@polpo-ai/server 0.15.144 → 0.16.1
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/deps.d.ts +8 -5
- package/dist/deps.d.ts.map +1 -1
- package/dist/deps.js +0 -7
- package/dist/deps.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/routes/agent-revisions.test.d.ts +2 -0
- package/dist/routes/agent-revisions.test.d.ts.map +1 -0
- package/dist/routes/agent-revisions.test.js +118 -0
- package/dist/routes/agent-revisions.test.js.map +1 -0
- package/dist/routes/agents.d.ts +3 -0
- package/dist/routes/agents.d.ts.map +1 -1
- package/dist/routes/agents.js +88 -8
- package/dist/routes/agents.js.map +1 -1
- package/dist/routes/approvals.d.ts.map +1 -1
- package/dist/routes/approvals.js +22 -2
- package/dist/routes/approvals.js.map +1 -1
- package/dist/routes/completions/agent-step-runner.d.ts.map +1 -1
- package/dist/routes/completions/agent-step-runner.js +1 -1
- package/dist/routes/completions/agent-step-runner.js.map +1 -1
- package/dist/routes/completions/agent-step-runner.test.js +3 -1
- package/dist/routes/completions/agent-step-runner.test.js.map +1 -1
- package/dist/routes/completions/chat-handler.d.ts +1 -0
- package/dist/routes/completions/chat-handler.d.ts.map +1 -1
- package/dist/routes/completions/chat-handler.js.map +1 -1
- package/dist/routes/completions/chat-interaction-runtime.d.ts +5 -2
- package/dist/routes/completions/chat-interaction-runtime.d.ts.map +1 -1
- package/dist/routes/completions/chat-interaction-runtime.js +52 -2
- package/dist/routes/completions/chat-interaction-runtime.js.map +1 -1
- package/dist/routes/completions/chat-suggestions.d.ts +3 -1
- package/dist/routes/completions/chat-suggestions.d.ts.map +1 -1
- package/dist/routes/completions/chat-suggestions.js +19 -6
- package/dist/routes/completions/chat-suggestions.js.map +1 -1
- package/dist/routes/completions/chat-suggestions.test.js +26 -0
- package/dist/routes/completions/chat-suggestions.test.js.map +1 -1
- package/dist/routes/completions/chat-via-run-handler.d.ts +2 -0
- package/dist/routes/completions/chat-via-run-handler.d.ts.map +1 -1
- package/dist/routes/completions/chat-via-run-handler.js +7 -1
- package/dist/routes/completions/chat-via-run-handler.js.map +1 -1
- package/dist/routes/completions/conversation-turn.d.ts +3 -1
- package/dist/routes/completions/conversation-turn.d.ts.map +1 -1
- package/dist/routes/completions/conversation-turn.js +32 -10
- package/dist/routes/completions/conversation-turn.js.map +1 -1
- package/dist/routes/completions/project-loop-runner.d.ts +6 -7
- package/dist/routes/completions/project-loop-runner.d.ts.map +1 -1
- package/dist/routes/completions/project-loop-runner.js +57 -8
- package/dist/routes/completions/project-loop-runner.js.map +1 -1
- package/dist/routes/completions/schemas.d.ts +14 -4
- package/dist/routes/completions/schemas.d.ts.map +1 -1
- package/dist/routes/completions/schemas.js +15 -6
- package/dist/routes/completions/schemas.js.map +1 -1
- package/dist/routes/completions/skill-activation-runtime.test.js +1 -1
- package/dist/routes/completions/skill-activation-runtime.test.js.map +1 -1
- package/dist/routes/completions-agent-lifetime.test.d.ts +2 -0
- package/dist/routes/completions-agent-lifetime.test.d.ts.map +1 -0
- package/dist/routes/completions-agent-lifetime.test.js +97 -0
- package/dist/routes/completions-agent-lifetime.test.js.map +1 -0
- package/dist/routes/completions-loop-suggestions.test.d.ts +2 -0
- package/dist/routes/completions-loop-suggestions.test.d.ts.map +1 -0
- package/dist/routes/completions-loop-suggestions.test.js +164 -0
- package/dist/routes/completions-loop-suggestions.test.js.map +1 -0
- package/dist/routes/completions.d.ts +4 -1
- package/dist/routes/completions.d.ts.map +1 -1
- package/dist/routes/completions.js +1 -0
- package/dist/routes/completions.js.map +1 -1
- package/dist/routes/connect-callback.d.ts +5 -0
- package/dist/routes/connect-callback.d.ts.map +1 -0
- package/dist/routes/connect-callback.js +30 -0
- package/dist/routes/connect-callback.js.map +1 -0
- package/dist/routes/connect-callback.test.d.ts +2 -0
- package/dist/routes/connect-callback.test.d.ts.map +1 -0
- package/dist/routes/connect-callback.test.js +52 -0
- package/dist/routes/connect-callback.test.js.map +1 -0
- package/dist/routes/connect.d.ts.map +1 -1
- package/dist/routes/connect.js +161 -5
- package/dist/routes/connect.js.map +1 -1
- package/dist/routes/connect.test.js +171 -2
- package/dist/routes/connect.test.js.map +1 -1
- package/dist/routes/missions.d.ts +3 -2
- package/dist/routes/missions.d.ts.map +1 -1
- package/dist/routes/missions.js +47 -16
- package/dist/routes/missions.js.map +1 -1
- package/dist/routes/missions.test.d.ts +2 -0
- package/dist/routes/missions.test.d.ts.map +1 -0
- package/dist/routes/missions.test.js +88 -0
- package/dist/routes/missions.test.js.map +1 -0
- package/dist/routes/queued-metadata.test.d.ts +2 -0
- package/dist/routes/queued-metadata.test.d.ts.map +1 -0
- package/dist/routes/queued-metadata.test.js +29 -0
- package/dist/routes/queued-metadata.test.js.map +1 -0
- package/dist/routes/task-cancellation.test.d.ts +2 -0
- package/dist/routes/task-cancellation.test.d.ts.map +1 -0
- package/dist/routes/task-cancellation.test.js +58 -0
- package/dist/routes/task-cancellation.test.js.map +1 -0
- package/dist/routes/tasks.d.ts +2 -1
- package/dist/routes/tasks.d.ts.map +1 -1
- package/dist/routes/tasks.js +42 -6
- package/dist/routes/tasks.js.map +1 -1
- package/dist/schemas.d.ts +41 -3
- package/dist/schemas.d.ts.map +1 -1
- package/dist/schemas.js +12 -4
- package/dist/schemas.js.map +1 -1
- package/dist/schemas.test.js +18 -4
- package/dist/schemas.test.js.map +1 -1
- package/package.json +7 -7
|
@@ -0,0 +1,164 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { runDeliveryRoutes } from "./run-delivery.js";
|
|
3
|
+
import { chatRoutes } from "./chat.js";
|
|
4
|
+
import { InMemoryRunEventStore, InMemoryRunExecutionLeaseStore, InMemoryRunCancellationStore } from "@polpo-ai/core/run-delivery";
|
|
5
|
+
import { MockLanguageModelV3 } from "ai/test";
|
|
6
|
+
import { completionRoutes, runConversationTurn } from "./completions.js";
|
|
7
|
+
function fixture() {
|
|
8
|
+
const messages = [{ id: "older", role: "assistant", content: "Your restaurant is called Luna." }];
|
|
9
|
+
const store = {
|
|
10
|
+
getSession: vi.fn(async () => ({ id: "session-1", version: 1 })),
|
|
11
|
+
create: vi.fn(async () => "session-1"),
|
|
12
|
+
getMessages: vi.fn(async () => messages),
|
|
13
|
+
addMessage: vi.fn(async (_session, role, content) => {
|
|
14
|
+
const message = { id: `m${messages.length}`, role, content };
|
|
15
|
+
messages.push(message);
|
|
16
|
+
return message;
|
|
17
|
+
}),
|
|
18
|
+
updateMessage: vi.fn(async (_session, id, content, _tools, suggestions) => {
|
|
19
|
+
Object.assign(messages.find(m => m.id === id), { content, suggestions });
|
|
20
|
+
}),
|
|
21
|
+
};
|
|
22
|
+
const generate = vi.fn(async () => ({
|
|
23
|
+
content: [{ type: "text", text: JSON.stringify({ suggestions: Array.from({ length: 5 }, (_, i) => ({ label: `Idea ${i}`, prompt: `Tell me about option ${i}` })) }) }],
|
|
24
|
+
finishReason: { unified: "stop", raw: undefined },
|
|
25
|
+
usage: { inputTokens: { total: 5 }, outputTokens: { total: 3 } }, warnings: [],
|
|
26
|
+
}));
|
|
27
|
+
const model = new MockLanguageModelV3({ doGenerate: generate });
|
|
28
|
+
const agent = { name: "leo", model: "mock", assignedLoops: ["create-site"], allowedTools: ["build_site"],
|
|
29
|
+
chat: { suggestions: { enabled: true, guidance: "Stay concise" } } };
|
|
30
|
+
const deps = {
|
|
31
|
+
getAgents: async () => [agent], getConfig: () => ({}), getMemoryStore: () => null,
|
|
32
|
+
getSessionStore: () => store, getStore: () => null, emit: () => { }, buildAgentPrompt: () => "",
|
|
33
|
+
resolveAgentModel: vi.fn(async () => ({ model: { id: "mock", provider: "mock", aiModel: model, contextWindow: 10000, maxTokens: 1000 } })),
|
|
34
|
+
resolveAgentTools: async () => ({ tools: [{ name: "build_site", description: "build", inputSchema: { type: "object", properties: {} } }], executor: async () => "Your site is ready" }),
|
|
35
|
+
getProjectLoop: async () => ({ name: "create-site", start: "build", steps: {
|
|
36
|
+
build: { type: "tool", tool: "build_site", saveAs: "site.text", next: "end" },
|
|
37
|
+
}, result: { presentation: { text: { $context: "site.text" } } } }),
|
|
38
|
+
onAuxiliaryModelFinished: vi.fn(),
|
|
39
|
+
};
|
|
40
|
+
const body = { stream: false, agent: "leo", loop: "create-site", messages: [{ role: "user", content: "Create my site" }],
|
|
41
|
+
polpo: { capabilities: { suggestions: { enabled: true, maxItems: 5, guidance: "Site just created", context: { published: false } } } } };
|
|
42
|
+
return { deps, body, agent, store, messages, generate };
|
|
43
|
+
}
|
|
44
|
+
async function post(deps, body) {
|
|
45
|
+
return completionRoutes(() => deps).request("/", { method: "POST", headers: { "content-type": "application/json" }, body: JSON.stringify(body) });
|
|
46
|
+
}
|
|
47
|
+
describe("Loop completion suggestions", () => {
|
|
48
|
+
it.each([false, true])("returns and persists the same five suggestions, stream=%s", async (stream) => {
|
|
49
|
+
const { deps, body, messages, generate, store } = fixture();
|
|
50
|
+
const res = await post(deps, { ...body, stream });
|
|
51
|
+
expect(res.status).toBe(200);
|
|
52
|
+
let suggestions;
|
|
53
|
+
if (stream) {
|
|
54
|
+
const text = await res.text();
|
|
55
|
+
const chunks = text.split("\n").filter(line => line.startsWith("data: ") && !line.includes("[DONE]")).map(line => JSON.parse(line.slice(6)));
|
|
56
|
+
suggestions = chunks.find(chunk => chunk.polpo?.suggestions)?.polpo.suggestions;
|
|
57
|
+
expect(text.indexOf('"suggestions"')).toBeGreaterThan(-1);
|
|
58
|
+
expect(text.indexOf('"suggestions"')).toBeLessThan(text.indexOf('"finish_reason":"stop"'));
|
|
59
|
+
expect(text.indexOf('"suggestions"')).toBeLessThan(text.indexOf("[DONE]"));
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
const json = await res.json();
|
|
63
|
+
expect(json.choices[0].message.content).toBe("Your site is ready");
|
|
64
|
+
suggestions = json.polpo?.suggestions;
|
|
65
|
+
}
|
|
66
|
+
expect(suggestions).toHaveLength(5);
|
|
67
|
+
expect(messages.at(-1)?.suggestions).toEqual(suggestions);
|
|
68
|
+
const history = await chatRoutes(() => ({ sessionStore: store })).request("/sessions/session-1/messages");
|
|
69
|
+
expect(history.status).toBe(200);
|
|
70
|
+
expect((await history.json()).data.messages.at(-1).suggestions).toEqual(suggestions);
|
|
71
|
+
const prompt = JSON.stringify(generate.mock.calls[0]);
|
|
72
|
+
expect(prompt).toContain("Your restaurant is called Luna");
|
|
73
|
+
expect(prompt).toContain("Site just created");
|
|
74
|
+
expect(prompt).toContain("published");
|
|
75
|
+
expect(deps.onAuxiliaryModelFinished).toHaveBeenCalledOnce();
|
|
76
|
+
});
|
|
77
|
+
it("supports the transport-independent runner and the boolean default of three", async () => {
|
|
78
|
+
const { deps, body, messages } = fixture();
|
|
79
|
+
const result = await runConversationTurn(deps, { body: { ...body, polpo: { capabilities: { suggestions: true } } } });
|
|
80
|
+
expect(result.suggestions).toHaveLength(3);
|
|
81
|
+
expect(messages.at(-1).suggestions).toEqual(result.suggestions);
|
|
82
|
+
});
|
|
83
|
+
it.each(["client", "agent", "channel"])("does not resolve an auxiliary model when disabled by %s", async (policy) => {
|
|
84
|
+
const { deps, body, agent, generate } = fixture();
|
|
85
|
+
if (policy === "agent")
|
|
86
|
+
agent.chat.suggestions.enabled = false;
|
|
87
|
+
const result = await runConversationTurn(deps, { body: { ...body,
|
|
88
|
+
...(policy === "client" ? { polpo: { capabilities: { suggestions: false } } } : {}),
|
|
89
|
+
}, ...(policy === "channel" ? { runtime: { surface: "channel", source: "channel" } } : {}) });
|
|
90
|
+
expect(result.suggestions ?? []).toEqual([]);
|
|
91
|
+
expect(generate).not.toHaveBeenCalled();
|
|
92
|
+
expect(deps.resolveAgentModel).not.toHaveBeenCalled();
|
|
93
|
+
});
|
|
94
|
+
it("fails open when model resolution fails", async () => {
|
|
95
|
+
const { deps, body, messages } = fixture();
|
|
96
|
+
deps.resolveAgentModel = vi.fn().mockRejectedValue(new Error("offline"));
|
|
97
|
+
const res = await post(deps, body);
|
|
98
|
+
expect(res.status).toBe(200);
|
|
99
|
+
expect((await res.json()).choices[0].message.content).toBe("Your site is ready");
|
|
100
|
+
expect(messages.at(-1).content).toBe("Your site is ready");
|
|
101
|
+
});
|
|
102
|
+
it.each([{ maxItems: 6 }, { guidance: "x".repeat(501) }, { context: { large: "x".repeat(8193) } }])("rejects invalid request options", async (suggestions) => {
|
|
103
|
+
const { deps, body, generate } = fixture();
|
|
104
|
+
expect((await post(deps, { ...body, polpo: { capabilities: { suggestions } } })).status).toBe(400);
|
|
105
|
+
expect(generate).not.toHaveBeenCalled();
|
|
106
|
+
});
|
|
107
|
+
});
|
|
108
|
+
it("journals suggestions once before DONE for durable replay", async () => {
|
|
109
|
+
const { deps, body, generate, messages } = fixture();
|
|
110
|
+
const scope = { eventStore: new InMemoryRunEventStore(), leaseStore: new InMemoryRunExecutionLeaseStore(),
|
|
111
|
+
cancellationStore: new InMemoryRunCancellationStore(), owner: "test", token: "attempt" };
|
|
112
|
+
deps.createRunDeliveryScope = async () => scope;
|
|
113
|
+
const response = await post(deps, { ...body, stream: true, polpo: {
|
|
114
|
+
...body.polpo, delivery: { onDisconnect: "continue" },
|
|
115
|
+
} });
|
|
116
|
+
const text = await response.text();
|
|
117
|
+
expect(text).toContain('"suggestions"');
|
|
118
|
+
const runId = response.headers.get("x-polpo-run-id");
|
|
119
|
+
const events = (await scope.eventStore.listAfter(runId)).events;
|
|
120
|
+
const suggestionEvent = events.findIndex(event => String(event.data.data).includes('"suggestions"'));
|
|
121
|
+
expect(suggestionEvent).toBeGreaterThan(-1);
|
|
122
|
+
expect(suggestionEvent).toBeLessThan(events.findIndex(event => event.type === "response.done"));
|
|
123
|
+
const frame = JSON.parse(String(events[suggestionEvent].data.data));
|
|
124
|
+
expect(frame.polpo.suggestions).toEqual(messages.at(-1).suggestions);
|
|
125
|
+
const replay = await runDeliveryRoutes(() => ({ resolveRunDelivery: async () => scope })).request(`/${runId}/events`);
|
|
126
|
+
expect(replay.status).toBe(200);
|
|
127
|
+
const replayText = await replay.text();
|
|
128
|
+
expect(replayText).toContain("suggestion_");
|
|
129
|
+
expect(replayText).toContain("run.completed");
|
|
130
|
+
expect(generate).toHaveBeenCalledOnce();
|
|
131
|
+
});
|
|
132
|
+
it("skips suggestions for a failed Loop", async () => {
|
|
133
|
+
const { deps, body, generate } = fixture();
|
|
134
|
+
deps.resolveAgentTools = async () => ({ tools: [], executor: async () => { throw new Error("build failed"); } });
|
|
135
|
+
const response = await post(deps, body);
|
|
136
|
+
expect(await response.text()).not.toContain('"suggestions"');
|
|
137
|
+
expect(generate).not.toHaveBeenCalled();
|
|
138
|
+
});
|
|
139
|
+
it("bounds stalled model resolution and preserves the successful Loop", async () => {
|
|
140
|
+
const { deps, body, messages, generate } = fixture();
|
|
141
|
+
deps.resolveAgentModel = () => new Promise(() => { });
|
|
142
|
+
vi.useFakeTimers();
|
|
143
|
+
try {
|
|
144
|
+
const result = runConversationTurn(deps, { body });
|
|
145
|
+
await vi.advanceTimersByTimeAsync(4_001);
|
|
146
|
+
expect((await result).text).toBe("Your site is ready");
|
|
147
|
+
expect(messages.at(-1).content).toBe("Your site is ready");
|
|
148
|
+
expect(generate).not.toHaveBeenCalled();
|
|
149
|
+
}
|
|
150
|
+
finally {
|
|
151
|
+
vi.useRealTimers();
|
|
152
|
+
}
|
|
153
|
+
});
|
|
154
|
+
it("uses the guarded presentation and excludes conversation after this turn's placeholder", async () => {
|
|
155
|
+
const { deps, body, store, messages, generate } = fixture();
|
|
156
|
+
store.getMessages.mockImplementation(async () => [...messages, { id: "future", role: "user", content: "DO NOT LEAK LATER TURN" }]);
|
|
157
|
+
deps.runOutputPolicy = { streamingMode: "buffer", evaluate: async () => ({ output: "Approved presentation" }) };
|
|
158
|
+
const response = await post(deps, body);
|
|
159
|
+
expect(response.status).toBe(200);
|
|
160
|
+
const prompt = JSON.stringify(generate.mock.calls[0]);
|
|
161
|
+
expect(prompt).not.toContain("DO NOT LEAK LATER TURN");
|
|
162
|
+
expect(prompt).toContain("Approved presentation");
|
|
163
|
+
});
|
|
164
|
+
//# sourceMappingURL=completions-loop-suggestions.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"completions-loop-suggestions.test.js","sourceRoot":"","sources":["../../src/routes/completions-loop-suggestions.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -76,6 +76,9 @@ export interface CompletionRunDeliveryScopeInput {
|
|
|
76
76
|
*/
|
|
77
77
|
export interface CompletionRouteDeps {
|
|
78
78
|
getAgents: () => Promise<any[]>;
|
|
79
|
+
/** Atomically load execution config and creation identity. When provided,
|
|
80
|
+
* absence never falls back to an unversioned lookup. */
|
|
81
|
+
getAgentSnapshot?: import("@polpo-ai/core").VersionedAgentStore["getAgentSnapshot"];
|
|
79
82
|
getConfig: () => any;
|
|
80
83
|
getMemoryStore: () => any;
|
|
81
84
|
getSessionStore: () => any;
|
|
@@ -154,7 +157,7 @@ export interface CompletionRouteDeps {
|
|
|
154
157
|
* tools (e.g. `gateway.tools.perplexitySearch`) which are server-executed
|
|
155
158
|
* by the gateway during `generateText` — Polpo never sees the tool-call.
|
|
156
159
|
* The keys here MUST NOT collide with names in `tools`. */
|
|
157
|
-
resolveAgentTools: (agentConfig: any, runScope?: CompletionToolRunScope, invocation?: ToolInvocationContext) => Promise<{
|
|
160
|
+
resolveAgentTools: (agentConfig: any, runScope?: CompletionToolRunScope, invocation?: ToolInvocationContext, signal?: AbortSignal) => Promise<{
|
|
158
161
|
tools: any[];
|
|
159
162
|
/**
|
|
160
163
|
* Complete runtime tool catalog when `tools` is narrowed for model-facing
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completions.d.ts","sourceRoot":"","sources":["../../src/routes/completions.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"completions.d.ts","sourceRoot":"","sources":["../../src/routes/completions.ts"],"names":[],"mappings":"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"}
|
|
@@ -133,6 +133,7 @@ export function completionRoutes(getDeps, apiKeys) {
|
|
|
133
133
|
body: prepared.body,
|
|
134
134
|
completionId: prepared.completionId,
|
|
135
135
|
agentConfig: prepared.agentConfig,
|
|
136
|
+
agentIdentity: prepared.agentIdentity,
|
|
136
137
|
projectLoop: prepared.projectLoop,
|
|
137
138
|
aiMessages: prepared.aiMessages,
|
|
138
139
|
extraSystemParts: prepared.extraSystemParts,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completions.js","sourceRoot":"","sources":["../../src/routes/completions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAuB3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAKhE,OAAO,EACL,qCAAqC,EACrC,2BAA2B,GAE5B,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EACL,8BAA8B,EAC9B,6BAA6B,EAC7B,oBAAoB,GACrB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,sBAAsB,EACtB,6BAA6B,GAE9B,MAAM,iCAAiC,CAAC;AACzC,OAAO,EACL,0BAA0B,EAC1B,gBAAgB,EAChB,yBAAyB,GAC1B,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,8BAA8B,EAAE,MAAM,oCAAoC,CAAC;AACpF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AASxE,OAAO,EACL,8BAA8B,GAC/B,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAC;AAC5E,OAAO,EACL,qBAAqB,EACrB,iBAAiB,GAElB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EACL,8BAA8B,EAC9B,8BAA8B,EAC9B,mBAAmB,GAIpB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"completions.js","sourceRoot":"","sources":["../../src/routes/completions.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { Hono } from "hono";
|
|
2
|
+
import type { ConnectRouteDeps } from "../deps.js";
|
|
3
|
+
/** Public browser callback only; all setup and management routes remain authenticated. */
|
|
4
|
+
export declare function connectCallbackRoutes(getDeps: () => ConnectRouteDeps): Hono<import("hono/types").BlankEnv, import("hono/types").BlankSchema, "/">;
|
|
5
|
+
//# sourceMappingURL=connect-callback.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connect-callback.d.ts","sourceRoot":"","sources":["../../src/routes/connect-callback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,0FAA0F;AAC1F,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,gBAAgB,8EAsBpE"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { Hono } from "hono";
|
|
2
|
+
import { ConnectError } from "@polpo-ai/connect";
|
|
3
|
+
/** Public browser callback only; all setup and management routes remain authenticated. */
|
|
4
|
+
export function connectCallbackRoutes(getDeps) {
|
|
5
|
+
const app = new Hono();
|
|
6
|
+
app.get("/oauth/callback", async (c) => {
|
|
7
|
+
c.header("Cache-Control", "no-store");
|
|
8
|
+
c.header("Referrer-Policy", "no-referrer");
|
|
9
|
+
c.header("Content-Security-Policy", "default-src 'none'; base-uri 'none'; frame-ancestors 'none'");
|
|
10
|
+
const service = getDeps().connectService;
|
|
11
|
+
if (!service)
|
|
12
|
+
return c.text("Connection setup is unavailable.", 503);
|
|
13
|
+
const state = c.req.query("state"), code = c.req.query("code"), error = c.req.query("error");
|
|
14
|
+
if (!state || state.length > 512 || (code && code.length > 8192) || (error && error.length > 128)) {
|
|
15
|
+
return c.text("Invalid connection callback. Start a new connection setup.", 400);
|
|
16
|
+
}
|
|
17
|
+
try {
|
|
18
|
+
const result = await service.completeOAuthCallback({ state, code, error });
|
|
19
|
+
if (result.returnUrl)
|
|
20
|
+
return c.redirect(result.returnUrl, 303);
|
|
21
|
+
return c.html("<!doctype html><html lang=\"en\"><meta charset=\"utf-8\"><title>Connection complete</title><h1>Connection complete</h1><p>You can return to the application.</p></html>");
|
|
22
|
+
}
|
|
23
|
+
catch (error) {
|
|
24
|
+
const expired = error instanceof ConnectError && error.code === "oauth_state_expired";
|
|
25
|
+
return c.text("Connection setup could not be completed. Return to the application and start again.", expired ? 410 : 400);
|
|
26
|
+
}
|
|
27
|
+
});
|
|
28
|
+
return app;
|
|
29
|
+
}
|
|
30
|
+
//# sourceMappingURL=connect-callback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connect-callback.js","sourceRoot":"","sources":["../../src/routes/connect-callback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAGjD,0FAA0F;AAC1F,MAAM,UAAU,qBAAqB,CAAC,OAA+B;IACnE,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IACvB,GAAG,CAAC,GAAG,CAAC,iBAAiB,EAAE,KAAK,EAAC,CAAC,EAAC,EAAE;QACnC,CAAC,CAAC,MAAM,CAAC,eAAe,EAAE,UAAU,CAAC,CAAC;QACtC,CAAC,CAAC,MAAM,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;QAC3C,CAAC,CAAC,MAAM,CAAC,yBAAyB,EAAE,6DAA6D,CAAC,CAAC;QACnG,MAAM,OAAO,GAAG,OAAO,EAAE,CAAC,cAAc,CAAC;QACzC,IAAI,CAAC,OAAO;YAAE,OAAO,CAAC,CAAC,IAAI,CAAC,kCAAkC,EAAE,GAAG,CAAC,CAAC;QACrE,MAAM,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC7F,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,EAAE,CAAC;YAClG,OAAO,CAAC,CAAC,IAAI,CAAC,4DAA4D,EAAE,GAAG,CAAC,CAAC;QACnF,CAAC;QACD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,qBAAqB,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YAC3E,IAAI,MAAM,CAAC,SAAS;gBAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YAC/D,OAAO,CAAC,CAAC,IAAI,CAAC,yKAAyK,CAAC,CAAC;QAC3L,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,OAAO,GAAG,KAAK,YAAY,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,qBAAqB,CAAC;YACtF,OAAO,CAAC,CAAC,IAAI,CAAC,qFAAqF,EAAE,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QAC5H,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connect-callback.test.d.ts","sourceRoot":"","sources":["../../src/routes/connect-callback.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { createConnectService, MemoryConnectStore, MemoryConnectionSecretStore } from "@polpo-ai/connect-server";
|
|
3
|
+
import { connectCallbackRoutes } from "./connect-callback.js";
|
|
4
|
+
function harness() {
|
|
5
|
+
const store = new MemoryConnectStore();
|
|
6
|
+
const fetch = vi.fn(async () => Response.json({ access_token: "private-test-token", scope: "read" }));
|
|
7
|
+
const service = createConnectService({
|
|
8
|
+
providers: [{ id: "example", name: "Example", auth: {
|
|
9
|
+
type: "oauth2", clientId: "client", authorizationUrl: "https://auth.example/authorize", tokenUrl: "https://auth.example/token", defaultScopes: ["read"],
|
|
10
|
+
}, scopes: [{ id: "read" }] }],
|
|
11
|
+
store, secrets: new MemoryConnectionSecretStore(), fetch, resolveHostname: async () => ["8.8.8.8"],
|
|
12
|
+
});
|
|
13
|
+
return { service, store, fetch, app: connectCallbackRoutes(() => ({ connectService: service })) };
|
|
14
|
+
}
|
|
15
|
+
describe("public OAuth callback", () => {
|
|
16
|
+
it("completes only a valid stored authorization and never exposes the account or token", async () => {
|
|
17
|
+
const { service, app, store } = harness();
|
|
18
|
+
const start = await service.startOAuth({ providerId: "example", redirectUri: "https://host.example/callback" });
|
|
19
|
+
const callback = `/oauth/callback?state=${start.state}&code=test-code&returnUrl=https://attacker.example`;
|
|
20
|
+
const response = await app.request(callback);
|
|
21
|
+
expect(response.status).toBe(200);
|
|
22
|
+
expect(response.headers.get("referrer-policy")).toBe("no-referrer");
|
|
23
|
+
expect(response.headers.get("cache-control")).toBe("no-store");
|
|
24
|
+
const html = await response.text();
|
|
25
|
+
expect(html).toContain("Connection complete");
|
|
26
|
+
expect(html).not.toContain("private-test-token");
|
|
27
|
+
expect(html).not.toContain("conn_");
|
|
28
|
+
expect(response.headers.get("location")).toBeNull();
|
|
29
|
+
expect(await store.listConnections()).toHaveLength(1);
|
|
30
|
+
expect((await app.request(callback)).status).toBe(400);
|
|
31
|
+
});
|
|
32
|
+
it("redirects only to the approved destination stored before provider authorization", async () => {
|
|
33
|
+
const { service, app, store } = harness();
|
|
34
|
+
const start = await service.startOAuth({ providerId: "example", redirectUri: "https://host.example/callback" });
|
|
35
|
+
// Emulate an already-validated setup session's immutable OAuth state.
|
|
36
|
+
const state = await store.getOAuthState(start.state);
|
|
37
|
+
await store.saveOAuthState({ ...state, returnUrl: "https://app.example/connected" });
|
|
38
|
+
const response = await app.request(`/oauth/callback?state=${start.state}&code=test-code&returnUrl=https://attacker.example`);
|
|
39
|
+
expect(response.status).toBe(303);
|
|
40
|
+
expect(response.headers.get("location")).toBe("https://app.example/connected");
|
|
41
|
+
});
|
|
42
|
+
it("does not reflect provider error descriptions or accept an unknown state", async () => {
|
|
43
|
+
const { service, app, fetch } = harness();
|
|
44
|
+
const start = await service.startOAuth({ providerId: "example", redirectUri: "https://host.example/callback" });
|
|
45
|
+
const response = await app.request(`/oauth/callback?state=${start.state}&error=access_denied&error_description=private-provider-error`);
|
|
46
|
+
expect(response.status).toBe(400);
|
|
47
|
+
expect(await response.text()).not.toContain("private-provider-error");
|
|
48
|
+
expect((await app.request("/oauth/callback?state=unknown&code=test")).status).toBe(400);
|
|
49
|
+
expect(fetch).not.toHaveBeenCalled();
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
//# sourceMappingURL=connect-callback.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"connect-callback.test.js","sourceRoot":"","sources":["../../src/routes/connect-callback.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/routes/connect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAkB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../src/routes/connect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAkB,MAAM,mBAAmB,CAAC;AAKhE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAmJnD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,gBAAgB,GAAG,WAAW,CAmb1E"}
|