@noorm/marie-cli 0.1.15 → 0.1.17
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/.marie_visual_verify_1771225696548/progress_bar_check.txt +1 -0
- package/SENTINEL.md +33 -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/Banner.js +5 -5
- package/dist/cli-new/components/Banner.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/domain/DomainEntity.js +7 -0
- package/dist/domain/DomainEntity.js.map +1 -0
- package/dist/extension.cjs +164 -154
- package/dist/extension.js +473 -0
- package/dist/extension.js.map +1 -0
- package/dist/infrastructure/BaseAdapter.js +3 -0
- package/dist/infrastructure/BaseAdapter.js.map +1 -0
- package/dist/monolith/cli/CliFileSystemPort.js +16 -8
- package/dist/monolith/cli/CliFileSystemPort.js.map +1 -1
- package/dist/monolith/cli/MarieToolDefinitionsCLI.js +9 -6
- package/dist/monolith/cli/MarieToolDefinitionsCLI.js.map +1 -1
- package/dist/monolith/cli/services/JoyAutomationServiceCLI.js +1 -1
- package/dist/monolith/cli/services/JoyAutomationServiceCLI.js.map +1 -1
- package/dist/monolith/infrastructure/ai/core/MarieEngine.js +29 -10
- package/dist/monolith/infrastructure/ai/core/MarieEngine.js.map +1 -1
- package/dist/monolith/infrastructure/ai/core/MarieToolProcessor.js +19 -13
- package/dist/monolith/infrastructure/ai/core/MarieToolProcessor.js.map +1 -1
- package/dist/monolith/infrastructure/ai/core/VscodeFileSystemPort.js +8 -8
- package/dist/monolith/infrastructure/ai/core/VscodeFileSystemPort.js.map +1 -1
- package/dist/monolith/infrastructure/config/ConfigService.js +2 -22
- package/dist/monolith/infrastructure/config/ConfigService.js.map +1 -1
- package/dist/monolith/infrastructure/joy/JoyTools.js +535 -0
- package/dist/monolith/infrastructure/joy/JoyTools.js.map +1 -0
- package/dist/monolith/infrastructure/tools/MarieToolDefinitions.js +14 -13
- package/dist/monolith/infrastructure/tools/MarieToolDefinitions.js.map +1 -1
- package/dist/monolith/plumbing/analysis/MarieSentinelService.js +23 -3
- package/dist/monolith/plumbing/analysis/MarieSentinelService.js.map +1 -1
- package/dist/monolith/plumbing/analysis/TestService.js +2 -1
- package/dist/monolith/plumbing/analysis/TestService.js.map +1 -1
- package/dist/monolith/plumbing/filesystem/FileService.js +22 -10
- package/dist/monolith/plumbing/filesystem/FileService.js.map +1 -1
- package/dist/monolith/plumbing/utils/EnvironmentUtils.js +59 -0
- package/dist/monolith/plumbing/utils/EnvironmentUtils.js.map +1 -0
- package/dist/monolith/plumbing/utils/MutexUtils.js +86 -0
- package/dist/monolith/plumbing/utils/MutexUtils.js.map +1 -0
- package/dist/monolith/runtime/MarieRuntime.js +250 -136
- package/dist/monolith/runtime/MarieRuntime.js.map +1 -1
- package/dist/monolith/runtime/RuntimeAdapterBase.js +6 -0
- package/dist/monolith/runtime/RuntimeAdapterBase.js.map +1 -1
- package/dist/monolith/services/JoyAutomationService.js +1 -1
- package/dist/monolith/services/JoyAutomationService.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/UpdateService.js +61 -0
- package/dist/monolith/services/UpdateService.js.map +1 -0
- package/dist/plumbing/BaseTool.js +7 -0
- package/dist/plumbing/BaseTool.js.map +1 -0
- package/dist/prompts.js +90 -0
- package/dist/prompts.js.map +1 -0
- package/dist/test_agent_stream_control_plane.js +170 -0
- package/dist/test_agent_stream_control_plane.js.map +1 -0
- package/dist/test_content_buffer_cap.js +67 -0
- package/dist/test_content_buffer_cap.js.map +1 -0
- package/dist/test_prefix_tree.js +120 -0
- package/dist/test_prefix_tree.js.map +1 -0
- package/dist/test_retry_utils.js +169 -0
- package/dist/test_retry_utils.js.map +1 -0
- package/dist/test_strategy_integration.js +114 -0
- package/dist/test_strategy_integration.js.map +1 -0
- package/dist/test_streaming_fragility.js +191 -0
- package/dist/test_streaming_fragility.js.map +1 -0
- package/dist/webview-ui/App.js +16 -0
- package/dist/webview-ui/App.js.map +1 -0
- package/dist/webview-ui/Providers.js +6 -0
- package/dist/webview-ui/Providers.js.map +1 -0
- package/dist/webview-ui/components/ApprovalPanel.js +8 -0
- package/dist/webview-ui/components/ApprovalPanel.js.map +1 -0
- package/dist/webview-ui/components/ChatPanel.js +19 -0
- package/dist/webview-ui/components/ChatPanel.js.map +1 -0
- package/dist/webview-ui/components/Composer.js +19 -0
- package/dist/webview-ui/components/Composer.js.map +1 -0
- package/dist/webview-ui/components/HeaderBar.js +5 -0
- package/dist/webview-ui/components/HeaderBar.js.map +1 -0
- package/dist/webview-ui/components/SessionList.js +14 -0
- package/dist/webview-ui/components/SessionList.js.map +1 -0
- package/dist/webview-ui/context/WebviewStateContext.js +146 -0
- package/dist/webview-ui/context/WebviewStateContext.js.map +1 -0
- package/dist/webview-ui/main.css +1 -0
- package/dist/webview-ui/main.js +108 -0
- package/dist/webview-ui/main.js.map +1 -0
- package/dist/webview-ui/types.js +2 -0
- package/dist/webview-ui/types.js.map +1 -0
- package/dist/webview-ui/vscode.js +4 -0
- package/dist/webview-ui/vscode.js.map +1 -0
- package/lint_output.txt +705 -0
- package/lint_output_v2.txt +711 -0
- package/marie-coder-0.1.16.vsix +0 -0
- package/package.json +3 -10
- package/JOY_ZONING.md +0 -200
- package/dist/monolith/tests/FileAppendVerifyTest.js +0 -28
- package/dist/monolith/tests/FileAppendVerifyTest.js.map +0 -1
- package/dist/monolith/tests/StreamingVerifyTest.js +0 -100
- package/dist/monolith/tests/StreamingVerifyTest.js.map +0 -1
- package/dist/monolith/tests/VisualProgressTest.js +0 -86
- package/dist/monolith/tests/VisualProgressTest.js.map +0 -1
|
@@ -3,6 +3,7 @@ import { MarieEngine } from "../infrastructure/ai/core/MarieEngine.js";
|
|
|
3
3
|
import { MarieProgressTracker } from "../infrastructure/ai/core/MarieProgressTracker.js";
|
|
4
4
|
import { MarieResponse } from "../infrastructure/ai/core/MarieResponse.js";
|
|
5
5
|
import { StringUtils } from "../plumbing/utils/StringUtils.js";
|
|
6
|
+
import { MarieMutex } from "../plumbing/utils/MutexUtils.js";
|
|
6
7
|
export class MarieRuntime {
|
|
7
8
|
options;
|
|
8
9
|
provider;
|
|
@@ -10,10 +11,14 @@ export class MarieRuntime {
|
|
|
10
11
|
toolRegistry;
|
|
11
12
|
currentSessionId = "default";
|
|
12
13
|
messages = [];
|
|
14
|
+
sequenceNumber = 0;
|
|
13
15
|
abortController = null;
|
|
14
16
|
currentRun;
|
|
15
17
|
initPromise;
|
|
16
18
|
pendingApprovals = new Map();
|
|
19
|
+
processingMutex = new MarieMutex("ProcessingLock");
|
|
20
|
+
persistenceMutex = new MarieMutex("PersistenceLock");
|
|
21
|
+
onStateChangedCallbacks = [];
|
|
17
22
|
constructor(options) {
|
|
18
23
|
this.options = options;
|
|
19
24
|
this.toolRegistry = new ToolRegistry();
|
|
@@ -47,7 +52,28 @@ export class MarieRuntime {
|
|
|
47
52
|
const historyMap = await this.options.sessionStore.getSessions();
|
|
48
53
|
this.messages = historyMap[this.currentSessionId] || [];
|
|
49
54
|
}
|
|
50
|
-
|
|
55
|
+
onStateChanged(callback) {
|
|
56
|
+
this.onStateChangedCallbacks.push(callback);
|
|
57
|
+
return () => {
|
|
58
|
+
this.onStateChangedCallbacks = this.onStateChangedCallbacks.filter(c => c !== callback);
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
emitStateChanged() {
|
|
62
|
+
const state = {
|
|
63
|
+
messages: [...this.messages],
|
|
64
|
+
currentSessionId: this.currentSessionId,
|
|
65
|
+
sequenceNumber: ++this.sequenceNumber,
|
|
66
|
+
};
|
|
67
|
+
for (const callback of this.onStateChangedCallbacks) {
|
|
68
|
+
try {
|
|
69
|
+
callback(state);
|
|
70
|
+
}
|
|
71
|
+
catch (e) {
|
|
72
|
+
console.error("[MarieRuntime] Error in state change callback", e);
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
async saveHistoryInternal(telemetry, specificSessionId, runStartTime) {
|
|
51
77
|
if (this.messages.length > 50) {
|
|
52
78
|
this.messages = this.messages.slice(this.messages.length - 50);
|
|
53
79
|
}
|
|
@@ -94,6 +120,18 @@ export class MarieRuntime {
|
|
|
94
120
|
if (telemetry !== undefined) {
|
|
95
121
|
await this.options.sessionStore.setLastTelemetry(telemetry === null ? undefined : telemetry);
|
|
96
122
|
}
|
|
123
|
+
if (sid === this.currentSessionId) {
|
|
124
|
+
this.emitStateChanged();
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
async saveHistory(telemetry, specificSessionId, runStartTime) {
|
|
128
|
+
const unlock = await this.persistenceMutex.acquire();
|
|
129
|
+
try {
|
|
130
|
+
await this.saveHistoryInternal(telemetry, specificSessionId, runStartTime);
|
|
131
|
+
}
|
|
132
|
+
finally {
|
|
133
|
+
unlock();
|
|
134
|
+
}
|
|
97
135
|
}
|
|
98
136
|
generateSessionTitle(firstMessage) {
|
|
99
137
|
const response = MarieResponse.wrap(firstMessage);
|
|
@@ -121,10 +159,16 @@ export class MarieRuntime {
|
|
|
121
159
|
}
|
|
122
160
|
async createSession() {
|
|
123
161
|
await this.ensureInitialized();
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
162
|
+
const unlock = await this.persistenceMutex.acquire();
|
|
163
|
+
try {
|
|
164
|
+
this.currentSessionId = `session_${Date.now()}`;
|
|
165
|
+
this.messages = [];
|
|
166
|
+
await this.saveHistoryInternal();
|
|
167
|
+
return this.currentSessionId;
|
|
168
|
+
}
|
|
169
|
+
finally {
|
|
170
|
+
unlock();
|
|
171
|
+
}
|
|
128
172
|
}
|
|
129
173
|
async listSessions() {
|
|
130
174
|
await this.ensureInitialized();
|
|
@@ -132,160 +176,227 @@ export class MarieRuntime {
|
|
|
132
176
|
}
|
|
133
177
|
async loadSession(id) {
|
|
134
178
|
await this.ensureInitialized();
|
|
135
|
-
this.
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
179
|
+
const unlock = await this.persistenceMutex.acquire();
|
|
180
|
+
try {
|
|
181
|
+
this.stopGeneration();
|
|
182
|
+
this.currentSessionId = id;
|
|
183
|
+
await this.loadHistory();
|
|
184
|
+
await this.options.sessionStore.setCurrentSessionId(id);
|
|
185
|
+
this.emitStateChanged();
|
|
186
|
+
return this.currentSessionId;
|
|
187
|
+
}
|
|
188
|
+
finally {
|
|
189
|
+
unlock();
|
|
190
|
+
}
|
|
140
191
|
}
|
|
141
192
|
async deleteSession(id) {
|
|
142
193
|
await this.ensureInitialized();
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
const
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
const filteredMetadata = sessionMetadata.filter((s) => s.id !== id);
|
|
151
|
-
await this.options.sessionStore.saveSessionMetadata(filteredMetadata);
|
|
152
|
-
if (this.currentSessionId === id) {
|
|
153
|
-
if (filteredMetadata.length > 0) {
|
|
154
|
-
await this.loadSession(filteredMetadata[0].id);
|
|
194
|
+
let firstSessionId;
|
|
195
|
+
let shouldLoadFirst = false;
|
|
196
|
+
let shouldCreateNew = false;
|
|
197
|
+
const unlock = await this.persistenceMutex.acquire();
|
|
198
|
+
try {
|
|
199
|
+
if (this.currentSessionId === id) {
|
|
200
|
+
this.stopGeneration();
|
|
155
201
|
}
|
|
156
|
-
|
|
157
|
-
|
|
202
|
+
const historyMap = await this.options.sessionStore.getSessions();
|
|
203
|
+
delete historyMap[id];
|
|
204
|
+
await this.options.sessionStore.saveSessions(historyMap);
|
|
205
|
+
const sessionMetadata = await this.options.sessionStore.getSessionMetadata();
|
|
206
|
+
const filteredMetadata = sessionMetadata.filter((s) => s.id !== id);
|
|
207
|
+
await this.options.sessionStore.saveSessionMetadata(filteredMetadata);
|
|
208
|
+
if (this.currentSessionId === id) {
|
|
209
|
+
if (filteredMetadata.length > 0) {
|
|
210
|
+
shouldLoadFirst = true;
|
|
211
|
+
firstSessionId = filteredMetadata[0].id;
|
|
212
|
+
}
|
|
213
|
+
else {
|
|
214
|
+
shouldCreateNew = true;
|
|
215
|
+
}
|
|
216
|
+
}
|
|
217
|
+
if (shouldLoadFirst && firstSessionId) {
|
|
218
|
+
this.currentSessionId = firstSessionId;
|
|
219
|
+
await this.loadHistory();
|
|
220
|
+
await this.options.sessionStore.setCurrentSessionId(this.currentSessionId);
|
|
221
|
+
this.emitStateChanged();
|
|
222
|
+
}
|
|
223
|
+
else if (shouldCreateNew) {
|
|
224
|
+
this.currentSessionId = `session_${Date.now()}`;
|
|
225
|
+
this.messages = [];
|
|
226
|
+
await this.saveHistoryInternal();
|
|
158
227
|
}
|
|
159
228
|
}
|
|
229
|
+
finally {
|
|
230
|
+
unlock();
|
|
231
|
+
}
|
|
160
232
|
}
|
|
161
233
|
async renameSession(id, newTitle) {
|
|
162
|
-
await this.
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
234
|
+
const unlock = await this.persistenceMutex.acquire();
|
|
235
|
+
try {
|
|
236
|
+
await this.ensureInitialized();
|
|
237
|
+
const sessionMetadata = await this.options.sessionStore.getSessionMetadata();
|
|
238
|
+
const index = sessionMetadata.findIndex((s) => s.id === id);
|
|
239
|
+
if (index >= 0) {
|
|
240
|
+
sessionMetadata[index].title = newTitle;
|
|
241
|
+
await this.options.sessionStore.saveSessionMetadata(sessionMetadata);
|
|
242
|
+
this.emitStateChanged();
|
|
243
|
+
}
|
|
244
|
+
}
|
|
245
|
+
finally {
|
|
246
|
+
unlock();
|
|
168
247
|
}
|
|
169
248
|
}
|
|
170
249
|
async togglePinSession(id) {
|
|
171
|
-
await this.
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
250
|
+
const unlock = await this.persistenceMutex.acquire();
|
|
251
|
+
try {
|
|
252
|
+
await this.ensureInitialized();
|
|
253
|
+
const sessionMetadata = await this.options.sessionStore.getSessionMetadata();
|
|
254
|
+
const index = sessionMetadata.findIndex((s) => s.id === id);
|
|
255
|
+
if (index >= 0) {
|
|
256
|
+
sessionMetadata[index].isPinned = !sessionMetadata[index].isPinned;
|
|
257
|
+
await this.options.sessionStore.saveSessionMetadata(sessionMetadata);
|
|
258
|
+
this.emitStateChanged();
|
|
259
|
+
}
|
|
260
|
+
}
|
|
261
|
+
finally {
|
|
262
|
+
unlock();
|
|
177
263
|
}
|
|
178
264
|
}
|
|
179
265
|
async handleMessage(text, callbacks) {
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
const run = {
|
|
188
|
-
runId: `run_${Date.now()}`,
|
|
189
|
-
startedAt: Date.now(),
|
|
190
|
-
steps: 0,
|
|
191
|
-
tools: 0,
|
|
192
|
-
objectives: [
|
|
193
|
-
{
|
|
194
|
-
id: "understand_request",
|
|
195
|
-
label: "Understand request",
|
|
196
|
-
status: "in_progress",
|
|
197
|
-
},
|
|
198
|
-
{ id: "execute_plan", label: "Execute plan", status: "pending" },
|
|
199
|
-
{ id: "deliver_result", label: "Deliver result", status: "pending" },
|
|
200
|
-
],
|
|
201
|
-
activeObjectiveId: "understand_request",
|
|
202
|
-
achieved: [],
|
|
203
|
-
currentPass: lastTelemetry?.currentPass,
|
|
204
|
-
totalPasses: lastTelemetry?.totalPasses,
|
|
205
|
-
passFocus: lastTelemetry?.passFocus,
|
|
206
|
-
isResuming: !!lastTelemetry,
|
|
207
|
-
originatingSessionId,
|
|
208
|
-
};
|
|
209
|
-
const tracker = new MarieProgressTracker({
|
|
210
|
-
...callbacks,
|
|
211
|
-
onStream: (chunk) => callbacks?.onStream?.(chunk, run.runId, originatingSessionId),
|
|
212
|
-
onTool: (tool) => callbacks?.onTool?.(tool, run.runId, originatingSessionId),
|
|
213
|
-
onToolDelta: (delta) => callbacks?.onToolDelta?.(delta, run.runId, originatingSessionId),
|
|
214
|
-
onEvent: (event) => {
|
|
215
|
-
event.originatingSessionId = originatingSessionId;
|
|
216
|
-
if (event.type === "progress_update" ||
|
|
217
|
-
event.type === "session_persistence_update" ||
|
|
218
|
-
event.type === "file_stream_delta") {
|
|
219
|
-
this.options.onProgressEvent?.(event);
|
|
220
|
-
}
|
|
221
|
-
callbacks?.onEvent?.(event);
|
|
222
|
-
},
|
|
223
|
-
}, run);
|
|
224
|
-
this.currentRun = run;
|
|
225
|
-
this.options.automationService.setCurrentRun(run);
|
|
226
|
-
const approvalRequester = async (name, input, diff) => {
|
|
227
|
-
if (this.options.shouldBypassApprovals?.()) {
|
|
228
|
-
return true;
|
|
266
|
+
let unlock;
|
|
267
|
+
let attempts = 0;
|
|
268
|
+
const maxAttempts = 3;
|
|
269
|
+
while (attempts < maxAttempts) {
|
|
270
|
+
try {
|
|
271
|
+
unlock = await this.processingMutex.acquire(10000); // 10s timeout per attempt
|
|
272
|
+
break;
|
|
229
273
|
}
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
if (!hasHandlers) {
|
|
238
|
-
return true;
|
|
239
|
-
}
|
|
240
|
-
const approvalPromise = new Promise((resolve) => {
|
|
241
|
-
this.pendingApprovals.set(request.id, resolve);
|
|
242
|
-
});
|
|
243
|
-
callbacks?.onApprovalRequest?.(request, run.runId, originatingSessionId);
|
|
244
|
-
if (this.options.onApprovalRequest) {
|
|
245
|
-
void this.options.onApprovalRequest(request).then((approved) => {
|
|
246
|
-
this.resolveApproval(request.id, approved);
|
|
247
|
-
});
|
|
274
|
+
catch (e) {
|
|
275
|
+
attempts++;
|
|
276
|
+
if (attempts >= maxAttempts) {
|
|
277
|
+
return `Error: System is currently busy with another task. Please wait a moment and try again. (Mutex Timeout)`;
|
|
278
|
+
}
|
|
279
|
+
console.warn(`[MarieRuntime] Mutex acquisition attempt ${attempts} failed, retrying...`);
|
|
280
|
+
await new Promise(resolve => setTimeout(resolve, 1000));
|
|
248
281
|
}
|
|
249
|
-
return approvalPromise;
|
|
250
|
-
};
|
|
251
|
-
const engine = new MarieEngine(this.provider, this.toolRegistry, approvalRequester, this.createProvider.bind(this), this.options.fs, this.options.ghostPort);
|
|
252
|
-
tracker.emitEvent({
|
|
253
|
-
type: "run_started",
|
|
254
|
-
runId: run.runId,
|
|
255
|
-
startedAt: run.startedAt,
|
|
256
|
-
});
|
|
257
|
-
tracker.emitProgressUpdate("Thinking...");
|
|
258
|
-
this.messages.push({ role: "user", content: text, timestamp: Date.now() });
|
|
259
|
-
await this.saveHistory();
|
|
260
|
-
if (this.abortController) {
|
|
261
|
-
this.abortController.abort();
|
|
262
282
|
}
|
|
263
|
-
this.abortController = new AbortController();
|
|
264
|
-
const runStartTime = Date.now();
|
|
265
283
|
try {
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
if (session &&
|
|
271
|
-
(session.title === "New Session" || session.title.length > 50)) {
|
|
272
|
-
this.summarizeSession(this.currentSessionId).catch(console.error);
|
|
273
|
-
}
|
|
284
|
+
await this.ensureInitialized();
|
|
285
|
+
this.initializeProvider();
|
|
286
|
+
if (!this.provider) {
|
|
287
|
+
return "Please configure your API key for the selected provider.";
|
|
274
288
|
}
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
289
|
+
const lastTelemetry = await this.options.sessionStore.getLastTelemetry();
|
|
290
|
+
const originatingSessionId = this.currentSessionId;
|
|
291
|
+
const run = {
|
|
292
|
+
runId: `run_${Date.now()}`,
|
|
293
|
+
startedAt: Date.now(),
|
|
294
|
+
steps: 0,
|
|
295
|
+
tools: 0,
|
|
296
|
+
objectives: [
|
|
297
|
+
{
|
|
298
|
+
id: "understand_request",
|
|
299
|
+
label: "Understand request",
|
|
300
|
+
status: "in_progress",
|
|
301
|
+
},
|
|
302
|
+
{ id: "execute_plan", label: "Execute plan", status: "pending" },
|
|
303
|
+
{ id: "deliver_result", label: "Deliver result", status: "pending" },
|
|
304
|
+
],
|
|
305
|
+
activeObjectiveId: "understand_request",
|
|
306
|
+
achieved: [],
|
|
307
|
+
currentPass: lastTelemetry?.currentPass,
|
|
308
|
+
totalPasses: lastTelemetry?.totalPasses,
|
|
309
|
+
passFocus: lastTelemetry?.passFocus,
|
|
310
|
+
isResuming: !!lastTelemetry,
|
|
311
|
+
originatingSessionId,
|
|
312
|
+
};
|
|
313
|
+
const tracker = new MarieProgressTracker({
|
|
314
|
+
...callbacks,
|
|
315
|
+
onStream: (chunk) => callbacks?.onStream?.(chunk, run.runId, originatingSessionId),
|
|
316
|
+
onTool: (tool) => callbacks?.onTool?.(tool, run.runId, originatingSessionId),
|
|
317
|
+
onToolDelta: (delta) => callbacks?.onToolDelta?.(delta, run.runId, originatingSessionId),
|
|
318
|
+
onEvent: (event) => {
|
|
319
|
+
event.originatingSessionId = originatingSessionId;
|
|
320
|
+
if (event.type === "progress_update" ||
|
|
321
|
+
event.type === "session_persistence_update" ||
|
|
322
|
+
event.type === "file_stream_delta") {
|
|
323
|
+
this.options.onProgressEvent?.(event);
|
|
324
|
+
}
|
|
325
|
+
callbacks?.onEvent?.(event);
|
|
326
|
+
},
|
|
327
|
+
}, run);
|
|
328
|
+
this.currentRun = run;
|
|
329
|
+
this.options.automationService.setCurrentRun(run);
|
|
330
|
+
const approvalRequester = async (name, input, diff) => {
|
|
331
|
+
if (this.options.shouldBypassApprovals?.()) {
|
|
332
|
+
return true;
|
|
333
|
+
}
|
|
334
|
+
const request = {
|
|
335
|
+
id: `approval_${Date.now()}_${Math.random().toString(36).slice(2, 7)}`,
|
|
336
|
+
toolName: name,
|
|
337
|
+
toolInput: input,
|
|
338
|
+
diff,
|
|
339
|
+
};
|
|
340
|
+
const hasHandlers = Boolean(callbacks?.onApprovalRequest || this.options.onApprovalRequest);
|
|
341
|
+
if (!hasHandlers) {
|
|
342
|
+
return true;
|
|
343
|
+
}
|
|
344
|
+
const approvalPromise = new Promise((resolve) => {
|
|
345
|
+
this.pendingApprovals.set(request.id, {
|
|
346
|
+
resolve,
|
|
347
|
+
toolName: name,
|
|
348
|
+
timestamp: Date.now(),
|
|
349
|
+
});
|
|
350
|
+
});
|
|
351
|
+
callbacks?.onApprovalRequest?.(request, run.runId, originatingSessionId);
|
|
352
|
+
if (this.options.onApprovalRequest) {
|
|
353
|
+
void this.options.onApprovalRequest(request).then((approved) => {
|
|
354
|
+
this.resolveApproval(request.id, approved);
|
|
355
|
+
});
|
|
356
|
+
}
|
|
357
|
+
return approvalPromise;
|
|
358
|
+
};
|
|
359
|
+
const engine = new MarieEngine(this.provider, this.toolRegistry, approvalRequester, this.createProvider.bind(this), this.options.fs, this.options.ghostPort);
|
|
278
360
|
tracker.emitEvent({
|
|
279
|
-
type: "
|
|
361
|
+
type: "run_started",
|
|
280
362
|
runId: run.runId,
|
|
281
|
-
|
|
282
|
-
message: String(error),
|
|
363
|
+
startedAt: run.startedAt,
|
|
283
364
|
});
|
|
284
|
-
|
|
365
|
+
tracker.emitProgressUpdate("Thinking...");
|
|
366
|
+
this.messages.push({ role: "user", content: text, timestamp: Date.now() });
|
|
367
|
+
await this.saveHistory();
|
|
368
|
+
if (this.abortController) {
|
|
369
|
+
this.abortController.abort();
|
|
370
|
+
}
|
|
371
|
+
this.abortController = new AbortController();
|
|
372
|
+
const runStartTime = Date.now();
|
|
373
|
+
try {
|
|
374
|
+
const response = await engine.chatLoop(this.messages, tracker, (t) => this.saveHistory(t, originatingSessionId, runStartTime), this.abortController.signal);
|
|
375
|
+
if (this.messages.length >= 6 && this.messages.length <= 10) {
|
|
376
|
+
const sessionMetadata = await this.options.sessionStore.getSessionMetadata();
|
|
377
|
+
const session = sessionMetadata.find((s) => s.id === this.currentSessionId);
|
|
378
|
+
if (session &&
|
|
379
|
+
(session.title === "New Session" || session.title.length > 50)) {
|
|
380
|
+
this.summarizeSession(this.currentSessionId).catch(console.error);
|
|
381
|
+
}
|
|
382
|
+
}
|
|
383
|
+
return response;
|
|
384
|
+
}
|
|
385
|
+
catch (error) {
|
|
386
|
+
tracker.emitEvent({
|
|
387
|
+
type: "run_error",
|
|
388
|
+
runId: run.runId,
|
|
389
|
+
elapsedMs: tracker.elapsedMs(),
|
|
390
|
+
message: String(error),
|
|
391
|
+
});
|
|
392
|
+
return `Error: ${error}`;
|
|
393
|
+
}
|
|
285
394
|
}
|
|
286
395
|
finally {
|
|
287
396
|
this.abortController = null;
|
|
288
397
|
this.currentRun = undefined;
|
|
398
|
+
if (unlock)
|
|
399
|
+
unlock();
|
|
289
400
|
}
|
|
290
401
|
}
|
|
291
402
|
async summarizeSession(id) {
|
|
@@ -337,15 +448,18 @@ export class MarieRuntime {
|
|
|
337
448
|
getCurrentSessionId() {
|
|
338
449
|
return this.currentSessionId;
|
|
339
450
|
}
|
|
451
|
+
getSequenceNumber() {
|
|
452
|
+
return this.sequenceNumber;
|
|
453
|
+
}
|
|
340
454
|
getCurrentRun() {
|
|
341
455
|
return this.currentRun;
|
|
342
456
|
}
|
|
343
457
|
resolveApproval(requestId, approved) {
|
|
344
|
-
const
|
|
345
|
-
if (!
|
|
458
|
+
const entry = this.pendingApprovals.get(requestId);
|
|
459
|
+
if (!entry)
|
|
346
460
|
return false;
|
|
347
461
|
this.pendingApprovals.delete(requestId);
|
|
348
|
-
|
|
462
|
+
entry.resolve(approved);
|
|
349
463
|
return true;
|
|
350
464
|
}
|
|
351
465
|
dispose() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MarieRuntime.js","sourceRoot":"","sources":["../../../src/monolith/runtime/MarieRuntime.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"MarieRuntime.js","sourceRoot":"","sources":["../../../src/monolith/runtime/MarieRuntime.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,9 @@ export class RuntimeAdapterBase {
|
|
|
7
7
|
constructor(runtime) {
|
|
8
8
|
this.runtime = runtime;
|
|
9
9
|
}
|
|
10
|
+
onStateChanged(callback) {
|
|
11
|
+
return this.runtime.onStateChanged(callback);
|
|
12
|
+
}
|
|
10
13
|
async createSession() {
|
|
11
14
|
return this.runtime.createSession();
|
|
12
15
|
}
|
|
@@ -46,6 +49,9 @@ export class RuntimeAdapterBase {
|
|
|
46
49
|
getCurrentSessionId() {
|
|
47
50
|
return this.runtime.getCurrentSessionId();
|
|
48
51
|
}
|
|
52
|
+
getSequenceNumber() {
|
|
53
|
+
return this.runtime.getSequenceNumber();
|
|
54
|
+
}
|
|
49
55
|
getCurrentRun() {
|
|
50
56
|
return this.runtime.getCurrentRun();
|
|
51
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RuntimeAdapterBase.js","sourceRoot":"","sources":["../../../src/monolith/runtime/RuntimeAdapterBase.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,MAAM,OAAgB,kBAAkB;IAIjB;IADrB,YACqB,OAAkC;QAAlC,YAAO,GAAP,OAAO,CAA2B;IACpD,CAAC;IAEG,KAAK,CAAC,aAAa;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;IACtC,CAAC;IACM,KAAK,CAAC,YAAY;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;IACrC,CAAC;IACM,KAAK,CAAC,WAAW,CAAC,EAAU;QACjC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACtC,CAAC;IACM,KAAK,CAAC,aAAa,CAAC,EAAU;QACnC,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC;IACM,KAAK,CAAC,aAAa,CAAC,EAAU,EAAE,QAAgB;QACrD,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACjD,CAAC;IACM,KAAK,CAAC,gBAAgB,CAAC,EAAU;QACtC,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;IAC1C,CAAC;IACM,KAAK,CAAC,aAAa,CACxB,IAAY,EACZ,SAA0B;QAE1B,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACrD,CAAC;IACM,KAAK,CAAC,mBAAmB;QAC9B,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAC3C,CAAC;IACM,cAAc;QACnB,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;IAChC,CAAC;IACM,cAAc;QACnB,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;IAChC,CAAC;IACM,KAAK,CAAC,SAAS;QACpB,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;IAClC,CAAC;IACM,WAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IACpC,CAAC;IACM,mBAAmB;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAC5C,CAAC;IACM,aAAa;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;IACtC,CAAC;IACM,eAAe,CAAC,SAAiB,EAAE,QAAiB;QACzD,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAEM,OAAO;QACZ,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"RuntimeAdapterBase.js","sourceRoot":"","sources":["../../../src/monolith/runtime/RuntimeAdapterBase.ts"],"names":[],"mappings":"AAIA;;;GAGG;AACH,MAAM,OAAgB,kBAAkB;IAIjB;IADrB,YACqB,OAAkC;QAAlC,YAAO,GAAP,OAAO,CAA2B;IACpD,CAAC;IAEG,cAAc,CAAC,QAA4C;QAChE,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;IAEM,KAAK,CAAC,aAAa;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;IACtC,CAAC;IACM,KAAK,CAAC,YAAY;QACvB,OAAO,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;IACrC,CAAC;IACM,KAAK,CAAC,WAAW,CAAC,EAAU;QACjC,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACtC,CAAC;IACM,KAAK,CAAC,aAAa,CAAC,EAAU;QACnC,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC;IACM,KAAK,CAAC,aAAa,CAAC,EAAU,EAAE,QAAgB;QACrD,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;IACjD,CAAC;IACM,KAAK,CAAC,gBAAgB,CAAC,EAAU;QACtC,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;IAC1C,CAAC;IACM,KAAK,CAAC,aAAa,CACxB,IAAY,EACZ,SAA0B;QAE1B,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IACrD,CAAC;IACM,KAAK,CAAC,mBAAmB;QAC9B,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAC3C,CAAC;IACM,cAAc;QACnB,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;IAChC,CAAC;IACM,cAAc;QACnB,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;IAChC,CAAC;IACM,KAAK,CAAC,SAAS;QACpB,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;IAClC,CAAC;IACM,WAAW;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;IACpC,CAAC;IACM,mBAAmB;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAC5C,CAAC;IACM,iBAAiB;QACtB,OAAO,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAC1C,CAAC;IACM,aAAa;QAClB,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;IACtC,CAAC;IACM,eAAe,CAAC,SAAiB,EAAE,QAAiB;QACzD,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC3D,CAAC;IAEM,OAAO;QACZ,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IACzB,CAAC;CACF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as vscode from "vscode";
|
|
2
|
-
import { proposeReorganization, executeRestoration, scaffoldZoneAbstractions, sowFeature, proposeClustering, executeGenesisRitual, isProjectJoyful, ensureJoyZoningFolders, } from "../
|
|
2
|
+
import { proposeReorganization, executeRestoration, scaffoldZoneAbstractions, sowFeature, proposeClustering, executeGenesisRitual, isProjectJoyful, ensureJoyZoningFolders, } from "../infrastructure/joy/JoyTools.js";
|
|
3
3
|
import { MarieSentinelService } from "../plumbing/analysis/MarieSentinelService.js";
|
|
4
4
|
export class JoyAutomationService {
|
|
5
5
|
context;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"JoyAutomationService.js","sourceRoot":"","sources":["../../../src/monolith/services/JoyAutomationService.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AAEjC,OAAO,EACL,qBAAqB,EACrB,kBAAkB,EAElB,wBAAwB,EACxB,UAAU,EACV,iBAAiB,EACjB,oBAAoB,EACpB,eAAe,EAGf,sBAAsB,GACvB,MAAM,
|
|
1
|
+
{"version":3,"file":"JoyAutomationService.js","sourceRoot":"","sources":["../../../src/monolith/services/JoyAutomationService.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as vscode from "vscode";
|
|
2
2
|
import { checkCodeHealth, } from "../plumbing/analysis/CodeHealthService.js";
|
|
3
|
-
import { proposeClustering, isProjectJoyful } from "../
|
|
3
|
+
import { proposeClustering, isProjectJoyful } from "../infrastructure/joy/JoyTools.js";
|
|
4
4
|
export class JoyService {
|
|
5
5
|
context;
|
|
6
6
|
joyLog;
|