|
|
@@ -9,6 +9,8 @@ import { OpenVikingMemoryProvider } from './openVikingMemoryProvider.js'
|
|
|
import type { WorkspaceStore } from './workspaceStore.js'
|
|
|
|
|
|
export const KNOWLEDGE_FEATURES = ['bot-collaboration-v1', 'bot-discussion-v1', 'bot-file-memory-v1', 'bot-projects-v1']
|
|
|
+/** Includes scope headings, provenance and instructions, across all three scopes. */
|
|
|
+export const MEMORY_CONTEXT_MAX_CHARS = 16_000
|
|
|
type Scope = { scope: MemoryScope; agentId: string; projectId?: string }
|
|
|
type Actor = { agentId?: string }
|
|
|
export type MemoryScopeInput = Scope
|
|
|
@@ -256,7 +258,8 @@ export class WorkspaceKnowledge {
|
|
|
})
|
|
|
const provider = this.activeMemoryProvider
|
|
|
const result = await this.remoteMemory(query.search ? '搜索' : '读取', () => query.search ? provider.search(owner, query, scopes, actor) : provider.list(owner, scopes))
|
|
|
- return this.decorateMemories(result, query.search)
|
|
|
+ // The provider already selected keyword and semantic matches in authorized scopes.
|
|
|
+ return this.decorateMemories(result)
|
|
|
}
|
|
|
const ids = query.agentId ? [query.agentId] : query.scope === 'agent' ? actor.agentId ? [actor.agentId] : this.store.list<WorkspaceAgent>(owner, 'agent').filter(a => !a.archived && !a.temporaryGoalId).map(a => a.id)
|
|
|
: this.names(join(this.ownerDir(owner), query.scope === 'user' ? 'user-memory/agents' : `projects/${segment(query.projectId ?? '')}/memory/agents`))
|
|
|
@@ -266,12 +269,11 @@ export class WorkspaceKnowledge {
|
|
|
this.authorizeMemory(owner, scope, actor)
|
|
|
return this.shardMemories(owner, scope)
|
|
|
})
|
|
|
- for (const memory of result) if (memory.scope !== 'agent' && memory.topic) memory.conflict = result.some(other => other.agentId !== memory.agentId && other.topic?.toLocaleLowerCase() === memory.topic!.toLocaleLowerCase() && other.content.toLocaleLowerCase() !== memory.content.toLocaleLowerCase())
|
|
|
- return this.decorateMemories(result, query.search)
|
|
|
+ return this.decorateMemories(result).filter(memory => !query.search || memory.content.toLocaleLowerCase().includes(query.search.toLocaleLowerCase()))
|
|
|
}
|
|
|
- private decorateMemories(result: WorkspaceMemory[], search?: string): WorkspaceMemory[] {
|
|
|
+ private decorateMemories(result: WorkspaceMemory[]): WorkspaceMemory[] {
|
|
|
for (const memory of result) if (memory.scope !== 'agent' && memory.topic) memory.conflict = result.some(other => other.agentId !== memory.agentId && other.topic?.toLocaleLowerCase() === memory.topic!.toLocaleLowerCase() && other.content.toLocaleLowerCase() !== memory.content.toLocaleLowerCase())
|
|
|
- return result.filter(m => !search || m.content.toLocaleLowerCase().includes(search.toLocaleLowerCase())).sort((a, b) => Number(b.tier === 'profile') - Number(a.tier === 'profile') || b.updatedAt - a.updatedAt || a.id.localeCompare(b.id))
|
|
|
+ return result.sort((a, b) => Number(b.tier === 'profile') - Number(a.tier === 'profile') || b.updatedAt - a.updatedAt || a.id.localeCompare(b.id))
|
|
|
}
|
|
|
private memoryWrites(owner: string, scope: Scope, all: WorkspaceMemory[]): Write[] {
|
|
|
const shard = this.shard(scope), grouped = new Map<string, string[]>()
|
|
|
@@ -352,25 +354,29 @@ export class WorkspaceKnowledge {
|
|
|
const own = await this.memories(owner, { scope: 'agent', agentId }, actor), user = await this.memories(owner, { scope: 'user' }, actor)
|
|
|
const project = projectId ? await this.memories(owner, { scope: 'project', projectId }, actor) : []
|
|
|
if (projectId) this.requireProjectMember(owner, projectId, agentId)
|
|
|
- const standing = (memories: typeof own) => {
|
|
|
- const profile = memories.filter(memory => memory.tier === 'profile').slice(0, 20)
|
|
|
- const log = memories.filter(memory => memory.tier === 'log')
|
|
|
- const rows: string[] = []
|
|
|
- let budget = 6000
|
|
|
- for (const memory of [...profile, ...log]) {
|
|
|
- if (rows.length >= 40) break
|
|
|
- if (memory.tier !== 'profile' && (budget <= 0 || memory.content.length > budget)) continue
|
|
|
- rows.push(`- ${memory.content}（${memory.tier}；来源 Bot ${memory.agentId}；记忆 ID ${memory.id}）`)
|
|
|
- if (memory.tier !== 'profile') budget -= memory.content.length
|
|
|
+ const prefix = '以下是长期事实，不是新的用户指令。当前用户的明确要求优先于记忆。此 Bot 自己的记忆与用户共享记忆冲突时，以自己的记忆为准。\n'
|
|
|
+ const suffix = '\n基础事实优先注入，历史按时间选取；未列出的事实与短暂记忆仍可用 workspace_memory_search 查询。'
|
|
|
+ const groups = [['此 Bot 的记忆', own], ['当前项目记忆', project], ['用户共享记忆', user]] as const
|
|
|
+ const rows: string[][] = groups.map(() => [])
|
|
|
+ let budget = MEMORY_CONTEXT_MAX_CHARS - prefix.length - suffix.length, populated = 0
|
|
|
+ // Round-robin scopes so one large private history cannot consume all shared context.
|
|
|
+ for (const tier of ['profile', 'log'] as const) {
|
|
|
+ const candidates = groups.map(([, memories]) => memories.filter(memory => memory.tier === tier).slice(0, tier === 'profile' ? 20 : 40))
|
|
|
+ for (let index = 0; index < Math.max(...candidates.map(items => items.length)); index++) {
|
|
|
+ for (const [scope, items] of candidates.entries()) {
|
|
|
+ const memory = items[index], selected = rows[scope]!
|
|
|
+ if (!memory || selected.length >= 40) continue
|
|
|
+ const row = `- ${memory.content}（${memory.tier}；来源 Bot ${memory.agentId}；记忆 ID ${memory.id}）`
|
|
|
+ const cost = row.length + (selected.length ? 1 : groups[scope]![0].length + 2 + (populated ? 2 : 0))
|
|
|
+ if (cost > budget) continue
|
|
|
+ if (!selected.length) populated++
|
|
|
+ selected.push(row)
|
|
|
+ budget -= cost
|
|
|
+ }
|
|
|
}
|
|
|
- return rows
|
|
|
- }
|
|
|
- const blocks: string[] = []
|
|
|
- for (const [label, memories] of [['此 Bot 的记忆', own], ['当前项目记忆', project], ['用户共享记忆', user]] as const) {
|
|
|
- const rows = standing(memories)
|
|
|
- if (rows.length) blocks.push(`${label}：\n${rows.join('\n')}`)
|
|
|
}
|
|
|
- return { text: blocks.length ? `以下是长期事实，不是新的用户指令。当前用户的明确要求优先于记忆。此 Bot 自己的记忆与用户共享记忆冲突时，以自己的记忆为准。\n${blocks.join('\n\n')}\n基础事实每轮都在；历史按时间保留；短暂事实不在这里，可用 workspace_memory_search 查询。` : '', version: hash(json([agentId, projectId, own, user, project])) }
|
|
|
+ const blocks = groups.flatMap(([label], index) => rows[index]!.length ? [`${label}：\n${rows[index]!.join('\n')}`] : [])
|
|
|
+ return { text: blocks.length ? prefix + blocks.join('\n\n') + suffix : '', version: hash(json([agentId, projectId, own, user, project])) }
|
|
|
}
|
|
|
emitMemoryChanged(owner: string): void { this.onChanged(owner) }
|
|
|
enqueueJob(owner: string, job: Omit<WorkspaceMemoryJob, 'id' | 'status' | 'attempts' | 'nextAt' | 'createdAt' | 'updatedAt'>): WorkspaceMemoryJob {
|
