@noorm/marie-cli 0.1.16 → 0.1.18
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/cli-new/components/AgenticSpinner.js +28 -0
- package/dist/cli-new/components/AgenticSpinner.js.map +1 -0
- package/dist/cli-new/components/App.js +3 -1
- package/dist/cli-new/components/App.js.map +1 -1
- package/dist/cli-new/components/ApprovalDialog.js +1 -1
- package/dist/cli-new/components/ApprovalDialog.js.map +1 -1
- package/dist/cli-new/components/Banner.js +16 -6
- package/dist/cli-new/components/Banner.js.map +1 -1
- package/dist/cli-new/components/Header.js +2 -2
- package/dist/cli-new/components/Header.js.map +1 -1
- package/dist/cli-new/components/InputArea.js +29 -23
- package/dist/cli-new/components/InputArea.js.map +1 -1
- package/dist/cli-new/components/MessageBubble.js +5 -4
- package/dist/cli-new/components/MessageBubble.js.map +1 -1
- package/dist/cli-new/components/SessionSwitcher.js +3 -3
- package/dist/cli-new/components/SessionSwitcher.js.map +1 -1
- package/dist/cli-new/components/SetupWizard.js +11 -11
- package/dist/cli-new/components/SetupWizard.js.map +1 -1
- package/dist/cli-new/components/ToolCallDisplay.js +1 -1
- package/dist/cli-new/components/ToolCallDisplay.js.map +1 -1
- package/dist/cli-new/hooks/useUpdateCheck.js +17 -0
- package/dist/cli-new/hooks/useUpdateCheck.js.map +1 -0
- package/dist/cli-new/styles/theme.js +17 -17
- package/dist/cli-new/styles/theme.js.map +1 -1
- package/dist/extension.cjs +868 -340
- package/dist/extension.js +15 -0
- package/dist/extension.js.map +1 -1
- package/dist/monolith/adapters/CliMarieAdapter.js +7 -7
- package/dist/monolith/adapters/CliMarieAdapter.js.map +1 -1
- package/dist/monolith/adapters/VscodeMarieAdapter.js +9 -9
- package/dist/monolith/adapters/VscodeMarieAdapter.js.map +1 -1
- package/dist/monolith/cli/MarieToolDefinitionsCLI.js +5 -2
- package/dist/monolith/cli/MarieToolDefinitionsCLI.js.map +1 -1
- package/dist/monolith/cli/index.js +6 -0
- package/dist/monolith/cli/index.js.map +1 -1
- package/dist/monolith/cli/storage.js +79 -60
- package/dist/monolith/cli/storage.js.map +1 -1
- package/dist/monolith/infrastructure/ai/context/ContextArchiveService.js +52 -37
- package/dist/monolith/infrastructure/ai/context/ContextArchiveService.js.map +1 -1
- package/dist/monolith/infrastructure/ai/context/ContextManager.js +35 -2
- package/dist/monolith/infrastructure/ai/context/ContextManager.js.map +1 -1
- package/dist/monolith/infrastructure/ai/core/MarieEngine.js +513 -3
- package/dist/monolith/infrastructure/ai/core/MarieEngine.js.map +1 -1
- package/dist/monolith/infrastructure/ai/core/MarieLockManager.js +25 -5
- package/dist/monolith/infrastructure/ai/core/MarieLockManager.js.map +1 -1
- package/dist/monolith/infrastructure/ai/core/MarieProgressTracker.js +29 -0
- package/dist/monolith/infrastructure/ai/core/MarieProgressTracker.js.map +1 -1
- package/dist/monolith/infrastructure/ai/core/MariePulseService.js +41 -7
- package/dist/monolith/infrastructure/ai/core/MariePulseService.js.map +1 -1
- package/dist/monolith/infrastructure/ai/core/MarieSanitizer.js +97 -8
- package/dist/monolith/infrastructure/ai/core/MarieSanitizer.js.map +1 -1
- package/dist/monolith/infrastructure/ai/core/MarieSemaphore.js +47 -4
- package/dist/monolith/infrastructure/ai/core/MarieSemaphore.js.map +1 -1
- package/dist/monolith/infrastructure/ai/core/MarieSession.js +95 -15
- package/dist/monolith/infrastructure/ai/core/MarieSession.js.map +1 -1
- package/dist/monolith/infrastructure/ai/core/MarieStabilityMonitor.js +21 -0
- package/dist/monolith/infrastructure/ai/core/MarieStabilityMonitor.js.map +1 -1
- package/dist/monolith/infrastructure/ai/core/MarieToolMender.js +12 -0
- package/dist/monolith/infrastructure/ai/core/MarieToolMender.js.map +1 -1
- package/dist/monolith/infrastructure/ai/core/MarieToolProcessor.js +155 -14
- package/dist/monolith/infrastructure/ai/core/MarieToolProcessor.js.map +1 -1
- package/dist/monolith/infrastructure/ai/core/ReasoningBudget.js +23 -12
- package/dist/monolith/infrastructure/ai/core/ReasoningBudget.js.map +1 -1
- package/dist/monolith/infrastructure/ai/providers/AnthropicProvider.js +6 -0
- package/dist/monolith/infrastructure/ai/providers/AnthropicProvider.js.map +1 -1
- package/dist/monolith/infrastructure/ai/providers/CerebrasProvider.js +6 -0
- package/dist/monolith/infrastructure/ai/providers/CerebrasProvider.js.map +1 -1
- package/dist/monolith/infrastructure/ai/providers/OpenRouterProvider.js +22 -0
- package/dist/monolith/infrastructure/ai/providers/OpenRouterProvider.js.map +1 -1
- package/dist/monolith/infrastructure/config/ConfigService.js +145 -1
- package/dist/monolith/infrastructure/config/ConfigService.js.map +1 -1
- package/dist/monolith/infrastructure/joy/CognitiveRituals.js +169 -0
- package/dist/monolith/infrastructure/joy/CognitiveRituals.js.map +1 -0
- package/dist/monolith/infrastructure/joy/JoyTools.js +15 -2
- package/dist/monolith/infrastructure/joy/JoyTools.js.map +1 -1
- package/dist/monolith/infrastructure/persistence/NoormmeAutonomics.js +118 -0
- package/dist/monolith/infrastructure/persistence/NoormmeAutonomics.js.map +1 -0
- package/dist/monolith/infrastructure/persistence/NoormmeEngine.js +78 -0
- package/dist/monolith/infrastructure/persistence/NoormmeEngine.js.map +1 -0
- package/dist/monolith/infrastructure/persistence/NoormmeSchema.js +150 -0
- package/dist/monolith/infrastructure/persistence/NoormmeSchema.js.map +1 -0
- package/dist/monolith/infrastructure/persistence/NoormmeSeeder.js +81 -0
- package/dist/monolith/infrastructure/persistence/NoormmeSeeder.js.map +1 -0
- package/dist/monolith/infrastructure/persistence/NoormmeTools.js +324 -0
- package/dist/monolith/infrastructure/persistence/NoormmeTools.js.map +1 -0
- package/dist/monolith/infrastructure/tools/MarieToolDefinitions.js +29 -1577
- package/dist/monolith/infrastructure/tools/MarieToolDefinitions.js.map +1 -1
- package/dist/monolith/infrastructure/tools/definitions/AnalysisTools.js +346 -0
- package/dist/monolith/infrastructure/tools/definitions/AnalysisTools.js.map +1 -0
- package/dist/monolith/infrastructure/tools/definitions/AutomationTools.js +289 -0
- package/dist/monolith/infrastructure/tools/definitions/AutomationTools.js.map +1 -0
- package/dist/monolith/infrastructure/tools/definitions/ContextTools.js +43 -0
- package/dist/monolith/infrastructure/tools/definitions/ContextTools.js.map +1 -0
- package/dist/monolith/infrastructure/tools/definitions/CoreTools.js +41 -0
- package/dist/monolith/infrastructure/tools/definitions/CoreTools.js.map +1 -0
- package/dist/monolith/infrastructure/tools/definitions/DiagnosticTools.js +185 -0
- package/dist/monolith/infrastructure/tools/definitions/DiagnosticTools.js.map +1 -0
- package/dist/monolith/infrastructure/tools/definitions/NavigationTools.js +348 -0
- package/dist/monolith/infrastructure/tools/definitions/NavigationTools.js.map +1 -0
- package/dist/monolith/infrastructure/tools/definitions/PlanningTools.js +297 -0
- package/dist/monolith/infrastructure/tools/definitions/PlanningTools.js.map +1 -0
- package/dist/monolith/plumbing/analysis/MarieSentinelService.js +22 -3
- package/dist/monolith/plumbing/analysis/MarieSentinelService.js.map +1 -1
- package/dist/monolith/plumbing/terminal/TerminalService.js +5 -0
- package/dist/monolith/plumbing/terminal/TerminalService.js.map +1 -1
- package/dist/monolith/plumbing/utils/EnvironmentUtils.js +1 -1
- package/dist/monolith/plumbing/utils/EnvironmentUtils.js.map +1 -1
- package/dist/monolith/plumbing/utils/MutexUtils.js.map +1 -1
- package/dist/monolith/runtime/MarieRuntime.js +86 -4
- package/dist/monolith/runtime/MarieRuntime.js.map +1 -1
- package/dist/monolith/runtime/RuntimeAdapterBase.js.map +1 -1
- package/dist/monolith/services/JoyService.js +1 -1
- package/dist/monolith/services/JoyService.js.map +1 -1
- package/dist/monolith/services/MarieGhostService.js +12 -0
- package/dist/monolith/services/MarieGhostService.js.map +1 -1
- package/dist/monolith/services/UpdateService.js +61 -0
- package/dist/monolith/services/UpdateService.js.map +1 -0
- package/dist/prompts.js +5 -0
- package/dist/prompts.js.map +1 -1
- package/dist/webview-ui/main.js +23 -23
- package/package.json +2 -1
- package/test-mind-p6.sqlite +0 -0
- package/test-mind-p6.sqlite-shm +0 -0
- package/test-mind-p6.sqlite-wal +0 -0
- package/dist/monolith/domain/joy/JoyTools.js +0 -535
- package/dist/monolith/domain/joy/JoyTools.js.map +0 -1
- package/dist/monolith/infrastructure/ai/agents/MarieYOLO.js +0 -207
- package/dist/monolith/infrastructure/ai/agents/MarieYOLO.js.map +0 -1
- package/dist/monolith/infrastructure/ai/core/MarieYOLOTypes.js +0 -2
- package/dist/monolith/infrastructure/ai/core/MarieYOLOTypes.js.map +0 -1
- package/dist/test_agent_stream_control_plane.js +0 -170
- package/dist/test_agent_stream_control_plane.js.map +0 -1
- package/dist/test_strategy_integration.js +0 -114
- package/dist/test_strategy_integration.js.map +0 -1
- package/dist/test_streaming_fragility.js +0 -191
- package/dist/test_streaming_fragility.js.map +0 -1
- package/dist/webview-ui/App.js +0 -16
- package/dist/webview-ui/App.js.map +0 -1
- package/dist/webview-ui/Providers.js +0 -6
- package/dist/webview-ui/Providers.js.map +0 -1
- package/dist/webview-ui/components/ApprovalPanel.js +0 -8
- package/dist/webview-ui/components/ApprovalPanel.js.map +0 -1
- package/dist/webview-ui/components/ChatPanel.js +0 -19
- package/dist/webview-ui/components/ChatPanel.js.map +0 -1
- package/dist/webview-ui/components/Composer.js +0 -19
- package/dist/webview-ui/components/Composer.js.map +0 -1
- package/dist/webview-ui/components/HeaderBar.js +0 -5
- package/dist/webview-ui/components/HeaderBar.js.map +0 -1
- package/dist/webview-ui/components/SessionList.js +0 -14
- package/dist/webview-ui/components/SessionList.js.map +0 -1
- package/dist/webview-ui/context/WebviewStateContext.js +0 -146
- package/dist/webview-ui/context/WebviewStateContext.js.map +0 -1
- package/dist/webview-ui/main.js.map +0 -1
- package/dist/webview-ui/types.js +0 -2
- package/dist/webview-ui/types.js.map +0 -1
- package/dist/webview-ui/vscode.js +0 -4
- package/dist/webview-ui/vscode.js.map +0 -1
- package/marie-coder-0.1.16.vsix +0 -0
|
@@ -1,17 +1,18 @@
|
|
|
1
1
|
import * as vscode from "vscode";
|
|
2
2
|
import * as fs from "fs/promises";
|
|
3
3
|
import * as path from "path";
|
|
4
|
+
import { NoormmeEngine } from "../../persistence/NoormmeEngine.js";
|
|
4
5
|
/**
|
|
5
6
|
* Manages "anchored" context for Marie, providing a stable memory for critical information.
|
|
7
|
+
* Now backed by NOORMME: The Sovereign Agentic Data Engine.
|
|
6
8
|
*/
|
|
7
9
|
export class ContextArchiveService {
|
|
8
10
|
static instance;
|
|
9
11
|
anchors = new Map();
|
|
10
12
|
ready;
|
|
11
|
-
saveQueue = Promise.resolve();
|
|
12
13
|
static context;
|
|
13
14
|
constructor() {
|
|
14
|
-
this.ready = this.
|
|
15
|
+
this.ready = this.initializeEngine();
|
|
15
16
|
}
|
|
16
17
|
static init(context) {
|
|
17
18
|
this.context = context;
|
|
@@ -25,7 +26,23 @@ export class ContextArchiveService {
|
|
|
25
26
|
}
|
|
26
27
|
return ContextArchiveService.instance;
|
|
27
28
|
}
|
|
28
|
-
async
|
|
29
|
+
async initializeEngine() {
|
|
30
|
+
// 1. Initialize NOORMME Engine
|
|
31
|
+
await NoormmeEngine.initialize();
|
|
32
|
+
// 2. Load from NOORMME Repositories
|
|
33
|
+
const db = await NoormmeEngine.getInstance();
|
|
34
|
+
const repo = db.getRepository("anchors");
|
|
35
|
+
const records = await repo.objects.all();
|
|
36
|
+
if (records.length > 0) {
|
|
37
|
+
this.anchors = new Map(records.map((r) => [r.id, r]));
|
|
38
|
+
console.log(`[ContextArchiveService] Loaded ${records.length} anchors from Sovereign Mind.`);
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
// 3. Fallback to Disk/Migration if NOORMME is empty
|
|
42
|
+
await this.loadFromLegacyDisk();
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
async loadFromLegacyDisk() {
|
|
29
46
|
if (!ContextArchiveService.context)
|
|
30
47
|
return;
|
|
31
48
|
const storageUri = ContextArchiveService.context.storageUri;
|
|
@@ -33,11 +50,13 @@ export class ContextArchiveService {
|
|
|
33
50
|
return;
|
|
34
51
|
const memoryPath = path.join(storageUri.fsPath, "marie_memory.json");
|
|
35
52
|
try {
|
|
36
|
-
// Ensure storage directory exists
|
|
37
|
-
await fs.mkdir(storageUri.fsPath, { recursive: true });
|
|
38
53
|
const data = await fs.readFile(memoryPath, "utf-8");
|
|
39
54
|
const parsed = JSON.parse(data);
|
|
40
55
|
this.anchors = new Map(Object.entries(parsed));
|
|
56
|
+
// Migrate to NOORMME
|
|
57
|
+
await this.migrateToNoormme();
|
|
58
|
+
// Archive the old file
|
|
59
|
+
await fs.rename(memoryPath, memoryPath + ".migrated");
|
|
41
60
|
}
|
|
42
61
|
catch (e) {
|
|
43
62
|
// Check for migration from workspace root
|
|
@@ -53,51 +72,45 @@ export class ContextArchiveService {
|
|
|
53
72
|
const data = await fs.readFile(oldPath, "utf-8");
|
|
54
73
|
const parsed = JSON.parse(data);
|
|
55
74
|
this.anchors = new Map(Object.entries(parsed));
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
await fs.writeFile(newPath, serialized);
|
|
59
|
-
// Optional: delete old file? Let's leave it for now but maybe rename it to .marie_memory.json.bak
|
|
75
|
+
await this.migrateToNoormme();
|
|
76
|
+
// Rename old file
|
|
60
77
|
await fs.rename(oldPath, oldPath + ".bak");
|
|
61
|
-
console.log(`[ContextArchiveService] Migrated memory from ${oldPath} to
|
|
78
|
+
console.log(`[ContextArchiveService] Migrated memory from ${oldPath} to Sovereign Mind`);
|
|
62
79
|
}
|
|
63
80
|
catch (err) {
|
|
64
81
|
// No old file to migrate
|
|
65
82
|
}
|
|
66
83
|
}
|
|
67
|
-
async
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
const
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
const memoryPath = path.join(storageUri.fsPath, "marie_memory.json");
|
|
74
|
-
try {
|
|
75
|
-
await fs.mkdir(storageUri.fsPath, { recursive: true });
|
|
76
|
-
const data = JSON.stringify(Object.fromEntries(this.anchors.entries()), null, 2);
|
|
77
|
-
await fs.writeFile(memoryPath, data);
|
|
78
|
-
}
|
|
79
|
-
catch (e) {
|
|
80
|
-
console.error("Failed to save strategic memory", e);
|
|
84
|
+
async migrateToNoormme() {
|
|
85
|
+
const db = await NoormmeEngine.getInstance();
|
|
86
|
+
const repo = db.getRepository("anchors");
|
|
87
|
+
const entries = Array.from(this.anchors.values());
|
|
88
|
+
for (const entry of entries) {
|
|
89
|
+
await repo.create(entry);
|
|
81
90
|
}
|
|
91
|
+
console.log(`[ContextArchiveService] Successfully migrated ${entries.length} anchors to NOORMME.`);
|
|
82
92
|
}
|
|
83
|
-
/**
|
|
84
|
-
* Anchors a new piece of context.
|
|
85
|
-
*/
|
|
86
93
|
/**
|
|
87
94
|
* Anchors a new piece of context. Safe to call anytime; awaits initialization if needed.
|
|
88
95
|
*/
|
|
89
96
|
async anchor(anchor) {
|
|
90
97
|
await this.ready;
|
|
91
|
-
|
|
98
|
+
const fullAnchor = {
|
|
92
99
|
...anchor,
|
|
93
100
|
timestamp: Date.now(),
|
|
94
|
-
}
|
|
95
|
-
this.
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
+
};
|
|
102
|
+
this.anchors.set(anchor.id, fullAnchor);
|
|
103
|
+
// Save to NOORMME
|
|
104
|
+
const db = await NoormmeEngine.getInstance();
|
|
105
|
+
const repo = db.getRepository("anchors");
|
|
106
|
+
const existing = await repo.objects.filter({ id: anchor.id }).first();
|
|
107
|
+
const dbValue = { ...fullAnchor, content: fullAnchor.content.replace(/'/g, "''") };
|
|
108
|
+
if (existing) {
|
|
109
|
+
await db.execute(`UPDATE anchors SET label = '${dbValue.label}', content = '${dbValue.content}', type = '${dbValue.type}', timestamp = ${dbValue.timestamp} WHERE id = '${dbValue.id}'`);
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
await repo.create(fullAnchor);
|
|
113
|
+
}
|
|
101
114
|
}
|
|
102
115
|
/**
|
|
103
116
|
* Retrieves all anchored context as a formatted string for the AI.
|
|
@@ -121,8 +134,10 @@ export class ContextArchiveService {
|
|
|
121
134
|
async release(id) {
|
|
122
135
|
await this.ready;
|
|
123
136
|
const deleted = this.anchors.delete(id);
|
|
124
|
-
if (deleted)
|
|
125
|
-
|
|
137
|
+
if (deleted) {
|
|
138
|
+
const db = await NoormmeEngine.getInstance();
|
|
139
|
+
await db.execute(`DELETE FROM anchors WHERE id = '${id}'`);
|
|
140
|
+
}
|
|
126
141
|
return deleted;
|
|
127
142
|
}
|
|
128
143
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContextArchiveService.js","sourceRoot":"","sources":["../../../../../src/monolith/infrastructure/ai/context/ContextArchiveService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"ContextArchiveService.js","sourceRoot":"","sources":["../../../../../src/monolith/infrastructure/ai/context/ContextArchiveService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,KAAK,EAAE,MAAM,aAAa,CAAC;AAClC,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAUnE;;;GAGG;AACH,MAAM,OAAO,qBAAqB;IACxB,MAAM,CAAC,QAAQ,CAAwB;IACvC,OAAO,GAAiC,IAAI,GAAG,EAAE,CAAC;IAClD,KAAK,CAAgB;IAErB,MAAM,CAAC,OAAO,CAA0B;IAEhD;QACE,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;IACvC,CAAC;IAEM,MAAM,CAAC,IAAI,CAAC,OAAgC;QACjD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAEM,KAAK,CAAC,UAAU;QACrB,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEM,MAAM,CAAC,WAAW;QACvB,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,CAAC;YACpC,qBAAqB,CAAC,QAAQ,GAAG,IAAI,qBAAqB,EAAE,CAAC;QAC/D,CAAC;QACD,OAAO,qBAAqB,CAAC,QAAQ,CAAC;IACxC,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC5B,+BAA+B;QAC/B,MAAM,aAAa,CAAC,UAAU,EAAE,CAAC;QAEjC,oCAAoC;QACpC,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,CAAC;QAC7C,MAAM,IAAI,GAAG,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAEzC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC;QACzC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACvB,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3D,OAAO,CAAC,GAAG,CAAC,kCAAkC,OAAO,CAAC,MAAM,+BAA+B,CAAC,CAAC;QAC/F,CAAC;aAAM,CAAC;YACN,oDAAoD;YACpD,MAAM,IAAI,CAAC,kBAAkB,EAAE,CAAC;QAClC,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,kBAAkB;QAC9B,IAAI,CAAC,qBAAqB,CAAC,OAAO;YAAE,OAAO;QAE3C,MAAM,UAAU,GAAG,qBAAqB,CAAC,OAAO,CAAC,UAAU,CAAC;QAC5D,IAAI,CAAC,UAAU;YAAE,OAAO;QAExB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;QAErE,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;YACpD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;YAE/C,qBAAqB;YACrB,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAE9B,uBAAuB;YACvB,MAAM,EAAE,CAAC,MAAM,CAAC,UAAU,EAAE,UAAU,GAAG,WAAW,CAAC,CAAC;QACxD,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,0CAA0C;YAC1C,MAAM,IAAI,CAAC,wBAAwB,CAAC,UAAU,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,wBAAwB,CAAC,OAAe;QACpD,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;QAChE,IAAI,CAAC,IAAI;YAAE,OAAO;QAElB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,oBAAoB,CAAC,CAAC;QACtD,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACjD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;YAE/C,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAE9B,kBAAkB;YAClB,MAAM,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,CAAC,CAAC;YAC3C,OAAO,CAAC,GAAG,CACT,gDAAgD,OAAO,oBAAoB,CAC5E,CAAC;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,yBAAyB;QAC3B,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,gBAAgB;QAC5B,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,CAAC;QAC7C,MAAM,IAAI,GAAG,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAEzC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;QAClD,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;YAC5B,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,iDAAiD,OAAO,CAAC,MAAM,sBAAsB,CAAC,CAAC;IACrG,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,MAAM,CACjB,MAA0C;QAE1C,MAAM,IAAI,CAAC,KAAK,CAAC;QACjB,MAAM,UAAU,GAAG;YACjB,GAAG,MAAM;YACT,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE;SACtB,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,UAAU,CAAC,CAAC;QAExC,kBAAkB;QAClB,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,CAAC;QAC7C,MAAM,IAAI,GAAG,EAAE,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QAEzC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC;QACtE,MAAM,OAAO,GAAG,EAAE,GAAG,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;QACnF,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,EAAE,CAAC,OAAO,CAAC,+BAA+B,OAAO,CAAC,KAAK,iBAAiB,OAAO,CAAC,OAAO,cAAc,OAAO,CAAC,IAAI,kBAAkB,OAAO,CAAC,SAAS,gBAAgB,OAAO,CAAC,EAAE,GAAG,CAAC,CAAC;QAC3L,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;QAChC,CAAC;IACH,CAAC;IAED;;OAEG;IACI,aAAa;QAClB,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;YAC5B,OAAO,mCAAmC,CAAC;QAC7C,CAAC;QAED,MAAM,KAAK,GAAa,CAAC,oCAAoC,CAAC,CAAC;QAC/D,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAC1D,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,CACpC,CAAC;QAEF,KAAK,MAAM,MAAM,IAAI,aAAa,EAAE,CAAC;YACnC,KAAK,CAAC,IAAI,CAAC,OAAO,MAAM,CAAC,KAAK,KAAK,MAAM,CAAC,IAAI,KAAK,CAAC,CAAC;YACrD,KAAK,CAAC,IAAI,CACR,SAAS,MAAM,CAAC,EAAE,cAAc,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,kBAAkB,EAAE,IAAI,CACpF,CAAC;YACF,KAAK,CAAC,IAAI,CAAC,WAAW,MAAM,CAAC,OAAO,cAAc,CAAC,CAAC;QACtD,CAAC;QAED,OAAO,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACxB,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,OAAO,CAAC,EAAU;QAC7B,MAAM,IAAI,CAAC,KAAK,CAAC;QACjB,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QACxC,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,CAAC;YAC7C,MAAM,EAAE,CAAC,OAAO,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;CACF"}
|
|
@@ -64,9 +64,42 @@ export class ContextManager {
|
|
|
64
64
|
const tokensPerChar = ConfigService.getTokensPerChar(); // Hoisted config access
|
|
65
65
|
const currentTokens = this.getTotalTokens(messages, tokensPerChar);
|
|
66
66
|
// PROACTIVE PRUNING: Summarize at 90% capacity to ensure zero 400 errors
|
|
67
|
-
if (currentTokens
|
|
68
|
-
|
|
67
|
+
if (currentTokens >= maxTokens * 0.9) {
|
|
68
|
+
messages = await this.summarizeHistory(messages, provider, state, tokensPerChar, currentTokens);
|
|
69
|
+
}
|
|
70
|
+
// SPECTRAL MEMORY INJECTION: Retrieve relevant long-term memories
|
|
71
|
+
return await this.injectSpectralMemories(messages, provider);
|
|
72
|
+
}
|
|
73
|
+
static async injectSpectralMemories(messages, provider) {
|
|
74
|
+
try {
|
|
75
|
+
const lastUserMsg = messages.slice().reverse().find(m => m.role === "user" && typeof m.content === "string");
|
|
76
|
+
if (!lastUserMsg)
|
|
77
|
+
return messages;
|
|
78
|
+
const { NoormmeEngine } = await import("../../persistence/NoormmeEngine.js");
|
|
79
|
+
const db = await NoormmeEngine.getInstance();
|
|
80
|
+
if (!db.agent.cortex.vectors)
|
|
81
|
+
return messages;
|
|
82
|
+
const embedding = await provider.createEmbedding(lastUserMsg.content);
|
|
83
|
+
const memories = await db.agent.cortex.vectors.search(embedding, { limit: 3 });
|
|
84
|
+
if (memories.length > 0) {
|
|
85
|
+
const memoryContext = memories
|
|
86
|
+
.map((m) => `- ${m.content} (Similarity: ${(m.similarity * 100).toFixed(1)}%)`)
|
|
87
|
+
.join("\n");
|
|
88
|
+
const injectedMessages = [...messages];
|
|
89
|
+
injectedMessages.splice(messages.length - 1, 0, {
|
|
90
|
+
role: "user",
|
|
91
|
+
content: `[SPECTRAL MEMORIES - STRATEGIC CONTEXT]\n${memoryContext}\n\n(Use these memories to inform your response if relevant. Do not mention "Spectral Memories" to the user unless they ask.)`,
|
|
92
|
+
virtual: true
|
|
93
|
+
});
|
|
94
|
+
return injectedMessages;
|
|
95
|
+
}
|
|
69
96
|
}
|
|
97
|
+
catch (e) {
|
|
98
|
+
console.warn("[ContextManager] Failed to inject spectral memories", e);
|
|
99
|
+
}
|
|
100
|
+
return messages;
|
|
101
|
+
}
|
|
102
|
+
static async summarizeHistory(messages, provider, state, tokensPerChar, currentTokens) {
|
|
70
103
|
vscode.window.showInformationMessage(`Marie is tidying up conversation history (${currentTokens} tokens)...`);
|
|
71
104
|
const keepRecent = ConfigService.getKeepRecentMessages();
|
|
72
105
|
if (messages.length <= keepRecent) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContextManager.js","sourceRoot":"","sources":["../../../../../src/monolith/infrastructure/ai/context/ContextManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ContextManager.js","sourceRoot":"","sources":["../../../../../src/monolith/infrastructure/ai/context/ContextManager.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAC9D,OAAO,EACL,2BAA2B,EAC3B,yBAAyB,GAC1B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,uCAAuC,CAAC;AACxE,OAAO,EAAE,WAAW,EAAE,MAAM,wCAAwC,CAAC;AAGrE,MAAM,OAAO,cAAc;IACjB,MAAM,CAAC,cAAc,CAAC,IAAY,EAAE,aAAqB;QAC/D,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,aAAa,CAAC,CAAC;IAChD,CAAC;IAED;;;OAGG;IACK,MAAM,CAAC,oBAAoB,CACjC,GAAQ,EACR,aAAqB,EACrB,QAAgB,CAAC;QAEjB,IAAI,CAAC,GAAG,IAAI,KAAK,GAAG,EAAE;YAAE,OAAO,CAAC,CAAC;QACjC,IAAI,OAAO,GAAG,KAAK,QAAQ;YAAE,OAAO,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAC5E,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,OAAO,GAAG,KAAK,SAAS;YAAE,OAAO,CAAC,CAAC;QAElE,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;gBACvB,KAAK,IAAI,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,aAAa,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;YACrE,CAAC;QACH,CAAC;aAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YACnC,KAAK,MAAM,GAAG,IAAI,GAAG,EAAE,CAAC;gBACtB,KAAK,IAAI,IAAI,CAAC,cAAc,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC,CAAC,aAAa;gBAC/D,KAAK,IAAI,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe;YACzF,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAEO,MAAM,CAAC,gBAAgB,CAAC,OAAY,EAAE,aAAqB;QACjE,IAAI,OAAO,OAAO,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;YACxC,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;QAC7D,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC1C,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAW,EAAE,KAAU,EAAE,EAAE;gBACxD,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;oBAC1B,OAAO,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;gBAC9D,CAAC;gBACD,IAAI,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;oBAC9B,OAAO,GAAG,GAAG,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,KAAK,EAAE,aAAa,EAAE,CAAC,CAAC,CAAC;gBACxE,CAAC;gBACD,IAAI,KAAK,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;oBACjC,uDAAuD;oBACvD,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;wBACtC,OAAO,GAAG,GAAG,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;oBACjE,CAAC;oBACD,OAAO,CACL,GAAG,GAAG,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC,CACjE,CAAC;gBACJ,CAAC;gBACD,OAAO,GAAG,CAAC;YACb,CAAC,EAAE,CAAC,CAAC,CAAC;QACR,CAAC;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAEO,MAAM,CAAC,cAAc,CAC3B,QAAe,EACf,aAAqB;QAErB,OAAO,QAAQ,CAAC,MAAM,CACpB,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,aAAa,CAAC,EAC7D,CAAC,CACF,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,MAAM,CACjB,QAAe,EACf,QAAoB,EACpB,KAAsB;QAEtB,MAAM,SAAS,GAAG,aAAa,CAAC,mBAAmB,EAAE,CAAC;QACtD,MAAM,aAAa,GAAG,aAAa,CAAC,gBAAgB,EAAE,CAAC,CAAC,wBAAwB;QAChF,MAAM,aAAa,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QAEnE,yEAAyE;QACzE,IAAI,aAAa,IAAI,SAAS,GAAG,GAAG,EAAE,CAAC;YACrC,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;QAClG,CAAC;QAED,kEAAkE;QAClE,OAAO,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,QAAe,EAAE,QAAoB;QAC/E,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,QAAQ,CAAC,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC;YAC7G,IAAI,CAAC,WAAW;gBAAE,OAAO,QAAQ,CAAC;YAElC,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,oCAAoC,CAAC,CAAC;YAC7E,MAAM,EAAE,GAAG,MAAM,aAAa,CAAC,WAAW,EAAE,CAAC;YAC7C,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO;gBAAE,OAAO,QAAQ,CAAC;YAE9C,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,eAAe,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YACtE,MAAM,QAAQ,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;YAE/E,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACxB,MAAM,aAAa,GAAG,QAAQ;qBAC3B,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC,OAAO,iBAAiB,CAAC,CAAC,CAAC,UAAU,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;qBACnF,IAAI,CAAC,IAAI,CAAC,CAAC;gBAEd,MAAM,gBAAgB,GAAG,CAAC,GAAG,QAAQ,CAAC,CAAC;gBACvC,gBAAgB,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,EAAE;oBAC9C,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,4CAA4C,aAAa,+HAA+H;oBACjM,OAAO,EAAE,IAAI;iBACd,CAAC,CAAC;gBACH,OAAO,gBAAgB,CAAC;YAC1B,CAAC;QACH,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,IAAI,CAAC,qDAAqD,EAAE,CAAC,CAAC,CAAC;QACzE,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,gBAAgB,CACnC,QAAe,EACf,QAAoB,EACpB,KAAiC,EACjC,aAAqB,EACrB,aAAqB;QAErB,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAClC,6CAA6C,aAAa,aAAa,CACxE,CAAC;QAEF,MAAM,UAAU,GAAG,aAAa,CAAC,qBAAqB,EAAE,CAAC;QAEzD,IAAI,QAAQ,CAAC,MAAM,IAAI,UAAU,EAAE,CAAC;YAClC,OAAO,QAAQ,CAAC;QAClB,CAAC;QAED,MAAM,aAAa,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC;QACtE,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,GAAG,UAAU,CAAC,CAAC;QAEpE,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC;gBACnD,KAAK,EAAE,aAAa,CAAC,QAAQ,EAAE;gBAC/B,UAAU,EAAE,IAAI;gBAChB,QAAQ,EAAE,aAAa,CAAC,MAAM,CAAC;oBAC7B,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,yBAAyB;iBACnC,CAAC;gBACF,MAAM,EAAE,2BAA2B;aACpC,CAAC,CAAC;YAEH,MAAM,WAAW,GACf,WAAW,CAAC,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC;gBAChD,sBAAsB,CAAC;YAEzB,2FAA2F;YAC3F,IAAI,aAAa,GAAG,EAAE,CAAC;YACvB,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC;qBACjD,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAE,CAAS,IAAI,CAAC,CAAC;qBACnC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC;qBAC9B,IAAI,CAAC,IAAI,CAAC,CAAC;gBAEd,MAAM,QAAQ,GAAG,KAAK,CAAC,UAAU,EAAE,QAAQ,IAAI,SAAS,CAAC;gBACzD,MAAM,cAAc,GAAG,KAAK,CAAC,UAAU,EAAE,MAAM,IAAI,MAAM,CAAC;gBAE1D,aAAa,GAAG,+BAA+B,QAAQ,WAAW,KAAK,CAAC,IAAI,6BAA6B,KAAK,CAAC,cAAc,yBAAyB,KAAK,CAAC,aAAa,GAAG,QAAQ,CAAC,CAAC,CAAC,eAAe,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,kBAAkB,cAAc,MAAM,CAAC;YAC9P,CAAC;YAED,MAAM,UAAU,GAAU;gBACxB;oBACE,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,iDAAiD,aAAa,GAAG,WAAW,EAAE;iBACxF;gBACD,GAAG,cAAc;aAClB,CAAC;YAEF,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAClC,+CAA+C,aAAa,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,CACrH,CAAC;YACF,OAAO,UAAU,CAAC;QACpB,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;YACvC,OAAO,CAAC,KAAK,CAAC,+BAA+B,EAAE,OAAO,CAAC,CAAC;YACxD,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAC5B,qCAAqC,OAAO,iCAAiC,CAC9E,CAAC;YACF,OAAO,QAAQ,CAAC;QAClB,CAAC;IACH,CAAC;CACF"}
|