agent-tower 0.6.0-beta.6 → 0.6.0-beta.7
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/routes/__tests__/system-workspace-context.test.d.ts +2 -0
- package/dist/routes/__tests__/system-workspace-context.test.d.ts.map +1 -0
- package/dist/routes/__tests__/system-workspace-context.test.js +182 -0
- package/dist/routes/__tests__/system-workspace-context.test.js.map +1 -0
- package/dist/routes/system.d.ts.map +1 -1
- package/dist/routes/system.js +29 -12
- package/dist/routes/system.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"system-workspace-context.test.d.ts","sourceRoot":"","sources":["../../../src/routes/__tests__/system-workspace-context.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,182 @@
|
|
|
1
|
+
import Fastify from 'fastify';
|
|
2
|
+
import { beforeEach, describe, expect, it, vi } from 'vitest';
|
|
3
|
+
const { findSession, findWorkspace, findInvocation, findInvocations, } = vi.hoisted(() => ({
|
|
4
|
+
findSession: vi.fn(),
|
|
5
|
+
findWorkspace: vi.fn(),
|
|
6
|
+
findInvocation: vi.fn(),
|
|
7
|
+
findInvocations: vi.fn(),
|
|
8
|
+
}));
|
|
9
|
+
vi.mock('../../utils/index.js', () => ({
|
|
10
|
+
prisma: {
|
|
11
|
+
session: { findUnique: findSession },
|
|
12
|
+
workspace: { findFirst: findWorkspace },
|
|
13
|
+
agentInvocation: {
|
|
14
|
+
findFirst: findInvocation,
|
|
15
|
+
findMany: findInvocations,
|
|
16
|
+
},
|
|
17
|
+
},
|
|
18
|
+
}));
|
|
19
|
+
import { systemRoutes } from '../system.js';
|
|
20
|
+
import { accessAuthHook } from '../../middleware/access-auth.js';
|
|
21
|
+
import { AGENT_API_CREDENTIAL_HEADER, clearAgentApiCredentials, createAgentApiCredential, } from '../../utils/agent-api-credential.js';
|
|
22
|
+
const workspace = {
|
|
23
|
+
id: 'workspace-shared',
|
|
24
|
+
branchName: 'team/main',
|
|
25
|
+
workspaceKind: 'WORKTREE',
|
|
26
|
+
workingDir: '/workspaces/shared',
|
|
27
|
+
worktreePath: '/workspaces/shared',
|
|
28
|
+
task: {
|
|
29
|
+
id: 'task-1',
|
|
30
|
+
title: 'Shared task',
|
|
31
|
+
project: { id: 'project-1', name: 'Project' },
|
|
32
|
+
},
|
|
33
|
+
};
|
|
34
|
+
async function buildTestApp(agentIdentity) {
|
|
35
|
+
const app = Fastify();
|
|
36
|
+
let credential;
|
|
37
|
+
if (agentIdentity) {
|
|
38
|
+
credential = createAgentApiCredential(agentIdentity);
|
|
39
|
+
app.addHook('onRequest', accessAuthHook);
|
|
40
|
+
}
|
|
41
|
+
await app.register(systemRoutes, { prefix: '/api' });
|
|
42
|
+
return { app, credential };
|
|
43
|
+
}
|
|
44
|
+
describe('system workspace context', () => {
|
|
45
|
+
beforeEach(() => {
|
|
46
|
+
findSession.mockReset();
|
|
47
|
+
findWorkspace.mockReset();
|
|
48
|
+
findInvocation.mockReset();
|
|
49
|
+
findInvocations.mockReset();
|
|
50
|
+
clearAgentApiCredentials();
|
|
51
|
+
});
|
|
52
|
+
it('uses the credential-bound invocation when multiple invocations share a workspace', async () => {
|
|
53
|
+
findSession.mockResolvedValue({ workspace });
|
|
54
|
+
findInvocation.mockResolvedValue({
|
|
55
|
+
id: 'invocation-bound',
|
|
56
|
+
teamRunId: 'team-run-1',
|
|
57
|
+
memberId: 'member-bound',
|
|
58
|
+
});
|
|
59
|
+
findInvocations.mockResolvedValue([
|
|
60
|
+
{ id: 'invocation-bound', teamRunId: 'team-run-1', memberId: 'member-bound' },
|
|
61
|
+
{ id: 'invocation-other', teamRunId: 'team-run-1', memberId: 'member-other' },
|
|
62
|
+
]);
|
|
63
|
+
const { app, credential } = await buildTestApp({
|
|
64
|
+
sessionId: 'session-bound',
|
|
65
|
+
invocationId: 'invocation-bound',
|
|
66
|
+
});
|
|
67
|
+
try {
|
|
68
|
+
const response = await app.inject({
|
|
69
|
+
method: 'GET',
|
|
70
|
+
url: '/api/system/workspace-context?path=%2Fworkspaces%2Fshared&sessionId=session-spoofed',
|
|
71
|
+
headers: { [AGENT_API_CREDENTIAL_HEADER]: credential },
|
|
72
|
+
});
|
|
73
|
+
expect(response.statusCode).toBe(200);
|
|
74
|
+
expect(response.json()).toMatchObject({
|
|
75
|
+
workspaceId: 'workspace-shared',
|
|
76
|
+
teamRunId: 'team-run-1',
|
|
77
|
+
memberId: 'member-bound',
|
|
78
|
+
invocationId: 'invocation-bound',
|
|
79
|
+
});
|
|
80
|
+
expect(findSession).toHaveBeenCalledWith(expect.objectContaining({
|
|
81
|
+
where: { id: 'session-bound' },
|
|
82
|
+
}));
|
|
83
|
+
expect(findInvocation).toHaveBeenCalledWith(expect.objectContaining({
|
|
84
|
+
where: {
|
|
85
|
+
id: 'invocation-bound',
|
|
86
|
+
workspaceId: 'workspace-shared',
|
|
87
|
+
sessionId: 'session-bound',
|
|
88
|
+
},
|
|
89
|
+
}));
|
|
90
|
+
expect(findWorkspace).not.toHaveBeenCalled();
|
|
91
|
+
expect(findInvocations).not.toHaveBeenCalled();
|
|
92
|
+
}
|
|
93
|
+
finally {
|
|
94
|
+
await app.close();
|
|
95
|
+
}
|
|
96
|
+
});
|
|
97
|
+
it('does not infer a TeamRun identity for a credential without an invocation', async () => {
|
|
98
|
+
findSession.mockResolvedValue({ workspace });
|
|
99
|
+
findInvocations.mockResolvedValue([
|
|
100
|
+
{ id: 'invocation-other', teamRunId: 'team-run-1', memberId: 'member-other' },
|
|
101
|
+
]);
|
|
102
|
+
const { app, credential } = await buildTestApp({
|
|
103
|
+
sessionId: 'session-solo',
|
|
104
|
+
invocationId: null,
|
|
105
|
+
});
|
|
106
|
+
try {
|
|
107
|
+
const response = await app.inject({
|
|
108
|
+
method: 'GET',
|
|
109
|
+
url: '/api/system/workspace-context?path=%2Fworkspaces%2Fshared',
|
|
110
|
+
headers: { [AGENT_API_CREDENTIAL_HEADER]: credential },
|
|
111
|
+
});
|
|
112
|
+
expect(response.statusCode).toBe(200);
|
|
113
|
+
expect(response.json()).toMatchObject({ workspaceId: 'workspace-shared' });
|
|
114
|
+
expect(response.json()).not.toHaveProperty('teamRunId');
|
|
115
|
+
expect(response.json()).not.toHaveProperty('memberId');
|
|
116
|
+
expect(response.json()).not.toHaveProperty('invocationId');
|
|
117
|
+
expect(findInvocation).not.toHaveBeenCalled();
|
|
118
|
+
expect(findInvocations).not.toHaveBeenCalled();
|
|
119
|
+
}
|
|
120
|
+
finally {
|
|
121
|
+
await app.close();
|
|
122
|
+
}
|
|
123
|
+
});
|
|
124
|
+
it('does not fall back when the credential-bound invocation does not match the workspace', async () => {
|
|
125
|
+
findSession.mockResolvedValue({ workspace });
|
|
126
|
+
findInvocation.mockResolvedValue(null);
|
|
127
|
+
findInvocations.mockResolvedValue([
|
|
128
|
+
{ id: 'invocation-other', teamRunId: 'team-run-1', memberId: 'member-other' },
|
|
129
|
+
]);
|
|
130
|
+
const { app, credential } = await buildTestApp({
|
|
131
|
+
sessionId: 'session-bound',
|
|
132
|
+
invocationId: 'invocation-mismatched',
|
|
133
|
+
});
|
|
134
|
+
try {
|
|
135
|
+
const response = await app.inject({
|
|
136
|
+
method: 'GET',
|
|
137
|
+
url: '/api/system/workspace-context?path=%2Fworkspaces%2Fshared',
|
|
138
|
+
headers: { [AGENT_API_CREDENTIAL_HEADER]: credential },
|
|
139
|
+
});
|
|
140
|
+
expect(response.statusCode).toBe(200);
|
|
141
|
+
expect(response.json()).not.toHaveProperty('teamRunId');
|
|
142
|
+
expect(response.json()).not.toHaveProperty('memberId');
|
|
143
|
+
expect(response.json()).not.toHaveProperty('invocationId');
|
|
144
|
+
expect(findInvocation).toHaveBeenCalledWith(expect.objectContaining({
|
|
145
|
+
where: {
|
|
146
|
+
id: 'invocation-mismatched',
|
|
147
|
+
workspaceId: 'workspace-shared',
|
|
148
|
+
sessionId: 'session-bound',
|
|
149
|
+
},
|
|
150
|
+
}));
|
|
151
|
+
expect(findInvocations).not.toHaveBeenCalled();
|
|
152
|
+
}
|
|
153
|
+
finally {
|
|
154
|
+
await app.close();
|
|
155
|
+
}
|
|
156
|
+
});
|
|
157
|
+
it('keeps cwd inference as a fallback for MCP callers without a bound credential', async () => {
|
|
158
|
+
findWorkspace.mockResolvedValue(workspace);
|
|
159
|
+
findInvocations.mockResolvedValue([
|
|
160
|
+
{ id: 'invocation-only', teamRunId: 'team-run-1', memberId: 'member-only' },
|
|
161
|
+
]);
|
|
162
|
+
const { app } = await buildTestApp();
|
|
163
|
+
try {
|
|
164
|
+
const response = await app.inject({
|
|
165
|
+
method: 'GET',
|
|
166
|
+
url: '/api/system/workspace-context?path=%2Fworkspaces%2Fshared',
|
|
167
|
+
});
|
|
168
|
+
expect(response.statusCode).toBe(200);
|
|
169
|
+
expect(response.json()).toMatchObject({
|
|
170
|
+
workspaceId: 'workspace-shared',
|
|
171
|
+
teamRunId: 'team-run-1',
|
|
172
|
+
memberId: 'member-only',
|
|
173
|
+
invocationId: 'invocation-only',
|
|
174
|
+
});
|
|
175
|
+
expect(findInvocations).toHaveBeenCalledTimes(1);
|
|
176
|
+
}
|
|
177
|
+
finally {
|
|
178
|
+
await app.close();
|
|
179
|
+
}
|
|
180
|
+
});
|
|
181
|
+
});
|
|
182
|
+
//# sourceMappingURL=system-workspace-context.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"system-workspace-context.test.js","sourceRoot":"","sources":["../../../src/routes/__tests__/system-workspace-context.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system.d.ts","sourceRoot":"","sources":["../../src/routes/system.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAU/C,gEAAgE;AAChE,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAyBrG;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"system.d.ts","sourceRoot":"","sources":["../../src/routes/system.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAU/C,gEAAgE;AAChE,wBAAgB,gCAAgC,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAyBrG;AAED,wBAAsB,YAAY,CAAC,GAAG,EAAE,eAAe,iBAqHtD"}
|
package/dist/routes/system.js
CHANGED
|
@@ -93,21 +93,24 @@ export async function systemRoutes(app) {
|
|
|
93
93
|
app.get('/system/mcp-config', async () => {
|
|
94
94
|
return buildMcpConfigResponse();
|
|
95
95
|
});
|
|
96
|
-
// MCP
|
|
96
|
+
// MCP 上下文检测：托管 Agent 使用 credential 绑定身份，手动 MCP 才回退到 query/cwd 推断。
|
|
97
97
|
app.get('/system/workspace-context', async (request, reply) => {
|
|
98
98
|
const { path: cwdPath, sessionId } = request.query;
|
|
99
99
|
if (!cwdPath) {
|
|
100
100
|
reply.code(400);
|
|
101
101
|
return { error: 'path query parameter is required' };
|
|
102
102
|
}
|
|
103
|
-
const
|
|
103
|
+
const agentIdentity = request.agentTowerAgentIdentity;
|
|
104
|
+
const effectiveSessionId = agentIdentity?.sessionId ?? sessionId;
|
|
105
|
+
const workspaceFromSession = effectiveSessionId
|
|
104
106
|
? await prisma.session.findUnique({
|
|
105
|
-
where: { id:
|
|
107
|
+
where: { id: effectiveSessionId },
|
|
106
108
|
include: { workspace: { include: { task: { include: { project: true } } } } },
|
|
107
109
|
})
|
|
108
110
|
: null;
|
|
109
|
-
|
|
110
|
-
|
|
111
|
+
let workspace = workspaceFromSession?.workspace ?? null;
|
|
112
|
+
if (!workspace && !agentIdentity) {
|
|
113
|
+
workspace = await prisma.workspace.findFirst({
|
|
111
114
|
where: {
|
|
112
115
|
status: 'ACTIVE',
|
|
113
116
|
OR: [
|
|
@@ -118,6 +121,7 @@ export async function systemRoutes(app) {
|
|
|
118
121
|
include: { task: { include: { project: true } } },
|
|
119
122
|
orderBy: [{ updatedAt: 'desc' }, { createdAt: 'desc' }],
|
|
120
123
|
});
|
|
124
|
+
}
|
|
121
125
|
if (!workspace) {
|
|
122
126
|
reply.code(404);
|
|
123
127
|
return { error: 'No active workspace found for this path' };
|
|
@@ -131,10 +135,25 @@ export async function systemRoutes(app) {
|
|
|
131
135
|
workspaceBranch: workspace.branchName,
|
|
132
136
|
workspaceKind: workspace.workspaceKind,
|
|
133
137
|
workingDir: workspace.workingDir || workspace.worktreePath,
|
|
134
|
-
...
|
|
138
|
+
...(agentIdentity
|
|
139
|
+
? await resolveBoundTeamRunContext(workspace.id, agentIdentity)
|
|
140
|
+
: await resolveTeamRunContext(workspace.id, sessionId)),
|
|
135
141
|
};
|
|
136
142
|
});
|
|
137
143
|
}
|
|
144
|
+
async function resolveBoundTeamRunContext(workspaceId, identity) {
|
|
145
|
+
if (!identity.invocationId)
|
|
146
|
+
return {};
|
|
147
|
+
const invocation = await prisma.agentInvocation.findFirst({
|
|
148
|
+
where: {
|
|
149
|
+
id: identity.invocationId,
|
|
150
|
+
workspaceId,
|
|
151
|
+
sessionId: identity.sessionId,
|
|
152
|
+
},
|
|
153
|
+
select: { id: true, teamRunId: true, memberId: true },
|
|
154
|
+
});
|
|
155
|
+
return invocation ? toTeamRunContext(invocation) : {};
|
|
156
|
+
}
|
|
138
157
|
async function resolveTeamRunContext(workspaceId, sessionId) {
|
|
139
158
|
if (sessionId) {
|
|
140
159
|
const invocation = await prisma.agentInvocation.findFirst({
|
|
@@ -142,11 +161,7 @@ async function resolveTeamRunContext(workspaceId, sessionId) {
|
|
|
142
161
|
select: { id: true, teamRunId: true, memberId: true },
|
|
143
162
|
});
|
|
144
163
|
if (invocation) {
|
|
145
|
-
return
|
|
146
|
-
teamRunId: invocation.teamRunId,
|
|
147
|
-
memberId: invocation.memberId,
|
|
148
|
-
invocationId: invocation.id,
|
|
149
|
-
};
|
|
164
|
+
return toTeamRunContext(invocation);
|
|
150
165
|
}
|
|
151
166
|
}
|
|
152
167
|
const runningInvocations = await prisma.agentInvocation.findMany({
|
|
@@ -161,7 +176,9 @@ async function resolveTeamRunContext(workspaceId, sessionId) {
|
|
|
161
176
|
if (runningInvocations.length !== 1) {
|
|
162
177
|
return {};
|
|
163
178
|
}
|
|
164
|
-
|
|
179
|
+
return toTeamRunContext(runningInvocations[0]);
|
|
180
|
+
}
|
|
181
|
+
function toTeamRunContext(invocation) {
|
|
165
182
|
return {
|
|
166
183
|
teamRunId: invocation.teamRunId,
|
|
167
184
|
memberId: invocation.memberId,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"system.js","sourceRoot":"","sources":["../../src/routes/system.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"system.js","sourceRoot":"","sources":["../../src/routes/system.ts"],"names":[],"mappings":"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"}
|