psadk 1.3.6 → 1.4.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/CHANGELOG.md +52 -0
- package/README.md +150 -0
- package/build/main/lib/PSAI.d.ts +8 -1
- package/build/main/lib/PSAI.js +128 -75
- package/build/main/lib/PSAgent.js +77 -60
- package/build/main/lib/PSAgentConfig.d.ts +3 -0
- package/build/main/lib/PSAgentLogger.js +12 -9
- package/build/main/lib/PSAgentTask.js +4 -1
- package/build/main/lib/PSAgentTool.js +12 -2
- package/build/main/lib/agent-core/agent-loop.d.ts +23 -0
- package/build/main/lib/agent-core/agent-loop.js +479 -0
- package/build/main/lib/agent-core/agent.d.ts +124 -0
- package/build/main/lib/agent-core/agent.js +402 -0
- package/build/main/lib/agent-core/harness/agent-harness.d.ts +84 -0
- package/build/main/lib/agent-core/harness/agent-harness.js +728 -0
- package/build/main/lib/agent-core/harness/compaction/branch-summarization.d.ts +87 -0
- package/build/main/lib/agent-core/harness/compaction/branch-summarization.js +243 -0
- package/build/main/lib/agent-core/harness/compaction/compaction.d.ts +121 -0
- package/build/main/lib/agent-core/harness/compaction/compaction.js +616 -0
- package/build/main/lib/agent-core/harness/compaction/utils.d.ts +37 -0
- package/build/main/lib/agent-core/harness/compaction/utils.js +153 -0
- package/build/main/lib/agent-core/harness/env/nodejs.d.ts +43 -0
- package/build/main/lib/agent-core/harness/env/nodejs.js +348 -0
- package/build/main/lib/agent-core/harness/execution-env.d.ts +3 -0
- package/build/main/lib/agent-core/harness/execution-env.js +3 -0
- package/build/main/lib/agent-core/harness/messages.d.ts +50 -0
- package/build/main/lib/agent-core/harness/messages.js +102 -0
- package/build/main/lib/agent-core/harness/prompt-templates.d.ts +44 -0
- package/build/main/lib/agent-core/harness/prompt-templates.js +200 -0
- package/build/main/lib/agent-core/harness/session/repo/jsonl.d.ts +19 -0
- package/build/main/lib/agent-core/harness/session/repo/jsonl.js +92 -0
- package/build/main/lib/agent-core/harness/session/repo/memory.d.ts +17 -0
- package/build/main/lib/agent-core/harness/session/repo/memory.js +42 -0
- package/build/main/lib/agent-core/harness/session/repo/shared.d.ts +9 -0
- package/build/main/lib/agent-core/harness/session/repo/shared.js +31 -0
- package/build/main/lib/agent-core/harness/session/session.d.ts +31 -0
- package/build/main/lib/agent-core/harness/session/session.js +196 -0
- package/build/main/lib/agent-core/harness/session/storage/jsonl.d.ts +29 -0
- package/build/main/lib/agent-core/harness/session/storage/jsonl.js +170 -0
- package/build/main/lib/agent-core/harness/session/storage/memory.d.ts +25 -0
- package/build/main/lib/agent-core/harness/session/storage/memory.js +90 -0
- package/build/main/lib/agent-core/harness/skills.d.ts +40 -0
- package/build/main/lib/agent-core/harness/skills.js +259 -0
- package/build/main/lib/agent-core/harness/system-prompt.d.ts +2 -0
- package/build/main/lib/agent-core/harness/system-prompt.js +30 -0
- package/build/main/lib/agent-core/harness/types.d.ts +524 -0
- package/build/main/lib/agent-core/harness/types.js +16 -0
- package/build/main/lib/agent-core/harness/utils/shell-output.d.ts +13 -0
- package/build/main/lib/agent-core/harness/utils/shell-output.js +97 -0
- package/build/main/lib/agent-core/harness/utils/truncate.d.ts +69 -0
- package/build/main/lib/agent-core/harness/utils/truncate.js +205 -0
- package/build/main/lib/agent-core/index.d.ts +19 -0
- package/build/main/lib/agent-core/index.js +25 -0
- package/build/main/lib/agent-core/package.json +3 -0
- package/build/main/lib/agent-core/proxy.d.ts +68 -0
- package/build/main/lib/agent-core/proxy.js +278 -0
- package/build/main/lib/agent-core/types.d.ts +385 -0
- package/build/main/lib/agent-core/types.js +2 -0
- package/build/main/lib/skills/constants.js +6 -4
- package/build/main/lib/skills/skillParser.js +2 -2
- package/build/main/lib/skills/utils.js +8 -10
- package/build/main/lib/tools/BraveWebSearchTool.js +4 -3
- package/build/main/lib/tools/PSArtifactTool.js +3 -3
- package/build/main/lib/tools/PSClarifyTool.js +3 -2
- package/build/main/lib/tools/PSCommandLineTool.js +8 -7
- package/build/main/lib/tools/PSMemoryTool.js +9 -7
- package/build/main/lib/tools/PSReadFileTool.js +3 -3
- package/build/main/lib/tools/PSSkillTool.js +6 -4
- package/build/main/lib/tools/PSSubAgentTool.js +4 -5
- package/build/main/lib/tools/PSWriteFileTool.js +3 -3
- package/build/main/lib/tools/TodoTool.js +8 -4
- package/build/main/lib/utils/helpers.js +2 -13
- package/build/module/lib/PSAI.d.ts +8 -1
- package/build/module/lib/PSAI.js +115 -81
- package/build/module/lib/PSAgentConfig.d.ts +3 -0
- package/build/module/lib/agent-core/agent-loop.d.ts +23 -0
- package/build/module/lib/agent-core/agent-loop.js +479 -0
- package/build/module/lib/agent-core/agent.d.ts +124 -0
- package/build/module/lib/agent-core/agent.js +402 -0
- package/build/module/lib/agent-core/harness/agent-harness.d.ts +84 -0
- package/build/module/lib/agent-core/harness/agent-harness.js +728 -0
- package/build/module/lib/agent-core/harness/compaction/branch-summarization.d.ts +87 -0
- package/build/module/lib/agent-core/harness/compaction/branch-summarization.js +243 -0
- package/build/module/lib/agent-core/harness/compaction/compaction.d.ts +121 -0
- package/build/module/lib/agent-core/harness/compaction/compaction.js +616 -0
- package/build/module/lib/agent-core/harness/compaction/utils.d.ts +37 -0
- package/build/module/lib/agent-core/harness/compaction/utils.js +153 -0
- package/build/module/lib/agent-core/harness/env/nodejs.d.ts +43 -0
- package/build/module/lib/agent-core/harness/env/nodejs.js +348 -0
- package/build/module/lib/agent-core/harness/execution-env.d.ts +3 -0
- package/build/module/lib/agent-core/harness/execution-env.js +3 -0
- package/build/module/lib/agent-core/harness/messages.d.ts +50 -0
- package/build/module/lib/agent-core/harness/messages.js +102 -0
- package/build/module/lib/agent-core/harness/prompt-templates.d.ts +44 -0
- package/build/module/lib/agent-core/harness/prompt-templates.js +200 -0
- package/build/module/lib/agent-core/harness/session/repo/jsonl.d.ts +19 -0
- package/build/module/lib/agent-core/harness/session/repo/jsonl.js +92 -0
- package/build/module/lib/agent-core/harness/session/repo/memory.d.ts +17 -0
- package/build/module/lib/agent-core/harness/session/repo/memory.js +42 -0
- package/build/module/lib/agent-core/harness/session/repo/shared.d.ts +9 -0
- package/build/module/lib/agent-core/harness/session/repo/shared.js +31 -0
- package/build/module/lib/agent-core/harness/session/session.d.ts +31 -0
- package/build/module/lib/agent-core/harness/session/session.js +196 -0
- package/build/module/lib/agent-core/harness/session/storage/jsonl.d.ts +29 -0
- package/build/module/lib/agent-core/harness/session/storage/jsonl.js +170 -0
- package/build/module/lib/agent-core/harness/session/storage/memory.d.ts +25 -0
- package/build/module/lib/agent-core/harness/session/storage/memory.js +90 -0
- package/build/module/lib/agent-core/harness/skills.d.ts +40 -0
- package/build/module/lib/agent-core/harness/skills.js +259 -0
- package/build/module/lib/agent-core/harness/system-prompt.d.ts +2 -0
- package/build/module/lib/agent-core/harness/system-prompt.js +30 -0
- package/build/module/lib/agent-core/harness/types.d.ts +524 -0
- package/build/module/lib/agent-core/harness/types.js +16 -0
- package/build/module/lib/agent-core/harness/utils/shell-output.d.ts +13 -0
- package/build/module/lib/agent-core/harness/utils/shell-output.js +97 -0
- package/build/module/lib/agent-core/harness/utils/truncate.d.ts +69 -0
- package/build/module/lib/agent-core/harness/utils/truncate.js +205 -0
- package/build/module/lib/agent-core/index.d.ts +19 -0
- package/build/module/lib/agent-core/index.js +25 -0
- package/build/module/lib/agent-core/proxy.d.ts +68 -0
- package/build/module/lib/agent-core/proxy.js +278 -0
- package/build/module/lib/agent-core/types.d.ts +385 -0
- package/build/module/lib/agent-core/types.js +2 -0
- package/build/module/lib/tools/PSSkillTool.js +1 -1
- package/package.json +20 -3
package/build/module/lib/PSAI.js
CHANGED
|
@@ -21,6 +21,14 @@ const existingToken = {
|
|
|
21
21
|
expires: new Date(0),
|
|
22
22
|
service_expires: new Date(0),
|
|
23
23
|
};
|
|
24
|
+
function updateExistingToken(accessToken, refreshToken) {
|
|
25
|
+
const accessPayload = jwt_1.JwtUtils.decode(accessToken);
|
|
26
|
+
const refreshPayload = jwt_1.JwtUtils.decode(refreshToken);
|
|
27
|
+
existingToken.service_token = accessToken;
|
|
28
|
+
existingToken.refresh_token = refreshToken;
|
|
29
|
+
existingToken.expires = new Date(refreshPayload?.exp * 1000);
|
|
30
|
+
existingToken.service_expires = new Date(accessPayload?.exp * 1000);
|
|
31
|
+
}
|
|
24
32
|
// export default class AIHelper implements EmbeddingsInterface{
|
|
25
33
|
class PSAI {
|
|
26
34
|
token;
|
|
@@ -28,10 +36,12 @@ class PSAI {
|
|
|
28
36
|
baseUrl;
|
|
29
37
|
log;
|
|
30
38
|
clientid;
|
|
31
|
-
|
|
39
|
+
appToken;
|
|
40
|
+
constructor(token, baseUrl, log, appToken) {
|
|
32
41
|
this.token = token;
|
|
33
42
|
this.baseUrl = baseUrl || process.env.PS_API_URL || '';
|
|
34
43
|
this.clientid = process.env.PS_CLIENT_ID || '';
|
|
44
|
+
this.appToken = appToken;
|
|
35
45
|
this.dimensions = 1536; // default to 1536 dimensions (for text-embedding-3-small)
|
|
36
46
|
this.log = log || new PSAgentLogger_1.PSAgentLogger({ prefix: 'PSAI' });
|
|
37
47
|
}
|
|
@@ -56,6 +66,9 @@ class PSAI {
|
|
|
56
66
|
'Content-Type': 'application/json',
|
|
57
67
|
Authorization: `Bearer ${this.token}`,
|
|
58
68
|
'x-client-id': this.clientid || '',
|
|
69
|
+
...(this.appToken
|
|
70
|
+
? { 'X-App-Authorization': `Bearer ${this.appToken}` }
|
|
71
|
+
: {}),
|
|
59
72
|
},
|
|
60
73
|
body: JSON.stringify({
|
|
61
74
|
input: text,
|
|
@@ -77,6 +90,9 @@ class PSAI {
|
|
|
77
90
|
'Content-Type': 'application/json',
|
|
78
91
|
Authorization: `Bearer ${this.token}`,
|
|
79
92
|
'x-client-id': this.clientid || '',
|
|
93
|
+
...(this.appToken
|
|
94
|
+
? { 'X-App-Authorization': `Bearer ${this.appToken}` }
|
|
95
|
+
: {}),
|
|
80
96
|
},
|
|
81
97
|
body: JSON.stringify({
|
|
82
98
|
input: text,
|
|
@@ -92,38 +108,81 @@ class PSAI {
|
|
|
92
108
|
return data.data.map((item) => item.embedding);
|
|
93
109
|
}
|
|
94
110
|
async getModels() {
|
|
95
|
-
const
|
|
111
|
+
const response = await fetch(apiEndpoints_1.API_ENDPOINTS.LLM_SERVICE(this.baseUrl, '/models'), {
|
|
96
112
|
headers: {
|
|
97
113
|
Authorization: `Bearer ${this.token}`,
|
|
114
|
+
...(this.appToken
|
|
115
|
+
? { 'X-App-Authorization': `Bearer ${this.appToken}` }
|
|
116
|
+
: {}),
|
|
98
117
|
},
|
|
99
118
|
});
|
|
100
|
-
if (!
|
|
101
|
-
this.log.error(`Failed to fetch LLM models: ${
|
|
119
|
+
if (!response.ok) {
|
|
120
|
+
this.log.error(`Failed to fetch LLM models: ${response.status} ${response.statusText}`);
|
|
102
121
|
}
|
|
103
|
-
const { data: models } = (await
|
|
122
|
+
const { data: models } = (await response.json());
|
|
104
123
|
return models;
|
|
105
124
|
}
|
|
125
|
+
prepareMessages(prompt, systemmsg, llm_config) {
|
|
126
|
+
const messages = [];
|
|
127
|
+
const enableCaching = llm_config?.enable_prompt_caching ?? false;
|
|
128
|
+
const cacheSystemPrompt = llm_config?.cache_system_prompt ?? true;
|
|
129
|
+
if (enableCaching && cacheSystemPrompt) {
|
|
130
|
+
messages.push({
|
|
131
|
+
role: 'system',
|
|
132
|
+
content: [
|
|
133
|
+
{
|
|
134
|
+
type: 'text',
|
|
135
|
+
text: systemmsg,
|
|
136
|
+
cache_control: { type: 'ephemeral' },
|
|
137
|
+
},
|
|
138
|
+
],
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
else {
|
|
142
|
+
messages.push({ role: 'system', content: systemmsg });
|
|
143
|
+
}
|
|
144
|
+
messages.push({ role: 'user', content: prompt });
|
|
145
|
+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
146
|
+
const { enable_prompt_caching, cache_system_prompt, ...apiConfig } = llm_config || {};
|
|
147
|
+
return { messages, apiConfig };
|
|
148
|
+
}
|
|
149
|
+
buildRequest(model, prompt, systemmsg, llm_config, stream) {
|
|
150
|
+
// TO-DO : this condition is a temporary workaround until all models support the /responses endpoint. We can remove this once all models are supported.
|
|
151
|
+
if (model.includes('codex')) {
|
|
152
|
+
const { max_tokens, temperature, top_p } = llm_config ?? {};
|
|
153
|
+
return {
|
|
154
|
+
endpoint: '/responses',
|
|
155
|
+
body: JSON.stringify({
|
|
156
|
+
model,
|
|
157
|
+
input: prompt,
|
|
158
|
+
instructions: systemmsg,
|
|
159
|
+
stream,
|
|
160
|
+
...(max_tokens !== undefined && { max_output_tokens: max_tokens }),
|
|
161
|
+
...(temperature !== undefined && { temperature }),
|
|
162
|
+
...(top_p !== undefined && { top_p }),
|
|
163
|
+
}),
|
|
164
|
+
};
|
|
165
|
+
}
|
|
166
|
+
const { messages, apiConfig } = this.prepareMessages(prompt, systemmsg, llm_config);
|
|
167
|
+
return {
|
|
168
|
+
endpoint: '/chat/completions',
|
|
169
|
+
body: JSON.stringify({ model, messages, stream, ...apiConfig }),
|
|
170
|
+
};
|
|
171
|
+
}
|
|
106
172
|
async llm(prompt, model = 'o3-mini', systemmsg = 'You are a helpful assistant. Answer as concisely as possible.', llm_config) {
|
|
107
173
|
const log = this.log;
|
|
108
174
|
try {
|
|
109
|
-
const
|
|
175
|
+
const { endpoint, body } = this.buildRequest(model, prompt, systemmsg, llm_config, false);
|
|
176
|
+
const res = await fetch(apiEndpoints_1.API_ENDPOINTS.LLM_SERVICE(this.baseUrl, endpoint), {
|
|
110
177
|
method: 'POST',
|
|
111
178
|
headers: {
|
|
112
179
|
'Content-Type': 'application/json',
|
|
113
180
|
Authorization: `Bearer ${this.token}`,
|
|
181
|
+
...(this.appToken
|
|
182
|
+
? { 'X-App-Authorization': `Bearer ${this.appToken}` }
|
|
183
|
+
: {}),
|
|
114
184
|
},
|
|
115
|
-
body
|
|
116
|
-
model,
|
|
117
|
-
messages: [
|
|
118
|
-
{ role: 'system', content: systemmsg },
|
|
119
|
-
{ role: 'user', content: prompt },
|
|
120
|
-
],
|
|
121
|
-
...(llm_config || {}),
|
|
122
|
-
prompt_cache_key: model.includes('gpt-5')
|
|
123
|
-
? `cache_${model}_${Buffer.from(prompt).toString('base64')}`
|
|
124
|
-
: undefined,
|
|
125
|
-
prompt_cache_retention: model.includes('gpt-5') ? '24h' : undefined,
|
|
126
|
-
}),
|
|
185
|
+
body,
|
|
127
186
|
retries: 3,
|
|
128
187
|
retryOn: function (attempt, error, response) {
|
|
129
188
|
// retry on any network error, or 4xx or 5xx status codes
|
|
@@ -159,21 +218,17 @@ class PSAI {
|
|
|
159
218
|
async llmStream(prompt, model = 'o3-mini', systemmsg = 'You are a helpful assistant. Answer as concisely as possible.', llm_config) {
|
|
160
219
|
const log = this.log;
|
|
161
220
|
try {
|
|
162
|
-
const
|
|
221
|
+
const { endpoint, body } = this.buildRequest(model, prompt, systemmsg, llm_config, true);
|
|
222
|
+
const res = await fetch(apiEndpoints_1.API_ENDPOINTS.LLM_SERVICE(this.baseUrl, endpoint), {
|
|
163
223
|
method: 'POST',
|
|
164
224
|
headers: {
|
|
165
225
|
'Content-Type': 'application/json',
|
|
166
226
|
Authorization: `Bearer ${this.token}`,
|
|
227
|
+
...(this.appToken
|
|
228
|
+
? { 'X-App-Authorization': `Bearer ${this.appToken}` }
|
|
229
|
+
: {}),
|
|
167
230
|
},
|
|
168
|
-
body
|
|
169
|
-
model,
|
|
170
|
-
messages: [
|
|
171
|
-
{ role: 'system', content: systemmsg },
|
|
172
|
-
{ role: 'user', content: prompt },
|
|
173
|
-
],
|
|
174
|
-
stream: true,
|
|
175
|
-
...(llm_config || {}),
|
|
176
|
-
}),
|
|
231
|
+
body,
|
|
177
232
|
retries: 3,
|
|
178
233
|
retryOn: function (attempt, error, response) {
|
|
179
234
|
// retry on any network error, or 4xx or 5xx status codes
|
|
@@ -217,53 +272,39 @@ class PSAI {
|
|
|
217
272
|
throw new Error('Missing required environment variables for service token retrieval');
|
|
218
273
|
}
|
|
219
274
|
const currentTime = new Date();
|
|
220
|
-
|
|
221
|
-
if (existingToken &&
|
|
222
|
-
existingToken.
|
|
223
|
-
existingToken.service_expires.getTime() >
|
|
224
|
-
currentTime.getTime() + 20 * 60000) {
|
|
275
|
+
const twentyMinutesFromNow = currentTime.getTime() + 20 * 60000;
|
|
276
|
+
if (existingToken.service_token &&
|
|
277
|
+
existingToken.service_expires.getTime() > twentyMinutesFromNow) {
|
|
225
278
|
return existingToken.service_token;
|
|
226
279
|
}
|
|
227
|
-
const
|
|
228
|
-
if (existingToken
|
|
280
|
+
const basicAuthToken = Buffer.from(`${clientid}:${clientsecret}`).toString('base64');
|
|
281
|
+
if (existingToken.expires > currentTime) {
|
|
229
282
|
dlog.debug(`Found existing refresh token: ${existingToken.refresh_token}`);
|
|
230
|
-
const
|
|
283
|
+
const response = await fetch(apiEndpoints_1.API_ENDPOINTS.AUTH_SERVICE(baseurl, '/refreshtoken', '?client=machine'), {
|
|
231
284
|
headers: {
|
|
232
|
-
Authorization: `Basic ${
|
|
285
|
+
Authorization: `Basic ${basicAuthToken}`,
|
|
233
286
|
'app-key': appkey || '',
|
|
234
287
|
rt: existingToken.refresh_token || '',
|
|
235
288
|
},
|
|
236
289
|
});
|
|
237
|
-
if (
|
|
238
|
-
const { accessToken, refreshToken } = (await
|
|
239
|
-
|
|
240
|
-
const rpayload = jwt_1.JwtUtils.decode(refreshToken);
|
|
241
|
-
existingToken.service_token = accessToken;
|
|
242
|
-
existingToken.refresh_token = refreshToken;
|
|
243
|
-
existingToken.expires = new Date(rpayload?.exp * 1000);
|
|
244
|
-
existingToken.service_expires = new Date(spayload?.exp * 1000);
|
|
290
|
+
if (response.ok) {
|
|
291
|
+
const { accessToken, refreshToken } = (await response.json());
|
|
292
|
+
updateExistingToken(accessToken, refreshToken);
|
|
245
293
|
dlog.debug(`Refreshed service token: expires at ${existingToken.service_expires}`);
|
|
246
294
|
return accessToken;
|
|
247
295
|
}
|
|
248
|
-
|
|
249
|
-
dlog.debug(`Failed to refresh service token, status: ${tres.status}`);
|
|
250
|
-
}
|
|
296
|
+
dlog.debug(`Failed to refresh service token, status: ${response.status}`);
|
|
251
297
|
}
|
|
252
|
-
const
|
|
298
|
+
const response = await fetch(apiEndpoints_1.API_ENDPOINTS.AUTH_SERVICE(baseurl, '/login', '?client=machine&source=custom'), {
|
|
253
299
|
headers: {
|
|
254
|
-
Authorization: `Basic ${
|
|
300
|
+
Authorization: `Basic ${basicAuthToken}`,
|
|
255
301
|
'app-key': appkey || '',
|
|
256
302
|
},
|
|
257
303
|
});
|
|
258
|
-
const { serviceToken, refreshToken } = (await
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
dlog.debug(`
|
|
262
|
-
dlog.debug(`refresh token expires: ${JSON.stringify(new Date(rpayload?.exp * 1000))}`);
|
|
263
|
-
existingToken.service_token = serviceToken;
|
|
264
|
-
existingToken.refresh_token = refreshToken;
|
|
265
|
-
existingToken.expires = new Date(rpayload?.exp * 1000);
|
|
266
|
-
existingToken.service_expires = new Date(spayload?.exp * 1000);
|
|
304
|
+
const { serviceToken, refreshToken } = (await response.json());
|
|
305
|
+
updateExistingToken(serviceToken, refreshToken);
|
|
306
|
+
dlog.debug(`service token expires: ${existingToken.service_expires}`);
|
|
307
|
+
dlog.debug(`refresh token expires: ${existingToken.expires}`);
|
|
267
308
|
return serviceToken;
|
|
268
309
|
}
|
|
269
310
|
/**
|
|
@@ -311,18 +352,18 @@ class PSAI {
|
|
|
311
352
|
.send('Authentication successful! You can close this window.');
|
|
312
353
|
});
|
|
313
354
|
router.get('/login', async (_req, res) => {
|
|
314
|
-
const
|
|
315
|
-
const loginUrl = `${baseurl}/api/v2/auth/login?client=desktop&redirect_url=${
|
|
316
|
-
const
|
|
355
|
+
const redirectUrl = encodeURIComponent('http://localhost:3133/callback');
|
|
356
|
+
const loginUrl = `${baseurl}/api/v2/auth/login?client=desktop&redirect_url=${redirectUrl}`;
|
|
357
|
+
const loginResponse = await fetch(loginUrl, {
|
|
317
358
|
headers: { 'app-key': appkey || '' },
|
|
318
359
|
});
|
|
319
|
-
if (
|
|
320
|
-
dlog.error(`Failed to initiate login: ${
|
|
321
|
-
callBackError = `Failed to initiate login: ${
|
|
360
|
+
if (loginResponse.status >= 400) {
|
|
361
|
+
dlog.error(`Failed to initiate login: ${loginResponse.status} ${loginResponse.statusText}`);
|
|
362
|
+
callBackError = `Failed to initiate login: ${loginResponse.status} ${loginResponse.statusText}`;
|
|
322
363
|
isCallbackFinished = true;
|
|
323
364
|
return res.status(500).send('Failed to initiate login');
|
|
324
365
|
}
|
|
325
|
-
const data =
|
|
366
|
+
const data = loginResponse.body;
|
|
326
367
|
if (!data) {
|
|
327
368
|
dlog.error('No response body from login initiation');
|
|
328
369
|
callBackError = 'No response body from login initiation';
|
|
@@ -331,14 +372,14 @@ class PSAI {
|
|
|
331
372
|
}
|
|
332
373
|
const reader = data.getReader();
|
|
333
374
|
const decoder = new TextDecoder('utf-8');
|
|
334
|
-
let
|
|
375
|
+
let responseText = '';
|
|
335
376
|
while (true) {
|
|
336
377
|
const { done, value } = await reader.read();
|
|
337
378
|
if (done)
|
|
338
379
|
break;
|
|
339
|
-
|
|
380
|
+
responseText += decoder.decode(value);
|
|
340
381
|
}
|
|
341
|
-
if (!
|
|
382
|
+
if (!responseText) {
|
|
342
383
|
dlog.error('Empty response body from login initiation');
|
|
343
384
|
callBackError = 'Empty response body from login initiation';
|
|
344
385
|
isCallbackFinished = true;
|
|
@@ -347,7 +388,7 @@ class PSAI {
|
|
|
347
388
|
.send('Empty response body from login initiation');
|
|
348
389
|
}
|
|
349
390
|
dlog.debug('Redirecting to authentication provider');
|
|
350
|
-
return res.redirect(
|
|
391
|
+
return res.redirect(responseText);
|
|
351
392
|
});
|
|
352
393
|
app.use('', router);
|
|
353
394
|
app
|
|
@@ -421,12 +462,11 @@ class PSAI {
|
|
|
421
462
|
const model = req.params.modelid || 'o3-mini';
|
|
422
463
|
try {
|
|
423
464
|
let apiurl = baseapiurl || process.env.PS_API_URL;
|
|
424
|
-
//remove trailing slash
|
|
425
465
|
if (apiurl?.endsWith('/')) {
|
|
426
466
|
apiurl = apiurl.slice(0, -1);
|
|
427
467
|
}
|
|
428
468
|
log.debug(`Proxying ${model} to ${apiurl}`);
|
|
429
|
-
const
|
|
469
|
+
const proxyResponse = await fetch(`${apiurl}/api/v1/llm/chat/completions`, {
|
|
430
470
|
method: 'POST',
|
|
431
471
|
mode: 'no-cors',
|
|
432
472
|
headers: callheaders,
|
|
@@ -435,20 +475,14 @@ class PSAI {
|
|
|
435
475
|
...req.body,
|
|
436
476
|
}),
|
|
437
477
|
});
|
|
438
|
-
|
|
439
|
-
// const data = await lres.json();
|
|
440
|
-
// log.error(`LLM proxy error: ${lres.status} ${lres.statusText}`, data);
|
|
441
|
-
// return res.status(lres.status).json(data);
|
|
442
|
-
// }
|
|
443
|
-
//pipe the lres response to res
|
|
444
|
-
const data = lres.body;
|
|
478
|
+
const data = proxyResponse.body;
|
|
445
479
|
if (!data) {
|
|
446
480
|
log.error('No response body from LLM proxy');
|
|
447
481
|
return res
|
|
448
482
|
.status(500)
|
|
449
483
|
.json({ error: 'No response body from LLM proxy' });
|
|
450
484
|
}
|
|
451
|
-
res.status(
|
|
485
|
+
res.status(proxyResponse.status);
|
|
452
486
|
const reader = data.getReader();
|
|
453
487
|
const decoder = new TextDecoder('utf-8');
|
|
454
488
|
while (true) {
|
|
@@ -470,4 +504,4 @@ class PSAI {
|
|
|
470
504
|
}
|
|
471
505
|
}
|
|
472
506
|
exports.PSAI = PSAI;
|
|
473
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PSAI.js","sourceRoot":"","sources":["../../../src/lib/PSAI.ts"],"names":[],"mappings":"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"}
|
|
507
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PSAI.js","sourceRoot":"","sources":["../../../src/lib/PSAI.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,9 @@ export interface PSAgentConfig {
|
|
|
17
17
|
temperature?: number;
|
|
18
18
|
top_p?: number;
|
|
19
19
|
verbosity?: 'low' | 'medium' | 'high';
|
|
20
|
+
enable_prompt_caching?: boolean;
|
|
21
|
+
cache_system_prompt?: boolean;
|
|
22
|
+
cache_breakpoints?: number[];
|
|
20
23
|
} & Record<string, any>;
|
|
21
24
|
input_schema?: z.core.JSONSchema.BaseSchema;
|
|
22
25
|
output_schema?: z.core.JSONSchema.BaseSchema;
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Agent loop that works with AgentMessage throughout.
|
|
3
|
+
* Transforms to Message[] only at the LLM call boundary.
|
|
4
|
+
*/
|
|
5
|
+
import { EventStream } from "@earendil-works/pi-ai";
|
|
6
|
+
import type { AgentContext, AgentEvent, AgentLoopConfig, AgentMessage, StreamFn } from "./types.js";
|
|
7
|
+
export type AgentEventSink = (event: AgentEvent) => Promise<void> | void;
|
|
8
|
+
/**
|
|
9
|
+
* Start an agent loop with a new prompt message.
|
|
10
|
+
* The prompt is added to the context and events are emitted for it.
|
|
11
|
+
*/
|
|
12
|
+
export declare function agentLoop(prompts: AgentMessage[], context: AgentContext, config: AgentLoopConfig, signal?: AbortSignal, streamFn?: StreamFn): EventStream<AgentEvent, AgentMessage[]>;
|
|
13
|
+
/**
|
|
14
|
+
* Continue an agent loop from the current context without adding a new message.
|
|
15
|
+
* Used for retries - context already has user message or tool results.
|
|
16
|
+
*
|
|
17
|
+
* **Important:** The last message in context must convert to a `user` or `toolResult` message
|
|
18
|
+
* via `convertToLlm`. If it doesn't, the LLM provider will reject the request.
|
|
19
|
+
* This cannot be validated here since `convertToLlm` is only called once per turn.
|
|
20
|
+
*/
|
|
21
|
+
export declare function agentLoopContinue(context: AgentContext, config: AgentLoopConfig, signal?: AbortSignal, streamFn?: StreamFn): EventStream<AgentEvent, AgentMessage[]>;
|
|
22
|
+
export declare function runAgentLoop(prompts: AgentMessage[], context: AgentContext, config: AgentLoopConfig, emit: AgentEventSink, signal?: AbortSignal, streamFn?: StreamFn): Promise<AgentMessage[]>;
|
|
23
|
+
export declare function runAgentLoopContinue(context: AgentContext, config: AgentLoopConfig, emit: AgentEventSink, signal?: AbortSignal, streamFn?: StreamFn): Promise<AgentMessage[]>;
|