@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,193 +0,0 @@
|
|
|
1
|
-
import { beforeEach, describe, expect, mock, test } from "bun:test";
|
|
2
|
-
|
|
3
|
-
let llmCallCount = 0;
|
|
4
|
-
let llmDelayMs = 0;
|
|
5
|
-
let llmResolution:
|
|
6
|
-
| "keep_existing"
|
|
7
|
-
| "keep_candidate"
|
|
8
|
-
| "merge"
|
|
9
|
-
| "still_unclear" = "still_unclear";
|
|
10
|
-
let llmResolvedStatement = "";
|
|
11
|
-
let llmExplanation = "Unclear response from user.";
|
|
12
|
-
|
|
13
|
-
mock.module("../providers/provider-send-message.js", () => ({
|
|
14
|
-
getConfiguredProvider: () => ({
|
|
15
|
-
sendMessage: async (
|
|
16
|
-
_messages: unknown,
|
|
17
|
-
_tools: unknown,
|
|
18
|
-
_system: unknown,
|
|
19
|
-
opts?: { signal?: AbortSignal },
|
|
20
|
-
) => {
|
|
21
|
-
llmCallCount += 1;
|
|
22
|
-
if (llmDelayMs > 0) {
|
|
23
|
-
await new Promise((resolve, reject) => {
|
|
24
|
-
const timer = setTimeout(resolve, llmDelayMs);
|
|
25
|
-
opts?.signal?.addEventListener("abort", () => {
|
|
26
|
-
clearTimeout(timer);
|
|
27
|
-
reject(new Error("Request was aborted."));
|
|
28
|
-
});
|
|
29
|
-
});
|
|
30
|
-
}
|
|
31
|
-
return {
|
|
32
|
-
content: [
|
|
33
|
-
{
|
|
34
|
-
type: "tool_use" as const,
|
|
35
|
-
id: "test-tool-use-id",
|
|
36
|
-
name: "resolve_conflict",
|
|
37
|
-
input: {
|
|
38
|
-
resolution: llmResolution,
|
|
39
|
-
resolved_statement: llmResolvedStatement,
|
|
40
|
-
explanation: llmExplanation,
|
|
41
|
-
},
|
|
42
|
-
},
|
|
43
|
-
],
|
|
44
|
-
model: "claude-haiku-4-5-20251001",
|
|
45
|
-
stopReason: "tool_use",
|
|
46
|
-
usage: { inputTokens: 0, outputTokens: 0 },
|
|
47
|
-
};
|
|
48
|
-
},
|
|
49
|
-
}),
|
|
50
|
-
createTimeout: (ms: number) => {
|
|
51
|
-
const controller = new AbortController();
|
|
52
|
-
const timer = setTimeout(() => controller.abort(), ms);
|
|
53
|
-
return {
|
|
54
|
-
signal: controller.signal,
|
|
55
|
-
cleanup: () => clearTimeout(timer),
|
|
56
|
-
};
|
|
57
|
-
},
|
|
58
|
-
extractToolUse: (response: { content: Array<{ type: string }> }) => {
|
|
59
|
-
return response.content.find(
|
|
60
|
-
(b: { type: string }) => b.type === "tool_use",
|
|
61
|
-
);
|
|
62
|
-
},
|
|
63
|
-
userMessage: (text: string) => ({
|
|
64
|
-
role: "user",
|
|
65
|
-
content: [{ type: "text", text }],
|
|
66
|
-
}),
|
|
67
|
-
}));
|
|
68
|
-
|
|
69
|
-
mock.module("../config/loader.js", () => ({
|
|
70
|
-
getConfig: () => ({
|
|
71
|
-
ui: {},
|
|
72
|
-
|
|
73
|
-
apiKeys: {
|
|
74
|
-
anthropic: "test-key",
|
|
75
|
-
},
|
|
76
|
-
}),
|
|
77
|
-
}));
|
|
78
|
-
|
|
79
|
-
import { resolveConflictClarification } from "../memory/clarification-resolver.js";
|
|
80
|
-
|
|
81
|
-
beforeEach(() => {
|
|
82
|
-
llmCallCount = 0;
|
|
83
|
-
llmDelayMs = 0;
|
|
84
|
-
llmResolution = "still_unclear";
|
|
85
|
-
llmResolvedStatement = "";
|
|
86
|
-
llmExplanation = "Unclear response from user.";
|
|
87
|
-
});
|
|
88
|
-
|
|
89
|
-
describe("resolveConflictClarification", () => {
|
|
90
|
-
test("returns keep_existing from deterministic heuristic", async () => {
|
|
91
|
-
const result = await resolveConflictClarification({
|
|
92
|
-
existingStatement: "Use React for frontend work.",
|
|
93
|
-
candidateStatement: "Use Vue for frontend work.",
|
|
94
|
-
userMessage: "Keep the old React preference.",
|
|
95
|
-
});
|
|
96
|
-
|
|
97
|
-
expect(result.resolution).toBe("keep_existing");
|
|
98
|
-
expect(result.strategy).toBe("heuristic");
|
|
99
|
-
expect(llmCallCount).toBe(0);
|
|
100
|
-
});
|
|
101
|
-
|
|
102
|
-
test("returns keep_candidate from deterministic heuristic", async () => {
|
|
103
|
-
const result = await resolveConflictClarification({
|
|
104
|
-
existingStatement: "Use React for frontend work.",
|
|
105
|
-
candidateStatement: "Use Vue for frontend work.",
|
|
106
|
-
userMessage: "Use the new Vue note going forward.",
|
|
107
|
-
});
|
|
108
|
-
|
|
109
|
-
expect(result.resolution).toBe("keep_candidate");
|
|
110
|
-
expect(result.strategy).toBe("heuristic");
|
|
111
|
-
expect(llmCallCount).toBe(0);
|
|
112
|
-
});
|
|
113
|
-
|
|
114
|
-
test("returns merge from deterministic heuristic", async () => {
|
|
115
|
-
const result = await resolveConflictClarification({
|
|
116
|
-
existingStatement: "React is preferred for dashboards.",
|
|
117
|
-
candidateStatement: "Vue is preferred for marketing pages.",
|
|
118
|
-
userMessage:
|
|
119
|
-
"Both are true: React for dashboards and Vue for marketing pages.",
|
|
120
|
-
});
|
|
121
|
-
|
|
122
|
-
expect(result.resolution).toBe("merge");
|
|
123
|
-
expect(result.strategy).toBe("heuristic");
|
|
124
|
-
expect(result.resolvedStatement).toContain("Both are true");
|
|
125
|
-
expect(llmCallCount).toBe(0);
|
|
126
|
-
});
|
|
127
|
-
|
|
128
|
-
test("uses LLM fallback when heuristics are inconclusive", async () => {
|
|
129
|
-
llmResolution = "still_unclear";
|
|
130
|
-
llmExplanation = "The user message does not pick a side.";
|
|
131
|
-
|
|
132
|
-
const result = await resolveConflictClarification({
|
|
133
|
-
existingStatement: "Use React for frontend work.",
|
|
134
|
-
candidateStatement: "Use Vue for frontend work.",
|
|
135
|
-
userMessage: "Not sure yet.",
|
|
136
|
-
});
|
|
137
|
-
|
|
138
|
-
expect(result.resolution).toBe("still_unclear");
|
|
139
|
-
expect(result.strategy).toBe("llm");
|
|
140
|
-
expect(llmCallCount).toBe(1);
|
|
141
|
-
});
|
|
142
|
-
|
|
143
|
-
test("does not match cue substrings inside unrelated words", async () => {
|
|
144
|
-
llmResolution = "keep_candidate";
|
|
145
|
-
llmExplanation = "User wants Vue.";
|
|
146
|
-
|
|
147
|
-
// "told" contains "old" as a substring but not as a whole word
|
|
148
|
-
const result = await resolveConflictClarification({
|
|
149
|
-
existingStatement: "Use React for frontend work.",
|
|
150
|
-
candidateStatement: "Use Vue for frontend work.",
|
|
151
|
-
userMessage: "I told you, use Vue.",
|
|
152
|
-
});
|
|
153
|
-
|
|
154
|
-
expect(result.resolution).toBe("keep_candidate");
|
|
155
|
-
expect(result.strategy).toBe("llm");
|
|
156
|
-
expect(llmCallCount).toBe(1);
|
|
157
|
-
});
|
|
158
|
-
|
|
159
|
-
test("delegates to LLM when multiple cue categories match", async () => {
|
|
160
|
-
llmResolution = "keep_existing";
|
|
161
|
-
llmExplanation = "User wants the old one.";
|
|
162
|
-
|
|
163
|
-
// "either" is a merge cue, "old" is an existing cue — ambiguous
|
|
164
|
-
const result = await resolveConflictClarification({
|
|
165
|
-
existingStatement: "Use React for frontend work.",
|
|
166
|
-
candidateStatement: "Use Vue for frontend work.",
|
|
167
|
-
userMessage: "I don't want either, keep the old one.",
|
|
168
|
-
});
|
|
169
|
-
|
|
170
|
-
expect(result.resolution).toBe("keep_existing");
|
|
171
|
-
expect(result.strategy).toBe("llm");
|
|
172
|
-
expect(llmCallCount).toBe(1);
|
|
173
|
-
});
|
|
174
|
-
|
|
175
|
-
test("enforces timeout bound on LLM fallback", async () => {
|
|
176
|
-
llmResolution = "keep_candidate";
|
|
177
|
-
llmExplanation = "Prefer the newer statement.";
|
|
178
|
-
llmDelayMs = 50;
|
|
179
|
-
|
|
180
|
-
const result = await resolveConflictClarification(
|
|
181
|
-
{
|
|
182
|
-
existingStatement: "Use React for frontend work.",
|
|
183
|
-
candidateStatement: "Use Vue for frontend work.",
|
|
184
|
-
userMessage: "I cannot decide right now.",
|
|
185
|
-
},
|
|
186
|
-
{ timeoutMs: 5 },
|
|
187
|
-
);
|
|
188
|
-
|
|
189
|
-
expect(result.resolution).toBe("still_unclear");
|
|
190
|
-
expect(result.strategy).toBe("llm_timeout");
|
|
191
|
-
expect(llmCallCount).toBe(1);
|
|
192
|
-
});
|
|
193
|
-
});
|
|
@@ -1,160 +0,0 @@
|
|
|
1
|
-
import { describe, expect, test } from "bun:test";
|
|
2
|
-
|
|
3
|
-
import {
|
|
4
|
-
areStatementsCoherent,
|
|
5
|
-
computeConflictRelevance,
|
|
6
|
-
overlapRatio as _overlapRatio,
|
|
7
|
-
tokenizeForConflictRelevance as _tokenizeForConflictRelevance,
|
|
8
|
-
} from "../memory/conflict-intent.js";
|
|
9
|
-
|
|
10
|
-
describe("tokenizeForConflictRelevance hardening", () => {
|
|
11
|
-
test("excludes numeric-only tokens from relevance", () => {
|
|
12
|
-
const relevance = computeConflictRelevance("Check PR 5526", {
|
|
13
|
-
existingStatement: "Track PR 5525 for review.",
|
|
14
|
-
candidateStatement: "Track PR 5526 for review.",
|
|
15
|
-
});
|
|
16
|
-
// Numeric tokens "5526" and "5525" should be excluded, so overlap is minimal
|
|
17
|
-
expect(relevance).toBeLessThan(0.5);
|
|
18
|
-
});
|
|
19
|
-
|
|
20
|
-
test("excludes URL boilerplate tokens from relevance", () => {
|
|
21
|
-
const relevance = computeConflictRelevance(
|
|
22
|
-
"Check https://github.com/org/repo/pull/123",
|
|
23
|
-
{
|
|
24
|
-
existingStatement: "Review https://github.com/org/repo/pull/456",
|
|
25
|
-
candidateStatement: "Review https://github.com/org/repo/pull/789",
|
|
26
|
-
},
|
|
27
|
-
);
|
|
28
|
-
// URL tokens like "https", "github", "pull" should be excluded;
|
|
29
|
-
// only real content tokens like "repo" remain, keeping relevance low
|
|
30
|
-
expect(relevance).toBeLessThanOrEqual(0.5);
|
|
31
|
-
});
|
|
32
|
-
|
|
33
|
-
test("URL-embedded tracking tokens are stripped, standalone usage preserved", () => {
|
|
34
|
-
// URLs containing "issue", "pull", etc. are stripped entirely before tokenizing
|
|
35
|
-
const urlRelevance = computeConflictRelevance(
|
|
36
|
-
"Check https://github.com/org/repo/issues/42",
|
|
37
|
-
{
|
|
38
|
-
existingStatement: "Review https://github.com/org/repo/issues/10",
|
|
39
|
-
candidateStatement: "Review https://github.com/org/repo/issues/11",
|
|
40
|
-
},
|
|
41
|
-
);
|
|
42
|
-
expect(urlRelevance).toBeLessThanOrEqual(0.5);
|
|
43
|
-
|
|
44
|
-
// Standalone "issue" is preserved as a meaningful token
|
|
45
|
-
const standaloneRelevance = computeConflictRelevance(
|
|
46
|
-
"should I file an issue?",
|
|
47
|
-
{
|
|
48
|
-
existingStatement: "File an issue when bugs are found.",
|
|
49
|
-
candidateStatement: "Skip filing an issue for minor bugs.",
|
|
50
|
-
},
|
|
51
|
-
);
|
|
52
|
-
expect(standaloneRelevance).toBeGreaterThan(0);
|
|
53
|
-
});
|
|
54
|
-
|
|
55
|
-
test("strips scheme-less bare domain URLs from relevance", () => {
|
|
56
|
-
const relevance = computeConflictRelevance(
|
|
57
|
-
"Check github.com/org/repo/pull/123",
|
|
58
|
-
{
|
|
59
|
-
existingStatement: "Review gitlab.com/org/repo/issues/456",
|
|
60
|
-
candidateStatement: "Review github.com/org/repo/pull/789",
|
|
61
|
-
},
|
|
62
|
-
);
|
|
63
|
-
// Bare URLs should be stripped entirely; tokens like "pull", "issues"
|
|
64
|
-
// embedded in paths must not contribute to overlap
|
|
65
|
-
expect(relevance).toBeLessThanOrEqual(0.5);
|
|
66
|
-
});
|
|
67
|
-
|
|
68
|
-
test("preserves dotted identifiers that look like file paths", () => {
|
|
69
|
-
const relevance = computeConflictRelevance("Use index.ts/runtime parser", {
|
|
70
|
-
existingStatement: "Keep index.ts/runtime approach.",
|
|
71
|
-
candidateStatement: "Switch to config.ts/runtime approach.",
|
|
72
|
-
});
|
|
73
|
-
// File-like identifiers should NOT be stripped as URLs
|
|
74
|
-
expect(relevance).toBeGreaterThan(0);
|
|
75
|
-
});
|
|
76
|
-
|
|
77
|
-
test("still computes meaningful relevance for real content tokens", () => {
|
|
78
|
-
const relevance = computeConflictRelevance(
|
|
79
|
-
"Should I use React for frontend?",
|
|
80
|
-
{
|
|
81
|
-
existingStatement: "Use React for frontend work.",
|
|
82
|
-
candidateStatement: "Use Vue for frontend work.",
|
|
83
|
-
},
|
|
84
|
-
);
|
|
85
|
-
// Real content tokens like "react", "frontend" should still match
|
|
86
|
-
expect(relevance).toBeGreaterThan(0);
|
|
87
|
-
});
|
|
88
|
-
});
|
|
89
|
-
|
|
90
|
-
describe("statement coherence (areStatementsCoherent)", () => {
|
|
91
|
-
test("unrelated statements are incoherent", () => {
|
|
92
|
-
expect(
|
|
93
|
-
areStatementsCoherent(
|
|
94
|
-
"The default model for the summarize CLI is google/gemini-3-flash-preview.",
|
|
95
|
-
"User's favorite color is blue.",
|
|
96
|
-
),
|
|
97
|
-
).toBe(false);
|
|
98
|
-
});
|
|
99
|
-
|
|
100
|
-
test("related statements are coherent", () => {
|
|
101
|
-
expect(
|
|
102
|
-
areStatementsCoherent(
|
|
103
|
-
"User's favorite color is blue.",
|
|
104
|
-
"User's favorite color is green.",
|
|
105
|
-
),
|
|
106
|
-
).toBe(true);
|
|
107
|
-
});
|
|
108
|
-
|
|
109
|
-
test("topically similar preferences are coherent", () => {
|
|
110
|
-
expect(
|
|
111
|
-
areStatementsCoherent(
|
|
112
|
-
"Use React for frontend work.",
|
|
113
|
-
"Use Vue for frontend work.",
|
|
114
|
-
),
|
|
115
|
-
).toBe(true);
|
|
116
|
-
});
|
|
117
|
-
|
|
118
|
-
test("completely disjoint technical topics are incoherent", () => {
|
|
119
|
-
expect(
|
|
120
|
-
areStatementsCoherent(
|
|
121
|
-
"Always use PostgreSQL for database storage.",
|
|
122
|
-
"The preferred terminal font is JetBrains Mono.",
|
|
123
|
-
),
|
|
124
|
-
).toBe(false);
|
|
125
|
-
});
|
|
126
|
-
|
|
127
|
-
test("short technical terms (3 chars) are preserved for coherence", () => {
|
|
128
|
-
// "vim" and "css" are 3 chars — should not be filtered
|
|
129
|
-
expect(
|
|
130
|
-
areStatementsCoherent(
|
|
131
|
-
"Use Vim for editing.",
|
|
132
|
-
"Use Emacs instead of Vim.",
|
|
133
|
-
),
|
|
134
|
-
).toBe(true);
|
|
135
|
-
|
|
136
|
-
expect(
|
|
137
|
-
areStatementsCoherent(
|
|
138
|
-
"Use CSS grid for layouts.",
|
|
139
|
-
"Use CSS flexbox for layouts.",
|
|
140
|
-
),
|
|
141
|
-
).toBe(true);
|
|
142
|
-
|
|
143
|
-
expect(
|
|
144
|
-
areStatementsCoherent(
|
|
145
|
-
"Use npm for installs.",
|
|
146
|
-
"Use npm with --legacy-peer-deps.",
|
|
147
|
-
),
|
|
148
|
-
).toBe(true);
|
|
149
|
-
});
|
|
150
|
-
|
|
151
|
-
test("short terms with no shared context are still incoherent", () => {
|
|
152
|
-
// No shared tokens at all — completely different topics
|
|
153
|
-
expect(
|
|
154
|
-
areStatementsCoherent(
|
|
155
|
-
"Vim is the preferred editor.",
|
|
156
|
-
"CSS grid handles page layouts.",
|
|
157
|
-
),
|
|
158
|
-
).toBe(false);
|
|
159
|
-
});
|
|
160
|
-
});
|
|
@@ -1,269 +0,0 @@
|
|
|
1
|
-
import { describe, expect, test } from "bun:test";
|
|
2
|
-
|
|
3
|
-
import {
|
|
4
|
-
isConflictKindEligible,
|
|
5
|
-
isConflictKindPairEligible,
|
|
6
|
-
isConflictUserEvidenced,
|
|
7
|
-
isDurableInstructionStatement,
|
|
8
|
-
isStatementConflictEligible,
|
|
9
|
-
isTransientTrackingStatement,
|
|
10
|
-
isUserEvidencedVerificationState,
|
|
11
|
-
} from "../memory/conflict-policy.js";
|
|
12
|
-
|
|
13
|
-
describe("conflict-policy", () => {
|
|
14
|
-
const config = { conflictableKinds: ["preference", "profile", "constraint"] };
|
|
15
|
-
|
|
16
|
-
describe("isConflictKindEligible", () => {
|
|
17
|
-
test("returns true for eligible kind", () => {
|
|
18
|
-
expect(isConflictKindEligible("preference", config)).toBe(true);
|
|
19
|
-
expect(isConflictKindEligible("profile", config)).toBe(true);
|
|
20
|
-
expect(isConflictKindEligible("constraint", config)).toBe(true);
|
|
21
|
-
});
|
|
22
|
-
|
|
23
|
-
test("returns false for ineligible kind", () => {
|
|
24
|
-
expect(isConflictKindEligible("project", config)).toBe(false);
|
|
25
|
-
expect(isConflictKindEligible("todo", config)).toBe(false);
|
|
26
|
-
expect(isConflictKindEligible("fact", config)).toBe(false);
|
|
27
|
-
});
|
|
28
|
-
});
|
|
29
|
-
|
|
30
|
-
describe("isConflictKindPairEligible", () => {
|
|
31
|
-
test("returns true when both kinds are eligible", () => {
|
|
32
|
-
expect(isConflictKindPairEligible("preference", "profile", config)).toBe(
|
|
33
|
-
true,
|
|
34
|
-
);
|
|
35
|
-
});
|
|
36
|
-
|
|
37
|
-
test("returns false when existing kind is ineligible", () => {
|
|
38
|
-
expect(isConflictKindPairEligible("project", "preference", config)).toBe(
|
|
39
|
-
false,
|
|
40
|
-
);
|
|
41
|
-
});
|
|
42
|
-
|
|
43
|
-
test("returns false when candidate kind is ineligible", () => {
|
|
44
|
-
expect(isConflictKindPairEligible("preference", "todo", config)).toBe(
|
|
45
|
-
false,
|
|
46
|
-
);
|
|
47
|
-
});
|
|
48
|
-
|
|
49
|
-
test("returns false when both kinds are ineligible", () => {
|
|
50
|
-
expect(isConflictKindPairEligible("project", "todo", config)).toBe(false);
|
|
51
|
-
});
|
|
52
|
-
});
|
|
53
|
-
|
|
54
|
-
describe("isTransientTrackingStatement", () => {
|
|
55
|
-
test("detects PR URLs", () => {
|
|
56
|
-
expect(
|
|
57
|
-
isTransientTrackingStatement(
|
|
58
|
-
"Track https://github.com/org/repo/pull/5526",
|
|
59
|
-
),
|
|
60
|
-
).toBe(true);
|
|
61
|
-
});
|
|
62
|
-
|
|
63
|
-
test("detects issue/ticket references", () => {
|
|
64
|
-
expect(isTransientTrackingStatement("Track PR #5526 and #5525")).toBe(
|
|
65
|
-
true,
|
|
66
|
-
);
|
|
67
|
-
expect(isTransientTrackingStatement("See issue #42 for details")).toBe(
|
|
68
|
-
true,
|
|
69
|
-
);
|
|
70
|
-
expect(isTransientTrackingStatement("Filed ticket 1234")).toBe(true);
|
|
71
|
-
});
|
|
72
|
-
|
|
73
|
-
test("detects tracking language", () => {
|
|
74
|
-
expect(isTransientTrackingStatement("While we wait for CI to pass")).toBe(
|
|
75
|
-
true,
|
|
76
|
-
);
|
|
77
|
-
expect(isTransientTrackingStatement("This PR needs review")).toBe(true);
|
|
78
|
-
});
|
|
79
|
-
|
|
80
|
-
test("does not flag generic time words as transient", () => {
|
|
81
|
-
expect(isTransientTrackingStatement("The deadline is today")).toBe(false);
|
|
82
|
-
expect(isTransientTrackingStatement("I need this right now")).toBe(false);
|
|
83
|
-
});
|
|
84
|
-
|
|
85
|
-
test("does not flag durable statements", () => {
|
|
86
|
-
expect(
|
|
87
|
-
isTransientTrackingStatement(
|
|
88
|
-
"Always answer with concise bullet points",
|
|
89
|
-
),
|
|
90
|
-
).toBe(false);
|
|
91
|
-
expect(isTransientTrackingStatement("User prefers dark mode")).toBe(
|
|
92
|
-
false,
|
|
93
|
-
);
|
|
94
|
-
});
|
|
95
|
-
|
|
96
|
-
test("does not false-positive on non-PR URLs", () => {
|
|
97
|
-
expect(
|
|
98
|
-
isTransientTrackingStatement("Visit https://example.com for docs"),
|
|
99
|
-
).toBe(false);
|
|
100
|
-
});
|
|
101
|
-
});
|
|
102
|
-
|
|
103
|
-
describe("isDurableInstructionStatement", () => {
|
|
104
|
-
test("detects durable instruction cues", () => {
|
|
105
|
-
expect(
|
|
106
|
-
isDurableInstructionStatement(
|
|
107
|
-
"Always answer with concise bullet points",
|
|
108
|
-
),
|
|
109
|
-
).toBe(true);
|
|
110
|
-
expect(
|
|
111
|
-
isDurableInstructionStatement("Never use semicolons in JavaScript"),
|
|
112
|
-
).toBe(true);
|
|
113
|
-
expect(
|
|
114
|
-
isDurableInstructionStatement("Use concise format for status updates"),
|
|
115
|
-
).toBe(true);
|
|
116
|
-
expect(
|
|
117
|
-
isDurableInstructionStatement("The default database is Postgres"),
|
|
118
|
-
).toBe(true);
|
|
119
|
-
});
|
|
120
|
-
|
|
121
|
-
test("rejects statements without durable cues", () => {
|
|
122
|
-
expect(isDurableInstructionStatement("Check the build output")).toBe(
|
|
123
|
-
false,
|
|
124
|
-
);
|
|
125
|
-
expect(isDurableInstructionStatement("Run the migration script")).toBe(
|
|
126
|
-
false,
|
|
127
|
-
);
|
|
128
|
-
});
|
|
129
|
-
});
|
|
130
|
-
|
|
131
|
-
describe("isStatementConflictEligible", () => {
|
|
132
|
-
test("rejects transient statements for any kind", () => {
|
|
133
|
-
expect(isStatementConflictEligible("preference", "Track PR #5526")).toBe(
|
|
134
|
-
false,
|
|
135
|
-
);
|
|
136
|
-
expect(
|
|
137
|
-
isStatementConflictEligible("instruction", "This PR needs review"),
|
|
138
|
-
).toBe(false);
|
|
139
|
-
});
|
|
140
|
-
|
|
141
|
-
test("accepts durable instruction statements", () => {
|
|
142
|
-
expect(
|
|
143
|
-
isStatementConflictEligible(
|
|
144
|
-
"instruction",
|
|
145
|
-
"Always use TypeScript strict mode",
|
|
146
|
-
),
|
|
147
|
-
).toBe(true);
|
|
148
|
-
expect(
|
|
149
|
-
isStatementConflictEligible("style", "Default to concise format"),
|
|
150
|
-
).toBe(true);
|
|
151
|
-
});
|
|
152
|
-
|
|
153
|
-
test("rejects non-durable instruction statements", () => {
|
|
154
|
-
expect(
|
|
155
|
-
isStatementConflictEligible("instruction", "Run the build first"),
|
|
156
|
-
).toBe(false);
|
|
157
|
-
expect(isStatementConflictEligible("style", "Check the output")).toBe(
|
|
158
|
-
false,
|
|
159
|
-
);
|
|
160
|
-
});
|
|
161
|
-
|
|
162
|
-
test("accepts non-transient statements for non-instruction kinds", () => {
|
|
163
|
-
expect(
|
|
164
|
-
isStatementConflictEligible("preference", "User prefers dark mode"),
|
|
165
|
-
).toBe(true);
|
|
166
|
-
expect(
|
|
167
|
-
isStatementConflictEligible("fact", "User works at Acme Corp"),
|
|
168
|
-
).toBe(true);
|
|
169
|
-
});
|
|
170
|
-
|
|
171
|
-
test("rejects kinds not in conflictableKinds when config is provided", () => {
|
|
172
|
-
const policyConfig = { conflictableKinds: ["preference", "profile"] };
|
|
173
|
-
expect(
|
|
174
|
-
isStatementConflictEligible(
|
|
175
|
-
"fact",
|
|
176
|
-
"User works at Acme Corp",
|
|
177
|
-
policyConfig,
|
|
178
|
-
),
|
|
179
|
-
).toBe(false);
|
|
180
|
-
expect(
|
|
181
|
-
isStatementConflictEligible(
|
|
182
|
-
"preference",
|
|
183
|
-
"User prefers dark mode",
|
|
184
|
-
policyConfig,
|
|
185
|
-
),
|
|
186
|
-
).toBe(true);
|
|
187
|
-
});
|
|
188
|
-
|
|
189
|
-
test("skips kind check when config is omitted", () => {
|
|
190
|
-
expect(
|
|
191
|
-
isStatementConflictEligible("fact", "User works at Acme Corp"),
|
|
192
|
-
).toBe(true);
|
|
193
|
-
});
|
|
194
|
-
});
|
|
195
|
-
|
|
196
|
-
describe("isUserEvidencedVerificationState", () => {
|
|
197
|
-
test("accepts user_reported", () => {
|
|
198
|
-
expect(isUserEvidencedVerificationState("user_reported")).toBe(true);
|
|
199
|
-
});
|
|
200
|
-
|
|
201
|
-
test("accepts user_confirmed", () => {
|
|
202
|
-
expect(isUserEvidencedVerificationState("user_confirmed")).toBe(true);
|
|
203
|
-
});
|
|
204
|
-
|
|
205
|
-
test("accepts legacy_import", () => {
|
|
206
|
-
expect(isUserEvidencedVerificationState("legacy_import")).toBe(true);
|
|
207
|
-
});
|
|
208
|
-
|
|
209
|
-
test("rejects assistant_inferred", () => {
|
|
210
|
-
expect(isUserEvidencedVerificationState("assistant_inferred")).toBe(
|
|
211
|
-
false,
|
|
212
|
-
);
|
|
213
|
-
});
|
|
214
|
-
|
|
215
|
-
test("rejects unknown states", () => {
|
|
216
|
-
expect(isUserEvidencedVerificationState("")).toBe(false);
|
|
217
|
-
expect(isUserEvidencedVerificationState("auto_detected")).toBe(false);
|
|
218
|
-
expect(isUserEvidencedVerificationState("pending")).toBe(false);
|
|
219
|
-
});
|
|
220
|
-
});
|
|
221
|
-
|
|
222
|
-
describe("isConflictUserEvidenced", () => {
|
|
223
|
-
test("returns true when existing side is user-evidenced", () => {
|
|
224
|
-
expect(
|
|
225
|
-
isConflictUserEvidenced("user_reported", "assistant_inferred"),
|
|
226
|
-
).toBe(true);
|
|
227
|
-
expect(
|
|
228
|
-
isConflictUserEvidenced("user_confirmed", "assistant_inferred"),
|
|
229
|
-
).toBe(true);
|
|
230
|
-
expect(
|
|
231
|
-
isConflictUserEvidenced("legacy_import", "assistant_inferred"),
|
|
232
|
-
).toBe(true);
|
|
233
|
-
});
|
|
234
|
-
|
|
235
|
-
test("returns true when candidate side is user-evidenced", () => {
|
|
236
|
-
expect(
|
|
237
|
-
isConflictUserEvidenced("assistant_inferred", "user_reported"),
|
|
238
|
-
).toBe(true);
|
|
239
|
-
expect(
|
|
240
|
-
isConflictUserEvidenced("assistant_inferred", "user_confirmed"),
|
|
241
|
-
).toBe(true);
|
|
242
|
-
expect(
|
|
243
|
-
isConflictUserEvidenced("assistant_inferred", "legacy_import"),
|
|
244
|
-
).toBe(true);
|
|
245
|
-
});
|
|
246
|
-
|
|
247
|
-
test("returns true when both sides are user-evidenced", () => {
|
|
248
|
-
expect(isConflictUserEvidenced("user_reported", "user_confirmed")).toBe(
|
|
249
|
-
true,
|
|
250
|
-
);
|
|
251
|
-
expect(isConflictUserEvidenced("legacy_import", "user_reported")).toBe(
|
|
252
|
-
true,
|
|
253
|
-
);
|
|
254
|
-
});
|
|
255
|
-
|
|
256
|
-
test("returns false when neither side is user-evidenced", () => {
|
|
257
|
-
expect(
|
|
258
|
-
isConflictUserEvidenced("assistant_inferred", "assistant_inferred"),
|
|
259
|
-
).toBe(false);
|
|
260
|
-
});
|
|
261
|
-
|
|
262
|
-
test("returns false for unknown states on both sides", () => {
|
|
263
|
-
expect(isConflictUserEvidenced("auto_detected", "pending")).toBe(false);
|
|
264
|
-
expect(
|
|
265
|
-
isConflictUserEvidenced("assistant_inferred", "auto_detected"),
|
|
266
|
-
).toBe(false);
|
|
267
|
-
});
|
|
268
|
-
});
|
|
269
|
-
});
|