zora-agent 0.9.4 → 0.9.6
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 +1 -1
- package/README.md +103 -92
- package/dist/cli/audit-commands.d.ts.map +1 -1
- package/dist/cli/audit-commands.js +3 -1
- package/dist/cli/audit-commands.js.map +1 -1
- package/dist/cli/daemon.js +86 -28
- package/dist/cli/daemon.js.map +1 -1
- package/dist/cli/edit-commands.d.ts.map +1 -1
- package/dist/cli/edit-commands.js +3 -1
- package/dist/cli/edit-commands.js.map +1 -1
- package/dist/cli/hook-commands.d.ts +9 -0
- package/dist/cli/hook-commands.d.ts.map +1 -0
- package/dist/cli/hook-commands.js +106 -0
- package/dist/cli/hook-commands.js.map +1 -0
- package/dist/cli/index.js +87 -35
- package/dist/cli/index.js.map +1 -1
- package/dist/cli/init-command.d.ts.map +1 -1
- package/dist/cli/init-command.js +108 -9
- package/dist/cli/init-command.js.map +1 -1
- package/dist/cli/memory-commands.d.ts +1 -1
- package/dist/cli/memory-commands.d.ts.map +1 -1
- package/dist/cli/memory-commands.js +213 -1
- package/dist/cli/memory-commands.js.map +1 -1
- package/dist/cli/presets.d.ts.map +1 -1
- package/dist/cli/presets.js +2 -1
- package/dist/cli/presets.js.map +1 -1
- package/dist/cli/skill-commands.d.ts.map +1 -1
- package/dist/cli/skill-commands.js +4 -2
- package/dist/cli/skill-commands.js.map +1 -1
- package/dist/cli/steer-commands.d.ts.map +1 -1
- package/dist/cli/steer-commands.js +6 -4
- package/dist/cli/steer-commands.js.map +1 -1
- package/dist/cli/team-commands.d.ts.map +1 -1
- package/dist/cli/team-commands.js +3 -1
- package/dist/cli/team-commands.js.map +1 -1
- package/dist/config/defaults.d.ts.map +1 -1
- package/dist/config/defaults.js +12 -2
- package/dist/config/defaults.js.map +1 -1
- package/dist/config/loader.d.ts +23 -0
- package/dist/config/loader.d.ts.map +1 -1
- package/dist/config/loader.js +64 -3
- package/dist/config/loader.js.map +1 -1
- package/dist/config/policy-loader.d.ts +14 -0
- package/dist/config/policy-loader.d.ts.map +1 -1
- package/dist/config/policy-loader.js +33 -0
- package/dist/config/policy-loader.js.map +1 -1
- package/dist/dashboard/frontend/dist/assets/index-BcOGj1EF.css +1 -0
- package/dist/dashboard/frontend/dist/assets/index-BtiFO9YN.js +261 -0
- package/dist/dashboard/frontend/dist/assets/index-Cfjy5acU.css +1 -0
- package/dist/dashboard/frontend/dist/assets/index-D41hcjgc.js +253 -0
- package/dist/dashboard/frontend/dist/assets/index-D83BawFd.css +1 -0
- package/dist/dashboard/frontend/dist/assets/index-DAODjoxu.css +1 -0
- package/dist/dashboard/frontend/dist/assets/index-DB-Eu5oV.js +253 -0
- package/dist/dashboard/frontend/dist/assets/index-W0VVEDu6.js +253 -0
- package/dist/dashboard/frontend/dist/index.html +17 -0
- package/dist/dashboard/server.d.ts +19 -2
- package/dist/dashboard/server.d.ts.map +1 -1
- package/dist/dashboard/server.js +121 -20
- package/dist/dashboard/server.js.map +1 -1
- package/dist/hooks/hook-runner.d.ts +55 -0
- package/dist/hooks/hook-runner.d.ts.map +1 -0
- package/dist/hooks/hook-runner.js +120 -0
- package/dist/hooks/hook-runner.js.map +1 -0
- package/dist/hooks/hook-types.d.ts +82 -0
- package/dist/hooks/hook-types.d.ts.map +1 -0
- package/dist/hooks/hook-types.js +20 -0
- package/dist/hooks/hook-types.js.map +1 -0
- package/dist/hooks/index.d.ts +6 -0
- package/dist/hooks/index.d.ts.map +1 -0
- package/dist/hooks/index.js +6 -0
- package/dist/hooks/index.js.map +1 -0
- package/dist/memory/context-compressor.d.ts +108 -0
- package/dist/memory/context-compressor.d.ts.map +1 -0
- package/dist/memory/context-compressor.js +307 -0
- package/dist/memory/context-compressor.js.map +1 -0
- package/dist/memory/index.d.ts +1 -0
- package/dist/memory/index.d.ts.map +1 -1
- package/dist/memory/index.js +1 -0
- package/dist/memory/index.js.map +1 -1
- package/dist/memory/memory-manager.d.ts +88 -4
- package/dist/memory/memory-manager.d.ts.map +1 -1
- package/dist/memory/memory-manager.js +299 -7
- package/dist/memory/memory-manager.js.map +1 -1
- package/dist/memory/observation-store.d.ts +75 -0
- package/dist/memory/observation-store.d.ts.map +1 -0
- package/dist/memory/observation-store.js +162 -0
- package/dist/memory/observation-store.js.map +1 -0
- package/dist/memory/observer-worker.d.ts +34 -0
- package/dist/memory/observer-worker.d.ts.map +1 -0
- package/dist/memory/observer-worker.js +161 -0
- package/dist/memory/observer-worker.js.map +1 -0
- package/dist/memory/reflector-worker.d.ts +40 -0
- package/dist/memory/reflector-worker.d.ts.map +1 -0
- package/dist/memory/reflector-worker.js +185 -0
- package/dist/memory/reflector-worker.js.map +1 -0
- package/dist/memory/salience-scorer.d.ts +16 -6
- package/dist/memory/salience-scorer.d.ts.map +1 -1
- package/dist/memory/salience-scorer.js +42 -22
- package/dist/memory/salience-scorer.js.map +1 -1
- package/dist/memory/structured-memory.d.ts +36 -1
- package/dist/memory/structured-memory.d.ts.map +1 -1
- package/dist/memory/structured-memory.js +207 -8
- package/dist/memory/structured-memory.js.map +1 -1
- package/dist/memory/token-estimator.d.ts +31 -0
- package/dist/memory/token-estimator.d.ts.map +1 -0
- package/dist/memory/token-estimator.js +77 -0
- package/dist/memory/token-estimator.js.map +1 -0
- package/dist/memory/validation-pipeline.d.ts +37 -0
- package/dist/memory/validation-pipeline.d.ts.map +1 -0
- package/dist/memory/validation-pipeline.js +106 -0
- package/dist/memory/validation-pipeline.js.map +1 -0
- package/dist/orchestrator/auth-monitor.d.ts.map +1 -1
- package/dist/orchestrator/auth-monitor.js +3 -1
- package/dist/orchestrator/auth-monitor.js.map +1 -1
- package/dist/orchestrator/execution-loop.d.ts +23 -0
- package/dist/orchestrator/execution-loop.d.ts.map +1 -1
- package/dist/orchestrator/execution-loop.js +60 -19
- package/dist/orchestrator/execution-loop.js.map +1 -1
- package/dist/orchestrator/failover-controller.d.ts +26 -2
- package/dist/orchestrator/failover-controller.d.ts.map +1 -1
- package/dist/orchestrator/failover-controller.js +143 -23
- package/dist/orchestrator/failover-controller.js.map +1 -1
- package/dist/orchestrator/orchestrator.d.ts +70 -7
- package/dist/orchestrator/orchestrator.d.ts.map +1 -1
- package/dist/orchestrator/orchestrator.js +416 -92
- package/dist/orchestrator/orchestrator.js.map +1 -1
- package/dist/orchestrator/retry-queue.d.ts.map +1 -1
- package/dist/orchestrator/retry-queue.js +24 -9
- package/dist/orchestrator/retry-queue.js.map +1 -1
- package/dist/orchestrator/router.d.ts +16 -1
- package/dist/orchestrator/router.d.ts.map +1 -1
- package/dist/orchestrator/router.js +79 -20
- package/dist/orchestrator/router.js.map +1 -1
- package/dist/orchestrator/session-manager.d.ts +26 -1
- package/dist/orchestrator/session-manager.d.ts.map +1 -1
- package/dist/orchestrator/session-manager.js +88 -4
- package/dist/orchestrator/session-manager.js.map +1 -1
- package/dist/providers/circuit-breaker.d.ts +78 -0
- package/dist/providers/circuit-breaker.d.ts.map +1 -0
- package/dist/providers/circuit-breaker.js +129 -0
- package/dist/providers/circuit-breaker.js.map +1 -0
- package/dist/providers/claude-provider.d.ts +27 -11
- package/dist/providers/claude-provider.d.ts.map +1 -1
- package/dist/providers/claude-provider.js +161 -46
- package/dist/providers/claude-provider.js.map +1 -1
- package/dist/providers/gemini-provider.d.ts +9 -1
- package/dist/providers/gemini-provider.d.ts.map +1 -1
- package/dist/providers/gemini-provider.js +97 -48
- package/dist/providers/gemini-provider.js.map +1 -1
- package/dist/providers/index.d.ts +1 -0
- package/dist/providers/index.d.ts.map +1 -1
- package/dist/providers/index.js +1 -0
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/ollama-provider.d.ts +7 -0
- package/dist/providers/ollama-provider.d.ts.map +1 -1
- package/dist/providers/ollama-provider.js +89 -18
- package/dist/providers/ollama-provider.js.map +1 -1
- package/dist/routines/heartbeat.d.ts +10 -2
- package/dist/routines/heartbeat.d.ts.map +1 -1
- package/dist/routines/heartbeat.js +42 -5
- package/dist/routines/heartbeat.js.map +1 -1
- package/dist/routines/routine-manager.d.ts.map +1 -1
- package/dist/routines/routine-manager.js +22 -15
- package/dist/routines/routine-manager.js.map +1 -1
- package/dist/security/audit-logger.d.ts.map +1 -1
- package/dist/security/audit-logger.js +5 -7
- package/dist/security/audit-logger.js.map +1 -1
- package/dist/security/policy-engine.d.ts +28 -17
- package/dist/security/policy-engine.d.ts.map +1 -1
- package/dist/security/policy-engine.js +42 -185
- package/dist/security/policy-engine.js.map +1 -1
- package/dist/security/policy-serializer.d.ts +19 -0
- package/dist/security/policy-serializer.d.ts.map +1 -0
- package/dist/security/policy-serializer.js +100 -0
- package/dist/security/policy-serializer.js.map +1 -0
- package/dist/security/shell-validator.d.ts +42 -0
- package/dist/security/shell-validator.d.ts.map +1 -0
- package/dist/security/shell-validator.js +231 -0
- package/dist/security/shell-validator.js.map +1 -0
- package/dist/skills/index.d.ts +1 -0
- package/dist/skills/index.d.ts.map +1 -1
- package/dist/skills/index.js +1 -0
- package/dist/skills/index.js.map +1 -1
- package/dist/skills/skill-loader.d.ts +38 -2
- package/dist/skills/skill-loader.d.ts.map +1 -1
- package/dist/skills/skill-loader.js +83 -2
- package/dist/skills/skill-loader.js.map +1 -1
- package/dist/skills/subagent-loader.d.ts +66 -0
- package/dist/skills/subagent-loader.d.ts.map +1 -0
- package/dist/skills/subagent-loader.js +143 -0
- package/dist/skills/subagent-loader.js.map +1 -0
- package/dist/steering/flag-manager.d.ts +20 -0
- package/dist/steering/flag-manager.d.ts.map +1 -1
- package/dist/steering/flag-manager.js +94 -11
- package/dist/steering/flag-manager.js.map +1 -1
- package/dist/steering/steering-manager.d.ts +11 -0
- package/dist/steering/steering-manager.d.ts.map +1 -1
- package/dist/steering/steering-manager.js +23 -0
- package/dist/steering/steering-manager.js.map +1 -1
- package/dist/steering/telegram-gateway.d.ts +4 -1
- package/dist/steering/telegram-gateway.d.ts.map +1 -1
- package/dist/steering/telegram-gateway.js +49 -10
- package/dist/steering/telegram-gateway.js.map +1 -1
- package/dist/teams/bridge-watchdog.d.ts.map +1 -1
- package/dist/teams/bridge-watchdog.js +5 -3
- package/dist/teams/bridge-watchdog.js.map +1 -1
- package/dist/teams/gemini-bridge.d.ts.map +1 -1
- package/dist/teams/gemini-bridge.js +9 -4
- package/dist/teams/gemini-bridge.js.map +1 -1
- package/dist/tools/index.d.ts +2 -0
- package/dist/tools/index.d.ts.map +1 -1
- package/dist/tools/index.js +2 -0
- package/dist/tools/index.js.map +1 -1
- package/dist/tools/memory-tools.d.ts +16 -0
- package/dist/tools/memory-tools.d.ts.map +1 -0
- package/dist/tools/memory-tools.js +207 -0
- package/dist/tools/memory-tools.js.map +1 -0
- package/dist/tools/notifications.d.ts.map +1 -1
- package/dist/tools/notifications.js +3 -1
- package/dist/tools/notifications.js.map +1 -1
- package/dist/tools/tool-factory.d.ts +36 -0
- package/dist/tools/tool-factory.d.ts.map +1 -0
- package/dist/tools/tool-factory.js +55 -0
- package/dist/tools/tool-factory.js.map +1 -0
- package/dist/types.d.ts +205 -1
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +47 -1
- package/dist/types.js.map +1 -1
- package/dist/utils/errors.d.ts +21 -0
- package/dist/utils/errors.d.ts.map +1 -0
- package/dist/utils/errors.js +29 -0
- package/dist/utils/errors.js.map +1 -0
- package/dist/utils/event-filter.d.ts +25 -0
- package/dist/utils/event-filter.d.ts.map +1 -0
- package/dist/utils/event-filter.js +61 -0
- package/dist/utils/event-filter.js.map +1 -0
- package/dist/utils/logger.d.ts +33 -36
- package/dist/utils/logger.d.ts.map +1 -1
- package/dist/utils/logger.js +60 -130
- package/dist/utils/logger.js.map +1 -1
- package/dist/utils/validate-job-id.d.ts +6 -0
- package/dist/utils/validate-job-id.d.ts.map +1 -0
- package/dist/utils/validate-job-id.js +10 -0
- package/dist/utils/validate-job-id.js.map +1 -0
- package/package.json +12 -3
|
@@ -10,6 +10,10 @@
|
|
|
10
10
|
* Supports any model Ollama can run: Llama, Mistral, Qwen, Gemma,
|
|
11
11
|
* DeepSeek, Phi, CodeLlama, etc.
|
|
12
12
|
*/
|
|
13
|
+
import { isTextEvent, isSteeringEvent } from '../types.js';
|
|
14
|
+
import { createLogger } from '../utils/logger.js';
|
|
15
|
+
import { CircuitBreaker } from './circuit-breaker.js';
|
|
16
|
+
const log = createLogger('ollama-provider');
|
|
13
17
|
export class OllamaProvider {
|
|
14
18
|
name;
|
|
15
19
|
rank;
|
|
@@ -20,7 +24,11 @@ export class OllamaProvider {
|
|
|
20
24
|
_model;
|
|
21
25
|
/** Track active requests by jobId for abort support */
|
|
22
26
|
_activeRequests = new Map();
|
|
27
|
+
/** Circuit breaker for failure tracking (PROV-02) */
|
|
28
|
+
_circuitBreaker;
|
|
23
29
|
_lastAuthStatus = null;
|
|
30
|
+
_requestCount = 0;
|
|
31
|
+
_lastRequestAt = null;
|
|
24
32
|
constructor(options) {
|
|
25
33
|
const { config } = options;
|
|
26
34
|
this.name = config.name;
|
|
@@ -30,10 +38,14 @@ export class OllamaProvider {
|
|
|
30
38
|
this._config = config;
|
|
31
39
|
this._endpoint = (options.endpoint ?? config.endpoint ?? 'http://localhost:11434').replace(/\/$/, '');
|
|
32
40
|
this._model = config.model ?? 'llama3.2';
|
|
41
|
+
this._circuitBreaker = new CircuitBreaker();
|
|
33
42
|
}
|
|
34
43
|
async isAvailable() {
|
|
35
44
|
if (!this._config.enabled)
|
|
36
45
|
return false;
|
|
46
|
+
// PROV-02: Check circuit breaker before auth
|
|
47
|
+
if (this._circuitBreaker.isOpen())
|
|
48
|
+
return false;
|
|
37
49
|
const auth = await this.checkAuth();
|
|
38
50
|
return auth.valid;
|
|
39
51
|
}
|
|
@@ -73,17 +85,34 @@ export class OllamaProvider {
|
|
|
73
85
|
}
|
|
74
86
|
}
|
|
75
87
|
async getQuotaStatus() {
|
|
76
|
-
//
|
|
88
|
+
// PROV-01: Derive health score from circuit breaker state
|
|
89
|
+
// Local models have no quota limits, but circuit breaker reflects reliability
|
|
90
|
+
const cbState = this._circuitBreaker.getState();
|
|
77
91
|
return {
|
|
78
|
-
isExhausted:
|
|
92
|
+
isExhausted: cbState === 'OPEN',
|
|
79
93
|
remainingRequests: null,
|
|
80
94
|
cooldownUntil: null,
|
|
81
|
-
healthScore:
|
|
95
|
+
healthScore: this._circuitBreaker.healthScore,
|
|
82
96
|
};
|
|
83
97
|
}
|
|
84
98
|
async *execute(task) {
|
|
99
|
+
// PROV-02: Reject immediately if circuit breaker is OPEN
|
|
100
|
+
if (this._circuitBreaker.isOpen()) {
|
|
101
|
+
yield {
|
|
102
|
+
type: 'error',
|
|
103
|
+
timestamp: new Date(),
|
|
104
|
+
source: this.name,
|
|
105
|
+
content: {
|
|
106
|
+
message: `Circuit breaker is OPEN for provider ${this.name} — too many recent failures`,
|
|
107
|
+
isCircuitOpen: true,
|
|
108
|
+
},
|
|
109
|
+
};
|
|
110
|
+
return;
|
|
111
|
+
}
|
|
85
112
|
const abortController = new AbortController();
|
|
86
113
|
this._activeRequests.set(task.jobId, abortController);
|
|
114
|
+
this._requestCount++;
|
|
115
|
+
this._lastRequestAt = new Date();
|
|
87
116
|
const messages = this._buildMessages(task);
|
|
88
117
|
let response;
|
|
89
118
|
try {
|
|
@@ -101,28 +130,40 @@ export class OllamaProvider {
|
|
|
101
130
|
catch (err) {
|
|
102
131
|
const msg = err instanceof Error ? err.message : String(err);
|
|
103
132
|
this._lastAuthStatus = { valid: false, expiresAt: null, canAutoRefresh: true, requiresInteraction: false };
|
|
133
|
+
// PROV-02: Record failure on the circuit breaker
|
|
134
|
+
this._circuitBreaker.recordFailure();
|
|
104
135
|
yield {
|
|
105
136
|
type: 'error',
|
|
106
137
|
timestamp: new Date(),
|
|
138
|
+
source: this.name,
|
|
107
139
|
content: { message: `Ollama connection failed: ${msg}. Is Ollama running? (ollama serve)` },
|
|
108
140
|
};
|
|
109
141
|
this._activeRequests.delete(task.jobId);
|
|
110
142
|
return;
|
|
111
143
|
}
|
|
112
144
|
if (!response.ok) {
|
|
113
|
-
const body = await response.text().catch(() =>
|
|
145
|
+
const body = await response.text().catch((readErr) => {
|
|
146
|
+
log.error({ err: readErr }, 'Failed to read error response body');
|
|
147
|
+
return '';
|
|
148
|
+
});
|
|
149
|
+
// PROV-02: Record failure on the circuit breaker
|
|
150
|
+
this._circuitBreaker.recordFailure();
|
|
114
151
|
yield {
|
|
115
152
|
type: 'error',
|
|
116
153
|
timestamp: new Date(),
|
|
154
|
+
source: this.name,
|
|
117
155
|
content: { message: `Ollama API error ${response.status}: ${body}` },
|
|
118
156
|
};
|
|
119
157
|
this._activeRequests.delete(task.jobId);
|
|
120
158
|
return;
|
|
121
159
|
}
|
|
122
160
|
if (!response.body) {
|
|
161
|
+
// PROV-02: Record failure on the circuit breaker
|
|
162
|
+
this._circuitBreaker.recordFailure();
|
|
123
163
|
yield {
|
|
124
164
|
type: 'error',
|
|
125
165
|
timestamp: new Date(),
|
|
166
|
+
source: this.name,
|
|
126
167
|
content: { message: 'Ollama returned no response body' },
|
|
127
168
|
};
|
|
128
169
|
this._activeRequests.delete(task.jobId);
|
|
@@ -136,17 +177,30 @@ export class OllamaProvider {
|
|
|
136
177
|
continue;
|
|
137
178
|
let chunk;
|
|
138
179
|
try {
|
|
139
|
-
|
|
180
|
+
const parsed = JSON.parse(line);
|
|
181
|
+
if (!parsed || typeof parsed !== 'object' || Array.isArray(parsed)) {
|
|
182
|
+
throw new Error('Invalid JSON chunk: expected object');
|
|
183
|
+
}
|
|
184
|
+
chunk = parsed;
|
|
185
|
+
}
|
|
186
|
+
catch (parseErr) {
|
|
187
|
+
// TYPE-05: Log malformed NDJSON lines instead of silently dropping them
|
|
188
|
+
const error = parseErr instanceof Error ? parseErr : new Error(String(parseErr));
|
|
189
|
+
log.error({ err: error, rawContent: line.slice(0, 200) }, 'Failed to parse streaming JSON line');
|
|
190
|
+
continue;
|
|
140
191
|
}
|
|
141
|
-
|
|
142
|
-
|
|
192
|
+
// Null check before accessing chunk properties
|
|
193
|
+
if (!chunk) {
|
|
194
|
+
continue;
|
|
143
195
|
}
|
|
144
|
-
|
|
145
|
-
|
|
196
|
+
const chunkMessage = chunk.message;
|
|
197
|
+
if (chunkMessage?.content) {
|
|
198
|
+
const text = String(chunkMessage.content);
|
|
146
199
|
fullText += text;
|
|
147
200
|
yield {
|
|
148
201
|
type: 'text',
|
|
149
202
|
timestamp: new Date(),
|
|
203
|
+
source: this.name,
|
|
150
204
|
content: { text },
|
|
151
205
|
};
|
|
152
206
|
}
|
|
@@ -158,12 +212,16 @@ export class OllamaProvider {
|
|
|
158
212
|
yield {
|
|
159
213
|
type: 'tool_call',
|
|
160
214
|
timestamp: new Date(),
|
|
215
|
+
source: this.name,
|
|
161
216
|
content: toolCall,
|
|
162
217
|
};
|
|
163
218
|
}
|
|
219
|
+
// PROV-02: Record success on the circuit breaker
|
|
220
|
+
this._circuitBreaker.recordSuccess();
|
|
164
221
|
yield {
|
|
165
222
|
type: 'done',
|
|
166
223
|
timestamp: new Date(),
|
|
224
|
+
source: this.name,
|
|
167
225
|
content: {
|
|
168
226
|
text: fullText,
|
|
169
227
|
model: chunk.model,
|
|
@@ -176,18 +234,22 @@ export class OllamaProvider {
|
|
|
176
234
|
}
|
|
177
235
|
}
|
|
178
236
|
catch (err) {
|
|
179
|
-
if (err
|
|
237
|
+
if (err instanceof Error && err.name === 'AbortError') {
|
|
180
238
|
yield {
|
|
181
239
|
type: 'done',
|
|
182
240
|
timestamp: new Date(),
|
|
241
|
+
source: this.name,
|
|
183
242
|
content: { text: fullText, aborted: true },
|
|
184
243
|
};
|
|
185
244
|
}
|
|
186
245
|
else {
|
|
246
|
+
// PROV-02: Record failure on the circuit breaker
|
|
247
|
+
this._circuitBreaker.recordFailure();
|
|
187
248
|
const msg = err instanceof Error ? err.message : String(err);
|
|
188
249
|
yield {
|
|
189
250
|
type: 'error',
|
|
190
251
|
timestamp: new Date(),
|
|
252
|
+
source: this.name,
|
|
191
253
|
content: { message: `Ollama streaming error: ${msg}` },
|
|
192
254
|
};
|
|
193
255
|
}
|
|
@@ -201,8 +263,8 @@ export class OllamaProvider {
|
|
|
201
263
|
totalCostUsd: 0,
|
|
202
264
|
totalInputTokens: 0,
|
|
203
265
|
totalOutputTokens: 0,
|
|
204
|
-
requestCount:
|
|
205
|
-
lastRequestAt:
|
|
266
|
+
requestCount: this._requestCount,
|
|
267
|
+
lastRequestAt: this._lastRequestAt,
|
|
206
268
|
};
|
|
207
269
|
}
|
|
208
270
|
async abort(jobId) {
|
|
@@ -233,10 +295,10 @@ export class OllamaProvider {
|
|
|
233
295
|
}
|
|
234
296
|
// History as conversation turns
|
|
235
297
|
for (const event of task.history) {
|
|
236
|
-
if (event
|
|
298
|
+
if (isTextEvent(event)) {
|
|
237
299
|
messages.push({ role: 'assistant', content: event.content.text });
|
|
238
300
|
}
|
|
239
|
-
else if (event
|
|
301
|
+
else if (isSteeringEvent(event)) {
|
|
240
302
|
messages.push({ role: 'user', content: event.content.text });
|
|
241
303
|
}
|
|
242
304
|
}
|
|
@@ -256,7 +318,9 @@ export class OllamaProvider {
|
|
|
256
318
|
while ((match = jsonRegex.exec(text)) !== null) {
|
|
257
319
|
try {
|
|
258
320
|
const data = JSON.parse(match[1]);
|
|
259
|
-
if (data
|
|
321
|
+
if (data && typeof data === 'object' && !Array.isArray(data) &&
|
|
322
|
+
typeof data.tool === 'string' &&
|
|
323
|
+
data.arguments && typeof data.arguments === 'object' && !Array.isArray(data.arguments)) {
|
|
260
324
|
toolCalls.push({
|
|
261
325
|
toolCallId: `call_${Math.random().toString(36).slice(2, 9)}`,
|
|
262
326
|
tool: data.tool,
|
|
@@ -264,8 +328,10 @@ export class OllamaProvider {
|
|
|
264
328
|
});
|
|
265
329
|
}
|
|
266
330
|
}
|
|
267
|
-
catch {
|
|
268
|
-
//
|
|
331
|
+
catch (parseErr) {
|
|
332
|
+
// TYPE-05: Log malformed tool call JSON instead of silently dropping
|
|
333
|
+
const error = parseErr instanceof Error ? parseErr : new Error(String(parseErr));
|
|
334
|
+
log.error({ err: error, rawContent: match[1]?.slice(0, 200) }, 'Failed to parse JSON tool call');
|
|
269
335
|
}
|
|
270
336
|
}
|
|
271
337
|
return toolCalls;
|
|
@@ -288,7 +354,7 @@ export class OllamaProvider {
|
|
|
288
354
|
const str = decoder.decode(value, { stream: true });
|
|
289
355
|
totalBytes += str.length;
|
|
290
356
|
if (totalBytes > MAX_BUFFER) {
|
|
291
|
-
|
|
357
|
+
log.warn('Output exceeded 50MB, truncating stream');
|
|
292
358
|
break;
|
|
293
359
|
}
|
|
294
360
|
buffer += str;
|
|
@@ -306,11 +372,16 @@ export class OllamaProvider {
|
|
|
306
372
|
reader.releaseLock();
|
|
307
373
|
}
|
|
308
374
|
}
|
|
375
|
+
/** Expose circuit breaker for external inspection / testing */
|
|
376
|
+
get circuitBreaker() {
|
|
377
|
+
return this._circuitBreaker;
|
|
378
|
+
}
|
|
309
379
|
/**
|
|
310
380
|
* Reset cached status (used after recovery).
|
|
311
381
|
*/
|
|
312
382
|
resetStatus() {
|
|
313
383
|
this._lastAuthStatus = null;
|
|
384
|
+
this._circuitBreaker.reset();
|
|
314
385
|
}
|
|
315
386
|
get activeJobCount() {
|
|
316
387
|
return this._activeRequests.size;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama-provider.js","sourceRoot":"","sources":["../../src/providers/ollama-provider.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ollama-provider.js","sourceRoot":"","sources":["../../src/providers/ollama-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,18 +4,25 @@
|
|
|
4
4
|
* Spec §5.6 "Heartbeat (Proactive)":
|
|
5
5
|
* - Checks HEARTBEAT.md periodically.
|
|
6
6
|
* - Parses unchecked markdown tasks.
|
|
7
|
-
* -
|
|
7
|
+
* - Validates tasks through PolicyEngine before execution.
|
|
8
|
+
* - Enforces a per-cycle task budget to limit runaway execution.
|
|
9
|
+
* - Executes approved tasks through the execution loop.
|
|
8
10
|
*/
|
|
9
11
|
import { ExecutionLoop } from '../orchestrator/execution-loop.js';
|
|
12
|
+
import type { PolicyEngine } from '../security/policy-engine.js';
|
|
10
13
|
export interface HeartbeatOptions {
|
|
11
14
|
loop: ExecutionLoop;
|
|
15
|
+
policyEngine?: PolicyEngine;
|
|
12
16
|
baseDir?: string;
|
|
13
17
|
intervalMinutes?: number;
|
|
18
|
+
maxTasksPerCycle?: number;
|
|
14
19
|
}
|
|
15
20
|
export declare class HeartbeatSystem {
|
|
16
21
|
private readonly _loop;
|
|
22
|
+
private readonly _policyEngine?;
|
|
17
23
|
private readonly _heartbeatFile;
|
|
18
24
|
private readonly _intervalMinutes;
|
|
25
|
+
private readonly _maxTasksPerCycle;
|
|
19
26
|
private _scheduledTask;
|
|
20
27
|
constructor(options: HeartbeatOptions);
|
|
21
28
|
/**
|
|
@@ -23,7 +30,8 @@ export declare class HeartbeatSystem {
|
|
|
23
30
|
*/
|
|
24
31
|
start(): Promise<void>;
|
|
25
32
|
/**
|
|
26
|
-
* Performs a single pulse: reads HEARTBEAT.md
|
|
33
|
+
* Performs a single pulse: reads HEARTBEAT.md, validates tasks through
|
|
34
|
+
* the policy engine, and runs approved tasks up to the per-cycle budget.
|
|
27
35
|
*/
|
|
28
36
|
pulse(): Promise<void>;
|
|
29
37
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heartbeat.d.ts","sourceRoot":"","sources":["../../src/routines/heartbeat.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"heartbeat.d.ts","sourceRoot":"","sources":["../../src/routines/heartbeat.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAMH,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAQjE,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,aAAa,CAAC;IACpB,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,qBAAa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IACxC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAS;IAC1C,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAS;IAC3C,OAAO,CAAC,cAAc,CAA8B;gBAExC,OAAO,EAAE,gBAAgB;IASrC;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAS5B;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA4E5B;;OAEG;IACH,IAAI,IAAI,IAAI;YAOE,WAAW;CAa1B"}
|
|
@@ -4,22 +4,32 @@
|
|
|
4
4
|
* Spec §5.6 "Heartbeat (Proactive)":
|
|
5
5
|
* - Checks HEARTBEAT.md periodically.
|
|
6
6
|
* - Parses unchecked markdown tasks.
|
|
7
|
-
* -
|
|
7
|
+
* - Validates tasks through PolicyEngine before execution.
|
|
8
|
+
* - Enforces a per-cycle task budget to limit runaway execution.
|
|
9
|
+
* - Executes approved tasks through the execution loop.
|
|
8
10
|
*/
|
|
9
11
|
import fs from 'node:fs/promises';
|
|
10
12
|
import path from 'node:path';
|
|
11
13
|
import os from 'node:os';
|
|
12
14
|
import cron from 'node-cron';
|
|
15
|
+
import { createLogger } from '../utils/logger.js';
|
|
16
|
+
const log = createLogger('heartbeat');
|
|
17
|
+
/** Maximum number of heartbeat tasks executed in a single pulse cycle. */
|
|
18
|
+
const MAX_HEARTBEAT_TASKS_PER_CYCLE = 3;
|
|
13
19
|
export class HeartbeatSystem {
|
|
14
20
|
_loop;
|
|
21
|
+
_policyEngine;
|
|
15
22
|
_heartbeatFile;
|
|
16
23
|
_intervalMinutes;
|
|
24
|
+
_maxTasksPerCycle;
|
|
17
25
|
_scheduledTask = null;
|
|
18
26
|
constructor(options) {
|
|
19
27
|
this._loop = options.loop;
|
|
28
|
+
this._policyEngine = options.policyEngine;
|
|
20
29
|
const baseDir = options.baseDir ?? path.join(os.homedir(), '.zora');
|
|
21
30
|
this._heartbeatFile = path.join(baseDir, 'workspace', 'HEARTBEAT.md');
|
|
22
31
|
this._intervalMinutes = options.intervalMinutes ?? 30;
|
|
32
|
+
this._maxTasksPerCycle = options.maxTasksPerCycle ?? MAX_HEARTBEAT_TASKS_PER_CYCLE;
|
|
23
33
|
}
|
|
24
34
|
/**
|
|
25
35
|
* Starts the heartbeat system.
|
|
@@ -32,7 +42,8 @@ export class HeartbeatSystem {
|
|
|
32
42
|
});
|
|
33
43
|
}
|
|
34
44
|
/**
|
|
35
|
-
* Performs a single pulse: reads HEARTBEAT.md
|
|
45
|
+
* Performs a single pulse: reads HEARTBEAT.md, validates tasks through
|
|
46
|
+
* the policy engine, and runs approved tasks up to the per-cycle budget.
|
|
36
47
|
*/
|
|
37
48
|
async pulse() {
|
|
38
49
|
try {
|
|
@@ -40,12 +51,35 @@ export class HeartbeatSystem {
|
|
|
40
51
|
const lines = content.split('\n');
|
|
41
52
|
const updatedLines = [...lines];
|
|
42
53
|
let tasksRun = 0;
|
|
54
|
+
let tasksSkippedBudget = 0;
|
|
55
|
+
let tasksSkippedPolicy = 0;
|
|
43
56
|
for (let i = 0; i < lines.length; i++) {
|
|
44
57
|
const line = lines[i];
|
|
45
58
|
// Match unchecked task: - [ ] Task description
|
|
46
59
|
const match = line.match(/^-\s*\[\s*\]\s*(.+)$/);
|
|
47
60
|
if (match) {
|
|
48
61
|
const taskText = match[1].trim();
|
|
62
|
+
// Budget enforcement: limit tasks per cycle
|
|
63
|
+
if (tasksRun >= this._maxTasksPerCycle) {
|
|
64
|
+
tasksSkippedBudget++;
|
|
65
|
+
log.warn({ task: taskText, maxPerCycle: this._maxTasksPerCycle }, 'Heartbeat task skipped: per-cycle budget reached');
|
|
66
|
+
continue;
|
|
67
|
+
}
|
|
68
|
+
// Policy validation: check budget status via PolicyEngine
|
|
69
|
+
if (this._policyEngine) {
|
|
70
|
+
const budgetStatus = this._policyEngine.getBudgetStatus();
|
|
71
|
+
if (budgetStatus.exceeded) {
|
|
72
|
+
tasksSkippedPolicy++;
|
|
73
|
+
log.warn({ task: taskText, exceededCategories: budgetStatus.exceededCategories }, 'Heartbeat task skipped: policy budget exceeded');
|
|
74
|
+
continue;
|
|
75
|
+
}
|
|
76
|
+
const actionResult = this._policyEngine.recordAction('heartbeat_task');
|
|
77
|
+
if (!actionResult.allowed) {
|
|
78
|
+
tasksSkippedPolicy++;
|
|
79
|
+
log.warn({ task: taskText, reason: actionResult.reason }, 'Heartbeat task skipped: policy action denied');
|
|
80
|
+
continue;
|
|
81
|
+
}
|
|
82
|
+
}
|
|
49
83
|
try {
|
|
50
84
|
await this._loop.run(taskText);
|
|
51
85
|
// Mark as done: - [x] Task description
|
|
@@ -53,16 +87,19 @@ export class HeartbeatSystem {
|
|
|
53
87
|
tasksRun++;
|
|
54
88
|
}
|
|
55
89
|
catch (err) {
|
|
56
|
-
|
|
90
|
+
log.error({ task: taskText, err }, 'Heartbeat task failed');
|
|
57
91
|
}
|
|
58
92
|
}
|
|
59
93
|
}
|
|
94
|
+
if (tasksSkippedBudget > 0 || tasksSkippedPolicy > 0) {
|
|
95
|
+
log.info({ tasksRun, tasksSkippedBudget, tasksSkippedPolicy }, 'Heartbeat pulse completed with skipped tasks');
|
|
96
|
+
}
|
|
60
97
|
if (tasksRun > 0) {
|
|
61
98
|
await fs.writeFile(this._heartbeatFile, updatedLines.join('\n'), 'utf8');
|
|
62
99
|
}
|
|
63
100
|
}
|
|
64
101
|
catch (err) {
|
|
65
|
-
|
|
102
|
+
log.error({ err }, 'Failed to perform heartbeat pulse');
|
|
66
103
|
}
|
|
67
104
|
}
|
|
68
105
|
/**
|
|
@@ -86,7 +123,7 @@ export class HeartbeatSystem {
|
|
|
86
123
|
}
|
|
87
124
|
}
|
|
88
125
|
catch (err) {
|
|
89
|
-
|
|
126
|
+
log.error({ heartbeatFile: this._heartbeatFile, err }, 'Failed to ensure heartbeat file');
|
|
90
127
|
}
|
|
91
128
|
}
|
|
92
129
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"heartbeat.js","sourceRoot":"","sources":["../../src/routines/heartbeat.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"heartbeat.js","sourceRoot":"","sources":["../../src/routines/heartbeat.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routine-manager.d.ts","sourceRoot":"","sources":["../../src/routines/routine-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAOH,OAAO,KAAK,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"routine-manager.d.ts","sourceRoot":"","sources":["../../src/routines/routine-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAOH,OAAO,KAAK,EAAE,iBAAiB,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAK/D;;;GAGG;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,EAAE;IAC3C,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,QAAQ,CAAC;CACxB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAEtB,qBAAa,cAAc;IACzB,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAuB;IACnD,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyC;gBAE7D,UAAU,EAAE,oBAAoB,EAAE,OAAO,GAAE,MAAyC;IAKhG;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAU3B;;OAEG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAa9B;;OAEG;IACG,WAAW,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBlD;;;;OAIG;IACH,eAAe,CAAC,UAAU,EAAE,iBAAiB,GAAG,IAAI;IAuBpD;;OAEG;IACG,UAAU,CAAC,UAAU,EAAE,iBAAiB,GAAG,OAAO,CAAC,MAAM,CAAC;IAShE;;OAEG;IACH,OAAO,CAAC,eAAe;IA4BvB;;OAEG;IACH,OAAO,IAAI,IAAI;IAOf,IAAI,cAAc,IAAI,MAAM,CAE3B;CACF"}
|
|
@@ -17,6 +17,8 @@ import path from 'node:path';
|
|
|
17
17
|
import os from 'node:os';
|
|
18
18
|
import cron from 'node-cron';
|
|
19
19
|
import * as smol from 'smol-toml';
|
|
20
|
+
import { createLogger } from '../utils/logger.js';
|
|
21
|
+
const log = createLogger('routine-manager');
|
|
20
22
|
export class RoutineManager {
|
|
21
23
|
_routinesDir;
|
|
22
24
|
_submitTask;
|
|
@@ -33,7 +35,7 @@ export class RoutineManager {
|
|
|
33
35
|
await fs.mkdir(this._routinesDir, { recursive: true });
|
|
34
36
|
}
|
|
35
37
|
catch (err) {
|
|
36
|
-
|
|
38
|
+
log.error({ dir: this._routinesDir, err }, 'Failed to create routines directory');
|
|
37
39
|
}
|
|
38
40
|
await this.loadAll();
|
|
39
41
|
}
|
|
@@ -50,7 +52,7 @@ export class RoutineManager {
|
|
|
50
52
|
}
|
|
51
53
|
}
|
|
52
54
|
catch (err) {
|
|
53
|
-
|
|
55
|
+
log.error({ err }, 'Failed to read routines directory');
|
|
54
56
|
}
|
|
55
57
|
}
|
|
56
58
|
/**
|
|
@@ -67,11 +69,11 @@ export class RoutineManager {
|
|
|
67
69
|
}
|
|
68
70
|
}
|
|
69
71
|
else {
|
|
70
|
-
|
|
72
|
+
log.error({ filePath }, 'Invalid routine definition');
|
|
71
73
|
}
|
|
72
74
|
}
|
|
73
75
|
catch (err) {
|
|
74
|
-
|
|
76
|
+
log.error({ filePath, err }, 'Failed to load routine');
|
|
75
77
|
}
|
|
76
78
|
}
|
|
77
79
|
/**
|
|
@@ -94,7 +96,7 @@ export class RoutineManager {
|
|
|
94
96
|
});
|
|
95
97
|
}
|
|
96
98
|
catch (err) {
|
|
97
|
-
|
|
99
|
+
log.error({ routine: routine.name, err }, 'Routine execution failed');
|
|
98
100
|
}
|
|
99
101
|
});
|
|
100
102
|
this._scheduledTasks.set(routine.name, scheduledTask);
|
|
@@ -114,20 +116,25 @@ export class RoutineManager {
|
|
|
114
116
|
* Basic validation for RoutineDefinition.
|
|
115
117
|
*/
|
|
116
118
|
_isValidRoutine(raw) {
|
|
117
|
-
if (!raw ||
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
119
|
+
if (!raw || typeof raw !== 'object')
|
|
120
|
+
return false;
|
|
121
|
+
const obj = raw;
|
|
122
|
+
const routine = obj['routine'];
|
|
123
|
+
const task = obj['task'];
|
|
124
|
+
if (!routine || typeof routine !== 'object' ||
|
|
125
|
+
!task || typeof task !== 'object') {
|
|
126
|
+
return false;
|
|
127
|
+
}
|
|
128
|
+
const r = routine;
|
|
129
|
+
const t = task;
|
|
130
|
+
if (typeof r['name'] !== 'string' || typeof r['schedule'] !== 'string' || typeof t['prompt'] !== 'string') {
|
|
123
131
|
return false;
|
|
124
132
|
}
|
|
125
133
|
// Validate optional max_cost_tier if present
|
|
126
|
-
if (
|
|
134
|
+
if (r['max_cost_tier'] !== undefined) {
|
|
127
135
|
const validTiers = ['free', 'included', 'metered', 'premium'];
|
|
128
|
-
if (!validTiers.includes(
|
|
129
|
-
|
|
130
|
-
`Valid values: ${validTiers.join(', ')}. Ignoring.`);
|
|
136
|
+
if (!validTiers.includes(r['max_cost_tier'])) {
|
|
137
|
+
log.warn({ routine: r['name'], costTier: r['max_cost_tier'], validTiers }, 'Invalid max_cost_tier, ignoring');
|
|
131
138
|
}
|
|
132
139
|
}
|
|
133
140
|
return true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routine-manager.js","sourceRoot":"","sources":["../../src/routines/routine-manager.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAEH,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAA4B,MAAM,WAAW,CAAC;AACrD,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"routine-manager.js","sourceRoot":"","sources":["../../src/routines/routine-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"audit-logger.d.ts","sourceRoot":"","sources":["../../src/security/audit-logger.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"audit-logger.d.ts","sourceRoot":"","sources":["../../src/security/audit-logger.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAKH,OAAO,KAAK,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAM3E,MAAM,MAAM,eAAe,GAAG,IAAI,CAAC,UAAU,EAAE,cAAc,GAAG,MAAM,GAAG,SAAS,CAAC,CAAC;AAEpF,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,mBAAmB,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,uBAAuB;IACtC,KAAK,EAAE,OAAO,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,aAAa,CAAwB;IAC7C,OAAO,CAAC,aAAa,CAAK;IAC1B,OAAO,CAAC,WAAW,CAAoC;IACvD,OAAO,CAAC,YAAY,CAAS;gBAEjB,YAAY,EAAE,MAAM;IAIhC;;;OAGG;IACG,GAAG,CAAC,KAAK,EAAE,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC;IAkBtD;;OAEG;IACG,WAAW,CAAC,MAAM,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAuC9D;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,uBAAuB,CAAC;IAuDrD;;;OAGG;IACH,qBAAqB,IAAI,CACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,SAAS,EAAE,MAAM,GAAG,SAAS,EAC7B,OAAO,EAAE;QAAE,MAAM,EAAE,WAAW,CAAA;KAAE,KAC7B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAuCvB,kBAAkB;YA6BlB,YAAY;IAuC1B,OAAO,CAAC,YAAY;IAepB,OAAO,CAAC,qBAAqB;CAK9B"}
|