@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,372 +0,0 @@
|
|
|
1
|
-
import { mkdtempSync, rmSync } from "node:fs";
|
|
2
|
-
import { tmpdir } from "node:os";
|
|
3
|
-
import { join } from "node:path";
|
|
4
|
-
import { afterAll, beforeEach, describe, expect, mock, test } from "bun:test";
|
|
5
|
-
|
|
6
|
-
import { eq } from "drizzle-orm";
|
|
7
|
-
|
|
8
|
-
const testDir = mkdtempSync(join(tmpdir(), "conflict-store-test-"));
|
|
9
|
-
|
|
10
|
-
mock.module("../util/platform.js", () => ({
|
|
11
|
-
getDataDir: () => testDir,
|
|
12
|
-
isMacOS: () => process.platform === "darwin",
|
|
13
|
-
isLinux: () => process.platform === "linux",
|
|
14
|
-
isWindows: () => process.platform === "win32",
|
|
15
|
-
getPidPath: () => join(testDir, "test.pid"),
|
|
16
|
-
getDbPath: () => join(testDir, "test.db"),
|
|
17
|
-
getLogPath: () => join(testDir, "test.log"),
|
|
18
|
-
ensureDataDir: () => {},
|
|
19
|
-
}));
|
|
20
|
-
|
|
21
|
-
mock.module("../util/logger.js", () => ({
|
|
22
|
-
getLogger: () =>
|
|
23
|
-
new Proxy({} as Record<string, unknown>, {
|
|
24
|
-
get: () => () => {},
|
|
25
|
-
}),
|
|
26
|
-
}));
|
|
27
|
-
|
|
28
|
-
import {
|
|
29
|
-
applyConflictResolution,
|
|
30
|
-
createOrUpdatePendingConflict,
|
|
31
|
-
getConflictById,
|
|
32
|
-
getPendingConflictByPair,
|
|
33
|
-
listPendingConflictDetails,
|
|
34
|
-
listPendingConflicts,
|
|
35
|
-
resolveConflict,
|
|
36
|
-
} from "../memory/conflict-store.js";
|
|
37
|
-
import { getDb, initializeDb, resetDb } from "../memory/db.js";
|
|
38
|
-
import { memoryItems } from "../memory/schema.js";
|
|
39
|
-
|
|
40
|
-
initializeDb();
|
|
41
|
-
|
|
42
|
-
afterAll(() => {
|
|
43
|
-
resetDb();
|
|
44
|
-
try {
|
|
45
|
-
rmSync(testDir, { recursive: true });
|
|
46
|
-
} catch {
|
|
47
|
-
/* best effort */
|
|
48
|
-
}
|
|
49
|
-
});
|
|
50
|
-
|
|
51
|
-
function resetTables() {
|
|
52
|
-
const db = getDb();
|
|
53
|
-
db.run("DELETE FROM memory_item_conflicts");
|
|
54
|
-
db.run("DELETE FROM memory_item_sources");
|
|
55
|
-
db.run("DELETE FROM memory_items");
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
function insertItemPair(
|
|
59
|
-
suffix: string,
|
|
60
|
-
scopeId = "default",
|
|
61
|
-
opts?: {
|
|
62
|
-
existingVerificationState?: string;
|
|
63
|
-
candidateVerificationState?: string;
|
|
64
|
-
},
|
|
65
|
-
): { existingItemId: string; candidateItemId: string } {
|
|
66
|
-
const db = getDb();
|
|
67
|
-
const now = Date.now();
|
|
68
|
-
const existingItemId = `existing-${suffix}`;
|
|
69
|
-
const candidateItemId = `candidate-${suffix}`;
|
|
70
|
-
db.insert(memoryItems)
|
|
71
|
-
.values([
|
|
72
|
-
{
|
|
73
|
-
id: existingItemId,
|
|
74
|
-
kind: "fact",
|
|
75
|
-
subject: "framework preference",
|
|
76
|
-
statement: `Existing statement ${suffix}`,
|
|
77
|
-
status: "active",
|
|
78
|
-
confidence: 0.8,
|
|
79
|
-
importance: 0.5,
|
|
80
|
-
fingerprint: `fp-existing-${suffix}`,
|
|
81
|
-
verificationState:
|
|
82
|
-
opts?.existingVerificationState ?? "assistant_inferred",
|
|
83
|
-
scopeId,
|
|
84
|
-
firstSeenAt: now,
|
|
85
|
-
lastSeenAt: now,
|
|
86
|
-
},
|
|
87
|
-
{
|
|
88
|
-
id: candidateItemId,
|
|
89
|
-
kind: "fact",
|
|
90
|
-
subject: "framework preference",
|
|
91
|
-
statement: `Candidate statement ${suffix}`,
|
|
92
|
-
status: "pending_clarification",
|
|
93
|
-
confidence: 0.8,
|
|
94
|
-
importance: 0.5,
|
|
95
|
-
fingerprint: `fp-candidate-${suffix}`,
|
|
96
|
-
verificationState:
|
|
97
|
-
opts?.candidateVerificationState ?? "assistant_inferred",
|
|
98
|
-
scopeId,
|
|
99
|
-
firstSeenAt: now,
|
|
100
|
-
lastSeenAt: now,
|
|
101
|
-
},
|
|
102
|
-
])
|
|
103
|
-
.run();
|
|
104
|
-
|
|
105
|
-
return { existingItemId, candidateItemId };
|
|
106
|
-
}
|
|
107
|
-
|
|
108
|
-
describe("conflict-store", () => {
|
|
109
|
-
beforeEach(() => {
|
|
110
|
-
resetTables();
|
|
111
|
-
});
|
|
112
|
-
|
|
113
|
-
test("creates and fetches a pending conflict", () => {
|
|
114
|
-
const pair = insertItemPair("create");
|
|
115
|
-
const conflict = createOrUpdatePendingConflict({
|
|
116
|
-
scopeId: "default",
|
|
117
|
-
existingItemId: pair.existingItemId,
|
|
118
|
-
candidateItemId: pair.candidateItemId,
|
|
119
|
-
relationship: "ambiguous_contradiction",
|
|
120
|
-
clarificationQuestion: "Do you prefer React or Vue?",
|
|
121
|
-
});
|
|
122
|
-
|
|
123
|
-
expect(conflict.id).toBeDefined();
|
|
124
|
-
expect(conflict.status).toBe("pending_clarification");
|
|
125
|
-
expect(conflict.scopeId).toBe("default");
|
|
126
|
-
expect(conflict.relationship).toBe("ambiguous_contradiction");
|
|
127
|
-
expect(conflict.clarificationQuestion).toBe("Do you prefer React or Vue?");
|
|
128
|
-
|
|
129
|
-
const byPair = getPendingConflictByPair(
|
|
130
|
-
"default",
|
|
131
|
-
pair.existingItemId,
|
|
132
|
-
pair.candidateItemId,
|
|
133
|
-
);
|
|
134
|
-
expect(byPair?.id).toBe(conflict.id);
|
|
135
|
-
});
|
|
136
|
-
|
|
137
|
-
test("deduplicates unresolved pair and updates fields in place", () => {
|
|
138
|
-
const pair = insertItemPair("dedupe");
|
|
139
|
-
const first = createOrUpdatePendingConflict({
|
|
140
|
-
scopeId: "default",
|
|
141
|
-
existingItemId: pair.existingItemId,
|
|
142
|
-
candidateItemId: pair.candidateItemId,
|
|
143
|
-
relationship: "contradiction",
|
|
144
|
-
clarificationQuestion: "First question",
|
|
145
|
-
});
|
|
146
|
-
|
|
147
|
-
const second = createOrUpdatePendingConflict({
|
|
148
|
-
scopeId: "default",
|
|
149
|
-
existingItemId: pair.existingItemId,
|
|
150
|
-
candidateItemId: pair.candidateItemId,
|
|
151
|
-
relationship: "ambiguous_contradiction",
|
|
152
|
-
clarificationQuestion: "Second question",
|
|
153
|
-
});
|
|
154
|
-
|
|
155
|
-
expect(second.id).toBe(first.id);
|
|
156
|
-
expect(second.relationship).toBe("ambiguous_contradiction");
|
|
157
|
-
expect(second.clarificationQuestion).toBe("Second question");
|
|
158
|
-
expect(listPendingConflicts("default")).toHaveLength(1);
|
|
159
|
-
});
|
|
160
|
-
|
|
161
|
-
test("allows a new pending row for the same pair after resolution", () => {
|
|
162
|
-
const pair = insertItemPair("reopen");
|
|
163
|
-
const first = createOrUpdatePendingConflict({
|
|
164
|
-
scopeId: "default",
|
|
165
|
-
existingItemId: pair.existingItemId,
|
|
166
|
-
candidateItemId: pair.candidateItemId,
|
|
167
|
-
relationship: "ambiguous_contradiction",
|
|
168
|
-
});
|
|
169
|
-
|
|
170
|
-
const resolved = resolveConflict(first.id, {
|
|
171
|
-
status: "resolved_keep_existing",
|
|
172
|
-
resolutionNote: "User confirmed existing statement is correct.",
|
|
173
|
-
});
|
|
174
|
-
expect(resolved?.status).toBe("resolved_keep_existing");
|
|
175
|
-
expect(typeof resolved?.resolvedAt).toBe("number");
|
|
176
|
-
|
|
177
|
-
const reopened = createOrUpdatePendingConflict({
|
|
178
|
-
scopeId: "default",
|
|
179
|
-
existingItemId: pair.existingItemId,
|
|
180
|
-
candidateItemId: pair.candidateItemId,
|
|
181
|
-
relationship: "ambiguous_contradiction",
|
|
182
|
-
clarificationQuestion: "Please confirm again",
|
|
183
|
-
});
|
|
184
|
-
|
|
185
|
-
expect(reopened.id).not.toBe(first.id);
|
|
186
|
-
expect(getConflictById(first.id)?.status).toBe("resolved_keep_existing");
|
|
187
|
-
expect(listPendingConflicts("default")).toHaveLength(1);
|
|
188
|
-
});
|
|
189
|
-
|
|
190
|
-
test("lists only pending conflicts for a scope", () => {
|
|
191
|
-
const defaultA = insertItemPair("scope-a");
|
|
192
|
-
const defaultB = insertItemPair("scope-b");
|
|
193
|
-
const otherScope = insertItemPair("scope-other", "workspace-b");
|
|
194
|
-
|
|
195
|
-
const conflictA = createOrUpdatePendingConflict({
|
|
196
|
-
scopeId: "default",
|
|
197
|
-
existingItemId: defaultA.existingItemId,
|
|
198
|
-
candidateItemId: defaultA.candidateItemId,
|
|
199
|
-
relationship: "ambiguous_contradiction",
|
|
200
|
-
});
|
|
201
|
-
const conflictB = createOrUpdatePendingConflict({
|
|
202
|
-
scopeId: "default",
|
|
203
|
-
existingItemId: defaultB.existingItemId,
|
|
204
|
-
candidateItemId: defaultB.candidateItemId,
|
|
205
|
-
relationship: "ambiguous_contradiction",
|
|
206
|
-
});
|
|
207
|
-
createOrUpdatePendingConflict({
|
|
208
|
-
scopeId: "workspace-b",
|
|
209
|
-
existingItemId: otherScope.existingItemId,
|
|
210
|
-
candidateItemId: otherScope.candidateItemId,
|
|
211
|
-
relationship: "ambiguous_contradiction",
|
|
212
|
-
});
|
|
213
|
-
|
|
214
|
-
resolveConflict(conflictB.id, {
|
|
215
|
-
status: "dismissed",
|
|
216
|
-
resolutionNote: "Irrelevant to active context",
|
|
217
|
-
});
|
|
218
|
-
|
|
219
|
-
const pendingDefault = listPendingConflicts("default");
|
|
220
|
-
expect(pendingDefault).toHaveLength(1);
|
|
221
|
-
expect(pendingDefault[0].id).toBe(conflictA.id);
|
|
222
|
-
expect(pendingDefault[0].status).toBe("pending_clarification");
|
|
223
|
-
});
|
|
224
|
-
|
|
225
|
-
test("listPendingConflictDetails joins current statements and verification states", () => {
|
|
226
|
-
const pair = insertItemPair("details", "workspace-a", {
|
|
227
|
-
existingVerificationState: "user_confirmed",
|
|
228
|
-
candidateVerificationState: "assistant_inferred",
|
|
229
|
-
});
|
|
230
|
-
createOrUpdatePendingConflict({
|
|
231
|
-
scopeId: "workspace-a",
|
|
232
|
-
existingItemId: pair.existingItemId,
|
|
233
|
-
candidateItemId: pair.candidateItemId,
|
|
234
|
-
relationship: "ambiguous_contradiction",
|
|
235
|
-
clarificationQuestion: "Which framework should I keep?",
|
|
236
|
-
});
|
|
237
|
-
|
|
238
|
-
const details = listPendingConflictDetails("workspace-a");
|
|
239
|
-
expect(details).toHaveLength(1);
|
|
240
|
-
expect(details[0].existingStatement).toBe("Existing statement details");
|
|
241
|
-
expect(details[0].candidateStatement).toBe("Candidate statement details");
|
|
242
|
-
expect(details[0].existingKind).toBe("fact");
|
|
243
|
-
expect(details[0].candidateKind).toBe("fact");
|
|
244
|
-
expect(details[0].existingVerificationState).toBe("user_confirmed");
|
|
245
|
-
expect(details[0].candidateVerificationState).toBe("assistant_inferred");
|
|
246
|
-
});
|
|
247
|
-
|
|
248
|
-
test("applyConflictResolution keeps candidate and resolves conflict row", () => {
|
|
249
|
-
const pair = insertItemPair("apply-candidate");
|
|
250
|
-
const conflict = createOrUpdatePendingConflict({
|
|
251
|
-
scopeId: "default",
|
|
252
|
-
existingItemId: pair.existingItemId,
|
|
253
|
-
candidateItemId: pair.candidateItemId,
|
|
254
|
-
relationship: "ambiguous_contradiction",
|
|
255
|
-
});
|
|
256
|
-
|
|
257
|
-
expect(
|
|
258
|
-
applyConflictResolution({
|
|
259
|
-
conflictId: conflict.id,
|
|
260
|
-
resolution: "keep_candidate",
|
|
261
|
-
resolutionNote: "User confirmed candidate statement.",
|
|
262
|
-
}),
|
|
263
|
-
).toBe(true);
|
|
264
|
-
|
|
265
|
-
const db = getDb();
|
|
266
|
-
const existing = db
|
|
267
|
-
.select()
|
|
268
|
-
.from(memoryItems)
|
|
269
|
-
.where(eq(memoryItems.id, pair.existingItemId))
|
|
270
|
-
.get();
|
|
271
|
-
const candidate = db
|
|
272
|
-
.select()
|
|
273
|
-
.from(memoryItems)
|
|
274
|
-
.where(eq(memoryItems.id, pair.candidateItemId))
|
|
275
|
-
.get();
|
|
276
|
-
const updatedConflict = getConflictById(conflict.id);
|
|
277
|
-
|
|
278
|
-
expect(typeof existing?.invalidAt).toBe("number");
|
|
279
|
-
expect(existing?.status).toBe("superseded");
|
|
280
|
-
expect(candidate?.status).toBe("active");
|
|
281
|
-
expect(updatedConflict?.status).toBe("resolved_keep_candidate");
|
|
282
|
-
});
|
|
283
|
-
|
|
284
|
-
test("applyConflictResolution merge updates existing item statement", () => {
|
|
285
|
-
const pair = insertItemPair("apply-merge");
|
|
286
|
-
const conflict = createOrUpdatePendingConflict({
|
|
287
|
-
scopeId: "default",
|
|
288
|
-
existingItemId: pair.existingItemId,
|
|
289
|
-
candidateItemId: pair.candidateItemId,
|
|
290
|
-
relationship: "ambiguous_contradiction",
|
|
291
|
-
});
|
|
292
|
-
|
|
293
|
-
const merged = "Use React for dashboard pages and Vue for marketing pages.";
|
|
294
|
-
expect(
|
|
295
|
-
applyConflictResolution({
|
|
296
|
-
conflictId: conflict.id,
|
|
297
|
-
resolution: "merge",
|
|
298
|
-
mergedStatement: merged,
|
|
299
|
-
resolutionNote: "User clarified both apply in different contexts.",
|
|
300
|
-
}),
|
|
301
|
-
).toBe(true);
|
|
302
|
-
|
|
303
|
-
const db = getDb();
|
|
304
|
-
const existing = db
|
|
305
|
-
.select()
|
|
306
|
-
.from(memoryItems)
|
|
307
|
-
.where(eq(memoryItems.id, pair.existingItemId))
|
|
308
|
-
.get();
|
|
309
|
-
const candidate = db
|
|
310
|
-
.select()
|
|
311
|
-
.from(memoryItems)
|
|
312
|
-
.where(eq(memoryItems.id, pair.candidateItemId))
|
|
313
|
-
.get();
|
|
314
|
-
const updatedConflict = getConflictById(conflict.id);
|
|
315
|
-
|
|
316
|
-
expect(existing?.statement).toBe(merged);
|
|
317
|
-
expect(candidate?.status).toBe("superseded");
|
|
318
|
-
expect(updatedConflict?.status).toBe("resolved_merge");
|
|
319
|
-
});
|
|
320
|
-
|
|
321
|
-
test("enforces pending-pair uniqueness with a partial index", () => {
|
|
322
|
-
const pair = insertItemPair("index");
|
|
323
|
-
const raw = (
|
|
324
|
-
getDb() as unknown as {
|
|
325
|
-
$client: import("bun:sqlite").Database;
|
|
326
|
-
}
|
|
327
|
-
).$client;
|
|
328
|
-
const now = Date.now();
|
|
329
|
-
|
|
330
|
-
raw.run(
|
|
331
|
-
`INSERT INTO memory_item_conflicts (
|
|
332
|
-
id, scope_id, existing_item_id, candidate_item_id, relationship, status,
|
|
333
|
-
clarification_question, resolution_note, last_asked_at, resolved_at, created_at, updated_at
|
|
334
|
-
) VALUES (
|
|
335
|
-
'conflict-index-a', 'default', '${pair.existingItemId}', '${pair.candidateItemId}',
|
|
336
|
-
'ambiguous_contradiction', 'pending_clarification', NULL, NULL, NULL, NULL, ${now}, ${now}
|
|
337
|
-
)`,
|
|
338
|
-
);
|
|
339
|
-
|
|
340
|
-
expect(() => {
|
|
341
|
-
raw.run(
|
|
342
|
-
`INSERT INTO memory_item_conflicts (
|
|
343
|
-
id, scope_id, existing_item_id, candidate_item_id, relationship, status,
|
|
344
|
-
clarification_question, resolution_note, last_asked_at, resolved_at, created_at, updated_at
|
|
345
|
-
) VALUES (
|
|
346
|
-
'conflict-index-b', 'default', '${pair.existingItemId}', '${
|
|
347
|
-
pair.candidateItemId
|
|
348
|
-
}',
|
|
349
|
-
'ambiguous_contradiction', 'pending_clarification', NULL, NULL, NULL, NULL, ${
|
|
350
|
-
now + 1
|
|
351
|
-
}, ${now + 1}
|
|
352
|
-
)`,
|
|
353
|
-
);
|
|
354
|
-
}).toThrow();
|
|
355
|
-
|
|
356
|
-
expect(() => {
|
|
357
|
-
raw.run(
|
|
358
|
-
`INSERT INTO memory_item_conflicts (
|
|
359
|
-
id, scope_id, existing_item_id, candidate_item_id, relationship, status,
|
|
360
|
-
clarification_question, resolution_note, last_asked_at, resolved_at, created_at, updated_at
|
|
361
|
-
) VALUES (
|
|
362
|
-
'conflict-index-c', 'default', '${pair.existingItemId}', '${
|
|
363
|
-
pair.candidateItemId
|
|
364
|
-
}',
|
|
365
|
-
'ambiguous_contradiction', 'resolved_keep_candidate', NULL, NULL, NULL, ${
|
|
366
|
-
now + 2
|
|
367
|
-
}, ${now + 2}, ${now + 2}
|
|
368
|
-
)`,
|
|
369
|
-
);
|
|
370
|
-
}).not.toThrow();
|
|
371
|
-
});
|
|
372
|
-
});
|