@vellumai/assistant 0.4.49 → 0.4.50
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/ARCHITECTURE.md +24 -33
- package/README.md +3 -3
- package/docs/architecture/memory.md +180 -119
- package/package.json +2 -2
- package/src/__tests__/agent-loop.test.ts +3 -1
- package/src/__tests__/anthropic-provider.test.ts +114 -23
- package/src/__tests__/approval-cascade.test.ts +1 -15
- package/src/__tests__/approval-routes-http.test.ts +2 -0
- package/src/__tests__/assistant-feature-flag-guard.test.ts +0 -23
- package/src/__tests__/canonical-guardian-store.test.ts +95 -0
- package/src/__tests__/checker.test.ts +13 -0
- package/src/__tests__/config-schema.test.ts +1 -68
- package/src/__tests__/context-memory-e2e.test.ts +11 -100
- package/src/__tests__/conversation-routes-guardian-reply.test.ts +8 -0
- package/src/__tests__/conversation-routes-slash-commands.test.ts +1 -0
- package/src/__tests__/credential-security-e2e.test.ts +1 -0
- package/src/__tests__/credential-vault-unit.test.ts +4 -0
- package/src/__tests__/credential-vault.test.ts +13 -1
- package/src/__tests__/cu-unified-flow.test.ts +532 -0
- package/src/__tests__/date-context.test.ts +93 -77
- package/src/__tests__/deterministic-verification-control-plane.test.ts +64 -0
- package/src/__tests__/guardian-routing-invariants.test.ts +93 -0
- package/src/__tests__/history-repair.test.ts +245 -0
- package/src/__tests__/host-cu-proxy.test.ts +165 -3
- package/src/__tests__/http-user-message-parity.test.ts +1 -0
- package/src/__tests__/invite-redemption-service.test.ts +65 -1
- package/src/__tests__/keychain-broker-client.test.ts +4 -4
- package/src/__tests__/memory-context-benchmark.benchmark.test.ts +56 -18
- package/src/__tests__/memory-lifecycle-e2e.test.ts +244 -387
- package/src/__tests__/memory-recall-quality.test.ts +244 -407
- package/src/__tests__/memory-regressions.experimental.test.ts +126 -101
- package/src/__tests__/memory-regressions.test.ts +477 -2841
- package/src/__tests__/memory-retrieval.benchmark.test.ts +33 -150
- package/src/__tests__/memory-upsert-concurrency.test.ts +5 -244
- package/src/__tests__/mime-builder.test.ts +28 -0
- package/src/__tests__/native-web-search.test.ts +1 -0
- package/src/__tests__/oauth-cli.test.ts +572 -5
- package/src/__tests__/oauth-store.test.ts +120 -6
- package/src/__tests__/qdrant-collection-migration.test.ts +53 -8
- package/src/__tests__/registry.test.ts +0 -1
- package/src/__tests__/relay-server.test.ts +46 -1
- package/src/__tests__/schedule-tools.test.ts +32 -0
- package/src/__tests__/script-proxy-certs.test.ts +1 -1
- package/src/__tests__/secret-onetime-send.test.ts +1 -0
- package/src/__tests__/secure-keys.test.ts +7 -2
- package/src/__tests__/send-endpoint-busy.test.ts +3 -0
- package/src/__tests__/session-abort-tool-results.test.ts +1 -14
- package/src/__tests__/session-agent-loop-overflow.test.ts +1583 -0
- package/src/__tests__/session-agent-loop.test.ts +19 -15
- package/src/__tests__/session-confirmation-signals.test.ts +1 -15
- package/src/__tests__/session-error.test.ts +124 -2
- package/src/__tests__/session-history-web-search.test.ts +918 -0
- package/src/__tests__/session-pre-run-repair.test.ts +1 -14
- package/src/__tests__/session-provider-retry-repair.test.ts +25 -28
- package/src/__tests__/session-queue.test.ts +37 -27
- package/src/__tests__/session-runtime-assembly.test.ts +54 -0
- package/src/__tests__/session-slash-known.test.ts +1 -15
- package/src/__tests__/session-slash-queue.test.ts +1 -15
- package/src/__tests__/session-slash-unknown.test.ts +1 -15
- package/src/__tests__/session-workspace-cache-state.test.ts +3 -33
- package/src/__tests__/session-workspace-injection.test.ts +3 -37
- package/src/__tests__/session-workspace-tool-tracking.test.ts +3 -37
- package/src/__tests__/skills-install-extract.test.ts +93 -0
- package/src/__tests__/skillssh-registry.test.ts +451 -0
- package/src/__tests__/trust-store.test.ts +15 -0
- package/src/__tests__/voice-invite-redemption.test.ts +32 -1
- package/src/agent/ax-tree-compaction.test.ts +51 -0
- package/src/agent/loop.ts +39 -12
- package/src/approvals/AGENTS.md +1 -1
- package/src/approvals/guardian-request-resolvers.ts +14 -2
- package/src/bundler/compiler-tools.ts +66 -2
- package/src/calls/call-domain.ts +132 -0
- package/src/calls/call-store.ts +6 -0
- package/src/calls/relay-server.ts +43 -5
- package/src/calls/relay-setup-router.ts +17 -1
- package/src/calls/twilio-config.ts +1 -1
- package/src/calls/types.ts +3 -1
- package/src/cli/commands/doctor.ts +4 -3
- package/src/cli/commands/mcp.ts +46 -59
- package/src/cli/commands/memory.ts +16 -165
- package/src/cli/commands/oauth/apps.ts +31 -2
- package/src/cli/commands/oauth/connections.ts +431 -97
- package/src/cli/commands/oauth/providers.ts +15 -1
- package/src/cli/commands/sessions.ts +5 -2
- package/src/cli/commands/skills.ts +173 -1
- package/src/cli/http-client.ts +0 -20
- package/src/cli/main-screen.tsx +2 -2
- package/src/cli/program.ts +5 -6
- package/src/cli.ts +4 -10
- package/src/config/bundled-skills/computer-use/TOOLS.json +1 -1
- package/src/config/bundled-skills/computer-use/tools/computer-use-observe.ts +12 -0
- package/src/config/bundled-tool-registry.ts +2 -5
- package/src/config/schema.ts +1 -12
- package/src/config/schemas/memory-lifecycle.ts +0 -9
- package/src/config/schemas/memory-processing.ts +0 -180
- package/src/config/schemas/memory-retrieval.ts +32 -104
- package/src/config/schemas/memory.ts +0 -10
- package/src/config/types.ts +0 -4
- package/src/context/window-manager.ts +4 -1
- package/src/daemon/config-watcher.ts +61 -3
- package/src/daemon/daemon-control.ts +1 -1
- package/src/daemon/date-context.ts +114 -31
- package/src/daemon/handlers/sessions.ts +18 -13
- package/src/daemon/handlers/skills.ts +20 -1
- package/src/daemon/history-repair.ts +72 -8
- package/src/daemon/host-cu-proxy.ts +55 -26
- package/src/daemon/lifecycle.ts +31 -3
- package/src/daemon/mcp-reload-service.ts +2 -2
- package/src/daemon/message-types/computer-use.ts +1 -12
- package/src/daemon/message-types/memory.ts +4 -16
- package/src/daemon/message-types/messages.ts +1 -0
- package/src/daemon/message-types/sessions.ts +4 -0
- package/src/daemon/server.ts +12 -1
- package/src/daemon/session-agent-loop-handlers.ts +38 -0
- package/src/daemon/session-agent-loop.ts +334 -48
- package/src/daemon/session-error.ts +89 -6
- package/src/daemon/session-history.ts +17 -7
- package/src/daemon/session-media-retry.ts +6 -2
- package/src/daemon/session-memory.ts +69 -149
- package/src/daemon/session-process.ts +10 -1
- package/src/daemon/session-runtime-assembly.ts +49 -19
- package/src/daemon/session-surfaces.ts +4 -1
- package/src/daemon/session-tool-setup.ts +7 -1
- package/src/daemon/session.ts +12 -2
- package/src/instrument.ts +61 -1
- package/src/memory/admin.ts +2 -191
- package/src/memory/canonical-guardian-store.ts +38 -2
- package/src/memory/conversation-crud.ts +0 -33
- package/src/memory/conversation-queries.ts +22 -3
- package/src/memory/db-init.ts +28 -0
- package/src/memory/embedding-backend.ts +84 -8
- package/src/memory/embedding-types.ts +9 -1
- package/src/memory/indexer.ts +7 -46
- package/src/memory/items-extractor.ts +274 -76
- package/src/memory/job-handlers/backfill.ts +2 -127
- package/src/memory/job-handlers/cleanup.ts +2 -16
- package/src/memory/job-handlers/extraction.ts +2 -138
- package/src/memory/job-handlers/index-maintenance.ts +1 -6
- package/src/memory/job-handlers/summarization.ts +3 -148
- package/src/memory/job-utils.ts +21 -59
- package/src/memory/jobs-store.ts +1 -159
- package/src/memory/jobs-worker.ts +9 -52
- package/src/memory/migrations/104-core-indexes.ts +3 -3
- package/src/memory/migrations/149-oauth-tables.ts +2 -0
- package/src/memory/migrations/150-oauth-apps-client-secret-path.ts +98 -0
- package/src/memory/migrations/151-oauth-providers-ping-url.ts +11 -0
- package/src/memory/migrations/152-memory-item-supersession.ts +44 -0
- package/src/memory/migrations/153-drop-entity-tables.ts +15 -0
- package/src/memory/migrations/154-drop-fts.ts +20 -0
- package/src/memory/migrations/155-drop-conflicts.ts +7 -0
- package/src/memory/migrations/156-call-session-invite-metadata.ts +24 -0
- package/src/memory/migrations/index.ts +7 -0
- package/src/memory/qdrant-client.ts +148 -51
- package/src/memory/raw-query.ts +1 -1
- package/src/memory/retriever.test.ts +294 -273
- package/src/memory/retriever.ts +421 -645
- package/src/memory/schema/calls.ts +2 -0
- package/src/memory/schema/memory-core.ts +3 -48
- package/src/memory/schema/oauth.ts +2 -0
- package/src/memory/search/formatting.ts +263 -176
- package/src/memory/search/lexical.ts +1 -254
- package/src/memory/search/ranking.ts +0 -455
- package/src/memory/search/semantic.ts +100 -14
- package/src/memory/search/staleness.ts +47 -0
- package/src/memory/search/tier-classifier.ts +21 -0
- package/src/memory/search/types.ts +15 -77
- package/src/memory/task-memory-cleanup.ts +4 -6
- package/src/messaging/providers/gmail/mime-builder.ts +17 -7
- package/src/oauth/byo-connection.test.ts +8 -1
- package/src/oauth/oauth-store.ts +113 -27
- package/src/oauth/seed-providers.ts +6 -0
- package/src/oauth/token-persistence.ts +11 -3
- package/src/permissions/defaults.ts +1 -0
- package/src/permissions/trust-store.ts +23 -1
- package/src/playbooks/playbook-compiler.ts +1 -1
- package/src/prompts/system-prompt.ts +18 -2
- package/src/providers/anthropic/client.ts +56 -126
- package/src/providers/types.ts +7 -1
- package/src/runtime/AGENTS.md +9 -0
- package/src/runtime/auth/route-policy.ts +6 -3
- package/src/runtime/guardian-reply-router.ts +24 -22
- package/src/runtime/http-server.ts +2 -2
- package/src/runtime/invite-redemption-service.ts +19 -1
- package/src/runtime/invite-service.ts +25 -0
- package/src/runtime/pending-interactions.ts +2 -2
- package/src/runtime/routes/brain-graph-routes.ts +10 -90
- package/src/runtime/routes/conversation-routes.ts +9 -1
- package/src/runtime/routes/inbound-stages/acl-enforcement.ts +21 -12
- package/src/runtime/routes/memory-item-routes.test.ts +754 -0
- package/src/runtime/routes/memory-item-routes.ts +503 -0
- package/src/runtime/routes/session-management-routes.ts +3 -3
- package/src/runtime/routes/settings-routes.ts +2 -2
- package/src/runtime/routes/trust-rules-routes.ts +14 -0
- package/src/runtime/routes/workspace-routes.ts +2 -1
- package/src/security/keychain-broker-client.ts +17 -4
- package/src/security/secure-keys.ts +25 -3
- package/src/security/token-manager.ts +36 -36
- package/src/skills/catalog-install.ts +74 -18
- package/src/skills/skillssh-registry.ts +503 -0
- package/src/tools/assets/search.ts +5 -1
- package/src/tools/computer-use/definitions.ts +0 -10
- package/src/tools/computer-use/registry.ts +1 -1
- package/src/tools/credentials/vault.ts +1 -3
- package/src/tools/memory/definitions.ts +4 -13
- package/src/tools/memory/handlers.test.ts +83 -103
- package/src/tools/memory/handlers.ts +50 -85
- package/src/tools/schedule/create.ts +8 -1
- package/src/tools/schedule/update.ts +8 -1
- package/src/tools/skills/load.ts +25 -2
- package/src/__tests__/clarification-resolver.test.ts +0 -193
- package/src/__tests__/conflict-intent-tokenization.test.ts +0 -160
- package/src/__tests__/conflict-policy.test.ts +0 -269
- package/src/__tests__/conflict-store.test.ts +0 -372
- package/src/__tests__/contradiction-checker.test.ts +0 -361
- package/src/__tests__/entity-extractor.test.ts +0 -211
- package/src/__tests__/entity-search.test.ts +0 -1117
- package/src/__tests__/profile-compiler.test.ts +0 -392
- package/src/__tests__/session-conflict-gate.test.ts +0 -1228
- package/src/__tests__/session-profile-injection.test.ts +0 -557
- package/src/config/bundled-skills/knowledge-graph/SKILL.md +0 -25
- package/src/config/bundled-skills/knowledge-graph/TOOLS.json +0 -66
- package/src/config/bundled-skills/knowledge-graph/tools/graph-query.ts +0 -211
- package/src/daemon/session-conflict-gate.ts +0 -167
- package/src/daemon/session-dynamic-profile.ts +0 -77
- package/src/memory/clarification-resolver.ts +0 -417
- package/src/memory/conflict-intent.ts +0 -205
- package/src/memory/conflict-policy.ts +0 -127
- package/src/memory/conflict-store.ts +0 -410
- package/src/memory/contradiction-checker.ts +0 -508
- package/src/memory/entity-extractor.ts +0 -535
- package/src/memory/format-recall.ts +0 -47
- package/src/memory/fts-reconciler.ts +0 -165
- package/src/memory/job-handlers/conflict.ts +0 -200
- package/src/memory/profile-compiler.ts +0 -195
- package/src/memory/recall-cache.ts +0 -117
- package/src/memory/search/entity.ts +0 -535
- package/src/memory/search/query-expansion.test.ts +0 -70
- package/src/memory/search/query-expansion.ts +0 -118
- package/src/runtime/routes/mcp-routes.ts +0 -20
|
@@ -1,211 +0,0 @@
|
|
|
1
|
-
import { inArray } from "drizzle-orm";
|
|
2
|
-
|
|
3
|
-
import { getDb, initializeDb } from "../../../../memory/db.js";
|
|
4
|
-
import type {
|
|
5
|
-
EntityRelationType,
|
|
6
|
-
EntityType,
|
|
7
|
-
} from "../../../../memory/entity-extractor.js";
|
|
8
|
-
import { memoryEntities } from "../../../../memory/schema.js";
|
|
9
|
-
import {
|
|
10
|
-
collectTypedNeighbors,
|
|
11
|
-
findMatchedEntities,
|
|
12
|
-
findNeighborEntities,
|
|
13
|
-
getEntityLinkedItemCandidates,
|
|
14
|
-
} from "../../../../memory/search/entity.js";
|
|
15
|
-
import type { TraversalStep } from "../../../../memory/search/types.js";
|
|
16
|
-
import type {
|
|
17
|
-
ToolContext,
|
|
18
|
-
ToolExecutionResult,
|
|
19
|
-
} from "../../../../tools/types.js";
|
|
20
|
-
|
|
21
|
-
interface GraphQueryInput {
|
|
22
|
-
query_type: "neighbors" | "typed_traversal" | "intersection";
|
|
23
|
-
seeds: string[];
|
|
24
|
-
steps?: Array<{
|
|
25
|
-
relation_types?: string[];
|
|
26
|
-
entity_types?: string[];
|
|
27
|
-
}>;
|
|
28
|
-
max_results?: number;
|
|
29
|
-
include_items?: boolean;
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
interface EntityResult {
|
|
33
|
-
id: string;
|
|
34
|
-
name: string;
|
|
35
|
-
type: string;
|
|
36
|
-
aliases: string[];
|
|
37
|
-
items?: Array<{ subject: string; statement: string }>;
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
export async function run(
|
|
41
|
-
input: Record<string, unknown>,
|
|
42
|
-
_context: ToolContext,
|
|
43
|
-
): Promise<ToolExecutionResult> {
|
|
44
|
-
const params = input as unknown as GraphQueryInput;
|
|
45
|
-
|
|
46
|
-
initializeDb();
|
|
47
|
-
|
|
48
|
-
const maxResults = params.max_results ?? 20;
|
|
49
|
-
const includeItems = params.include_items ?? true;
|
|
50
|
-
|
|
51
|
-
// Resolve seed entity names to IDs
|
|
52
|
-
const seedEntityIds: string[] = [];
|
|
53
|
-
const resolvedSeeds: Array<{ name: string; id: string }> = [];
|
|
54
|
-
for (const seedName of params.seeds) {
|
|
55
|
-
const matched = findMatchedEntities(seedName, 5);
|
|
56
|
-
if (matched.length > 0) {
|
|
57
|
-
seedEntityIds.push(matched[0].id);
|
|
58
|
-
resolvedSeeds.push({ name: seedName, id: matched[0].id });
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
if (seedEntityIds.length === 0) {
|
|
63
|
-
return {
|
|
64
|
-
content: JSON.stringify({
|
|
65
|
-
error: "No matching entities found for the provided seed names",
|
|
66
|
-
seeds: params.seeds,
|
|
67
|
-
}),
|
|
68
|
-
isError: true,
|
|
69
|
-
};
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
// For intersection queries, all seeds must resolve — dropping any seed silently
|
|
73
|
-
// changes semantics from "reachable from ALL seeds" to "reachable from resolved seeds"
|
|
74
|
-
if (
|
|
75
|
-
params.query_type === "intersection" &&
|
|
76
|
-
seedEntityIds.length < params.seeds.length
|
|
77
|
-
) {
|
|
78
|
-
const unresolvedSeeds = params.seeds.filter(
|
|
79
|
-
(name) => !resolvedSeeds.some((s) => s.name === name),
|
|
80
|
-
);
|
|
81
|
-
return {
|
|
82
|
-
content: JSON.stringify({
|
|
83
|
-
error:
|
|
84
|
-
"Some seed entities could not be resolved. Intersection requires all seeds to match.",
|
|
85
|
-
unresolved_seeds: unresolvedSeeds,
|
|
86
|
-
resolved_seeds: resolvedSeeds,
|
|
87
|
-
}),
|
|
88
|
-
isError: true,
|
|
89
|
-
};
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
let resultEntityIds: string[];
|
|
93
|
-
|
|
94
|
-
switch (params.query_type) {
|
|
95
|
-
case "neighbors": {
|
|
96
|
-
const steps = params.steps?.[0];
|
|
97
|
-
const result = findNeighborEntities(seedEntityIds, {
|
|
98
|
-
maxEdges: 40,
|
|
99
|
-
maxNeighborEntities: maxResults,
|
|
100
|
-
maxDepth: 1,
|
|
101
|
-
relationTypes: steps?.relation_types as
|
|
102
|
-
| EntityRelationType[]
|
|
103
|
-
| undefined,
|
|
104
|
-
entityTypes: steps?.entity_types as EntityType[] | undefined,
|
|
105
|
-
});
|
|
106
|
-
resultEntityIds = result.neighborEntityIds;
|
|
107
|
-
break;
|
|
108
|
-
}
|
|
109
|
-
|
|
110
|
-
case "typed_traversal": {
|
|
111
|
-
const traversalSteps: TraversalStep[] = (params.steps ?? []).map((s) => ({
|
|
112
|
-
relationTypes: s.relation_types as EntityRelationType[] | undefined,
|
|
113
|
-
entityTypes: s.entity_types as EntityType[] | undefined,
|
|
114
|
-
}));
|
|
115
|
-
resultEntityIds = collectTypedNeighbors(seedEntityIds, traversalSteps, {
|
|
116
|
-
maxResultsPerStep: maxResults,
|
|
117
|
-
maxEdgesPerStep: 40,
|
|
118
|
-
});
|
|
119
|
-
break;
|
|
120
|
-
}
|
|
121
|
-
|
|
122
|
-
case "intersection": {
|
|
123
|
-
// Run typed traversal from each seed independently, then intersect
|
|
124
|
-
const traversalSteps: TraversalStep[] = (params.steps ?? []).map((s) => ({
|
|
125
|
-
relationTypes: s.relation_types as EntityRelationType[] | undefined,
|
|
126
|
-
entityTypes: s.entity_types as EntityType[] | undefined,
|
|
127
|
-
}));
|
|
128
|
-
|
|
129
|
-
const resultSets: Set<string>[] = [];
|
|
130
|
-
for (const seedId of seedEntityIds) {
|
|
131
|
-
const result = collectTypedNeighbors([seedId], traversalSteps, {
|
|
132
|
-
maxResultsPerStep: maxResults,
|
|
133
|
-
maxEdgesPerStep: 40,
|
|
134
|
-
});
|
|
135
|
-
resultSets.push(new Set(result));
|
|
136
|
-
}
|
|
137
|
-
|
|
138
|
-
if (resultSets.length === 0) {
|
|
139
|
-
resultEntityIds = [];
|
|
140
|
-
} else {
|
|
141
|
-
// Intersect all sets
|
|
142
|
-
const intersection = [...resultSets[0]].filter((id) =>
|
|
143
|
-
resultSets.every((set) => set.has(id)),
|
|
144
|
-
);
|
|
145
|
-
resultEntityIds = intersection;
|
|
146
|
-
}
|
|
147
|
-
break;
|
|
148
|
-
}
|
|
149
|
-
|
|
150
|
-
default:
|
|
151
|
-
return {
|
|
152
|
-
content: JSON.stringify({
|
|
153
|
-
error: `Unknown query_type: ${params.query_type}`,
|
|
154
|
-
}),
|
|
155
|
-
isError: true,
|
|
156
|
-
};
|
|
157
|
-
}
|
|
158
|
-
|
|
159
|
-
// Look up entity details
|
|
160
|
-
const db = getDb();
|
|
161
|
-
const entities: EntityResult[] = [];
|
|
162
|
-
|
|
163
|
-
if (resultEntityIds.length > 0) {
|
|
164
|
-
const entityRows = db
|
|
165
|
-
.select()
|
|
166
|
-
.from(memoryEntities)
|
|
167
|
-
.where(inArray(memoryEntities.id, resultEntityIds.slice(0, maxResults)))
|
|
168
|
-
.all();
|
|
169
|
-
|
|
170
|
-
for (const row of entityRows) {
|
|
171
|
-
const entity: EntityResult = {
|
|
172
|
-
id: row.id,
|
|
173
|
-
name: row.name,
|
|
174
|
-
type: row.type,
|
|
175
|
-
aliases: row.aliases ? (JSON.parse(row.aliases) as string[]) : [],
|
|
176
|
-
};
|
|
177
|
-
|
|
178
|
-
if (includeItems) {
|
|
179
|
-
const candidates = getEntityLinkedItemCandidates([row.id], {
|
|
180
|
-
source: "entity_direct",
|
|
181
|
-
scopeIds: _context.memoryScopeId
|
|
182
|
-
? [_context.memoryScopeId]
|
|
183
|
-
: undefined,
|
|
184
|
-
});
|
|
185
|
-
entity.items = candidates.slice(0, 5).map((c) => {
|
|
186
|
-
const parts = c.text.split(": ");
|
|
187
|
-
return {
|
|
188
|
-
subject: parts[0] ?? "",
|
|
189
|
-
statement: parts.slice(1).join(": ") || c.text,
|
|
190
|
-
};
|
|
191
|
-
});
|
|
192
|
-
}
|
|
193
|
-
|
|
194
|
-
entities.push(entity);
|
|
195
|
-
}
|
|
196
|
-
}
|
|
197
|
-
|
|
198
|
-
return {
|
|
199
|
-
content: JSON.stringify(
|
|
200
|
-
{
|
|
201
|
-
query_type: params.query_type,
|
|
202
|
-
resolved_seeds: resolvedSeeds,
|
|
203
|
-
result_count: entities.length,
|
|
204
|
-
entities,
|
|
205
|
-
},
|
|
206
|
-
null,
|
|
207
|
-
2,
|
|
208
|
-
),
|
|
209
|
-
isError: false,
|
|
210
|
-
};
|
|
211
|
-
}
|
|
@@ -1,167 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Conflict-gate logic extracted from Session.
|
|
3
|
-
*
|
|
4
|
-
* Handles pending memory conflicts internally: dismisses non-user-evidenced
|
|
5
|
-
* and non-actionable conflicts, and attempts resolution when the user's reply
|
|
6
|
-
* looks like an explicit clarification with topical relevance. Never produces
|
|
7
|
-
* user-facing clarification text.
|
|
8
|
-
*/
|
|
9
|
-
|
|
10
|
-
import { resolveConflictClarification } from "../memory/clarification-resolver.js";
|
|
11
|
-
import {
|
|
12
|
-
areStatementsCoherent,
|
|
13
|
-
computeConflictRelevance,
|
|
14
|
-
looksLikeClarificationReply,
|
|
15
|
-
shouldAttemptConflictResolution,
|
|
16
|
-
} from "../memory/conflict-intent.js";
|
|
17
|
-
import {
|
|
18
|
-
isConflictKindPairEligible,
|
|
19
|
-
isConflictUserEvidenced,
|
|
20
|
-
isStatementConflictEligible,
|
|
21
|
-
} from "../memory/conflict-policy.js";
|
|
22
|
-
import type { PendingConflictDetail } from "../memory/conflict-store.js";
|
|
23
|
-
import {
|
|
24
|
-
applyConflictResolution,
|
|
25
|
-
listPendingConflictDetails,
|
|
26
|
-
resolveConflict,
|
|
27
|
-
} from "../memory/conflict-store.js";
|
|
28
|
-
|
|
29
|
-
export class ConflictGate {
|
|
30
|
-
async evaluate(
|
|
31
|
-
userMessage: string,
|
|
32
|
-
conflictConfig: {
|
|
33
|
-
enabled: boolean;
|
|
34
|
-
gateMode: string;
|
|
35
|
-
relevanceThreshold: number;
|
|
36
|
-
resolverLlmTimeoutMs: number;
|
|
37
|
-
conflictableKinds: readonly string[];
|
|
38
|
-
},
|
|
39
|
-
scopeId = "default",
|
|
40
|
-
): Promise<void> {
|
|
41
|
-
if (!conflictConfig.enabled || conflictConfig.gateMode !== "soft") return;
|
|
42
|
-
|
|
43
|
-
const pendingBeforeResolve = listPendingConflictDetails(scopeId, 50);
|
|
44
|
-
|
|
45
|
-
// Dismiss non-actionable conflicts (kind/statement policy, incoherent pair,
|
|
46
|
-
// or assistant-inferred-only provenance with no user evidence)
|
|
47
|
-
const dismissedIds = new Set<string>();
|
|
48
|
-
for (const conflict of pendingBeforeResolve) {
|
|
49
|
-
const dismissReason = this.getDismissReason(
|
|
50
|
-
conflict,
|
|
51
|
-
conflictConfig.conflictableKinds,
|
|
52
|
-
);
|
|
53
|
-
if (dismissReason) {
|
|
54
|
-
resolveConflict(conflict.id, {
|
|
55
|
-
status: "dismissed",
|
|
56
|
-
resolutionNote: dismissReason,
|
|
57
|
-
});
|
|
58
|
-
dismissedIds.add(conflict.id);
|
|
59
|
-
}
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
const actionablePending = pendingBeforeResolve.filter(
|
|
63
|
-
(c) => !dismissedIds.has(c.id),
|
|
64
|
-
);
|
|
65
|
-
|
|
66
|
-
// Attempt resolution only for explicit clarification-like replies with
|
|
67
|
-
// topical relevance to the conflict statements
|
|
68
|
-
const clarificationReply = looksLikeClarificationReply(userMessage);
|
|
69
|
-
const candidatesBeforeResolve = actionablePending.filter((conflict) => {
|
|
70
|
-
const relevance = computeConflictRelevance(userMessage, conflict);
|
|
71
|
-
return shouldAttemptConflictResolution({
|
|
72
|
-
clarificationReply,
|
|
73
|
-
relevance,
|
|
74
|
-
});
|
|
75
|
-
});
|
|
76
|
-
await this.resolvePendingConflicts(
|
|
77
|
-
userMessage,
|
|
78
|
-
conflictConfig.resolverLlmTimeoutMs,
|
|
79
|
-
candidatesBeforeResolve,
|
|
80
|
-
);
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
private async resolvePendingConflicts(
|
|
84
|
-
userMessage: string,
|
|
85
|
-
resolverTimeoutMs: number,
|
|
86
|
-
pendingConflicts: PendingConflictDetail[],
|
|
87
|
-
): Promise<void> {
|
|
88
|
-
for (const conflict of pendingConflicts) {
|
|
89
|
-
const resolution = await resolveConflictClarification(
|
|
90
|
-
{
|
|
91
|
-
existingStatement: conflict.existingStatement,
|
|
92
|
-
candidateStatement: conflict.candidateStatement,
|
|
93
|
-
userMessage,
|
|
94
|
-
},
|
|
95
|
-
{ timeoutMs: resolverTimeoutMs },
|
|
96
|
-
);
|
|
97
|
-
if (resolution.resolution === "still_unclear") continue;
|
|
98
|
-
|
|
99
|
-
applyConflictResolution({
|
|
100
|
-
conflictId: conflict.id,
|
|
101
|
-
resolution: resolution.resolution,
|
|
102
|
-
mergedStatement:
|
|
103
|
-
resolution.resolution === "merge"
|
|
104
|
-
? resolution.resolvedStatement
|
|
105
|
-
: null,
|
|
106
|
-
resolutionNote: resolution.explanation,
|
|
107
|
-
});
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
/**
|
|
112
|
-
* Returns a dismissal reason if the conflict should be dismissed, or null if actionable.
|
|
113
|
-
*/
|
|
114
|
-
private getDismissReason(
|
|
115
|
-
conflict: PendingConflictDetail,
|
|
116
|
-
conflictableKinds: readonly string[],
|
|
117
|
-
): string | null {
|
|
118
|
-
if (
|
|
119
|
-
!isConflictKindPairEligible(
|
|
120
|
-
conflict.existingKind,
|
|
121
|
-
conflict.candidateKind,
|
|
122
|
-
{ conflictableKinds },
|
|
123
|
-
)
|
|
124
|
-
) {
|
|
125
|
-
return "Dismissed by conflict policy (kind not eligible).";
|
|
126
|
-
}
|
|
127
|
-
if (
|
|
128
|
-
!isStatementConflictEligible(
|
|
129
|
-
conflict.existingKind,
|
|
130
|
-
conflict.existingStatement,
|
|
131
|
-
{ conflictableKinds },
|
|
132
|
-
)
|
|
133
|
-
) {
|
|
134
|
-
return "Dismissed by conflict policy (transient/non-durable).";
|
|
135
|
-
}
|
|
136
|
-
if (
|
|
137
|
-
!isStatementConflictEligible(
|
|
138
|
-
conflict.candidateKind,
|
|
139
|
-
conflict.candidateStatement,
|
|
140
|
-
{ conflictableKinds },
|
|
141
|
-
)
|
|
142
|
-
) {
|
|
143
|
-
return "Dismissed by conflict policy (transient/non-durable).";
|
|
144
|
-
}
|
|
145
|
-
// Dismiss incoherent conflicts where the two statements have zero topical overlap
|
|
146
|
-
if (
|
|
147
|
-
!areStatementsCoherent(
|
|
148
|
-
conflict.existingStatement,
|
|
149
|
-
conflict.candidateStatement,
|
|
150
|
-
)
|
|
151
|
-
) {
|
|
152
|
-
return "Dismissed by conflict policy (incoherent — zero statement overlap).";
|
|
153
|
-
}
|
|
154
|
-
// Dismiss conflicts where neither side has user-evidenced provenance
|
|
155
|
-
if (
|
|
156
|
-
!isConflictUserEvidenced(
|
|
157
|
-
conflict.existingVerificationState,
|
|
158
|
-
conflict.candidateVerificationState,
|
|
159
|
-
)
|
|
160
|
-
) {
|
|
161
|
-
return "Dismissed by conflict policy (no user-evidenced provenance).";
|
|
162
|
-
}
|
|
163
|
-
return null;
|
|
164
|
-
}
|
|
165
|
-
}
|
|
166
|
-
|
|
167
|
-
export { computeConflictRelevance, looksLikeClarificationReply };
|
|
@@ -1,77 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Dynamic-profile injection and stripping helpers extracted from Session.
|
|
3
|
-
*
|
|
4
|
-
* These are pure functions with no state — they wrap profile text into user
|
|
5
|
-
* messages at runtime and strip it back out before persistence.
|
|
6
|
-
*/
|
|
7
|
-
|
|
8
|
-
import type { Message } from "../providers/types.js";
|
|
9
|
-
|
|
10
|
-
export function injectDynamicProfileIntoUserMessage(
|
|
11
|
-
message: Message,
|
|
12
|
-
profileText: string,
|
|
13
|
-
): Message {
|
|
14
|
-
const trimmedProfile = profileText.trim();
|
|
15
|
-
if (trimmedProfile.length === 0) return message;
|
|
16
|
-
const block = [
|
|
17
|
-
"<dynamic-profile-context>",
|
|
18
|
-
trimmedProfile,
|
|
19
|
-
"</dynamic-profile-context>",
|
|
20
|
-
].join("\n");
|
|
21
|
-
return {
|
|
22
|
-
...message,
|
|
23
|
-
content: [...message.content, { type: "text", text: `\n\n${block}` }],
|
|
24
|
-
};
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
export function stripDynamicProfileMessages(
|
|
28
|
-
messages: Message[],
|
|
29
|
-
profileText: string,
|
|
30
|
-
): Message[] {
|
|
31
|
-
const trimmedProfile = profileText.trim();
|
|
32
|
-
if (trimmedProfile.length === 0) return messages;
|
|
33
|
-
const injectedBlock = `\n\n<dynamic-profile-context>\n${trimmedProfile}\n</dynamic-profile-context>`;
|
|
34
|
-
// Find the last user message that actually contains the injected profile block.
|
|
35
|
-
// We can't just target the last user message by role — tool_result messages also
|
|
36
|
-
// have role 'user', so after tool use the last user message won't be the one
|
|
37
|
-
// we injected the profile into.
|
|
38
|
-
let lastUserIdx = -1;
|
|
39
|
-
for (let i = messages.length - 1; i >= 0; i--) {
|
|
40
|
-
if (
|
|
41
|
-
messages[i].role === "user" &&
|
|
42
|
-
messages[i].content.some(
|
|
43
|
-
(b) => b.type === "text" && b.text.includes(injectedBlock),
|
|
44
|
-
)
|
|
45
|
-
) {
|
|
46
|
-
lastUserIdx = i;
|
|
47
|
-
break;
|
|
48
|
-
}
|
|
49
|
-
}
|
|
50
|
-
if (lastUserIdx === -1) return messages;
|
|
51
|
-
const message = messages[lastUserIdx];
|
|
52
|
-
let changed = false;
|
|
53
|
-
const nextContent = message.content
|
|
54
|
-
.map((block) => {
|
|
55
|
-
if (block.type !== "text") return block;
|
|
56
|
-
const nextText = block.text.split(injectedBlock).join("");
|
|
57
|
-
if (nextText === block.text) return block;
|
|
58
|
-
changed = true;
|
|
59
|
-
const stripped = nextText.replace(/\n{3,}/g, "\n\n").trimEnd();
|
|
60
|
-
return stripped.length > 0 ? { ...block, text: stripped } : null;
|
|
61
|
-
})
|
|
62
|
-
.filter((block): block is NonNullable<typeof block> => block != null);
|
|
63
|
-
if (!changed) return messages;
|
|
64
|
-
// If stripping removed all content blocks, drop the message entirely
|
|
65
|
-
// to avoid sending an empty content array to the provider.
|
|
66
|
-
if (nextContent.length === 0) {
|
|
67
|
-
return [
|
|
68
|
-
...messages.slice(0, lastUserIdx),
|
|
69
|
-
...messages.slice(lastUserIdx + 1),
|
|
70
|
-
];
|
|
71
|
-
}
|
|
72
|
-
return [
|
|
73
|
-
...messages.slice(0, lastUserIdx),
|
|
74
|
-
{ ...message, content: nextContent },
|
|
75
|
-
...messages.slice(lastUserIdx + 1),
|
|
76
|
-
];
|
|
77
|
-
}
|