feat(agent): enhance agent sharing and selection features

- Updated the AgentSelector component to improve agent selection logic, ensuring accurate representation of selected agents.
- Introduced new AgentShareSettings component for managing agent sharing with organizations, including UI for selecting organizations and displaying shared agents.
- Enhanced API interactions for sharing agents, including new methods for listing and managing agent shares.
- Improved localization support for agent sharing features across multiple languages.
- Updated various components to reflect changes in agent capabilities and sharing status, enhancing user experience and clarity.

This update strengthens the agent management features, providing users with better tools for sharing and selecting agents within organizations.
This commit is contained in:
wizardchen
2026-02-04 20:12:29 +08:00
committed by lyingbug
parent faa4e9e7b5
commit dfaf862bc0
45 changed files with 3606 additions and 477 deletions
+1 -1
View File
@@ -89,7 +89,7 @@ export function useStream() {
if (params.knowledge_ids !== undefined && params.knowledge_ids.length > 0) {
postBody.knowledge_ids = params.knowledge_ids;
}
// Include agent_id if provided (for custom agent configuration)
// Include agent_id if provided (backend resolves shared agent and tenant from share relation)
if (params.agent_id) {
postBody.agent_id = params.agent_id;
}
+33 -12
View File
@@ -1,8 +1,11 @@
import { get, post, put, del, postUpload, getDown } from "../../utils/request";
// 知识库管理 API(列表、创建、获取、更新、删除、复制)
export function listKnowledgeBases() {
return get(`/api/v1/knowledge-bases`);
export function listKnowledgeBases(params?: { agent_id?: string }) {
const query = new URLSearchParams();
if (params?.agent_id) query.set('agent_id', params.agent_id);
const qs = query.toString();
return get(qs ? `/api/v1/knowledge-bases?${qs}` : '/api/v1/knowledge-bases');
}
export function createKnowledgeBase(data: {
@@ -23,8 +26,11 @@ export function createKnowledgeBase(data: {
return post(`/api/v1/knowledge-bases`, data);
}
export function getKnowledgeBaseById(id: string) {
return get(`/api/v1/knowledge-bases/${id}`);
export function getKnowledgeBaseById(id: string, options?: { agent_id?: string }) {
const query = new URLSearchParams();
if (options?.agent_id) query.set('agent_id', options.agent_id);
const qs = query.toString();
return get(qs ? `/api/v1/knowledge-bases/${id}?${qs}` : `/api/v1/knowledge-bases/${id}`);
}
export function updateKnowledgeBase(id: string, data: { name: string; description?: string; config: any }) {
@@ -81,8 +87,11 @@ export function listKnowledgeFiles(
return get(`/api/v1/knowledge-bases/${kbId}/knowledge?${qs}`);
}
export function getKnowledgeDetails(id: string) {
return get(`/api/v1/knowledge/${id}`);
export function getKnowledgeDetails(id: string, options?: { agent_id?: string }) {
const query = new URLSearchParams();
if (options?.agent_id) query.set('agent_id', options.agent_id);
const qs = query.toString();
return get(qs ? `/api/v1/knowledge/${id}?${qs}` : `/api/v1/knowledge/${id}`);
}
export function updateManualKnowledge(id: string, data: { title: string; content: string; status: string }) {
@@ -98,8 +107,10 @@ export function downKnowledgeDetails(id: string) {
}
/** @param idsQueryString - query string with ids (e.g. ids=xxx&ids=yyy) */
export function batchQueryKnowledge(idsQueryString: string, kbId?: string) {
const qs = kbId ? `${idsQueryString}&kb_id=${encodeURIComponent(kbId)}` : idsQueryString;
export function batchQueryKnowledge(idsQueryString: string, kbId?: string, agentId?: string) {
let qs = idsQueryString;
if (kbId) qs += `&kb_id=${encodeURIComponent(kbId)}`;
if (agentId) qs += `&agent_id=${encodeURIComponent(agentId)}`;
return get(`/api/v1/knowledge/batch?${qs}`);
}
@@ -267,10 +278,20 @@ export function updateFAQImportResultDisplayStatus(knowledgeBaseId: string, disp
});
}
export function searchKnowledge(keyword: string, offset = 0, limit = 20, fileTypes?: string[]) {
let url = `/api/v1/knowledge/search?keyword=${encodeURIComponent(keyword)}&offset=${offset}&limit=${limit}`;
export function searchKnowledge(
keyword: string,
offset = 0,
limit = 20,
fileTypes?: string[],
options?: { agent_id?: string }
) {
const query = new URLSearchParams();
query.set('keyword', keyword);
query.set('offset', String(offset));
query.set('limit', String(limit));
if (fileTypes && fileTypes.length > 0) {
url += `&file_types=${encodeURIComponent(fileTypes.join(','))}`;
query.set('file_types', fileTypes.join(','));
}
return get(url);
if (options?.agent_id) query.set('agent_id', options.agent_id);
return get(`/api/v1/knowledge/search?${query.toString()}`);
}
+99
View File
@@ -16,6 +16,7 @@ export interface Organization {
member_limit?: number
member_count?: number
share_count?: number
agent_share_count?: number
pending_join_request_count?: number
is_owner?: boolean
my_role?: string
@@ -80,6 +81,7 @@ export interface OrganizationPreview {
avatar?: string
member_count: number
share_count: number
agent_share_count?: number
is_already_member: boolean
require_approval: boolean
created_at: string
@@ -94,6 +96,7 @@ export interface SearchableOrganizationItem {
member_count: number
member_limit: number // 0 = unlimited
share_count: number
agent_share_count?: number
is_already_member: boolean
require_approval: boolean
}
@@ -204,6 +207,47 @@ export interface ListSharesResponse {
total: number
}
// Agent share types
export interface AgentShareResponse {
id: string
agent_id: string
agent_name?: string
organization_id: string
organization_name?: string
shared_by_user_id: string
shared_by_username?: string
source_tenant_id: number
permission: string
my_role_in_org?: string
my_permission?: string
created_at: string
/** Agent scope summary for list display */
scope_kb?: string
scope_kb_count?: number
scope_web_search?: boolean
scope_mcp?: string
scope_mcp_count?: number
/** Agent avatar (emoji) for list display */
agent_avatar?: string
}
export interface SharedAgentInfo {
agent: { id: string; name: string; description?: string; [key: string]: any }
share_id: string
organization_id: string
org_name: string
permission: string
source_tenant_id: number
shared_at: string
shared_by_user_id?: string
shared_by_username?: string
}
export interface ListAgentSharesResponse {
shares: AgentShareResponse[]
total: number
}
// Organization API functions
/**
@@ -520,6 +564,61 @@ export async function listOrgShares(orgId: string): Promise<ApiResponse<ListShar
}
}
// Agent sharing
export async function shareAgent(agentId: string, req: ShareKnowledgeBaseRequest): Promise<ApiResponse<AgentShareResponse>> {
try {
const response = await post(`/api/v1/agents/${agentId}/shares`, req)
return response as unknown as ApiResponse<AgentShareResponse>
} catch (error: any) {
return { success: false, message: error.message || 'Failed to share agent' }
}
}
export async function listAgentShares(agentId: string): Promise<ApiResponse<ListAgentSharesResponse>> {
try {
const response = await get(`/api/v1/agents/${agentId}/shares`)
return response as unknown as ApiResponse<ListAgentSharesResponse>
} catch (error: any) {
return { success: false, message: error.message || 'Failed to list agent shares' }
}
}
export async function updateAgentSharePermission(agentId: string, shareId: string, req: UpdateSharePermissionRequest): Promise<ApiResponse<void>> {
try {
const response = await put(`/api/v1/agents/${agentId}/shares/${shareId}`, req)
return response as unknown as ApiResponse<void>
} catch (error: any) {
return { success: false, message: error.message || 'Failed to update share permission' }
}
}
export async function removeAgentShare(agentId: string, shareId: string): Promise<ApiResponse<void>> {
try {
const response = await del(`/api/v1/agents/${agentId}/shares/${shareId}`)
return response as unknown as ApiResponse<void>
} catch (error: any) {
return { success: false, message: error.message || 'Failed to remove share' }
}
}
export async function listSharedAgents(): Promise<ApiResponse<SharedAgentInfo[]>> {
try {
const response = await get('/api/v1/shared-agents')
return response as unknown as ApiResponse<SharedAgentInfo[]>
} catch (error: any) {
return { success: false, message: error.message || 'Failed to list shared agents' }
}
}
export async function listOrgAgentShares(orgId: string): Promise<ApiResponse<ListAgentSharesResponse>> {
try {
const response = await get(`/api/v1/organizations/${orgId}/agent-shares`)
return response as unknown as ApiResponse<ListAgentSharesResponse>
} catch (error: any) {
return { success: false, message: error.message || 'Failed to list organization agent shares' }
}
}
/**
* Search users for inviting to organization (excludes existing members)
*/
+187 -32
View File
@@ -30,7 +30,7 @@
>
<div
class="agent-option"
:class="{ 'selected': currentAgentId === agent.id }"
:class="{ 'selected': isMyAgentSelected(agent) }"
@click="selectAgent(agent)"
>
<!-- 快速回答和智能推理使用图标,其他内置智能体使用 avatar -->
@@ -51,7 +51,7 @@
</div>
</t-tooltip>
<svg
v-if="currentAgentId === agent.id"
v-if="isMyAgentSelected(agent)"
width="14"
height="14"
viewBox="0 0 16 16"
@@ -77,7 +77,7 @@
</div>
<div class="agent-tooltip-title">
<span class="agent-tooltip-name">{{ agent.name }}</span>
<span v-if="currentAgentId === agent.id" class="agent-tooltip-selected">{{ $t('agent.selector.current') }}</span>
<span v-if="isMyAgentSelected(agent)" class="agent-tooltip-selected">{{ $t('agent.selector.current') }}</span>
</div>
</div>
<p class="agent-tooltip-desc">{{ agent.description || $t('agent.noDescription') }}</p>
@@ -86,6 +86,22 @@
<TIcon :name="agent.config?.agent_mode === 'smart-reasoning' ? 'control-platform' : 'chat'" size="12px" />
<span>{{ agent.config?.agent_mode === 'smart-reasoning' ? $t('agent.type.agent') : $t('agent.type.normal') }}</span>
</div>
<div v-if="getKbCapability(agent)" class="capability-item">
<TIcon name="folder" size="12px" />
<span>{{ getKbCapability(agent) }}</span>
</div>
<div v-if="agent.config?.web_search_enabled" class="capability-item">
<TIcon name="internet" size="12px" />
<span>{{ $t('agent.capabilities.webSearchOn') }}</span>
</div>
<div v-if="getMcpCapability(agent)" class="capability-item">
<TIcon name="extension" size="12px" />
<span>{{ getMcpCapability(agent) }}</span>
</div>
<div v-if="agent.config?.multi_turn_enabled" class="capability-item">
<TIcon name="chat-bubble" size="12px" />
<span>{{ $t('agent.capabilities.multiTurn') }}</span>
</div>
</div>
</div>
</template>
@@ -105,7 +121,7 @@
>
<div
class="agent-option"
:class="{ 'selected': currentAgentId === agent.id }"
:class="{ 'selected': isMyAgentSelected(agent) }"
@click="selectAgent(agent)"
>
<AgentAvatar :name="agent.name" size="small" />
@@ -117,7 +133,7 @@
</div>
</t-tooltip>
<svg
v-if="currentAgentId === agent.id"
v-if="isMyAgentSelected(agent)"
width="14"
height="14"
viewBox="0 0 16 16"
@@ -134,7 +150,7 @@
<AgentAvatar :name="agent.name" size="small" />
<div class="agent-tooltip-title">
<span class="agent-tooltip-name">{{ agent.name }}</span>
<span v-if="currentAgentId === agent.id" class="agent-tooltip-selected">{{ $t('agent.selector.current') }}</span>
<span v-if="isMyAgentSelected(agent)" class="agent-tooltip-selected">{{ $t('agent.selector.current') }}</span>
</div>
</div>
<p class="agent-tooltip-desc">{{ agent.description || $t('agent.noDescription') }}</p>
@@ -151,9 +167,9 @@
<TIcon name="internet" size="12px" />
<span>{{ $t('agent.capabilities.webSearchOn') }}</span>
</div>
<div v-if="agent.config?.mcp_services?.length || agent.config?.mcp_selection_mode === 'all'" class="capability-item">
<div v-if="getMcpCapability(agent)" class="capability-item">
<TIcon name="extension" size="12px" />
<span>{{ $t('agent.capabilities.mcpEnabled') }}</span>
<span>{{ getMcpCapability(agent) }}</span>
</div>
<div v-if="agent.config?.multi_turn_enabled" class="capability-item">
<TIcon name="chat-bubble" size="12px" />
@@ -165,8 +181,87 @@
</t-popup>
</div>
<!-- 共享给我分组 -->
<div v-if="sharedAgentsList.length > 0" class="agent-group">
<div class="agent-group-title">{{ $t('agent.tabs.sharedToMe') }}</div>
<t-popup
v-for="shared in sharedAgentsList"
:key="`${shared.agent.id}-${shared.source_tenant_id}`"
placement="right"
trigger="hover"
:show-arrow="true"
:overlay-inner-class-name="'agent-tooltip-popup'"
>
<div
class="agent-option"
:class="{ 'selected': isSharedAgentSelected(shared) }"
@click="selectSharedAgent(shared)"
>
<AgentAvatar :name="shared.agent.name" size="small" />
<span class="agent-option-name">{{ shared.agent.name }}</span>
<span class="shared-tag">{{ $t('agent.selector.sharedLabel') }}</span>
<div class="agent-option-actions">
<svg
v-if="isSharedAgentSelected(shared)"
width="14"
height="14"
viewBox="0 0 16 16"
fill="currentColor"
class="check-icon"
>
<path d="M13.5 4.5L6 12L2.5 8.5L3.5 7.5L6 10L12.5 3.5L13.5 4.5Z"/>
</svg>
</div>
</div>
<template #content>
<div class="agent-tooltip-content">
<div class="agent-tooltip-header">
<AgentAvatar :name="shared.agent.name" size="small" />
<div class="agent-tooltip-title">
<span class="agent-tooltip-name">{{ shared.agent.name }}</span>
<span v-if="isSharedAgentSelected(shared)" class="agent-tooltip-selected">{{ $t('agent.selector.current') }}</span>
</div>
</div>
<p class="agent-tooltip-desc">{{ shared.agent.description || $t('agent.noDescription') }}</p>
<div class="agent-tooltip-capabilities">
<div class="capability-item">
<TIcon :name="shared.agent.config?.agent_mode === 'smart-reasoning' ? 'control-platform' : 'chat'" size="12px" />
<span>{{ shared.agent.config?.agent_mode === 'smart-reasoning' ? $t('agent.type.agent') : $t('agent.type.normal') }}</span>
</div>
<div v-if="getKbCapability(shared.agent)" class="capability-item">
<TIcon name="folder" size="12px" />
<span>{{ getKbCapability(shared.agent) }}</span>
</div>
<div v-if="shared.agent.config?.web_search_enabled" class="capability-item">
<TIcon name="internet" size="12px" />
<span>{{ $t('agent.capabilities.webSearchOn') }}</span>
</div>
<div v-if="getMcpCapability(shared.agent)" class="capability-item">
<TIcon name="extension" size="12px" />
<span>{{ getMcpCapability(shared.agent) }}</span>
</div>
<div v-if="shared.agent.config?.multi_turn_enabled" class="capability-item">
<TIcon name="chat-bubble" size="12px" />
<span>{{ $t('agent.capabilities.multiTurn') }}</span>
</div>
</div>
<div v-if="shared.org_name || shared.shared_by_username" class="agent-tooltip-meta-list">
<div v-if="shared.org_name" class="agent-tooltip-meta-row">
<img src="@/assets/img/organization-green.svg" class="agent-tooltip-meta-icon" alt="" aria-hidden="true" />
<span class="agent-tooltip-meta-text">{{ shared.org_name }}</span>
</div>
<div v-if="shared.shared_by_username" class="agent-tooltip-meta-row">
<img src="@/assets/img/user.svg" class="agent-tooltip-meta-icon" alt="" aria-hidden="true" />
<span class="agent-tooltip-meta-text">{{ shared.shared_by_username }}</span>
</div>
</div>
</div>
</template>
</t-popup>
</div>
<!-- 空状态 -->
<div v-if="builtinAgents.length === 0 && customAgents.length === 0" class="agent-option empty">
<div v-if="builtinAgents.length === 0 && customAgents.length === 0 && sharedAgentsList.length === 0" class="agent-option empty">
{{ $t('agent.noAgents') }}
</div>
</div>
@@ -176,34 +271,43 @@
</template>
<script setup lang="ts">
import { ref, computed, watch, onMounted, nextTick } from 'vue';
import { ref, computed, watch, nextTick } from 'vue';
import { useI18n } from 'vue-i18n';
import { useRouter } from 'vue-router';
import { Icon as TIcon, Popup as TPopup, Tooltip as TTooltip } from 'tdesign-vue-next';
import { listAgents, type CustomAgent, BUILTIN_QUICK_ANSWER_ID, BUILTIN_SMART_REASONING_ID } from '@/api/agent';
import { type CustomAgent, BUILTIN_QUICK_ANSWER_ID, BUILTIN_SMART_REASONING_ID } from '@/api/agent';
import AgentAvatar from '@/components/AgentAvatar.vue';
import { useOrganizationStore } from '@/stores/organization';
import { useSettingsStore } from '@/stores/settings';
import type { SharedAgentInfo } from '@/api/organization';
const { t } = useI18n();
const router = useRouter();
const orgStore = useOrganizationStore();
const settingsStore = useSettingsStore();
const props = defineProps<{
visible: boolean;
anchorEl?: HTMLElement;
currentAgentId: string;
/** 由父组件加载的智能体列表,避免下拉打开时重复请求 agents / shared-agents */
agents?: CustomAgent[];
}>();
const emit = defineEmits<{
(e: 'close'): void;
(e: 'select', agent: CustomAgent): void;
(e: 'select', agent: CustomAgent, sourceTenantId?: string): void;
}>();
const agents = ref<CustomAgent[]>([]);
const dropdownStyle = ref<Record<string, string>>({});
// 使用父组件传入的 agents,避免与父组件重复请求
const agentsList = computed(() => props.agents ?? []);
// 内置智能体(从 API 获取,对特定 ID 使用本地化名称)
const builtinAgents = computed(() => {
// 从 API 获取的内置智能体
const apiBuiltins = agents.value.filter(a => a.is_builtin);
const apiBuiltins = agentsList.value.filter(a => a.is_builtin);
// 对特定内置智能体使用本地化名称和描述
return apiBuiltins.map(agent => {
@@ -225,11 +329,24 @@ const builtinAgents = computed(() => {
});
});
// 自定义智能体
// 自定义智能体(我的)
const customAgents = computed(() => {
return agents.value.filter(a => !a.is_builtin);
return agentsList.value.filter(a => !a.is_builtin);
});
// 共享给我的智能体
const sharedAgentsList = computed<SharedAgentInfo[]>(() => orgStore.sharedAgents || []);
// 当前选中的来源租户(共享智能体时)
const currentAgentSourceTenantId = computed(() => settingsStore.selectedAgentSourceTenantId ?? null);
const isSharedAgentSelected = (shared: SharedAgentInfo) =>
props.currentAgentId === shared.agent.id && currentAgentSourceTenantId.value === String(shared.source_tenant_id);
// 我的智能体(内置或自定义)选中态:仅当未选共享来源时
const isMyAgentSelected = (agent: CustomAgent) =>
props.currentAgentId === agent.id && !currentAgentSourceTenantId.value;
// 获取知识库能力描述
const getKbCapability = (agent: CustomAgent): string => {
const config = agent.config || {};
@@ -243,21 +360,31 @@ const getKbCapability = (agent: CustomAgent): string => {
return '';
};
// 加载智能体列表
const loadAgents = async () => {
try {
const response = await listAgents();
agents.value = response.data || [];
} catch (error) {
console.error('Failed to load agents:', error);
// 获取 MCP 能力描述(更详细:全部 / 指定 N 个)
const getMcpCapability = (agent: CustomAgent): string => {
const config = agent.config || {};
if (config.mcp_selection_mode === 'none' || (!config.mcp_services?.length && config.mcp_selection_mode !== 'all')) {
return '';
}
if (config.mcp_selection_mode === 'all') {
return t('agent.detail.shareScope.mcpAll');
}
if (config.mcp_services?.length) {
return t('agent.detail.shareScope.mcpSelected', { count: config.mcp_services.length });
}
return t('agent.capabilities.mcpEnabled');
};
// 选择智能体
// 选择智能体(我的或内置)
const selectAgent = (agent: CustomAgent) => {
emit('select', agent);
};
// 选择共享智能体
const selectSharedAgent = (shared: SharedAgentInfo) => {
emit('select', shared.agent as CustomAgent, String(shared.source_tenant_id));
};
// 跳转到智能体设置页面
const goToSettings = (agent: CustomAgent) => {
emit('close');
@@ -325,21 +452,14 @@ const updateDropdownPosition = () => {
}
};
// 监听显示状态
// 监听显示状态(仅更新位置,数据由父组件加载后通过 props.agents 传入)
watch(() => props.visible, (newVal) => {
if (newVal) {
loadAgents();
nextTick(() => {
updateDropdownPosition();
});
}
});
onMounted(() => {
if (props.visible) {
loadAgents();
}
});
</script>
<style scoped lang="less">
@@ -474,6 +594,41 @@ onMounted(() => {
line-height: 1.4;
}
.shared-tag {
font-size: 10px;
color: var(--td-text-color-placeholder, #999);
flex-shrink: 0;
}
.agent-tooltip-meta-list {
margin-top: 8px;
padding-top: 8px;
border-top: 1px solid var(--td-component-stroke, #f0f0f0);
display: flex;
flex-direction: column;
gap: 4px;
}
.agent-tooltip-meta-row {
display: flex;
align-items: center;
gap: 6px;
font-size: 11px;
color: var(--td-text-color-placeholder, #999);
}
.agent-tooltip-meta-icon {
width: 14px;
height: 14px;
flex-shrink: 0;
}
.agent-tooltip-meta-text {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.builtin-icon {
display: flex;
align-items: center;
@@ -0,0 +1,510 @@
<template>
<div class="section-content">
<div class="section-header">
<h3 class="section-title">{{ $t('organization.share.title') }}</h3>
<p class="section-desc">{{ $t('organization.share.agentShareDesc') || '将智能体共享到空间,空间成员可使用该智能体' }}</p>
</div>
<!-- 共享范围说明:当传入 agent 时展示,仅提示 + 变更同步说明,不列具体开关 -->
<div v-if="agent?.config" class="share-scope-block">
<h4 class="share-scope-title">{{ $t('agent.shareScope.title') }}</h4>
<p class="share-scope-desc">{{ $t('agent.shareScope.desc') }}</p>
</div>
<div class="section-body">
<div class="share-form">
<div class="form-item">
<label class="form-label">{{ $t('organization.share.selectOrg') }}</label>
<div class="share-input-row">
<t-select
v-model="selectedOrgId"
:placeholder="$t('organization.share.selectOrgPlaceholder')"
:loading="loadingOrgs"
class="org-select org-select-dropdown"
:popup-props="{ overlayClassName: 'org-select-dropdown-popup' }"
>
<t-option
v-for="org in availableOrganizations"
:key="org.id"
:value="org.id"
:label="org.name"
>
<div class="org-option-content">
<div class="org-option-icon-wrap">
<SpaceAvatar :name="org.name" :avatar="org.avatar" size="small" />
</div>
<div class="org-option-body">
<div class="org-option-header">
<span class="org-option-name">{{ org.name }}</span>
<t-tag v-if="org.is_owner" theme="primary" size="small" variant="light">
{{ $t('organization.owner') }}
</t-tag>
<t-tag v-else-if="org.my_role" :theme="org.my_role === 'admin' ? 'warning' : 'default'" size="small" variant="light">
{{ $t(`organization.role.${org.my_role}`) }}
</t-tag>
</div>
<div class="org-option-meta">
<span class="org-meta-tag">
<t-icon name="user" class="org-meta-icon org-meta-icon-user" />
{{ org.member_count ?? 0 }}
</span>
<span class="org-meta-tag">
<img src="@/assets/img/zhishiku.svg" class="org-meta-icon org-meta-icon-kb" alt="" aria-hidden="true" />
{{ org.share_count ?? 0 }}
</span>
<span class="org-meta-tag">
<img src="@/assets/img/organization-grey.svg" class="org-meta-icon org-meta-icon-kb" alt="" aria-hidden="true" />
{{ org.agent_share_count ?? 0 }}
</span>
</div>
</div>
</div>
</t-option>
</t-select>
<t-button
theme="primary"
:loading="submitting"
:disabled="!selectedOrgId"
@click="handleShare"
>
{{ $t('knowledgeEditor.share.addShare') }}
</t-button>
</div>
</div>
</div>
<div class="shares-section">
<div class="shares-header">
<span class="shares-title">{{ $t('organization.share.sharedTo') }}</span>
<span class="shares-count">{{ shares.length }}</span>
</div>
<div v-if="loadingShares" class="shares-loading">
<t-loading size="small" />
<span>{{ $t('common.loading') }}</span>
</div>
<div v-else-if="shares.length === 0" class="shares-empty">
<t-icon name="share" class="empty-icon" />
<span>{{ $t('organization.share.noShares') }}</span>
</div>
<div v-else class="shares-list">
<div v-for="share in shares" :key="share.id" class="share-item">
<div class="share-info">
<div class="share-info-top">
<div class="share-org">
<SpaceAvatar
:name="share.organization_name || ''"
:avatar="orgStore.organizations.find(o => o.id === share.organization_id)?.avatar"
size="small"
/>
<span class="org-name">{{ share.organization_name }}</span>
</div>
</div>
<div class="share-item-meta">
<span class="org-meta-tag">
<t-icon name="user" class="org-meta-icon org-meta-icon-user" />
{{ getOrgForShare(share.organization_id)?.member_count ?? 0 }}
</span>
<span class="org-meta-tag">
<img src="@/assets/img/zhishiku.svg" class="org-meta-icon org-meta-icon-kb" alt="" aria-hidden="true" />
{{ getOrgForShare(share.organization_id)?.share_count ?? 0 }}
</span>
<t-tooltip :content="$t('organization.share.spaceAgentShareCountTip')" placement="top">
<span class="org-meta-tag">
<img src="@/assets/img/agent.svg" class="org-meta-icon org-meta-icon-kb" alt="" aria-hidden="true" />
{{ getOrgForShare(share.organization_id)?.agent_share_count ?? 0 }}
</span>
</t-tooltip>
</div>
</div>
<div class="share-actions">
<t-popconfirm
:content="$t('knowledgeEditor.share.unshareConfirm', { name: share.organization_name })"
@confirm="handleUnshare(share)"
>
<t-button variant="text" theme="danger" size="small">
<t-icon name="delete" />
</t-button>
</t-popconfirm>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script setup lang="ts">
import { ref, computed, watch, onMounted } from 'vue'
import { MessagePlugin } from 'tdesign-vue-next'
import { useI18n } from 'vue-i18n'
import { useOrganizationStore } from '@/stores/organization'
import { shareAgent, listAgentShares, removeAgentShare } from '@/api/organization'
import type { AgentShareResponse } from '@/api/organization'
import type { CustomAgent } from '@/api/agent'
import SpaceAvatar from '@/components/SpaceAvatar.vue'
const { t } = useI18n()
const orgStore = useOrganizationStore()
function getOrgForShare(organizationId: string) {
return orgStore.organizations.find(o => o.id === organizationId)
}
interface Props {
agentId: string
/** 当前智能体(用于展示共享范围说明) */
agent?: CustomAgent | null
}
const props = defineProps<Props>()
const loadingOrgs = ref(false)
const loadingShares = ref(false)
const submitting = ref(false)
const selectedOrgId = ref('')
const shares = ref<(AgentShareResponse & { organization_name?: string })[]>([])
const availableOrganizations = computed(() => {
const sharedOrgIds = new Set(shares.value.map(s => s.organization_id))
return orgStore.organizations.filter(
(org) =>
!sharedOrgIds.has(org.id) &&
(org.is_owner === true || org.my_role === 'admin' || org.my_role === 'editor')
)
})
async function loadOrganizations() {
loadingOrgs.value = true
try {
await orgStore.fetchOrganizations()
} finally {
loadingOrgs.value = false
}
}
async function loadShares() {
if (!props.agentId) return
loadingShares.value = true
try {
const result = await listAgentShares(props.agentId)
if (result.success && result.data) {
const sharesData = (result.data as any).shares || result.data
const sharesList = Array.isArray(sharesData) ? sharesData : []
shares.value = sharesList.map((share: AgentShareResponse) => ({
...share,
organization_name: share.organization_name || orgStore.organizations.find(o => o.id === share.organization_id)?.name || share.organization_id
}))
}
} catch (e) {
console.error('Failed to load agent shares:', e)
} finally {
loadingShares.value = false
}
}
async function handleShare() {
if (!selectedOrgId.value) return
submitting.value = true
try {
const result = await shareAgent(props.agentId, {
organization_id: selectedOrgId.value,
permission: 'viewer'
})
if (result.success) {
MessagePlugin.success(t('organization.share.shareSuccess'))
selectedOrgId.value = ''
await loadShares()
} else {
MessagePlugin.error(result.message || t('organization.share.shareFailed'))
}
} catch (e: any) {
MessagePlugin.error(e?.message || t('organization.share.shareFailed'))
} finally {
submitting.value = false
}
}
async function handleUnshare(share: AgentShareResponse) {
try {
const result = await removeAgentShare(props.agentId, share.id)
if (result.success) {
MessagePlugin.success(t('organization.share.unshareSuccess'))
await loadShares()
} else {
MessagePlugin.error(result.message || t('organization.share.unshareFailed'))
}
} catch (e: any) {
MessagePlugin.error(e?.message || t('organization.share.unshareFailed'))
}
}
watch(() => props.agentId, async (newId) => {
if (newId) await Promise.all([loadOrganizations(), loadShares()])
}, { immediate: true })
onMounted(async () => {
if (props.agentId) await Promise.all([loadOrganizations(), loadShares()])
})
defineExpose({ loadShares })
</script>
<style scoped lang="less">
.section-content { .section-header { margin-bottom: 20px; } .section-title { margin: 0 0 8px 0; font-size: 16px; font-weight: 600; } .section-desc { margin: 0; font-size: 14px; color: #00000066; } }
.share-form { margin-bottom: 24px; padding-bottom: 24px; border-bottom: 1px solid #f0f0f0; }
.form-item {
.form-label {
display: block;
margin-bottom: 12px;
font-size: 14px;
font-weight: 500;
}
}
.share-input-row {
display: flex;
gap: 12px;
align-items: center;
flex-wrap: wrap;
.org-select { flex: 1; min-width: 240px; }
}
.shares-section { margin-bottom: 24px; }
.shares-header {
display: flex;
align-items: center;
gap: 8px;
margin-bottom: 16px;
.shares-title {
font-family: "PingFang SC";
font-size: 14px;
font-weight: 500;
color: #000000e6;
}
.shares-count {
padding: 2px 8px;
background: #f5f5f5;
border-radius: 10px;
font-size: 12px;
color: #00000066;
}
}
.shares-loading {
display: flex;
align-items: center;
justify-content: center;
gap: 8px;
padding: 32px;
color: #00000066;
font-size: 14px;
}
.shares-empty {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
gap: 12px;
padding: 40px 20px;
background: #fafafa;
border-radius: 8px;
color: #00000066;
.empty-icon { font-size: 32px; opacity: 0.5; }
}
.shares-list {
display: flex;
flex-direction: column;
gap: 10px;
max-height: 320px;
overflow-y: auto;
}
.share-item {
display: flex;
justify-content: space-between;
align-items: center;
gap: 12px;
padding: 14px 16px;
background: #fafafa;
border: 1px solid #f0f0f0;
border-radius: 8px;
transition: background 0.2s ease, border-color 0.2s ease;
&:hover {
background: #f5f5f5;
border-color: #e8e8e8;
}
}
.share-info {
flex: 1;
min-width: 0;
display: flex;
flex-direction: column;
gap: 8px;
}
.share-info-top {
display: flex;
align-items: center;
gap: 12px;
}
.share-org {
display: flex;
align-items: center;
gap: 8px;
.org-name {
font-family: "PingFang SC";
font-size: 14px;
font-weight: 500;
color: #000000e6;
}
}
.share-item-meta {
display: flex;
align-items: center;
gap: 6px;
font-size: 12px;
color: #00000099;
.org-meta-tag {
display: inline-flex;
align-items: center;
gap: 3px;
padding: 2px 6px;
background: #f0f0f0;
border-radius: 4px;
}
.org-meta-icon {
flex-shrink: 0;
vertical-align: middle;
color: #00000099;
}
.org-meta-icon-user {
font-size: 12px;
}
.org-meta-icon-kb {
width: 12px;
height: 12px;
opacity: 0.75;
}
}
.share-actions {
display: flex;
align-items: center;
gap: 6px;
.permission-change-select { width: 100px; }
}
.share-scope-block {
margin-bottom: 24px;
padding: 16px;
background: #f8faf9;
border: 1px solid #e8f5ed;
border-radius: 8px;
}
.share-scope-title {
margin: 0 0 6px 0;
font-size: 14px;
font-weight: 600;
color: #1a1a1a;
}
.share-scope-desc {
margin: 0 0 12px 0;
font-size: 12px;
color: #666;
line-height: 1.4;
}
// 与知识库设置中空间下拉一致的选项样式
:deep(.t-select-option) {
height: auto;
align-items: center;
padding: 6px 12px;
border-radius: 4px;
margin: 1px 6px;
transition: background 0.15s ease;
}
:deep(.t-select-option:hover),
:deep(.t-select-option.t-is-selected) {
background: #f0f7ff;
}
:deep(.t-select-option__content) {
width: 100%;
}
.org-option-content {
display: flex;
align-items: center;
gap: 10px;
padding: 0;
min-width: 260px;
width: 100%;
}
.org-option-icon-wrap {
flex-shrink: 0;
display: flex;
align-items: center;
justify-content: center;
}
.org-option-body {
flex: 1;
min-width: 0;
}
.org-option-header {
display: flex;
align-items: center;
gap: 6px;
margin-bottom: 2px;
}
.org-option-name {
font-family: "PingFang SC";
font-size: 13px;
font-weight: 500;
color: #000000e6;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.org-option-meta {
display: flex;
align-items: center;
gap: 6px;
font-family: "PingFang SC";
font-size: 12px;
color: #00000099;
.org-meta-tag {
display: inline-flex;
align-items: center;
gap: 3px;
padding: 0px 4px;
background: #f0f0f0;
border-radius: 4px;
}
.org-meta-icon {
flex-shrink: 0;
vertical-align: middle;
color: #00000099;
}
.org-meta-icon-user {
font-size: 12px;
}
.org-meta-icon-kb {
width: 12px;
height: 12px;
opacity: 0.75;
}
}
</style>
<style lang="less">
.org-select-dropdown-popup.t-select__dropdown {
padding: 4px 0;
max-height: 320px;
overflow-y: auto;
border-radius: 6px;
box-shadow: 0 2px 12px rgba(0, 0, 0, 0.08);
}
.org-select-dropdown-popup .t-select-option {
height: auto;
align-items: center;
padding: 6px 12px;
border-radius: 4px;
margin: 1px 6px;
}
.org-select-dropdown-popup .t-select-option__content {
width: 100%;
}
</style>
+194 -92
View File
@@ -39,7 +39,16 @@ const selectedAgentId = computed({
set: (val: string) => settingsStore.selectAgent(val)
});
const selectedAgent = computed(() => {
return agents.value.find(a => a.id === selectedAgentId.value) || {
const mine = agents.value.find(a => a.id === selectedAgentId.value);
if (mine) return mine;
const sourceTenantId = settingsStore.selectedAgentSourceTenantId;
if (sourceTenantId && orgStore.sharedAgents?.length) {
const shared = orgStore.sharedAgents.find(
s => s.agent.id === selectedAgentId.value && String(s.source_tenant_id) === sourceTenantId
);
if (shared?.agent) return shared.agent as CustomAgent;
}
return {
id: BUILTIN_QUICK_ANSWER_ID,
name: t('input.normalMode'),
is_builtin: true,
@@ -80,25 +89,49 @@ const agentKnowledgeBases = computed(() => {
return currentAgentConfig.value?.knowledge_bases || [];
});
// 当智能体改变时,将智能体配置的知识库同步到 store
// 这样用户可以移除这些知识库
watch([selectedAgentId, agentKnowledgeBases], ([newAgentId, newAgentKbs], [oldAgentId]) => {
if (newAgentId !== oldAgentId && newAgentKbs && newAgentKbs.length > 0) {
// 智能体切换了,将新智能体配置的知识库添加到 store
const currentSelected = settingsStore.settings.selectedKnowledgeBases || [];
const toAdd = newAgentKbs.filter((id: string) => !currentSelected.includes(id));
if (toAdd.length > 0) {
settingsStore.selectKnowledgeBases([...currentSelected, ...toAdd]);
}
}
}, { immediate: true });
// 智能体的知识库选择模式
const agentKBSelectionMode = computed(() => {
if (!hasAgentConfig.value) return null; // null 表示不受智能体控制
return currentAgentConfig.value?.kb_selection_mode || 'all';
});
// 当智能体改变时,模型、网络搜索、可@知识库列表均跟随新智能体配置
// 知识库:用新智能体配置的列表替换当前选中,使已选与可@列表一致(含共享智能体)
watch([selectedAgentId, agentKnowledgeBases, agentKBSelectionMode], ([newAgentId, newAgentKbs, newKbMode], [oldAgentId]) => {
if (newAgentId !== oldAgentId && oldAgentId !== undefined) {
if (newKbMode === 'none') {
settingsStore.selectKnowledgeBases([]);
} else {
settingsStore.selectKnowledgeBases(newAgentKbs && newAgentKbs.length > 0 ? [...newAgentKbs] : []);
}
// 若 @ 面板已打开,刷新可@列表以立即反映新智能体的知识库范围
if (showMention.value) {
loadMentionItems(mentionQuery.value, true);
}
}
}, { immediate: true });
// 共享智能体时预取该智能体知识库列表,使已选标签在未打开 @ 时也能显示共享空间角标
watch([selectedAgentId, () => settingsStore.selectedAgentSourceTenantId], async ([agentId, sourceTenantId]) => {
if (sourceTenantId && agentId) {
try {
const res: any = await listKnowledgeBases({ agent_id: agentId });
const list = res?.data && Array.isArray(res.data) ? res.data : [];
sharedAgentKbList.value = list.map((kb: any) => ({
id: kb.id,
name: kb.name,
type: kb.type || 'document',
knowledge_count: kb.knowledge_count,
chunk_count: kb.chunk_count
}));
} catch {
sharedAgentKbList.value = [];
}
} else {
sharedAgentKbList.value = [];
}
}, { immediate: true });
// 智能体是否启用了网络搜索
const agentWebSearchEnabled = computed(() => {
if (!hasAgentConfig.value) return null; // null 表示不受智能体控制
@@ -159,6 +192,20 @@ const mentionLoading = ref(false);
const mentionOffset = ref(0);
const MENTION_PAGE_SIZE = 20;
// 共享智能体时用于标识「共享空间」的展示名(组织名或共享者),供 @ 列表与已选标签显示角标
const sharedAgentOrgName = computed(() => {
const sourceTenantId = settingsStore.selectedAgentSourceTenantId;
const agentId = selectedAgentId.value;
if (!sourceTenantId || !agentId || !orgStore.sharedAgents?.length) return '';
const shared = orgStore.sharedAgents.find(
(s: any) => s.agent?.id === agentId && String(s.source_tenant_id) === sourceTenantId
);
return shared?.org_name || shared?.shared_by_username || '';
});
// 共享智能体下的知识库列表(来自 listKnowledgeBases(agent_id)),用于已选知识库展示与 org 角标
const sharedAgentKbList = ref<Array<{ id: string; name: string; type?: string; knowledge_count?: number; chunk_count?: number }>>([]);
const props = defineProps({
isReplying: {
type: Boolean,
@@ -184,7 +231,7 @@ const isWebSearchConfigured = ref(false);
const knowledgeBases = ref<Array<{ id: string; name: string; type?: 'document' | 'faq'; knowledge_count?: number; chunk_count?: number }>>([]);
const fileList = ref<Array<{ id: string; name: string }>>([]);
// 选中的知识库:包含自己的 + 别人共享的(用于展示已选列表)
// 选中的知识库:包含自己的 + 组织共享的 + 共享智能体下的(用于展示已选列表与 org 角标)
const selectedKbs = computed(() => {
const own = knowledgeBases.value.filter(kb => selectedKbIds.value.includes(kb.id));
const sharedList = orgStore.sharedKnowledgeBases || [];
@@ -200,7 +247,18 @@ const selectedKbs = computed(() => {
}));
const ownIds = new Set(own.map(kb => kb.id));
const sharedOnly = sharedMapped.filter((kb: any) => !ownIds.has(kb.id));
return [...own, ...sharedOnly];
const sharedOnlyIds = new Set(sharedOnly.map((kb: any) => kb.id));
// 共享智能体下的知识库:从 sharedAgentKbList 中取在选中列表里的,并打上共享空间标识
const agentOrg = sharedAgentOrgName.value;
const sharedFromAgent = (sharedAgentKbList.value || []).filter(kb => selectedKbIds.value.includes(kb.id) && !ownIds.has(kb.id) && !sharedOnlyIds.has(kb.id)).map(kb => ({
id: kb.id,
name: kb.name,
type: kb.type || 'document',
knowledge_count: kb.knowledge_count,
chunk_count: kb.chunk_count,
org_name: agentOrg || ''
}));
return [...own, ...sharedOnly, ...sharedFromAgent];
});
const selectedFiles = computed(() => {
@@ -226,13 +284,18 @@ const selectedFiles = computed(() => {
isAgentConfigured: agentKbIds.includes(kb.id)
}));
// 用户选择的文件(根据 fileIdToKbId + 共享列表补全 org_name,用于角标)
// 用户选择的文件(根据 fileIdToKbId + 共享列表/共享智能体补全 org_name,用于角标)
const sharedKbOrgMap: Record<string, string> = {};
(orgStore.sharedKnowledgeBases || []).forEach((s: any) => {
if (s.knowledge_base?.id != null && s.org_name) {
sharedKbOrgMap[String(s.knowledge_base.id)] = s.org_name;
}
});
if (sharedAgentOrgName.value) {
(sharedAgentKbList.value || []).forEach((kb) => {
sharedKbOrgMap[String(kb.id)] = sharedAgentOrgName.value;
});
}
const files = selectedFiles.value.map((f: { id: string; name: string }) => {
const kbId = fileIdToKbId.value[f.id];
const org_name = kbId ? sharedKbOrgMap[String(kbId)] || '' : '';
@@ -361,10 +424,11 @@ const loadFiles = async () => {
});
const allNewFiles: Array<{ id: string; name: string }> = [];
const runBatch = async (batchIds: string[], kbId?: string) => {
const agentIdForBatch = settingsStore.selectedAgentSourceTenantId ? settingsStore.selectedAgentId : undefined;
const runBatch = async (batchIds: string[], kbId?: string, agentId?: string) => {
const query = new URLSearchParams();
batchIds.forEach((id: string) => query.append('ids', id));
const res: any = await batchQueryKnowledge(query.toString(), kbId);
const res: any = await batchQueryKnowledge(query.toString(), kbId, agentId);
if (res.data && Array.isArray(res.data)) {
res.data.forEach((f: any) => allNewFiles.push({ id: f.id, name: f.title || f.file_name }));
}
@@ -374,7 +438,7 @@ const loadFiles = async () => {
await runBatch(batchIds, kbId);
}
if (noKbId.length > 0) {
await runBatch(noKbId);
await runBatch(noKbId, undefined, agentIdForBatch);
}
if (allNewFiles.length > 0) {
fileList.value = [...fileList.value, ...allNewFiles];
@@ -407,11 +471,14 @@ const loadWebSearchConfig = async () => {
}
};
// 加载智能体列表
// 加载智能体列表(我的 + 共享,供选中态与就绪检查用)
const loadAgents = async () => {
try {
const response = await listAgents();
agents.value = response.data || [];
const [agentsRes] = await Promise.all([
listAgents(),
orgStore.fetchSharedAgents(),
]);
agents.value = agentsRes.data || [];
} catch (error) {
console.error('Failed to load agents:', error);
}
@@ -527,6 +594,16 @@ const selectedModel = computed(() => {
return availableModels.value.find(model => model.id === selectedModelId.value);
});
// 模型展示名:本租户列表中有则用名称;若为共享智能体且其 model_id 不在本租户列表中则显示“共享智能体配置的模型”
const selectedModelDisplayName = computed(() => {
if (selectedModel.value) return selectedModel.value.name;
if (!selectedModelId.value) return t('input.notConfigured');
const isSharedAgent = !!settingsStore.selectedAgentSourceTenantId;
const modelFromAgent = agentModelId.value && agentModelId.value === selectedModelId.value;
if (isSharedAgent && modelFromAgent) return t('input.sharedAgentModelLabel');
return t('input.notConfigured');
});
const updateModelDropdownPosition = () => {
const anchor = modelButtonRef.value;
if (!anchor) {
@@ -644,33 +721,61 @@ const loadMentionItems = async (q: string, resetIndex = true, append = false) =>
mentionOffset.value = 0;
}
// 根据智能体的 kb_selection_mode 过滤知识库;合并「自己的」+「共享的」知识库
// 根据智能体的 kb_selection_mode 过滤知识库;选中共享智能体时使用该租户下的知识库,否则使用本租户 + 共享给自己的
let kbItems: any[] = [];
if (!append) {
// 自己的知识库(需有 embedding/summary 模型)
let availableKbs = [...knowledgeBases.value];
// 共享的知识库(有权限的),映射为与 knowledgeBases 同结构便于合并
const sharedList = orgStore.sharedKnowledgeBases || [];
const sharedKbsForMention = sharedList
.filter((s: any) => s.knowledge_base != null)
.map((s: any) => ({
id: s.knowledge_base.id,
name: s.knowledge_base.name,
type: s.knowledge_base.type || 'document',
knowledge_count: s.knowledge_base.knowledge_count,
chunk_count: s.knowledge_base.chunk_count,
org_name: s.org_name || ''
}));
// 去重:若某 KB 既在自己列表又在共享列表,只保留一份(自己的优先)
const ownIds = new Set(availableKbs.map((kb: any) => kb.id));
sharedKbsForMention.forEach((kb: any) => {
if (!ownIds.has(kb.id)) {
availableKbs.push(kb);
ownIds.add(kb.id);
let availableKbs: any[];
const sourceTenantId = settingsStore.selectedAgentSourceTenantId;
const agentId = selectedAgentId.value;
if (sourceTenantId && agentId) {
// 共享智能体:按 agent_id 拉取该智能体配置的知识库范围(后端从共享关系解析租户)
try {
const res: any = await listKnowledgeBases({ agent_id: agentId });
const list = res?.data && Array.isArray(res.data) ? res.data : [];
const orgLabel = sharedAgentOrgName.value || '';
availableKbs = list.map((kb: any) => ({
id: kb.id,
name: kb.name,
type: kb.type || 'document',
knowledge_count: kb.knowledge_count,
chunk_count: kb.chunk_count,
org_name: orgLabel
}));
sharedAgentKbList.value = list.map((kb: any) => ({
id: kb.id,
name: kb.name,
type: kb.type || 'document',
knowledge_count: kb.knowledge_count,
chunk_count: kb.chunk_count
}));
} catch (e) {
console.error('[Mention] listKnowledgeBases(agent_id) error:', e);
availableKbs = [];
sharedAgentKbList.value = [];
}
});
} else {
sharedAgentKbList.value = [];
availableKbs = [...knowledgeBases.value];
const sharedList = orgStore.sharedKnowledgeBases || [];
const sharedKbsForMention = sharedList
.filter((s: any) => s.knowledge_base != null)
.map((s: any) => ({
id: s.knowledge_base.id,
name: s.knowledge_base.name,
type: s.knowledge_base.type || 'document',
knowledge_count: s.knowledge_base.knowledge_count,
chunk_count: s.knowledge_base.chunk_count,
org_name: s.org_name || ''
}));
const ownIds = new Set(availableKbs.map((kb: any) => kb.id));
sharedKbsForMention.forEach((kb: any) => {
if (!ownIds.has(kb.id)) {
availableKbs.push(kb);
ownIds.add(kb.id);
}
});
}
// 如果智能体有配置,根据 kb_selection_mode 过滤
if (hasAgentConfig.value) {
const kbMode = agentKBSelectionMode.value;
if (kbMode === 'none') {
@@ -681,7 +786,6 @@ const loadMentionItems = async (q: string, resetIndex = true, append = false) =>
}
}
// 按查询过滤
const kbs = availableKbs.filter((kb: any) =>
!q || (kb.name && kb.name.toLowerCase().includes(q.toLowerCase()))
);
@@ -691,7 +795,7 @@ const loadMentionItems = async (q: string, resetIndex = true, append = false) =>
type: 'kb' as const,
kbType: kb.type || 'document',
count: kb.type === 'faq' ? (kb.chunk_count || 0) : (kb.knowledge_count || 0),
orgName: kb.org_name || undefined
orgName: kb.org_name || sharedAgentOrgName.value || undefined
}));
}
@@ -703,35 +807,42 @@ const loadMentionItems = async (q: string, resetIndex = true, append = false) =>
if (shouldLoadFiles) {
mentionLoading.value = true;
try {
// 将文件类型过滤传递给后端
const fileTypesParam = agentSupportedFileTypes.value.length > 0 ? agentSupportedFileTypes.value : undefined;
const res: any = await searchKnowledge(q || '', mentionOffset.value, MENTION_PAGE_SIZE, fileTypesParam);
const sourceTenantId = settingsStore.selectedAgentSourceTenantId;
const agentId = selectedAgentId.value;
const searchOptions = sourceTenantId && agentId ? { agent_id: agentId } : undefined;
const res: any = await searchKnowledge(
q || '',
mentionOffset.value,
MENTION_PAGE_SIZE,
fileTypesParam,
searchOptions
);
console.log('[Mention] searchKnowledge response:', res);
if (res.data && Array.isArray(res.data)) {
let files = res.data;
// 如果智能体配置了 kb_selection_mode === 'selected',只显示指定知识库中的文件
if (hasAgentConfig.value && agentKBSelectionMode.value === 'selected') {
if (!sourceTenantId && hasAgentConfig.value && agentKBSelectionMode.value === 'selected') {
const configuredKbIds = agentKnowledgeBases.value;
files = files.filter((f: any) => configuredKbIds.includes(f.knowledge_base_id ?? f.kb_id));
}
// 共享知识库 kb_id -> org_name,用于文件项显示组织角标(key 统一转 string 避免类型不一致)
const sharedKbOrgMap: Record<string, string> = {};
(orgStore.sharedKnowledgeBases || []).forEach((s: any) => {
if (s.knowledge_base?.id != null && s.org_name) {
sharedKbOrgMap[String(s.knowledge_base.id)] = s.org_name;
}
});
const agentOrgLabel = sourceTenantId && agentId ? sharedAgentOrgName.value : '';
fileItems = files.map((f: any) => {
const kbId = f.knowledge_base_id ?? f.kb_id;
const kbIdStr = kbId != null ? String(kbId) : '';
const fileOrgName = agentOrgLabel || (kbIdStr ? sharedKbOrgMap[kbIdStr] : undefined);
return {
id: f.id,
name: f.title || f.file_name,
type: 'file' as const,
kbName: f.knowledge_base_name || '',
kbId: kbId || undefined,
orgName: kbIdStr ? sharedKbOrgMap[kbIdStr] || undefined : undefined
orgName: fileOrgName || undefined
};
});
}
@@ -961,6 +1072,7 @@ const onMentionSelect = (item: any) => {
settingsStore.addFile(item.id);
if (item.kbId) {
fileIdToKbId.value[item.id] = item.kbId;
settingsStore.setFileKbMap({ [item.id]: item.kbId });
}
// Add to local cache immediately
if (!fileList.value.find(f => f.id === item.id)) {
@@ -1065,6 +1177,17 @@ onMounted(() => {
loadConversationConfig();
loadChatModels();
loadAgents();
// 从持久化恢复 fileId -> kbId,刷新后共享知识库文件可带 kb_id 拉取(仅保留当前仍选中的文件)
const persisted = settingsStore.settings.selectedFileKbMap;
const ids = settingsStore.settings.selectedFiles || [];
if (persisted && typeof persisted === 'object' && ids.length > 0) {
const next: Record<string, string> = {};
ids.forEach((id: string) => {
if (persisted[id]) next[id] = persisted[id];
});
fileIdToKbId.value = next;
}
// 如果从知识库内部进入,自动选中该知识库
const kbId = (route.params as any)?.kbId as string;
@@ -1298,8 +1421,8 @@ const selectAgentMode = (mode: 'quick-answer' | 'smart-reasoning') => {
showAgentModeSelector.value = false;
}
// 选择智能体(新版)
const handleSelectAgent = (agent: CustomAgent) => {
// 选择智能体(新版);sourceTenantId 为共享智能体时传入
const handleSelectAgent = (agent: CustomAgent, sourceTenantId?: string) => {
// 根据智能体的 agent_mode 判断是否为 Agent 模式
const isAgentType = agent.config?.agent_mode === 'smart-reasoning';
@@ -1317,27 +1440,23 @@ const handleSelectAgent = (agent: CustomAgent) => {
return;
}
selectedAgentId.value = agent.id;
settingsStore.selectAgent(agent.id, sourceTenantId);
settingsStore.toggleAgent(!!isAgentType);
// 同步智能体的配置状态(包括内置和自定义智能体)
// 同步智能体的配置状态(含内置、自定义、共享智能体):模型、网络搜索、知识库由 watch 同步
// 1. 同步网络搜索状态
const agentWebSearch = agent.config?.web_search_enabled;
if (agentWebSearch !== undefined) {
// 智能体配置了网络搜索设置,同步到 store
settingsStore.toggleWebSearch(agentWebSearch);
} else if (agent.is_builtin) {
// 如果是内置智能体且未配置网络搜索,不强制修改,保留当前用户设置
// 或者可以考虑恢复默认值,视需求而定
// 内置智能体未配置时保留当前用户设置
}
// 2. 同步模型
// 2. 同步模型(选中的对话模型随智能体切换,含共享智能体)
const agentModel = agent.config?.model_id;
if (agentModel) {
if (agentModel && agentModel.trim() !== '') {
selectedModelId.value = agentModel;
} else if (agent.is_builtin) {
// 如果是内置智能体且未配置特定模型,恢复为系统默认模型
// 这样可以确保从专用模型切换回普通模式时,模型也切回通用模型
} else {
if (conversationConfig.value?.summary_model_id) {
selectedModelId.value = conversationConfig.value.summary_model_id;
}
@@ -1672,6 +1791,7 @@ onBeforeRouteUpdate((to, from, next) => {
:visible="showAgentModeSelector"
:anchorEl="agentModeButtonRef"
:currentAgentId="selectedAgentId"
:agents="agents"
@close="closeAgentModeSelector"
@select="handleSelectAgent"
/>
@@ -1748,7 +1868,7 @@ onBeforeRouteUpdate((to, from, next) => {
@click.stop="toggleModelSelector"
>
<span class="model-selector-name">
{{ selectedModel?.name || $t('input.notConfigured') }}
{{ selectedModelDisplayName }}
</span>
<svg
width="12"
@@ -1893,33 +2013,15 @@ const getImgSrc = (url: string) => {
border: 1px solid transparent;
color: var(--td-text-color-primary, #333);
/* KB - Document (Greenish tint) */
&.kb-tag {
background: rgba(16, 185, 129, 0.08);
color: #059669;
.tag-icon {
color: #10b981;
}
}
/* KB - FAQ (Blueish tint) */
&.faq-tag {
background: rgba(0, 82, 217, 0.08);
color: #0052d9;
.tag-icon {
color: #0052d9;
}
}
/* File (Orange tint) */
/* 知识库 / 文件 - 无背景,与整体一致 */
&.kb-tag,
&.faq-tag,
&.file-tag {
background: rgba(237, 123, 47, 0.08);
color: #e65100;
background: transparent;
color: var(--td-text-color-primary, #333);
.tag-icon {
color: #ed7b2f;
color: var(--td-text-color-secondary, #666);
}
}
+20 -27
View File
@@ -18,19 +18,15 @@
@click="$emit('select', item)"
@mouseenter="$emit('update:activeIndex', index)"
>
<div class="icon-wrap" :class="{ 'has-org': item.orgName }">
<div class="icon-wrap">
<div class="icon" :class="item.kbType === 'faq' ? 'faq-icon' : 'kb-icon'">
<t-icon :name="item.kbType === 'faq' ? 'chat-bubble-help' : 'folder'" />
</div>
<span v-if="item.orgName" class="org-badge-wrap">
<img src="@/assets/img/organization-green.svg" class="org-badge" alt="" aria-hidden="true" />
</span>
</div>
<div class="item-main">
<span class="name">{{ item.name }}</span>
<span class="count">({{ item.count || 0 }})</span>
</div>
<span v-if="item.orgName" class="org-name">{{ item.orgName }}</span>
</div>
<template #content>
<div class="mention-detail-content">
@@ -90,16 +86,12 @@
@click="$emit('select', item)"
@mouseenter="$emit('update:activeIndex', kbItems.length + index)"
>
<div class="icon-wrap" :class="{ 'has-org': item.orgName }">
<div class="icon-wrap">
<div class="icon file-icon">
<t-icon name="file" />
</div>
<span v-if="item.orgName" class="org-badge-wrap">
<img src="@/assets/img/organization-grey.svg" class="org-badge" alt="" aria-hidden="true" />
</span>
</div>
<span class="name">{{ item.name }}</span>
<span v-if="item.kbName" class="kb-name">{{ item.kbName }}</span>
</div>
<template #content>
<div class="mention-detail-content">
@@ -158,6 +150,7 @@ import { useRouter } from 'vue-router';
import { getKnowledgeBaseById } from '@/api/knowledge-base';
import { getKnowledgeDetails } from '@/api/knowledge-base';
import { useOrganizationStore } from '@/stores/organization';
import { useSettingsStore } from '@/stores/settings';
type DetailState = { loading: boolean; error?: string; data?: any };
@@ -174,9 +167,17 @@ const emit = defineEmits(['select', 'update:activeIndex', 'loadMore']);
const router = useRouter();
const orgStore = useOrganizationStore();
const settingsStore = useSettingsStore();
const menuRef = ref<HTMLElement | null>(null);
const detailCache = ref<Record<string, DetailState>>({});
// 共享智能体上下文:用于请求知识库/知识详情时带 agent_id,后端据此校验权限
const agentIdForDetail = computed(() => {
const sourceTenantId = settingsStore.selectedAgentSourceTenantId;
const agentId = settingsStore.selectedAgentId;
return sourceTenantId && agentId ? agentId : undefined;
});
const kbItems = computed(() => props.items.filter(item => item.type === 'kb'));
const fileItems = computed(() => props.items.filter(item => item.type === 'file'));
@@ -184,7 +185,8 @@ async function fetchKbDetail(item: { id: string }) {
if (detailCache.value[item.id]?.data || detailCache.value[item.id]?.loading) return;
detailCache.value = { ...detailCache.value, [item.id]: { loading: true } };
try {
const res: any = await getKnowledgeBaseById(item.id);
const opts = agentIdForDetail.value ? { agent_id: agentIdForDetail.value } : undefined;
const res: any = await getKnowledgeBaseById(item.id, opts);
detailCache.value = { ...detailCache.value, [item.id]: { loading: false, data: res?.data ?? res } };
} catch (e: any) {
detailCache.value = { ...detailCache.value, [item.id]: { loading: false, error: e?.message || 'Failed to load' } };
@@ -195,7 +197,8 @@ async function fetchFileDetail(item: { id: string }) {
if (detailCache.value[item.id]?.data || detailCache.value[item.id]?.loading) return;
detailCache.value = { ...detailCache.value, [item.id]: { loading: true } };
try {
const res: any = await getKnowledgeDetails(item.id);
const opts = agentIdForDetail.value ? { agent_id: agentIdForDetail.value } : undefined;
const res: any = await getKnowledgeDetails(item.id, opts);
detailCache.value = { ...detailCache.value, [item.id]: { loading: false, data: res?.data ?? res } };
} catch (e: any) {
detailCache.value = { ...detailCache.value, [item.id]: { loading: false, error: e?.message || 'Failed to load' } };
@@ -365,22 +368,12 @@ const scrollToItem = (index: number) => {
object-fit: contain;
}
/* Document KB - Greenish */
.kb-icon {
background: rgba(16, 185, 129, 0.1);
color: #10b981;
}
/* FAQ KB - Blueish */
.faq-icon {
background: rgba(0, 82, 217, 0.1);
color: #0052d9;
}
/* File - Orange */
/* 知识库 / 文件 - 无背景,与整体一致 */
.kb-icon,
.faq-icon,
.file-icon {
background: rgba(237, 123, 47, 0.1);
color: #ed7b2f;
background: transparent;
color: var(--td-text-color-secondary, #666);
}
.mention-item.active .icon {
@@ -42,13 +42,17 @@
</t-tag>
</div>
<div class="org-option-meta">
<span class="org-meta-item">
<span class="org-meta-tag">
<t-icon name="user" class="org-meta-icon org-meta-icon-user" />
{{ org.member_count || 0 }} {{ $t('organization.members') }}
{{ org.member_count ?? 0 }}
</span>
<span v-if="org.share_count !== undefined" class="org-meta-item">
<span class="org-meta-tag">
<img src="@/assets/img/zhishiku.svg" class="org-meta-icon org-meta-icon-kb" alt="" aria-hidden="true" />
{{ org.share_count }} {{ $t('organization.share.sharedKBs') }}
{{ org.share_count ?? 0 }}
</span>
<span class="org-meta-tag">
<img src="@/assets/img/organization-grey.svg" class="org-meta-icon org-meta-icon-kb" alt="" aria-hidden="true" />
{{ org.agent_share_count ?? 0 }}
</span>
</div>
</div>
@@ -422,15 +426,18 @@ function handleGoToOrgSettings(orgId: string) {
.org-option-meta {
display: flex;
align-items: center;
gap: 12px;
gap: 6px;
font-family: "PingFang SC";
font-size: 12px;
color: var(--td-text-color-placeholder);
.org-meta-item {
display: flex;
.org-meta-tag {
display: inline-flex;
align-items: center;
gap: 3px;
padding: 0px 4px;
background: #f0f0f0;
border-radius: 4px;
}
.org-meta-icon {
@@ -440,14 +447,12 @@ function handleGoToOrgSettings(orgId: string) {
}
.org-meta-icon-user {
font-size: 14px;
margin-right: 2px;
font-size: 12px;
}
.org-meta-icon-kb {
width: 14px;
height: 14px;
margin-right: 2px;
width: 12px;
height: 12px;
opacity: 0.75;
}
}
+47 -1
View File
@@ -261,9 +261,39 @@ export default {
mcp: 'MCP Services Enabled',
multiTurn: 'Multi-turn Conversation',
},
tabs: {
all: 'All',
mine: 'My Agents',
sharedToMe: 'Shared to Me',
},
empty: {
title: 'No Custom Agents',
description: 'Click the button in the top right to create your first agent',
sharedTitle: 'No shared agents yet',
sharedDescription: 'You can join a space or ask others to share agents with you',
},
detail: {
title: 'Agent Details',
useInChat: 'Use in Chat',
},
shareScope: {
title: 'Share Scope',
desc: 'Space members have read-only access to this agent and will use it according to your current configuration; your changes to the agent will sync to shared spaces. To allow space members to edit knowledge base content, share the knowledge base to the space.',
knowledgeBase: 'Knowledge bases',
chatModel: 'Chat model',
rerankModel: 'Rerank model',
webSearch: 'Web search',
mcp: 'MCP services',
kbAll: 'All knowledge bases',
kbSelected: '{count} selected',
kbNone: 'None',
modelConfigured: 'Configured',
modelNotSet: 'Not set',
enabled: 'On',
disabled: 'Off',
mcpAll: 'All services',
mcpSelected: '{count} selected',
mcpNone: 'None',
},
delete: {
confirmTitle: 'Delete Agent',
@@ -400,6 +430,7 @@ export default {
addNew: 'Add New Agent',
current: 'Current',
goToSettings: 'Settings',
sharedLabel: 'Shared',
},
// Built-in agent information
builtinInfo: {
@@ -1011,6 +1042,7 @@ export default {
knowledgeBase: 'Knowledge Base',
knowledgeBaseWithCount: 'Knowledge Base ({count})',
notConfigured: 'Not configured',
sharedAgentModelLabel: 'Model from shared agent',
model: 'Model',
remote: 'Remote',
noModel: 'No available models',
@@ -2376,6 +2408,7 @@ export default {
preview: 'Preview & Join',
memberCount: '{count} members',
shareCount: '{count} shared knowledge bases',
agentShareCount: '{count} agents',
alreadyMember: 'You are already a member of this space',
invalidCode: 'Invalid invite code',
byInviteCode: 'Enter invite code',
@@ -2401,6 +2434,7 @@ export default {
previewFailed: 'Preview failed, please try again',
members: 'Members',
knowledgeBases: 'Knowledge Bases',
agents: 'Agents',
alreadyMember: 'You are already a member of this space',
confirmJoin: 'Confirm Join',
submitRequest: 'Request to Join',
@@ -2472,6 +2506,10 @@ export default {
sharedDesc: 'View all knowledge bases shared to this space',
noSharedKB: 'No shared knowledge bases yet',
noSharedKBTip: 'Knowledge base owners can share their knowledge bases to this space in KB settings',
sharedAgents: 'Shared Agents',
noSharedAgents: 'No shared agents yet',
sharedAgentsDesc: 'Agents shared to this space; members can use them in chat',
noSharedAgentsTip: 'Admins can share agents to this space from agent settings',
sharePermissionLabel: 'Space permission',
myPermissionLabel: 'My actual permission',
permissionCalcFormula: 'Space permission is what was set when the KB was shared to this space; my actual permission = min(space permission, my role in this space)',
@@ -2490,6 +2528,7 @@ export default {
remainingValidityExpired: 'Expired',
removeShareFromOrg: 'Remove from space',
removeShareConfirm: 'Remove "{name}" from this space? Members will no longer have access to this knowledge base.',
removeAgentShareConfirm: 'Remove "{name}" from this space? Members will no longer have access to this agent.',
removeShareSuccess: 'Removed from space',
removeShareFailed: 'Failed to remove, please try again',
requireApproval: 'Require Approval',
@@ -2587,13 +2626,20 @@ export default {
unshareSuccess: 'Share cancelled',
unshareFailed: 'Failed to cancel share',
sharedTo: 'Shared to',
noShares: 'This knowledge base has not been shared to any space',
noShares: 'Not shared to any space yet',
sharedKnowledgeBase: 'Shared Knowledge Base',
shareToSpace: 'Share to space',
shareModelToSpace: 'Share "{name}" to space',
shareAgentToSpace: 'Share "{name}" to space',
modelShareDesc: 'Share this model to a space so members can use it',
agentShareDesc: 'Share this agent to a space so members can use it',
spaceAgentShareCountTip: 'Number of agents shared to this space',
sharedFrom: 'From',
sharedBadge: 'Shared',
permissionReadonly: 'Read-only',
permissionEditable: 'Editable',
sharedKBs: ' knowledge bases',
sharedAgents: ' agents',
},
},
}
+1
View File
@@ -1557,6 +1557,7 @@ export default {
knowledgeBase: "지식베이스",
knowledgeBaseWithCount: "지식베이스({count})",
notConfigured: "구성되지 않음",
sharedAgentModelLabel: "공유 에이전트에 구성된 모델",
model: "모델",
remote: "원격",
noModel: "사용 가능한 모델 없음",
+1
View File
@@ -1801,6 +1801,7 @@ export default {
knowledgeBase: 'База знаний',
knowledgeBaseWithCount: 'База знаний ({count})',
notConfigured: 'Не настроено',
sharedAgentModelLabel: 'Модель из общего агента',
model: 'Модель',
remote: 'Удалённая',
noModel: 'Нет доступных моделей',
+49 -3
View File
@@ -799,9 +799,39 @@ export default {
mcp: "支持MCP服务",
multiTurn: "多轮对话",
},
tabs: {
all: "全部",
mine: "我的智能体",
sharedToMe: "共享给我",
},
empty: {
title: "暂无自定义智能体",
description: "点击右上角按钮创建您的第一个智能体",
sharedTitle: "暂无共享智能体",
sharedDescription: "您可以加入空间或请求他人将智能体共享给您",
},
detail: {
title: "智能体详情",
useInChat: "在对话中使用",
},
shareScope: {
title: "共享范围说明",
desc: "空间成员以只读方式使用该智能体,将遵循您当前配置的能力与资源;您对智能体的修改会同步给已共享的空间。如需允许空间成员编辑知识库内容,请将知识库共享到空间。",
knowledgeBase: "知识库",
chatModel: "对话模型",
rerankModel: "重排模型",
webSearch: "网络搜索",
mcp: "MCP 服务",
kbAll: "全部知识库",
kbSelected: "指定 {count} 个知识库",
kbNone: "不使用",
modelConfigured: "已配置",
modelNotSet: "未配置",
enabled: "开启",
disabled: "关闭",
mcpAll: "全部服务",
mcpSelected: "指定 {count} 个服务",
mcpNone: "不使用",
},
delete: {
confirmTitle: "删除智能体",
@@ -938,6 +968,7 @@ export default {
addNew: "添加新智能体",
current: "当前",
goToSettings: "设置",
sharedLabel: "共享",
},
// 内置智能体信息
builtinInfo: {
@@ -1820,6 +1851,7 @@ export default {
knowledgeBase: "知识库",
knowledgeBaseWithCount: "知识库({count})",
notConfigured: "未配置",
sharedAgentModelLabel: "共享智能体配置的模型",
model: "模型",
remote: "远程",
noModel: "暂无可用模型",
@@ -2381,6 +2413,7 @@ export default {
preview: "预览并加入",
memberCount: "{count} 名成员",
shareCount: "{count} 个共享知识库",
agentShareCount: "{count} 个智能体",
alreadyMember: "您已经是该空间的成员",
invalidCode: "无效的邀请码",
byInviteCode: "输入邀请码",
@@ -2406,6 +2439,7 @@ export default {
previewFailed: "预览失败,请稍后重试",
members: "成员",
knowledgeBases: "知识库",
agents: "智能体",
alreadyMember: "您已经是该空间的成员",
confirmJoin: "确认加入",
submitRequest: "申请加入",
@@ -2477,6 +2511,10 @@ export default {
sharedDesc: "查看共享到此空间的所有知识库",
noSharedKB: "暂无共享的知识库",
noSharedKBTip: "知识库拥有者可以在知识库设置中将其共享到此空间",
sharedAgents: "共享智能体",
noSharedAgents: "暂无共享的智能体",
sharedAgentsDesc: "已共享到本空间的智能体,成员可在对话中使用",
noSharedAgentsTip: "管理员可将智能体从智能体设置中共享到本空间",
sharePermissionLabel: "空间权限",
myPermissionLabel: "我的实际权限",
permissionCalcFormula: "空间权限为共享时给该空间设定的权限;我的实际权限 = min(空间权限, 我在本空间的角色)",
@@ -2495,6 +2533,7 @@ export default {
remainingValidityExpired: "已过期",
removeShareFromOrg: "从空间中移除",
removeShareConfirm: "确定将「{name}」从本空间中移除?移除后空间成员将无法再访问该知识库。",
removeAgentShareConfirm: "确定将「{name}」从本空间中移除?移除后空间成员将无法再访问该智能体。",
removeShareSuccess: "已从空间中移除",
removeShareFailed: "移除失败,请重试",
requireApproval: "需要审核",
@@ -2582,23 +2621,30 @@ export default {
},
},
share: {
title: "共享知识库",
title: "共享到空间",
shareToSpace: "共享到空间",
shareModelToSpace: "共享「{name}」到空间",
shareAgentToSpace: "共享「{name}」到空间",
modelShareDesc: "将模型共享到空间,空间成员可使用该模型",
agentShareDesc: "将智能体共享到空间,空间成员可使用该智能体",
spaceAgentShareCountTip: "该空间的共享智能体数量",
selectOrg: "选择空间",
selectOrgPlaceholder: "请选择要共享的空间",
permission: "权限",
permissionTip: "可编辑权限允许成员修改知识库内容,只读权限仅允许检索和问答",
shareSuccess: "知识库已共享",
shareSuccess: "已共享",
shareFailed: "共享失败",
unshareSuccess: "已取消共享",
unshareFailed: "取消共享失败",
sharedTo: "已共享到",
noShares: "该知识库尚未共享到任何空间",
noShares: "尚未共享到任何空间",
sharedKnowledgeBase: "共享知识库",
sharedFrom: "来自",
sharedBadge: "共享",
permissionReadonly: "只读",
permissionEditable: "可编辑",
sharedKBs: "个知识库",
sharedAgents: "个智能体",
},
},
};
+23 -1
View File
@@ -4,6 +4,7 @@ import type {
Organization,
OrganizationMember,
SharedKnowledgeBase,
SharedAgentInfo,
OrganizationPreview
} from '@/api/organization'
import {
@@ -18,7 +19,8 @@ import {
listMembers,
updateMemberRole,
removeMember,
listSharedKnowledgeBases
listSharedKnowledgeBases,
listSharedAgents
} from '@/api/organization'
export const useOrganizationStore = defineStore('organization', () => {
@@ -27,6 +29,7 @@ export const useOrganizationStore = defineStore('organization', () => {
const currentOrganization = ref<Organization | null>(null)
const currentMembers = ref<OrganizationMember[]>([])
const sharedKnowledgeBases = ref<SharedKnowledgeBase[]>([])
const sharedAgents = ref<SharedAgentInfo[]>([])
const previewData = ref<OrganizationPreview | null>(null)
const loading = ref(false)
const error = ref<string | null>(null)
@@ -349,6 +352,22 @@ export const useOrganizationStore = defineStore('organization', () => {
}
}
/**
* Fetch shared agents (shared to me through organizations)
*/
async function fetchSharedAgents() {
try {
const response = await listSharedAgents()
if (response.success && response.data) {
sharedAgents.value = response.data.filter(s => s.agent != null)
return sharedAgents.value
}
return []
} catch (e: any) {
return []
}
}
/**
* Set current organization for detail view
*/
@@ -393,6 +412,7 @@ export const useOrganizationStore = defineStore('organization', () => {
currentOrganization.value = null
currentMembers.value = []
sharedKnowledgeBases.value = []
sharedAgents.value = []
previewData.value = null
error.value = null
}
@@ -403,6 +423,7 @@ export const useOrganizationStore = defineStore('organization', () => {
currentOrganization,
currentMembers,
sharedKnowledgeBases,
sharedAgents,
previewData,
loading,
error,
@@ -426,6 +447,7 @@ export const useOrganizationStore = defineStore('organization', () => {
changeMemberRole,
kickMember,
fetchSharedKnowledgeBases,
fetchSharedAgents,
setCurrentOrganization,
getKBPermission,
canEditKB,
+23 -3
View File
@@ -10,11 +10,13 @@ interface Settings {
agentConfig: AgentConfig;
selectedKnowledgeBases: string[]; // 当前选中的知识库ID列表
selectedFiles: string[]; // 当前选中的文件ID列表
selectedFileKbMap: Record<string, string>; // 文件ID -> 知识库ID,用于刷新后带 kb_id 拉取共享知识库文件
modelConfig: ModelConfig; // 模型配置
ollamaConfig: OllamaConfig; // Ollama配置
webSearchEnabled: boolean; // 网络搜索是否启用
conversationModels: ConversationModels;
selectedAgentId: string; // 当前选中的智能体ID
selectedAgentSourceTenantId: string | null; // 当使用共享智能体时,来源租户 ID(用于后端 model/KB/MCP 解析)
}
// Agent 配置接口
@@ -72,6 +74,7 @@ const defaultSettings: Settings = {
},
selectedKnowledgeBases: [], // 默认为空数组
selectedFiles: [], // 默认为空数组
selectedFileKbMap: {}, // 文件ID -> 知识库ID
modelConfig: {
chatModels: [],
embeddingModels: [],
@@ -89,6 +92,7 @@ const defaultSettings: Settings = {
selectedChatModelId: "", // 用户当前选择的对话模型ID
},
selectedAgentId: BUILTIN_QUICK_ANSWER_ID, // 默认选中快速问答模式
selectedAgentSourceTenantId: null as string | null, // 共享智能体来源租户 ID
};
export const useSettingsStore = defineStore("settings", {
@@ -136,6 +140,8 @@ export const useSettingsStore = defineStore("settings", {
// 当前选中的智能体ID
selectedAgentId: (state) => state.settings.selectedAgentId || BUILTIN_QUICK_ANSWER_ID,
// 共享智能体来源租户 ID(可选)
selectedAgentSourceTenantId: (state) => state.settings.selectedAgentSourceTenantId ?? null,
},
actions: {
@@ -302,11 +308,24 @@ export const useSettingsStore = defineStore("settings", {
removeFile(fileId: string) {
if (!this.settings.selectedFiles) return;
this.settings.selectedFiles = this.settings.selectedFiles.filter((id: string) => id !== fileId);
if (this.settings.selectedFileKbMap) delete this.settings.selectedFileKbMap[fileId];
localStorage.setItem("WeKnora_settings", JSON.stringify(this.settings));
},
clearFiles() {
this.settings.selectedFiles = [];
this.settings.selectedFileKbMap = {};
localStorage.setItem("WeKnora_settings", JSON.stringify(this.settings));
},
setFileKbMap(updates: Record<string, string>) {
if (!this.settings.selectedFileKbMap) this.settings.selectedFileKbMap = {};
Object.assign(this.settings.selectedFileKbMap, updates);
localStorage.setItem("WeKnora_settings", JSON.stringify(this.settings));
},
removeFileKbId(fileId: string) {
if (this.settings.selectedFileKbMap) delete this.settings.selectedFileKbMap[fileId];
localStorage.setItem("WeKnora_settings", JSON.stringify(this.settings));
},
@@ -314,9 +333,10 @@ export const useSettingsStore = defineStore("settings", {
return this.settings.selectedFiles || [];
},
// 选择智能体
selectAgent(agentId: string) {
// 选择智能体(sourceTenantId 仅在使用共享智能体时传入)
selectAgent(agentId: string, sourceTenantId?: string | null) {
this.settings.selectedAgentId = agentId;
this.settings.selectedAgentSourceTenantId = (sourceTenantId != null && sourceTenantId !== "") ? sourceTenantId : null;
// 根据智能体类型自动切换 Agent 模式
if (agentId === BUILTIN_QUICK_ANSWER_ID) {
this.settings.isAgentEnabled = false;
@@ -329,7 +349,7 @@ export const useSettingsStore = defineStore("settings", {
// 因为不同智能体关联的知识库不同,需要清空用户之前的选择
this.settings.selectedKnowledgeBases = [];
this.settings.selectedFiles = [];
this.settings.selectedFileKbMap = {};
localStorage.setItem("WeKnora_settings", JSON.stringify(this.settings));
},
@@ -1017,6 +1017,11 @@
</template>
</div>
</div>
<!-- 共享管理(仅编辑模式且非内置智能体) -->
<div v-if="props.mode === 'edit' && props.agent?.id && !props.agent?.is_builtin" v-show="currentSection === 'share'" class="section">
<AgentShareSettings :agent-id="props.agent.id" :agent="props.agent" />
</div>
</div>
<!-- 底部操作栏 -->
@@ -1046,6 +1051,7 @@ import { useUIStore } from '@/stores/ui';
import AgentAvatar from '@/components/AgentAvatar.vue';
import PromptTemplateSelector from '@/components/PromptTemplateSelector.vue';
import ModelSelector from '@/components/ModelSelector.vue';
import AgentShareSettings from '@/components/AgentShareSettings.vue';
const uiStore = useUIStore();
@@ -1252,6 +1258,10 @@ const navItems = computed(() => {
if (!isAgentMode.value) {
items.push({ key: 'conversation', icon: 'chat', label: t('agent.editor.conversationSettings') || '多轮对话' });
}
// 共享管理(仅编辑模式且非内置智能体)
if (props.mode === 'edit' && props.agent?.id && !props.agent?.is_builtin) {
items.push({ key: 'share', icon: 'share', label: t('knowledgeEditor.sidebar.share') || '共享管理' });
}
return items;
});
+614 -40
View File
@@ -21,10 +21,142 @@
</t-button>
</div>
</div>
<!-- Tab 切换 -->
<div class="agent-tabs">
<div
class="tab-item"
:class="{ 'active': activeTab === 'all' }"
@click="activeTab = 'all'"
>
{{ $t('agent.tabs.all') }} ({{ allAgentsCount }})
</div>
<div
class="tab-item"
:class="{ 'active': activeTab === 'mine' }"
@click="activeTab = 'mine'"
>
{{ $t('agent.tabs.mine') }} ({{ agents.length }})
</div>
<div
class="tab-item"
:class="{ 'active': activeTab === 'shared' }"
@click="activeTab = 'shared'"
>
{{ $t('agent.tabs.sharedToMe') }} ({{ sharedAgents.length }})
</div>
</div>
<div class="header-divider"></div>
<!-- 卡片网格 -->
<div v-if="agents.length > 0" class="agent-card-wrap">
<!-- 全部:我的 + 共享 -->
<div v-if="activeTab === 'all' && filteredAgents.length > 0" class="agent-card-wrap">
<div
v-for="agent in filteredAgents"
:key="agent.isMine ? agent.id : `shared-${agent.share_id}`"
class="agent-card"
:class="{
'is-builtin': agent.is_builtin,
'agent-mode-normal': agent.config?.agent_mode === 'quick-answer',
'agent-mode-agent': agent.config?.agent_mode === 'smart-reasoning',
'shared-agent-card': !agent.isMine
}"
@click="handleCardClick(agent)"
>
<!-- 装饰星星 -->
<div class="card-decoration">
<svg class="star-icon" width="24" height="24" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10 3L10.8 6.2C10.9 6.7 11.3 7.1 11.8 7.2L15 8L11.8 8.8C11.3 8.9 10.9 9.3 10.8 9.8L10 13L9.2 9.8C9.1 9.3 8.7 8.9 8.2 8.8L5 8L8.2 7.2C8.7 7.1 9.1 6.7 9.2 6.2L10 3Z" stroke="currentColor" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" fill="currentColor" fill-opacity="0.15"/>
</svg>
<svg class="star-icon small" width="14" height="14" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10 3L10.8 6.2C10.9 6.7 11.3 7.1 11.8 7.2L15 8L11.8 8.8C11.3 8.9 10.9 9.3 10.8 9.8L10 13L9.2 9.8C9.1 9.3 8.7 8.9 8.2 8.8L5 8L8.2 7.2C8.7 7.1 9.1 6.7 9.2 6.2L10 3Z" stroke="currentColor" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" fill="currentColor" fill-opacity="0.15"/>
</svg>
</div>
<div class="card-header">
<div class="card-header-left">
<div v-if="agent.is_builtin" class="builtin-avatar" :class="agent.config?.agent_mode === 'smart-reasoning' ? 'agent' : 'normal'">
<t-icon :name="agent.config?.agent_mode === 'smart-reasoning' ? 'control-platform' : 'chat'" size="18px" />
</div>
<div v-else-if="agent.avatar" class="builtin-avatar agent-emoji">{{ agent.avatar }}</div>
<AgentAvatar v-else :name="agent.name" size="medium" />
<span class="card-title" :title="agent.name">{{ agent.name }}</span>
</div>
<t-popup
v-if="agent.isMine"
:visible="openMoreAgentId === agent.id"
trigger="hover"
overlayClassName="card-more-popup"
destroy-on-close
placement="bottom-right"
@visible-change="onVisibleChange"
@update:visible="(v: boolean) => { if (!v) openMoreAgentId = null }"
>
<div class="more-wrap" :class="{ 'active-more': openMoreAgentId === agent.id }" @click="toggleMore($event, agent.id)">
<img class="more-icon" src="@/assets/img/more.png" alt="" />
</div>
<template #content>
<div class="popup-menu">
<div class="popup-menu-item" @click="handleEdit(agent)"><t-icon class="menu-icon" name="edit" /><span>{{ $t('common.edit') }}</span></div>
<div class="popup-menu-item" @click="handleCopy(agent)"><t-icon class="menu-icon" name="file-copy" /><span>{{ $t('common.copy') }}</span></div>
<div v-if="!agent.is_builtin" class="popup-menu-item delete" @click="handleDelete(agent)"><t-icon class="menu-icon" name="delete" /><span>{{ $t('common.delete') }}</span></div>
</div>
</template>
</t-popup>
</div>
<div class="card-content">
<div class="card-description">{{ agent.description || $t('agent.noDescription') }}</div>
</div>
<div class="card-bottom">
<div class="bottom-left">
<div class="feature-badges">
<t-tooltip :content="agent.config?.agent_mode === 'smart-reasoning' ? $t('agent.mode.agent') : $t('agent.mode.normal')" placement="top">
<div class="feature-badge" :class="{ 'mode-normal': agent.config?.agent_mode === 'quick-answer', 'mode-agent': agent.config?.agent_mode === 'smart-reasoning' }">
<t-icon :name="agent.config?.agent_mode === 'smart-reasoning' ? 'control-platform' : 'chat'" size="14px" />
</div>
</t-tooltip>
<t-tooltip v-if="agent.config?.web_search_enabled" :content="$t('agent.features.webSearch')" placement="top">
<div class="feature-badge web-search">
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="8" cy="8" r="6" stroke="currentColor" stroke-width="1.2" fill="none"/>
<ellipse cx="8" cy="8" rx="2.5" ry="6" stroke="currentColor" stroke-width="1.2" fill="none"/>
<line x1="2" y1="6" x2="14" y2="6" stroke="currentColor" stroke-width="1.2"/>
<line x1="2" y1="10" x2="14" y2="10" stroke="currentColor" stroke-width="1.2"/>
</svg>
</div>
</t-tooltip>
<t-tooltip v-if="agent.config?.knowledge_bases?.length || agent.config?.kb_selection_mode === 'all'" :content="$t('agent.features.knowledgeBase')" placement="top">
<div class="feature-badge knowledge">
<t-icon name="folder" size="16px" />
</div>
</t-tooltip>
<t-tooltip v-if="agent.config?.mcp_services?.length || agent.config?.mcp_selection_mode === 'all'" :content="$t('agent.features.mcp')" placement="top">
<div class="feature-badge mcp">
<t-icon name="extension" size="16px" />
</div>
</t-tooltip>
<t-tooltip v-if="agent.config?.multi_turn_enabled" :content="$t('agent.features.multiTurn')" placement="top">
<div class="feature-badge multi-turn">
<t-icon name="chat-bubble" size="16px" />
</div>
</t-tooltip>
</div>
</div>
<!-- 右下角:内置 / 自定义 / 空间图标+名称 -->
<div v-if="!agent.isMine" class="card-bottom-source">
<img src="@/assets/img/organization-green.svg" class="org-icon" alt="" aria-hidden="true" />
<span class="org-source-text">{{ agent.org_name }}</span>
</div>
<div v-else-if="agent.is_builtin" class="builtin-badge">
<t-icon name="lock-on" size="12px" />
<span>{{ $t('agent.builtin') }}</span>
</div>
<div v-else class="custom-badge">
<span>{{ $t('agent.type.custom') }}</span>
</div>
</div>
</div>
</div>
<!-- 我的智能体 -->
<div v-if="activeTab === 'mine' && agents.length > 0" class="agent-card-wrap">
<div
v-for="agent in agents"
:key="agent.id"
@@ -53,22 +185,23 @@
<div v-if="agent.is_builtin" class="builtin-avatar" :class="agent.config?.agent_mode === 'smart-reasoning' ? 'agent' : 'normal'">
<t-icon :name="agent.config?.agent_mode === 'smart-reasoning' ? 'control-platform' : 'chat'" size="18px" />
</div>
<!-- 自定义智能体使用 AgentAvatar -->
<div v-else-if="agent.avatar" class="builtin-avatar agent-emoji">{{ agent.avatar }}</div>
<AgentAvatar v-else :name="agent.name" size="medium" />
<span class="card-title" :title="agent.name">{{ agent.name }}</span>
</div>
<t-popup
v-model="agent.showMore"
<t-popup
:visible="openMoreAgentId === agent.id"
trigger="hover"
overlayClassName="card-more-popup"
:on-visible-change="(visible: boolean) => onVisibleChange(visible, agent)"
trigger="click"
destroy-on-close
destroy-on-close
placement="bottom-right"
@visible-change="onVisibleChange"
@update:visible="(v: boolean) => { if (!v) openMoreAgentId = null }"
>
<div
class="more-wrap"
@click.stop
:class="{ 'active-more': agent.showMore }"
<div
class="more-wrap"
:class="{ 'active-more': openMoreAgentId === agent.id }"
@click="toggleMore($event, agent.id)"
>
<img class="more-icon" src="@/assets/img/more.png" alt="" />
</div>
@@ -134,21 +267,97 @@
</t-tooltip>
</div>
</div>
<!-- 右下角:内置 / 自定义 -->
<div v-if="agent.is_builtin" class="builtin-badge">
<t-icon name="lock-on" size="12px" />
<span>{{ $t('agent.builtin') }}</span>
</div>
<span v-else-if="agent.updated_at" class="card-time">{{ formatDate(agent.updated_at) }}</span>
<div v-else class="custom-badge">
<span>{{ $t('agent.type.custom') }}</span>
</div>
</div>
</div>
</div>
<!-- 空状态 -->
<div v-else-if="!loading" class="empty-state">
<!-- 共享给我的智能体 -->
<div v-if="activeTab === 'shared' && sharedAgents.length > 0" class="agent-card-wrap">
<div
v-for="shared in sharedAgents"
:key="'shared-' + shared.share_id"
class="agent-card shared-agent-card"
:class="{
'agent-mode-normal': shared.agent?.config?.agent_mode === 'quick-answer',
'agent-mode-agent': shared.agent?.config?.agent_mode === 'smart-reasoning'
}"
@click="openSharedAgentDetail(shared)"
>
<div class="card-decoration">
<svg class="star-icon" width="24" height="24" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10 3L10.8 6.2C10.9 6.7 11.3 7.1 11.8 7.2L15 8L11.8 8.8C11.3 8.9 10.9 9.3 10.8 9.8L10 13L9.2 9.8C9.1 9.3 8.7 8.9 8.2 8.8L5 8L8.2 7.2C8.7 7.1 9.1 6.7 9.2 6.2L10 3Z" stroke="currentColor" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" fill="currentColor" fill-opacity="0.15"/>
</svg>
<svg class="star-icon small" width="14" height="14" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M10 3L10.8 6.2C10.9 6.7 11.3 7.1 11.8 7.2L15 8L11.8 8.8C11.3 8.9 10.9 9.3 10.8 9.8L10 13L9.2 9.8C9.1 9.3 8.7 8.9 8.2 8.8L5 8L8.2 7.2C8.7 7.1 9.1 6.7 9.2 6.2L10 3Z" stroke="currentColor" stroke-width="0.8" stroke-linecap="round" stroke-linejoin="round" fill="currentColor" fill-opacity="0.15"/>
</svg>
</div>
<div class="card-header">
<div class="card-header-left">
<div v-if="shared.agent?.avatar" class="builtin-avatar agent-emoji">{{ shared.agent.avatar }}</div>
<AgentAvatar v-else :name="shared.agent?.name" size="medium" />
<span class="card-title" :title="shared.agent?.name">{{ shared.agent?.name }}</span>
</div>
</div>
<div class="card-content">
<div class="card-description">{{ shared.agent?.description || $t('agent.noDescription') }}</div>
</div>
<div class="card-bottom">
<div class="bottom-left">
<div class="feature-badges">
<t-tooltip :content="shared.agent?.config?.agent_mode === 'smart-reasoning' ? $t('agent.mode.agent') : $t('agent.mode.normal')" placement="top">
<div class="feature-badge" :class="{ 'mode-normal': shared.agent?.config?.agent_mode === 'quick-answer', 'mode-agent': shared.agent?.config?.agent_mode === 'smart-reasoning' }">
<t-icon :name="shared.agent?.config?.agent_mode === 'smart-reasoning' ? 'control-platform' : 'chat'" size="14px" />
</div>
</t-tooltip>
<t-tooltip v-if="shared.agent?.config?.web_search_enabled" :content="$t('agent.features.webSearch')" placement="top">
<div class="feature-badge web-search"><svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" r="6" stroke="currentColor" stroke-width="1.2" fill="none"/><ellipse cx="8" cy="8" rx="2.5" ry="6" stroke="currentColor" stroke-width="1.2" fill="none"/><line x1="2" y1="6" x2="14" y2="6" stroke="currentColor" stroke-width="1.2"/><line x1="2" y1="10" x2="14" y2="10" stroke="currentColor" stroke-width="1.2"/></svg></div>
</t-tooltip>
<t-tooltip v-if="shared.agent?.config?.knowledge_bases?.length || shared.agent?.config?.kb_selection_mode === 'all'" :content="$t('agent.features.knowledgeBase')" placement="top">
<div class="feature-badge knowledge"><t-icon name="folder" size="16px" /></div>
</t-tooltip>
<t-tooltip v-if="shared.agent?.config?.mcp_services?.length || shared.agent?.config?.mcp_selection_mode === 'all'" :content="$t('agent.features.mcp')" placement="top">
<div class="feature-badge mcp"><t-icon name="extension" size="16px" /></div>
</t-tooltip>
<t-tooltip v-if="shared.agent?.config?.multi_turn_enabled" :content="$t('agent.features.multiTurn')" placement="top">
<div class="feature-badge multi-turn"><t-icon name="chat-bubble" size="16px" /></div>
</t-tooltip>
</div>
</div>
<!-- 右下角:空间图标+名称 -->
<div class="card-bottom-source">
<img src="@/assets/img/organization-green.svg" class="org-icon" alt="" aria-hidden="true" />
<span class="org-source-text">{{ shared.org_name }}</span>
</div>
</div>
</div>
</div>
<!-- 空状态:全部 -->
<div v-if="activeTab === 'all' && filteredAgents.length === 0 && !loading" class="empty-state">
<img class="empty-img" src="@/assets/img/upload.svg" alt="">
<span class="empty-txt">{{ $t('agent.empty.title') }}</span>
<span class="empty-desc">{{ $t('agent.empty.description') }}</span>
</div>
<!-- 空状态:我的 -->
<div v-if="activeTab === 'mine' && agents.length === 0 && !loading" class="empty-state">
<img class="empty-img" src="@/assets/img/upload.svg" alt="">
<span class="empty-txt">{{ $t('agent.empty.title') }}</span>
<span class="empty-desc">{{ $t('agent.empty.description') }}</span>
</div>
<!-- 空状态:共享给我 -->
<div v-if="activeTab === 'shared' && sharedAgents.length === 0 && !loading" class="empty-state">
<img class="empty-img" src="@/assets/img/upload.svg" alt="">
<span class="empty-txt">{{ $t('agent.empty.sharedTitle') }}</span>
<span class="empty-desc">{{ $t('agent.empty.sharedDescription') }}</span>
</div>
<!-- 删除确认对话框 -->
<t-dialog
@@ -173,6 +382,66 @@
</div>
</t-dialog>
<!-- 共享智能体详情侧边栏 -->
<Transition name="shared-detail-drawer">
<div v-if="sharedDetailVisible && currentSharedAgent" class="shared-detail-drawer-overlay" @click.self="closeSharedAgentDetail">
<div class="shared-detail-drawer">
<div class="shared-detail-drawer-header">
<h3 class="shared-detail-drawer-title">{{ $t('agent.detail.title') || '智能体详情' }}</h3>
<button type="button" class="shared-detail-drawer-close" @click="closeSharedAgentDetail" :aria-label="$t('general.close')">
<t-icon name="close" />
</button>
</div>
<div class="shared-detail-drawer-body">
<div class="shared-detail-row">
<span class="shared-detail-label">{{ $t('agent.editor.name') || '名称' }}</span>
<span class="shared-detail-value">{{ currentSharedAgent.agent?.name }}</span>
</div>
<div class="shared-detail-row">
<span class="shared-detail-label">{{ $t('knowledgeList.detail.sourceOrg') || '来源空间' }}</span>
<span class="shared-detail-value shared-detail-org">
<img src="@/assets/img/organization-green.svg" class="shared-detail-org-icon" alt="" aria-hidden="true" />
<span>{{ currentSharedAgent.org_name }}</span>
</span>
</div>
<div class="shared-detail-row">
<span class="shared-detail-label">{{ $t('knowledgeList.detail.myPermission') || '我的权限' }}</span>
<span class="shared-detail-value">{{ $t('organization.share.permissionReadonly') }}</span>
</div>
<!-- 能力范围(与共享范围说明一致) -->
<template v-if="currentSharedAgent.agent?.config">
<div class="shared-detail-section-title">{{ $t('agent.shareScope.title') }}</div>
<div class="shared-detail-row">
<span class="shared-detail-label">{{ $t('agent.shareScope.knowledgeBase') }}</span>
<span class="shared-detail-value">{{ sharedAgentKbScopeText }}</span>
</div>
<div class="shared-detail-row">
<span class="shared-detail-label">{{ $t('agent.shareScope.chatModel') }}</span>
<span class="shared-detail-value">{{ currentSharedAgent.agent.config.model_id ? $t('agent.shareScope.modelConfigured') : $t('agent.shareScope.modelNotSet') }}</span>
</div>
<div v-if="sharedAgentUsesKb" class="shared-detail-row">
<span class="shared-detail-label">{{ $t('agent.shareScope.rerankModel') }}</span>
<span class="shared-detail-value">{{ currentSharedAgent.agent.config.rerank_model_id ? $t('agent.shareScope.modelConfigured') : $t('agent.shareScope.modelNotSet') }}</span>
</div>
<div class="shared-detail-row">
<span class="shared-detail-label">{{ $t('agent.shareScope.webSearch') }}</span>
<span class="shared-detail-value">{{ currentSharedAgent.agent.config.web_search_enabled ? $t('agent.shareScope.enabled') : $t('agent.shareScope.disabled') }}</span>
</div>
<div class="shared-detail-row">
<span class="shared-detail-label">{{ $t('agent.shareScope.mcp') }}</span>
<span class="shared-detail-value">{{ sharedAgentMcpScopeText }}</span>
</div>
</template>
</div>
<div class="shared-detail-drawer-footer">
<t-button theme="primary" block @click="handleUseSharedAgentInChat(currentSharedAgent)">
{{ $t('agent.detail.useInChat') || '在对话中使用' }}
</t-button>
</div>
</div>
</div>
</Transition>
<!-- 智能体编辑器弹窗 -->
<AgentEditorModal
:visible="editorVisible"
@@ -186,45 +455,94 @@
</template>
<script setup lang="ts">
import { onMounted, onUnmounted, ref } from 'vue'
import { computed, onMounted, onUnmounted, ref } from 'vue'
import { useRoute, useRouter } from 'vue-router'
import { MessagePlugin, Icon as TIcon } from 'tdesign-vue-next'
import { listAgents, deleteAgent, copyAgent, type CustomAgent } from '@/api/agent'
import { formatStringDate } from '@/utils/index'
import { useI18n } from 'vue-i18n'
import { createSessions } from '@/api/chat/index'
import { useOrganizationStore } from '@/stores/organization'
import { useSettingsStore } from '@/stores/settings'
import { useMenuStore } from '@/stores/menu'
import type { SharedAgentInfo } from '@/api/organization'
import AgentEditorModal from './AgentEditorModal.vue'
import AgentAvatar from '@/components/AgentAvatar.vue'
const { t } = useI18n()
const route = useRoute()
const router = useRouter()
const orgStore = useOrganizationStore()
interface AgentWithUI extends CustomAgent {
showMore?: boolean
}
/** Merged agent for "all" tab: my agents (isMine: true) or shared (isMine: false, org_name, source_tenant_id, share_id) */
type DisplayAgent = (AgentWithUI & { isMine: true }) | (CustomAgent & { isMine: false; org_name: string; source_tenant_id: number; share_id: string; showMore?: boolean })
const activeTab = ref<'all' | 'mine' | 'shared'>('all')
const agents = ref<AgentWithUI[]>([])
const sharedAgents = computed<SharedAgentInfo[]>(() => orgStore.sharedAgents || [])
const allAgentsCount = computed(() => agents.value.length + sharedAgents.value.length)
const filteredAgents = computed<DisplayAgent[]>(() => {
if (activeTab.value !== 'all') return []
const list: DisplayAgent[] = []
agents.value.forEach(a => list.push({ ...a, isMine: true as const }))
sharedAgents.value.forEach(shared => {
if (!shared.agent) return
list.push({
...shared.agent,
isMine: false as const,
org_name: shared.org_name,
source_tenant_id: shared.source_tenant_id,
share_id: shared.share_id,
showMore: false
} as DisplayAgent)
})
return list
})
const loading = ref(false)
const deleteVisible = ref(false)
const deletingAgent = ref<AgentWithUI | null>(null)
const sharedDetailVisible = ref(false)
const currentSharedAgent = ref<SharedAgentInfo | null>(null)
const sharedAgentUsesKb = computed(() => {
const c = currentSharedAgent.value?.agent?.config
if (!c) return false
return c.kb_selection_mode !== 'none' && c.kb_selection_mode !== undefined
})
const sharedAgentKbScopeText = computed(() => {
const c = currentSharedAgent.value?.agent?.config
if (!c) return t('agent.shareScope.kbNone')
if (c.kb_selection_mode === 'all') return t('agent.shareScope.kbAll')
if (c.kb_selection_mode === 'selected' && c.knowledge_bases?.length) return t('agent.shareScope.kbSelected', { count: c.knowledge_bases.length })
return t('agent.shareScope.kbNone')
})
const sharedAgentMcpScopeText = computed(() => {
const c = currentSharedAgent.value?.agent?.config
if (!c) return t('agent.shareScope.mcpNone')
if (c.mcp_selection_mode === 'all') return t('agent.shareScope.mcpAll')
if (c.mcp_selection_mode === 'selected' && c.mcp_services?.length) return t('agent.shareScope.mcpSelected', { count: c.mcp_services.length })
return t('agent.shareScope.mcpNone')
})
const editorVisible = ref(false)
const editorMode = ref<'create' | 'edit'>('create')
const editingAgent = ref<CustomAgent | null>(null)
const editorInitialSection = ref<string>('basic')
/** 当前打开三点菜单的卡片 agent.id(用于受控弹出层,避免 computed 项无持久引用导致菜单不响应) */
const openMoreAgentId = ref<string | null>(null)
const fetchList = () => {
loading.value = true
return listAgents().then((res: any) => {
const data = res.data || []
// 显示所有智能体(包括内置智能体)
agents.value = data.map((agent: CustomAgent) => ({
...agent,
showMore: false
}))
// 检查 URL 中是否有 edit 参数,如果有则打开对应智能体的编辑模态框
checkAndOpenEditModal()
}).finally(() => loading.value = false)
return Promise.all([
listAgents().then((res: any) => {
const data = res.data || []
agents.value = data.map((agent: CustomAgent) => ({ ...agent, showMore: false }))
checkAndOpenEditModal()
}),
orgStore.fetchSharedAgents()
]).finally(() => loading.value = false)
}
// 检查 URL 参数并打开编辑模态框
@@ -260,36 +578,87 @@ onUnmounted(() => {
window.removeEventListener('openAgentEditor', handleOpenAgentEditor as EventListener)
})
const onVisibleChange = (visible: boolean, agent: AgentWithUI) => {
const onVisibleChange = (visible: boolean) => {
if (!visible) {
agent.showMore = false
openMoreAgentId.value = null
}
}
const handleCardClick = (agent: AgentWithUI) => {
// 如果弹窗正在显示,不触发编辑
if (agent.showMore) {
const toggleMore = (e: Event, agentId: string) => {
e.stopPropagation()
openMoreAgentId.value = openMoreAgentId.value === agentId ? null : agentId
}
const handleCardClick = (agent: DisplayAgent | AgentWithUI) => {
if (openMoreAgentId.value === agent.id) return
if ('isMine' in agent && !agent.isMine) {
const shared = sharedAgents.value.find(s => s.agent?.id === agent.id && s.source_tenant_id === agent.source_tenant_id)
if (shared) openSharedAgentDetail(shared)
return
}
// 点击卡片编辑(包括内置智能体)
handleEdit(agent)
handleEdit(agent as AgentWithUI)
}
function openSharedAgentDetail(shared: SharedAgentInfo) {
currentSharedAgent.value = shared
sharedDetailVisible.value = true
}
function closeSharedAgentDetail() {
sharedDetailVisible.value = false
currentSharedAgent.value = null
}
/** 在对话中使用共享智能体:创建新会话并跳转 */
async function handleUseSharedAgentInChat(shared: SharedAgentInfo) {
if (!shared.agent?.id) return
closeSharedAgentDetail()
const settingsStore = useSettingsStore()
const menuStore = useMenuStore()
settingsStore.selectAgent(shared.agent.id, String(shared.source_tenant_id))
try {
const res = await createSessions({})
if (res?.data?.id) {
const sessionId = res.data.id
const now = new Date().toISOString()
menuStore.updataMenuChildren({
title: t('createChat.newSessionTitle'),
path: `chat/${sessionId}`,
id: sessionId,
isMore: false,
isNoTitle: true,
created_at: now,
updated_at: now
})
menuStore.changeIsFirstSession(false)
router.push({
path: `/platform/chat/${sessionId}`,
query: { agent_id: shared.agent.id, source_tenant_id: String(shared.source_tenant_id) }
})
} else {
MessagePlugin.error(t('createChat.messages.createFailed') || '创建会话失败')
}
} catch (e) {
console.error('Create session for shared agent failed', e)
MessagePlugin.error(t('createChat.messages.createError') || '创建会话出错')
}
}
const handleEdit = (agent: AgentWithUI) => {
agent.showMore = false
openMoreAgentId.value = null
editingAgent.value = agent
editorMode.value = 'edit'
editorVisible.value = true
}
const handleDelete = (agent: AgentWithUI) => {
agent.showMore = false
openMoreAgentId.value = null
deletingAgent.value = agent
deleteVisible.value = true
}
const handleCopy = (agent: AgentWithUI) => {
agent.showMore = false
openMoreAgentId.value = null
copyAgent(agent.id).then((res: any) => {
if (res.data) {
MessagePlugin.success(t('agent.messages.copied'))
@@ -458,12 +827,78 @@ defineExpose({
line-height: 20px;
}
.header-divider {
height: 1px;
background: #e7ebf0;
.agent-tabs {
display: flex;
align-items: center;
gap: 24px;
border-bottom: 1px solid #e7ebf0;
margin-bottom: 20px;
.tab-item {
padding: 12px 0;
cursor: pointer;
color: #666;
font-family: "PingFang SC";
font-size: 14px;
font-weight: 400;
transition: color 0.2s;
&:hover {
color: #1a1a1a;
}
&.active {
color: #07c05f;
font-weight: 600;
border-bottom: 2px solid #07c05f;
margin-bottom: -1px;
}
}
}
.shared-badge {
flex-shrink: 0;
}
.card-bottom-source {
display: inline-flex;
align-items: center;
gap: 4px;
padding: 2px 8px;
border-radius: 10px;
background: rgba(0, 0, 0, 0.04);
flex-shrink: 0;
}
.card-bottom-source .org-icon {
width: 12px;
height: 12px;
flex-shrink: 0;
}
.org-source-text {
color: #666;
font-family: "PingFang SC";
font-size: 11px;
font-weight: 500;
flex-shrink: 0;
}
.custom-badge {
display: inline-flex;
align-items: center;
gap: 3px;
padding: 2px 8px;
border-radius: 10px;
background: rgba(0, 0, 0, 0.04);
color: #666;
font-family: "PingFang SC";
font-size: 11px;
font-weight: 500;
flex-shrink: 0;
}
.agent-card-wrap {
display: grid;
gap: 16px;
@@ -609,6 +1044,12 @@ defineExpose({
height: 32px;
border-radius: 8px;
flex-shrink: 0;
&.agent-emoji {
font-size: 18px;
line-height: 1;
background: rgba(0, 0, 0, 0.04);
}
&.normal {
background: linear-gradient(135deg, rgba(7, 192, 95, 0.15) 0%, rgba(7, 192, 95, 0.08) 100%);
@@ -980,4 +1421,137 @@ defineExpose({
}
}
}
// 共享智能体详情侧边栏
.shared-detail-drawer-overlay {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.4);
z-index: 1000;
display: flex;
justify-content: flex-end;
}
.shared-detail-drawer {
width: 360px;
max-width: 90vw;
height: 100%;
background: #fff;
box-shadow: -4px 0 24px rgba(0, 0, 0, 0.12);
display: flex;
flex-direction: column;
font-family: "PingFang SC", sans-serif;
}
.shared-detail-drawer-header {
display: flex;
align-items: center;
justify-content: space-between;
padding: 20px 24px;
border-bottom: 1px solid #e7ebf0;
flex-shrink: 0;
}
.shared-detail-drawer-title {
margin: 0;
font-size: 18px;
font-weight: 600;
color: #1d2129;
}
.shared-detail-drawer-close {
width: 32px;
height: 32px;
border: none;
border-radius: 6px;
background: #f5f6f8;
color: #86909c;
cursor: pointer;
display: flex;
align-items: center;
justify-content: center;
transition: background 0.2s ease, color 0.2s ease;
&:hover {
background: #e7ebf0;
color: #1d2129;
}
}
.shared-detail-drawer-body {
flex: 1;
overflow-y: auto;
padding: 24px;
display: flex;
flex-direction: column;
gap: 20px;
}
.shared-detail-drawer-body .shared-detail-row {
display: flex;
flex-direction: column;
gap: 6px;
}
.shared-detail-drawer-body .shared-detail-section-title {
font-size: 13px;
font-weight: 600;
color: #1d2129;
margin: 20px 0 12px 0;
padding-top: 16px;
border-top: 1px solid #e7ebf0;
}
.shared-detail-drawer-body .shared-detail-label {
font-size: 12px;
color: #86909c;
line-height: 1.4;
}
.shared-detail-drawer-body .shared-detail-value {
font-size: 14px;
color: #1d2129;
line-height: 1.5;
word-break: break-word;
&.shared-detail-org {
display: inline-flex;
align-items: center;
gap: 6px;
}
}
.shared-detail-drawer-body .shared-detail-org-icon {
width: 14px;
height: 14px;
flex-shrink: 0;
}
.shared-detail-drawer-footer {
padding: 16px 24px;
border-top: 1px solid #e7ebf0;
flex-shrink: 0;
background: #fff;
}
.shared-detail-drawer-enter-active,
.shared-detail-drawer-leave-active {
transition: opacity 0.25s ease;
.shared-detail-drawer {
transition: transform 0.25s ease;
}
}
.shared-detail-drawer-enter-from,
.shared-detail-drawer-leave-to {
opacity: 0;
.shared-detail-drawer {
transform: translateX(100%);
}
}
</style>
+6 -24
View File
@@ -72,33 +72,15 @@ const props = defineProps({
border: 1px solid transparent;
color: var(--td-text-color-primary, #333);
/* KB - Document (Greenish tint) */
&.kb-tag {
background: rgba(16, 185, 129, 0.08);
color: #059669;
.tag_icon {
color: #10b981;
}
}
/* KB - FAQ (Blueish tint) */
&.faq-tag {
background: rgba(0, 82, 217, 0.08);
color: #0052d9;
.tag_icon {
color: #0052d9;
}
}
/* File (Orange tint) */
/* 知识库 / 文件 - 无背景,与整体一致 */
&.kb-tag,
&.faq-tag,
&.file-tag {
background: rgba(237, 123, 47, 0.08);
color: #e65100;
background: transparent;
color: var(--td-text-color-primary, #333);
.tag_icon {
color: #ed7b2f;
color: var(--td-text-color-secondary, #666);
}
}
+9 -3
View File
@@ -336,10 +336,9 @@ const sendMsg = async (value, modelId = '', mentionedItems = []) => {
const kbIds = [...kbIdSet];
const knowledgeIds = [...fileIdSet];
// Get selected agent ID
// Get selected agent ID (backend resolves shared agent and its tenant from share relation)
const selectedAgentId = useSettingsStoreInstance.selectedAgentId || '';
// Use agent-chat endpoint when agent is enabled, otherwise use knowledge-chat
const endpoint = agentEnabled ? '/api/v1/agent-chat' : '/api/v1/knowledge-chat';
@@ -351,7 +350,7 @@ const sendMsg = async (value, modelId = '', mentionedItems = []) => {
knowledge_base_ids: kbIds,
knowledge_ids: knowledgeIds,
agent_enabled: agentEnabled,
agent_id: selectedAgentId, // 传递选中的智能体 ID
agent_id: selectedAgentId,
web_search_enabled: webSearchEnabled,
summary_model_id: modelId,
mcp_service_ids: mcpServiceIds,
@@ -882,6 +881,13 @@ const updateAssistantSession = (payload) => {
onMounted(async () => {
messagesList.splice(0);
// 若从智能体列表点击共享智能体进入,URL 带 agent_id 与 source_tenant_id,同步到 store
const agentIdFromQuery = route.query.agent_id && String(route.query.agent_id);
const sourceTenantIdFromQuery = route.query.source_tenant_id && String(route.query.source_tenant_id);
if (agentIdFromQuery && sourceTenantIdFromQuery) {
useSettingsStoreInstance.selectAgent(agentIdFromQuery, sourceTenantIdFromQuery);
}
// 初始化状态:加载历史消息时不应显示loading
loading.value = false;
isReplying.value = false;
@@ -38,13 +38,17 @@
</t-tag>
</div>
<div class="org-option-meta">
<span class="org-meta-item">
<span class="org-meta-tag">
<t-icon name="user" class="org-meta-icon org-meta-icon-user" />
{{ org.member_count || 0 }} {{ $t('organization.members') }}
{{ org.member_count ?? 0 }}
</span>
<span v-if="org.share_count !== undefined" class="org-meta-item">
<span class="org-meta-tag">
<img src="@/assets/img/zhishiku.svg" class="org-meta-icon org-meta-icon-kb" alt="" aria-hidden="true" />
{{ org.share_count }} {{ $t('organization.share.sharedKBs') }}
{{ org.share_count ?? 0 }}
</span>
<span class="org-meta-tag">
<img src="@/assets/img/organization-grey.svg" class="org-meta-icon org-meta-icon-kb" alt="" aria-hidden="true" />
{{ org.agent_share_count ?? 0 }}
</span>
</div>
</div>
@@ -91,28 +95,39 @@
<div v-else class="shares-list">
<div v-for="share in shares" :key="share.id" class="share-item">
<div class="share-info">
<div class="share-org">
<SpaceAvatar
:name="share.organization_name || ''"
:avatar="orgStore.organizations.find(o => o.id === share.organization_id)?.avatar"
<div class="share-info-top">
<div class="share-org">
<SpaceAvatar
:name="share.organization_name || ''"
:avatar="orgStore.organizations.find(o => o.id === share.organization_id)?.avatar"
size="small"
/>
<span class="org-name">{{ share.organization_name }}</span>
</div>
<t-tag
:theme="share.permission === 'editor' ? 'warning' : 'default'"
size="small"
/>
<span class="org-name">{{ share.organization_name }}</span>
variant="light"
>
{{ share.permission === 'editor' ? $t('organization.share.permissionEditable') : $t('organization.share.permissionReadonly') }}
</t-tag>
</div>
<div class="share-item-meta">
<span class="org-meta-tag">
<t-icon name="user" class="org-meta-icon org-meta-icon-user" />
{{ getOrgForShare(share.organization_id)?.member_count ?? 0 }}
</span>
<span class="org-meta-tag">
<img src="@/assets/img/zhishiku.svg" class="org-meta-icon org-meta-icon-kb" alt="" aria-hidden="true" />
{{ getOrgForShare(share.organization_id)?.share_count ?? 0 }}
</span>
<span class="org-meta-tag">
<img src="@/assets/img/organization-grey.svg" class="org-meta-icon org-meta-icon-kb" alt="" aria-hidden="true" />
{{ getOrgForShare(share.organization_id)?.agent_share_count ?? 0 }}
</span>
</div>
<t-tag
:theme="share.permission === 'editor' ? 'warning' : 'default'"
size="small"
variant="light"
>
{{ share.permission === 'editor' ? $t('organization.share.permissionEditable') : $t('organization.share.permissionReadonly') }}
</t-tag>
</div>
<div class="share-actions">
<t-tooltip :content="$t('organization.settings.editTitle')" placement="top">
<t-button variant="text" theme="default" size="small" @click="handleGoToOrgSettings(share.organization_id)">
<t-icon name="setting" />
</t-button>
</t-tooltip>
<t-select
:value="share.permission"
size="small"
@@ -151,16 +166,18 @@
import { ref, computed, watch, onMounted } from 'vue'
import { MessagePlugin } from 'tdesign-vue-next'
import { useI18n } from 'vue-i18n'
import { useRouter } from 'vue-router'
import { useOrganizationStore } from '@/stores/organization'
import { shareKnowledgeBase, listKBShares, removeShare, updateSharePermission } from '@/api/organization'
import type { KnowledgeBaseShare } from '@/api/organization'
import SpaceAvatar from '@/components/SpaceAvatar.vue'
const { t } = useI18n()
const router = useRouter()
const orgStore = useOrganizationStore()
function getOrgForShare(organizationId: string) {
return orgStore.organizations.find(o => o.id === organizationId)
}
interface Props {
kbId: string
}
@@ -275,14 +292,6 @@ async function handleUnshare(share: KnowledgeBaseShare) {
}
}
// Navigate to organization settings
function handleGoToOrgSettings(orgId: string) {
router.push({
path: '/platform/organizations',
query: { orgId }
})
}
// Watch for kbId changes
watch(() => props.kbId, async (newKbId) => {
if (newKbId) {
@@ -439,6 +448,12 @@ onMounted(async () => {
}
.share-info {
display: flex;
flex-direction: column;
gap: 8px;
}
.share-info-top {
display: flex;
align-items: center;
gap: 12px;
@@ -457,6 +472,39 @@ onMounted(async () => {
}
}
.share-item-meta {
display: flex;
align-items: center;
gap: 6px;
font-size: 12px;
color: #00000099;
.org-meta-tag {
display: inline-flex;
align-items: center;
gap: 3px;
padding: 2px 6px;
background: #f0f0f0;
border-radius: 4px;
}
.org-meta-icon {
flex-shrink: 0;
vertical-align: middle;
color: #00000099;
}
.org-meta-icon-user {
font-size: 12px;
}
.org-meta-icon-kb {
width: 12px;
height: 12px;
opacity: 0.75;
}
}
.share-actions {
display: flex;
align-items: center;
@@ -558,15 +606,18 @@ onMounted(async () => {
.org-option-meta {
display: flex;
align-items: center;
gap: 12px;
gap: 6px;
font-family: "PingFang SC";
font-size: 12px;
color: #00000099;
.org-meta-item {
display: flex;
.org-meta-tag {
display: inline-flex;
align-items: center;
gap: 3px;
padding: 0px 4px;
background: #f0f0f0;
border-radius: 4px;
}
.org-meta-icon {
@@ -576,14 +627,12 @@ onMounted(async () => {
}
.org-meta-icon-user {
font-size: 14px;
margin-right: 2px;
font-size: 12px;
}
.org-meta-icon-kb {
width: 14px;
height: 14px;
margin-right: 2px;
width: 12px;
height: 12px;
opacity: 0.75;
}
}
@@ -229,6 +229,10 @@
<t-icon name="folder" />
<span>{{ $t('organization.join.shareCount', { count: previewInfo.share_count }) }}</span>
</div>
<div class="stat-item stat-item-agent">
<img src="@/assets/img/agent.svg" class="stat-agent-icon" alt="" aria-hidden="true" />
<span>{{ $t('organization.join.agentShareCount', { count: previewInfo.agent_share_count ?? 0 }) }}</span>
</div>
</div>
</div>
<div v-if="previewInfo.is_already_member" class="already-member-notice">
@@ -879,6 +883,12 @@ watch(() => props.mode, () => {
font-size: 16px;
color: #00000066;
}
&.stat-item-agent .stat-agent-icon {
width: 16px;
height: 16px;
flex-shrink: 0;
}
}
.already-member-notice {
@@ -134,6 +134,12 @@
<span>{{ org.share_count ?? 0 }}</span>
</span>
</t-tooltip>
<t-tooltip :content="$t('organization.invite.agents')" placement="top">
<span class="stat-item stat-item-agent">
<img src="@/assets/img/agent.svg" class="stat-agent-icon" alt="" aria-hidden="true" />
<span>{{ org.agent_share_count ?? 0 }}</span>
</span>
</t-tooltip>
</div>
<t-tooltip v-if="(org.pending_join_request_count ?? 0) > 0" :content="$t('organization.settings.pendingJoinRequestsBadge')" placement="top">
<span class="pending-requests-badge">{{ org.pending_join_request_count }} {{ $t('organization.settings.pendingReview') }}</span>
@@ -384,6 +390,10 @@
<t-icon name="folder" size="12px" />
{{ org.share_count }}
</span>
<span class="searchable-badge searchable-badge-agent">
<img src="@/assets/img/agent.svg" class="searchable-badge-agent-icon" alt="" aria-hidden="true" />
{{ org.agent_share_count ?? 0 }}
</span>
<t-tag v-if="org.require_approval" class="searchable-tag-approval" size="small" variant="light">
{{ $t('organization.invite.needApproval') }}
</t-tag>
@@ -457,6 +467,10 @@
<t-icon name="folder" size="14px" />
{{ invitePreviewData.share_count }} {{ $t('organization.invite.knowledgeBases') }}
</span>
<span class="preview-badge preview-badge-agent">
<img src="@/assets/img/agent.svg" class="preview-badge-agent-icon" alt="" aria-hidden="true" />
{{ invitePreviewData.agent_share_count ?? 0 }} {{ $t('organization.invite.agents') }}
</span>
<t-tag v-if="invitePreviewData.require_approval" class="preview-tag-approval" size="small" variant="light">
{{ $t('organization.invite.needApproval') }}
</t-tag>
@@ -1082,6 +1096,7 @@ function previewSearchableOrg(org: SearchableOrganizationItem) {
avatar: org.avatar,
member_count: org.member_count,
share_count: org.share_count,
agent_share_count: org.agent_share_count ?? 0,
is_already_member: org.is_already_member,
require_approval: org.require_approval,
created_at: '', // 搜索列表中没有创建时间,使用空字符串
@@ -1572,6 +1587,16 @@ onUnmounted(() => {
line-height: 1;
}
&.stat-item-agent {
background: rgba(7, 192, 95, 0.08);
color: #059669;
.stat-agent-icon {
width: 12px;
height: 12px;
flex-shrink: 0;
}
}
&:hover {
background: rgba(100, 116, 139, 0.12);
}
@@ -2275,6 +2300,15 @@ onUnmounted(() => {
background: rgba(0, 82, 217, 0.08);
color: #0052d9;
}
&.searchable-badge-agent {
background: rgba(7, 192, 95, 0.08);
color: #059669;
.searchable-badge-agent-icon {
width: 12px;
height: 12px;
}
}
}
.searchable-tag-approval {
@@ -2528,6 +2562,15 @@ onUnmounted(() => {
background: rgba(0, 82, 217, 0.08);
color: #0052d9;
}
&.preview-badge-agent {
background: rgba(7, 192, 95, 0.08);
color: #059669;
.preview-badge-agent-icon {
width: 14px;
height: 14px;
}
}
}
.preview-tag-approval {
@@ -23,9 +23,13 @@
:class="['nav-item', { 'active': currentSection === item.key }]"
@click="currentSection = item.key"
>
<t-icon :name="item.icon" class="nav-icon" />
<img v-if="item.key === 'sharedAgents'" :src="currentSection === 'sharedAgents' ? agentIconActiveSrc : agentIconSrc" class="nav-icon nav-icon-img" alt="" aria-hidden="true" />
<t-icon v-else :name="item.icon" class="nav-icon" />
<span class="nav-label">{{ item.label }}</span>
<span v-if="item.badge != null && item.badge > 0" class="nav-item-badge">{{ item.badge }}</span>
<span
v-if="item.badge != null && (item.key === 'sharedKb' || item.key === 'sharedAgents' ? true : item.badge > 0)"
:class="['nav-item-badge', { 'nav-item-badge-count': item.key === 'sharedKb' || item.key === 'sharedAgents' }]"
>{{ item.badge }}</span>
</div>
</div>
</div>
@@ -461,8 +465,8 @@
</div>
</div>
<!-- 共享知识库 -->
<div v-show="currentSection === 'shared'" class="section">
<!-- 共享知识库(独立侧边栏) -->
<div v-show="currentSection === 'sharedKb'" class="section">
<div class="section-header">
<h2>{{ $t('organization.share.sharedKnowledgeBase') }}</h2>
<p class="section-description">{{ $t('organization.settings.sharedDesc') }}</p>
@@ -475,12 +479,11 @@
</t-tooltip>
</p>
</div>
<div class="settings-group">
<t-loading :loading="sharesLoading">
<div v-if="sharedKnowledgeBases.length === 0 && !sharesLoading" class="empty-shared">
<div class="empty-icon">
<t-icon name="folder-open" size="48px" />
<img src="@/assets/img/zhishiku.svg" class="empty-icon-kb" alt="" aria-hidden="true" />
</div>
<p class="empty-text">{{ $t('organization.settings.noSharedKB') }}</p>
<p class="empty-subtext">{{ $t('organization.settings.noSharedKBTip') }}</p>
@@ -492,8 +495,8 @@
class="shared-item"
@click="handleShareClick(share)"
>
<div class="shared-icon shared-icon-org">
<img src="@/assets/img/organization.svg" class="org-icon-img" alt="" aria-hidden="true" />
<div class="shared-icon shared-icon-kb">
<img src="@/assets/img/zhishiku.svg" class="shared-icon-kb-img" alt="" aria-hidden="true" />
</div>
<div class="shared-info">
<span class="shared-name">{{ share.knowledge_base_name }}</span>
@@ -545,8 +548,81 @@
</div>
</div>
<!-- 共享智能体(独立侧边栏) -->
<div v-show="currentSection === 'sharedAgents'" class="section">
<div class="section-header">
<h2>{{ $t('organization.settings.sharedAgents') }}</h2>
<p class="section-description">{{ $t('organization.settings.sharedAgentsDesc') }}</p>
</div>
<div class="settings-group">
<div v-if="sharedAgents.length === 0" class="empty-shared">
<div class="empty-icon">
<img src="@/assets/img/agent.svg" class="empty-icon-agent" alt="" aria-hidden="true" />
</div>
<p class="empty-text">{{ $t('organization.settings.noSharedAgents') }}</p>
<p class="empty-subtext">{{ $t('organization.settings.noSharedAgentsTip') }}</p>
</div>
<div v-else class="shared-list">
<div
v-for="share in sharedAgents"
:key="share.id"
class="shared-item"
@mouseenter="onSharedAgentMouseEnter(share, $event)"
@mousemove="onSharedAgentMouseMove($event)"
@mouseleave="onSharedAgentMouseLeave"
>
<div class="shared-icon shared-icon-agent-wrap">
<AgentAvatar :name="share.agent_name || share.agent_id" size="small" />
</div>
<div class="shared-info">
<span class="shared-name">{{ share.agent_name || share.agent_id }}</span>
<div class="shared-meta">
<span v-if="share.shared_by_username" class="shared-by"><t-icon name="user" size="12px" />{{ share.shared_by_username }}</span>
<span class="shared-time"><t-icon name="time" size="12px" />{{ formatDate(share.created_at) }}</span>
</div>
</div>
<t-popconfirm v-if="isAdmin" :content="$t('organization.settings.removeAgentShareConfirm', { name: share.agent_name || share.agent_id })" :confirm-btn="{ content: $t('common.confirm'), theme: 'danger' }" :cancel-btn="{ content: $t('common.cancel') }" @confirm="handleRemoveAgentShare(share)">
<t-button variant="text" size="small" theme="danger" class="shared-remove-btn" @click.stop><t-icon name="delete" size="16px" /></t-button>
</t-popconfirm>
</div>
</div>
</div>
</div>
</div>
<!-- 共享智能体 hover 跟随气泡 -->
<Teleport to="body">
<Transition name="agent-scope-popover-fade">
<div
v-if="agentScopePopover"
class="agent-scope-popover-follow"
:style="agentScopePopoverStyle"
>
<div class="agent-scope-popover-card">
<div class="agent-scope-popover-name">{{ agentScopePopover.share.agent_name || agentScopePopover.share.agent_id }}</div>
<div class="agent-scope-popover-meta">
<span v-if="agentScopePopover.share.shared_by_username" class="popover-meta-item">
<t-icon name="user" size="12px" /> {{ agentScopePopover.share.shared_by_username }}
</span>
<span class="popover-meta-item">
<t-icon name="time" size="12px" /> {{ formatDate(agentScopePopover.share.created_at) }}
</span>
</div>
<div class="agent-scope-popover-permission">
<span class="popover-label">{{ $t('organization.settings.sharePermissionLabel') }}</span>
<span class="popover-value">{{ $t('organization.share.permissionReadonly') }}</span>
</div>
<template v-if="getAgentScopeTags(agentScopePopover.share).length">
<div class="agent-scope-popover-divider" />
<div class="agent-scope-popover-section-title">{{ $t('agent.shareScope.title') }}</div>
<div v-for="(tag, idx) in getAgentScopeTags(agentScopePopover.share)" :key="idx" class="agent-scope-popover-row">{{ tag }}</div>
</template>
</div>
</div>
</Transition>
</Teleport>
<!-- 底部操作按钮 -->
<div class="settings-footer">
<t-button variant="outline" @click="handleClose">{{ $t('common.cancel') }}</t-button>
@@ -658,24 +734,31 @@ import {
removeMember,
generateInviteCode,
listOrgShares,
listOrgAgentShares,
listJoinRequests,
reviewJoinRequest,
removeShare,
removeAgentShare,
requestRoleUpgrade,
searchUsersForInvite,
inviteMember,
type Organization,
type OrganizationMember,
type KnowledgeBaseShare,
type AgentShareResponse,
type JoinRequestResponse
} from '@/api/organization'
import { useOrganizationStore } from '@/stores/organization'
import { useAuthStore } from '@/stores/auth'
import SpaceAvatar from '@/components/SpaceAvatar.vue'
import AgentAvatar from '@/components/AgentAvatar.vue'
import agentIconSrc from '@/assets/img/agent.svg'
import agentIconActiveSrc from '@/assets/img/agent-green.svg'
const router = useRouter()
const authStore = useAuthStore()
const { t } = useI18n()
const orgStore = useOrganizationStore()
interface Props {
@@ -698,6 +781,7 @@ const currentSection = ref('basic')
const orgInfo = ref<Organization | null>(null)
const members = ref<OrganizationMember[]>([])
const sharedKnowledgeBases = ref<KnowledgeBaseShare[]>([])
const sharedAgents = ref<AgentShareResponse[]>([])
const joinRequests = ref<JoinRequestResponse[]>([])
const joinRequestsLoading = ref(false)
const reviewingRequestId = ref<string | null>(null)
@@ -736,6 +820,12 @@ const formData = ref({
member_limit: 50 as number // 0 = unlimited
})
// 共享智能体 hover 跟随气泡
const agentScopePopover = ref<{ share: AgentShareResponse; x: number; y: number } | null>(null)
const agentScopePopoverTimer = ref<ReturnType<typeof setTimeout> | null>(null)
const POPOVER_OFFSET = 14
const POPOVER_DELAY = 200
// 空间头像可选 Emoji(方案三:Emoji 作为头像)
const avatarEmojiOptions = [
'🚀', '📁', '👥', '🏢', '💡', '📚', '🌟', '🔧', '📌', '🎯',
@@ -817,7 +907,18 @@ const navItems = computed(() => {
badge: pendingCount > 0 ? pendingCount : undefined
})
}
items.push({ key: 'shared', icon: 'folder-open', label: t('organization.share.sharedKnowledgeBase') })
items.push({
key: 'sharedKb',
icon: 'folder-open',
label: t('organization.share.sharedKnowledgeBase'),
badge: sharedKnowledgeBases.value.length
})
items.push({
key: 'sharedAgents',
icon: 'control-platform',
label: t('organization.settings.sharedAgents'),
badge: sharedAgents.value.length
})
}
return items
})
@@ -910,15 +1011,24 @@ const fetchSharedKBs = async () => {
if (!props.orgId) return
sharesLoading.value = true
try {
const res = await listOrgShares(props.orgId)
if (res.success && res.data) {
sharedKnowledgeBases.value = res.data.shares || []
const [kbRes, agentRes] = await Promise.all([
listOrgShares(props.orgId),
listOrgAgentShares(props.orgId)
])
if (kbRes.success && kbRes.data) {
sharedKnowledgeBases.value = kbRes.data.shares || []
} else {
sharedKnowledgeBases.value = []
}
if (agentRes.success && agentRes.data) {
sharedAgents.value = agentRes.data.shares || []
} else {
sharedAgents.value = []
}
} catch (error) {
console.error('Failed to fetch shared KBs:', error)
console.error('Failed to fetch shared resources:', error)
sharedKnowledgeBases.value = []
sharedAgents.value = []
} finally {
sharesLoading.value = false
}
@@ -1280,6 +1390,21 @@ const handleRemoveShare = async (share: KnowledgeBaseShare) => {
}
}
const handleRemoveAgentShare = async (share: AgentShareResponse) => {
if (!props.orgId) return
try {
const res = await removeAgentShare(share.agent_id, share.id)
if (res.success) {
MessagePlugin.success(t('organization.settings.removeShareSuccess'))
sharedAgents.value = sharedAgents.value.filter(s => s.id !== share.id)
} else {
MessagePlugin.error(res.message || t('organization.settings.removeShareFailed'))
}
} catch (error: any) {
MessagePlugin.error(error?.message || t('organization.settings.removeShareFailed'))
}
}
const formatDate = (dateStr: string) => {
if (!dateStr) return ''
const date = new Date(dateStr)
@@ -1289,6 +1414,68 @@ const formatDate = (dateStr: string) => {
return `${year}-${month}-${day}`
}
/** 共享智能体能力范围标签(知识库、网络搜索、MCP) */
function getAgentScopeTags(share: AgentShareResponse): string[] {
const tags: string[] = []
if (share.scope_kb !== undefined && share.scope_kb !== '') {
const kbText = share.scope_kb === 'all'
? t('agent.shareScope.kbAll')
: share.scope_kb === 'selected' && (share.scope_kb_count ?? 0) > 0
? t('agent.shareScope.kbSelected', { count: share.scope_kb_count })
: t('agent.shareScope.kbNone')
tags.push(`${t('agent.shareScope.knowledgeBase')}:${kbText}`)
}
if (share.scope_web_search !== undefined) {
tags.push(`${t('agent.shareScope.webSearch')}:${share.scope_web_search ? t('agent.shareScope.enabled') : t('agent.shareScope.disabled')}`)
}
if (share.scope_mcp !== undefined && share.scope_mcp !== '') {
const mcpText = share.scope_mcp === 'all'
? t('agent.shareScope.mcpAll')
: share.scope_mcp === 'selected' && (share.scope_mcp_count ?? 0) > 0
? t('agent.shareScope.mcpSelected', { count: share.scope_mcp_count })
: t('agent.shareScope.mcpNone')
tags.push(`${t('agent.shareScope.mcp')}:${mcpText}`)
}
return tags
}
function onSharedAgentMouseEnter(share: AgentShareResponse, e: MouseEvent) {
agentScopePopoverTimer.value = setTimeout(() => {
agentScopePopover.value = { share, x: e.clientX, y: e.clientY }
agentScopePopoverTimer.value = null
}, POPOVER_DELAY)
}
function onSharedAgentMouseMove(e: MouseEvent) {
if (agentScopePopover.value) {
agentScopePopover.value = { ...agentScopePopover.value, x: e.clientX, y: e.clientY }
}
}
function onSharedAgentMouseLeave() {
if (agentScopePopoverTimer.value) {
clearTimeout(agentScopePopoverTimer.value)
agentScopePopoverTimer.value = null
}
agentScopePopover.value = null
}
const agentScopePopoverStyle = computed(() => {
if (!agentScopePopover.value) return {}
const { x, y } = agentScopePopover.value
const popoverWidth = 240
const popoverHeight = 180
let left = x + POPOVER_OFFSET
let top = y + POPOVER_OFFSET
const rightEdge = window.innerWidth - popoverWidth - 12
const bottomEdge = window.innerHeight - popoverHeight - 12
if (left > rightEdge) left = rightEdge
if (left < 12) left = 12
if (top > bottomEdge) top = bottomEdge
if (top < 12) top = 12
return { left: `${left}px`, top: `${top}px` }
})
const getRoleTheme = (role: string) => {
switch (role) {
case 'admin': return 'primary'
@@ -1326,6 +1513,12 @@ watch(() => props.visible, (newVal) => {
fetchMembers()
fetchSharedKBs()
}
} else {
if (agentScopePopoverTimer.value) {
clearTimeout(agentScopePopoverTimer.value)
agentScopePopoverTimer.value = null
}
agentScopePopover.value = null
}
})
@@ -1457,6 +1650,11 @@ watch(currentSection, (section) => {
justify-content: center;
color: #94a3b8;
transition: color 0.2s;
&.nav-icon-img {
width: 18px;
height: 18px;
}
}
.nav-label {
@@ -1476,6 +1674,12 @@ watch(currentSection, (section) => {
line-height: 20px;
text-align: center;
flex-shrink: 0;
&.nav-item-badge-count {
background: rgba(0, 0, 0, 0.06);
color: #64748b;
font-weight: 500;
}
}
&:hover {
@@ -2067,6 +2271,16 @@ watch(currentSection, (section) => {
align-items: center;
justify-content: center;
color: #c9ced6;
.empty-icon-agent {
width: 48px;
height: 48px;
}
.empty-icon-kb {
width: 48px;
height: 48px;
}
}
.empty-text {
@@ -2080,6 +2294,24 @@ watch(currentSection, (section) => {
color: #86909c;
margin: 0;
}
&.small {
padding: 24px 16px;
.empty-text { margin: 0; }
}
}
.shared-subsection {
margin-top: 24px;
padding-top: 24px;
border-top: 1px solid #e5e7eb;
.shared-subtitle {
font-size: 14px;
font-weight: 600;
color: #1f2937;
margin: 0 0 12px 0;
}
}
// Join requests
@@ -2257,9 +2489,32 @@ watch(currentSection, (section) => {
color: #0052d9;
}
&.shared-icon-org {
background: rgba(0, 82, 217, 0.06);
color: #0052d9;
& .shared-icon-org {
background: rgba(7, 192, 95, 0.08);
color: #059669;
}
&.shared-icon-agent-wrap {
padding: 0;
height: auto;
background: transparent;
}
&.shared-icon-kb {
background: rgba(7, 192, 95, 0.08);
color: #059669;
}
.shared-icon-kb-img {
width: 20px;
height: 20px;
flex-shrink: 0;
}
.shared-icon-agent {
width: 20px;
height: 20px;
flex-shrink: 0;
}
.org-icon-img {
@@ -2436,3 +2691,90 @@ watch(currentSection, (section) => {
}
}
</style>
<style lang="less">
/* 共享智能体 hover 跟随气泡(Teleport 到 body) */
.agent-scope-popover-follow {
position: fixed;
z-index: 10000;
pointer-events: none;
}
.agent-scope-popover-card {
min-width: 220px;
max-width: 280px;
padding: 14px 16px;
background: #fff;
border-radius: 10px;
box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12), 0 2px 8px rgba(0, 0, 0, 0.06);
border: 1px solid #e5e7eb;
}
.agent-scope-popover-name {
font-size: 14px;
font-weight: 600;
color: #1d2129;
margin-bottom: 8px;
line-height: 1.3;
padding-right: 8px;
}
.agent-scope-popover-meta {
display: flex;
flex-wrap: wrap;
gap: 10px 16px;
font-size: 12px;
color: #86909c;
margin-bottom: 10px;
.popover-meta-item {
display: inline-flex;
align-items: center;
gap: 4px;
}
}
.agent-scope-popover-permission {
font-size: 12px;
margin-bottom: 10px;
.popover-label {
color: #86909c;
margin-right: 6px;
}
.popover-value {
color: #1d2129;
font-weight: 500;
}
}
.agent-scope-popover-divider {
height: 1px;
background: #f0f0f0;
margin: 10px 0;
}
.agent-scope-popover-section-title {
font-size: 12px;
font-weight: 600;
color: #1d2129;
margin-bottom: 8px;
}
.agent-scope-popover-row {
font-size: 12px;
color: #4e5969;
line-height: 1.7;
padding: 2px 0;
}
.agent-scope-popover-fade-enter-active,
.agent-scope-popover-fade-leave-active {
transition: opacity 0.12s ease;
}
.agent-scope-popover-fade-enter-from,
.agent-scope-popover-fade-leave-to {
opacity: 0;
}
</style>
@@ -228,6 +228,7 @@
:model-data="editingModel"
@confirm="handleModelSave"
/>
</div>
</template>
@@ -463,7 +464,7 @@ const getModelOptions = (type: 'chat' | 'embedding' | 'rerank' | 'vllm', model:
content: t('common.edit'),
value: `edit-${type}-${model.id}`
})
// 删除选项
options.push({
content: t('common.delete'),
@@ -0,0 +1,156 @@
package repository
import (
"context"
"errors"
"github.com/Tencent/WeKnora/internal/types"
"github.com/Tencent/WeKnora/internal/types/interfaces"
"gorm.io/gorm"
)
var (
ErrAgentShareNotFound = errors.New("agent share not found")
ErrAgentShareAlreadyExists = errors.New("agent already shared to this organization")
)
// agentShareRepository implements AgentShareRepository interface
type agentShareRepository struct {
db *gorm.DB
}
// NewAgentShareRepository creates a new agent share repository
func NewAgentShareRepository(db *gorm.DB) interfaces.AgentShareRepository {
return &agentShareRepository{db: db}
}
// Create creates a new agent share record
func (r *agentShareRepository) Create(ctx context.Context, share *types.AgentShare) error {
var count int64
r.db.WithContext(ctx).Model(&types.AgentShare{}).
Where("agent_id = ? AND source_tenant_id = ? AND organization_id = ? AND deleted_at IS NULL",
share.AgentID, share.SourceTenantID, share.OrganizationID).
Count(&count)
if count > 0 {
return ErrAgentShareAlreadyExists
}
return r.db.WithContext(ctx).Create(share).Error
}
// GetByID gets a share record by ID
func (r *agentShareRepository) GetByID(ctx context.Context, id string) (*types.AgentShare, error) {
var share types.AgentShare
err := r.db.WithContext(ctx).Where("id = ?", id).First(&share).Error
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, ErrAgentShareNotFound
}
return nil, err
}
return &share, nil
}
// GetByAgentAndOrg gets a share record by agent ID and organization ID
func (r *agentShareRepository) GetByAgentAndOrg(ctx context.Context, agentID string, orgID string) (*types.AgentShare, error) {
var share types.AgentShare
err := r.db.WithContext(ctx).
Where("agent_id = ? AND organization_id = ?", agentID, orgID).
First(&share).Error
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, ErrAgentShareNotFound
}
return nil, err
}
return &share, nil
}
// Update updates a share record
func (r *agentShareRepository) Update(ctx context.Context, share *types.AgentShare) error {
return r.db.WithContext(ctx).Model(&types.AgentShare{}).
Where("id = ?", share.ID).Updates(share).Error
}
// Delete soft deletes a share record
func (r *agentShareRepository) Delete(ctx context.Context, id string) error {
return r.db.WithContext(ctx).Where("id = ?", id).Delete(&types.AgentShare{}).Error
}
// DeleteByAgentIDAndSourceTenant soft deletes all share records for an agent (id, tenant_id)
func (r *agentShareRepository) DeleteByAgentIDAndSourceTenant(ctx context.Context, agentID string, sourceTenantID uint64) error {
return r.db.WithContext(ctx).
Where("agent_id = ? AND source_tenant_id = ?", agentID, sourceTenantID).
Delete(&types.AgentShare{}).Error
}
// DeleteByOrganizationID soft deletes all share records for an organization
func (r *agentShareRepository) DeleteByOrganizationID(ctx context.Context, orgID string) error {
return r.db.WithContext(ctx).Where("organization_id = ?", orgID).Delete(&types.AgentShare{}).Error
}
// ListByAgent lists all share records for an agent
func (r *agentShareRepository) ListByAgent(ctx context.Context, agentID string) ([]*types.AgentShare, error) {
var shares []*types.AgentShare
err := r.db.WithContext(ctx).
Preload("Organization").
Where("agent_id = ?", agentID).
Order("created_at DESC").
Find(&shares).Error
if err != nil {
return nil, err
}
return shares, nil
}
// ListByOrganization lists all share records for an organization (excluding deleted agents)
func (r *agentShareRepository) ListByOrganization(ctx context.Context, orgID string) ([]*types.AgentShare, error) {
var shares []*types.AgentShare
err := r.db.WithContext(ctx).
Joins("JOIN custom_agents ON custom_agents.id = agent_shares.agent_id AND custom_agents.tenant_id = agent_shares.source_tenant_id AND custom_agents.deleted_at IS NULL").
Preload("Agent").
Where("agent_shares.organization_id = ? AND agent_shares.deleted_at IS NULL", orgID).
Order("agent_shares.created_at DESC").
Find(&shares).Error
if err != nil {
return nil, err
}
return shares, nil
}
// ListSharedAgentsForUser lists all agents shared to organizations that the user belongs to
func (r *agentShareRepository) ListSharedAgentsForUser(ctx context.Context, userID string) ([]*types.AgentShare, error) {
var shares []*types.AgentShare
err := r.db.WithContext(ctx).
Joins("JOIN custom_agents ON custom_agents.id = agent_shares.agent_id AND custom_agents.tenant_id = agent_shares.source_tenant_id AND custom_agents.deleted_at IS NULL").
Preload("Agent").
Preload("Organization").
Joins("JOIN organization_members ON organization_members.organization_id = agent_shares.organization_id").
Joins("JOIN organizations ON organizations.id = agent_shares.organization_id AND organizations.deleted_at IS NULL").
Where("organization_members.user_id = ?", userID).
Where("agent_shares.deleted_at IS NULL").
Order("agent_shares.created_at DESC").
Find(&shares).Error
if err != nil {
return nil, err
}
return shares, nil
}
// GetShareByAgentIDForUser returns one share for the given agentID that the user can access (user in org), excluding source_tenant_id == excludeTenantID. Single query.
func (r *agentShareRepository) GetShareByAgentIDForUser(ctx context.Context, userID, agentID string, excludeTenantID uint64) (*types.AgentShare, error) {
var share types.AgentShare
err := r.db.WithContext(ctx).
Joins("JOIN organization_members ON organization_members.organization_id = agent_shares.organization_id").
Where("agent_shares.agent_id = ?", agentID).
Where("organization_members.user_id = ?", userID).
Where("agent_shares.source_tenant_id != ?", excludeTenantID).
Where("agent_shares.deleted_at IS NULL").
First(&share).Error
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
return nil, ErrAgentShareNotFound
}
return nil, err
}
return &share, nil
}
+252
View File
@@ -0,0 +1,252 @@
package service
import (
"context"
"errors"
"fmt"
"time"
"github.com/Tencent/WeKnora/internal/application/repository"
"github.com/Tencent/WeKnora/internal/logger"
"github.com/Tencent/WeKnora/internal/types"
"github.com/Tencent/WeKnora/internal/types/interfaces"
"github.com/google/uuid"
)
var (
ErrAgentShareNotFound = errors.New("agent share not found")
ErrAgentSharePermission = errors.New("permission denied for this share operation")
ErrAgentNotFoundForShare = errors.New("agent not found")
ErrNotAgentOwner = errors.New("only agent owner can share")
ErrOrgRoleCannotShareAgent = errors.New("only editors and admins can share agents to this organization")
ErrAgentNotConfigured = errors.New("agent is not fully configured (missing required chat model or rerank model when using knowledge bases)")
)
// agentShareService implements AgentShareService interface
type agentShareService struct {
shareRepo interfaces.AgentShareRepository
orgRepo interfaces.OrganizationRepository
agentRepo interfaces.CustomAgentRepository
userRepo interfaces.UserRepository
}
// NewAgentShareService creates a new agent share service
func NewAgentShareService(
shareRepo interfaces.AgentShareRepository,
orgRepo interfaces.OrganizationRepository,
agentRepo interfaces.CustomAgentRepository,
userRepo interfaces.UserRepository,
) interfaces.AgentShareService {
return &agentShareService{
shareRepo: shareRepo,
orgRepo: orgRepo,
agentRepo: agentRepo,
userRepo: userRepo,
}
}
// ShareAgent shares an agent to an organization
func (s *agentShareService) ShareAgent(ctx context.Context, agentID string, orgID string, userID string, tenantID uint64, permission types.OrgMemberRole) (*types.AgentShare, error) {
logger.Infof(ctx, "Sharing agent %s to organization %s", agentID, orgID)
agent, err := s.agentRepo.GetAgentByID(ctx, agentID, tenantID)
if err != nil || agent == nil {
return nil, ErrAgentNotFoundForShare
}
if agent.TenantID != tenantID {
return nil, ErrNotAgentOwner
}
// Require agent to be fully configured before sharing (same rules as for conversation)
if agent.Config.ModelID == "" {
return nil, ErrAgentNotConfigured
}
usesKB := agent.Config.KBSelectionMode != "none" || len(agent.Config.KnowledgeBases) > 0
if usesKB && agent.Config.RerankModelID == "" {
return nil, ErrAgentNotConfigured
}
_, err = s.orgRepo.GetByID(ctx, orgID)
if err != nil {
if errors.Is(err, repository.ErrOrganizationNotFound) {
return nil, ErrOrgNotFound
}
return nil, err
}
member, err := s.orgRepo.GetMember(ctx, orgID, userID)
if err != nil {
if errors.Is(err, repository.ErrOrgMemberNotFound) {
return nil, ErrUserNotInOrg
}
return nil, err
}
if !member.Role.HasPermission(types.OrgRoleEditor) {
return nil, ErrOrgRoleCannotShareAgent
}
// 智能体共享仅支持只读,不支持可编辑
permission = types.OrgRoleViewer
share := &types.AgentShare{
ID: uuid.New().String(),
AgentID: agentID,
OrganizationID: orgID,
SharedByUserID: userID,
SourceTenantID: tenantID,
Permission: permission,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
}
if err := s.shareRepo.Create(ctx, share); err != nil {
if errors.Is(err, repository.ErrAgentShareAlreadyExists) {
existing, err := s.shareRepo.GetByAgentAndOrg(ctx, agentID, orgID)
if err != nil {
return nil, err
}
existing.Permission = types.OrgRoleViewer
existing.UpdatedAt = time.Now()
if err := s.shareRepo.Update(ctx, existing); err != nil {
return nil, err
}
return existing, nil
}
return nil, err
}
logger.Infof(ctx, "Agent %s shared successfully to organization %s", agentID, orgID)
return share, nil
}
// RemoveShare removes an agent share
func (s *agentShareService) RemoveShare(ctx context.Context, shareID string, userID string) error {
share, err := s.shareRepo.GetByID(ctx, shareID)
if err != nil {
if errors.Is(err, repository.ErrAgentShareNotFound) {
return ErrAgentShareNotFound
}
return err
}
if share.SharedByUserID == userID {
return s.shareRepo.Delete(ctx, shareID)
}
member, err := s.orgRepo.GetMember(ctx, share.OrganizationID, userID)
if err == nil && member.Role == types.OrgRoleAdmin {
return s.shareRepo.Delete(ctx, shareID)
}
return ErrAgentSharePermission
}
// ListSharesByAgent lists all shares for an agent
func (s *agentShareService) ListSharesByAgent(ctx context.Context, agentID string) ([]*types.AgentShare, error) {
return s.shareRepo.ListByAgent(ctx, agentID)
}
// ListSharesByOrganization lists all agent shares for an organization
func (s *agentShareService) ListSharesByOrganization(ctx context.Context, orgID string) ([]*types.AgentShare, error) {
return s.shareRepo.ListByOrganization(ctx, orgID)
}
// ListSharedAgents lists agents shared to the user through organizations, deduplicated by agent ID (keep highest permission)
func (s *agentShareService) ListSharedAgents(ctx context.Context, userID string, currentTenantID uint64) ([]*types.SharedAgentInfo, error) {
shares, err := s.shareRepo.ListSharedAgentsForUser(ctx, userID)
if err != nil {
return nil, err
}
agentInfoMap := make(map[string]*types.SharedAgentInfo)
for _, share := range shares {
if share.SourceTenantID == currentTenantID {
continue
}
if share.Agent == nil {
continue
}
member, err := s.orgRepo.GetMember(ctx, share.OrganizationID, userID)
if err != nil {
continue
}
effectivePermission := share.Permission
if !member.Role.HasPermission(share.Permission) {
effectivePermission = member.Role
}
info := &types.SharedAgentInfo{
Agent: share.Agent,
ShareID: share.ID,
OrganizationID: share.OrganizationID,
OrgName: "",
Permission: effectivePermission,
SourceTenantID: share.SourceTenantID,
SharedAt: share.CreatedAt,
SharedByUserID: share.SharedByUserID,
}
if share.Organization != nil {
info.OrgName = share.Organization.Name
}
if share.SharedByUserID != "" {
if u, err := s.userRepo.GetUserByID(ctx, share.SharedByUserID); err == nil && u != nil {
info.SharedByUsername = u.Username
}
}
key := fmt.Sprintf("%s_%d", share.AgentID, share.SourceTenantID)
existing, exists := agentInfoMap[key]
if !exists {
agentInfoMap[key] = info
} else if effectivePermission.HasPermission(existing.Permission) && effectivePermission != existing.Permission {
agentInfoMap[key] = info
}
}
result := make([]*types.SharedAgentInfo, 0, len(agentInfoMap))
for _, info := range agentInfoMap {
result = append(result, info)
}
return result, nil
}
// GetSharedAgentForUser returns the shared agent by agentID if the user has access; source tenant is resolved from the user's share. One share lookup + one agent lookup.
func (s *agentShareService) GetSharedAgentForUser(ctx context.Context, userID string, currentTenantID uint64, agentID string) (*types.CustomAgent, error) {
if agentID == "" {
return nil, ErrAgentShareNotFound
}
share, err := s.shareRepo.GetShareByAgentIDForUser(ctx, userID, agentID, currentTenantID)
if err != nil {
if errors.Is(err, repository.ErrAgentShareNotFound) {
return nil, ErrAgentSharePermission
}
return nil, err
}
agent, err := s.agentRepo.GetAgentByID(ctx, agentID, share.SourceTenantID)
if err != nil {
if errors.Is(err, repository.ErrCustomAgentNotFound) {
return nil, ErrAgentNotFoundForShare
}
return nil, err
}
return agent, nil
}
// GetShare gets an agent share by ID
func (s *agentShareService) GetShare(ctx context.Context, shareID string) (*types.AgentShare, error) {
share, err := s.shareRepo.GetByID(ctx, shareID)
if err != nil {
if errors.Is(err, repository.ErrAgentShareNotFound) {
return nil, ErrAgentShareNotFound
}
return nil, err
}
return share, nil
}
// GetShareByAgentAndOrg gets an agent share by agent ID and organization ID
func (s *agentShareService) GetShareByAgentAndOrg(ctx context.Context, agentID string, orgID string) (*types.AgentShare, error) {
share, err := s.shareRepo.GetByAgentAndOrg(ctx, agentID, orgID)
if err != nil {
if errors.Is(err, repository.ErrAgentShareNotFound) {
return nil, ErrAgentShareNotFound
}
return nil, err
}
return share, nil
}
@@ -124,6 +124,22 @@ func (s *customAgentService) GetAgentByID(ctx context.Context, id string) (*type
return agent, nil
}
// GetAgentByIDAndTenant retrieves an agent by ID and tenant (for shared agents; does not resolve built-in)
func (s *customAgentService) GetAgentByIDAndTenant(ctx context.Context, id string, tenantID uint64) (*types.CustomAgent, error) {
if id == "" {
logger.Error(ctx, "Agent ID is empty")
return nil, errors.New("agent ID cannot be empty")
}
agent, err := s.repo.GetAgentByID(ctx, id, tenantID)
if err != nil {
if errors.Is(err, repository.ErrCustomAgentNotFound) {
return nil, ErrAgentNotFound
}
return nil, err
}
return agent, nil
}
// ListAgents lists all agents for the current tenant (including built-in agents)
func (s *customAgentService) ListAgents(ctx context.Context) ([]*types.CustomAgent, error) {
tenantID, ok := ctx.Value(types.TenantIDContextKey).(uint64)
@@ -7585,6 +7585,14 @@ func (s *knowledgeService) SearchKnowledge(ctx context.Context, keyword string,
return s.repo.SearchKnowledgeInScopes(ctx, scopes, keyword, offset, limit, fileTypes)
}
// SearchKnowledgeForScopes searches knowledge within the given scopes (e.g. for shared agent context).
func (s *knowledgeService) SearchKnowledgeForScopes(ctx context.Context, scopes []types.KnowledgeSearchScope, keyword string, offset, limit int, fileTypes []string) ([]*types.Knowledge, bool, error) {
if len(scopes) == 0 {
return nil, false, nil
}
return s.repo.SearchKnowledgeInScopes(ctx, scopes, keyword, offset, limit, fileTypes)
}
// ProcessKnowledgeListDelete handles Asynq knowledge list delete tasks
func (s *knowledgeService) ProcessKnowledgeListDelete(ctx context.Context, t *asynq.Task) error {
var payload types.KnowledgeListDeletePayload
@@ -139,6 +139,23 @@ func (s *knowledgeBaseService) GetKnowledgeBaseByIDOnly(ctx context.Context, id
return kb, nil
}
// GetKnowledgeBasesByIDsOnly retrieves knowledge bases by IDs without tenant filter (batch).
func (s *knowledgeBaseService) GetKnowledgeBasesByIDsOnly(ctx context.Context, ids []string) ([]*types.KnowledgeBase, error) {
if len(ids) == 0 {
return nil, nil
}
kbs, err := s.repo.GetKnowledgeBaseByIDs(ctx, ids)
if err != nil {
return nil, err
}
for _, kb := range kbs {
if kb != nil {
kb.EnsureDefaults()
}
}
return kbs, nil
}
// ListKnowledgeBases returns all knowledge bases for a tenant
func (s *knowledgeBaseService) ListKnowledgeBases(ctx context.Context) ([]*types.KnowledgeBase, error) {
tenantID := ctx.Value(types.TenantIDContextKey).(uint64)
@@ -195,6 +212,59 @@ func (s *knowledgeBaseService) ListKnowledgeBases(ctx context.Context) ([]*types
return kbs, nil
}
// ListKnowledgeBasesByTenantID returns all knowledge bases for the given tenant (e.g. for shared agent context).
func (s *knowledgeBaseService) ListKnowledgeBasesByTenantID(ctx context.Context, tenantID uint64) ([]*types.KnowledgeBase, error) {
kbs, err := s.repo.ListKnowledgeBasesByTenantID(ctx, tenantID)
if err != nil {
logger.ErrorWithFields(ctx, err, map[string]interface{}{
"tenant_id": tenantID,
})
return nil, err
}
for _, kb := range kbs {
kb.EnsureDefaults()
switch kb.Type {
case types.KnowledgeBaseTypeDocument:
if cnt, err := s.kgRepo.CountKnowledgeByKnowledgeBaseID(ctx, tenantID, kb.ID); err == nil {
kb.KnowledgeCount = cnt
}
case types.KnowledgeBaseTypeFAQ:
if cnt, err := s.chunkRepo.CountChunksByKnowledgeBaseID(ctx, tenantID, kb.ID); err == nil {
kb.ChunkCount = cnt
}
}
if processingCount, err := s.kgRepo.CountKnowledgeByStatus(ctx, tenantID, kb.ID, []string{"pending", "processing"}); err == nil {
kb.IsProcessing = processingCount > 0
kb.ProcessingCount = processingCount
}
}
return kbs, nil
}
// FillKnowledgeBaseCounts fills KnowledgeCount, ChunkCount, IsProcessing, ProcessingCount for the given KB using kb.TenantID.
func (s *knowledgeBaseService) FillKnowledgeBaseCounts(ctx context.Context, kb *types.KnowledgeBase) error {
if kb == nil {
return nil
}
tenantID := kb.TenantID
kb.EnsureDefaults()
switch kb.Type {
case types.KnowledgeBaseTypeDocument:
if cnt, err := s.kgRepo.CountKnowledgeByKnowledgeBaseID(ctx, tenantID, kb.ID); err == nil {
kb.KnowledgeCount = cnt
}
case types.KnowledgeBaseTypeFAQ:
if cnt, err := s.chunkRepo.CountChunksByKnowledgeBaseID(ctx, tenantID, kb.ID); err == nil {
kb.ChunkCount = cnt
}
}
if processingCount, err := s.kgRepo.CountKnowledgeByStatus(ctx, tenantID, kb.ID, []string{"pending", "processing"}); err == nil {
kb.IsProcessing = processingCount > 0
kb.ProcessingCount = processingCount
}
return nil
}
// UpdateKnowledgeBase updates a knowledge base's properties
func (s *knowledgeBaseService) UpdateKnowledgeBase(ctx context.Context,
id string,
+22 -7
View File
@@ -39,17 +39,24 @@ var (
// organizationService implements OrganizationService interface
type organizationService struct {
orgRepo interfaces.OrganizationRepository
userRepo interfaces.UserRepository
shareRepo interfaces.KBShareRepository
orgRepo interfaces.OrganizationRepository
userRepo interfaces.UserRepository
shareRepo interfaces.KBShareRepository
agentShareRepo interfaces.AgentShareRepository
}
// NewOrganizationService creates a new organization service
func NewOrganizationService(orgRepo interfaces.OrganizationRepository, userRepo interfaces.UserRepository, shareRepo interfaces.KBShareRepository) interfaces.OrganizationService {
func NewOrganizationService(
orgRepo interfaces.OrganizationRepository,
userRepo interfaces.UserRepository,
shareRepo interfaces.KBShareRepository,
agentShareRepo interfaces.AgentShareRepository,
) interfaces.OrganizationService {
return &organizationService{
orgRepo: orgRepo,
userRepo: userRepo,
shareRepo: shareRepo,
orgRepo: orgRepo,
userRepo: userRepo,
shareRepo: shareRepo,
agentShareRepo: agentShareRepo,
}
}
@@ -227,6 +234,7 @@ func (s *organizationService) SearchSearchableOrganizations(ctx context.Context,
}
memberCounts := make(map[string]int64)
shareCounts := make(map[string]int64)
agentShareCounts := make(map[string]int)
memberOrgIDs := make(map[string]bool)
for _, org := range orgs {
if mc, err := s.orgRepo.CountMembers(ctx, org.ID); err == nil {
@@ -234,6 +242,9 @@ func (s *organizationService) SearchSearchableOrganizations(ctx context.Context,
}
shares, _ := s.shareRepo.ListByOrganization(ctx, org.ID)
shareCounts[org.ID] = int64(len(shares))
if agentShares, err := s.agentShareRepo.ListByOrganization(ctx, org.ID); err == nil {
agentShareCounts[org.ID] = len(agentShares)
}
_, err := s.orgRepo.GetMember(ctx, org.ID, userID)
memberOrgIDs[org.ID] = (err == nil)
}
@@ -247,6 +258,7 @@ func (s *organizationService) SearchSearchableOrganizations(ctx context.Context,
MemberCount: int(memberCounts[org.ID]),
MemberLimit: org.MemberLimit,
ShareCount: int(shareCounts[org.ID]),
AgentShareCount: agentShareCounts[org.ID],
IsAlreadyMember: memberOrgIDs[org.ID],
RequireApproval: org.RequireApproval,
})
@@ -312,6 +324,9 @@ func (s *organizationService) DeleteOrganization(ctx context.Context, id string,
if err := s.shareRepo.DeleteByOrganizationID(ctx, id); err != nil {
logger.Warnf(ctx, "Failed to delete KB shares for organization %s: %v", id, err)
}
if err := s.agentShareRepo.DeleteByOrganizationID(ctx, id); err != nil {
logger.Warnf(ctx, "Failed to delete agent shares for organization %s: %v", id, err)
}
return s.orgRepo.Delete(ctx, id)
}
+69 -42
View File
@@ -577,8 +577,20 @@ func (s *sessionService) KnowledgeQA(
}
}
// Retrieval scope: when agent is set, use agent's tenant (own or shared); otherwise session tenant or context
retrievalTenantID := session.TenantID
if customAgent != nil && customAgent.TenantID != 0 {
retrievalTenantID = customAgent.TenantID
logger.Infof(ctx, "Using agent tenant %d for retrieval scope", retrievalTenantID)
} else if v := ctx.Value(types.TenantIDContextKey); v != nil {
if tid, ok := v.(uint64); ok && tid != 0 {
retrievalTenantID = tid
logger.Infof(ctx, "Using effective tenant %d for retrieval from context", retrievalTenantID)
}
}
// Build unified search targets (computed once, used throughout pipeline)
searchTargets, err := s.buildSearchTargets(ctx, session.TenantID, knowledgeBaseIDs, knowledgeIDs)
searchTargets, err := s.buildSearchTargets(ctx, retrievalTenantID, knowledgeBaseIDs, knowledgeIDs)
if err != nil {
logger.Warnf(ctx, "Failed to build search targets: %v", err)
}
@@ -614,7 +626,7 @@ func (s *sessionService) KnowledgeQA(
FallbackPrompt: fallbackPrompt,
EventBus: eventBus.AsEventBusInterface(), // NEW: For pipeline to emit events directly
WebSearchEnabled: webSearchEnabled,
TenantID: session.TenantID,
TenantID: retrievalTenantID, // Effective tenant for retrieval (shared agent = agent's tenant)
RewritePromptSystem: rewritePromptSystem,
RewritePromptUser: rewritePromptUser,
EnableRewrite: enableRewrite,
@@ -923,12 +935,12 @@ func (s *sessionService) configureSkillsFromAgent(
}
// buildSearchTargets computes the unified search targets from knowledgeBaseIDs and knowledgeIDs
// This is called once at the request entry point to avoid repeated queries later in the pipeline
// buildSearchTargets computes the unified search targets from knowledgeBaseIDs and knowledgeIDs.
// tenantID is the retrieval scope: session.TenantID or effective tenant from shared agent (set by handler).
// This is called once at the request entry point to avoid repeated queries later in the pipeline.
// Logic:
// - For each knowledgeBaseID: create a SearchTargetTypeKnowledgeBase target with correct TenantID
// - For each knowledgeID: find its knowledgeBaseID, if the KB is already in the list, skip (covered by full KB search)
// otherwise create a SearchTargetTypeKnowledge target grouped by KB
// - For each knowledgeBaseID: resolve actual TenantID (own, org-shared, or in retrieval-tenant scope for shared agent)
// - For each knowledgeID: find its knowledgeBaseID; if the KB is already in the list, skip; otherwise add SearchTargetTypeKnowledge
func (s *sessionService) buildSearchTargets(
ctx context.Context,
tenantID uint64,
@@ -943,34 +955,31 @@ func (s *sessionService) buildSearchTargets(
// Track which KBs are fully searched
fullKBSet := make(map[string]bool)
// First pass: process knowledge base IDs and get their tenant info
// First pass: batch-fetch KBs, then resolve tenant per ID (tenant scope already set by caller)
if len(knowledgeBaseIDs) > 0 {
// Get KB details to determine their actual tenant IDs (may include shared KBs)
kbs, _ := s.knowledgeBaseService.GetKnowledgeBasesByIDsOnly(ctx, knowledgeBaseIDs)
kbByID := make(map[string]*types.KnowledgeBase, len(kbs))
for _, kb := range kbs {
if kb != nil {
kbByID[kb.ID] = kb
}
}
userID, _ := ctx.Value(types.UserIDContextKey).(string)
for _, kbID := range knowledgeBaseIDs {
fullKBSet[kbID] = true
// Try to get KB info - first from current tenant, then from shared access
kb, err := s.knowledgeBaseService.GetKnowledgeBaseByID(ctx, kbID)
if err != nil {
// May be a shared KB from another tenant - use kbShareService to check
if s.kbShareService != nil {
userID, _ := ctx.Value(types.UserIDContextKey).(string)
if userID != "" {
// Check if user has at least viewer permission on this KB
hasAccess, _ := s.kbShareService.HasKBPermission(ctx, kbID, userID, types.OrgRoleViewer)
if hasAccess {
// Get KB info without tenant filter
kbInfo, err := s.knowledgeBaseService.GetKnowledgeBaseByIDOnly(ctx, kbID)
if err == nil && kbInfo != nil {
kbTenantMap[kbID] = kbInfo.TenantID
}
}
}
kb := kbByID[kbID]
if kb == nil {
kbTenantMap[kbID] = tenantID
} else if kb.TenantID == tenantID {
kbTenantMap[kbID] = tenantID
} else if s.kbShareService != nil && userID != "" {
hasAccess, _ := s.kbShareService.HasKBPermission(ctx, kbID, userID, types.OrgRoleViewer)
if hasAccess {
kbTenantMap[kbID] = kb.TenantID
} else {
kbTenantMap[kbID] = tenantID
}
} else if kb != nil {
kbTenantMap[kbID] = kb.TenantID
}
// Default to current tenant if we couldn't determine the actual tenant
if kbTenantMap[kbID] == 0 {
} else {
kbTenantMap[kbID] = tenantID
}
targets = append(targets, &types.SearchTarget{
@@ -1215,26 +1224,44 @@ func (s *sessionService) AgentQA(
knowledgeIDs []string,
) error {
sessionID := session.ID
tenantID := ctx.Value(types.TenantIDContextKey).(uint64)
sessionJSON, err := json.Marshal(session)
if err != nil {
logger.Errorf(ctx, "Failed to marshal session, session ID: %s, error: %v", sessionID, err)
return fmt.Errorf("failed to marshal session: %w", err)
}
logger.Infof(ctx, "Start agent-based question answering, session ID: %s, tenant ID: %d, query: %s, session: %s",
sessionID, tenantID, query, string(sessionJSON))
// Build effective agent configuration by merging session and tenant configs
// All config now comes from customAgent parameter
tenantInfo := ctx.Value(types.TenantInfoContextKey).(*types.Tenant)
// customAgent is required for AgentQA
// customAgent is required for AgentQA (handler has already done permission check for shared agent)
if customAgent == nil {
logger.Warnf(ctx, "Custom agent not provided for session: %s", sessionID)
return errors.New("custom agent configuration is required for agent QA")
}
// Use agent's tenant for retrieval and tenant-scoped config (handler has validated access)
agentTenantID := customAgent.TenantID
if agentTenantID == 0 {
agentTenantID = session.TenantID
}
logger.Infof(ctx, "Start agent-based question answering, session ID: %s, agent tenant ID: %d, query: %s, session: %s",
sessionID, agentTenantID, query, string(sessionJSON))
var tenantInfo *types.Tenant
if v := ctx.Value(types.TenantInfoContextKey); v != nil {
tenantInfo, _ = v.(*types.Tenant)
}
// When agent belongs to another tenant (shared agent), use agent's tenant for KB/model scope; load tenantInfo if needed
if tenantInfo == nil || tenantInfo.ID != agentTenantID {
if s.tenantService != nil {
if agentTenant, err := s.tenantService.GetTenantByID(ctx, agentTenantID); err == nil && agentTenant != nil {
tenantInfo = agentTenant
logger.Infof(ctx, "Using agent tenant info for retrieval scope, tenant ID: %d", agentTenantID)
}
}
}
if tenantInfo == nil {
logger.Warnf(ctx, "Tenant info not available for agent tenant %d, proceeding with defaults", agentTenantID)
tenantInfo = &types.Tenant{ID: agentTenantID}
}
// Ensure defaults are set
customAgent.EnsureDefaults()
@@ -1317,8 +1344,8 @@ func (s *sessionService) AgentQA(
logger.Infof(ctx, "No knowledge bases specified for agent, running in pure agent mode")
}
// Build search targets for agent (pre-compute once to avoid repeated queries)
searchTargets, err := s.buildSearchTargets(ctx, tenantInfo.ID, agentConfig.KnowledgeBases, agentConfig.KnowledgeIDs)
// Build search targets using agent's tenant (handler has validated access for shared agent)
searchTargets, err := s.buildSearchTargets(ctx, agentTenantID, agentConfig.KnowledgeBases, agentConfig.KnowledgeIDs)
if err != nil {
logger.Warnf(ctx, "Failed to build search targets for agent: %v", err)
// Continue without search targets, the tool will handle empty targets
+2
View File
@@ -113,6 +113,7 @@ func BuildContainer(container *dig.Container) *dig.Container {
must(container.Provide(repository.NewCustomAgentRepository))
must(container.Provide(repository.NewOrganizationRepository))
must(container.Provide(repository.NewKBShareRepository))
must(container.Provide(repository.NewAgentShareRepository))
must(container.Provide(service.NewWebSearchStateService))
// MCP manager for managing MCP client connections
@@ -125,6 +126,7 @@ func BuildContainer(container *dig.Container) *dig.Container {
must(container.Provide(service.NewKnowledgeBaseService))
must(container.Provide(service.NewOrganizationService))
must(container.Provide(service.NewKBShareService)) // KBShareService must be registered before KnowledgeService and KnowledgeTagService
must(container.Provide(service.NewAgentShareService))
must(container.Provide(service.NewKnowledgeService))
must(container.Provide(service.NewChunkService))
must(container.Provide(service.NewKnowledgeTagService))
+154 -33
View File
@@ -9,8 +9,10 @@ import (
"strconv"
"strings"
"github.com/Tencent/WeKnora/internal/application/service"
"github.com/Tencent/WeKnora/internal/errors"
"github.com/Tencent/WeKnora/internal/logger"
goerrors "errors"
"github.com/Tencent/WeKnora/internal/types"
"github.com/Tencent/WeKnora/internal/types/interfaces"
secutils "github.com/Tencent/WeKnora/internal/utils"
@@ -19,9 +21,10 @@ import (
// KnowledgeHandler processes HTTP requests related to knowledge resources
type KnowledgeHandler struct {
kgService interfaces.KnowledgeService
kbService interfaces.KnowledgeBaseService
kbShareService interfaces.KBShareService
kgService interfaces.KnowledgeService
kbService interfaces.KnowledgeBaseService
kbShareService interfaces.KBShareService
agentShareService interfaces.AgentShareService
}
// NewKnowledgeHandler creates a new knowledge handler instance
@@ -29,11 +32,13 @@ func NewKnowledgeHandler(
kgService interfaces.KnowledgeService,
kbService interfaces.KnowledgeBaseService,
kbShareService interfaces.KBShareService,
agentShareService interfaces.AgentShareService,
) *KnowledgeHandler {
return &KnowledgeHandler{
kgService: kgService,
kbService: kbService,
kbShareService: kbShareService,
kgService: kgService,
kbService: kbService,
kbShareService: kbShareService,
agentShareService: agentShareService,
}
}
@@ -157,18 +162,41 @@ func (h *KnowledgeHandler) resolveKnowledgeAndValidateKBAccess(c *gin.Context, k
}
// Shared KB: check organization permission
if !userExists || h.kbShareService == nil {
return nil, ctx, errors.NewForbiddenError("Permission denied to access this knowledge")
if userExists && h.kbShareService != nil {
permission, isShared, permErr := h.kbShareService.CheckUserKBPermission(ctx, knowledge.KnowledgeBaseID, userID.(string))
if permErr == nil && isShared && permission.HasPermission(requiredPermission) {
effectiveTenantID := knowledge.TenantID
return knowledge, context.WithValue(ctx, types.TenantIDContextKey, effectiveTenantID), nil
}
}
permission, isShared, permErr := h.kbShareService.CheckUserKBPermission(ctx, knowledge.KnowledgeBaseID, userID.(string))
if permErr != nil || !isShared {
return nil, ctx, errors.NewForbiddenError("Permission denied to access this knowledge")
// Shared agent: request passes agent_id, verify user has that shared agent and the agent has access to this knowledge/KB
if userExists && h.agentShareService != nil && requiredPermission == types.OrgRoleViewer {
agentID := c.Query("agent_id")
if agentID != "" {
agent, err := h.agentShareService.GetSharedAgentForUser(ctx, userID.(string), tenantID, agentID)
if err == nil && agent != nil {
if knowledge.TenantID != agent.TenantID {
return nil, ctx, errors.NewForbiddenError("Permission denied to access this knowledge")
}
mode := agent.Config.KBSelectionMode
if mode == "none" {
return nil, ctx, errors.NewForbiddenError("Permission denied to access this knowledge")
}
if mode == "all" {
return knowledge, context.WithValue(ctx, types.TenantIDContextKey, knowledge.TenantID), nil
}
if mode == "selected" {
for _, kbID := range agent.Config.KnowledgeBases {
if kbID == knowledge.KnowledgeBaseID {
return knowledge, context.WithValue(ctx, types.TenantIDContextKey, knowledge.TenantID), nil
}
}
return nil, ctx, errors.NewForbiddenError("Permission denied to access this knowledge")
}
}
}
}
if !permission.HasPermission(requiredPermission) {
return nil, ctx, errors.NewForbiddenError("Insufficient permission for this operation")
}
effectiveTenantID := knowledge.TenantID
return knowledge, context.WithValue(ctx, types.TenantIDContextKey, effectiveTenantID), nil
return nil, ctx, errors.NewForbiddenError("Permission denied to access this knowledge")
}
// handleDuplicateKnowledgeError handles cases where duplicate knowledge is detected
@@ -680,20 +708,22 @@ func (h *KnowledgeHandler) DownloadKnowledgeFile(c *gin.Context) {
// GetKnowledgeBatchRequest defines parameters for batch knowledge retrieval
type GetKnowledgeBatchRequest struct {
IDs []string `form:"ids" binding:"required"` // List of knowledge IDs
KBID string `form:"kb_id"` // Optional: scope to this KB (validates access and uses effective tenant for shared KB)
IDs []string `form:"ids" binding:"required"` // List of knowledge IDs
KBID string `form:"kb_id"` // Optional: scope to this KB (validates access and uses effective tenant for shared KB)
AgentID string `form:"agent_id"` // Optional: when using a shared agent, use agent's tenant for retrieval (validates shared agent access)
}
// GetKnowledgeBatch godoc
// @Summary 批量获取知识
// @Description 根据ID列表批量获取知识条目。可选 kb_id:指定时按该知识库校验权限并用于共享知识库的租户解析
// @Description 根据ID列表批量获取知识条目。可选 kb_id:指定时按该知识库校验权限并用于共享知识库的租户解析;可选 agent_id:使用共享智能体时传此参数,后端按智能体所属租户查询(用于刷新后恢复共享知识库下的文件)
// @Tags 知识管理
// @Accept json
// @Produce json
// @Param ids query []string true "知识ID列表"
// @Param kb_id query string false "可选,知识库ID(用于共享知识库时指定范围)"
// @Success 200 {object} map[string]interface{} "知识列表"
// @Failure 400 {object} errors.AppError "请求参数错误"
// @Param ids query []string true "知识ID列表"
// @Param kb_id query string false "可选,知识库ID(用于共享知识库时指定范围)"
// @Param agent_id query string false "可选,共享智能体ID(用于按智能体租户批量拉取文件详情)"
// @Success 200 {object} map[string]interface{} "知识列表"
// @Failure 400 {object} errors.AppError "请求参数错误"
// @Security Bearer
// @Security ApiKeyAuth
// @Router /knowledge/batch [get]
@@ -715,6 +745,30 @@ func (h *KnowledgeHandler) GetKnowledgeBatch(c *gin.Context) {
return
}
// Optional agent_id: when using shared agent, resolve agent and use its tenant for batch retrieval (so shared KB files can be loaded after refresh)
if agentID := secutils.SanitizeForLog(req.AgentID); agentID != "" && h.agentShareService != nil {
userIDVal, ok := c.Get(types.UserIDContextKey.String())
if !ok {
c.Error(errors.NewUnauthorizedError("Unauthorized"))
return
}
userID, _ := userIDVal.(string)
currentTenantID := c.GetUint64(types.TenantIDContextKey.String())
if currentTenantID == 0 {
c.Error(errors.NewUnauthorizedError("Unauthorized"))
return
}
agent, err := h.agentShareService.GetSharedAgentForUser(ctx, userID, currentTenantID, agentID)
if err != nil || agent == nil {
logger.Warnf(ctx, "GetKnowledgeBatch: invalid or inaccessible shared agent %s: %v", agentID, err)
c.Error(errors.NewForbiddenError("Invalid or inaccessible shared agent").WithDetails(err.Error()))
return
}
effectiveTenantID = agent.TenantID
logger.Infof(ctx, "Batch retrieving knowledge with agent_id, effective tenant ID: %d, IDs count: %d",
effectiveTenantID, len(req.IDs))
}
var knowledges []*types.Knowledge
var err error
@@ -733,9 +787,8 @@ func (h *KnowledgeHandler) GetKnowledgeBatch(c *gin.Context) {
knowledges, err = h.kgService.GetKnowledgeBatch(ctx, effectiveTenantID, req.IDs)
} else {
// No kb_id provided: use GetKnowledgeBatchWithSharedAccess to support cross-tenant shared files
// This is needed when page is refreshed and frontend doesn't have kb_id mapping
logger.Infof(ctx, "Batch retrieving knowledge without kb_id (using shared access), tenant ID: %d, IDs count: %d",
// No kb_id: use GetKnowledgeBatchWithSharedAccess (or effectiveTenantID may already be set by agent_id for shared agent)
logger.Infof(ctx, "Batch retrieving knowledge without kb_id, effective tenant ID: %d, IDs count: %d",
effectiveTenantID, len(req.IDs))
knowledges, err = h.kgService.GetKnowledgeBatchWithSharedAccess(ctx, effectiveTenantID, req.IDs)
@@ -999,14 +1052,15 @@ func (h *KnowledgeHandler) UpdateImageInfo(c *gin.Context) {
// SearchKnowledge godoc
// @Summary Search knowledge
// @Description Search knowledge files by keyword across all knowledge bases
// @Description Search knowledge files by keyword. When agent_id is set (shared agent), scope is the agent's configured knowledge bases.
// @Tags Knowledge
// @Accept json
// @Produce json
// @Param keyword query string false "Keyword to search"
// @Param offset query int false "Offset for pagination"
// @Param limit query int false "Limit for pagination (default 20)"
// @Param file_types query string false "Comma-separated file extensions to filter (e.g., csv,xlsx)"
// @Param keyword query string false "Keyword to search"
// @Param offset query int false "Offset for pagination"
// @Param limit query int false "Limit for pagination (default 20)"
// @Param file_types query string false "Comma-separated file extensions to filter (e.g., csv,xlsx)"
// @Param agent_id query string false "Shared agent ID (search within agent's KB scope)"
// @Success 200 {object} map[string]interface{} "Search results"
// @Failure 400 {object} errors.AppError "Invalid request"
// @Security Bearer
@@ -1021,7 +1075,6 @@ func (h *KnowledgeHandler) SearchKnowledge(c *gin.Context) {
offset, _ := strconv.Atoi(c.DefaultQuery("offset", "0"))
limit, _ := strconv.Atoi(c.DefaultQuery("limit", "20"))
// Parse file_types parameter (comma-separated)
var fileTypes []string
if fileTypesStr := c.Query("file_types"); fileTypesStr != "" {
for _, ft := range strings.Split(fileTypesStr, ",") {
@@ -1032,7 +1085,75 @@ func (h *KnowledgeHandler) SearchKnowledge(c *gin.Context) {
}
}
// Retrieve knowledge entries (own + shared KBs; empty keyword returns recent files)
agentID := c.Query("agent_id")
if agentID != "" {
userIDVal, ok := c.Get(types.UserIDContextKey.String())
if !ok {
c.Error(errors.NewUnauthorizedError("user ID not found"))
return
}
userID, _ := userIDVal.(string)
currentTenantID := c.GetUint64(types.TenantIDContextKey.String())
if currentTenantID == 0 {
c.Error(errors.NewUnauthorizedError("tenant ID not found"))
return
}
agent, err := h.agentShareService.GetSharedAgentForUser(ctx, userID, currentTenantID, agentID)
if err != nil {
if goerrors.Is(err, service.ErrAgentShareNotFound) || goerrors.Is(err, service.ErrAgentSharePermission) || goerrors.Is(err, service.ErrAgentNotFoundForShare) {
c.Error(errors.NewForbiddenError("no permission for this shared agent"))
return
}
logger.ErrorWithFields(ctx, err, nil)
c.Error(errors.NewInternalServerError("Failed to verify shared agent access").WithDetails(err.Error()))
return
}
sourceTenantID := agent.TenantID
mode := agent.Config.KBSelectionMode
if mode == "none" {
c.JSON(http.StatusOK, gin.H{
"success": true,
"data": []interface{}{},
"has_more": false,
})
return
}
var scopes []types.KnowledgeSearchScope
if mode == "selected" && len(agent.Config.KnowledgeBases) > 0 {
for _, kbID := range agent.Config.KnowledgeBases {
if kbID != "" {
scopes = append(scopes, types.KnowledgeSearchScope{TenantID: sourceTenantID, KBID: kbID})
}
}
}
if len(scopes) == 0 {
kbs, err := h.kbService.ListKnowledgeBasesByTenantID(ctx, sourceTenantID)
if err != nil {
logger.ErrorWithFields(ctx, err, nil)
c.Error(errors.NewInternalServerError("Failed to list knowledge bases").WithDetails(err.Error()))
return
}
for _, kb := range kbs {
if kb != nil && kb.Type == types.KnowledgeBaseTypeDocument {
scopes = append(scopes, types.KnowledgeSearchScope{TenantID: sourceTenantID, KBID: kb.ID})
}
}
}
knowledges, hasMore, err := h.kgService.SearchKnowledgeForScopes(ctx, scopes, keyword, offset, limit, fileTypes)
if err != nil {
logger.ErrorWithFields(ctx, err, nil)
c.Error(errors.NewInternalServerError("Failed to search knowledge").WithDetails(err.Error()))
return
}
c.JSON(http.StatusOK, gin.H{
"success": true,
"data": knowledges,
"has_more": hasMore,
})
return
}
// Default: own + shared KBs
knowledges, hasMore, err := h.kgService.SearchKnowledge(ctx, keyword, offset, limit, fileTypes)
if err != nil {
logger.ErrorWithFields(ctx, err, nil)
+139 -42
View File
@@ -8,7 +8,9 @@ import (
"time"
"github.com/Tencent/WeKnora/internal/application/repository"
"github.com/Tencent/WeKnora/internal/application/service"
"github.com/Tencent/WeKnora/internal/errors"
apperrors "github.com/Tencent/WeKnora/internal/errors"
"github.com/Tencent/WeKnora/internal/logger"
"github.com/Tencent/WeKnora/internal/types"
"github.com/Tencent/WeKnora/internal/types/interfaces"
@@ -20,10 +22,11 @@ import (
// KnowledgeBaseHandler defines the HTTP handler for knowledge base operations
type KnowledgeBaseHandler struct {
service interfaces.KnowledgeBaseService
knowledgeService interfaces.KnowledgeService
kbShareService interfaces.KBShareService
asynqClient *asynq.Client
service interfaces.KnowledgeBaseService
knowledgeService interfaces.KnowledgeService
kbShareService interfaces.KBShareService
agentShareService interfaces.AgentShareService
asynqClient *asynq.Client
}
// NewKnowledgeBaseHandler creates a new knowledge base handler instance
@@ -31,13 +34,15 @@ func NewKnowledgeBaseHandler(
service interfaces.KnowledgeBaseService,
knowledgeService interfaces.KnowledgeService,
kbShareService interfaces.KBShareService,
agentShareService interfaces.AgentShareService,
asynqClient *asynq.Client,
) *KnowledgeBaseHandler {
return &KnowledgeBaseHandler{
service: service,
knowledgeService: knowledgeService,
kbShareService: kbShareService,
asynqClient: asynqClient,
service: service,
knowledgeService: knowledgeService,
kbShareService: kbShareService,
agentShareService: agentShareService,
asynqClient: asynqClient,
}
}
@@ -70,7 +75,7 @@ func (h *KnowledgeBaseHandler) HybridSearch(c *gin.Context) {
var req types.SearchParams
if err := c.ShouldBindJSON(&req); err != nil {
logger.Error(ctx, "Failed to parse request parameters", err)
c.Error(errors.NewBadRequestError("Invalid request parameters").WithDetails(err.Error()))
c.Error(apperrors.NewBadRequestError("Invalid request parameters").WithDetails(err.Error()))
return
}
@@ -82,7 +87,7 @@ func (h *KnowledgeBaseHandler) HybridSearch(c *gin.Context) {
results, err := h.service.HybridSearch(ctx, id, req)
if err != nil {
logger.ErrorWithFields(ctx, err, nil)
c.Error(errors.NewInternalServerError(err.Error()))
c.Error(apperrors.NewInternalServerError(err.Error()))
return
}
@@ -115,7 +120,7 @@ func (h *KnowledgeBaseHandler) CreateKnowledgeBase(c *gin.Context) {
var req types.KnowledgeBase
if err := c.ShouldBindJSON(&req); err != nil {
logger.Error(ctx, "Failed to parse request parameters", err)
c.Error(errors.NewBadRequestError("Invalid request parameters").WithDetails(err.Error()))
c.Error(apperrors.NewBadRequestError("Invalid request parameters").WithDetails(err.Error()))
return
}
if err := validateExtractConfig(req.ExtractConfig); err != nil {
@@ -129,7 +134,7 @@ func (h *KnowledgeBaseHandler) CreateKnowledgeBase(c *gin.Context) {
kb, err := h.service.CreateKnowledgeBase(ctx, &req)
if err != nil {
logger.ErrorWithFields(ctx, err, nil)
c.Error(errors.NewInternalServerError(err.Error()))
c.Error(apperrors.NewInternalServerError(err.Error()))
return
}
@@ -152,7 +157,7 @@ func (h *KnowledgeBaseHandler) validateAndGetKnowledgeBase(c *gin.Context) (*typ
tenantID, exists := c.Get(types.TenantIDContextKey.String())
if !exists {
logger.Error(ctx, "Failed to get tenant ID")
return nil, "", 0, "", errors.NewUnauthorizedError("Unauthorized")
return nil, "", 0, "", apperrors.NewUnauthorizedError("Unauthorized")
}
// Get user ID from context (needed for shared KB permission check)
@@ -162,14 +167,14 @@ func (h *KnowledgeBaseHandler) validateAndGetKnowledgeBase(c *gin.Context) (*typ
id := secutils.SanitizeForLog(c.Param("id"))
if id == "" {
logger.Error(ctx, "Knowledge base ID is empty")
return nil, "", 0, "", errors.NewBadRequestError("Knowledge base ID cannot be empty")
return nil, "", 0, "", apperrors.NewBadRequestError("Knowledge base ID cannot be empty")
}
// Verify tenant has permission to access this knowledge base
kb, err := h.service.GetKnowledgeBaseByID(ctx, id)
if err != nil {
logger.ErrorWithFields(ctx, err, nil)
return nil, id, 0, "", errors.NewInternalServerError(err.Error())
return nil, id, 0, "", apperrors.NewInternalServerError(err.Error())
}
// Check 1: Verify tenant ownership (owner has full access)
@@ -192,6 +197,37 @@ func (h *KnowledgeBaseHandler) validateAndGetKnowledgeBase(c *gin.Context) (*typ
}
}
// Check 3: Shared agent — request has agent_id, verify user has that shared agent and the agent has access to this KB
if userExists && h.agentShareService != nil {
agentID := c.Query("agent_id")
if agentID != "" {
currentTenantID := c.GetUint64(types.TenantIDContextKey.String())
if currentTenantID != 0 {
agent, err := h.agentShareService.GetSharedAgentForUser(ctx, userID.(string), currentTenantID, agentID)
if err == nil && agent != nil {
if kb.TenantID != agent.TenantID {
logger.Warnf(ctx, "Shared agent tenant mismatch, KB %s tenant: %d, agent tenant: %d", id, kb.TenantID, agent.TenantID)
} else {
mode := agent.Config.KBSelectionMode
if mode == "none" {
// no-op, fall through to forbid
} else if mode == "all" {
logger.Infof(ctx, "User %s accessing KB %s via shared agent %s (mode=all)", userID.(string), id, agentID)
return kb, id, kb.TenantID, types.OrgRoleViewer, nil
} else if mode == "selected" {
for _, allowedID := range agent.Config.KnowledgeBases {
if allowedID == id {
logger.Infof(ctx, "User %s accessing KB %s via shared agent %s (mode=selected)", userID.(string), id, agentID)
return kb, id, kb.TenantID, types.OrgRoleViewer, nil
}
}
}
}
}
}
}
}
// No permission: not owner and no shared access
logger.Warnf(
ctx,
@@ -199,16 +235,17 @@ func (h *KnowledgeBaseHandler) validateAndGetKnowledgeBase(c *gin.Context) (*typ
"request tenant ID: %d, knowledge base tenant ID: %d",
id, tenantID.(uint64), kb.TenantID,
)
return nil, id, 0, "", errors.NewForbiddenError("No permission to operate")
return nil, id, 0, "", apperrors.NewForbiddenError("No permission to operate")
}
// GetKnowledgeBase godoc
// @Summary 获取知识库详情
// @Description 根据ID获取知识库详情
// @Description 根据ID获取知识库详情。当使用共享智能体时,可传 agent_id 以校验该智能体是否有权访问该知识库。
// @Tags 知识库
// @Accept json
// @Produce json
// @Param id path string true "知识库ID"
// @Param id path string true "知识库ID"
// @Param agent_id query string false "共享智能体 ID(用于校验智能体是否有权访问该知识库)"
// @Success 200 {object} map[string]interface{} "知识库详情"
// @Failure 400 {object} errors.AppError "请求参数错误"
// @Failure 404 {object} errors.AppError "知识库不存在"
@@ -222,6 +259,10 @@ func (h *KnowledgeBaseHandler) GetKnowledgeBase(c *gin.Context) {
c.Error(err)
return
}
// Fill counts (knowledge_count, chunk_count, is_processing) so hover/detail shows correct numbers
if fillErr := h.service.FillKnowledgeBaseCounts(c.Request.Context(), kb); fillErr != nil {
logger.Warnf(c.Request.Context(), "Failed to fill KB counts for %s: %v", kb.ID, fillErr)
}
c.JSON(http.StatusOK, gin.H{
"success": true,
"data": kb,
@@ -230,10 +271,11 @@ func (h *KnowledgeBaseHandler) GetKnowledgeBase(c *gin.Context) {
// ListKnowledgeBases godoc
// @Summary 获取知识库列表
// @Description 获取当前租户的所有知识库
// @Description 获取当前租户的所有知识库;或当传入 agent_id(共享智能体)时,校验权限后返回该智能体配置的知识库范围(用于 @ 提及)
// @Tags 知识库
// @Accept json
// @Produce json
// @Param agent_id query string false "共享智能体 ID(传入时返回该智能体可用的知识库)"
// @Success 200 {object} map[string]interface{} "知识库列表"
// @Failure 500 {object} errors.AppError "服务器错误"
// @Security Bearer
@@ -242,11 +284,66 @@ func (h *KnowledgeBaseHandler) GetKnowledgeBase(c *gin.Context) {
func (h *KnowledgeBaseHandler) ListKnowledgeBases(c *gin.Context) {
ctx := c.Request.Context()
agentID := c.Query("agent_id")
if agentID != "" {
userIDVal, ok := c.Get(types.UserIDContextKey.String())
if !ok {
c.Error(apperrors.NewUnauthorizedError("user ID not found"))
return
}
userID, _ := userIDVal.(string)
currentTenantID := c.GetUint64(types.TenantIDContextKey.String())
if currentTenantID == 0 {
c.Error(apperrors.NewUnauthorizedError("tenant ID not found"))
return
}
agent, err := h.agentShareService.GetSharedAgentForUser(ctx, userID, currentTenantID, agentID)
if err != nil {
if stderrors.Is(err, service.ErrAgentShareNotFound) || stderrors.Is(err, service.ErrAgentSharePermission) || stderrors.Is(err, service.ErrAgentNotFoundForShare) {
c.Error(apperrors.NewForbiddenError("no permission for this shared agent"))
return
}
logger.ErrorWithFields(ctx, err, nil)
c.Error(apperrors.NewInternalServerError(err.Error()))
return
}
mode := agent.Config.KBSelectionMode
if mode == "none" {
c.JSON(http.StatusOK, gin.H{"success": true, "data": []interface{}{}})
return
}
sourceTenantID := agent.TenantID
kbs, err := h.service.ListKnowledgeBasesByTenantID(ctx, sourceTenantID)
if err != nil {
logger.ErrorWithFields(ctx, err, nil)
c.Error(apperrors.NewInternalServerError(err.Error()))
return
}
if mode == "selected" && len(agent.Config.KnowledgeBases) > 0 {
allowed := make(map[string]bool)
for _, id := range agent.Config.KnowledgeBases {
allowed[id] = true
}
filtered := make([]*types.KnowledgeBase, 0, len(kbs))
for _, kb := range kbs {
if allowed[kb.ID] {
filtered = append(filtered, kb)
}
}
kbs = filtered
}
c.JSON(http.StatusOK, gin.H{
"success": true,
"data": kbs,
})
return
}
// Get all knowledge bases for this tenant
kbs, err := h.service.ListKnowledgeBases(ctx)
if err != nil {
logger.ErrorWithFields(ctx, err, nil)
c.Error(errors.NewInternalServerError(err.Error()))
c.Error(apperrors.NewInternalServerError(err.Error()))
return
}
@@ -308,7 +405,7 @@ func (h *KnowledgeBaseHandler) UpdateKnowledgeBase(c *gin.Context) {
// Only admin/editor can update knowledge base
if permission != types.OrgRoleAdmin && permission != types.OrgRoleEditor {
c.Error(errors.NewForbiddenError("No permission to update knowledge base"))
c.Error(apperrors.NewForbiddenError("No permission to update knowledge base"))
return
}
@@ -316,7 +413,7 @@ func (h *KnowledgeBaseHandler) UpdateKnowledgeBase(c *gin.Context) {
var req UpdateKnowledgeBaseRequest
if err := c.ShouldBindJSON(&req); err != nil {
logger.Error(ctx, "Failed to parse request parameters", err)
c.Error(errors.NewBadRequestError("Invalid request parameters").WithDetails(err.Error()))
c.Error(apperrors.NewBadRequestError("Invalid request parameters").WithDetails(err.Error()))
return
}
@@ -327,7 +424,7 @@ func (h *KnowledgeBaseHandler) UpdateKnowledgeBase(c *gin.Context) {
kb, err := h.service.UpdateKnowledgeBase(ctx, id, req.Name, req.Description, req.Config)
if err != nil {
logger.ErrorWithFields(ctx, err, nil)
c.Error(errors.NewInternalServerError(err.Error()))
c.Error(apperrors.NewInternalServerError(err.Error()))
return
}
@@ -365,7 +462,7 @@ func (h *KnowledgeBaseHandler) DeleteKnowledgeBase(c *gin.Context) {
// Only owner (admin with matching tenant) can delete knowledge base
tenantID, _ := c.Get(types.TenantIDContextKey.String())
if kb.TenantID != tenantID.(uint64) || permission != types.OrgRoleAdmin {
c.Error(errors.NewForbiddenError("Only knowledge base owner can delete"))
c.Error(apperrors.NewForbiddenError("Only knowledge base owner can delete"))
return
}
@@ -375,7 +472,7 @@ func (h *KnowledgeBaseHandler) DeleteKnowledgeBase(c *gin.Context) {
// Delete the knowledge base
if err := h.service.DeleteKnowledgeBase(ctx, id); err != nil {
logger.ErrorWithFields(ctx, err, nil)
c.Error(errors.NewInternalServerError(err.Error()))
c.Error(apperrors.NewInternalServerError(err.Error()))
return
}
@@ -418,7 +515,7 @@ func (h *KnowledgeBaseHandler) CopyKnowledgeBase(c *gin.Context) {
var req CopyKnowledgeBaseRequest
if err := c.ShouldBindJSON(&req); err != nil {
logger.Error(ctx, "Failed to parse request parameters", err)
c.Error(errors.NewBadRequestError("Invalid request parameters").WithDetails(err.Error()))
c.Error(apperrors.NewBadRequestError("Invalid request parameters").WithDetails(err.Error()))
return
}
@@ -426,7 +523,7 @@ func (h *KnowledgeBaseHandler) CopyKnowledgeBase(c *gin.Context) {
tenantID, exists := c.Get(types.TenantIDContextKey.String())
if !exists {
logger.Error(ctx, "Failed to get tenant ID")
c.Error(errors.NewUnauthorizedError("Unauthorized"))
c.Error(apperrors.NewUnauthorizedError("Unauthorized"))
return
}
@@ -486,7 +583,7 @@ func (h *KnowledgeBaseHandler) CopyKnowledgeBase(c *gin.Context) {
payloadBytes, err := json.Marshal(payload)
if err != nil {
logger.Errorf(ctx, "Failed to marshal KB clone payload: %v", err)
c.Error(errors.NewInternalServerError("Failed to create task"))
c.Error(apperrors.NewInternalServerError("Failed to create task"))
return
}
@@ -496,7 +593,7 @@ func (h *KnowledgeBaseHandler) CopyKnowledgeBase(c *gin.Context) {
info, err := h.asynqClient.Enqueue(task)
if err != nil {
logger.Errorf(ctx, "Failed to enqueue KB clone task: %v", err)
c.Error(errors.NewInternalServerError("Failed to enqueue task"))
c.Error(apperrors.NewInternalServerError("Failed to enqueue task"))
return
}
@@ -548,7 +645,7 @@ func (h *KnowledgeBaseHandler) GetKBCloneProgress(c *gin.Context) {
taskID := c.Param("task_id")
if taskID == "" {
logger.Error(ctx, "Task ID is empty")
c.Error(errors.NewBadRequestError("Task ID cannot be empty"))
c.Error(apperrors.NewBadRequestError("Task ID cannot be empty"))
return
}
@@ -576,55 +673,55 @@ func validateExtractConfig(config *types.ExtractConfig) error {
}
// Validate text field
if config.Text == "" {
return errors.NewBadRequestError("text cannot be empty")
return apperrors.NewBadRequestError("text cannot be empty")
}
// Validate tags field
if len(config.Tags) == 0 {
return errors.NewBadRequestError("tags cannot be empty")
return apperrors.NewBadRequestError("tags cannot be empty")
}
for i, tag := range config.Tags {
if tag == "" {
return errors.NewBadRequestError("tag cannot be empty at index " + strconv.Itoa(i))
return apperrors.NewBadRequestError("tag cannot be empty at index " + strconv.Itoa(i))
}
}
// Validate nodes
if len(config.Nodes) == 0 {
return errors.NewBadRequestError("nodes cannot be empty")
return apperrors.NewBadRequestError("nodes cannot be empty")
}
nodeNames := make(map[string]bool)
for i, node := range config.Nodes {
if node.Name == "" {
return errors.NewBadRequestError("node name cannot be empty at index " + strconv.Itoa(i))
return apperrors.NewBadRequestError("node name cannot be empty at index " + strconv.Itoa(i))
}
// Check for duplicate node names
if nodeNames[node.Name] {
return errors.NewBadRequestError("duplicate node name: " + node.Name)
return apperrors.NewBadRequestError("duplicate node name: " + node.Name)
}
nodeNames[node.Name] = true
}
if len(config.Relations) == 0 {
return errors.NewBadRequestError("relations cannot be empty")
return apperrors.NewBadRequestError("relations cannot be empty")
}
// Validate relations
for i, relation := range config.Relations {
if relation.Node1 == "" {
return errors.NewBadRequestError("relation node1 cannot be empty at index " + strconv.Itoa(i))
return apperrors.NewBadRequestError("relation node1 cannot be empty at index " + strconv.Itoa(i))
}
if relation.Node2 == "" {
return errors.NewBadRequestError("relation node2 cannot be empty at index " + strconv.Itoa(i))
return apperrors.NewBadRequestError("relation node2 cannot be empty at index " + strconv.Itoa(i))
}
if relation.Type == "" {
return errors.NewBadRequestError("relation type cannot be empty at index " + strconv.Itoa(i))
return apperrors.NewBadRequestError("relation type cannot be empty at index " + strconv.Itoa(i))
}
// Check if referenced nodes exist
if !nodeNames[relation.Node1] {
return errors.NewBadRequestError("relation references non-existent node1: " + relation.Node1)
return apperrors.NewBadRequestError("relation references non-existent node1: " + relation.Node1)
}
if !nodeNames[relation.Node2] {
return errors.NewBadRequestError("relation references non-existent node2: " + relation.Node2)
return apperrors.NewBadRequestError("relation references non-existent node2: " + relation.Node2)
}
}
+164 -10
View File
@@ -18,27 +18,30 @@ import (
// OrganizationHandler implements HTTP request handlers for organization management
type OrganizationHandler struct {
orgService interfaces.OrganizationService
shareService interfaces.KBShareService
userService interfaces.UserService
knowledgeRepo interfaces.KnowledgeRepository
chunkRepo interfaces.ChunkRepository
orgService interfaces.OrganizationService
shareService interfaces.KBShareService
agentShareService interfaces.AgentShareService
userService interfaces.UserService
knowledgeRepo interfaces.KnowledgeRepository
chunkRepo interfaces.ChunkRepository
}
// NewOrganizationHandler creates a new organization handler
func NewOrganizationHandler(
orgService interfaces.OrganizationService,
shareService interfaces.KBShareService,
agentShareService interfaces.AgentShareService,
userService interfaces.UserService,
knowledgeRepo interfaces.KnowledgeRepository,
chunkRepo interfaces.ChunkRepository,
) *OrganizationHandler {
return &OrganizationHandler{
orgService: orgService,
shareService: shareService,
userService: userService,
knowledgeRepo: knowledgeRepo,
chunkRepo: chunkRepo,
orgService: orgService,
shareService: shareService,
agentShareService: agentShareService,
userService: userService,
knowledgeRepo: knowledgeRepo,
chunkRepo: chunkRepo,
}
}
@@ -392,6 +395,9 @@ func (h *OrganizationHandler) PreviewByInviteCode(c *gin.Context) {
// Get shared knowledge bases count
shares, _ := h.shareService.ListSharesByOrganization(ctx, org.ID)
shareCount := len(shares)
// Get shared agents count
agentShares, _ := h.agentShareService.ListSharesByOrganization(ctx, org.ID)
agentShareCount := len(agentShares)
// Check if user is already a member
_, memberErr := h.orgService.GetMember(ctx, org.ID, userID.(string))
@@ -406,6 +412,7 @@ func (h *OrganizationHandler) PreviewByInviteCode(c *gin.Context) {
"avatar": org.Avatar,
"member_count": memberCount,
"share_count": shareCount,
"agent_share_count": agentShareCount,
"is_already_member": isAlreadyMember,
"require_approval": org.RequireApproval,
"created_at": org.CreatedAt,
@@ -1102,6 +1109,149 @@ func (h *OrganizationHandler) ListSharedKnowledgeBases(c *gin.Context) {
})
}
// ShareAgent shares an agent to an organization
func (h *OrganizationHandler) ShareAgent(c *gin.Context) {
ctx := c.Request.Context()
agentID := c.Param("id")
userID, _ := c.Get(types.UserIDContextKey.String())
tenantID, _ := c.Get(types.TenantIDContextKey.String())
var req types.ShareKnowledgeBaseRequest
if err := c.ShouldBindJSON(&req); err != nil {
c.Error(apperrors.NewValidationError("Invalid request parameters").WithDetails(err.Error()))
return
}
share, err := h.agentShareService.ShareAgent(ctx, agentID, req.OrganizationID, userID.(string), tenantID.(uint64), req.Permission)
if err != nil {
logger.Errorf(ctx, "Failed to share agent: %v", err)
if errors.Is(err, service.ErrOrgRoleCannotShareAgent) {
c.Error(apperrors.NewForbiddenError("Only editors and admins can share agents to this organization"))
return
}
if errors.Is(err, service.ErrAgentNotConfigured) {
c.Error(apperrors.NewValidationError("Agent is not fully configured. Please set the chat model and, if using knowledge bases, the rerank model in agent settings."))
return
}
c.Error(apperrors.NewForbiddenError("Permission denied or invalid operation"))
return
}
c.JSON(http.StatusCreated, gin.H{"success": true, "data": share})
}
// ListAgentShares lists all shares for an agent
func (h *OrganizationHandler) ListAgentShares(c *gin.Context) {
ctx := c.Request.Context()
agentID := c.Param("id")
shares, err := h.agentShareService.ListSharesByAgent(ctx, agentID)
if err != nil {
logger.Errorf(ctx, "Failed to list agent shares: %v", err)
c.Error(apperrors.NewInternalServerError("Failed to list shares"))
return
}
response := make([]types.AgentShareResponse, 0, len(shares))
for _, s := range shares {
resp := types.AgentShareResponse{
ID: s.ID, AgentID: s.AgentID, OrganizationID: s.OrganizationID,
SharedByUserID: s.SharedByUserID, SourceTenantID: s.SourceTenantID,
Permission: string(s.Permission), CreatedAt: s.CreatedAt,
}
if s.Organization != nil {
resp.OrganizationName = s.Organization.Name
}
response = append(response, resp)
}
c.JSON(http.StatusOK, gin.H{"success": true, "data": gin.H{"shares": response, "total": len(response)}})
}
// RemoveAgentShare removes an agent share
func (h *OrganizationHandler) RemoveAgentShare(c *gin.Context) {
ctx := c.Request.Context()
shareID := c.Param("share_id")
userID, _ := c.Get(types.UserIDContextKey.String())
if err := h.agentShareService.RemoveShare(ctx, shareID, userID.(string)); err != nil {
logger.Errorf(ctx, "Failed to remove agent share: %v", err)
c.Error(apperrors.NewForbiddenError("Permission denied"))
return
}
c.JSON(http.StatusOK, gin.H{"success": true, "message": "Share removed successfully"})
}
// ListOrgAgentShares lists all agents shared to an organization
func (h *OrganizationHandler) ListOrgAgentShares(c *gin.Context) {
ctx := c.Request.Context()
orgID := c.Param("id")
userID, _ := c.Get(types.UserIDContextKey.String())
member, err := h.orgService.GetMember(ctx, orgID, userID.(string))
if err != nil {
c.Error(apperrors.NewForbiddenError("You are not a member of this organization"))
return
}
myRoleInOrg := member.Role
shares, err := h.agentShareService.ListSharesByOrganization(ctx, orgID)
if err != nil {
logger.Errorf(ctx, "Failed to list organization agent shares: %v", err)
c.Error(apperrors.NewInternalServerError("Failed to list shares"))
return
}
response := make([]types.AgentShareResponse, 0, len(shares))
for _, s := range shares {
effectivePerm := s.Permission
if !myRoleInOrg.HasPermission(s.Permission) {
effectivePerm = myRoleInOrg
}
resp := types.AgentShareResponse{
ID: s.ID, AgentID: s.AgentID, OrganizationID: s.OrganizationID,
SharedByUserID: s.SharedByUserID, SourceTenantID: s.SourceTenantID,
Permission: string(s.Permission), MyRoleInOrg: string(myRoleInOrg), MyPermission: string(effectivePerm), CreatedAt: s.CreatedAt,
}
if s.Agent != nil {
resp.AgentName = s.Agent.Name
resp.AgentAvatar = s.Agent.Avatar
cfg := &s.Agent.Config
if cfg.KBSelectionMode != "" {
resp.ScopeKB = cfg.KBSelectionMode
if cfg.KBSelectionMode == "selected" && len(cfg.KnowledgeBases) > 0 {
resp.ScopeKBCount = len(cfg.KnowledgeBases)
}
} else {
resp.ScopeKB = "none"
}
resp.ScopeWebSearch = cfg.WebSearchEnabled
if cfg.MCPSelectionMode != "" {
resp.ScopeMCP = cfg.MCPSelectionMode
if cfg.MCPSelectionMode == "selected" && len(cfg.MCPServices) > 0 {
resp.ScopeMCPCount = len(cfg.MCPServices)
}
} else {
resp.ScopeMCP = "none"
}
}
if s.Organization != nil {
resp.OrganizationName = s.Organization.Name
}
if u, err := h.userService.GetUserByID(ctx, s.SharedByUserID); err == nil && u != nil {
resp.SharedByUsername = u.Username
}
response = append(response, resp)
}
c.JSON(http.StatusOK, gin.H{"success": true, "data": gin.H{"shares": response, "total": len(response)}})
}
// ListSharedAgents lists agents shared to the current user
func (h *OrganizationHandler) ListSharedAgents(c *gin.Context) {
ctx := c.Request.Context()
userID, _ := c.Get(types.UserIDContextKey.String())
tenantID, _ := c.Get(types.TenantIDContextKey.String())
list, err := h.agentShareService.ListSharedAgents(ctx, userID.(string), tenantID.(uint64))
if err != nil {
logger.Errorf(ctx, "Failed to list shared agents: %v", err)
c.Error(apperrors.NewInternalServerError("Failed to list shared agents"))
return
}
c.JSON(http.StatusOK, gin.H{"success": true, "data": list, "total": len(list)})
}
// toOrgResponse converts an organization to response format
func (h *OrganizationHandler) toOrgResponse(ctx context.Context, org *types.Organization, currentUserID string) types.OrganizationResponse {
resp := types.OrganizationResponse{
@@ -1128,6 +1278,10 @@ func (h *OrganizationHandler) toOrgResponse(ctx context.Context, org *types.Orga
if shares, err := h.shareService.ListSharesByOrganization(ctx, org.ID); err == nil {
resp.ShareCount = len(shares)
}
// Get shared agent count for this organization
if agentShares, err := h.agentShareService.ListSharesByOrganization(ctx, org.ID); err == nil {
resp.AgentShareCount = len(agentShares)
}
// Get current user's role in this organization
isAdmin := false
+6
View File
@@ -20,6 +20,8 @@ type Handler struct {
config *config.Config // Application configuration
knowledgebaseService interfaces.KnowledgeBaseService // Service for managing knowledge bases
customAgentService interfaces.CustomAgentService // Service for managing custom agents
tenantService interfaces.TenantService // Service for loading tenant (shared agent context)
agentShareService interfaces.AgentShareService // Service for resolving shared agents (KB scope in retrieval)
}
// NewHandler creates a new instance of Handler with all necessary dependencies
@@ -30,6 +32,8 @@ func NewHandler(
config *config.Config,
knowledgebaseService interfaces.KnowledgeBaseService,
customAgentService interfaces.CustomAgentService,
tenantService interfaces.TenantService,
agentShareService interfaces.AgentShareService,
) *Handler {
return &Handler{
sessionService: sessionService,
@@ -38,6 +42,8 @@ func NewHandler(
config: config,
knowledgebaseService: knowledgebaseService,
customAgentService: customAgentService,
tenantService: tenantService,
agentShareService: agentShareService,
}
}
+57 -28
View File
@@ -18,19 +18,20 @@ import (
// qaRequestContext holds all the common data needed for QA requests
type qaRequestContext struct {
ctx context.Context
c *gin.Context
sessionID string
requestID string
query string
session *types.Session
customAgent *types.CustomAgent
assistantMessage *types.Message
knowledgeBaseIDs []string
knowledgeIDs []string
summaryModelID string
webSearchEnabled bool
mentionedItems types.MentionedItems
ctx context.Context
c *gin.Context
sessionID string
requestID string
query string
session *types.Session
customAgent *types.CustomAgent
assistantMessage *types.Message
knowledgeBaseIDs []string
knowledgeIDs []string
summaryModelID string
webSearchEnabled bool
mentionedItems types.MentionedItems
effectiveTenantID uint64 // when using shared agent, tenant ID for model/KB/MCP resolution; 0 = use context tenant
}
// parseQARequest parses and validates a QA request, returns the request context
@@ -71,18 +72,36 @@ func (h *Handler) parseQARequest(c *gin.Context, logPrefix string) (*qaRequestCo
return nil, nil, errors.NewNotFoundError("Session not found")
}
// Get custom agent if agent_id is provided
// Get custom agent if agent_id is provided. Backend resolves shared agent from share relation (no client-provided tenant).
var customAgent *types.CustomAgent
var effectiveTenantID uint64
if request.AgentID != "" {
logger.Infof(ctx, "Fetching custom agent, agent ID: %s", secutils.SanitizeForLog(request.AgentID))
agent, err := h.customAgentService.GetAgentByID(ctx, request.AgentID)
if err != nil {
logger.Warnf(ctx, "Failed to get custom agent, agent ID: %s, error: %v, using default config",
secutils.SanitizeForLog(request.AgentID), err)
logger.Infof(ctx, "Resolving agent, agent ID: %s", secutils.SanitizeForLog(request.AgentID))
userIDVal, _ := c.Get(types.UserIDContextKey.String())
currentTenantID := c.GetUint64(types.TenantIDContextKey.String())
if h.agentShareService != nil && userIDVal != nil && currentTenantID != 0 {
userID, _ := userIDVal.(string)
agent, err := h.agentShareService.GetSharedAgentForUser(ctx, userID, currentTenantID, request.AgentID)
if err == nil && agent != nil {
effectiveTenantID = agent.TenantID
customAgent = agent
logger.Infof(ctx, "Using shared agent: ID=%s, Name=%s, effectiveTenantID=%d (retrieval scope)",
customAgent.ID, customAgent.Name, effectiveTenantID)
}
}
if customAgent == nil {
agent, err := h.customAgentService.GetAgentByID(ctx, request.AgentID)
if err == nil {
customAgent = agent
logger.Infof(ctx, "Using own agent: ID=%s, Name=%s, AgentMode=%s",
customAgent.ID, customAgent.Name, customAgent.Config.AgentMode)
} else {
logger.Warnf(ctx, "Failed to get custom agent, agent ID: %s, error: %v, using default config",
secutils.SanitizeForLog(request.AgentID), err)
}
} else {
customAgent = agent
logger.Infof(ctx, "Using custom agent: ID=%s, Name=%s, IsBuiltin=%v, AgentMode=%s",
customAgent.ID, customAgent.Name, customAgent.IsBuiltin, customAgent.Config.AgentMode)
logger.Infof(ctx, "Using custom agent: ID=%s, Name=%s, IsBuiltin=%v, AgentMode=%s, effectiveTenantID=%d",
customAgent.ID, customAgent.Name, customAgent.IsBuiltin, customAgent.Config.AgentMode, effectiveTenantID)
}
}
@@ -143,11 +162,12 @@ func (h *Handler) parseQARequest(c *gin.Context, logPrefix string) (*qaRequestCo
RequestID: c.GetString(types.RequestIDContextKey.String()),
IsCompleted: false,
},
knowledgeBaseIDs: secutils.SanitizeForLogArray(kbIDs),
knowledgeIDs: secutils.SanitizeForLogArray(knowledgeIDs),
summaryModelID: secutils.SanitizeForLog(request.SummaryModelID),
webSearchEnabled: request.WebSearchEnabled,
mentionedItems: convertMentionedItems(request.MentionedItems),
knowledgeBaseIDs: secutils.SanitizeForLogArray(kbIDs),
knowledgeIDs: secutils.SanitizeForLogArray(knowledgeIDs),
summaryModelID: secutils.SanitizeForLog(request.SummaryModelID),
webSearchEnabled: request.WebSearchEnabled,
mentionedItems: convertMentionedItems(request.MentionedItems),
effectiveTenantID: effectiveTenantID,
}
return reqCtx, &request, nil
@@ -169,9 +189,18 @@ func (h *Handler) setupSSEStream(reqCtx *qaRequestContext, generateTitle bool) *
// Write initial agent_query event
h.writeAgentQueryEvent(reqCtx.ctx, reqCtx.sessionID, reqCtx.assistantMessage.ID)
// Base context for async work: when using shared agent, use source tenant for model/KB/MCP resolution
baseCtx := reqCtx.ctx
if reqCtx.effectiveTenantID != 0 && h.tenantService != nil {
if tenant, err := h.tenantService.GetTenantByID(reqCtx.ctx, reqCtx.effectiveTenantID); err == nil && tenant != nil {
baseCtx = context.WithValue(context.WithValue(reqCtx.ctx, types.TenantIDContextKey, reqCtx.effectiveTenantID), types.TenantInfoContextKey, tenant)
logger.Infof(reqCtx.ctx, "Using effective tenant %d for shared agent (model/KB/MCP)", reqCtx.effectiveTenantID)
}
}
// Create EventBus and cancellable context
eventBus := event.NewEventBus()
asyncCtx, cancel := context.WithCancel(logger.CloneContext(reqCtx.ctx))
asyncCtx, cancel := context.WithCancel(logger.CloneContext(baseCtx))
streamCtx := &sseStreamContext{
eventBus: eventBus,
+1 -1
View File
@@ -33,7 +33,7 @@ type CreateKnowledgeQARequest struct {
KnowledgeBaseIDs []string `json:"knowledge_base_ids"` // Selected knowledge base ID for this request
KnowledgeIds []string `json:"knowledge_ids"` // Selected knowledge ID for this request
AgentEnabled bool `json:"agent_enabled"` // Whether agent mode is enabled for this request
AgentID string `json:"agent_id"` // Selected custom agent ID for this request
AgentID string `json:"agent_id"` // Selected custom agent ID (backend resolves shared agent and its tenant from share relation)
WebSearchEnabled bool `json:"web_search_enabled"` // Whether web search is enabled for this request
SummaryModelID string `json:"summary_model_id"` // Optional summary model ID for this request (overrides session default)
MentionedItems []MentionedItemRequest `json:"mentioned_items"` // @mentioned knowledge bases and files
+12
View File
@@ -500,6 +500,8 @@ func RegisterOrganizationRoutes(r *gin.RouterGroup, orgHandler *handler.Organiza
orgs.PUT("/:id/join-requests/:request_id/review", orgHandler.ReviewJoinRequest)
// List knowledge bases shared to this organization
orgs.GET("/:id/shares", orgHandler.ListOrgShares)
// List agents shared to this organization
orgs.GET("/:id/agent-shares", orgHandler.ListOrgAgentShares)
}
// Knowledge base sharing routes (add to existing kb routes)
@@ -515,6 +517,16 @@ func RegisterOrganizationRoutes(r *gin.RouterGroup, orgHandler *handler.Organiza
kbShares.DELETE("/:share_id", orgHandler.RemoveShare)
}
// Agent sharing routes
agentShares := r.Group("/agents/:id/shares")
{
agentShares.POST("", orgHandler.ShareAgent)
agentShares.GET("", orgHandler.ListAgentShares)
agentShares.DELETE("/:share_id", orgHandler.RemoveAgentShare)
}
// Shared knowledge bases route
r.GET("/shared-knowledge-bases", orgHandler.ListSharedKnowledgeBases)
// Shared agents route
r.GET("/shared-agents", orgHandler.ListSharedAgents)
}
+4 -1
View File
@@ -19,7 +19,7 @@ type CustomAgentService interface {
// - Possible errors such as insufficient permissions, validation errors, etc.
CreateAgent(ctx context.Context, agent *types.CustomAgent) (*types.CustomAgent, error)
// GetAgentByID retrieves agent information by ID
// GetAgentByID retrieves agent information by ID (uses tenant from context)
// Parameters:
// - ctx: Context information
// - id: Unique identifier of the agent
@@ -28,6 +28,9 @@ type CustomAgentService interface {
// - Possible errors such as not existing, insufficient permissions, etc.
GetAgentByID(ctx context.Context, id string) (*types.CustomAgent, error)
// GetAgentByIDAndTenant retrieves agent by ID and tenant (for shared agents; skips built-in resolution)
GetAgentByIDAndTenant(ctx context.Context, id string, tenantID uint64) (*types.CustomAgent, error)
// ListAgents lists all agents under the current tenant (including built-in agents)
// Parameters:
// - ctx: Context information, containing tenant information
+2
View File
@@ -146,6 +146,8 @@ type KnowledgeService interface {
// SearchKnowledge searches knowledge items by keyword across the tenant.
// fileTypes: optional list of file extensions to filter by (e.g., ["csv", "xlsx"])
SearchKnowledge(ctx context.Context, keyword string, offset, limit int, fileTypes []string) ([]*types.Knowledge, bool, error)
// SearchKnowledgeForScopes searches knowledge within the given (tenant_id, kb_id) scopes (e.g. for shared agent context).
SearchKnowledgeForScopes(ctx context.Context, scopes []types.KnowledgeSearchScope, keyword string, offset, limit int, fileTypes []string) ([]*types.Knowledge, bool, error)
}
// KnowledgeRepository defines the interface for knowledge repositories.
@@ -42,6 +42,12 @@ type KnowledgeBaseService interface {
// - Possible errors such as not existing, etc.
GetKnowledgeBaseByIDOnly(ctx context.Context, id string) (*types.KnowledgeBase, error)
// GetKnowledgeBasesByIDsOnly retrieves knowledge bases by IDs without tenant filter (batch).
GetKnowledgeBasesByIDsOnly(ctx context.Context, ids []string) ([]*types.KnowledgeBase, error)
// FillKnowledgeBaseCounts fills KnowledgeCount, ChunkCount, IsProcessing, ProcessingCount for the given KB (uses kb.TenantID).
FillKnowledgeBaseCounts(ctx context.Context, kb *types.KnowledgeBase) error
// ListKnowledgeBases lists all knowledge bases under the current tenant
// Parameters:
// - ctx: Context information, containing tenant information
@@ -49,6 +55,8 @@ type KnowledgeBaseService interface {
// - List of knowledge base objects
// - Possible errors such as insufficient permissions, etc.
ListKnowledgeBases(ctx context.Context) ([]*types.KnowledgeBase, error)
// ListKnowledgeBasesByTenantID lists all knowledge bases for a specific tenant (e.g. for shared agent context).
ListKnowledgeBasesByTenantID(ctx context.Context, tenantID uint64) ([]*types.KnowledgeBase, error)
// UpdateKnowledgeBase updates knowledge base information
// Parameters:
+29
View File
@@ -127,3 +127,32 @@ type KBShareRepository interface {
CountSharesByKnowledgeBaseID(ctx context.Context, kbID string) (int64, error)
CountSharesByKnowledgeBaseIDs(ctx context.Context, kbIDs []string) (map[string]int64, error)
}
// AgentShareService defines the agent sharing service interface
type AgentShareService interface {
ShareAgent(ctx context.Context, agentID string, orgID string, userID string, tenantID uint64, permission types.OrgMemberRole) (*types.AgentShare, error)
RemoveShare(ctx context.Context, shareID string, userID string) error
ListSharesByAgent(ctx context.Context, agentID string) ([]*types.AgentShare, error)
ListSharesByOrganization(ctx context.Context, orgID string) ([]*types.AgentShare, error)
ListSharedAgents(ctx context.Context, userID string, currentTenantID uint64) ([]*types.SharedAgentInfo, error)
// GetSharedAgentForUser returns the shared agent by agentID if the user has access (source tenant is resolved from share); used to resolve KB scope for @ mention.
GetSharedAgentForUser(ctx context.Context, userID string, currentTenantID uint64, agentID string) (*types.CustomAgent, error)
GetShare(ctx context.Context, shareID string) (*types.AgentShare, error)
GetShareByAgentAndOrg(ctx context.Context, agentID string, orgID string) (*types.AgentShare, error)
}
// AgentShareRepository defines the agent sharing repository interface
type AgentShareRepository interface {
Create(ctx context.Context, share *types.AgentShare) error
GetByID(ctx context.Context, id string) (*types.AgentShare, error)
GetByAgentAndOrg(ctx context.Context, agentID string, orgID string) (*types.AgentShare, error)
Update(ctx context.Context, share *types.AgentShare) error
Delete(ctx context.Context, id string) error
DeleteByAgentIDAndSourceTenant(ctx context.Context, agentID string, sourceTenantID uint64) error
DeleteByOrganizationID(ctx context.Context, orgID string) error
ListByAgent(ctx context.Context, agentID string) ([]*types.AgentShare, error)
ListByOrganization(ctx context.Context, orgID string) ([]*types.AgentShare, error)
ListSharedAgentsForUser(ctx context.Context, userID string) ([]*types.AgentShare, error)
// GetShareByAgentIDForUser returns one share for the given agentID that the user can access (user in org), excluding source_tenant_id == excludeTenantID.
GetShareByAgentIDForUser(ctx context.Context, userID, agentID string, excludeTenantID uint64) (*types.AgentShare, error)
}
+59
View File
@@ -210,6 +210,39 @@ type SharedKnowledgeBaseInfo struct {
SharedAt time.Time `json:"shared_at"`
}
// AgentShare represents a sharing record of an agent to an organization
type AgentShare struct {
ID string `json:"id" gorm:"type:varchar(36);primaryKey"`
AgentID string `json:"agent_id" gorm:"type:varchar(36);not null;index"`
OrganizationID string `json:"organization_id" gorm:"type:varchar(36);not null;index"`
SharedByUserID string `json:"shared_by_user_id" gorm:"type:varchar(36);not null"`
SourceTenantID uint64 `json:"source_tenant_id" gorm:"not null;index"`
Permission OrgMemberRole `json:"permission" gorm:"type:varchar(32);not null;default:'viewer'"`
CreatedAt time.Time `json:"created_at"`
UpdatedAt time.Time `json:"updated_at"`
DeletedAt gorm.DeletedAt `json:"deleted_at" gorm:"index"`
Agent *CustomAgent `json:"agent,omitempty" gorm:"foreignKey:AgentID,SourceTenantID;references:ID,TenantID"`
Organization *Organization `json:"organization,omitempty" gorm:"foreignKey:OrganizationID"`
}
// TableName returns the table name for GORM
func (AgentShare) TableName() string {
return "agent_shares"
}
// SharedAgentInfo represents a shared agent with additional sharing info
type SharedAgentInfo struct {
Agent *CustomAgent `json:"agent"`
ShareID string `json:"share_id"`
OrganizationID string `json:"organization_id"`
OrgName string `json:"org_name"`
Permission OrgMemberRole `json:"permission"`
SourceTenantID uint64 `json:"source_tenant_id"`
SharedAt time.Time `json:"shared_at"`
SharedByUserID string `json:"shared_by_user_id,omitempty"`
SharedByUsername string `json:"shared_by_username,omitempty"`
}
// ----------------------
// Request/Response Types
// ----------------------
@@ -302,6 +335,7 @@ type OrganizationResponse struct {
MemberLimit int `json:"member_limit"` // 0 = unlimited
MemberCount int `json:"member_count"`
ShareCount int `json:"share_count"` // 共享到该组织的知识库数量
AgentShareCount int `json:"agent_share_count"` // 共享到该组织的智能体数量
PendingJoinRequestCount int `json:"pending_join_request_count"` // 待审批加入申请数(仅管理员可见)
IsOwner bool `json:"is_owner"`
MyRole string `json:"my_role,omitempty"`
@@ -342,6 +376,30 @@ type KnowledgeBaseShareResponse struct {
RequireApproval bool `json:"require_approval"`
}
// AgentShareResponse represents an agent share record in API responses
type AgentShareResponse struct {
ID string `json:"id"`
AgentID string `json:"agent_id"`
AgentName string `json:"agent_name"`
OrganizationID string `json:"organization_id"`
OrganizationName string `json:"organization_name"`
SharedByUserID string `json:"shared_by_user_id"`
SharedByUsername string `json:"shared_by_username"`
SourceTenantID uint64 `json:"source_tenant_id"`
Permission string `json:"permission"`
MyRoleInOrg string `json:"my_role_in_org,omitempty"`
MyPermission string `json:"my_permission,omitempty"`
CreatedAt time.Time `json:"created_at"`
// Agent scope summary for list display (from agent config when available)
ScopeKB string `json:"scope_kb,omitempty"` // "all" | "selected" | "none"
ScopeKBCount int `json:"scope_kb_count,omitempty"` // when selected
ScopeWebSearch bool `json:"scope_web_search,omitempty"`
ScopeMCP string `json:"scope_mcp,omitempty"` // "all" | "selected" | "none"
ScopeMCPCount int `json:"scope_mcp_count,omitempty"` // when selected
// Agent avatar (emoji or icon name) for list display
AgentAvatar string `json:"agent_avatar,omitempty"`
}
// ListOrganizationsResponse represents the response for listing organizations
type ListOrganizationsResponse struct {
Organizations []OrganizationResponse `json:"organizations"`
@@ -357,6 +415,7 @@ type SearchableOrganizationItem struct {
MemberCount int `json:"member_count"`
MemberLimit int `json:"member_limit"` // 0 = unlimited
ShareCount int `json:"share_count"`
AgentShareCount int `json:"agent_share_count"` // 共享到该组织的智能体数量
IsAlreadyMember bool `json:"is_already_member"`
RequireApproval bool `json:"require_approval"`
}
@@ -1,6 +1,7 @@
-- Migration: 000012_organizations (down, merged 000011–000017, 000012, 000013)
DO $$ BEGIN RAISE NOTICE '[Migration 000012] Rolling back organization tables...'; END $$;
-- Migration: 000012_organizations (down, merged 000012, 000013, 000014)
DO $$ BEGIN RAISE NOTICE '[Migration 000012] Rolling back organization and agent_share tables...'; END $$;
DROP TABLE IF EXISTS agent_shares;
DROP TABLE IF EXISTS organization_join_requests;
DROP TABLE IF EXISTS kb_shares;
DROP TABLE IF EXISTS organization_members;
@@ -1,5 +1,5 @@
-- Migration: 000012_organizations (merged 000011–000017, 000012, 000013)
-- Description: Organization tables, approval, invite expiry, join requests, avatar, searchable, member_limit
-- Migration: 000012_organizations (merged 000012, 000013, 000014)
-- Description: Organization tables, kb_shares, join requests, agent_shares (model_shares omitted/dropped)
DO $$ BEGIN RAISE NOTICE '[Migration 000012] Starting organization tables setup...'; END $$;
-- Create organizations table
@@ -108,4 +108,28 @@ COMMENT ON COLUMN organization_join_requests.message IS 'Optional message from t
COMMENT ON COLUMN organization_join_requests.reviewed_by IS 'User ID of the admin who reviewed the request';
COMMENT ON COLUMN organization_join_requests.review_message IS 'Optional message from the reviewer';
DO $$ BEGIN RAISE NOTICE '[Migration 000012] Organization tables setup completed successfully!'; END $$;
-- Agent shares (merged from 000013; model_shares omitted, dropped in 000014)
CREATE TABLE IF NOT EXISTS agent_shares (
id VARCHAR(36) PRIMARY KEY DEFAULT uuid_generate_v4(),
agent_id VARCHAR(36) NOT NULL,
organization_id VARCHAR(36) NOT NULL REFERENCES organizations(id) ON DELETE CASCADE,
shared_by_user_id VARCHAR(36) NOT NULL,
source_tenant_id INTEGER NOT NULL,
permission VARCHAR(32) NOT NULL DEFAULT 'viewer',
created_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
updated_at TIMESTAMP WITH TIME ZONE DEFAULT CURRENT_TIMESTAMP,
deleted_at TIMESTAMP WITH TIME ZONE,
FOREIGN KEY (agent_id, source_tenant_id) REFERENCES custom_agents(id, tenant_id) ON DELETE CASCADE
);
CREATE UNIQUE INDEX IF NOT EXISTS idx_agent_shares_agent_org ON agent_shares(agent_id, source_tenant_id, organization_id) WHERE deleted_at IS NULL;
CREATE INDEX IF NOT EXISTS idx_agent_shares_agent_id ON agent_shares(agent_id);
CREATE INDEX IF NOT EXISTS idx_agent_shares_org_id ON agent_shares(organization_id);
CREATE INDEX IF NOT EXISTS idx_agent_shares_source_tenant ON agent_shares(source_tenant_id);
CREATE INDEX IF NOT EXISTS idx_agent_shares_deleted_at ON agent_shares(deleted_at);
COMMENT ON TABLE agent_shares IS 'Custom agent sharing records to organizations';
COMMENT ON COLUMN agent_shares.source_tenant_id IS 'Original tenant ID of the agent';
COMMENT ON COLUMN agent_shares.permission IS 'Access permission: viewer or editor';
DO $$ BEGIN RAISE NOTICE '[Migration 000012] Organization tables and agent_shares setup completed successfully!'; END $$;