visionclaw 0.1.91 → 0.1.92
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 +21 -0
- package/README.md +4 -2
- package/dist/agent/browser-launcher.d.ts.map +1 -1
- package/dist/agent/browser-launcher.js +18 -1
- package/dist/agent/browser-launcher.js.map +1 -1
- package/dist/agent/command-handlers.d.ts +1 -1
- package/dist/agent/command-handlers.d.ts.map +1 -1
- package/dist/agent/command-handlers.js +1 -14
- package/dist/agent/command-handlers.js.map +1 -1
- package/dist/agent/context.js +1 -1
- package/dist/agent/context.js.map +1 -1
- package/dist/agent/interrupt-handler.d.ts +1 -0
- package/dist/agent/interrupt-handler.d.ts.map +1 -1
- package/dist/agent/interrupt-handler.js +22 -2
- package/dist/agent/interrupt-handler.js.map +1 -1
- package/dist/agent/loop.d.ts.map +1 -1
- package/dist/agent/loop.js +2 -1
- package/dist/agent/loop.js.map +1 -1
- package/dist/agent/openai-file-session.d.ts +19 -0
- package/dist/agent/openai-file-session.d.ts.map +1 -0
- package/dist/agent/openai-file-session.js +78 -0
- package/dist/agent/openai-file-session.js.map +1 -0
- package/dist/agent/openai-session.d.ts +50 -0
- package/dist/agent/openai-session.d.ts.map +1 -0
- package/dist/agent/openai-session.js +413 -0
- package/dist/agent/openai-session.js.map +1 -0
- package/dist/agent/openai-tools.d.ts +11 -0
- package/dist/agent/openai-tools.d.ts.map +1 -0
- package/dist/agent/openai-tools.js +167 -0
- package/dist/agent/openai-tools.js.map +1 -0
- package/dist/agent/providers/claude/session.d.ts +134 -0
- package/dist/agent/providers/claude/session.d.ts.map +1 -0
- package/dist/agent/providers/claude/session.js +525 -0
- package/dist/agent/providers/claude/session.js.map +1 -0
- package/dist/agent/providers/client-factory.d.ts +41 -0
- package/dist/agent/providers/client-factory.d.ts.map +1 -0
- package/dist/agent/providers/client-factory.js +190 -0
- package/dist/agent/providers/client-factory.js.map +1 -0
- package/dist/agent/providers/openai/file-session.d.ts +19 -0
- package/dist/agent/providers/openai/file-session.d.ts.map +1 -0
- package/dist/agent/providers/openai/file-session.js +78 -0
- package/dist/agent/providers/openai/file-session.js.map +1 -0
- package/dist/agent/providers/openai/session.d.ts +47 -0
- package/dist/agent/providers/openai/session.d.ts.map +1 -0
- package/dist/agent/providers/openai/session.js +414 -0
- package/dist/agent/providers/openai/session.js.map +1 -0
- package/dist/agent/providers/openai/tools.d.ts +13 -0
- package/dist/agent/providers/openai/tools.d.ts.map +1 -0
- package/dist/agent/providers/openai/tools.js +208 -0
- package/dist/agent/providers/openai/tools.js.map +1 -0
- package/dist/agent/providers/session-types.d.ts +123 -0
- package/dist/agent/providers/session-types.d.ts.map +1 -0
- package/dist/agent/providers/session-types.js +2 -0
- package/dist/agent/providers/session-types.js.map +1 -0
- package/dist/agent/runtime-surface.d.ts +23 -0
- package/dist/agent/runtime-surface.d.ts.map +1 -0
- package/dist/agent/runtime-surface.js +48 -0
- package/dist/agent/runtime-surface.js.map +1 -0
- package/dist/agent/session-types.d.ts +111 -0
- package/dist/agent/session-types.d.ts.map +1 -0
- package/dist/agent/session-types.js +2 -0
- package/dist/agent/session-types.js.map +1 -0
- package/dist/agent/status.d.ts.map +1 -1
- package/dist/agent/status.js +0 -7
- package/dist/agent/status.js.map +1 -1
- package/dist/agent/system-prompt.js +1 -1
- package/dist/agent/system-prompt.js.map +1 -1
- package/dist/builtin-skills/macos-automation/SKILL.md +43 -26
- package/dist/builtin-skills/visionclaw-manual/SKILL.md +3 -3
- package/dist/calendar/google-calendar.d.ts.map +1 -1
- package/dist/calendar/google-calendar.js +3 -1
- package/dist/calendar/google-calendar.js.map +1 -1
- package/dist/channels/interface.d.ts +0 -10
- package/dist/channels/interface.d.ts.map +1 -1
- package/dist/channels/manager.d.ts.map +1 -1
- package/dist/channels/manager.js +0 -3
- package/dist/channels/manager.js.map +1 -1
- package/dist/channels/telegram.d.ts.map +1 -1
- package/dist/channels/telegram.js +0 -13
- package/dist/channels/telegram.js.map +1 -1
- package/dist/config/types.d.ts +5 -5
- package/dist/config/types.d.ts.map +1 -1
- package/dist/config/types.js +15 -6
- package/dist/config/types.js.map +1 -1
- package/dist/drive/google-drive.d.ts.map +1 -1
- package/dist/drive/google-drive.js +3 -1
- package/dist/drive/google-drive.js.map +1 -1
- package/dist/email/gmail-utils.d.ts.map +1 -1
- package/dist/email/gmail-utils.js +3 -1
- package/dist/email/gmail-utils.js.map +1 -1
- package/dist/google/default-oauth-app.d.ts +6 -0
- package/dist/google/default-oauth-app.d.ts.map +1 -0
- package/dist/google/default-oauth-app.js +7 -0
- package/dist/google/default-oauth-app.js.map +1 -0
- package/dist/google/oauth-credentials.d.ts +10 -0
- package/dist/google/oauth-credentials.d.ts.map +1 -0
- package/dist/google/oauth-credentials.js +39 -0
- package/dist/google/oauth-credentials.js.map +1 -0
- package/dist/index.js +19 -3
- package/dist/index.js.map +1 -1
- package/dist/obs/server.js +1 -1
- package/dist/obs/server.js.map +1 -1
- package/dist/obs/tunnel.d.ts.map +1 -1
- package/dist/obs/tunnel.js +18 -2
- package/dist/obs/tunnel.js.map +1 -1
- package/dist/onboarding/google-auth.d.ts +2 -2
- package/dist/onboarding/google-auth.d.ts.map +1 -1
- package/dist/onboarding/google-auth.js +3 -1
- package/dist/onboarding/google-auth.js.map +1 -1
- package/dist/onboarding/google-cloud-setup.d.ts.map +1 -1
- package/dist/onboarding/google-cloud-setup.js +25 -6
- package/dist/onboarding/google-cloud-setup.js.map +1 -1
- package/dist/onboarding/index.d.ts.map +1 -1
- package/dist/onboarding/index.js +70 -21
- package/dist/onboarding/index.js.map +1 -1
- package/dist/onboarding/onboarding-session.d.ts +1 -0
- package/dist/onboarding/onboarding-session.d.ts.map +1 -1
- package/dist/onboarding/onboarding-session.js +2 -3
- package/dist/onboarding/onboarding-session.js.map +1 -1
- package/dist/onboarding/onboarding-tools.d.ts +0 -1
- package/dist/onboarding/onboarding-tools.d.ts.map +1 -1
- package/dist/onboarding/onboarding-tools.js +0 -6
- package/dist/onboarding/onboarding-tools.js.map +1 -1
- package/dist/onboarding/prepare-windows.d.ts +9 -0
- package/dist/onboarding/prepare-windows.d.ts.map +1 -0
- package/dist/onboarding/prepare-windows.js +250 -0
- package/dist/onboarding/prepare-windows.js.map +1 -0
- package/dist/onboarding/set-owner.js +1 -1
- package/dist/onboarding/set-owner.js.map +1 -1
- package/dist/onboarding/telegram-onboarding.d.ts.map +1 -1
- package/dist/onboarding/telegram-onboarding.js +0 -1
- package/dist/onboarding/telegram-onboarding.js.map +1 -1
- package/dist/onboarding/windows-permissions.d.ts +20 -0
- package/dist/onboarding/windows-permissions.d.ts.map +1 -0
- package/dist/onboarding/windows-permissions.js +195 -0
- package/dist/onboarding/windows-permissions.js.map +1 -0
- package/dist/reconfigure.d.ts.map +1 -1
- package/dist/reconfigure.js +40 -9
- package/dist/reconfigure.js.map +1 -1
- package/dist/tools/computer-use.d.ts +3 -0
- package/dist/tools/computer-use.d.ts.map +1 -1
- package/dist/tools/computer-use.js +43 -11
- package/dist/tools/computer-use.js.map +1 -1
- package/dist/tools/desktop-executor-factory.d.ts +20 -0
- package/dist/tools/desktop-executor-factory.d.ts.map +1 -0
- package/dist/tools/desktop-executor-factory.js +56 -0
- package/dist/tools/desktop-executor-factory.js.map +1 -0
- package/dist/tools/desktop-executor-windows.d.ts +42 -0
- package/dist/tools/desktop-executor-windows.d.ts.map +1 -0
- package/dist/tools/desktop-executor-windows.js +359 -0
- package/dist/tools/desktop-executor-windows.js.map +1 -0
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +2 -1
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/screenshot.d.ts.map +1 -1
- package/dist/tools/screenshot.js +101 -17
- package/dist/tools/screenshot.js.map +1 -1
- package/dist/tools/web-fetch.d.ts +5 -0
- package/dist/tools/web-fetch.d.ts.map +1 -0
- package/dist/tools/web-fetch.js +175 -0
- package/dist/tools/web-fetch.js.map +1 -0
- package/dist/utils/restart.d.ts.map +1 -1
- package/dist/utils/restart.js +7 -2
- package/dist/utils/restart.js.map +1 -1
- package/dist/utils/transcribe.d.ts.map +1 -1
- package/dist/utils/transcribe.js +11 -5
- package/dist/utils/transcribe.js.map +1 -1
- package/dist/utils/version-check.d.ts.map +1 -1
- package/dist/utils/version-check.js +2 -1
- package/dist/utils/version-check.js.map +1 -1
- package/package.json +2 -1
|
@@ -0,0 +1,414 @@
|
|
|
1
|
+
import { Agent, OpenAIResponsesCompactionSession, Runner } from "@openai/agents";
|
|
2
|
+
import { loadSessionId, loadUsageSnapshot, saveSessionId, saveUsageSnapshot } from "../../../config/index.js";
|
|
3
|
+
import { logger } from "../../../logger.js";
|
|
4
|
+
import { configureOpenAIProvider, createOpenAIClient, getModelId } from "../client-factory.js";
|
|
5
|
+
import { OpenAIFileSession } from "./file-session.js";
|
|
6
|
+
import { createOpenAIMcpServers, createOpenAITools } from "./tools.js";
|
|
7
|
+
const MAX_TURNS = 100;
|
|
8
|
+
export class OpenAIAgentSession {
|
|
9
|
+
config;
|
|
10
|
+
buildSystemPrompt;
|
|
11
|
+
runtimeSurface;
|
|
12
|
+
getDualSessionEnabled;
|
|
13
|
+
dynamicMcpServers;
|
|
14
|
+
client;
|
|
15
|
+
runner;
|
|
16
|
+
underlyingSession;
|
|
17
|
+
session;
|
|
18
|
+
abortController = null;
|
|
19
|
+
inputClosed = true;
|
|
20
|
+
stopRequested = false;
|
|
21
|
+
lastUsageSnapshot = null;
|
|
22
|
+
currentRun = null;
|
|
23
|
+
sessionId;
|
|
24
|
+
hasOrphanedInjections = false;
|
|
25
|
+
mode;
|
|
26
|
+
constructor({ config, buildSystemPrompt, runtimeSurface, sessionContext, }) {
|
|
27
|
+
configureOpenAIProvider(config);
|
|
28
|
+
this.config = config;
|
|
29
|
+
this.buildSystemPrompt = buildSystemPrompt;
|
|
30
|
+
this.runtimeSurface = runtimeSurface;
|
|
31
|
+
this.getDualSessionEnabled = sessionContext.getDualSessionEnabled;
|
|
32
|
+
this.dynamicMcpServers = {};
|
|
33
|
+
this.mode = sessionContext.mode;
|
|
34
|
+
this.client = createOpenAIClient(config);
|
|
35
|
+
this.runner = new Runner({ model: getModelId(config) });
|
|
36
|
+
const persistedSessionId = loadSessionId(this.mode);
|
|
37
|
+
this.underlyingSession = new OpenAIFileSession({
|
|
38
|
+
fileName: `openai-session-${this.mode}.json`,
|
|
39
|
+
sessionId: persistedSessionId,
|
|
40
|
+
});
|
|
41
|
+
this.sessionId = this.underlyingSession.getSessionIdSync();
|
|
42
|
+
saveSessionId(this.sessionId, this.mode);
|
|
43
|
+
this.session = new OpenAIResponsesCompactionSession({
|
|
44
|
+
client: this.client,
|
|
45
|
+
underlyingSession: this.underlyingSession,
|
|
46
|
+
model: getModelId(config),
|
|
47
|
+
});
|
|
48
|
+
const persistedUsage = loadUsageSnapshot(this.mode);
|
|
49
|
+
if (persistedUsage) {
|
|
50
|
+
this.lastUsageSnapshot = {
|
|
51
|
+
...persistedUsage,
|
|
52
|
+
capturedAtMs: Date.now(),
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
sendAndStream(content) {
|
|
57
|
+
const input = contentBlocksToInputItems(content);
|
|
58
|
+
this.inputClosed = false;
|
|
59
|
+
this.stopRequested = false;
|
|
60
|
+
this.abortController = new AbortController();
|
|
61
|
+
return this.streamMessages(input, this.sessionId);
|
|
62
|
+
}
|
|
63
|
+
injectMessage(_content) {
|
|
64
|
+
// The OpenAI runner does not support mid-run message injection.
|
|
65
|
+
return false;
|
|
66
|
+
}
|
|
67
|
+
closeInput() {
|
|
68
|
+
this.inputClosed = true;
|
|
69
|
+
}
|
|
70
|
+
requestStop() {
|
|
71
|
+
this.stopRequested = true;
|
|
72
|
+
this.inputClosed = true;
|
|
73
|
+
this.abortController?.abort();
|
|
74
|
+
}
|
|
75
|
+
clearStop() {
|
|
76
|
+
this.stopRequested = false;
|
|
77
|
+
this.abortController = null;
|
|
78
|
+
}
|
|
79
|
+
isStopRequested() {
|
|
80
|
+
return this.stopRequested;
|
|
81
|
+
}
|
|
82
|
+
captureSessionId(id) {
|
|
83
|
+
if (!id) {
|
|
84
|
+
return;
|
|
85
|
+
}
|
|
86
|
+
this.sessionId = id;
|
|
87
|
+
saveSessionId(id, this.mode);
|
|
88
|
+
}
|
|
89
|
+
captureUsageSnapshot(snapshot) {
|
|
90
|
+
if (snapshot.contextWindow <= 0) {
|
|
91
|
+
return;
|
|
92
|
+
}
|
|
93
|
+
this.lastUsageSnapshot = {
|
|
94
|
+
...snapshot,
|
|
95
|
+
capturedAtMs: Date.now(),
|
|
96
|
+
};
|
|
97
|
+
saveUsageSnapshot(snapshot, this.mode);
|
|
98
|
+
}
|
|
99
|
+
capturePostCompactionSnapshot(_postCompactionTokens) {
|
|
100
|
+
// OpenAI compaction is handled by the SDK session decorator.
|
|
101
|
+
}
|
|
102
|
+
async requestCompaction() {
|
|
103
|
+
await this.session.runCompaction({ force: true });
|
|
104
|
+
}
|
|
105
|
+
async maybeCompactByTokens() {
|
|
106
|
+
// Compaction runs inside the OpenAIResponsesCompactionSession decorator.
|
|
107
|
+
}
|
|
108
|
+
getSessionId() {
|
|
109
|
+
return this.sessionId;
|
|
110
|
+
}
|
|
111
|
+
getTranscriptPath() {
|
|
112
|
+
return null;
|
|
113
|
+
}
|
|
114
|
+
getUsageSnapshot() {
|
|
115
|
+
return this.lastUsageSnapshot ? { ...this.lastUsageSnapshot } : null;
|
|
116
|
+
}
|
|
117
|
+
getCurrentQuery() {
|
|
118
|
+
return this.currentRun;
|
|
119
|
+
}
|
|
120
|
+
setDynamicMcpServers(servers) {
|
|
121
|
+
this.dynamicMcpServers = { ...servers };
|
|
122
|
+
}
|
|
123
|
+
getDynamicMcpServers() {
|
|
124
|
+
return { ...this.dynamicMcpServers };
|
|
125
|
+
}
|
|
126
|
+
get isInputClosed() {
|
|
127
|
+
return this.inputClosed;
|
|
128
|
+
}
|
|
129
|
+
async *streamMessages(input, sessionId) {
|
|
130
|
+
const mcpServers = createOpenAIMcpServers({
|
|
131
|
+
...this.runtimeSurface.externalMcpServers,
|
|
132
|
+
...this.dynamicMcpServers,
|
|
133
|
+
});
|
|
134
|
+
try {
|
|
135
|
+
await connectMcpServers(mcpServers);
|
|
136
|
+
const agent = new Agent({
|
|
137
|
+
name: this.mode === "coding" ? `${this.config.agentName} Coding` : this.config.agentName,
|
|
138
|
+
instructions: renderSystemPrompt(this.buildSystemPrompt()),
|
|
139
|
+
model: getModelId(this.config),
|
|
140
|
+
tools: createOpenAITools({
|
|
141
|
+
dualSession: this.getDualSessionEnabled(),
|
|
142
|
+
mode: this.mode,
|
|
143
|
+
runtimeSurface: this.runtimeSurface,
|
|
144
|
+
}),
|
|
145
|
+
mcpServers,
|
|
146
|
+
});
|
|
147
|
+
const stream = await this.runner.run(agent, input, {
|
|
148
|
+
stream: true,
|
|
149
|
+
session: this.session,
|
|
150
|
+
maxTurns: MAX_TURNS,
|
|
151
|
+
signal: this.abortController?.signal,
|
|
152
|
+
});
|
|
153
|
+
this.currentRun = null;
|
|
154
|
+
for await (const event of stream) {
|
|
155
|
+
const normalized = normalizeRunEvent(event, sessionId);
|
|
156
|
+
if (normalized) {
|
|
157
|
+
yield normalized;
|
|
158
|
+
}
|
|
159
|
+
const usage = captureUsageFromEvent(event);
|
|
160
|
+
if (usage) {
|
|
161
|
+
this.captureUsageSnapshot(usage);
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
await stream.completed;
|
|
165
|
+
const result = buildResultMessage(stream, this.config);
|
|
166
|
+
const usage = extractUsageFromStream(stream);
|
|
167
|
+
if (usage) {
|
|
168
|
+
this.captureUsageSnapshot(usage);
|
|
169
|
+
}
|
|
170
|
+
yield result;
|
|
171
|
+
}
|
|
172
|
+
finally {
|
|
173
|
+
this.inputClosed = true;
|
|
174
|
+
this.abortController = null;
|
|
175
|
+
this.currentRun = null;
|
|
176
|
+
await closeMcpServers(mcpServers);
|
|
177
|
+
}
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
function renderSystemPrompt(prompt) {
|
|
181
|
+
if (typeof prompt === "string") {
|
|
182
|
+
return prompt;
|
|
183
|
+
}
|
|
184
|
+
const presetIntro = "You are in a coding-focused session. Prefer careful, multi-step engineering work.";
|
|
185
|
+
return [presetIntro, prompt.append ?? ""].filter(Boolean).join("\n\n");
|
|
186
|
+
}
|
|
187
|
+
function contentBlocksToInputItems(content) {
|
|
188
|
+
const blocks = normalizeInputContent(content);
|
|
189
|
+
return [
|
|
190
|
+
{
|
|
191
|
+
role: "user",
|
|
192
|
+
content: blocks.map((block) => {
|
|
193
|
+
if (block.type === "text") {
|
|
194
|
+
return {
|
|
195
|
+
type: "input_text",
|
|
196
|
+
text: block.text,
|
|
197
|
+
};
|
|
198
|
+
}
|
|
199
|
+
if (block.source.type === "url") {
|
|
200
|
+
return {
|
|
201
|
+
type: "input_image",
|
|
202
|
+
image: block.source.url,
|
|
203
|
+
detail: "original",
|
|
204
|
+
};
|
|
205
|
+
}
|
|
206
|
+
return {
|
|
207
|
+
type: "input_image",
|
|
208
|
+
image: `data:${block.source.media_type};base64,${block.source.data}`,
|
|
209
|
+
detail: "original",
|
|
210
|
+
};
|
|
211
|
+
}),
|
|
212
|
+
},
|
|
213
|
+
];
|
|
214
|
+
}
|
|
215
|
+
function normalizeInputContent(content) {
|
|
216
|
+
if (typeof content === "string") {
|
|
217
|
+
return [{ type: "text", text: content }];
|
|
218
|
+
}
|
|
219
|
+
const blocks = [];
|
|
220
|
+
for (const block of content) {
|
|
221
|
+
if (block.type === "text") {
|
|
222
|
+
blocks.push({ type: "text", text: block.text });
|
|
223
|
+
continue;
|
|
224
|
+
}
|
|
225
|
+
if (block.type === "image") {
|
|
226
|
+
if (block.source.type === "url") {
|
|
227
|
+
blocks.push({ type: "image", source: { type: "url", url: block.source.url } });
|
|
228
|
+
continue;
|
|
229
|
+
}
|
|
230
|
+
blocks.push({
|
|
231
|
+
type: "image",
|
|
232
|
+
source: {
|
|
233
|
+
type: "base64",
|
|
234
|
+
media_type: block.source.media_type,
|
|
235
|
+
data: block.source.data,
|
|
236
|
+
},
|
|
237
|
+
});
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
return blocks;
|
|
241
|
+
}
|
|
242
|
+
function normalizeRunEvent(event, sessionId) {
|
|
243
|
+
if (event.type === "raw_model_stream_event") {
|
|
244
|
+
const data = event.data;
|
|
245
|
+
if (data.type === "output_text_delta" && data.delta) {
|
|
246
|
+
return {
|
|
247
|
+
type: "assistant",
|
|
248
|
+
session_id: sessionId,
|
|
249
|
+
message: {
|
|
250
|
+
role: "assistant",
|
|
251
|
+
content: [{ type: "text", text: data.delta }],
|
|
252
|
+
},
|
|
253
|
+
};
|
|
254
|
+
}
|
|
255
|
+
return null;
|
|
256
|
+
}
|
|
257
|
+
if (event.type !== "run_item_stream_event") {
|
|
258
|
+
return null;
|
|
259
|
+
}
|
|
260
|
+
const raw = event.item.rawItem;
|
|
261
|
+
if (!raw?.type) {
|
|
262
|
+
return null;
|
|
263
|
+
}
|
|
264
|
+
if (event.name === "message_output_created" && raw.type === "message") {
|
|
265
|
+
return null;
|
|
266
|
+
}
|
|
267
|
+
if (event.name === "reasoning_item_created" && raw.type === "reasoning") {
|
|
268
|
+
const text = raw.content
|
|
269
|
+
?.filter((entry) => entry.type === "reasoning_text" && typeof entry.text === "string")
|
|
270
|
+
.map((entry) => entry.text)
|
|
271
|
+
.join(" ");
|
|
272
|
+
if (!text) {
|
|
273
|
+
return null;
|
|
274
|
+
}
|
|
275
|
+
return {
|
|
276
|
+
type: "assistant",
|
|
277
|
+
session_id: sessionId,
|
|
278
|
+
message: {
|
|
279
|
+
role: "assistant",
|
|
280
|
+
content: [{ type: "thinking", thinking: text }],
|
|
281
|
+
},
|
|
282
|
+
};
|
|
283
|
+
}
|
|
284
|
+
if (event.name === "tool_called") {
|
|
285
|
+
if (raw.type === "function_call") {
|
|
286
|
+
return {
|
|
287
|
+
type: "assistant",
|
|
288
|
+
session_id: sessionId,
|
|
289
|
+
message: {
|
|
290
|
+
role: "assistant",
|
|
291
|
+
content: [{
|
|
292
|
+
type: "tool_use",
|
|
293
|
+
id: raw.callId,
|
|
294
|
+
tool_use_id: raw.callId,
|
|
295
|
+
name: raw.name ?? "tool",
|
|
296
|
+
input: parseToolArguments(raw.arguments),
|
|
297
|
+
}],
|
|
298
|
+
},
|
|
299
|
+
};
|
|
300
|
+
}
|
|
301
|
+
if (raw.type === "computer_call") {
|
|
302
|
+
return {
|
|
303
|
+
type: "assistant",
|
|
304
|
+
session_id: sessionId,
|
|
305
|
+
message: {
|
|
306
|
+
role: "assistant",
|
|
307
|
+
content: [{
|
|
308
|
+
type: "tool_use",
|
|
309
|
+
id: raw.callId,
|
|
310
|
+
tool_use_id: raw.callId,
|
|
311
|
+
name: "computer",
|
|
312
|
+
input: raw.action ?? {},
|
|
313
|
+
}],
|
|
314
|
+
},
|
|
315
|
+
};
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
if (event.name === "tool_output") {
|
|
319
|
+
if (raw.type === "function_call_result" || raw.type === "computer_call_result") {
|
|
320
|
+
return {
|
|
321
|
+
type: "user",
|
|
322
|
+
session_id: sessionId,
|
|
323
|
+
parent_tool_use_id: null,
|
|
324
|
+
message: {
|
|
325
|
+
role: "user",
|
|
326
|
+
content: [{
|
|
327
|
+
type: "tool_result",
|
|
328
|
+
tool_use_id: raw.callId ?? "",
|
|
329
|
+
content: raw.output ?? "",
|
|
330
|
+
is_error: false,
|
|
331
|
+
}],
|
|
332
|
+
},
|
|
333
|
+
};
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
return null;
|
|
337
|
+
}
|
|
338
|
+
function parseToolArguments(value) {
|
|
339
|
+
if (!value) {
|
|
340
|
+
return {};
|
|
341
|
+
}
|
|
342
|
+
try {
|
|
343
|
+
return JSON.parse(value);
|
|
344
|
+
}
|
|
345
|
+
catch {
|
|
346
|
+
return value;
|
|
347
|
+
}
|
|
348
|
+
}
|
|
349
|
+
function captureUsageFromEvent(event) {
|
|
350
|
+
if (event.type !== "raw_model_stream_event") {
|
|
351
|
+
return null;
|
|
352
|
+
}
|
|
353
|
+
const data = event.data;
|
|
354
|
+
if (data.type !== "response_done") {
|
|
355
|
+
return null;
|
|
356
|
+
}
|
|
357
|
+
const inputTokens = data.response?.usage?.inputTokens;
|
|
358
|
+
if (typeof inputTokens !== "number") {
|
|
359
|
+
return null;
|
|
360
|
+
}
|
|
361
|
+
return {
|
|
362
|
+
usedInputTokens: inputTokens,
|
|
363
|
+
contextWindow: 0,
|
|
364
|
+
usedPct: 0,
|
|
365
|
+
};
|
|
366
|
+
}
|
|
367
|
+
function extractUsageFromStream(stream) {
|
|
368
|
+
const usage = stream.rawResponses?.at(-1)?.usage;
|
|
369
|
+
if (typeof usage?.inputTokens !== "number") {
|
|
370
|
+
return null;
|
|
371
|
+
}
|
|
372
|
+
return {
|
|
373
|
+
usedInputTokens: usage.inputTokens,
|
|
374
|
+
contextWindow: 0,
|
|
375
|
+
usedPct: 0,
|
|
376
|
+
};
|
|
377
|
+
}
|
|
378
|
+
function buildResultMessage(stream, config) {
|
|
379
|
+
const usage = stream.rawResponses?.at(-1)?.usage;
|
|
380
|
+
const errorText = stream.error instanceof Error
|
|
381
|
+
? stream.error.message
|
|
382
|
+
: stream.error
|
|
383
|
+
? JSON.stringify(stream.error)
|
|
384
|
+
: "";
|
|
385
|
+
return {
|
|
386
|
+
type: "result",
|
|
387
|
+
subtype: errorText ? "error" : "success",
|
|
388
|
+
num_turns: 1,
|
|
389
|
+
usage: {
|
|
390
|
+
input_tokens: usage?.inputTokens ?? 0,
|
|
391
|
+
output_tokens: usage?.outputTokens ?? 0,
|
|
392
|
+
},
|
|
393
|
+
total_cost_usd: 0,
|
|
394
|
+
is_error: Boolean(errorText),
|
|
395
|
+
errors: errorText ? [errorText] : [],
|
|
396
|
+
model: getModelId(config),
|
|
397
|
+
};
|
|
398
|
+
}
|
|
399
|
+
async function connectMcpServers(servers) {
|
|
400
|
+
for (const server of servers) {
|
|
401
|
+
await server.connect();
|
|
402
|
+
}
|
|
403
|
+
}
|
|
404
|
+
async function closeMcpServers(servers) {
|
|
405
|
+
for (const server of servers) {
|
|
406
|
+
try {
|
|
407
|
+
await server.close();
|
|
408
|
+
}
|
|
409
|
+
catch (err) {
|
|
410
|
+
logger.warn(`Failed to close MCP server "${server.name}": ${err instanceof Error ? err.message : String(err)}`);
|
|
411
|
+
}
|
|
412
|
+
}
|
|
413
|
+
}
|
|
414
|
+
//# sourceMappingURL=session.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../src/agent/providers/openai/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,gCAAgC,EAAE,MAAM,EAA4D,MAAM,gBAAgB,CAAC;AAE3I,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE9G,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAE5C,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAC/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAavE,MAAM,SAAS,GAAG,GAAG,CAAC;AAetB,MAAM,OAAO,kBAAkB;IACZ,MAAM,CAAmB;IACzB,iBAAiB,CAA2B;IAC5C,cAAc,CAAiB;IAC/B,qBAAqB,CAAgB;IAC9C,iBAAiB,CAA0C;IAClD,MAAM,CAAqC;IAC3C,MAAM,CAAS;IACf,iBAAiB,CAAoB;IACrC,OAAO,CAAmC;IACnD,eAAe,GAA2B,IAAI,CAAC;IAC/C,WAAW,GAAG,IAAI,CAAC;IACnB,aAAa,GAAG,KAAK,CAAC;IACtB,iBAAiB,GAAyB,IAAI,CAAC;IAC/C,UAAU,GAA4B,IAAI,CAAC;IAC3C,SAAS,CAAS;IACjB,qBAAqB,GAAG,KAAK,CAAC;IAC9B,IAAI,CAAc;IAE3B,YAAY,EACV,MAAM,EACN,iBAAiB,EACjB,cAAc,EACd,cAAc,GACc;QAC5B,uBAAuB,CAAC,MAAM,CAAC,CAAC;QAEhC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC;QAC3C,IAAI,CAAC,cAAc,GAAG,cAAc,CAAC;QACrC,IAAI,CAAC,qBAAqB,GAAG,cAAc,CAAC,qBAAqB,CAAC;QAClE,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI,GAAG,cAAc,CAAC,IAAI,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAkD,CAAC;QAC1F,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAExD,MAAM,kBAAkB,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,iBAAiB,GAAG,IAAI,iBAAiB,CAAC;YAC7C,QAAQ,EAAE,kBAAkB,IAAI,CAAC,IAAI,OAAO;YAC5C,SAAS,EAAE,kBAAkB;SAC9B,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,EAAE,CAAC;QAC3D,aAAa,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QAEzC,IAAI,CAAC,OAAO,GAAG,IAAI,gCAAgC,CAAC;YAClD,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;YACzC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAsC;SAC/D,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC,iBAAiB,GAAG;gBACvB,GAAG,cAAc;gBACjB,YAAY,EAAE,IAAI,CAAC,GAAG,EAAE;aACzB,CAAC;QACJ,CAAC;IACH,CAAC;IAED,aAAa,CAAC,OAAgC;QAC5C,MAAM,KAAK,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAC;QACjD,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;QACzB,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAC7C,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;IAED,aAAa,CAAC,QAAiC;QAC7C,gEAAgE;QAChE,OAAO,KAAK,CAAC;IACf,CAAC;IAED,UAAU;QACR,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;IAC1B,CAAC;IAED,WAAW;QACT,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;QAC1B,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,eAAe,EAAE,KAAK,EAAE,CAAC;IAChC,CAAC;IAED,SAAS;QACP,IAAI,CAAC,aAAa,GAAG,KAAK,CAAC;QAC3B,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;IAC9B,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,gBAAgB,CAAC,EAAsB;QACrC,IAAI,CAAC,EAAE,EAAE,CAAC;YACR,OAAO;QACT,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,EAAE,CAAC;QACpB,aAAa,CAAC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,oBAAoB,CAAC,QAIpB;QACC,IAAI,QAAQ,CAAC,aAAa,IAAI,CAAC,EAAE,CAAC;YAChC,OAAO;QACT,CAAC;QAED,IAAI,CAAC,iBAAiB,GAAG;YACvB,GAAG,QAAQ;YACX,YAAY,EAAE,IAAI,CAAC,GAAG,EAAE;SACzB,CAAC;QACF,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,6BAA6B,CAAC,qBAA6B;QACzD,6DAA6D;IAC/D,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,oBAAoB;QACxB,yEAAyE;IAC3E,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,iBAAiB;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IAED,gBAAgB;QACd,OAAO,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACvE,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IAED,oBAAoB,CAAC,OAAgD;QACnE,IAAI,CAAC,iBAAiB,GAAG,EAAE,GAAG,OAAO,EAAE,CAAC;IAC1C,CAAC;IAED,oBAAoB;QAClB,OAAO,EAAE,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAAC;IACvC,CAAC;IAED,IAAI,aAAa;QACf,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAEO,KAAK,CAAC,CAAC,cAAc,CAC3B,KAAuB,EACvB,SAAiB;QAEjB,MAAM,UAAU,GAAG,sBAAsB,CAAC;YACxC,GAAG,IAAI,CAAC,cAAc,CAAC,kBAAkB;YACzC,GAAG,IAAI,CAAC,iBAAiB;SAC1B,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,iBAAiB,CAAC,UAAU,CAAC,CAAC;YACpC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;gBACtB,IAAI,EAAE,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,SAAS,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS;gBACxF,YAAY,EAAE,kBAAkB,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAC1D,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC;gBAC9B,KAAK,EAAE,iBAAiB,CAAC;oBACvB,WAAW,EAAE,IAAI,CAAC,qBAAqB,EAAE;oBACzC,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,cAAc,EAAE,IAAI,CAAC,cAAc;iBACpC,CAAC;gBACF,UAAU;aACX,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE;gBACjD,MAAM,EAAE,IAAI;gBACZ,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,QAAQ,EAAE,SAAS;gBACnB,MAAM,EAAE,IAAI,CAAC,eAAe,EAAE,MAAM;aACrC,CAAC,CAAC;YAEH,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YAEvB,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;gBACjC,MAAM,UAAU,GAAG,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;gBACvD,IAAI,UAAU,EAAE,CAAC;oBACf,MAAM,UAAU,CAAC;gBACnB,CAAC;gBAED,MAAM,KAAK,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;gBAC3C,IAAI,KAAK,EAAE,CAAC;oBACV,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;gBACnC,CAAC;YACH,CAAC;YAED,MAAM,MAAM,CAAC,SAAS,CAAC;YAEvB,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;YACvD,MAAM,KAAK,GAAG,sBAAsB,CAAC,MAAM,CAAC,CAAC;YAC7C,IAAI,KAAK,EAAE,CAAC;gBACV,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YACnC,CAAC;YACD,MAAM,MAAM,CAAC;QACf,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC;YACxB,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC;YAC5B,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;YACvB,MAAM,eAAe,CAAC,UAAU,CAAC,CAAC;QACpC,CAAC;IACH,CAAC;CACF;AAED,SAAS,kBAAkB,CAAC,MAA0B;IACpD,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,WAAW,GAAG,mFAAmF,CAAC;IAExG,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;AACzE,CAAC;AAED,SAAS,yBAAyB,CAAC,OAAgC;IACjE,MAAM,MAAM,GAAG,qBAAqB,CAAC,OAAO,CAAC,CAAC;IAC9C,OAAO;QACL;YACE,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;gBAC5B,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAC1B,OAAO;wBACL,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,KAAK,CAAC,IAAI;qBACjB,CAAC;gBACJ,CAAC;gBAED,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;oBAChC,OAAO;wBACL,IAAI,EAAE,aAAa;wBACnB,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG;wBACvB,MAAM,EAAE,UAAU;qBACnB,CAAC;gBACJ,CAAC;gBAED,OAAO;oBACL,IAAI,EAAE,aAAa;oBACnB,KAAK,EAAE,QAAQ,KAAK,CAAC,MAAM,CAAC,UAAU,WAAW,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE;oBACpE,MAAM,EAAE,UAAU;iBACnB,CAAC;YACJ,CAAC,CAAC;SACe;KACpB,CAAC;AACJ,CAAC;AAED,SAAS,qBAAqB,CAAC,OAAgC;IAC7D,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;QAChC,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3C,CAAC;IAED,MAAM,MAAM,GAAmB,EAAE,CAAC;IAElC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC1B,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YAChD,SAAS;QACX,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YAC3B,IAAI,KAAK,CAAC,MAAM,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;gBAChC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;gBAC/E,SAAS;YACX,CAAC;YAED,MAAM,CAAC,IAAI,CAAC;gBACV,IAAI,EAAE,OAAO;gBACb,MAAM,EAAE;oBACN,IAAI,EAAE,QAAQ;oBACd,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU;oBACnC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI;iBACxB;aACF,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,iBAAiB,CACxB,KAAqB,EACrB,SAAiB;IAEjB,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAwB,EAAE,CAAC;QAC5C,MAAM,IAAI,GAAG,KAAK,CAAC,IAAyC,CAAC;QAC7D,IAAI,IAAI,CAAC,IAAI,KAAK,mBAAmB,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;YACpD,OAAO;gBACL,IAAI,EAAE,WAAW;gBACjB,UAAU,EAAE,SAAS;gBACrB,OAAO,EAAE;oBACP,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC;iBAC9C;aACF,CAAC;QACJ,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,uBAAuB,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,GAAG,GAAI,KAAK,CAAC,IAAmB,CAAC,OAAO,CAAC;IAC/C,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;QACf,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAwB,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACtE,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAwB,IAAI,GAAG,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;QACxE,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO;YACtB,EAAE,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,gBAAgB,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,CAAC;aACrF,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;aAC1B,IAAI,CAAC,GAAG,CAAC,CAAC;QAEb,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,IAAI,CAAC;QACd,CAAC;QAED,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE;gBACP,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aAChD;SACF,CAAC;IACJ,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QACjC,IAAI,GAAG,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YACjC,OAAO;gBACL,IAAI,EAAE,WAAW;gBACjB,UAAU,EAAE,SAAS;gBACrB,OAAO,EAAE;oBACP,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,CAAC;4BACR,IAAI,EAAE,UAAU;4BAChB,EAAE,EAAE,GAAG,CAAC,MAAM;4BACd,WAAW,EAAE,GAAG,CAAC,MAAM;4BACvB,IAAI,EAAE,GAAG,CAAC,IAAI,IAAI,MAAM;4BACxB,KAAK,EAAE,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC;yBACzC,CAAC;iBACH;aACF,CAAC;QACJ,CAAC;QAED,IAAI,GAAG,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;YACjC,OAAO;gBACL,IAAI,EAAE,WAAW;gBACjB,UAAU,EAAE,SAAS;gBACrB,OAAO,EAAE;oBACP,IAAI,EAAE,WAAW;oBACjB,OAAO,EAAE,CAAC;4BACR,IAAI,EAAE,UAAU;4BAChB,EAAE,EAAE,GAAG,CAAC,MAAM;4BACd,WAAW,EAAE,GAAG,CAAC,MAAM;4BACvB,IAAI,EAAE,UAAU;4BAChB,KAAK,EAAE,GAAG,CAAC,MAAM,IAAI,EAAE;yBACxB,CAAC;iBACH;aACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QACjC,IAAI,GAAG,CAAC,IAAI,KAAK,sBAAsB,IAAI,GAAG,CAAC,IAAI,KAAK,sBAAsB,EAAE,CAAC;YAC/E,OAAO;gBACL,IAAI,EAAE,MAAM;gBACZ,UAAU,EAAE,SAAS;gBACrB,kBAAkB,EAAE,IAAI;gBACxB,OAAO,EAAE;oBACP,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,CAAC;4BACR,IAAI,EAAE,aAAa;4BACnB,WAAW,EAAE,GAAG,CAAC,MAAM,IAAI,EAAE;4BAC7B,OAAO,EAAE,GAAG,CAAC,MAAM,IAAI,EAAE;4BACzB,QAAQ,EAAE,KAAK;yBAChB,CAAC;iBACH;aACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,kBAAkB,CAAC,KAAyB;IACnD,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAY,CAAC;IACtC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,SAAS,qBAAqB,CAAC,KAAqB;IAKlD,IAAI,KAAK,CAAC,IAAI,KAAK,wBAAwB,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,IAAI,GAAG,KAAK,CAAC,IAQlB,CAAC;IAEF,IAAI,IAAI,CAAC,IAAI,KAAK,eAAe,EAAE,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,WAAW,CAAC;IACtD,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,eAAe,EAAE,WAAW;QAC5B,aAAa,EAAE,CAAC;QAChB,OAAO,EAAE,CAAC;KACX,CAAC;AACJ,CAAC;AAED,SAAS,sBAAsB,CAAC,MAO/B;IACC,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;IACjD,IAAI,OAAO,KAAK,EAAE,WAAW,KAAK,QAAQ,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO;QACL,eAAe,EAAE,KAAK,CAAC,WAAW;QAClC,aAAa,EAAE,CAAC;QAChB,OAAO,EAAE,CAAC;KACX,CAAC;AACJ,CAAC;AAED,SAAS,kBAAkB,CACzB,MASC,EACD,MAAwB;IAExB,MAAM,KAAK,GAAG,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC;IACjD,MAAM,SAAS,GAAG,MAAM,CAAC,KAAK,YAAY,KAAK;QAC7C,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO;QACtB,CAAC,CAAC,MAAM,CAAC,KAAK;YACZ,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC;YAC9B,CAAC,CAAC,EAAE,CAAC;IAET,OAAO;QACL,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;QACxC,SAAS,EAAE,CAAC;QACZ,KAAK,EAAE;YACL,YAAY,EAAE,KAAK,EAAE,WAAW,IAAI,CAAC;YACrC,aAAa,EAAE,KAAK,EAAE,YAAY,IAAI,CAAC;SACxC;QACD,cAAc,EAAE,CAAC;QACjB,QAAQ,EAAE,OAAO,CAAC,SAAS,CAAC;QAC5B,MAAM,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;QACpC,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC;KAC1B,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,OAAoB;IACnD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,OAAoB;IACjD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC7B,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,IAAI,CACT,+BAA+B,MAAM,CAAC,IAAI,MAAM,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CACnG,CAAC;QACJ,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { type MCPServer, type Tool } from "@openai/agents";
|
|
2
|
+
import type { SessionMode } from "../../mailbox.js";
|
|
3
|
+
import type { RuntimeSurface } from "../../runtime-surface.js";
|
|
4
|
+
type OpenAIMcpServerConfig = Record<string, unknown>;
|
|
5
|
+
export declare function createVisionClawComputerTool(): Tool;
|
|
6
|
+
export declare function createOpenAIMcpServers(serverConfigs: Record<string, OpenAIMcpServerConfig>): MCPServer[];
|
|
7
|
+
export declare function createOpenAITools(options: {
|
|
8
|
+
dualSession: boolean;
|
|
9
|
+
mode: SessionMode;
|
|
10
|
+
runtimeSurface: RuntimeSurface;
|
|
11
|
+
}): Tool[];
|
|
12
|
+
export {};
|
|
13
|
+
//# sourceMappingURL=tools.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../../../src/agent/providers/openai/tools.ts"],"names":[],"mappings":"AACA,OAAO,EAA2G,KAAK,SAAS,EAAE,KAAK,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAiBpK,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAS/D,KAAK,qBAAqB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AAiKrD,wBAAgB,4BAA4B,IAAI,IAAI,CAMnD;AAED,wBAAgB,sBAAsB,CACpC,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,qBAAqB,CAAC,GACnD,SAAS,EAAE,CA2Bb;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE;IACzC,WAAW,EAAE,OAAO,CAAC;IACrB,IAAI,EAAE,WAAW,CAAC;IAClB,cAAc,EAAE,cAAc,CAAC;CAChC,GAAG,IAAI,EAAE,CA+CT"}
|
|
@@ -0,0 +1,208 @@
|
|
|
1
|
+
import { setTimeout as delay } from "node:timers/promises";
|
|
2
|
+
import { computerTool, MCPServerSSE, MCPServerStdio, MCPServerStreamableHttp, tool, webSearchTool } from "@openai/agents";
|
|
3
|
+
import { codexTool } from "@openai/agents-extensions/experimental/codex";
|
|
4
|
+
import { z } from "zod";
|
|
5
|
+
import { finishTool } from "../../../tools/finish.js";
|
|
6
|
+
import { manageCalendarTool } from "../../../tools/calendar.js";
|
|
7
|
+
import { manageDriveTool } from "../../../tools/drive.js";
|
|
8
|
+
import { manageEmailTool } from "../../../tools/email.js";
|
|
9
|
+
import { memoryTool } from "../../../tools/memory.js";
|
|
10
|
+
import { manageMcpServersTool } from "../../../tools/mcp-manager.js";
|
|
11
|
+
import { notifyUserTool } from "../../../tools/notify.js";
|
|
12
|
+
import { manageSkillsTool } from "../../../tools/skill.js";
|
|
13
|
+
import { switchSessionTool } from "../../../tools/switch-session.js";
|
|
14
|
+
import { upgradeTool } from "../../../tools/upgrade.js";
|
|
15
|
+
import { waitTool } from "../../../tools/wait.js";
|
|
16
|
+
import { webFetchTool } from "../../../tools/web-fetch.js";
|
|
17
|
+
import { captureScreen, click, doubleClick, drag, getDisplaySize, moveTo, pressKey, rightClick, scrollBy, typeText } from "../../../tools/desktop-executor.js";
|
|
18
|
+
function toOpenAIParameterSchema(schema) {
|
|
19
|
+
let current = schema;
|
|
20
|
+
// OpenAI's strict function schemas expect every property to appear in
|
|
21
|
+
// `required`. For Claude-style optional inputs, we convert them to
|
|
22
|
+
// required-but-nullable fields and normalize `null` back to `undefined`
|
|
23
|
+
// before invoking the existing handler.
|
|
24
|
+
while (current.safeParse(undefined).success) {
|
|
25
|
+
const wrapped = current;
|
|
26
|
+
if (typeof wrapped.unwrap === "function") {
|
|
27
|
+
current = wrapped.unwrap();
|
|
28
|
+
continue;
|
|
29
|
+
}
|
|
30
|
+
if (wrapped.def.innerType) {
|
|
31
|
+
current = wrapped.def.innerType;
|
|
32
|
+
continue;
|
|
33
|
+
}
|
|
34
|
+
break;
|
|
35
|
+
}
|
|
36
|
+
return current === schema ? schema : current.nullable();
|
|
37
|
+
}
|
|
38
|
+
function toZodParameters(schema) {
|
|
39
|
+
const normalizedEntries = Object.entries(schema ?? {}).map(([name, fieldSchema]) => [
|
|
40
|
+
name,
|
|
41
|
+
toOpenAIParameterSchema(fieldSchema),
|
|
42
|
+
]);
|
|
43
|
+
return z.object(Object.fromEntries(normalizedEntries));
|
|
44
|
+
}
|
|
45
|
+
function normalizeToolInput(value) {
|
|
46
|
+
if (value === null) {
|
|
47
|
+
return undefined;
|
|
48
|
+
}
|
|
49
|
+
if (Array.isArray(value)) {
|
|
50
|
+
return value.map((entry) => normalizeToolInput(entry));
|
|
51
|
+
}
|
|
52
|
+
if (typeof value === "object") {
|
|
53
|
+
return Object.fromEntries(Object.entries(value).map(([key, entry]) => [
|
|
54
|
+
key,
|
|
55
|
+
normalizeToolInput(entry),
|
|
56
|
+
]));
|
|
57
|
+
}
|
|
58
|
+
return value;
|
|
59
|
+
}
|
|
60
|
+
function normalizeToolOutput(result) {
|
|
61
|
+
const normalized = result.content.map((entry) => {
|
|
62
|
+
if (entry.type === "text") {
|
|
63
|
+
return {
|
|
64
|
+
type: "text",
|
|
65
|
+
text: result.isError ? `Tool error: ${entry.text}` : entry.text,
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
if (entry.type === "image") {
|
|
69
|
+
return {
|
|
70
|
+
type: "image",
|
|
71
|
+
image: {
|
|
72
|
+
data: entry.data,
|
|
73
|
+
mediaType: entry.mimeType,
|
|
74
|
+
},
|
|
75
|
+
};
|
|
76
|
+
}
|
|
77
|
+
return {
|
|
78
|
+
type: "text",
|
|
79
|
+
text: JSON.stringify(entry),
|
|
80
|
+
};
|
|
81
|
+
});
|
|
82
|
+
const only = normalized[0];
|
|
83
|
+
if (normalized.length === 1 && only.type === "text") {
|
|
84
|
+
return only.text;
|
|
85
|
+
}
|
|
86
|
+
return normalized;
|
|
87
|
+
}
|
|
88
|
+
function adaptClaudeTool(definition) {
|
|
89
|
+
return tool({
|
|
90
|
+
name: definition.name,
|
|
91
|
+
description: definition.description,
|
|
92
|
+
parameters: toZodParameters(definition.inputSchema),
|
|
93
|
+
execute: async (input) => {
|
|
94
|
+
const result = await definition.handler(normalizeToolInput(input), undefined);
|
|
95
|
+
return normalizeToolOutput(result);
|
|
96
|
+
},
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
class VisionClawComputer {
|
|
100
|
+
environment = "mac";
|
|
101
|
+
get dimensions() {
|
|
102
|
+
const size = getDisplaySize();
|
|
103
|
+
return [size.width, size.height];
|
|
104
|
+
}
|
|
105
|
+
async screenshot() {
|
|
106
|
+
const { base64 } = await captureScreen();
|
|
107
|
+
return base64;
|
|
108
|
+
}
|
|
109
|
+
async click(x, y, button) {
|
|
110
|
+
if (button === "left") {
|
|
111
|
+
await click(x, y);
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
if (button === "right") {
|
|
115
|
+
await rightClick(x, y);
|
|
116
|
+
return;
|
|
117
|
+
}
|
|
118
|
+
throw new Error(`Unsupported click button: ${button}`);
|
|
119
|
+
}
|
|
120
|
+
async doubleClick(x, y) {
|
|
121
|
+
await doubleClick(x, y);
|
|
122
|
+
}
|
|
123
|
+
async scroll(x, y, scrollX, scrollY) {
|
|
124
|
+
await scrollBy(x, y, scrollY, scrollX);
|
|
125
|
+
}
|
|
126
|
+
async type(text) {
|
|
127
|
+
await typeText(text);
|
|
128
|
+
}
|
|
129
|
+
async wait() {
|
|
130
|
+
await delay(1000);
|
|
131
|
+
}
|
|
132
|
+
async move(x, y) {
|
|
133
|
+
await moveTo(x, y);
|
|
134
|
+
}
|
|
135
|
+
async keypress(keys) {
|
|
136
|
+
await pressKey(keys.join("+"));
|
|
137
|
+
}
|
|
138
|
+
async drag(path) {
|
|
139
|
+
const start = path[0];
|
|
140
|
+
const end = path[path.length - 1];
|
|
141
|
+
await drag(start[0], start[1], end[0], end[1]);
|
|
142
|
+
}
|
|
143
|
+
}
|
|
144
|
+
export function createVisionClawComputerTool() {
|
|
145
|
+
return computerTool({
|
|
146
|
+
name: "computer",
|
|
147
|
+
computer: new VisionClawComputer(),
|
|
148
|
+
needsApproval: false,
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
export function createOpenAIMcpServers(serverConfigs) {
|
|
152
|
+
return Object.entries(serverConfigs).map(([name, config]) => {
|
|
153
|
+
if (typeof config.command === "string") {
|
|
154
|
+
return new MCPServerStdio({
|
|
155
|
+
name,
|
|
156
|
+
command: config.command,
|
|
157
|
+
args: Array.isArray(config.args) ? config.args.filter((arg) => typeof arg === "string") : [],
|
|
158
|
+
env: isStringRecord(config.env) ? config.env : undefined,
|
|
159
|
+
});
|
|
160
|
+
}
|
|
161
|
+
if (config.type === "http" && typeof config.url === "string") {
|
|
162
|
+
return new MCPServerStreamableHttp({
|
|
163
|
+
name,
|
|
164
|
+
url: config.url,
|
|
165
|
+
});
|
|
166
|
+
}
|
|
167
|
+
if (config.type === "sse" && typeof config.url === "string") {
|
|
168
|
+
return new MCPServerSSE({
|
|
169
|
+
name,
|
|
170
|
+
url: config.url,
|
|
171
|
+
});
|
|
172
|
+
}
|
|
173
|
+
throw new Error(`Unsupported MCP server config for "${name}"`);
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
export function createOpenAITools(options) {
|
|
177
|
+
const tools = [];
|
|
178
|
+
if (options.runtimeSurface.visionClawToolTransport.transport === "openai-functions") {
|
|
179
|
+
tools.push(adaptClaudeTool(waitTool), adaptClaudeTool(webFetchTool), adaptClaudeTool(notifyUserTool), adaptClaudeTool(finishTool), adaptClaudeTool(manageSkillsTool), adaptClaudeTool(upgradeTool), adaptClaudeTool(manageCalendarTool), adaptClaudeTool(manageEmailTool), adaptClaudeTool(manageDriveTool), adaptClaudeTool(memoryTool), adaptClaudeTool(manageMcpServersTool), createVisionClawComputerTool());
|
|
180
|
+
}
|
|
181
|
+
if (options.runtimeSurface.nativeTools.kind === "openai-hosted"
|
|
182
|
+
&& options.runtimeSurface.nativeTools.hostedTools.includes("web_search")) {
|
|
183
|
+
tools.push(webSearchTool({
|
|
184
|
+
name: "WebSearch",
|
|
185
|
+
searchContextSize: "medium",
|
|
186
|
+
}));
|
|
187
|
+
}
|
|
188
|
+
if (options.dualSession
|
|
189
|
+
&& options.runtimeSurface.visionClawToolTransport.transport === "openai-functions"
|
|
190
|
+
&& options.runtimeSurface.visionClawToolTransport.supportsSwitchSessionTool) {
|
|
191
|
+
tools.push(adaptClaudeTool(switchSessionTool));
|
|
192
|
+
}
|
|
193
|
+
if (options.mode === "coding") {
|
|
194
|
+
tools.push(codexTool({
|
|
195
|
+
sandboxMode: "workspace-write",
|
|
196
|
+
workingDirectory: process.cwd(),
|
|
197
|
+
persistSession: true,
|
|
198
|
+
}));
|
|
199
|
+
}
|
|
200
|
+
return tools;
|
|
201
|
+
}
|
|
202
|
+
function isStringRecord(value) {
|
|
203
|
+
if (!value || typeof value !== "object" || Array.isArray(value)) {
|
|
204
|
+
return false;
|
|
205
|
+
}
|
|
206
|
+
return Object.values(value).every((entry) => typeof entry === "string");
|
|
207
|
+
}
|
|
208
|
+
//# sourceMappingURL=tools.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tools.js","sourceRoot":"","sources":["../../../../src/agent/providers/openai/tools.ts"],"names":[],"mappings":"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"}
|