funolio-agent 0.3.7 → 0.5.0
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/agent-config.d.ts +39 -0
- package/dist/agent-config.d.ts.map +1 -0
- package/dist/agent-config.js +123 -0
- package/dist/agent-config.js.map +1 -0
- package/dist/approval.d.ts +26 -0
- package/dist/approval.d.ts.map +1 -0
- package/dist/approval.js +73 -0
- package/dist/approval.js.map +1 -0
- package/dist/bot-manager.d.ts +21 -14
- package/dist/bot-manager.d.ts.map +1 -1
- package/dist/bot-manager.js +75 -82
- package/dist/bot-manager.js.map +1 -1
- package/dist/cli.js +120 -4
- package/dist/cli.js.map +1 -1
- package/dist/commands/add.d.ts +8 -0
- package/dist/commands/add.d.ts.map +1 -0
- package/dist/commands/add.js +212 -0
- package/dist/commands/add.js.map +1 -0
- package/dist/commands/configure-provider.d.ts +14 -0
- package/dist/commands/configure-provider.d.ts.map +1 -0
- package/dist/commands/configure-provider.js +332 -0
- package/dist/commands/configure-provider.js.map +1 -0
- package/dist/commands/detect-tools.d.ts +7 -0
- package/dist/commands/detect-tools.d.ts.map +1 -0
- package/dist/commands/detect-tools.js +151 -0
- package/dist/commands/detect-tools.js.map +1 -0
- package/dist/commands/service.d.ts +6 -0
- package/dist/commands/service.d.ts.map +1 -0
- package/dist/commands/service.js +228 -0
- package/dist/commands/service.js.map +1 -0
- package/dist/commands/setup.d.ts +9 -0
- package/dist/commands/setup.d.ts.map +1 -0
- package/dist/commands/setup.js +220 -0
- package/dist/commands/setup.js.map +1 -0
- package/dist/commands/start.d.ts +2 -0
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +142 -45
- package/dist/commands/start.js.map +1 -1
- package/dist/commands/status.d.ts.map +1 -1
- package/dist/commands/status.js +54 -22
- package/dist/commands/status.js.map +1 -1
- package/dist/config.d.ts +23 -1
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +1 -1
- package/dist/config.js.map +1 -1
- package/dist/funolio-agent-linux-x64 +0 -0
- package/dist/message-loop.d.ts +6 -0
- package/dist/message-loop.d.ts.map +1 -1
- package/dist/message-loop.js +54 -15
- package/dist/message-loop.js.map +1 -1
- package/dist/mqtt-client.d.ts +19 -1
- package/dist/mqtt-client.d.ts.map +1 -1
- package/dist/mqtt-client.js +82 -1
- package/dist/mqtt-client.js.map +1 -1
- package/dist/providers/anthropic.d.ts +1 -0
- package/dist/providers/anthropic.d.ts.map +1 -1
- package/dist/providers/anthropic.js +58 -26
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/claude-cli.d.ts +1 -0
- package/dist/providers/claude-cli.d.ts.map +1 -1
- package/dist/providers/claude-cli.js +88 -14
- package/dist/providers/claude-cli.js.map +1 -1
- package/dist/providers/google.d.ts.map +1 -1
- package/dist/providers/google.js +31 -2
- package/dist/providers/google.js.map +1 -1
- package/dist/providers/index.d.ts +8 -1
- package/dist/providers/index.d.ts.map +1 -1
- package/dist/providers/index.js +42 -2
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/openai.d.ts +3 -1
- package/dist/providers/openai.d.ts.map +1 -1
- package/dist/providers/openai.js +23 -3
- package/dist/providers/openai.js.map +1 -1
- package/dist/service-mode.d.ts +24 -0
- package/dist/service-mode.d.ts.map +1 -0
- package/dist/service-mode.js +123 -0
- package/dist/service-mode.js.map +1 -0
- package/dist/tools/run-command.d.ts.map +1 -1
- package/dist/tools/run-command.js +4 -1
- package/dist/tools/run-command.js.map +1 -1
- package/package.json +21 -4
|
@@ -2,6 +2,9 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ClaudeCliProvider = void 0;
|
|
4
4
|
const child_process_1 = require("child_process");
|
|
5
|
+
// Windows STATUS_DLL_INIT_FAILED — benign crash during process cleanup
|
|
6
|
+
const WIN_DLL_INIT_FAILED = 3221225794; // 0xC0000142
|
|
7
|
+
const MAX_RETRIES = 2;
|
|
5
8
|
/**
|
|
6
9
|
* Claude CLI provider — delegates to the locally-installed `claude` CLI binary.
|
|
7
10
|
* Does NOT require an API key (the CLI handles auth via its own session).
|
|
@@ -20,42 +23,113 @@ class ClaudeCliProvider {
|
|
|
20
23
|
if (options.system) {
|
|
21
24
|
systemArg = ['--system-prompt', options.system];
|
|
22
25
|
}
|
|
23
|
-
|
|
26
|
+
// Don't pass --model; let claude use whatever model the user configured in Claude Code
|
|
27
|
+
const modelArg = [];
|
|
28
|
+
const args = [
|
|
29
|
+
'--print',
|
|
30
|
+
...modelArg,
|
|
31
|
+
...systemArg,
|
|
32
|
+
'--output-format', 'text',
|
|
33
|
+
prompt,
|
|
34
|
+
];
|
|
35
|
+
// Build a single shell command string with properly quoted arguments.
|
|
36
|
+
// shell:true + args array doesn't escape (DEP0190), so we quote manually.
|
|
37
|
+
const shellCmd = ['claude', ...args].map(a => {
|
|
38
|
+
if (/[\s"&|<>^()]/.test(a)) {
|
|
39
|
+
return `"${a.replace(/"/g, '\\"')}"`;
|
|
40
|
+
}
|
|
41
|
+
return a;
|
|
42
|
+
}).join(' ');
|
|
43
|
+
// Retry loop for Windows DLL init failures (0xC0000142)
|
|
44
|
+
let lastError = null;
|
|
45
|
+
for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
|
|
46
|
+
try {
|
|
47
|
+
const result = await this.spawnClaude(shellCmd, prompt, options);
|
|
48
|
+
return result;
|
|
49
|
+
}
|
|
50
|
+
catch (err) {
|
|
51
|
+
lastError = err;
|
|
52
|
+
// Only retry on the specific Windows DLL crash, and only if no output was streamed
|
|
53
|
+
if (err._exitCode === WIN_DLL_INIT_FAILED && attempt < MAX_RETRIES) {
|
|
54
|
+
console.warn(`[claude-cli] Windows DLL init failure (attempt ${attempt}/${MAX_RETRIES}) — retrying...`);
|
|
55
|
+
continue;
|
|
56
|
+
}
|
|
57
|
+
throw err;
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
throw lastError;
|
|
61
|
+
}
|
|
62
|
+
spawnClaude(shellCmd, prompt, options) {
|
|
24
63
|
return new Promise((resolve, reject) => {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
stdio: ['pipe', 'pipe', 'pipe'],
|
|
34
|
-
env: { ...process.env },
|
|
64
|
+
console.log(`[claude-cli] spawning: ${shellCmd.slice(0, 120)}... (${prompt.length} char prompt)`);
|
|
65
|
+
// Strip CLAUDECODE env var so the CLI doesn't think it's a nested session
|
|
66
|
+
const cleanEnv = { ...process.env };
|
|
67
|
+
delete cleanEnv.CLAUDECODE;
|
|
68
|
+
const proc = (0, child_process_1.spawn)(shellCmd, {
|
|
69
|
+
stdio: ['ignore', 'pipe', 'pipe'],
|
|
70
|
+
shell: true,
|
|
71
|
+
env: cleanEnv,
|
|
35
72
|
});
|
|
36
73
|
let stdout = '';
|
|
37
74
|
let stderr = '';
|
|
75
|
+
let gotOutput = false;
|
|
76
|
+
let settled = false;
|
|
77
|
+
// 30-second timeout for first output — if nothing arrives, the process is stuck
|
|
78
|
+
const initialTimeout = setTimeout(() => {
|
|
79
|
+
if (!gotOutput && !settled) {
|
|
80
|
+
settled = true;
|
|
81
|
+
console.error('[claude-cli] no output after 30s — killing process');
|
|
82
|
+
proc.kill();
|
|
83
|
+
reject(new Error('claude CLI produced no output after 30 seconds'));
|
|
84
|
+
}
|
|
85
|
+
}, 30_000);
|
|
38
86
|
proc.stdout.on('data', async (data) => {
|
|
39
87
|
const chunk = data.toString();
|
|
88
|
+
if (!gotOutput) {
|
|
89
|
+
gotOutput = true;
|
|
90
|
+
clearTimeout(initialTimeout);
|
|
91
|
+
console.log('[claude-cli] first output received, streaming...');
|
|
92
|
+
}
|
|
40
93
|
stdout += chunk;
|
|
41
94
|
if (options.onChunk) {
|
|
42
95
|
await options.onChunk(chunk);
|
|
43
96
|
}
|
|
44
97
|
});
|
|
45
98
|
proc.stderr.on('data', (data) => {
|
|
46
|
-
|
|
99
|
+
const text = data.toString();
|
|
100
|
+
stderr += text;
|
|
101
|
+
console.error(`[claude-cli] stderr: ${text.trim()}`);
|
|
47
102
|
});
|
|
48
103
|
proc.on('close', (code) => {
|
|
49
|
-
|
|
50
|
-
|
|
104
|
+
clearTimeout(initialTimeout);
|
|
105
|
+
if (settled)
|
|
106
|
+
return;
|
|
107
|
+
settled = true;
|
|
108
|
+
// On Windows, claude can exit with 0xC0000142 (STATUS_DLL_INIT_FAILED)
|
|
109
|
+
// during process cleanup even after producing valid output. If we already
|
|
110
|
+
// got stdout, treat it as success regardless of exit code.
|
|
111
|
+
if (code !== 0 && stdout.length > 0) {
|
|
112
|
+
console.warn(`[claude-cli] exited with code ${code} but had ${stdout.length} chars of output — treating as success`);
|
|
113
|
+
}
|
|
114
|
+
else if (code !== 0) {
|
|
115
|
+
console.error(`[claude-cli] exited with code ${code}`);
|
|
116
|
+
const err = new Error(`claude CLI exited with code ${code}: ${stderr}`);
|
|
117
|
+
err._exitCode = code;
|
|
118
|
+
reject(err);
|
|
51
119
|
return;
|
|
52
120
|
}
|
|
121
|
+
console.log(`[claude-cli] done (${stdout.length} chars)`);
|
|
53
122
|
resolve({
|
|
54
123
|
content: stdout.trim(),
|
|
55
124
|
finishReason: 'end_turn',
|
|
56
125
|
});
|
|
57
126
|
});
|
|
58
127
|
proc.on('error', (err) => {
|
|
128
|
+
clearTimeout(initialTimeout);
|
|
129
|
+
if (settled)
|
|
130
|
+
return;
|
|
131
|
+
settled = true;
|
|
132
|
+
console.error(`[claude-cli] spawn error: ${err.message}`);
|
|
59
133
|
reject(new Error(`Failed to spawn claude CLI: ${err.message}`));
|
|
60
134
|
});
|
|
61
135
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-cli.js","sourceRoot":"","sources":["../../src/providers/claude-cli.ts"],"names":[],"mappings":";;;AACA,iDAAsC;AAEtC;;;GAGG;AACH,MAAa,iBAAiB;IACpB,MAAM,CAAoB;IAElC,YAAY,MAAyB;QACnC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAuB;QAChC,iCAAiC;QACjC,MAAM,WAAW,GAAG,CAAC,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC;QACjF,MAAM,MAAM,GAAG,WAAW,EAAE,OAAO,IAAI,EAAE,CAAC;QAE1C,sBAAsB;QACtB,IAAI,SAAS,GAAa,EAAE,CAAC;QAC7B,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;YACnB,SAAS,GAAG,CAAC,iBAAiB,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,
|
|
1
|
+
{"version":3,"file":"claude-cli.js","sourceRoot":"","sources":["../../src/providers/claude-cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google.d.ts","sourceRoot":"","sources":["../../src/providers/google.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAe,MAAM,SAAS,CAAC;AAGnG,qBAAa,cAAe,YAAW,WAAW;IAChD,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,OAAO,CAAsD;gBAEzD,MAAM,EAAE,iBAAiB;IAI/B,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"google.d.ts","sourceRoot":"","sources":["../../src/providers/google.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAe,MAAM,SAAS,CAAC;AAGnG,qBAAa,cAAe,YAAW,WAAW;IAChD,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,OAAO,CAAsD;gBAEzD,MAAM,EAAE,iBAAiB;IAI/B,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;YA6F3C,UAAU;IAoExB,OAAO,CAAC,aAAa;CA+BtB"}
|
package/dist/providers/google.js
CHANGED
|
@@ -11,9 +11,26 @@ class GoogleProvider {
|
|
|
11
11
|
async chat(options) {
|
|
12
12
|
return (0, retry_1.withRetry)(async () => {
|
|
13
13
|
const contents = [];
|
|
14
|
+
let pendingFunctionResponses = [];
|
|
15
|
+
const flushFunctionResponses = () => {
|
|
16
|
+
if (pendingFunctionResponses.length > 0) {
|
|
17
|
+
contents.push({ role: 'user', parts: pendingFunctionResponses });
|
|
18
|
+
pendingFunctionResponses = [];
|
|
19
|
+
}
|
|
20
|
+
};
|
|
14
21
|
// Google uses a different message format
|
|
15
22
|
for (const m of options.messages) {
|
|
16
|
-
if (m.role === '
|
|
23
|
+
if (m.role === 'tool') {
|
|
24
|
+
// Google expects functionResponse parts in a user message
|
|
25
|
+
pendingFunctionResponses.push({
|
|
26
|
+
functionResponse: {
|
|
27
|
+
name: m.toolName,
|
|
28
|
+
response: { result: m.content },
|
|
29
|
+
},
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
else if (m.role === 'assistant') {
|
|
33
|
+
flushFunctionResponses();
|
|
17
34
|
const parts = [];
|
|
18
35
|
if (m.content)
|
|
19
36
|
parts.push({ text: m.content });
|
|
@@ -29,13 +46,15 @@ class GoogleProvider {
|
|
|
29
46
|
}
|
|
30
47
|
contents.push({ role: 'model', parts });
|
|
31
48
|
}
|
|
32
|
-
else {
|
|
49
|
+
else if (m.role !== 'system') {
|
|
50
|
+
flushFunctionResponses();
|
|
33
51
|
contents.push({
|
|
34
52
|
role: 'user',
|
|
35
53
|
parts: [{ text: m.content }],
|
|
36
54
|
});
|
|
37
55
|
}
|
|
38
56
|
}
|
|
57
|
+
flushFunctionResponses();
|
|
39
58
|
const body = {
|
|
40
59
|
contents,
|
|
41
60
|
generationConfig: {
|
|
@@ -45,6 +64,16 @@ class GoogleProvider {
|
|
|
45
64
|
if (options.system) {
|
|
46
65
|
body.systemInstruction = { parts: [{ text: options.system }] };
|
|
47
66
|
}
|
|
67
|
+
// Pass tool definitions if provided
|
|
68
|
+
if (options.tools?.length) {
|
|
69
|
+
body.tools = [{
|
|
70
|
+
functionDeclarations: options.tools.map(t => ({
|
|
71
|
+
name: t.name,
|
|
72
|
+
description: t.description,
|
|
73
|
+
parameters: t.parameters,
|
|
74
|
+
})),
|
|
75
|
+
}];
|
|
76
|
+
}
|
|
48
77
|
const model = this.config.model;
|
|
49
78
|
const url = `${this.baseUrl}/models/${model}:${options.stream ? 'streamGenerateContent' : 'generateContent'}?key=${this.config.apiKey}`;
|
|
50
79
|
if (options.stream && options.onChunk) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/providers/google.ts"],"names":[],"mappings":";;;AACA,mCAAoC;AAEpC,MAAa,cAAc;IACjB,MAAM,CAAoB;IAC1B,OAAO,GAAG,kDAAkD,CAAC;IAErE,YAAY,MAAyB;QACnC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAuB;QAChC,OAAO,IAAA,iBAAS,EAAC,KAAK,IAAI,EAAE;YAC1B,MAAM,QAAQ,GAAU,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"google.js","sourceRoot":"","sources":["../../src/providers/google.ts"],"names":[],"mappings":";;;AACA,mCAAoC;AAEpC,MAAa,cAAc;IACjB,MAAM,CAAoB;IAC1B,OAAO,GAAG,kDAAkD,CAAC;IAErE,YAAY,MAAyB;QACnC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAuB;QAChC,OAAO,IAAA,iBAAS,EAAC,KAAK,IAAI,EAAE;YAC1B,MAAM,QAAQ,GAAU,EAAE,CAAC;YAC3B,IAAI,wBAAwB,GAAU,EAAE,CAAC;YAEzC,MAAM,sBAAsB,GAAG,GAAG,EAAE;gBAClC,IAAI,wBAAwB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACxC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,wBAAwB,EAAE,CAAC,CAAC;oBACjE,wBAAwB,GAAG,EAAE,CAAC;gBAChC,CAAC;YACH,CAAC,CAAC;YAEF,yCAAyC;YACzC,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACjC,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBACtB,0DAA0D;oBAC1D,wBAAwB,CAAC,IAAI,CAAC;wBAC5B,gBAAgB,EAAE;4BAChB,IAAI,EAAE,CAAC,CAAC,QAAQ;4BAChB,QAAQ,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,OAAO,EAAE;yBAChC;qBACF,CAAC,CAAC;gBACL,CAAC;qBAAM,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,EAAE,CAAC;oBAClC,sBAAsB,EAAE,CAAC;oBACzB,MAAM,KAAK,GAAU,EAAE,CAAC;oBACxB,IAAI,CAAC,CAAC,OAAO;wBAAE,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;oBAC/C,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;wBAChB,KAAK,MAAM,EAAE,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;4BAC7B,KAAK,CAAC,IAAI,CAAC;gCACT,YAAY,EAAE;oCACZ,IAAI,EAAE,EAAE,CAAC,IAAI;oCACb,IAAI,EAAE,EAAE,CAAC,SAAS;iCACnB;6BACF,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;oBACD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;gBAC1C,CAAC;qBAAM,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC/B,sBAAsB,EAAE,CAAC;oBACzB,QAAQ,CAAC,IAAI,CAAC;wBACZ,IAAI,EAAE,MAAM;wBACZ,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;qBAC7B,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;YACD,sBAAsB,EAAE,CAAC;YAEzB,MAAM,IAAI,GAAwB;gBAChC,QAAQ;gBACR,gBAAgB,EAAE;oBAChB,eAAe,EAAE,IAAI;iBACtB;aACF,CAAC;YAEF,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,IAAI,CAAC,iBAAiB,GAAG,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;YACjE,CAAC;YAED,oCAAoC;YACpC,IAAI,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;gBAC1B,IAAI,CAAC,KAAK,GAAG,CAAC;wBACZ,oBAAoB,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;4BAC5C,IAAI,EAAE,CAAC,CAAC,IAAI;4BACZ,WAAW,EAAE,CAAC,CAAC,WAAW;4BAC1B,UAAU,EAAE,CAAC,CAAC,UAAU;yBACzB,CAAC,CAAC;qBACJ,CAAC,CAAC;YACL,CAAC;YAED,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YAChC,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,OAAO,WAAW,KAAK,IAAI,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,iBAAiB,QAAQ,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YAExI,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACtC,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YACrD,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAChC,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;gBAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC3B,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,KAAK,GAAQ,IAAI,KAAK,CAAC,qBAAqB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;gBACrE,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;gBAC/B,MAAM,KAAK,CAAC;YACd,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAS,CAAC;YAC1C,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAClC,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACpD,CAAC;IAEO,KAAK,CAAC,UAAU,CAAC,GAAW,EAAE,IAAyB,EAAE,OAAyC;QACxG,wDAAwD;QACxD,GAAG,IAAI,UAAU,CAAC;QAElB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;YAChC,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CAAC,CAAC;QAEH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,KAAK,GAAQ,IAAI,KAAK,CAAC,qBAAqB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;YACrE,KAAK,CAAC,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;YAC/B,MAAM,KAAK,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,EAAE,SAAS,EAAE,CAAC;QAC1C,IAAI,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAEjD,MAAM,OAAO,GAAG,IAAI,WAAW,EAAE,CAAC;QAClC,IAAI,WAAW,GAAG,EAAE,CAAC;QACrB,MAAM,SAAS,GAAkB,EAAE,CAAC;QACpC,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,eAAe,GAAG,CAAC,CAAC;QAExB,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YAC5C,IAAI,IAAI;gBAAE,MAAM;YAEhB,MAAM,IAAI,OAAO,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;YAClD,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACjC,MAAM,GAAG,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC;YAE3B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;oBAAE,SAAS;gBACzC,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAClC,IAAI,CAAC,IAAI;oBAAE,SAAS;gBAEpB,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC/B,MAAM,SAAS,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;oBACxC,IAAI,CAAC,SAAS,EAAE,OAAO,EAAE,KAAK;wBAAE,SAAS;oBAEzC,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;wBAC3C,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;4BACd,WAAW,IAAI,IAAI,CAAC,IAAI,CAAC;4BACzB,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBAC3B,CAAC;wBACD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;4BACtB,SAAS,CAAC,IAAI,CAAC;gCACb,EAAE,EAAE,aAAa,eAAe,EAAE,EAAE;gCACpC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI;gCAC5B,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE;6BACxC,CAAC,CAAC;wBACL,CAAC;oBACH,CAAC;gBACH,CAAC;gBAAC,MAAM,CAAC;oBACP,wBAAwB;gBAC1B,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO;YACL,OAAO,EAAE,WAAW;YACpB,SAAS,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;SACxD,CAAC;IACJ,CAAC;IAEO,aAAa,CAAC,IAAS;QAC7B,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,MAAM,SAAS,GAAkB,EAAE,CAAC;QACpC,IAAI,eAAe,GAAG,CAAC,CAAC;QAExB,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC;QACvC,IAAI,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;YAC9B,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBAC3C,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;oBACd,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC;gBACvB,CAAC;gBACD,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;oBACtB,SAAS,CAAC,IAAI,CAAC;wBACb,EAAE,EAAE,aAAa,eAAe,EAAE,EAAE;wBACpC,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI;wBAC5B,SAAS,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,IAAI,EAAE;qBACxC,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO;YACL,OAAO;YACP,SAAS,EAAE,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS;YACvD,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC;gBAC1B,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,gBAAgB,IAAI,CAAC;gBACrD,YAAY,EAAE,IAAI,CAAC,aAAa,CAAC,oBAAoB,IAAI,CAAC;aAC3D,CAAC,CAAC,CAAC,SAAS;YACb,YAAY,EAAE,SAAS,EAAE,YAAY;SACtC,CAAC;IACJ,CAAC;CACF;AAxMD,wCAwMC"}
|
|
@@ -4,9 +4,13 @@ export interface LLMToolCall {
|
|
|
4
4
|
arguments: Record<string, any>;
|
|
5
5
|
}
|
|
6
6
|
export interface LLMMessage {
|
|
7
|
-
role: 'user' | 'assistant' | 'system';
|
|
7
|
+
role: 'user' | 'assistant' | 'system' | 'tool';
|
|
8
8
|
content: string;
|
|
9
9
|
toolCalls?: LLMToolCall[];
|
|
10
|
+
/** For role='tool': the tool_call_id this result corresponds to */
|
|
11
|
+
toolCallId?: string;
|
|
12
|
+
/** For role='tool': the tool name */
|
|
13
|
+
toolName?: string;
|
|
10
14
|
}
|
|
11
15
|
export interface LLMChatOptions {
|
|
12
16
|
messages: LLMMessage[];
|
|
@@ -34,9 +38,12 @@ export interface LLMProviderConfig {
|
|
|
34
38
|
model: string;
|
|
35
39
|
maxRetries?: number;
|
|
36
40
|
baseDelay?: number;
|
|
41
|
+
baseUrl?: string;
|
|
37
42
|
}
|
|
38
43
|
export interface LLMProvider {
|
|
39
44
|
chat(options: LLMChatOptions): Promise<LLMResponse>;
|
|
40
45
|
}
|
|
46
|
+
/** Providers fully implemented in runtime */
|
|
47
|
+
export declare const SUPPORTED_PROVIDERS: Set<string>;
|
|
41
48
|
export declare function createProvider(providerName: string, config: LLMProviderConfig): LLMProvider;
|
|
42
49
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,WAAW;IAC1B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CAChC;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,QAAQ,GAAG,MAAM,CAAC;IAC/C,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC;IAC1B,mEAAmE;IACnE,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,qCAAqC;IACrC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,UAAU,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3C,KAAK,CAAC,EAAE,iBAAiB,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,CAAC,EAAE,WAAW,EAAE,CAAC;IAC1B,KAAK,CAAC,EAAE;QACN,WAAW,EAAE,MAAM,CAAC;QACpB,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;CACrD;AAED,6CAA6C;AAC7C,eAAO,MAAM,mBAAmB,aAa9B,CAAC;AAcH,wBAAgB,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,GAAG,WAAW,CA2B3F"}
|
package/dist/providers/index.js
CHANGED
|
@@ -1,11 +1,43 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.SUPPORTED_PROVIDERS = void 0;
|
|
3
4
|
exports.createProvider = createProvider;
|
|
4
5
|
const anthropic_1 = require("./anthropic");
|
|
5
6
|
const openai_1 = require("./openai");
|
|
6
7
|
const google_1 = require("./google");
|
|
7
8
|
const claude_cli_1 = require("./claude-cli");
|
|
9
|
+
/** Providers fully implemented in runtime */
|
|
10
|
+
exports.SUPPORTED_PROVIDERS = new Set([
|
|
11
|
+
'anthropic',
|
|
12
|
+
'openai',
|
|
13
|
+
'google',
|
|
14
|
+
'claude-cli',
|
|
15
|
+
'codex-cli', // routes to OpenAI provider
|
|
16
|
+
'mistral', // OpenAI-compatible API
|
|
17
|
+
'cohere', // OpenAI-compatible API
|
|
18
|
+
'deepseek', // OpenAI-compatible API
|
|
19
|
+
'groq', // OpenAI-compatible API
|
|
20
|
+
'together', // OpenAI-compatible API
|
|
21
|
+
'perplexity', // OpenAI-compatible API
|
|
22
|
+
'xai', // OpenAI-compatible API
|
|
23
|
+
]);
|
|
24
|
+
/** Map of OpenAI-compatible providers to their base URLs */
|
|
25
|
+
const OPENAI_COMPATIBLE_BASE_URLS = {
|
|
26
|
+
'codex-cli': 'https://api.openai.com/v1',
|
|
27
|
+
'mistral': 'https://api.mistral.ai/v1',
|
|
28
|
+
'cohere': 'https://api.cohere.com/compatibility/v1',
|
|
29
|
+
'deepseek': 'https://api.deepseek.com/v1',
|
|
30
|
+
'groq': 'https://api.groq.com/openai/v1',
|
|
31
|
+
'together': 'https://api.together.xyz/v1',
|
|
32
|
+
'perplexity': 'https://api.perplexity.ai',
|
|
33
|
+
'xai': 'https://api.x.ai/v1',
|
|
34
|
+
};
|
|
8
35
|
function createProvider(providerName, config) {
|
|
36
|
+
// Validate provider is supported
|
|
37
|
+
if (!exports.SUPPORTED_PROVIDERS.has(providerName)) {
|
|
38
|
+
console.warn(`Unknown provider "${providerName}", falling back to anthropic`);
|
|
39
|
+
return new anthropic_1.AnthropicProvider(config);
|
|
40
|
+
}
|
|
9
41
|
switch (providerName) {
|
|
10
42
|
case 'anthropic':
|
|
11
43
|
return new anthropic_1.AnthropicProvider(config);
|
|
@@ -15,8 +47,16 @@ function createProvider(providerName, config) {
|
|
|
15
47
|
return new google_1.GoogleProvider(config);
|
|
16
48
|
case 'claude-cli':
|
|
17
49
|
return new claude_cli_1.ClaudeCliProvider(config);
|
|
18
|
-
default:
|
|
19
|
-
|
|
50
|
+
default: {
|
|
51
|
+
// All other providers use OpenAI-compatible API with custom baseUrl
|
|
52
|
+
const baseUrl = OPENAI_COMPATIBLE_BASE_URLS[providerName];
|
|
53
|
+
if (baseUrl) {
|
|
54
|
+
return new openai_1.OpenAIProvider({ ...config, baseUrl });
|
|
55
|
+
}
|
|
56
|
+
// Final fallback — should never reach here due to SUPPORTED_PROVIDERS check
|
|
57
|
+
console.warn(`No base URL for provider "${providerName}", falling back to anthropic`);
|
|
58
|
+
return new anthropic_1.AnthropicProvider(config);
|
|
59
|
+
}
|
|
20
60
|
}
|
|
21
61
|
}
|
|
22
62
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/providers/index.ts"],"names":[],"mappings":";;;AAqFA,wCA2BC;AAhHD,2CAAgD;AAChD,qCAA0C;AAC1C,qCAA0C;AAC1C,6CAAiD;AAsDjD,6CAA6C;AAChC,QAAA,mBAAmB,GAAG,IAAI,GAAG,CAAC;IACzC,WAAW;IACX,QAAQ;IACR,QAAQ;IACR,YAAY;IACZ,WAAW,EAAI,4BAA4B;IAC3C,SAAS,EAAM,wBAAwB;IACvC,QAAQ,EAAO,wBAAwB;IACvC,UAAU,EAAK,wBAAwB;IACvC,MAAM,EAAS,wBAAwB;IACvC,UAAU,EAAK,wBAAwB;IACvC,YAAY,EAAG,wBAAwB;IACvC,KAAK,EAAU,wBAAwB;CACxC,CAAC,CAAC;AAEH,4DAA4D;AAC5D,MAAM,2BAA2B,GAA2B;IAC1D,WAAW,EAAG,2BAA2B;IACzC,SAAS,EAAK,2BAA2B;IACzC,QAAQ,EAAM,yCAAyC;IACvD,UAAU,EAAI,6BAA6B;IAC3C,MAAM,EAAQ,gCAAgC;IAC9C,UAAU,EAAI,6BAA6B;IAC3C,YAAY,EAAE,2BAA2B;IACzC,KAAK,EAAS,qBAAqB;CACpC,CAAC;AAEF,SAAgB,cAAc,CAAC,YAAoB,EAAE,MAAyB;IAC5E,iCAAiC;IACjC,IAAI,CAAC,2BAAmB,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC;QAC3C,OAAO,CAAC,IAAI,CAAC,qBAAqB,YAAY,8BAA8B,CAAC,CAAC;QAC9E,OAAO,IAAI,6BAAiB,CAAC,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,QAAQ,YAAY,EAAE,CAAC;QACrB,KAAK,WAAW;YACd,OAAO,IAAI,6BAAiB,CAAC,MAAM,CAAC,CAAC;QACvC,KAAK,QAAQ;YACX,OAAO,IAAI,uBAAc,CAAC,MAAM,CAAC,CAAC;QACpC,KAAK,QAAQ;YACX,OAAO,IAAI,uBAAc,CAAC,MAAM,CAAC,CAAC;QACpC,KAAK,YAAY;YACf,OAAO,IAAI,8BAAiB,CAAC,MAAM,CAAC,CAAC;QACvC,OAAO,CAAC,CAAC,CAAC;YACR,oEAAoE;YACpE,MAAM,OAAO,GAAG,2BAA2B,CAAC,YAAY,CAAC,CAAC;YAC1D,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,IAAI,uBAAc,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,CAAC,CAAC;YACpD,CAAC;YACD,4EAA4E;YAC5E,OAAO,CAAC,IAAI,CAAC,6BAA6B,YAAY,8BAA8B,CAAC,CAAC;YACtF,OAAO,IAAI,6BAAiB,CAAC,MAAM,CAAC,CAAC;QACvC,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -2,7 +2,9 @@ import { LLMProvider, LLMProviderConfig, LLMChatOptions, LLMResponse } from './i
|
|
|
2
2
|
export declare class OpenAIProvider implements LLMProvider {
|
|
3
3
|
private config;
|
|
4
4
|
private baseUrl;
|
|
5
|
-
constructor(config: LLMProviderConfig
|
|
5
|
+
constructor(config: LLMProviderConfig & {
|
|
6
|
+
baseUrl?: string;
|
|
7
|
+
});
|
|
6
8
|
chat(options: LLMChatOptions): Promise<LLMResponse>;
|
|
7
9
|
private chatStream;
|
|
8
10
|
private parseResponse;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAe,MAAM,SAAS,CAAC;AAGnG,qBAAa,cAAe,YAAW,WAAW;IAChD,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAe,MAAM,SAAS,CAAC;AAGnG,qBAAa,cAAe,YAAW,WAAW;IAChD,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,OAAO,CAAS;gBAEZ,MAAM,EAAE,iBAAiB,GAAG;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;IAKtD,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;YA4E3C,UAAU;IA6FxB,OAAO,CAAC,aAAa;CAyBtB"}
|
package/dist/providers/openai.js
CHANGED
|
@@ -4,9 +4,10 @@ exports.OpenAIProvider = void 0;
|
|
|
4
4
|
const retry_1 = require("./retry");
|
|
5
5
|
class OpenAIProvider {
|
|
6
6
|
config;
|
|
7
|
-
baseUrl
|
|
7
|
+
baseUrl;
|
|
8
8
|
constructor(config) {
|
|
9
9
|
this.config = config;
|
|
10
|
+
this.baseUrl = config.baseUrl || 'https://api.openai.com/v1';
|
|
10
11
|
}
|
|
11
12
|
async chat(options) {
|
|
12
13
|
return (0, retry_1.withRetry)(async () => {
|
|
@@ -15,7 +16,15 @@ class OpenAIProvider {
|
|
|
15
16
|
messages.push({ role: 'system', content: options.system });
|
|
16
17
|
}
|
|
17
18
|
for (const m of options.messages) {
|
|
18
|
-
if (m.role === '
|
|
19
|
+
if (m.role === 'tool') {
|
|
20
|
+
// OpenAI uses role='tool' with tool_call_id
|
|
21
|
+
messages.push({
|
|
22
|
+
role: 'tool',
|
|
23
|
+
tool_call_id: m.toolCallId,
|
|
24
|
+
content: m.content,
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
else if (m.role === 'assistant' && m.toolCalls?.length) {
|
|
19
28
|
messages.push({
|
|
20
29
|
role: 'assistant',
|
|
21
30
|
content: m.content || null,
|
|
@@ -29,7 +38,7 @@ class OpenAIProvider {
|
|
|
29
38
|
})),
|
|
30
39
|
});
|
|
31
40
|
}
|
|
32
|
-
else {
|
|
41
|
+
else if (m.role !== 'system') {
|
|
33
42
|
messages.push({ role: m.role, content: m.content });
|
|
34
43
|
}
|
|
35
44
|
}
|
|
@@ -38,6 +47,17 @@ class OpenAIProvider {
|
|
|
38
47
|
messages,
|
|
39
48
|
max_tokens: 4096,
|
|
40
49
|
};
|
|
50
|
+
// Pass tool definitions if provided
|
|
51
|
+
if (options.tools?.length) {
|
|
52
|
+
body.tools = options.tools.map(t => ({
|
|
53
|
+
type: 'function',
|
|
54
|
+
function: {
|
|
55
|
+
name: t.name,
|
|
56
|
+
description: t.description,
|
|
57
|
+
parameters: t.parameters,
|
|
58
|
+
},
|
|
59
|
+
}));
|
|
60
|
+
}
|
|
41
61
|
if (options.stream && options.onChunk) {
|
|
42
62
|
return this.chatStream(body, options.onChunk);
|
|
43
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":";;;AACA,mCAAoC;AAEpC,MAAa,cAAc;IACjB,MAAM,CAAoB;IAC1B,OAAO,
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../src/providers/openai.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Service Mode — headless agent for Tauri sidecar
|
|
3
|
+
*
|
|
4
|
+
* No terminal output (logs to ~/.funolio/agent.log).
|
|
5
|
+
* Structured JSON events on stdout for Tauri IPC.
|
|
6
|
+
* Auto-reconnects MQTT on failure.
|
|
7
|
+
*/
|
|
8
|
+
/**
|
|
9
|
+
* Write a log entry to ~/.funolio/agent.log
|
|
10
|
+
*/
|
|
11
|
+
export declare function serviceLog(level: 'info' | 'warn' | 'error', message: string, data?: Record<string, unknown>): void;
|
|
12
|
+
/**
|
|
13
|
+
* Emit a structured JSON event on stdout for Tauri IPC.
|
|
14
|
+
*/
|
|
15
|
+
export declare function emitEvent(type: string, data?: Record<string, unknown>): void;
|
|
16
|
+
/**
|
|
17
|
+
* Redirect console.log/warn/error to file when in service mode.
|
|
18
|
+
*/
|
|
19
|
+
export declare function enableServiceMode(): void;
|
|
20
|
+
/**
|
|
21
|
+
* Clean up log stream on shutdown.
|
|
22
|
+
*/
|
|
23
|
+
export declare function closeServiceMode(): void;
|
|
24
|
+
//# sourceMappingURL=service-mode.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"service-mode.d.ts","sourceRoot":"","sources":["../src/service-mode.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAiCH;;GAEG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CASlH;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAG5E;AAED;;GAEG;AACH,wBAAgB,iBAAiB,IAAI,IAAI,CAmBxC;AAED;;GAEG;AACH,wBAAgB,gBAAgB,IAAI,IAAI,CAKvC"}
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/**
|
|
3
|
+
* Service Mode — headless agent for Tauri sidecar
|
|
4
|
+
*
|
|
5
|
+
* No terminal output (logs to ~/.funolio/agent.log).
|
|
6
|
+
* Structured JSON events on stdout for Tauri IPC.
|
|
7
|
+
* Auto-reconnects MQTT on failure.
|
|
8
|
+
*/
|
|
9
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
12
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
13
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
14
|
+
}
|
|
15
|
+
Object.defineProperty(o, k2, desc);
|
|
16
|
+
}) : (function(o, m, k, k2) {
|
|
17
|
+
if (k2 === undefined) k2 = k;
|
|
18
|
+
o[k2] = m[k];
|
|
19
|
+
}));
|
|
20
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
21
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
22
|
+
}) : function(o, v) {
|
|
23
|
+
o["default"] = v;
|
|
24
|
+
});
|
|
25
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
26
|
+
var ownKeys = function(o) {
|
|
27
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
28
|
+
var ar = [];
|
|
29
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
30
|
+
return ar;
|
|
31
|
+
};
|
|
32
|
+
return ownKeys(o);
|
|
33
|
+
};
|
|
34
|
+
return function (mod) {
|
|
35
|
+
if (mod && mod.__esModule) return mod;
|
|
36
|
+
var result = {};
|
|
37
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
38
|
+
__setModuleDefault(result, mod);
|
|
39
|
+
return result;
|
|
40
|
+
};
|
|
41
|
+
})();
|
|
42
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
43
|
+
exports.serviceLog = serviceLog;
|
|
44
|
+
exports.emitEvent = emitEvent;
|
|
45
|
+
exports.enableServiceMode = enableServiceMode;
|
|
46
|
+
exports.closeServiceMode = closeServiceMode;
|
|
47
|
+
const fs = __importStar(require("fs"));
|
|
48
|
+
const path = __importStar(require("path"));
|
|
49
|
+
const config_1 = require("./config");
|
|
50
|
+
const LOG_FILE = path.join((0, config_1.getConfigDir)(), 'agent.log');
|
|
51
|
+
const MAX_LOG_SIZE = 10 * 1024 * 1024; // 10MB
|
|
52
|
+
let logStream = null;
|
|
53
|
+
function ensureLogStream() {
|
|
54
|
+
if (!logStream) {
|
|
55
|
+
const dir = (0, config_1.getConfigDir)();
|
|
56
|
+
if (!fs.existsSync(dir)) {
|
|
57
|
+
fs.mkdirSync(dir, { recursive: true });
|
|
58
|
+
}
|
|
59
|
+
// Rotate if too large
|
|
60
|
+
if (fs.existsSync(LOG_FILE)) {
|
|
61
|
+
const stat = fs.statSync(LOG_FILE);
|
|
62
|
+
if (stat.size > MAX_LOG_SIZE) {
|
|
63
|
+
const rotated = LOG_FILE + '.1';
|
|
64
|
+
if (fs.existsSync(rotated))
|
|
65
|
+
fs.unlinkSync(rotated);
|
|
66
|
+
fs.renameSync(LOG_FILE, rotated);
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
logStream = fs.createWriteStream(LOG_FILE, { flags: 'a' });
|
|
70
|
+
}
|
|
71
|
+
return logStream;
|
|
72
|
+
}
|
|
73
|
+
/**
|
|
74
|
+
* Write a log entry to ~/.funolio/agent.log
|
|
75
|
+
*/
|
|
76
|
+
function serviceLog(level, message, data) {
|
|
77
|
+
const entry = {
|
|
78
|
+
ts: new Date().toISOString(),
|
|
79
|
+
level,
|
|
80
|
+
message,
|
|
81
|
+
...(data || {}),
|
|
82
|
+
};
|
|
83
|
+
const stream = ensureLogStream();
|
|
84
|
+
stream.write(JSON.stringify(entry) + '\n');
|
|
85
|
+
}
|
|
86
|
+
/**
|
|
87
|
+
* Emit a structured JSON event on stdout for Tauri IPC.
|
|
88
|
+
*/
|
|
89
|
+
function emitEvent(type, data) {
|
|
90
|
+
const event = { type, ts: Date.now(), ...(data || {}) };
|
|
91
|
+
process.stdout.write(JSON.stringify(event) + '\n');
|
|
92
|
+
}
|
|
93
|
+
/**
|
|
94
|
+
* Redirect console.log/warn/error to file when in service mode.
|
|
95
|
+
*/
|
|
96
|
+
function enableServiceMode() {
|
|
97
|
+
// Redirect console to log file
|
|
98
|
+
const origLog = console.log;
|
|
99
|
+
const origWarn = console.warn;
|
|
100
|
+
const origError = console.error;
|
|
101
|
+
console.log = (...args) => {
|
|
102
|
+
serviceLog('info', args.map(String).join(' '));
|
|
103
|
+
};
|
|
104
|
+
console.warn = (...args) => {
|
|
105
|
+
serviceLog('warn', args.map(String).join(' '));
|
|
106
|
+
};
|
|
107
|
+
console.error = (...args) => {
|
|
108
|
+
serviceLog('error', args.map(String).join(' '));
|
|
109
|
+
};
|
|
110
|
+
// Emit startup event
|
|
111
|
+
emitEvent('status', { status: 'starting' });
|
|
112
|
+
serviceLog('info', 'Agent starting in service mode');
|
|
113
|
+
}
|
|
114
|
+
/**
|
|
115
|
+
* Clean up log stream on shutdown.
|
|
116
|
+
*/
|
|
117
|
+
function closeServiceMode() {
|
|
118
|
+
if (logStream) {
|
|
119
|
+
logStream.end();
|
|
120
|
+
logStream = null;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
//# sourceMappingURL=service-mode.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"service-mode.js","sourceRoot":"","sources":["../src/service-mode.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAoCH,gCASC;AAKD,8BAGC;AAKD,8CAmBC;AAKD,4CAKC;AArFD,uCAAyB;AACzB,2CAA6B;AAC7B,qCAAwC;AAExC,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAA,qBAAY,GAAE,EAAE,WAAW,CAAC,CAAC;AACxD,MAAM,YAAY,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC,OAAO;AAE9C,IAAI,SAAS,GAA0B,IAAI,CAAC;AAE5C,SAAS,eAAe;IACtB,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,GAAG,GAAG,IAAA,qBAAY,GAAE,CAAC;QAC3B,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,EAAE,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACzC,CAAC;QAED,sBAAsB;QACtB,IAAI,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;YACnC,IAAI,IAAI,CAAC,IAAI,GAAG,YAAY,EAAE,CAAC;gBAC7B,MAAM,OAAO,GAAG,QAAQ,GAAG,IAAI,CAAC;gBAChC,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC;oBAAE,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;gBACnD,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YACnC,CAAC;QACH,CAAC;QAED,SAAS,GAAG,EAAE,CAAC,iBAAiB,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;GAEG;AACH,SAAgB,UAAU,CAAC,KAAgC,EAAE,OAAe,EAAE,IAA8B;IAC1G,MAAM,KAAK,GAAG;QACZ,EAAE,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QAC5B,KAAK;QACL,OAAO;QACP,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;KAChB,CAAC;IACF,MAAM,MAAM,GAAG,eAAe,EAAE,CAAC;IACjC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;AAC7C,CAAC;AAED;;GAEG;AACH,SAAgB,SAAS,CAAC,IAAY,EAAE,IAA8B;IACpE,MAAM,KAAK,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,EAAE,CAAC;IACxD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC;AACrD,CAAC;AAED;;GAEG;AACH,SAAgB,iBAAiB;IAC/B,+BAA+B;IAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAC5B,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAC9B,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,CAAC;IAEhC,OAAO,CAAC,GAAG,GAAG,CAAC,GAAG,IAAe,EAAE,EAAE;QACnC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,CAAC,CAAC;IACF,OAAO,CAAC,IAAI,GAAG,CAAC,GAAG,IAAe,EAAE,EAAE;QACpC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACjD,CAAC,CAAC;IACF,OAAO,CAAC,KAAK,GAAG,CAAC,GAAG,IAAe,EAAE,EAAE;QACrC,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAClD,CAAC,CAAC;IAEF,qBAAqB;IACrB,SAAS,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,UAAU,EAAE,CAAC,CAAC;IAC5C,UAAU,CAAC,MAAM,EAAE,gCAAgC,CAAC,CAAC;AACvD,CAAC;AAED;;GAEG;AACH,SAAgB,gBAAgB;IAC9B,IAAI,SAAS,EAAE,CAAC;QACd,SAAS,CAAC,GAAG,EAAE,CAAC;QAChB,SAAS,GAAG,IAAI,CAAC;IACnB,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-command.d.ts","sourceRoot":"","sources":["../../src/tools/run-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAA2B,MAAM,UAAU,CAAC;AAGnE,eAAO,MAAM,cAAc,EAAE,
|
|
1
|
+
{"version":3,"file":"run-command.d.ts","sourceRoot":"","sources":["../../src/tools/run-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAA2B,MAAM,UAAU,CAAC;AAGnE,eAAO,MAAM,cAAc,EAAE,cA8F5B,CAAC"}
|