@amodalai/runtime 0.3.22 → 0.3.24
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/dist/src/__fixtures__/smoke.test.js +127 -25
- package/dist/src/__fixtures__/smoke.test.js.map +1 -1
- package/dist/src/agent/local-server.js +4 -180
- package/dist/src/agent/local-server.js.map +1 -1
- package/dist/src/agent/routes/stores.js +5 -5
- package/dist/src/agent/routes/stores.js.map +1 -1
- package/dist/src/agent/routes/stores.test.js +1 -1
- package/dist/src/agent/routes/stores.test.js.map +1 -1
- package/dist/src/credentials.d.ts +44 -0
- package/dist/src/credentials.js +58 -0
- package/dist/src/credentials.js.map +1 -0
- package/dist/src/credentials.test.d.ts +6 -0
- package/dist/src/credentials.test.js +108 -0
- package/dist/src/credentials.test.js.map +1 -0
- package/dist/src/events/store-event-wrapper.js +12 -12
- package/dist/src/events/store-event-wrapper.js.map +1 -1
- package/dist/src/events/store-event-wrapper.test.js +9 -9
- package/dist/src/events/store-event-wrapper.test.js.map +1 -1
- package/dist/src/index.d.ts +5 -0
- package/dist/src/index.js +6 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/middleware/auth.d.ts +4 -0
- package/dist/src/middleware/auth.js.map +1 -1
- package/dist/src/routes/chat-stream.js +12 -0
- package/dist/src/routes/chat-stream.js.map +1 -1
- package/dist/src/routes/chat.js +12 -0
- package/dist/src/routes/chat.js.map +1 -1
- package/dist/src/routes/session-resolver.d.ts +11 -0
- package/dist/src/routes/session-resolver.js +30 -6
- package/dist/src/routes/session-resolver.js.map +1 -1
- package/dist/src/routes/sessions-history.d.ts +22 -0
- package/dist/src/routes/sessions-history.js +186 -0
- package/dist/src/routes/sessions-history.js.map +1 -0
- package/dist/src/scope.d.ts +18 -0
- package/dist/src/scope.js +15 -0
- package/dist/src/scope.js.map +1 -0
- package/dist/src/scope.test.d.ts +6 -0
- package/dist/src/scope.test.js +64 -0
- package/dist/src/scope.test.js.map +1 -0
- package/dist/src/server.js +12 -0
- package/dist/src/server.js.map +1 -1
- package/dist/src/session/drizzle-session-store.d.ts +12 -0
- package/dist/src/session/drizzle-session-store.js +33 -1
- package/dist/src/session/drizzle-session-store.js.map +1 -1
- package/dist/src/session/manager.d.ts +3 -1
- package/dist/src/session/manager.js +15 -1
- package/dist/src/session/manager.js.map +1 -1
- package/dist/src/session/session-builder.d.ts +11 -0
- package/dist/src/session/session-builder.js +22 -7
- package/dist/src/session/session-builder.js.map +1 -1
- package/dist/src/session/store.d.ts +6 -0
- package/dist/src/session/store.js +2 -3
- package/dist/src/session/store.js.map +1 -1
- package/dist/src/session/store.test.js +4 -0
- package/dist/src/session/store.test.js.map +1 -1
- package/dist/src/session/tool-context-factory.d.ts +17 -1
- package/dist/src/session/tool-context-factory.js +95 -9
- package/dist/src/session/tool-context-factory.js.map +1 -1
- package/dist/src/session/tool-context-factory.test.js +2 -1
- package/dist/src/session/tool-context-factory.test.js.map +1 -1
- package/dist/src/session/types.d.ts +6 -0
- package/dist/src/stores/drizzle-store-backend.d.ts +6 -6
- package/dist/src/stores/drizzle-store-backend.js +24 -19
- package/dist/src/stores/drizzle-store-backend.js.map +1 -1
- package/dist/src/stores/drizzle-store-backend.test.js +41 -41
- package/dist/src/stores/drizzle-store-backend.test.js.map +1 -1
- package/dist/src/stores/index.d.ts +1 -0
- package/dist/src/stores/index.js +1 -0
- package/dist/src/stores/index.js.map +1 -1
- package/dist/src/stores/scoped-store-backend.d.ts +36 -0
- package/dist/src/stores/scoped-store-backend.js +59 -0
- package/dist/src/stores/scoped-store-backend.js.map +1 -0
- package/dist/src/stores/scoped-store-backend.test.d.ts +6 -0
- package/dist/src/stores/scoped-store-backend.test.js +159 -0
- package/dist/src/stores/scoped-store-backend.test.js.map +1 -0
- package/dist/src/tools/custom-tool-adapter.d.ts +1 -1
- package/dist/src/tools/custom-tool-adapter.js +1 -1
- package/dist/src/tools/custom-tool-adapter.js.map +1 -1
- package/dist/src/tools/custom-tool-adapter.test.js +2 -1
- package/dist/src/tools/custom-tool-adapter.test.js.map +1 -1
- package/dist/src/tools/fetch-url-tool.test.js +1 -0
- package/dist/src/tools/fetch-url-tool.test.js.map +1 -1
- package/dist/src/tools/mcp-tool-adapter.test.js +1 -0
- package/dist/src/tools/mcp-tool-adapter.test.js.map +1 -1
- package/dist/src/tools/memory-tool.d.ts +5 -3
- package/dist/src/tools/memory-tool.js +30 -30
- package/dist/src/tools/memory-tool.js.map +1 -1
- package/dist/src/tools/memory-tool.test.js +1 -0
- package/dist/src/tools/memory-tool.test.js.map +1 -1
- package/dist/src/tools/registry.test.js +1 -0
- package/dist/src/tools/registry.test.js.map +1 -1
- package/dist/src/tools/request-tool.test.js +1 -0
- package/dist/src/tools/request-tool.test.js.map +1 -1
- package/dist/src/tools/store-tools.js +7 -7
- package/dist/src/tools/store-tools.js.map +1 -1
- package/dist/src/tools/store-tools.test.js +8 -7
- package/dist/src/tools/store-tools.test.js.map +1 -1
- package/dist/src/tools/types.d.ts +4 -0
- package/dist/src/tools/web-search-tool.test.js +1 -0
- package/dist/src/tools/web-search-tool.test.js.map +1 -1
- package/dist/src/types.d.ts +10 -0
- package/dist/src/types.js +4 -0
- package/dist/src/types.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright 2026 Amodal Labs, Inc.
|
|
4
|
+
* SPDX-License-Identifier: MIT
|
|
5
|
+
*/
|
|
6
|
+
import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
|
7
|
+
import { EnvCredentialResolver, ScopeSecretsResolver, ChainResolver } from './credentials.js';
|
|
8
|
+
describe('EnvCredentialResolver', () => {
|
|
9
|
+
const resolver = new EnvCredentialResolver();
|
|
10
|
+
beforeEach(() => {
|
|
11
|
+
process.env['TEST_ENV_KEY'] = 'env-value-123';
|
|
12
|
+
});
|
|
13
|
+
afterEach(() => {
|
|
14
|
+
delete process.env['TEST_ENV_KEY'];
|
|
15
|
+
});
|
|
16
|
+
it('resolves env:KEY from process.env', async () => {
|
|
17
|
+
const result = await resolver.resolve('env:TEST_ENV_KEY');
|
|
18
|
+
expect(result).toBe('env-value-123');
|
|
19
|
+
});
|
|
20
|
+
it('returns undefined for non-env: prefixes', async () => {
|
|
21
|
+
const result = await resolver.resolve('scope:SOME_KEY');
|
|
22
|
+
expect(result).toBeUndefined();
|
|
23
|
+
});
|
|
24
|
+
it('returns undefined for an env:KEY that does not exist', async () => {
|
|
25
|
+
const result = await resolver.resolve('env:NONEXISTENT_KEY_XYZ');
|
|
26
|
+
expect(result).toBeUndefined();
|
|
27
|
+
});
|
|
28
|
+
it('returns undefined for a plain string with no prefix', async () => {
|
|
29
|
+
const result = await resolver.resolve('plain-literal');
|
|
30
|
+
expect(result).toBeUndefined();
|
|
31
|
+
});
|
|
32
|
+
});
|
|
33
|
+
describe('ScopeSecretsResolver', () => {
|
|
34
|
+
const secrets = {
|
|
35
|
+
API_KEY: 'secret-abc',
|
|
36
|
+
WEBHOOK_SECRET: 'webhook-xyz',
|
|
37
|
+
};
|
|
38
|
+
const resolver = new ScopeSecretsResolver(secrets);
|
|
39
|
+
it('resolves scope:KEY from the secrets map', async () => {
|
|
40
|
+
const result = await resolver.resolve('scope:API_KEY');
|
|
41
|
+
expect(result).toBe('secret-abc');
|
|
42
|
+
});
|
|
43
|
+
it('resolves another key from the secrets map', async () => {
|
|
44
|
+
const result = await resolver.resolve('scope:WEBHOOK_SECRET');
|
|
45
|
+
expect(result).toBe('webhook-xyz');
|
|
46
|
+
});
|
|
47
|
+
it('returns undefined for non-scope: prefixes', async () => {
|
|
48
|
+
const result = await resolver.resolve('env:API_KEY');
|
|
49
|
+
expect(result).toBeUndefined();
|
|
50
|
+
});
|
|
51
|
+
it('returns undefined for missing keys', async () => {
|
|
52
|
+
const result = await resolver.resolve('scope:MISSING_KEY');
|
|
53
|
+
expect(result).toBeUndefined();
|
|
54
|
+
});
|
|
55
|
+
it('returns undefined for a plain string with no prefix', async () => {
|
|
56
|
+
const result = await resolver.resolve('plain-literal');
|
|
57
|
+
expect(result).toBeUndefined();
|
|
58
|
+
});
|
|
59
|
+
});
|
|
60
|
+
describe('ChainResolver', () => {
|
|
61
|
+
beforeEach(() => {
|
|
62
|
+
process.env['CHAIN_TEST_KEY'] = 'env-chain-value';
|
|
63
|
+
});
|
|
64
|
+
afterEach(() => {
|
|
65
|
+
delete process.env['CHAIN_TEST_KEY'];
|
|
66
|
+
});
|
|
67
|
+
it('tries resolvers in order and returns first match', async () => {
|
|
68
|
+
const secrets = { MY_SECRET: 'scope-value' };
|
|
69
|
+
const chain = new ChainResolver([
|
|
70
|
+
new EnvCredentialResolver(),
|
|
71
|
+
new ScopeSecretsResolver(secrets),
|
|
72
|
+
]);
|
|
73
|
+
// env: should be matched by EnvCredentialResolver (first)
|
|
74
|
+
const envResult = await chain.resolve('env:CHAIN_TEST_KEY');
|
|
75
|
+
expect(envResult).toBe('env-chain-value');
|
|
76
|
+
// scope: should fall through to ScopeSecretsResolver (second)
|
|
77
|
+
const scopeResult = await chain.resolve('scope:MY_SECRET');
|
|
78
|
+
expect(scopeResult).toBe('scope-value');
|
|
79
|
+
});
|
|
80
|
+
it('falls back to literal string when no resolver matches a prefix', async () => {
|
|
81
|
+
const chain = new ChainResolver([
|
|
82
|
+
new EnvCredentialResolver(),
|
|
83
|
+
new ScopeSecretsResolver({}),
|
|
84
|
+
]);
|
|
85
|
+
const result = await chain.resolve('some-literal-value');
|
|
86
|
+
expect(result).toBe('some-literal-value');
|
|
87
|
+
});
|
|
88
|
+
it('returns the first non-undefined result and skips later resolvers', async () => {
|
|
89
|
+
// Both resolvers would claim to handle 'env:' — but only the first
|
|
90
|
+
// match is used. We verify by putting a resolver that always returns
|
|
91
|
+
// a value first in the chain.
|
|
92
|
+
const alwaysResolvesFirst = {
|
|
93
|
+
resolve: async (_ref) => 'first-resolver',
|
|
94
|
+
};
|
|
95
|
+
const alwaysResolvesSecond = {
|
|
96
|
+
resolve: async (_ref) => 'second-resolver',
|
|
97
|
+
};
|
|
98
|
+
const chain = new ChainResolver([alwaysResolvesFirst, alwaysResolvesSecond]);
|
|
99
|
+
const result = await chain.resolve('anything');
|
|
100
|
+
expect(result).toBe('first-resolver');
|
|
101
|
+
});
|
|
102
|
+
it('works with an empty resolver list and returns ref as literal', async () => {
|
|
103
|
+
const chain = new ChainResolver([]);
|
|
104
|
+
const result = await chain.resolve('literal-passthrough');
|
|
105
|
+
expect(result).toBe('literal-passthrough');
|
|
106
|
+
});
|
|
107
|
+
});
|
|
108
|
+
//# sourceMappingURL=credentials.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"credentials.test.js","sourceRoot":"","sources":["../../src/credentials.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,17 +8,17 @@ export function wrapStoreBackendWithEvents(inner, bus) {
|
|
|
8
8
|
initialize(stores) {
|
|
9
9
|
return inner.initialize(stores);
|
|
10
10
|
},
|
|
11
|
-
get(appId, store, key) {
|
|
12
|
-
return inner.get(appId, store, key);
|
|
11
|
+
get(appId, scopeId, store, key) {
|
|
12
|
+
return inner.get(appId, scopeId, store, key);
|
|
13
13
|
},
|
|
14
|
-
list(appId, store, opts) {
|
|
15
|
-
return inner.list(appId, store, opts);
|
|
14
|
+
list(appId, scopeId, store, opts) {
|
|
15
|
+
return inner.list(appId, scopeId, store, opts);
|
|
16
16
|
},
|
|
17
|
-
history(appId, store, key) {
|
|
18
|
-
return inner.history(appId, store, key);
|
|
17
|
+
history(appId, scopeId, store, key) {
|
|
18
|
+
return inner.history(appId, scopeId, store, key);
|
|
19
19
|
},
|
|
20
|
-
async put(appId, store, key, payload, meta) {
|
|
21
|
-
const result = await inner.put(appId, store, key, payload, meta);
|
|
20
|
+
async put(appId, scopeId, store, key, payload, meta) {
|
|
21
|
+
const result = await inner.put(appId, scopeId, store, key, payload, meta);
|
|
22
22
|
bus.emit({
|
|
23
23
|
type: 'store_updated',
|
|
24
24
|
storeName: store,
|
|
@@ -26,8 +26,8 @@ export function wrapStoreBackendWithEvents(inner, bus) {
|
|
|
26
26
|
});
|
|
27
27
|
return result;
|
|
28
28
|
},
|
|
29
|
-
async delete(appId, store, key) {
|
|
30
|
-
const result = await inner.delete(appId, store, key);
|
|
29
|
+
async delete(appId, scopeId, store, key) {
|
|
30
|
+
const result = await inner.delete(appId, scopeId, store, key);
|
|
31
31
|
if (result) {
|
|
32
32
|
bus.emit({
|
|
33
33
|
type: 'store_updated',
|
|
@@ -37,8 +37,8 @@ export function wrapStoreBackendWithEvents(inner, bus) {
|
|
|
37
37
|
}
|
|
38
38
|
return result;
|
|
39
39
|
},
|
|
40
|
-
async purgeExpired(appId, store) {
|
|
41
|
-
const count = await inner.purgeExpired(appId, store);
|
|
40
|
+
async purgeExpired(appId, scopeId, store) {
|
|
41
|
+
const count = await inner.purgeExpired(appId, scopeId, store);
|
|
42
42
|
if (count > 0) {
|
|
43
43
|
bus.emit({
|
|
44
44
|
type: 'store_updated',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store-event-wrapper.js","sourceRoot":"","sources":["../../../src/events/store-event-wrapper.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA0BH,MAAM,UAAU,0BAA0B,CACxC,KAAmB,EACnB,GAAmB;IAEnB,OAAO;QACL,UAAU,CAAC,MAAqB;YAC9B,OAAO,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC;QAED,GAAG,CAAC,KAAa,EAAE,KAAa,EAAE,GAAW;
|
|
1
|
+
{"version":3,"file":"store-event-wrapper.js","sourceRoot":"","sources":["../../../src/events/store-event-wrapper.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AA0BH,MAAM,UAAU,0BAA0B,CACxC,KAAmB,EACnB,GAAmB;IAEnB,OAAO;QACL,UAAU,CAAC,MAAqB;YAC9B,OAAO,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;QAClC,CAAC;QAED,GAAG,CAAC,KAAa,EAAE,OAAe,EAAE,KAAa,EAAE,GAAW;YAC5D,OAAO,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,CAAC,KAAa,EAAE,OAAe,EAAE,KAAa,EAAE,IAAuB;YACzE,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QACjD,CAAC;QAED,OAAO,CAAC,KAAa,EAAE,OAAe,EAAE,KAAa,EAAE,GAAW;YAChE,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QACnD,CAAC;QAED,KAAK,CAAC,GAAG,CACP,KAAa,EACb,OAAe,EACf,KAAa,EACb,GAAW,EACX,OAAgC,EAChC,IAAgC;YAEhC,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;YAC1E,GAAG,CAAC,IAAI,CAAC;gBACP,IAAI,EAAE,eAAe;gBACrB,SAAS,EAAE,KAAK;gBAChB,SAAS,EAAE,KAAK;aACjB,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,KAAK,CAAC,MAAM,CAAC,KAAa,EAAE,OAAe,EAAE,KAAa,EAAE,GAAW;YACrE,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;YAC9D,IAAI,MAAM,EAAE,CAAC;gBACX,GAAG,CAAC,IAAI,CAAC;oBACP,IAAI,EAAE,eAAe;oBACrB,SAAS,EAAE,KAAK;oBAChB,SAAS,EAAE,QAAQ;iBACpB,CAAC,CAAC;YACL,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC;QAED,KAAK,CAAC,YAAY,CAAC,KAAa,EAAE,OAAe,EAAE,KAAc;YAC/D,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YAC9D,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;gBACd,GAAG,CAAC,IAAI,CAAC;oBACP,IAAI,EAAE,eAAe;oBACrB,SAAS,EAAE,KAAK,IAAI,GAAG;oBACvB,SAAS,EAAE,QAAQ;oBACnB,KAAK;iBACN,CAAC,CAAC;YACL,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,KAAK;YACH,OAAO,KAAK,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -25,7 +25,7 @@ describe('wrapStoreBackendWithEvents', () => {
|
|
|
25
25
|
const emits = [];
|
|
26
26
|
bus.subscribe((e) => emits.push({ type: e.type, storeName: e.storeName, operation: e.operation }));
|
|
27
27
|
const wrapped = wrapStoreBackendWithEvents(makeStubBackend(), bus);
|
|
28
|
-
await wrapped.put('local', 'leads', 'k1', { x: 1 }, {});
|
|
28
|
+
await wrapped.put('local', '', 'leads', 'k1', { x: 1 }, {});
|
|
29
29
|
expect(emits).toHaveLength(1);
|
|
30
30
|
expect(emits[0]).toEqual({ type: 'store_updated', storeName: 'leads', operation: 'put' });
|
|
31
31
|
});
|
|
@@ -34,7 +34,7 @@ describe('wrapStoreBackendWithEvents', () => {
|
|
|
34
34
|
const emits = [];
|
|
35
35
|
bus.subscribe((e) => emits.push(e));
|
|
36
36
|
const wrapped = wrapStoreBackendWithEvents(makeStubBackend(), bus);
|
|
37
|
-
await wrapped.delete('local', 'leads', 'k1');
|
|
37
|
+
await wrapped.delete('local', '', 'leads', 'k1');
|
|
38
38
|
expect(emits).toHaveLength(1);
|
|
39
39
|
expect(emits[0]?.['type']).toBe('store_updated');
|
|
40
40
|
expect(emits[0]?.['operation']).toBe('delete');
|
|
@@ -44,7 +44,7 @@ describe('wrapStoreBackendWithEvents', () => {
|
|
|
44
44
|
const emits = [];
|
|
45
45
|
bus.subscribe((e) => emits.push(e));
|
|
46
46
|
const wrapped = wrapStoreBackendWithEvents(makeStubBackend({ delete: vi.fn().mockResolvedValue(false) }), bus);
|
|
47
|
-
await wrapped.delete('local', 'leads', 'missing');
|
|
47
|
+
await wrapped.delete('local', '', 'leads', 'missing');
|
|
48
48
|
expect(emits).toHaveLength(0);
|
|
49
49
|
});
|
|
50
50
|
it('emits store_updated with count on purgeExpired', async () => {
|
|
@@ -52,7 +52,7 @@ describe('wrapStoreBackendWithEvents', () => {
|
|
|
52
52
|
const emits = [];
|
|
53
53
|
bus.subscribe((e) => emits.push(e));
|
|
54
54
|
const wrapped = wrapStoreBackendWithEvents(makeStubBackend({ purgeExpired: vi.fn().mockResolvedValue(3) }), bus);
|
|
55
|
-
await wrapped.purgeExpired('local', 'leads');
|
|
55
|
+
await wrapped.purgeExpired('local', '', 'leads');
|
|
56
56
|
expect(emits).toHaveLength(1);
|
|
57
57
|
expect(emits[0]?.['count']).toBe(3);
|
|
58
58
|
expect(emits[0]?.['storeName']).toBe('leads');
|
|
@@ -62,7 +62,7 @@ describe('wrapStoreBackendWithEvents', () => {
|
|
|
62
62
|
const emits = [];
|
|
63
63
|
bus.subscribe((e) => emits.push(e));
|
|
64
64
|
const wrapped = wrapStoreBackendWithEvents(makeStubBackend(), bus);
|
|
65
|
-
await wrapped.purgeExpired('local');
|
|
65
|
+
await wrapped.purgeExpired('local', '');
|
|
66
66
|
expect(emits).toHaveLength(0);
|
|
67
67
|
});
|
|
68
68
|
it('passes read operations through unchanged without emitting', async () => {
|
|
@@ -71,9 +71,9 @@ describe('wrapStoreBackendWithEvents', () => {
|
|
|
71
71
|
bus.subscribe((e) => emits.push(e));
|
|
72
72
|
const inner = makeStubBackend();
|
|
73
73
|
const wrapped = wrapStoreBackendWithEvents(inner, bus);
|
|
74
|
-
await wrapped.get('local', 'leads', 'k1');
|
|
75
|
-
await wrapped.list('local', 'leads');
|
|
76
|
-
await wrapped.history('local', 'leads', 'k1');
|
|
74
|
+
await wrapped.get('local', '', 'leads', 'k1');
|
|
75
|
+
await wrapped.list('local', '', 'leads');
|
|
76
|
+
await wrapped.history('local', '', 'leads', 'k1');
|
|
77
77
|
expect(emits).toHaveLength(0);
|
|
78
78
|
expect(inner.get).toHaveBeenCalled();
|
|
79
79
|
expect(inner.list).toHaveBeenCalled();
|
|
@@ -84,7 +84,7 @@ describe('wrapStoreBackendWithEvents', () => {
|
|
|
84
84
|
const emits = [];
|
|
85
85
|
bus.subscribe((e) => emits.push(e));
|
|
86
86
|
const wrapped = wrapStoreBackendWithEvents(makeStubBackend({ put: vi.fn().mockRejectedValue(new Error('disk full')) }), bus);
|
|
87
|
-
await expect(wrapped.put('local', 'leads', 'k1', {}, {})).rejects.toThrow('disk full');
|
|
87
|
+
await expect(wrapped.put('local', '', 'leads', 'k1', {}, {})).rejects.toThrow('disk full');
|
|
88
88
|
expect(emits).toHaveLength(0);
|
|
89
89
|
});
|
|
90
90
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store-event-wrapper.test.js","sourceRoot":"","sources":["../../../src/events/store-event-wrapper.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAC,QAAQ,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAC,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAC,0BAA0B,EAAC,MAAM,0BAA0B,CAAC;AACpE,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;AAE/C,SAAS,eAAe,CAAC,YAAmC,EAAE;IAC5D,OAAO;QACL,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;QAChD,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC;QACpC,IAAI,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAC,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAC,CAAC;QACrD,OAAO,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACtC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,EAAC,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAC,CAAC;QAC1D,MAAM,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,IAAI,CAAC;QACvC,YAAY,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAC1C,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC;QAC3C,GAAG,SAAS;KACb,CAAC;AACJ,CAAC;AAED,QAAQ,CAAC,4BAA4B,EAAE,GAAG,EAAE;IAC1C,EAAE,CAAC,uCAAuC,EAAE,KAAK,IAAI,EAAE;QACrD,MAAM,GAAG,GAAG,IAAI,eAAe,EAAE,CAAC;QAClC,MAAM,KAAK,GAAkE,EAAE,CAAC;QAChF,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,SAAS,EAAG,CAA2B,CAAC,SAAS,EAAE,SAAS,EAAG,CAA2B,CAAC,SAAS,EAAC,CAAC,CAAC,CAAC;QAEvJ,MAAM,OAAO,GAAG,0BAA0B,CAAC,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;QACnE,MAAM,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,EAAC,CAAC,EAAE,CAAC,EAAC,EAAE,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"store-event-wrapper.test.js","sourceRoot":"","sources":["../../../src/events/store-event-wrapper.test.ts"],"names":[],"mappings":"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"}
|
package/dist/src/index.d.ts
CHANGED
|
@@ -24,6 +24,10 @@ export { createTaskRouter } from './agent/routes/task.js';
|
|
|
24
24
|
export type { TaskRouterOptions } from './agent/routes/task.js';
|
|
25
25
|
export { getAuthContext } from './middleware/auth.js';
|
|
26
26
|
export type { AuthContext } from './middleware/auth.js';
|
|
27
|
+
export { resolveScope } from './scope.js';
|
|
28
|
+
export type { ResolvedScope } from './scope.js';
|
|
29
|
+
export { EnvCredentialResolver, ScopeSecretsResolver, ChainResolver } from './credentials.js';
|
|
30
|
+
export type { CredentialResolver } from './credentials.js';
|
|
27
31
|
export type { StreamHooks, TokenCounts } from './session/stream-hooks.js';
|
|
28
32
|
export { routeOutput } from './output/output-router.js';
|
|
29
33
|
export { errorHandler } from './middleware/error-handler.js';
|
|
@@ -44,6 +48,7 @@ export { createToolRegistry } from './tools/registry.js';
|
|
|
44
48
|
export type { ToolDefinition, ToolContext, ToolCategory, ToolMetadata, ToolRegistry, } from './tools/types.js';
|
|
45
49
|
export { createMcpToolDefinition, registerMcpTools, } from './tools/mcp-tool-adapter.js';
|
|
46
50
|
export { createStoreWriteTool, createStoreBatchTool, createStoreQueryTool, registerStoreTools, storeToToolName, QUERY_STORE_TOOL_NAME, } from './tools/store-tools.js';
|
|
51
|
+
export { ScopedStoreBackend } from './stores/scoped-store-backend.js';
|
|
47
52
|
export { createRequestTool, REQUEST_TOOL_NAME } from './tools/request-tool.js';
|
|
48
53
|
export type { ConnectionsMap, CreateRequestToolOptions } from './tools/request-tool.js';
|
|
49
54
|
export { createMemoryTool, loadMemoryContent, loadMemoryEntries, formatMemoryForPrompt, MEMORY_TOOL_NAME, UPDATE_MEMORY_TOOL_NAME } from './tools/memory-tool.js';
|
package/dist/src/index.js
CHANGED
|
@@ -27,6 +27,10 @@ export { createChatRouter } from './routes/chat.js';
|
|
|
27
27
|
export { createTaskRouter } from './agent/routes/task.js';
|
|
28
28
|
// Auth types (middleware implementation provided by hosting layer)
|
|
29
29
|
export { getAuthContext } from './middleware/auth.js';
|
|
30
|
+
// Scope resolution
|
|
31
|
+
export { resolveScope } from './scope.js';
|
|
32
|
+
// Credential resolution
|
|
33
|
+
export { EnvCredentialResolver, ScopeSecretsResolver, ChainResolver } from './credentials.js';
|
|
30
34
|
// Output routing (for automation result delivery)
|
|
31
35
|
export { routeOutput } from './output/output-router.js';
|
|
32
36
|
// Error handler
|
|
@@ -49,6 +53,8 @@ export { createToolRegistry } from './tools/registry.js';
|
|
|
49
53
|
export { createMcpToolDefinition, registerMcpTools, } from './tools/mcp-tool-adapter.js';
|
|
50
54
|
// Store tools (new Zod-based implementations)
|
|
51
55
|
export { createStoreWriteTool, createStoreBatchTool, createStoreQueryTool, registerStoreTools, storeToToolName, QUERY_STORE_TOOL_NAME, } from './tools/store-tools.js';
|
|
56
|
+
// Scoped store backend wrapper
|
|
57
|
+
export { ScopedStoreBackend } from './stores/scoped-store-backend.js';
|
|
52
58
|
// Connection request tool
|
|
53
59
|
export { createRequestTool, REQUEST_TOOL_NAME } from './tools/request-tool.js';
|
|
54
60
|
// Memory tool
|
package/dist/src/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,EAAE,YAAY,EAAuB,MAAM,aAAa,CAAC;AAChE,OAAO,EAAE,GAAG,EAAE,MAAM,aAAa,CAAC;AAElC,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC;AAEtC,8EAA8E;AAC9E,aAAa;AACb,8EAA8E;AAE9E,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAGpD,8EAA8E;AAC9E,0BAA0B;AAC1B,8EAA8E;AAC9E,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,EAAE,oBAAoB,EAA8B,MAAM,uBAAuB,CAAC;AAEzF,0DAA0D;AAC1D,OAAO,EACL,mBAAmB,EACnB,WAAW,EACX,OAAO,EACP,iBAAiB,GAClB,MAAM,oBAAoB,CAAC;AAO5B,aAAa;AACb,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,gBAAgB;AAChB,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAGlE,kEAAkE;AAClE,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG1D,mEAAmE;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,6 +14,10 @@ export interface AuthContext {
|
|
|
14
14
|
token?: string;
|
|
15
15
|
applicationId: string;
|
|
16
16
|
authMethod: string;
|
|
17
|
+
/** Scope ID extracted from JWT claims (for per-user session isolation) */
|
|
18
|
+
scopeId?: string;
|
|
19
|
+
/** Scope context key-value pairs extracted from JWT claims */
|
|
20
|
+
scopeContext?: Record<string, string>;
|
|
17
21
|
}
|
|
18
22
|
/**
|
|
19
23
|
* Get the auth context from response locals.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/middleware/auth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../src/middleware/auth.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAoBH,MAAM,gBAAgB,GAAG,aAAa,CAAC;AAEvC;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,GAAa;IAC1C,uEAAuE;IACvE,OAAO,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAA4B,CAAC;AACjE,CAAC"}
|
|
@@ -16,6 +16,7 @@ import { validate } from '../middleware/request-validation.js';
|
|
|
16
16
|
import { getAuthContext } from '../middleware/auth.js';
|
|
17
17
|
import { resolveSession } from './session-resolver.js';
|
|
18
18
|
import { adaptOnUsage, asyncHandler, fireDrainHooks, UNKNOWN_TOOL_NAME } from './route-helpers.js';
|
|
19
|
+
import { resolveScope } from '../scope.js';
|
|
19
20
|
// ---------------------------------------------------------------------------
|
|
20
21
|
// Router
|
|
21
22
|
// ---------------------------------------------------------------------------
|
|
@@ -27,6 +28,15 @@ export function createChatStreamRouter(options) {
|
|
|
27
28
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- validated by Zod middleware
|
|
28
29
|
const body = req.body;
|
|
29
30
|
const auth = getAuthContext(res);
|
|
31
|
+
const { scopeId, scopeContext } = resolveScope(body, auth);
|
|
32
|
+
// Reject if the agent requires a scope but none was provided
|
|
33
|
+
const bundleConfig = options.bundleResolver.staticBundle?.config;
|
|
34
|
+
if (bundleConfig?.scope?.requireScope === true && scopeId === '') {
|
|
35
|
+
res.status(400).json({
|
|
36
|
+
error: { code: 'scope_required', message: 'This agent requires a scope_id.' },
|
|
37
|
+
});
|
|
38
|
+
return;
|
|
39
|
+
}
|
|
30
40
|
const { session, toolContextFactory } = await resolveSession(body.session_id, {
|
|
31
41
|
sessionManager: options.sessionManager,
|
|
32
42
|
bundleResolver: options.bundleResolver,
|
|
@@ -37,6 +47,8 @@ export function createChatStreamRouter(options) {
|
|
|
37
47
|
maxSessionTokens: body.max_session_tokens,
|
|
38
48
|
pinnedModel: body.model,
|
|
39
49
|
onSessionBuild: options.onSessionBuild,
|
|
50
|
+
scopeId,
|
|
51
|
+
scopeContext,
|
|
40
52
|
});
|
|
41
53
|
// Set up SSE headers (use setHeader to preserve CORS headers from middleware)
|
|
42
54
|
res.setHeader('Content-Type', 'text/event-stream');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-stream.js","sourceRoot":"","sources":["../../../src/routes/chat-stream.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;;GAMG;AAEH,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAC,iBAAiB,EAAE,YAAY,EAAC,MAAM,aAAa,CAAC;AAE5D,OAAO,EAAC,QAAQ,EAAC,MAAM,qCAAqC,CAAC;AAC7D,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAIrD,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAC,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAC,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"chat-stream.js","sourceRoot":"","sources":["../../../src/routes/chat-stream.ts"],"names":[],"mappings":"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"}
|
package/dist/src/routes/chat.js
CHANGED
|
@@ -15,6 +15,7 @@ import { validate } from '../middleware/request-validation.js';
|
|
|
15
15
|
import { getAuthContext } from '../middleware/auth.js';
|
|
16
16
|
import { resolveSession } from './session-resolver.js';
|
|
17
17
|
import { adaptOnUsage, asyncHandler, fireDrainHooks, UNKNOWN_TOOL_NAME } from './route-helpers.js';
|
|
18
|
+
import { resolveScope } from '../scope.js';
|
|
18
19
|
// ---------------------------------------------------------------------------
|
|
19
20
|
// Router
|
|
20
21
|
// ---------------------------------------------------------------------------
|
|
@@ -25,6 +26,15 @@ export function createChatRouter(options) {
|
|
|
25
26
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion -- validated by Zod middleware
|
|
26
27
|
const body = req.body;
|
|
27
28
|
const auth = getAuthContext(res);
|
|
29
|
+
const { scopeId, scopeContext } = resolveScope(body, auth);
|
|
30
|
+
// Reject if the agent requires a scope but none was provided
|
|
31
|
+
const bundleConfig = options.bundleResolver.staticBundle?.config;
|
|
32
|
+
if (bundleConfig?.scope?.requireScope === true && scopeId === '') {
|
|
33
|
+
res.status(400).json({
|
|
34
|
+
error: { code: 'scope_required', message: 'This agent requires a scope_id.' },
|
|
35
|
+
});
|
|
36
|
+
return;
|
|
37
|
+
}
|
|
28
38
|
const { session, toolContextFactory } = await resolveSession(body.session_id, {
|
|
29
39
|
sessionManager: options.sessionManager,
|
|
30
40
|
bundleResolver: options.bundleResolver,
|
|
@@ -34,6 +44,8 @@ export function createChatRouter(options) {
|
|
|
34
44
|
auth,
|
|
35
45
|
maxSessionTokens: body.max_session_tokens,
|
|
36
46
|
pinnedModel: body.model,
|
|
47
|
+
scopeId,
|
|
48
|
+
scopeContext,
|
|
37
49
|
});
|
|
38
50
|
const controller = new AbortController();
|
|
39
51
|
res.on('close', () => controller.abort());
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../../src/routes/chat.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH;;;;;GAKG;AAEH,OAAO,EAAC,MAAM,EAAC,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAC,iBAAiB,EAAE,YAAY,EAAC,MAAM,aAAa,CAAC;AAE5D,OAAO,EAAC,QAAQ,EAAC,MAAM,qCAAqC,CAAC;AAC7D,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAIrD,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AAErD,OAAO,EAAC,YAAY,EAAE,YAAY,EAAE,cAAc,EAAE,iBAAiB,EAAC,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"chat.js","sourceRoot":"","sources":["../../../src/routes/chat.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ import type { ToolContext } from '../tools/types.js';
|
|
|
19
19
|
import type { SessionComponents, SessionType } from '../session/session-builder.js';
|
|
20
20
|
import type { AuthContext } from '../middleware/auth.js';
|
|
21
21
|
import type { Logger } from '../logger.js';
|
|
22
|
+
import type { CredentialResolver } from '../credentials.js';
|
|
22
23
|
/** How the route resolves an AgentBundle for a given request. */
|
|
23
24
|
export interface BundleResolver {
|
|
24
25
|
/** Static bundle for local dev (used when no deploy_id is provided). */
|
|
@@ -37,6 +38,12 @@ export interface SharedResources {
|
|
|
37
38
|
memoryDb?: NodePgDatabase<Record<string, unknown>>;
|
|
38
39
|
/** Application ID for tenant scoping (defaults to 'local' in dev). */
|
|
39
40
|
appId?: string;
|
|
41
|
+
/**
|
|
42
|
+
* Factory that builds a CredentialResolver for a given scopeId.
|
|
43
|
+
* Used by connection loading to resolve scope:KEY references at session time.
|
|
44
|
+
* If not provided, only env:KEY and literal values are resolved.
|
|
45
|
+
*/
|
|
46
|
+
buildCredentialResolver?: (scopeId: string | undefined) => CredentialResolver;
|
|
40
47
|
}
|
|
41
48
|
/** Result of session resolution — includes the tool context factory for wiring into runMessage. */
|
|
42
49
|
export interface ResolvedSession {
|
|
@@ -70,6 +77,10 @@ export interface ResolveSessionOptions {
|
|
|
70
77
|
auth?: AuthContext;
|
|
71
78
|
bundle: AgentBundle;
|
|
72
79
|
}) => SessionComponents | Promise<SessionComponents>;
|
|
80
|
+
/** Scope ID for per-user session isolation. Empty string means agent-level. */
|
|
81
|
+
scopeId?: string;
|
|
82
|
+
/** Additional scope context from JWT claims or request body. */
|
|
83
|
+
scopeContext?: Record<string, string>;
|
|
73
84
|
}
|
|
74
85
|
/**
|
|
75
86
|
* Resolve an AgentBundle from the bundle resolver.
|
|
@@ -29,9 +29,10 @@ async function buildComponents(bundle, shared, opts) {
|
|
|
29
29
|
let memoryContent;
|
|
30
30
|
const memoryDb = shared.memoryDb;
|
|
31
31
|
if (bundle.config.memory?.enabled && memoryDb) {
|
|
32
|
-
memoryContent = await loadMemoryContent(memoryDb, shared.appId ?? 'local');
|
|
33
|
-
shared.logger.info('memory_loaded', { contentLength: memoryContent.length });
|
|
32
|
+
memoryContent = await loadMemoryContent(memoryDb, shared.appId ?? 'local', opts.scopeId ?? '');
|
|
33
|
+
shared.logger.info('memory_loaded', { contentLength: memoryContent.length, scopeId: opts.scopeId ?? '' });
|
|
34
34
|
}
|
|
35
|
+
const credentialResolver = shared.buildCredentialResolver?.(opts.scopeId);
|
|
35
36
|
return buildSessionComponents({
|
|
36
37
|
bundle,
|
|
37
38
|
storeBackend: shared.storeBackend,
|
|
@@ -45,6 +46,9 @@ async function buildComponents(bundle, shared, opts) {
|
|
|
45
46
|
memoryContent: memoryContent || undefined,
|
|
46
47
|
memoryDb,
|
|
47
48
|
appId: shared.appId,
|
|
49
|
+
scopeId: opts.scopeId,
|
|
50
|
+
scopeContext: opts.scopeContext,
|
|
51
|
+
...(credentialResolver ? { credentialResolver } : {}),
|
|
48
52
|
});
|
|
49
53
|
}
|
|
50
54
|
// ---------------------------------------------------------------------------
|
|
@@ -66,6 +70,7 @@ async function buildComponents(bundle, shared, opts) {
|
|
|
66
70
|
*/
|
|
67
71
|
export async function resolveSession(sessionId, opts) {
|
|
68
72
|
const { sessionManager, bundleResolver, shared, auth } = opts;
|
|
73
|
+
const scopeId = opts.scopeId ?? '';
|
|
69
74
|
// 1. In-memory lookup (existing live session)
|
|
70
75
|
if (sessionId) {
|
|
71
76
|
const existing = sessionManager.get(sessionId);
|
|
@@ -92,20 +97,36 @@ export async function resolveSession(sessionId, opts) {
|
|
|
92
97
|
// Reuse the enhanced prompt from the first call
|
|
93
98
|
return { ...components, systemPrompt: hookResult.systemPrompt };
|
|
94
99
|
}
|
|
100
|
+
// 1b. Scope-based session lookup: if a scopeId is provided but no session_id,
|
|
101
|
+
// look up the latest session for that scope from the store.
|
|
102
|
+
let resolvedSessionId = sessionId;
|
|
103
|
+
if (!resolvedSessionId && scopeId && bundle) {
|
|
104
|
+
const sessionStore = sessionManager.getStore();
|
|
105
|
+
if (sessionStore?.findByScopeId) {
|
|
106
|
+
const found = await sessionStore.findByScopeId(scopeId);
|
|
107
|
+
if (found) {
|
|
108
|
+
resolvedSessionId = found;
|
|
109
|
+
shared.logger.info('session_resolved_by_scope', { scopeId, sessionId: found });
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
95
113
|
// 2. Resume from store (with dedup handled by StandaloneSessionManager)
|
|
96
|
-
if (
|
|
114
|
+
if (resolvedSessionId && bundle) {
|
|
97
115
|
const rawComponents = await buildComponents(bundle, shared, {
|
|
98
116
|
sessionType: opts.sessionType,
|
|
99
|
-
sessionId,
|
|
117
|
+
sessionId: resolvedSessionId,
|
|
100
118
|
pinnedModel: opts.pinnedModel,
|
|
119
|
+
scopeId,
|
|
120
|
+
scopeContext: opts.scopeContext,
|
|
101
121
|
});
|
|
102
122
|
const components = await enhance(rawComponents);
|
|
103
|
-
const resumed = await sessionManager.resume(
|
|
123
|
+
const resumed = await sessionManager.resume(resolvedSessionId, {
|
|
104
124
|
provider: components.provider,
|
|
105
125
|
toolRegistry: components.toolRegistry,
|
|
106
126
|
permissionChecker: components.permissionChecker,
|
|
107
127
|
systemPrompt: components.systemPrompt,
|
|
108
128
|
toolContextFactory: components.toolContextFactory,
|
|
129
|
+
scopeId,
|
|
109
130
|
});
|
|
110
131
|
if (resumed) {
|
|
111
132
|
return { session: resumed, toolContextFactory: components.toolContextFactory };
|
|
@@ -114,13 +135,15 @@ export async function resolveSession(sessionId, opts) {
|
|
|
114
135
|
// 3. Create new session
|
|
115
136
|
if (!bundle) {
|
|
116
137
|
throw new SessionError('No bundle available — provide a deploy_id or configure a static bundle', {
|
|
117
|
-
sessionId:
|
|
138
|
+
sessionId: resolvedSessionId ?? 'new',
|
|
118
139
|
context: { operation: 'resolveSession', deployId: opts.deployId },
|
|
119
140
|
});
|
|
120
141
|
}
|
|
121
142
|
const rawComponents = await buildComponents(bundle, shared, {
|
|
122
143
|
sessionType: opts.sessionType,
|
|
123
144
|
pinnedModel: opts.pinnedModel,
|
|
145
|
+
scopeId,
|
|
146
|
+
scopeContext: opts.scopeContext,
|
|
124
147
|
});
|
|
125
148
|
const components = await enhance(rawComponents);
|
|
126
149
|
const session = sessionManager.create({
|
|
@@ -131,6 +154,7 @@ export async function resolveSession(sessionId, opts) {
|
|
|
131
154
|
toolContextFactory: components.toolContextFactory,
|
|
132
155
|
maxSessionTokens: opts.maxSessionTokens,
|
|
133
156
|
appId: shared.appId,
|
|
157
|
+
scopeId,
|
|
134
158
|
});
|
|
135
159
|
return { session, toolContextFactory: components.toolContextFactory };
|
|
136
160
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-resolver.js","sourceRoot":"","sources":["../../../src/routes/session-resolver.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAiBH,OAAO,EAAC,sBAAsB,EAAC,MAAM,+BAA+B,CAAC;AACrE,OAAO,EAAC,iBAAiB,EAAC,MAAM,yBAAyB,CAAC;AAE1D,OAAO,EAAC,YAAY,EAAC,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"session-resolver.js","sourceRoot":"","sources":["../../../src/routes/session-resolver.ts"],"names":[],"mappings":"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"}
|