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
package/dist/message-loop.js
CHANGED
|
@@ -6,16 +6,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
6
6
|
exports.MessageLoop = void 0;
|
|
7
7
|
const chalk_1 = __importDefault(require("chalk"));
|
|
8
8
|
const index_1 = require("./providers/index");
|
|
9
|
+
const index_2 = require("./index");
|
|
10
|
+
const approval_1 = require("./approval");
|
|
9
11
|
class MessageLoop {
|
|
10
12
|
options;
|
|
11
13
|
llmProvider;
|
|
12
14
|
activeCommandId = null;
|
|
15
|
+
toolContext;
|
|
16
|
+
toolDefinitions;
|
|
13
17
|
constructor(options) {
|
|
14
18
|
this.options = options;
|
|
15
19
|
this.llmProvider = (0, index_1.createProvider)(options.provider, {
|
|
16
20
|
apiKey: options.oauthToken || options.apiKey,
|
|
17
21
|
model: options.model,
|
|
18
22
|
});
|
|
23
|
+
this.toolContext = (0, index_2.createToolContext)(options.projectDir);
|
|
24
|
+
this.toolDefinitions = (0, index_2.getAllToolDefinitions)();
|
|
19
25
|
}
|
|
20
26
|
async handleCommand(command) {
|
|
21
27
|
if (command.type === 'ping') {
|
|
@@ -42,13 +48,15 @@ class MessageLoop {
|
|
|
42
48
|
const provider = command.model?.provider || this.options.provider;
|
|
43
49
|
const model = command.model?.model || this.options.model;
|
|
44
50
|
const apiKey = command.model?.apiKey || this.options.oauthToken || this.options.apiKey;
|
|
45
|
-
// Create provider if overridden
|
|
46
|
-
const
|
|
51
|
+
// Create provider if overridden, or if command forwarded a key
|
|
52
|
+
const hasOverride = provider !== this.options.provider || model !== this.options.model || command.model?.apiKey;
|
|
53
|
+
const llm = hasOverride
|
|
47
54
|
? (0, index_1.createProvider)(provider, { apiKey, model })
|
|
48
55
|
: this.llmProvider;
|
|
49
56
|
this.activeCommandId = command.id;
|
|
50
57
|
console.log(chalk_1.default.blue(`← Command ${command.id.slice(0, 8)}...`));
|
|
51
58
|
console.log(chalk_1.default.gray(` Prompt: ${command.prompt.slice(0, 100)}...`));
|
|
59
|
+
console.log(chalk_1.default.gray(` Provider: ${provider} / ${model} (override: ${command.model?.provider || 'none'}) key: ${apiKey?.slice(0, 15)}...`));
|
|
52
60
|
try {
|
|
53
61
|
// Build messages from context
|
|
54
62
|
const messages = [];
|
|
@@ -58,8 +66,9 @@ class MessageLoop {
|
|
|
58
66
|
messages.push({ role: msg.role, content: msg.content });
|
|
59
67
|
}
|
|
60
68
|
}
|
|
61
|
-
// Build system prompt with context
|
|
62
|
-
let systemPrompt =
|
|
69
|
+
// Build system prompt with context — use configured prompt or default
|
|
70
|
+
let systemPrompt = this.options.systemPrompt
|
|
71
|
+
|| 'You are a Funolio AI agent running locally on the user\'s machine. You have access to their project files and can execute code.';
|
|
63
72
|
if (command.context?.facts?.length) {
|
|
64
73
|
systemPrompt += '\n\nRelevant memory/facts:\n' + command.context.facts.map(f => `- ${f}`).join('\n');
|
|
65
74
|
}
|
|
@@ -77,6 +86,7 @@ class MessageLoop {
|
|
|
77
86
|
messages,
|
|
78
87
|
system: systemPrompt,
|
|
79
88
|
stream: true,
|
|
89
|
+
tools: this.toolDefinitions,
|
|
80
90
|
onChunk: async (chunk) => {
|
|
81
91
|
if (this.activeCommandId !== command.id)
|
|
82
92
|
return;
|
|
@@ -98,6 +108,29 @@ class MessageLoop {
|
|
|
98
108
|
});
|
|
99
109
|
for (const toolCall of response.toolCalls) {
|
|
100
110
|
console.log(chalk_1.default.cyan(` 🔧 Tool: ${toolCall.name}(${JSON.stringify(toolCall.arguments).slice(0, 60)}...)`));
|
|
111
|
+
// Check permission before execution
|
|
112
|
+
const permMode = this.options.permissionMode || 'autopilot';
|
|
113
|
+
const approval = (0, approval_1.checkPermission)(toolCall.name, permMode, this.options.enabledTools);
|
|
114
|
+
if (!approval.approved) {
|
|
115
|
+
console.log(chalk_1.default.yellow(` ⚠ Tool denied: ${approval.reason}`));
|
|
116
|
+
await this.options.mqttClient.publishResult({
|
|
117
|
+
commandId: command.id,
|
|
118
|
+
type: 'tool_result',
|
|
119
|
+
toolResult: {
|
|
120
|
+
callId: toolCall.id,
|
|
121
|
+
output: `PERMISSION_DENIED: ${approval.reason}`,
|
|
122
|
+
isError: true,
|
|
123
|
+
},
|
|
124
|
+
timestamp: Date.now(),
|
|
125
|
+
});
|
|
126
|
+
messages.push({
|
|
127
|
+
role: 'tool',
|
|
128
|
+
content: `PERMISSION_DENIED: ${approval.reason}`,
|
|
129
|
+
toolCallId: toolCall.id,
|
|
130
|
+
toolName: toolCall.name,
|
|
131
|
+
});
|
|
132
|
+
continue;
|
|
133
|
+
}
|
|
101
134
|
await this.options.mqttClient.publishResult({
|
|
102
135
|
commandId: command.id,
|
|
103
136
|
type: 'tool_call',
|
|
@@ -108,23 +141,28 @@ class MessageLoop {
|
|
|
108
141
|
},
|
|
109
142
|
timestamp: Date.now(),
|
|
110
143
|
});
|
|
111
|
-
//
|
|
112
|
-
|
|
113
|
-
const
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
};
|
|
144
|
+
// Execute the tool
|
|
145
|
+
const toolResult = await (0, index_2.executeAndVerify)({ id: toolCall.id, name: toolCall.name, arguments: toolCall.arguments }, this.toolContext);
|
|
146
|
+
const resultOutput = toolResult.success
|
|
147
|
+
? toolResult.output
|
|
148
|
+
: `ERROR: ${toolResult.error || 'Unknown error'}`;
|
|
149
|
+
console.log(chalk_1.default.gray(` Result: ${toolResult.success ? '✓' : '✗'} ${resultOutput.slice(0, 100)}${resultOutput.length > 100 ? '...' : ''}`));
|
|
118
150
|
await this.options.mqttClient.publishResult({
|
|
119
151
|
commandId: command.id,
|
|
120
152
|
type: 'tool_result',
|
|
121
|
-
toolResult
|
|
153
|
+
toolResult: {
|
|
154
|
+
callId: toolCall.id,
|
|
155
|
+
output: resultOutput,
|
|
156
|
+
isError: !toolResult.success,
|
|
157
|
+
},
|
|
122
158
|
timestamp: Date.now(),
|
|
123
159
|
});
|
|
124
|
-
// Add tool result to messages for
|
|
160
|
+
// Add tool result to messages using proper 'tool' role for provider formatting
|
|
125
161
|
messages.push({
|
|
126
|
-
role: '
|
|
127
|
-
content:
|
|
162
|
+
role: 'tool',
|
|
163
|
+
content: resultOutput,
|
|
164
|
+
toolCallId: toolCall.id,
|
|
165
|
+
toolName: toolCall.name,
|
|
128
166
|
});
|
|
129
167
|
}
|
|
130
168
|
// Continue the loop for the next LLM call
|
|
@@ -137,6 +175,7 @@ class MessageLoop {
|
|
|
137
175
|
content: response.content,
|
|
138
176
|
timestamp: Date.now(),
|
|
139
177
|
});
|
|
178
|
+
console.log(chalk_1.default.white(` Response: ${response.content?.slice(0, 200)}${(response.content?.length || 0) > 200 ? '...' : ''}`));
|
|
140
179
|
console.log(chalk_1.default.green(` ✓ Command complete (${iteration} iteration${iteration > 1 ? 's' : ''})`));
|
|
141
180
|
break;
|
|
142
181
|
}
|
package/dist/message-loop.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-loop.js","sourceRoot":"","sources":["../src/message-loop.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,
|
|
1
|
+
{"version":3,"file":"message-loop.js","sourceRoot":"","sources":["../src/message-loop.ts"],"names":[],"mappings":"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"}
|
package/dist/mqtt-client.d.ts
CHANGED
|
@@ -3,10 +3,12 @@ export interface MqttClientOptions {
|
|
|
3
3
|
userId: string;
|
|
4
4
|
mqttJwt: string;
|
|
5
5
|
heartbeatIntervalMs: number;
|
|
6
|
+
authToken?: string;
|
|
7
|
+
refreshUrl?: string;
|
|
6
8
|
}
|
|
7
9
|
export interface AgentCommand {
|
|
8
10
|
id: string;
|
|
9
|
-
type: 'prompt' | 'cancel' | 'ping' | 'bot_add' | 'bot_remove' | 'bot_update';
|
|
11
|
+
type: 'prompt' | 'cancel' | 'ping' | 'bot_add' | 'bot_remove' | 'bot_update' | 'agent_add' | 'agent_remove' | 'agent_update';
|
|
10
12
|
prompt?: string;
|
|
11
13
|
context?: {
|
|
12
14
|
conversationId?: string;
|
|
@@ -55,8 +57,12 @@ export declare class AgentMqttClient {
|
|
|
55
57
|
private client;
|
|
56
58
|
private options;
|
|
57
59
|
private heartbeatTimer;
|
|
60
|
+
private refreshTimer;
|
|
58
61
|
private commandHandler;
|
|
59
62
|
private reconnectCount;
|
|
63
|
+
private static readonly MAX_RECONNECT_ATTEMPTS;
|
|
64
|
+
private static readonly REFRESH_BEFORE_EXPIRY_MS;
|
|
65
|
+
private static readonly JWT_TTL_MS;
|
|
60
66
|
constructor(options: MqttClientOptions);
|
|
61
67
|
connect(): Promise<void>;
|
|
62
68
|
onCommand(handler: CommandHandler): void;
|
|
@@ -64,6 +70,18 @@ export declare class AgentMqttClient {
|
|
|
64
70
|
private publishStatus;
|
|
65
71
|
private startHeartbeat;
|
|
66
72
|
private stopHeartbeat;
|
|
73
|
+
publishConfigSync(config: {
|
|
74
|
+
name: string;
|
|
75
|
+
providers: {
|
|
76
|
+
id: string;
|
|
77
|
+
model: string;
|
|
78
|
+
}[];
|
|
79
|
+
mcpTools: string[];
|
|
80
|
+
permissionMode: string;
|
|
81
|
+
}): void;
|
|
82
|
+
private startRefreshTimer;
|
|
83
|
+
private stopRefreshTimer;
|
|
84
|
+
private refreshMqttJwt;
|
|
67
85
|
publishProviders(providers: {
|
|
68
86
|
id: string;
|
|
69
87
|
model: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mqtt-client.d.ts","sourceRoot":"","sources":["../src/mqtt-client.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,iBAAiB;IAChC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,mBAAmB,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"mqtt-client.d.ts","sourceRoot":"","sources":["../src/mqtt-client.ts"],"names":[],"mappings":"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"}
|
package/dist/mqtt-client.js
CHANGED
|
@@ -10,12 +10,23 @@ class AgentMqttClient {
|
|
|
10
10
|
client = null;
|
|
11
11
|
options;
|
|
12
12
|
heartbeatTimer = null;
|
|
13
|
+
refreshTimer = null;
|
|
13
14
|
commandHandler = null;
|
|
14
15
|
reconnectCount = 0;
|
|
16
|
+
static MAX_RECONNECT_ATTEMPTS = 10;
|
|
17
|
+
static REFRESH_BEFORE_EXPIRY_MS = 5 * 60 * 1000; // 5 minutes
|
|
18
|
+
static JWT_TTL_MS = 60 * 60 * 1000; // 1 hour
|
|
15
19
|
constructor(options) {
|
|
16
20
|
this.options = options;
|
|
17
21
|
}
|
|
18
22
|
async connect() {
|
|
23
|
+
// Pre-connect validation: userId and mqttJwt must be non-empty strings
|
|
24
|
+
if (!this.options.userId || typeof this.options.userId !== 'string' || this.options.userId.trim() === '') {
|
|
25
|
+
throw new Error('Cannot connect to MQTT: userId is missing or empty. Please run \'funolio-agent login\' to set up your credentials.');
|
|
26
|
+
}
|
|
27
|
+
if (!this.options.mqttJwt || typeof this.options.mqttJwt !== 'string' || this.options.mqttJwt.trim() === '') {
|
|
28
|
+
throw new Error('Cannot connect to MQTT: mqttJwt is missing or empty. Please run \'funolio-agent login\' to set up your credentials.');
|
|
29
|
+
}
|
|
19
30
|
return new Promise((resolve, reject) => {
|
|
20
31
|
const clientId = `funolio-agent-${this.options.userId}-${Date.now()}`;
|
|
21
32
|
const mqttOptions = {
|
|
@@ -26,6 +37,7 @@ class AgentMqttClient {
|
|
|
26
37
|
keepalive: 60,
|
|
27
38
|
reconnectPeriod: 5000,
|
|
28
39
|
connectTimeout: 10000,
|
|
40
|
+
rejectUnauthorized: false, // EMQX uses self-signed TLS cert
|
|
29
41
|
will: {
|
|
30
42
|
topic: `funolio/${this.options.userId}/agent/status`,
|
|
31
43
|
payload: Buffer.from(JSON.stringify({
|
|
@@ -50,6 +62,8 @@ class AgentMqttClient {
|
|
|
50
62
|
this.publishStatus('online');
|
|
51
63
|
// Start heartbeat
|
|
52
64
|
this.startHeartbeat();
|
|
65
|
+
// Start JWT refresh timer
|
|
66
|
+
this.startRefreshTimer();
|
|
53
67
|
resolve();
|
|
54
68
|
});
|
|
55
69
|
});
|
|
@@ -66,7 +80,12 @@ class AgentMqttClient {
|
|
|
66
80
|
});
|
|
67
81
|
this.client.on('reconnect', () => {
|
|
68
82
|
this.reconnectCount++;
|
|
69
|
-
console.log(chalk_1.default.yellow(`⟳ Reconnecting to MQTT broker... (attempt ${this.reconnectCount})`));
|
|
83
|
+
console.log(chalk_1.default.yellow(`⟳ Reconnecting to MQTT broker... (attempt ${this.reconnectCount}/${AgentMqttClient.MAX_RECONNECT_ATTEMPTS})`));
|
|
84
|
+
if (this.reconnectCount >= AgentMqttClient.MAX_RECONNECT_ATTEMPTS) {
|
|
85
|
+
console.error(chalk_1.default.red(`\n✗ Max reconnect attempts (${AgentMqttClient.MAX_RECONNECT_ATTEMPTS}) reached.`));
|
|
86
|
+
console.error(chalk_1.default.red(' Authentication failed. Please run \'funolio-agent login\' to set up your credentials.'));
|
|
87
|
+
this.client?.end(true);
|
|
88
|
+
}
|
|
70
89
|
});
|
|
71
90
|
this.client.on('offline', () => {
|
|
72
91
|
console.log(chalk_1.default.gray(' MQTT client went offline'));
|
|
@@ -140,6 +159,67 @@ class AgentMqttClient {
|
|
|
140
159
|
this.heartbeatTimer = null;
|
|
141
160
|
}
|
|
142
161
|
}
|
|
162
|
+
publishConfigSync(config) {
|
|
163
|
+
if (!this.client?.connected)
|
|
164
|
+
return;
|
|
165
|
+
const topic = `funolio/${this.options.userId}/agent/config`;
|
|
166
|
+
const payload = JSON.stringify({
|
|
167
|
+
...config,
|
|
168
|
+
timestamp: Date.now(),
|
|
169
|
+
});
|
|
170
|
+
this.client.publish(topic, payload, { qos: 1, retain: true });
|
|
171
|
+
}
|
|
172
|
+
startRefreshTimer() {
|
|
173
|
+
this.stopRefreshTimer();
|
|
174
|
+
if (!this.options.authToken)
|
|
175
|
+
return;
|
|
176
|
+
const refreshIn = AgentMqttClient.JWT_TTL_MS - AgentMqttClient.REFRESH_BEFORE_EXPIRY_MS;
|
|
177
|
+
this.refreshTimer = setTimeout(() => this.refreshMqttJwt(), refreshIn);
|
|
178
|
+
}
|
|
179
|
+
stopRefreshTimer() {
|
|
180
|
+
if (this.refreshTimer) {
|
|
181
|
+
clearTimeout(this.refreshTimer);
|
|
182
|
+
this.refreshTimer = null;
|
|
183
|
+
}
|
|
184
|
+
}
|
|
185
|
+
async refreshMqttJwt(attempt = 0) {
|
|
186
|
+
const maxRetries = 3;
|
|
187
|
+
const refreshUrl = this.options.refreshUrl || 'https://www.funolio.com/api/v1/agent/auth/refresh';
|
|
188
|
+
try {
|
|
189
|
+
const res = await fetch(refreshUrl, {
|
|
190
|
+
method: 'POST',
|
|
191
|
+
headers: { 'Content-Type': 'application/json' },
|
|
192
|
+
body: JSON.stringify({ token: this.options.authToken }),
|
|
193
|
+
});
|
|
194
|
+
if (!res.ok) {
|
|
195
|
+
throw new Error(`Refresh failed: ${res.status} ${res.statusText}`);
|
|
196
|
+
}
|
|
197
|
+
const data = await res.json();
|
|
198
|
+
console.log(chalk_1.default.green('✓ MQTT JWT refreshed'));
|
|
199
|
+
// Update options with new JWT
|
|
200
|
+
this.options.mqttJwt = data.mqttJwt;
|
|
201
|
+
// Disconnect and reconnect with new JWT
|
|
202
|
+
if (this.client) {
|
|
203
|
+
this.stopHeartbeat();
|
|
204
|
+
this.client.end(true, {}, () => {
|
|
205
|
+
this.client = null;
|
|
206
|
+
this.connect().catch((err) => {
|
|
207
|
+
console.error(chalk_1.default.red(`✗ Reconnect after refresh failed: ${err.message}`));
|
|
208
|
+
});
|
|
209
|
+
});
|
|
210
|
+
}
|
|
211
|
+
}
|
|
212
|
+
catch (err) {
|
|
213
|
+
console.error(chalk_1.default.red(`✗ MQTT JWT refresh failed (attempt ${attempt + 1}/${maxRetries}): ${err.message}`));
|
|
214
|
+
if (attempt < maxRetries - 1) {
|
|
215
|
+
const backoff = Math.pow(2, attempt) * 1000;
|
|
216
|
+
setTimeout(() => this.refreshMqttJwt(attempt + 1), backoff);
|
|
217
|
+
}
|
|
218
|
+
else {
|
|
219
|
+
console.error(chalk_1.default.red('✗ All MQTT JWT refresh attempts failed'));
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
}
|
|
143
223
|
publishProviders(providers) {
|
|
144
224
|
if (!this.client?.connected)
|
|
145
225
|
return;
|
|
@@ -152,6 +232,7 @@ class AgentMqttClient {
|
|
|
152
232
|
}
|
|
153
233
|
async disconnect() {
|
|
154
234
|
this.stopHeartbeat();
|
|
235
|
+
this.stopRefreshTimer();
|
|
155
236
|
this.publishStatus('offline');
|
|
156
237
|
return new Promise((resolve) => {
|
|
157
238
|
if (this.client) {
|
package/dist/mqtt-client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mqtt-client.js","sourceRoot":"","sources":["../src/mqtt-client.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAwD;AACxD,kDAA0B;
|
|
1
|
+
{"version":3,"file":"mqtt-client.js","sourceRoot":"","sources":["../src/mqtt-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ export declare class AnthropicProvider implements LLMProvider {
|
|
|
5
5
|
constructor(config: LLMProviderConfig);
|
|
6
6
|
chat(options: LLMChatOptions): Promise<LLMResponse>;
|
|
7
7
|
private chatStream;
|
|
8
|
+
private buildHeaders;
|
|
8
9
|
private parseResponse;
|
|
9
10
|
}
|
|
10
11
|
//# sourceMappingURL=anthropic.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../../src/providers/anthropic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAe,MAAM,SAAS,CAAC;AAGnG,qBAAa,iBAAkB,YAAW,WAAW;IACnD,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,OAAO,CAAkC;gBAErC,MAAM,EAAE,iBAAiB;IAI/B,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"anthropic.d.ts","sourceRoot":"","sources":["../../src/providers/anthropic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAe,MAAM,SAAS,CAAC;AAGnG,qBAAa,iBAAkB,YAAW,WAAW;IACnD,OAAO,CAAC,MAAM,CAAoB;IAClC,OAAO,CAAC,OAAO,CAAkC;gBAErC,MAAM,EAAE,iBAAiB;IAI/B,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;YAmF3C,UAAU;IAsGxB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,aAAa;CA0BtB"}
|
|
@@ -10,23 +10,46 @@ class AnthropicProvider {
|
|
|
10
10
|
}
|
|
11
11
|
async chat(options) {
|
|
12
12
|
return (0, retry_1.withRetry)(async () => {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
type: 'tool_use',
|
|
21
|
-
id: tc.id,
|
|
22
|
-
name: tc.name,
|
|
23
|
-
input: tc.arguments,
|
|
24
|
-
})),
|
|
25
|
-
],
|
|
26
|
-
};
|
|
13
|
+
// Build Anthropic message format, grouping consecutive tool results into one user message
|
|
14
|
+
const messages = [];
|
|
15
|
+
let pendingToolResults = [];
|
|
16
|
+
const flushToolResults = () => {
|
|
17
|
+
if (pendingToolResults.length > 0) {
|
|
18
|
+
messages.push({ role: 'user', content: pendingToolResults });
|
|
19
|
+
pendingToolResults = [];
|
|
27
20
|
}
|
|
28
|
-
|
|
29
|
-
|
|
21
|
+
};
|
|
22
|
+
for (const m of options.messages) {
|
|
23
|
+
if (m.role === 'tool') {
|
|
24
|
+
// Accumulate tool results — Anthropic expects them as tool_result blocks in a user message
|
|
25
|
+
pendingToolResults.push({
|
|
26
|
+
type: 'tool_result',
|
|
27
|
+
tool_use_id: m.toolCallId,
|
|
28
|
+
content: m.content,
|
|
29
|
+
});
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
flushToolResults();
|
|
33
|
+
if (m.role === 'assistant' && m.toolCalls?.length) {
|
|
34
|
+
messages.push({
|
|
35
|
+
role: 'assistant',
|
|
36
|
+
content: [
|
|
37
|
+
...(m.content ? [{ type: 'text', text: m.content }] : []),
|
|
38
|
+
...m.toolCalls.map(tc => ({
|
|
39
|
+
type: 'tool_use',
|
|
40
|
+
id: tc.id,
|
|
41
|
+
name: tc.name,
|
|
42
|
+
input: tc.arguments,
|
|
43
|
+
})),
|
|
44
|
+
],
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
else if (m.role !== 'system') {
|
|
48
|
+
messages.push({ role: m.role, content: m.content });
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
flushToolResults();
|
|
30
53
|
const body = {
|
|
31
54
|
model: this.config.model,
|
|
32
55
|
max_tokens: 4096,
|
|
@@ -35,16 +58,20 @@ class AnthropicProvider {
|
|
|
35
58
|
if (options.system) {
|
|
36
59
|
body.system = options.system;
|
|
37
60
|
}
|
|
61
|
+
// Pass tool definitions if provided
|
|
62
|
+
if (options.tools?.length) {
|
|
63
|
+
body.tools = options.tools.map(t => ({
|
|
64
|
+
name: t.name,
|
|
65
|
+
description: t.description,
|
|
66
|
+
input_schema: t.parameters,
|
|
67
|
+
}));
|
|
68
|
+
}
|
|
38
69
|
if (options.stream && options.onChunk) {
|
|
39
70
|
return this.chatStream(body, options.onChunk);
|
|
40
71
|
}
|
|
41
72
|
const response = await fetch(`${this.baseUrl}/messages`, {
|
|
42
73
|
method: 'POST',
|
|
43
|
-
headers:
|
|
44
|
-
'Content-Type': 'application/json',
|
|
45
|
-
'x-api-key': this.config.apiKey,
|
|
46
|
-
'anthropic-version': '2023-06-01',
|
|
47
|
-
},
|
|
74
|
+
headers: this.buildHeaders(),
|
|
48
75
|
body: JSON.stringify(body),
|
|
49
76
|
});
|
|
50
77
|
if (!response.ok) {
|
|
@@ -60,11 +87,7 @@ class AnthropicProvider {
|
|
|
60
87
|
body.stream = true;
|
|
61
88
|
const response = await fetch(`${this.baseUrl}/messages`, {
|
|
62
89
|
method: 'POST',
|
|
63
|
-
headers:
|
|
64
|
-
'Content-Type': 'application/json',
|
|
65
|
-
'x-api-key': this.config.apiKey,
|
|
66
|
-
'anthropic-version': '2023-06-01',
|
|
67
|
-
},
|
|
90
|
+
headers: this.buildHeaders(),
|
|
68
91
|
body: JSON.stringify(body),
|
|
69
92
|
});
|
|
70
93
|
if (!response.ok) {
|
|
@@ -153,6 +176,15 @@ class AnthropicProvider {
|
|
|
153
176
|
usage: { inputTokens, outputTokens },
|
|
154
177
|
};
|
|
155
178
|
}
|
|
179
|
+
buildHeaders() {
|
|
180
|
+
const headers = {
|
|
181
|
+
'Content-Type': 'application/json',
|
|
182
|
+
'anthropic-version': '2023-06-01',
|
|
183
|
+
};
|
|
184
|
+
// All Anthropic keys (including OAuth tokens sk-ant-oat*) use x-api-key
|
|
185
|
+
headers['x-api-key'] = this.config.apiKey;
|
|
186
|
+
return headers;
|
|
187
|
+
}
|
|
156
188
|
parseResponse(data) {
|
|
157
189
|
let content = '';
|
|
158
190
|
const toolCalls = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../src/providers/anthropic.ts"],"names":[],"mappings":";;;AACA,mCAAoC;AAEpC,MAAa,iBAAiB;IACpB,MAAM,CAAoB;IAC1B,OAAO,GAAG,8BAA8B,CAAC;IAEjD,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,GAAG,
|
|
1
|
+
{"version":3,"file":"anthropic.js","sourceRoot":"","sources":["../../src/providers/anthropic.ts"],"names":[],"mappings":";;;AACA,mCAAoC;AAEpC,MAAa,iBAAiB;IACpB,MAAM,CAAoB;IAC1B,OAAO,GAAG,8BAA8B,CAAC;IAEjD,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,0FAA0F;YAC1F,MAAM,QAAQ,GAAU,EAAE,CAAC;YAC3B,IAAI,kBAAkB,GAAU,EAAE,CAAC;YAEnC,MAAM,gBAAgB,GAAG,GAAG,EAAE;gBAC5B,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC,CAAC;oBAC7D,kBAAkB,GAAG,EAAE,CAAC;gBAC1B,CAAC;YACH,CAAC,CAAC;YAEF,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;gBACjC,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBACtB,2FAA2F;oBAC3F,kBAAkB,CAAC,IAAI,CAAC;wBACtB,IAAI,EAAE,aAAsB;wBAC5B,WAAW,EAAE,CAAC,CAAC,UAAU;wBACzB,OAAO,EAAE,CAAC,CAAC,OAAO;qBACnB,CAAC,CAAC;gBACL,CAAC;qBAAM,CAAC;oBACN,gBAAgB,EAAE,CAAC;oBACnB,IAAI,CAAC,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC;wBAClD,QAAQ,CAAC,IAAI,CAAC;4BACZ,IAAI,EAAE,WAAoB;4BAC1B,OAAO,EAAE;gCACP,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,MAAe,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gCAClE,GAAG,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;oCACxB,IAAI,EAAE,UAAmB;oCACzB,EAAE,EAAE,EAAE,CAAC,EAAE;oCACT,IAAI,EAAE,EAAE,CAAC,IAAI;oCACb,KAAK,EAAE,EAAE,CAAC,SAAS;iCACpB,CAAC,CAAC;6BACJ;yBACF,CAAC,CAAC;oBACL,CAAC;yBAAM,IAAI,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;wBAC/B,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;oBACtD,CAAC;gBACH,CAAC;YACH,CAAC;YACD,gBAAgB,EAAE,CAAC;YAEnB,MAAM,IAAI,GAAwB;gBAChC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK;gBACxB,UAAU,EAAE,IAAI;gBAChB,QAAQ;aACT,CAAC;YAEF,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;YAC/B,CAAC;YAED,oCAAoC;YACpC,IAAI,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,CAAC;gBAC1B,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;oBACnC,IAAI,EAAE,CAAC,CAAC,IAAI;oBACZ,WAAW,EAAE,CAAC,CAAC,WAAW;oBAC1B,YAAY,EAAE,CAAC,CAAC,UAAU;iBAC3B,CAAC,CAAC,CAAC;YACN,CAAC;YAED,IAAI,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBACtC,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;YAChD,CAAC;YAED,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,WAAW,EAAE;gBACvD,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE;gBAC5B,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,wBAAwB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;gBACxE,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,IAAyB,EAAE,OAAyC;QAC3F,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QAEnB,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,IAAI,CAAC,OAAO,WAAW,EAAE;YACvD,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE;YAC5B,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,wBAAwB,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;YACxE,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,eAAe,GAAgC,IAAI,CAAC;QACxD,IAAI,YAAY,GAAG,EAAE,CAAC;QACtB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,YAAY,GAAG,CAAC,CAAC;QAErB,IAAI,MAAM,GAAG,EAAE,CAAC;QAEhB,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,IAAI,KAAK,QAAQ;oBAAE,SAAS;gBAEhC,IAAI,CAAC;oBACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAE/B,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;wBACnB,KAAK,qBAAqB;4BACxB,IAAI,KAAK,CAAC,aAAa,EAAE,IAAI,KAAK,UAAU,EAAE,CAAC;gCAC7C,eAAe,GAAG;oCAChB,EAAE,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE;oCAC1B,IAAI,EAAE,KAAK,CAAC,aAAa,CAAC,IAAI;iCAC/B,CAAC;gCACF,YAAY,GAAG,EAAE,CAAC;4BACpB,CAAC;4BACD,MAAM;wBAER,KAAK,qBAAqB;4BACxB,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,KAAK,YAAY,EAAE,CAAC;gCACvC,WAAW,IAAI,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC;gCAChC,MAAM,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;4BAClC,CAAC;iCAAM,IAAI,KAAK,CAAC,KAAK,EAAE,IAAI,KAAK,kBAAkB,EAAE,CAAC;gCACpD,YAAY,IAAI,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC;4BAC3C,CAAC;4BACD,MAAM;wBAER,KAAK,oBAAoB;4BACvB,IAAI,eAAe,EAAE,CAAC;gCACpB,IAAI,CAAC;oCACH,eAAe,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,IAAI,CAAC,CAAC;gCAC/D,CAAC;gCAAC,MAAM,CAAC;oCACP,eAAe,CAAC,SAAS,GAAG,EAAE,CAAC;gCACjC,CAAC;gCACD,SAAS,CAAC,IAAI,CAAC,eAA8B,CAAC,CAAC;gCAC/C,eAAe,GAAG,IAAI,CAAC;gCACvB,YAAY,GAAG,EAAE,CAAC;4BACpB,CAAC;4BACD,MAAM;wBAER,KAAK,eAAe;4BAClB,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;gCAChB,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,CAAC;4BAChD,CAAC;4BACD,MAAM;wBAER,KAAK,eAAe;4BAClB,IAAI,KAAK,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC;gCACzB,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,CAAC;4BACtD,CAAC;4BACD,MAAM;oBACV,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;YACvD,KAAK,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE;SACrC,CAAC;IACJ,CAAC;IAEO,YAAY;QAClB,MAAM,OAAO,GAA2B;YACtC,cAAc,EAAE,kBAAkB;YAClC,mBAAmB,EAAE,YAAY;SAClC,CAAC;QAEF,wEAAwE;QACxE,OAAO,CAAC,WAAW,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAE1C,OAAO,OAAO,CAAC;IACjB,CAAC;IAEO,aAAa,CAAC,IAAS;QAC7B,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,MAAM,SAAS,GAAkB,EAAE,CAAC;QAEpC,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,OAAO,IAAI,EAAE,EAAE,CAAC;YACvC,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAC1B,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC;YACxB,CAAC;iBAAM,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;gBACrC,SAAS,CAAC,IAAI,CAAC;oBACb,EAAE,EAAE,KAAK,CAAC,EAAE;oBACZ,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,SAAS,EAAE,KAAK,CAAC,KAAK;iBACvB,CAAC,CAAC;YACL,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,KAAK,CAAC,CAAC,CAAC;gBAClB,WAAW,EAAE,IAAI,CAAC,KAAK,CAAC,YAAY;gBACpC,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,aAAa;aACvC,CAAC,CAAC,CAAC,SAAS;YACb,YAAY,EAAE,IAAI,CAAC,WAAW;SAC/B,CAAC;IACJ,CAAC;CACF;AAvOD,8CAuOC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-cli.d.ts","sourceRoot":"","sources":["../../src/providers/claude-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"claude-cli.d.ts","sourceRoot":"","sources":["../../src/providers/claude-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAOtF;;;GAGG;AACH,qBAAa,iBAAkB,YAAW,WAAW;IACnD,OAAO,CAAC,MAAM,CAAoB;gBAEtB,MAAM,EAAE,iBAAiB;IAI/B,IAAI,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC;IAkDzD,OAAO,CAAC,WAAW;CAkFpB"}
|