aismemory 0.8.3 → 0.8.4
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/README.md +146 -3
- package/dist/__tests__/agent-key-mode.test.js +46 -5
- package/dist/__tests__/agent-key-mode.test.js.map +1 -1
- package/dist/__tests__/ais-http.test.js +22 -0
- package/dist/__tests__/ais-http.test.js.map +1 -1
- package/dist/__tests__/auto-enroll-key.test.js +20 -1
- package/dist/__tests__/auto-enroll-key.test.js.map +1 -1
- package/dist/__tests__/cli-info.test.js +8 -4
- package/dist/__tests__/cli-info.test.js.map +1 -1
- package/dist/__tests__/client-credential-expiry.test.d.ts +1 -0
- package/dist/__tests__/client-credential-expiry.test.js +319 -0
- package/dist/__tests__/client-credential-expiry.test.js.map +1 -0
- package/dist/__tests__/declared-agent.test.d.ts +1 -0
- package/dist/__tests__/declared-agent.test.js +60 -0
- package/dist/__tests__/declared-agent.test.js.map +1 -0
- package/dist/__tests__/doctor.test.js +21 -2
- package/dist/__tests__/doctor.test.js.map +1 -1
- package/dist/__tests__/dream-poll.test.d.ts +1 -0
- package/dist/__tests__/dream-poll.test.js +130 -0
- package/dist/__tests__/dream-poll.test.js.map +1 -0
- package/dist/__tests__/enable-key-auth.test.d.ts +1 -0
- package/dist/__tests__/enable-key-auth.test.js +180 -0
- package/dist/__tests__/enable-key-auth.test.js.map +1 -0
- package/dist/__tests__/existing-hashes.test.js +3 -6
- package/dist/__tests__/existing-hashes.test.js.map +1 -1
- package/dist/__tests__/full-context-view-forwarding.test.js +20 -1
- package/dist/__tests__/full-context-view-forwarding.test.js.map +1 -1
- package/dist/__tests__/hooks.test.d.ts +1 -0
- package/dist/__tests__/hooks.test.js +455 -0
- package/dist/__tests__/hooks.test.js.map +1 -0
- package/dist/__tests__/hydration.test.js +2 -0
- package/dist/__tests__/hydration.test.js.map +1 -1
- package/dist/__tests__/install.test.js +28 -1
- package/dist/__tests__/install.test.js.map +1 -1
- package/dist/__tests__/invite-accept.test.js +167 -3
- package/dist/__tests__/invite-accept.test.js.map +1 -1
- package/dist/__tests__/list-all-agents.test.js +17 -15
- package/dist/__tests__/list-all-agents.test.js.map +1 -1
- package/dist/__tests__/mcp-instructions.test.d.ts +1 -0
- package/dist/__tests__/mcp-instructions.test.js +26 -0
- package/dist/__tests__/mcp-instructions.test.js.map +1 -0
- package/dist/__tests__/mcp-tools.test.js +65 -0
- package/dist/__tests__/mcp-tools.test.js.map +1 -1
- package/dist/__tests__/memory-export.test.d.ts +1 -0
- package/dist/__tests__/memory-export.test.js +78 -0
- package/dist/__tests__/memory-export.test.js.map +1 -0
- package/dist/__tests__/owner-credentials.test.d.ts +1 -0
- package/dist/__tests__/owner-credentials.test.js +250 -0
- package/dist/__tests__/owner-credentials.test.js.map +1 -0
- package/dist/__tests__/owner-keychain-agent-load.test.d.ts +1 -0
- package/dist/__tests__/owner-keychain-agent-load.test.js +57 -0
- package/dist/__tests__/owner-keychain-agent-load.test.js.map +1 -0
- package/dist/__tests__/recall-order-by.test.d.ts +1 -0
- package/dist/__tests__/recall-order-by.test.js +115 -0
- package/dist/__tests__/recall-order-by.test.js.map +1 -0
- package/dist/__tests__/remember-duplicate-truth.test.js +11 -0
- package/dist/__tests__/remember-duplicate-truth.test.js.map +1 -1
- package/dist/__tests__/resolve-agent-preference.test.js +19 -8
- package/dist/__tests__/resolve-agent-preference.test.js.map +1 -1
- package/dist/__tests__/signin-keychain.test.d.ts +1 -0
- package/dist/__tests__/signin-keychain.test.js +79 -0
- package/dist/__tests__/signin-keychain.test.js.map +1 -0
- package/dist/__tests__/startup-identity.test.d.ts +1 -0
- package/dist/__tests__/startup-identity.test.js +213 -0
- package/dist/__tests__/startup-identity.test.js.map +1 -0
- package/dist/__tests__/sync-auth.test.d.ts +1 -0
- package/dist/__tests__/sync-auth.test.js +69 -0
- package/dist/__tests__/sync-auth.test.js.map +1 -0
- package/dist/__tests__/sync-doc.test.d.ts +1 -0
- package/dist/__tests__/sync-doc.test.js +13 -0
- package/dist/__tests__/sync-doc.test.js.map +1 -0
- package/dist/__tests__/sync-memory-cli.test.js +1 -1
- package/dist/__tests__/sync-memory-cli.test.js.map +1 -1
- package/dist/__tests__/tool-args.test.js +6 -0
- package/dist/__tests__/tool-args.test.js.map +1 -1
- package/dist/agent-key-mode.js +22 -22
- package/dist/agent-key-mode.js.map +1 -1
- package/dist/agent-preference.d.ts +4 -0
- package/dist/agent-preference.js +7 -1
- package/dist/agent-preference.js.map +1 -1
- package/dist/ais-http-error.d.ts +5 -0
- package/dist/ais-http-error.js +10 -0
- package/dist/ais-http-error.js.map +1 -1
- package/dist/ais-http.js +8 -4
- package/dist/ais-http.js.map +1 -1
- package/dist/auto-handoff.js +2 -1
- package/dist/auto-handoff.js.map +1 -1
- package/dist/cli/doctor.d.ts +8 -0
- package/dist/cli/doctor.js +19 -0
- package/dist/cli/doctor.js.map +1 -1
- package/dist/cli/enable-key-auth.js +39 -18
- package/dist/cli/enable-key-auth.js.map +1 -1
- package/dist/cli/export-harness.d.ts +13 -0
- package/dist/cli/export-harness.js +110 -0
- package/dist/cli/export-harness.js.map +1 -0
- package/dist/cli/hooks.d.ts +62 -0
- package/dist/cli/hooks.js +634 -0
- package/dist/cli/hooks.js.map +1 -0
- package/dist/cli/install.d.ts +4 -0
- package/dist/cli/install.js +44 -5
- package/dist/cli/install.js.map +1 -1
- package/dist/cli/invite-accept.d.ts +36 -1
- package/dist/cli/invite-accept.js +135 -1
- package/dist/cli/invite-accept.js.map +1 -1
- package/dist/cli/owner-credentials.d.ts +52 -0
- package/dist/cli/owner-credentials.js +387 -0
- package/dist/cli/owner-credentials.js.map +1 -0
- package/dist/cli/sync-memory.js +7 -9
- package/dist/cli/sync-memory.js.map +1 -1
- package/dist/cli-info.js +6 -1
- package/dist/cli-info.js.map +1 -1
- package/dist/credential-expiry.d.ts +10 -0
- package/dist/credential-expiry.js +41 -0
- package/dist/credential-expiry.js.map +1 -0
- package/dist/declared-agent.d.ts +20 -0
- package/dist/declared-agent.js +40 -0
- package/dist/declared-agent.js.map +1 -0
- package/dist/device-poll.d.ts +1 -0
- package/dist/device-poll.js.map +1 -1
- package/dist/dream-poll.d.ts +19 -0
- package/dist/dream-poll.js +93 -0
- package/dist/dream-poll.js.map +1 -0
- package/dist/env-agent.d.ts +6 -1
- package/dist/env-agent.js +18 -5
- package/dist/env-agent.js.map +1 -1
- package/dist/hydration.js +2 -1
- package/dist/hydration.js.map +1 -1
- package/dist/index.js +124 -16
- package/dist/index.js.map +1 -1
- package/dist/key-auth.d.ts +13 -3
- package/dist/key-auth.js +27 -5
- package/dist/key-auth.js.map +1 -1
- package/dist/mcp/tools.js +37 -20
- package/dist/mcp/tools.js.map +1 -1
- package/dist/mcp-instructions.d.ts +6 -0
- package/dist/mcp-instructions.js +7 -0
- package/dist/mcp-instructions.js.map +1 -0
- package/dist/memory-export.d.ts +30 -0
- package/dist/memory-export.js +116 -0
- package/dist/memory-export.js.map +1 -0
- package/dist/pipeline/bulk-store.d.ts +2 -5
- package/dist/pipeline/bulk-store.js +2 -4
- package/dist/pipeline/bulk-store.js.map +1 -1
- package/dist/pipeline/existing-hashes.d.ts +2 -5
- package/dist/pipeline/existing-hashes.js +1 -2
- package/dist/pipeline/existing-hashes.js.map +1 -1
- package/dist/pipeline/sync-auth.d.ts +12 -0
- package/dist/pipeline/sync-auth.js +64 -0
- package/dist/pipeline/sync-auth.js.map +1 -0
- package/dist/refresh.js +2 -1
- package/dist/refresh.js.map +1 -1
- package/dist/run-pass-mode.js +8 -13
- package/dist/run-pass-mode.js.map +1 -1
- package/dist/signin-keychain.d.ts +54 -0
- package/dist/signin-keychain.js +200 -0
- package/dist/signin-keychain.js.map +1 -0
- package/dist/startup-identity.d.ts +71 -0
- package/dist/startup-identity.js +213 -0
- package/dist/startup-identity.js.map +1 -0
- package/dist/tool-args.d.ts +10 -0
- package/dist/tool-args.js +39 -0
- package/dist/tool-args.js.map +1 -1
- package/dist/types.d.ts +8 -0
- package/dist/workspace-key-mode.js +19 -19
- package/dist/workspace-key-mode.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,115 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* recall accepts orderBy (CORBOT-B1770E61).
|
|
3
|
+
*
|
|
4
|
+
* Near-duplicate task memories rank almost equally by meaning, so a ranked
|
|
5
|
+
* recall can bury the newest. AIS (CORBOT-123E51C5) answers `orderBy=newest`
|
|
6
|
+
* with the matching rows by createdAt DESC. These tests prove the client sends
|
|
7
|
+
* the parameter in every credential mode, validates it, leaves the default
|
|
8
|
+
* request unchanged, and cannot drift from the route's accepted values.
|
|
9
|
+
*/
|
|
10
|
+
import { readFileSync } from 'node:fs';
|
|
11
|
+
import { dirname, join } from 'node:path';
|
|
12
|
+
import { fileURLToPath } from 'node:url';
|
|
13
|
+
import { describe, expect, it, vi } from 'vitest';
|
|
14
|
+
import { mkdtempSync, rmSync, writeFileSync } from 'node:fs';
|
|
15
|
+
import { tmpdir } from 'node:os';
|
|
16
|
+
import { dispatchToolKeyMode } from '../agent-key-mode.js';
|
|
17
|
+
import { dispatchToolRunPassMode } from '../run-pass-mode.js';
|
|
18
|
+
import { dispatchToolWorkspaceKeyMode } from '../workspace-key-mode.js';
|
|
19
|
+
import { parseRecallArgs } from '../tool-args.js';
|
|
20
|
+
const AIS_URL = 'https://ais.example.test';
|
|
21
|
+
const config = { apiKey: 'ais_ak_scoped', agentId: 'agent-42' };
|
|
22
|
+
const HERE = dirname(fileURLToPath(import.meta.url));
|
|
23
|
+
/** Five near-duplicate task memories: same text, a counter apart. Oldest scores highest. */
|
|
24
|
+
const SEEDED = [1, 2, 3, 4, 5].map((n) => ({
|
|
25
|
+
id: `task-${n}`,
|
|
26
|
+
content: `Next task: run the canary (attempt ${n})`,
|
|
27
|
+
type: 'task',
|
|
28
|
+
createdAt: new Date(Date.UTC(2026, 10, n)).toISOString(),
|
|
29
|
+
score: 1 - n * 0.001,
|
|
30
|
+
}));
|
|
31
|
+
/** Fake AIS implementing the route's documented behaviour for GET /memory. */
|
|
32
|
+
function fakeServer() {
|
|
33
|
+
return vi.fn(async (url) => {
|
|
34
|
+
const q = new URL(String(url)).searchParams;
|
|
35
|
+
const orderBy = q.get('orderBy');
|
|
36
|
+
const reply = (status, body) => new Response(JSON.stringify(body), { status, headers: { 'content-type': 'application/json' } });
|
|
37
|
+
if (orderBy !== null) {
|
|
38
|
+
if (orderBy !== 'newest')
|
|
39
|
+
return reply(400, { success: false, error: { message: 'orderBy must be: newest' } });
|
|
40
|
+
if (!q.has('types') && !q.has('tags') && !q.has('anyTags')) {
|
|
41
|
+
return reply(400, { success: false, error: { message: 'orderBy=newest needs types, tags or anyTags' } });
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
const limit = Number(q.get('limit') ?? '10');
|
|
45
|
+
const rows = [...SEEDED].sort((a, b) => orderBy === 'newest' ? b.createdAt.localeCompare(a.createdAt) : b.score - a.score);
|
|
46
|
+
return reply(200, { success: true, data: { memories: rows.slice(0, limit) } });
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
async function recallIds(fetchMock, args) {
|
|
50
|
+
const out = await dispatchToolKeyMode(AIS_URL, config, 'recall', args, fetchMock);
|
|
51
|
+
return out.data.memories.map((m) => m.id);
|
|
52
|
+
}
|
|
53
|
+
describe('recall orderBy', () => {
|
|
54
|
+
it('sends orderBy=newest as the query parameter AIS reads', async () => {
|
|
55
|
+
const fetchMock = fakeServer();
|
|
56
|
+
await recallIds(fetchMock, { query: 'canary', type: 'task', orderBy: 'newest' });
|
|
57
|
+
const url = new URL(String(fetchMock.mock.calls[0][0]));
|
|
58
|
+
expect(url.searchParams.get('orderBy')).toBe('newest');
|
|
59
|
+
expect(url.searchParams.get('types')).toBe('task');
|
|
60
|
+
});
|
|
61
|
+
it('returns the newest of five near-duplicate task memories first', async () => {
|
|
62
|
+
const fetchMock = fakeServer();
|
|
63
|
+
expect(await recallIds(fetchMock, { query: 'Next task: run the canary', type: 'task', limit: 2 }))
|
|
64
|
+
.toEqual(['task-1', 'task-2']);
|
|
65
|
+
expect(await recallIds(fetchMock, { query: 'Next task: run the canary', type: 'task', limit: 5, orderBy: 'newest' }))
|
|
66
|
+
.toEqual(['task-5', 'task-4', 'task-3', 'task-2', 'task-1']);
|
|
67
|
+
});
|
|
68
|
+
it('leaves the default request unchanged when orderBy is omitted', async () => {
|
|
69
|
+
const fetchMock = fakeServer();
|
|
70
|
+
await recallIds(fetchMock, { query: 'canary' });
|
|
71
|
+
expect(String(fetchMock.mock.calls[0][0])).toBe(`${AIS_URL}/v1/agents/agent-42/memory?query=canary`);
|
|
72
|
+
});
|
|
73
|
+
it('rejects any value but newest before touching the network', async () => {
|
|
74
|
+
const fetchMock = fakeServer();
|
|
75
|
+
expect(() => parseRecallArgs({ query: 'x', orderBy: 'oldest' })).toThrow(/orderBy must be 'newest'/);
|
|
76
|
+
await expect(recallIds(fetchMock, { query: 'x', type: 'task', orderBy: 'oldest' })).rejects.toThrow();
|
|
77
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
78
|
+
});
|
|
79
|
+
});
|
|
80
|
+
describe('recall orderBy in the other credential modes', () => {
|
|
81
|
+
const ARGS = { query: 'canary', type: 'task', orderBy: 'newest' };
|
|
82
|
+
const RUN_PASS_AGENT = '11111111-1111-4111-8111-111111111111';
|
|
83
|
+
it('workspace-key mode sends orderBy=newest', async () => {
|
|
84
|
+
const fetchMock = fakeServer();
|
|
85
|
+
await dispatchToolWorkspaceKeyMode(AIS_URL, { agentId: 'agent-42', workspaceKey: 'ais_wk_test' }, 'recall', ARGS, fetchMock);
|
|
86
|
+
expect(new URL(String(fetchMock.mock.calls[0][0])).searchParams.get('orderBy')).toBe('newest');
|
|
87
|
+
});
|
|
88
|
+
it('run-pass mode sends orderBy=newest', async () => {
|
|
89
|
+
const dir = mkdtempSync(join(tmpdir(), 'ais-recall-order-by-'));
|
|
90
|
+
try {
|
|
91
|
+
const passFile = join(dir, 'ais-run-pass');
|
|
92
|
+
writeFileSync(passFile, `ais_rp_${'A'.repeat(43)}\n`, { mode: 0o600 });
|
|
93
|
+
const fetchMock = fakeServer();
|
|
94
|
+
await dispatchToolRunPassMode(AIS_URL, { runPassFile: passFile, agentId: RUN_PASS_AGENT }, 'recall', ARGS, fetchMock);
|
|
95
|
+
expect(new URL(String(fetchMock.mock.calls[0][0])).searchParams.get('orderBy')).toBe('newest');
|
|
96
|
+
}
|
|
97
|
+
finally {
|
|
98
|
+
rmSync(dir, { recursive: true, force: true });
|
|
99
|
+
}
|
|
100
|
+
});
|
|
101
|
+
});
|
|
102
|
+
describe('recall orderBy contract with the AIS route and the tool schema', () => {
|
|
103
|
+
const route = readFileSync(join(HERE, '../../../agent-identity-service/src/api/routes/memory-query.ts'), 'utf8');
|
|
104
|
+
const index = readFileSync(join(HERE, '../index.ts'), 'utf8');
|
|
105
|
+
it('the only value the route accepts is the one the client allows', () => {
|
|
106
|
+
const accepted = [...route.matchAll(/queryParams\.orderBy !== '([a-z]+)'/g)].map((m) => m[1]);
|
|
107
|
+
expect(accepted).toEqual(['newest']);
|
|
108
|
+
expect(route).toContain("orderBy must be: newest");
|
|
109
|
+
expect(parseRecallArgs({ query: 'x', orderBy: 'newest' }).orderBy).toBe('newest');
|
|
110
|
+
});
|
|
111
|
+
it('the recall tool schema advertises orderBy with the same single value', () => {
|
|
112
|
+
expect(index).toMatch(/orderBy: \{ type: 'string', enum: \['newest'\]/);
|
|
113
|
+
});
|
|
114
|
+
});
|
|
115
|
+
//# sourceMappingURL=recall-order-by.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"recall-order-by.test.js","sourceRoot":"","sources":["../../src/__tests__/recall-order-by.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,6 +42,17 @@ function duplicateResponse(withId = true) {
|
|
|
42
42
|
});
|
|
43
43
|
}
|
|
44
44
|
describe('duplicateMemoryResult', () => {
|
|
45
|
+
it('says when a duplicate write left the memory to supersede unmarked (CORBOT-FC8D0DCC)', () => {
|
|
46
|
+
const oldId = '00000000-0000-4000-8000-000000000001';
|
|
47
|
+
const result = duplicateMemoryResult(new AisHttpError(409, '/v1/agents/agent-42/memory', {
|
|
48
|
+
success: false,
|
|
49
|
+
duplicate: true,
|
|
50
|
+
supersedes: { memoryId: oldId, applied: false },
|
|
51
|
+
error: { code: 'DUPLICATE_MEMORY', details: { existingMemoryId: EXISTING_ID } },
|
|
52
|
+
}));
|
|
53
|
+
expect(result?.supersedes).toEqual({ memoryId: oldId, applied: false });
|
|
54
|
+
expect(result?.message).toContain(`Memory ${oldId} was NOT marked superseded`);
|
|
55
|
+
});
|
|
45
56
|
it('turns a 409 DUPLICATE_MEMORY into a truthful success carrying the stored id', () => {
|
|
46
57
|
const result = duplicateMemoryResult(new AisHttpError(409, '/v1/agents/agent-42/memory', {
|
|
47
58
|
success: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remember-duplicate-truth.test.js","sourceRoot":"","sources":["../../src/__tests__/remember-duplicate-truth.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"remember-duplicate-truth.test.js","sourceRoot":"","sources":["../../src/__tests__/remember-duplicate-truth.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
* keep their existing priority.
|
|
15
15
|
*/
|
|
16
16
|
import { describe, it, expect } from 'vitest';
|
|
17
|
-
import { selectAgentForSession } from '../env-agent.js';
|
|
17
|
+
import { EnvAgentNameError, selectAgentForSession } from '../env-agent.js';
|
|
18
18
|
const AGENT_A = { id: 'agent-a', name: 'MyAgent', status: 'active' };
|
|
19
19
|
const AGENT_B = { id: 'agent-b', name: 'OtherAgent', status: 'active' };
|
|
20
20
|
describe('selectAgentForSession', () => {
|
|
@@ -67,17 +67,28 @@ describe('selectAgentForSession', () => {
|
|
|
67
67
|
expect(selection.agentId).toBe('agent-new');
|
|
68
68
|
expect(selection.reason).toBe('fallback');
|
|
69
69
|
});
|
|
70
|
-
it('
|
|
71
|
-
|
|
70
|
+
it('refuses to start as another agent when AIS_AGENT_NAME matches nothing (CORBOT-C1A01EB3)', () => {
|
|
71
|
+
// An explicit name is the session asking for one identity; connecting as the
|
|
72
|
+
// bonded or first agent instead would write its memories into the wrong agent.
|
|
73
|
+
expect(() => selectAgentForSession({
|
|
72
74
|
agents: [AGENT_B, AGENT_A],
|
|
73
75
|
envAgentName: 'nosuchagent',
|
|
74
76
|
preferredAgentId: 'agent-a',
|
|
75
77
|
fallbackAgentId: 'agent-new',
|
|
76
|
-
});
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
78
|
+
})).toThrow(EnvAgentNameError);
|
|
79
|
+
expect(() => selectAgentForSession({
|
|
80
|
+
agents: [AGENT_B, AGENT_A],
|
|
81
|
+
envAgentName: 'nosuchagent',
|
|
82
|
+
fallbackAgentId: 'agent-new',
|
|
83
|
+
})).toThrow(/AIS_AGENT_NAME="nosuchagent" matches no agent.*MyAgent, OtherAgent|AIS_AGENT_NAME="nosuchagent" matches no agent.*OtherAgent, MyAgent/);
|
|
84
|
+
});
|
|
85
|
+
it('refuses an AIS_AGENT_NAME that matches more than one agent', () => {
|
|
86
|
+
const twin = { id: 'agent-c', name: 'myagent', status: 'active' };
|
|
87
|
+
expect(() => selectAgentForSession({
|
|
88
|
+
agents: [AGENT_A, twin],
|
|
89
|
+
envAgentName: 'MyAgent',
|
|
90
|
+
fallbackAgentId: 'agent-new',
|
|
91
|
+
})).toThrow(/matches 2 agents.*AIS_AGENT_ID/);
|
|
81
92
|
});
|
|
82
93
|
});
|
|
83
94
|
//# sourceMappingURL=resolve-agent-preference.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-agent-preference.test.js","sourceRoot":"","sources":["../../src/__tests__/resolve-agent-preference.test.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,qBAAqB,EAA2B,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve-agent-preference.test.js","sourceRoot":"","sources":["../../src/__tests__/resolve-agent-preference.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,79 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
|
|
2
|
+
import { existsSync, mkdtempSync, readFileSync, rmSync } from 'node:fs';
|
|
3
|
+
import { tmpdir } from 'node:os';
|
|
4
|
+
import { join } from 'node:path';
|
|
5
|
+
import { credentialsFilePath } from '../oauth-credentials.js';
|
|
6
|
+
import { loadAgentPreference, saveAgentPreference } from '../agent-preference.js';
|
|
7
|
+
import { SIGNIN_ACCESS_SERVICE, SIGNIN_RENEWAL_SERVICE, loadOwnerSignInAccessForPreference, saveOwnerSignInToKeychain, setSigninKeychainBackendForTests, signinKeychainAccount, } from '../signin-keychain.js';
|
|
8
|
+
function makeJwt(payload) {
|
|
9
|
+
const header = Buffer.from(JSON.stringify({ alg: 'none' }), 'utf8').toString('base64url');
|
|
10
|
+
const body = Buffer.from(JSON.stringify(payload), 'utf8').toString('base64url');
|
|
11
|
+
return `${header}.${body}.sig`;
|
|
12
|
+
}
|
|
13
|
+
describe('signin keychain (CORBOT-51CAC5E8)', () => {
|
|
14
|
+
let home;
|
|
15
|
+
let writes;
|
|
16
|
+
let backend;
|
|
17
|
+
beforeEach(() => {
|
|
18
|
+
home = mkdtempSync(join(tmpdir(), 'ais-keychain-'));
|
|
19
|
+
writes = [];
|
|
20
|
+
backend = {
|
|
21
|
+
isAvailable: () => true,
|
|
22
|
+
read: (service, account) => {
|
|
23
|
+
const hit = writes.filter((w) => w.service === service && w.account === account).at(-1);
|
|
24
|
+
return hit?.secret ?? null;
|
|
25
|
+
},
|
|
26
|
+
write: (service, account, secret) => {
|
|
27
|
+
writes.push({ service, account, secret });
|
|
28
|
+
},
|
|
29
|
+
};
|
|
30
|
+
setSigninKeychainBackendForTests(backend);
|
|
31
|
+
});
|
|
32
|
+
afterEach(() => {
|
|
33
|
+
setSigninKeychainBackendForTests(null);
|
|
34
|
+
rmSync(home, { recursive: true, force: true });
|
|
35
|
+
});
|
|
36
|
+
it('stores renewal and access items under the spec service names', () => {
|
|
37
|
+
const accessToken = makeJwt({
|
|
38
|
+
user_id: 'user-1',
|
|
39
|
+
tenant_id: 'tenant-1',
|
|
40
|
+
sid: 'sid-1',
|
|
41
|
+
});
|
|
42
|
+
saveOwnerSignInToKeychain({
|
|
43
|
+
aisUrl: 'https://ais.example.test',
|
|
44
|
+
accessToken,
|
|
45
|
+
refreshToken: 'refresh-abc',
|
|
46
|
+
expiresAt: '2099-01-01T00:00:00.000Z',
|
|
47
|
+
});
|
|
48
|
+
expect(writes).toHaveLength(2);
|
|
49
|
+
expect(writes[0]?.service).toBe(SIGNIN_RENEWAL_SERVICE);
|
|
50
|
+
expect(writes[1]?.service).toBe(SIGNIN_ACCESS_SERVICE);
|
|
51
|
+
const account = signinKeychainAccount('https://ais.example.test', 'tenant-1', 'user-1');
|
|
52
|
+
expect(writes[0]?.account).toBe(account);
|
|
53
|
+
expect(JSON.parse(writes[0].secret).refresh_token).toBe('refresh-abc');
|
|
54
|
+
expect(JSON.parse(writes[1].secret).access_token).toBe(accessToken);
|
|
55
|
+
});
|
|
56
|
+
it('loads access from keychain using preference ownerUserId', () => {
|
|
57
|
+
const accessToken = makeJwt({ user_id: 'user-1', tenant_id: 'tenant-1' });
|
|
58
|
+
saveOwnerSignInToKeychain({
|
|
59
|
+
aisUrl: 'https://ais.example.test',
|
|
60
|
+
accessToken,
|
|
61
|
+
refreshToken: 'refresh-abc',
|
|
62
|
+
expiresAt: '2099-01-01T00:00:00.000Z',
|
|
63
|
+
});
|
|
64
|
+
saveAgentPreference({ agentId: 'agent-1', tenantId: 'tenant-1', ownerUserId: 'user-1' }, home);
|
|
65
|
+
const pref = loadAgentPreference(home);
|
|
66
|
+
expect(pref?.ownerUserId).toBe('user-1');
|
|
67
|
+
const cached = loadOwnerSignInAccessForPreference('https://ais.example.test', pref);
|
|
68
|
+
expect(cached?.access_token).toBe(accessToken);
|
|
69
|
+
});
|
|
70
|
+
it('does not write bearer secrets to credentials.json when preference holds ids only', () => {
|
|
71
|
+
saveAgentPreference({ agentId: 'agent-1', tenantId: 'tenant-1', ownerUserId: 'user-1' }, home);
|
|
72
|
+
const file = credentialsFilePath(home);
|
|
73
|
+
expect(existsSync(file)).toBe(true);
|
|
74
|
+
const parsed = JSON.parse(readFileSync(file, 'utf8'));
|
|
75
|
+
expect(parsed.token).toBeUndefined();
|
|
76
|
+
expect(parsed.schemaVersion).toBe(2);
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
//# sourceMappingURL=signin-keychain.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signin-keychain.test.js","sourceRoot":"","sources":["../../src/__tests__/signin-keychain.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACrE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,kCAAkC,EAClC,yBAAyB,EACzB,gCAAgC,EAChC,qBAAqB,GAEtB,MAAM,uBAAuB,CAAC;AAE/B,SAAS,OAAO,CAAC,OAAgC;IAC/C,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAC1F,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAChF,OAAO,GAAG,MAAM,IAAI,IAAI,MAAM,CAAC;AACjC,CAAC;AAED,QAAQ,CAAC,mCAAmC,EAAE,GAAS,EAAE;IACvD,IAAI,IAAY,CAAC;IACjB,IAAI,MAAmE,CAAC;IACxE,IAAI,OAA8B,CAAC;IAEnC,UAAU,CAAC,GAAS,EAAE;QACpB,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC,MAAM,EAAE,EAAE,eAAe,CAAC,CAAC,CAAC;QACpD,MAAM,GAAG,EAAE,CAAC;QACZ,OAAO,GAAG;YACR,WAAW,EAAE,GAAY,EAAE,CAAC,IAAI;YAChC,IAAI,EAAE,CAAC,OAAe,EAAE,OAAe,EAAiB,EAAE;gBACxD,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,OAAO,IAAI,CAAC,CAAC,OAAO,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBACxF,OAAO,GAAG,EAAE,MAAM,IAAI,IAAI,CAAC;YAC7B,CAAC;YACD,KAAK,EAAE,CAAC,OAAe,EAAE,OAAe,EAAE,MAAc,EAAQ,EAAE;gBAChE,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;YAC5C,CAAC;SACF,CAAC;QACF,gCAAgC,CAAC,OAAO,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,GAAS,EAAE;QACnB,gCAAgC,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,IAAI,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,GAAS,EAAE;QAC5E,MAAM,WAAW,GAAG,OAAO,CAAC;YAC1B,OAAO,EAAE,QAAQ;YACjB,SAAS,EAAE,UAAU;YACrB,GAAG,EAAE,OAAO;SACb,CAAC,CAAC;QACH,yBAAyB,CAAC;YACxB,MAAM,EAAE,0BAA0B;YAClC,WAAW;YACX,YAAY,EAAE,aAAa;YAC3B,SAAS,EAAE,0BAA0B;SACtC,CAAC,CAAC;QACH,MAAM,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC/B,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACxD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,qBAAqB,CAAC,0BAA0B,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;QACxF,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACzC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,MAAM,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QACxE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAE,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,GAAS,EAAE;QACvE,MAAM,WAAW,GAAG,OAAO,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,CAAC;QAC1E,yBAAyB,CAAC;YACxB,MAAM,EAAE,0BAA0B;YAClC,WAAW;YACX,YAAY,EAAE,aAAa;YAC3B,SAAS,EAAE,0BAA0B;SACtC,CAAC,CAAC;QACH,mBAAmB,CACjB,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,EACnE,IAAI,CACL,CAAC;QACF,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,kCAAkC,CAAC,0BAA0B,EAAE,IAAK,CAAC,CAAC;QACrF,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kFAAkF,EAAE,GAAS,EAAE;QAChG,mBAAmB,CACjB,EAAE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,EACnE,IAAI,CACL,CAAC;QACF,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;QACvC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAA4B,CAAC;QACjF,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,aAAa,EAAE,CAAC;QACrC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,213 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Startup identity line and duplicate MCP server-name detection (CORBOT-5D16CF2A).
|
|
3
|
+
*
|
|
4
|
+
* Two installs of different aismemory versions, or two MCP config entries
|
|
5
|
+
* with the same server name, show up to the user only as "the bond prompt
|
|
6
|
+
* looks different" or "my credentials are ignored". These tests pin the one
|
|
7
|
+
* stderr line that names version, agent and credential source, and the
|
|
8
|
+
* read-only scan that names every config scope defining the same server.
|
|
9
|
+
*/
|
|
10
|
+
import { mkdirSync, mkdtempSync, rmSync, symlinkSync, writeFileSync } from 'node:fs';
|
|
11
|
+
import { tmpdir } from 'node:os';
|
|
12
|
+
import { join } from 'node:path';
|
|
13
|
+
import { afterEach, describe, expect, it } from 'vitest';
|
|
14
|
+
import { describeStartupIdentity, findDuplicateServerNames, formatDuplicateServerWarning, formatStartupIdentityLine, getStartupIdentity, setStartupIdentity, } from '../startup-identity.js';
|
|
15
|
+
const dirs = [];
|
|
16
|
+
function tempDir(prefix) {
|
|
17
|
+
const dir = mkdtempSync(join(tmpdir(), prefix));
|
|
18
|
+
dirs.push(dir);
|
|
19
|
+
return dir;
|
|
20
|
+
}
|
|
21
|
+
afterEach(() => {
|
|
22
|
+
for (const dir of dirs.splice(0))
|
|
23
|
+
rmSync(dir, { recursive: true, force: true });
|
|
24
|
+
setStartupIdentity(null);
|
|
25
|
+
});
|
|
26
|
+
describe('describeStartupIdentity', () => {
|
|
27
|
+
it('names the env variable for workspace-key mode, never the key', () => {
|
|
28
|
+
const identity = describeStartupIdentity('0.8.3', {
|
|
29
|
+
kind: 'workspace-key',
|
|
30
|
+
env: { AIS_WORKSPACE_KEY: 'ais_wk_secretvalue' },
|
|
31
|
+
agentId: 'agent-ws',
|
|
32
|
+
});
|
|
33
|
+
expect(identity).toEqual({ clientVersion: '0.8.3', agentId: 'agent-ws', credentialSource: 'env AIS_WORKSPACE_KEY' });
|
|
34
|
+
expect(JSON.stringify(identity)).not.toContain('secretvalue');
|
|
35
|
+
});
|
|
36
|
+
it('falls back to AIS_API_KEY for a workspace key set there', () => {
|
|
37
|
+
const identity = describeStartupIdentity('0.8.3', { kind: 'workspace-key', env: { AIS_API_KEY: 'ais_wk_x' }, agentId: 'a' });
|
|
38
|
+
expect(identity.credentialSource).toBe('env AIS_API_KEY');
|
|
39
|
+
});
|
|
40
|
+
it('prefers AIS_API_KEY over the legacy alias for agent-key mode', () => {
|
|
41
|
+
expect(describeStartupIdentity('1.0.0', {
|
|
42
|
+
kind: 'agent-api-key', env: { AIS_API_KEY: 'ais_ak_1', AIS_AGENT_API_KEY: 'ais_ak_2' }, agentId: 'a',
|
|
43
|
+
}).credentialSource).toBe('env AIS_API_KEY');
|
|
44
|
+
expect(describeStartupIdentity('1.0.0', {
|
|
45
|
+
kind: 'agent-api-key', env: { AIS_AGENT_API_KEY: 'ais_ak_2' }, agentId: 'a',
|
|
46
|
+
}).credentialSource).toBe('env AIS_AGENT_API_KEY');
|
|
47
|
+
});
|
|
48
|
+
it('names the run-pass file path', () => {
|
|
49
|
+
const identity = describeStartupIdentity('1.0.0', { kind: 'run-pass', runPassFile: '/run/pass', agentId: 'a' });
|
|
50
|
+
expect(identity.credentialSource).toBe('run-pass file /run/pass');
|
|
51
|
+
});
|
|
52
|
+
it('reports the enrolled device key dir and the session or last bonded agent', () => {
|
|
53
|
+
const withPref = describeStartupIdentity('1.0.0', {
|
|
54
|
+
kind: 'oauth', enrolledKeyDir: '/h/.aismemory/keys', diskAgentId: null, credentialsFile: '/h/.aismemory/credentials.json', preferredAgentId: 'pref-1',
|
|
55
|
+
});
|
|
56
|
+
expect(withPref).toEqual({ clientVersion: '1.0.0', agentId: 'pref-1', credentialSource: 'device key file in /h/.aismemory/keys' });
|
|
57
|
+
const withSession = describeStartupIdentity('1.0.0', {
|
|
58
|
+
kind: 'oauth', sessionAgentId: 'sess-1', enrolledKeyDir: '/h/.aismemory/keys', diskAgentId: null, credentialsFile: '/c', preferredAgentId: 'pref-1',
|
|
59
|
+
});
|
|
60
|
+
expect(withSession.agentId).toBe('sess-1');
|
|
61
|
+
});
|
|
62
|
+
it('reports the owner session file when there is no device key', () => {
|
|
63
|
+
const identity = describeStartupIdentity('1.0.0', {
|
|
64
|
+
kind: 'oauth', enrolledKeyDir: null, diskAgentId: 'disk-1', credentialsFile: '/h/.aismemory/credentials.json',
|
|
65
|
+
});
|
|
66
|
+
expect(identity).toEqual({ clientVersion: '1.0.0', agentId: 'disk-1', credentialSource: 'owner session file /h/.aismemory/credentials.json' });
|
|
67
|
+
});
|
|
68
|
+
it('reports none and no agent when nothing is bonded', () => {
|
|
69
|
+
const identity = describeStartupIdentity('1.0.0', {
|
|
70
|
+
kind: 'oauth', enrolledKeyDir: null, diskAgentId: null, credentialsFile: '/c',
|
|
71
|
+
});
|
|
72
|
+
expect(identity).toEqual({ clientVersion: '1.0.0', agentId: null, credentialSource: 'none' });
|
|
73
|
+
});
|
|
74
|
+
});
|
|
75
|
+
describe('formatStartupIdentityLine', () => {
|
|
76
|
+
it('prints version, agent and source on one line', () => {
|
|
77
|
+
expect(formatStartupIdentityLine({ clientVersion: '0.8.3', agentId: 'agent-1', credentialSource: 'env AIS_API_KEY' }))
|
|
78
|
+
.toBe('aismemory 0.8.3: agent agent-1 via env AIS_API_KEY');
|
|
79
|
+
});
|
|
80
|
+
it('says unbonded when there is no agent', () => {
|
|
81
|
+
expect(formatStartupIdentityLine({ clientVersion: '0.8.3', agentId: null, credentialSource: 'none' }))
|
|
82
|
+
.toBe('aismemory 0.8.3: agent none (unbonded) via none');
|
|
83
|
+
});
|
|
84
|
+
});
|
|
85
|
+
describe('startup identity state', () => {
|
|
86
|
+
it('round-trips through set/get', () => {
|
|
87
|
+
expect(getStartupIdentity()).toBeNull();
|
|
88
|
+
setStartupIdentity({ clientVersion: '1', agentId: null, credentialSource: 'none' });
|
|
89
|
+
expect(getStartupIdentity()?.credentialSource).toBe('none');
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
describe('findDuplicateServerNames', () => {
|
|
93
|
+
function writeJson(path, value) {
|
|
94
|
+
writeFileSync(path, JSON.stringify(value));
|
|
95
|
+
}
|
|
96
|
+
it('finds aismemory defined in user, local and project scopes', () => {
|
|
97
|
+
const home = tempDir('ais-dup-home-');
|
|
98
|
+
const cwd = tempDir('ais-dup-cwd-');
|
|
99
|
+
writeJson(join(home, '.claude.json'), {
|
|
100
|
+
mcpServers: { aismemory: { command: 'npx', args: ['aismemory@0.8.0'], env: { AIS_API_KEY: 'ais_ak_SECRET' } } },
|
|
101
|
+
projects: { [cwd]: { mcpServers: { aismemory: { command: 'npx', args: ['aismemory'] } } } },
|
|
102
|
+
});
|
|
103
|
+
writeJson(join(cwd, '.mcp.json'), { mcpServers: { aismemory: { command: 'npx', args: ['-y', 'aismemory@latest'] } } });
|
|
104
|
+
const conflicts = findDuplicateServerNames({ home, cwd });
|
|
105
|
+
const local = `local (${join(home, '.claude.json')} projects[${cwd}])`;
|
|
106
|
+
const user = `user (${join(home, '.claude.json')})`;
|
|
107
|
+
expect(conflicts).toEqual([{
|
|
108
|
+
name: 'aismemory',
|
|
109
|
+
scopes: [local, `project (${join(cwd, '.mcp.json')})`, user],
|
|
110
|
+
winner: local,
|
|
111
|
+
winnerCredentialEnv: [],
|
|
112
|
+
ignoredCredentialEnv: [`${user} sets AIS_API_KEY`],
|
|
113
|
+
}]);
|
|
114
|
+
const warning = formatDuplicateServerWarning(conflicts[0]);
|
|
115
|
+
expect(warning).toContain('"aismemory"');
|
|
116
|
+
expect(warning).toContain('3 config scopes');
|
|
117
|
+
expect(warning).not.toContain('SECRET');
|
|
118
|
+
});
|
|
119
|
+
it('uses the real project config when the launching cwd is a symlink', () => {
|
|
120
|
+
const home = tempDir('ais-dup-home-');
|
|
121
|
+
const realCwd = tempDir('ais-dup-real-cwd-');
|
|
122
|
+
const symlinkParent = tempDir('ais-dup-link-parent-');
|
|
123
|
+
const cwd = join(symlinkParent, 'project-link');
|
|
124
|
+
symlinkSync(realCwd, cwd, 'dir');
|
|
125
|
+
writeJson(join(home, '.claude.json'), {
|
|
126
|
+
mcpServers: { aismemory: { command: 'npx', args: ['aismemory@0.8.0'] } },
|
|
127
|
+
projects: { [realCwd]: { mcpServers: { aismemory: { command: 'npx', args: ['aismemory'] } } } },
|
|
128
|
+
});
|
|
129
|
+
writeJson(join(realCwd, '.mcp.json'), { mcpServers: { aismemory: { command: 'npx', args: ['-y', 'aismemory@latest'] } } });
|
|
130
|
+
const conflicts = findDuplicateServerNames({ home, cwd });
|
|
131
|
+
expect(conflicts[0]?.scopes).toEqual([
|
|
132
|
+
`local (${join(home, '.claude.json')} projects[${realCwd}])`,
|
|
133
|
+
`project (${join(realCwd, '.mcp.json')})`,
|
|
134
|
+
`user (${join(home, '.claude.json')})`,
|
|
135
|
+
]);
|
|
136
|
+
});
|
|
137
|
+
it('keeps supporting a lexical symlink cwd key in user projects', () => {
|
|
138
|
+
const home = tempDir('ais-dup-home-');
|
|
139
|
+
const realCwd = tempDir('ais-dup-real-cwd-');
|
|
140
|
+
const symlinkParent = tempDir('ais-dup-link-parent-');
|
|
141
|
+
const cwd = join(symlinkParent, 'project-link');
|
|
142
|
+
symlinkSync(realCwd, cwd, 'dir');
|
|
143
|
+
writeJson(join(home, '.claude.json'), {
|
|
144
|
+
mcpServers: { aismemory: { command: 'npx', args: ['aismemory@latest'] } },
|
|
145
|
+
projects: { [cwd]: { mcpServers: { aismemory: { command: 'npx', args: ['aismemory'] } } } },
|
|
146
|
+
});
|
|
147
|
+
expect(findDuplicateServerNames({ home, cwd })[0]?.scopes).toEqual([
|
|
148
|
+
`local (${join(home, '.claude.json')} projects[${cwd}])`,
|
|
149
|
+
`user (${join(home, '.claude.json')})`,
|
|
150
|
+
]);
|
|
151
|
+
});
|
|
152
|
+
it('says which scope wins, why, and that the winner has no credential env', () => {
|
|
153
|
+
const home = tempDir('ais-dup-home-');
|
|
154
|
+
const cwd = tempDir('ais-dup-cwd-');
|
|
155
|
+
writeJson(join(home, '.claude.json'), {
|
|
156
|
+
mcpServers: { aismemory: { command: 'npx', args: ['aismemory'], env: { AIS_WORKSPACE_KEY: 'ais_wk_SECRET', AIS_AGENT_ID: 'a' } } },
|
|
157
|
+
});
|
|
158
|
+
writeJson(join(cwd, '.mcp.json'), { mcpServers: { aismemory: { command: 'npx', args: ['aismemory@0.8.0'] } } });
|
|
159
|
+
const [conflict] = findDuplicateServerNames({ home, cwd });
|
|
160
|
+
const warning = formatDuplicateServerWarning(conflict);
|
|
161
|
+
expect(conflict.winner).toBe(`project (${join(cwd, '.mcp.json')})`);
|
|
162
|
+
expect(warning).toContain(`The project (${join(cwd, '.mcp.json')}) entry wins (precedence: local > project > user)`);
|
|
163
|
+
expect(warning).toContain('the winner has no credential env');
|
|
164
|
+
expect(warning).toContain(`Ignored: user (${join(home, '.claude.json')}) sets AIS_WORKSPACE_KEY.`);
|
|
165
|
+
expect(warning).not.toContain('SECRET');
|
|
166
|
+
});
|
|
167
|
+
it('names the credential env the winner sets', () => {
|
|
168
|
+
const home = tempDir('ais-dup-home-');
|
|
169
|
+
const cwd = tempDir('ais-dup-cwd-');
|
|
170
|
+
writeJson(join(home, '.claude.json'), { mcpServers: { aismemory: { command: 'aismemory' } } });
|
|
171
|
+
writeJson(join(cwd, '.mcp.json'), { mcpServers: { aismemory: { command: 'aismemory', env: { AIS_API_KEY: 'ais_ak_SECRET' } } } });
|
|
172
|
+
const warning = formatDuplicateServerWarning(findDuplicateServerNames({ home, cwd })[0]);
|
|
173
|
+
expect(warning).toContain('the winner sets credential env AIS_API_KEY');
|
|
174
|
+
expect(warning).not.toContain('Ignored:');
|
|
175
|
+
expect(warning).not.toContain('SECRET');
|
|
176
|
+
});
|
|
177
|
+
it('catches a renamed server whose command runs this package', () => {
|
|
178
|
+
const home = tempDir('ais-dup-home-');
|
|
179
|
+
const cwd = tempDir('ais-dup-cwd-');
|
|
180
|
+
writeJson(join(home, '.claude.json'), { mcpServers: { memory: { command: 'node', args: ['/x/packages/agentmemory/dist/index.js'] } } });
|
|
181
|
+
writeJson(join(cwd, '.mcp.json'), { mcpServers: { memory: { command: 'aismemory' } } });
|
|
182
|
+
expect(findDuplicateServerNames({ home, cwd }).map((c) => c.name)).toEqual(['memory']);
|
|
183
|
+
});
|
|
184
|
+
it('ignores unrelated servers that share a name', () => {
|
|
185
|
+
const home = tempDir('ais-dup-home-');
|
|
186
|
+
const cwd = tempDir('ais-dup-cwd-');
|
|
187
|
+
writeJson(join(home, '.claude.json'), { mcpServers: { github: { command: 'gh-mcp' } } });
|
|
188
|
+
writeJson(join(cwd, '.mcp.json'), { mcpServers: { github: { command: 'gh-mcp' } } });
|
|
189
|
+
expect(findDuplicateServerNames({ home, cwd })).toEqual([]);
|
|
190
|
+
});
|
|
191
|
+
it('returns nothing for a single definition', () => {
|
|
192
|
+
const home = tempDir('ais-dup-home-');
|
|
193
|
+
const cwd = tempDir('ais-dup-cwd-');
|
|
194
|
+
writeJson(join(home, '.claude.json'), { mcpServers: { aismemory: { command: 'npx', args: ['aismemory'] } } });
|
|
195
|
+
expect(findDuplicateServerNames({ home, cwd })).toEqual([]);
|
|
196
|
+
});
|
|
197
|
+
it('tolerates missing and invalid config files', () => {
|
|
198
|
+
const home = tempDir('ais-dup-home-');
|
|
199
|
+
const cwd = tempDir('ais-dup-cwd-');
|
|
200
|
+
writeFileSync(join(home, '.claude.json'), '{not json');
|
|
201
|
+
mkdirSync(join(cwd, '.mcp.json'));
|
|
202
|
+
expect(findDuplicateServerNames({ home, cwd })).toEqual([]);
|
|
203
|
+
expect(findDuplicateServerNames({ home: join(home, 'missing'), cwd: join(cwd, 'missing') })).toEqual([]);
|
|
204
|
+
});
|
|
205
|
+
it('tolerates wrongly shaped server maps', () => {
|
|
206
|
+
const home = tempDir('ais-dup-home-');
|
|
207
|
+
const cwd = tempDir('ais-dup-cwd-');
|
|
208
|
+
writeJson(join(home, '.claude.json'), { mcpServers: ['aismemory'], projects: { [cwd]: { mcpServers: null } } });
|
|
209
|
+
writeJson(join(cwd, '.mcp.json'), { mcpServers: { aismemory: 'npx aismemory' } });
|
|
210
|
+
expect(findDuplicateServerNames({ home, cwd })).toEqual([]);
|
|
211
|
+
});
|
|
212
|
+
});
|
|
213
|
+
//# sourceMappingURL=startup-identity.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"startup-identity.test.js","sourceRoot":"","sources":["../../src/__tests__/startup-identity.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|