@resolveio/server-lib 20.14.48 → 20.15.0

package/methods/ai-terminal.js

@@ -61,6 +61,13 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};
 var __read = (this && this.__read) || function (o, n) {
     var m = typeof Symbol === "function" && o[Symbol.iterator];
     if (!m) return o;
@@ -788,7 +795,7 @@ function executeAiFormPatch(payload, context) {
 }
 function executeAiAssistantCodexRun(payload, context) {
     return __awaiter(this, void 0, void 0, function () {
-        var input, message, requestId, guardrail, conversation_2, now_2, userMsg, assistantMsg, user, isSuperAdmin, hasInvoiceAccess, customerId, conversation, now, attachments, attachmentData, historyLimit, history, _a, historyLines, assistantContext, prompt, workspaceRoot, codexConfig, runOptions, userDoc, initialProgress, assistantDoc, insertResult, assistantMessageId, progressTracker, assistantContent, toolResult, responseText, directive, cleanedResponseText, toolRequest, toolResponse, _b, toolPayload, followupPrompt, followupText, _c, error_1, error_2, finalNow, finalMetadata, finalAssistantDoc;
+        var input, message, requestId, guardrail, conversation_2, now_2, userMsg, assistantMsg, user, isSuperAdmin, hasInvoiceAccess, customerId, conversation, now, attachments, attachmentData, historyLimit, history, _a, historyLines, assistantContext, prompt, workspaceRoot, codexConfig, runOptions, userDoc, initialProgress, assistantDoc, insertResult, assistantMessageId, progressTracker, streamProgress, assistantContent, toolResult, responseText, directive, cleanedResponseText, toolRequest, toolResponse, _b, toolPayload, followupPrompt, followupText, _c, error_1, error_2, finalNow, finalMetadata, finalAssistantDoc;
         var _d, _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
@@ -916,12 +923,13 @@ function executeAiAssistantCodexRun(payload, context) {
                     insertResult = _f.sent();
                     assistantMessageId = (insertResult === null || insertResult === void 0 ? void 0 : insertResult._id) || (insertResult === null || insertResult === void 0 ? void 0 : insertResult.insertedId);
                     progressTracker = createAssistantProgressTracker(assistantMessageId, initialProgress);
+                    streamProgress = createAssistantStreamProgressHandler(progressTracker);
                     assistantContent = '';
                     toolResult = null;
                     _f.label = 15;
                 case 15:
                     _f.trys.push([15, 30, 31, 32]);
-                    return [4 /*yield*/, runCodexInWorkerThread(prompt, runOptions, codexConfig)];
+                    return [4 /*yield*/, runCodexInWorkerThread(prompt, runOptions, codexConfig, streamProgress)];
                 case 16:
                     responseText = _f.sent();
                     directive = extractAssistantMongoDirective(responseText);
@@ -951,7 +959,7 @@ function executeAiAssistantCodexRun(payload, context) {
                     _f.label = 22;
                 case 22:
                     _f.trys.push([22, 24, , 25]);
-                    return [4 /*yield*/, runCodexInWorkerThread(followupPrompt, runOptions, codexConfig)];
+                    return [4 /*yield*/, runCodexInWorkerThread(followupPrompt, runOptions, codexConfig, streamProgress)];
                 case 23:
                     followupText = _f.sent();
                     assistantContent = sanitizeAssistantResponse(followupText);
@@ -1381,6 +1389,60 @@ function buildAssistantToolErrorMessage(error, directive, request) {
     }
     return "I couldn't access the requested data. ".concat(routeLine);
 }
+function deriveAssistantStreamStatus(event) {
+    var _a;
+    if (!event || !event.type) {
+        return null;
+    }
+    if (event.type === 'thread.started' || event.type === 'turn.started') {
+        return 'Reviewing request';
+    }
+    if (event.type === 'turn.completed') {
+        return 'Drafting response';
+    }
+    if (event.type === 'item.started' || event.type === 'item.updated' || event.type === 'item.completed') {
+        var itemType = String(((_a = event === null || event === void 0 ? void 0 : event.item) === null || _a === void 0 ? void 0 : _a.type) || '').trim().toLowerCase();
+        if (!itemType) {
+            return null;
+        }
+        if (itemType === 'mcp_tool_call') {
+            return 'Calling tool';
+        }
+        if (itemType === 'command_execution') {
+            return 'Running command';
+        }
+        if (itemType === 'web_search') {
+            return 'Searching references';
+        }
+        if (itemType === 'file_change') {
+            return 'Drafting response';
+        }
+        if (itemType === 'agent_message') {
+            return 'Drafting response';
+        }
+        if (itemType === 'reasoning') {
+            return 'Analyzing';
+        }
+    }
+    return null;
+}
+function createAssistantStreamProgressHandler(progressTracker) {
+    var lastStatus = '';
+    var lastSentAt = 0;
+    return function (status) {
+        var trimmed = normalizeOptionalString(status);
+        if (!trimmed) {
+            return;
+        }
+        var now = Date.now();
+        if (trimmed === lastStatus && now - lastSentAt < 3000) {
+            return;
+        }
+        lastStatus = trimmed;
+        lastSentAt = now;
+        progressTracker.push(trimmed);
+    };
+}
 function normalizeAssistantProgress(items) {
     var seen = new Set();
     var cleaned = [];
@@ -2400,26 +2462,103 @@ var CodexWorkerBootstrapError = /** @class */ (function (_super) {
     }
     return CodexWorkerBootstrapError;
 }(Error));
-function runCodexInWorkerThread(prompt, runOptions, config) {
+function applyCodexStreamStatusHandler(runOptions, streamStatusHandler) {
+    var _this = this;
+    if (!streamStatusHandler) {
+        return runOptions;
+    }
+    var existing = runOptions === null || runOptions === void 0 ? void 0 : runOptions.onStreamEvent;
+    return __assign(__assign({}, runOptions), { onStreamEvent: function (event) { return __awaiter(_this, void 0, void 0, function () {
+            var status;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (!existing) return [3 /*break*/, 2];
+                        return [4 /*yield*/, existing(event)];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2:
+                        status = deriveAssistantStreamStatus(event);
+                        if (status) {
+                            streamStatusHandler(status);
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        }); } });
+}
+function waitForCodexWorkerMessage(worker, streamStatusHandler) {
     return __awaiter(this, void 0, void 0, function () {
-        var codexClient, workerPath, codexClient, error_3, codexClient;
+        var _a, _b, _c, _d, message, payload, status_1, e_2_1;
+        var _e, e_2, _f, _g;
+        return __generator(this, function (_h) {
+            switch (_h.label) {
+                case 0:
+                    _h.trys.push([0, 5, 6, 11]);
+                    _a = true, _b = __asyncValues((0, events_1.on)(worker, 'message'));
+                    _h.label = 1;
+                case 1: return [4 /*yield*/, _b.next()];
+                case 2:
+                    if (!(_c = _h.sent(), _e = _c.done, !_e)) return [3 /*break*/, 4];
+                    _g = _c.value;
+                    _a = false;
+                    _d = __read(_g, 1), message = _d[0];
+                    payload = message;
+                    if ((payload === null || payload === void 0 ? void 0 : payload.type) === 'stream') {
+                        status_1 = normalizeOptionalString(payload.status);
+                        if (status_1 && streamStatusHandler) {
+                            streamStatusHandler(status_1);
+                        }
+                        return [3 /*break*/, 3];
+                    }
+                    return [2 /*return*/, payload];
+                case 3:
+                    _a = true;
+                    return [3 /*break*/, 1];
+                case 4: return [3 /*break*/, 11];
+                case 5:
+                    e_2_1 = _h.sent();
+                    e_2 = { error: e_2_1 };
+                    return [3 /*break*/, 11];
+                case 6:
+                    _h.trys.push([6, , 9, 10]);
+                    if (!(!_a && !_e && (_f = _b.return))) return [3 /*break*/, 8];
+                    return [4 /*yield*/, _f.call(_b)];
+                case 7:
+                    _h.sent();
+                    _h.label = 8;
+                case 8: return [3 /*break*/, 10];
+                case 9:
+                    if (e_2) throw e_2.error;
+                    return [7 /*endfinally*/];
+                case 10: return [7 /*endfinally*/];
+                case 11: throw new CodexWorkerBootstrapError('Codex worker exited before completing.');
+            }
+        });
+    });
+}
+function runCodexInWorkerThread(prompt, runOptions, config, streamStatusHandler) {
+    return __awaiter(this, void 0, void 0, function () {
+        var streamedOptions, codexClient, workerPath, codexClient, error_3, codexClient;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
+                    streamedOptions = applyCodexStreamStatusHandler(runOptions, streamStatusHandler);
                     if (!!resolveCodexWorkerThreadEnabled()) return [3 /*break*/, 2];
                     codexClient = getAssistantCodexClient();
-                    return [4 /*yield*/, codexClient.run(prompt, runOptions)];
+                    return [4 /*yield*/, codexClient.run(prompt, streamedOptions)];
                 case 1: return [2 /*return*/, _a.sent()];
                 case 2: return [4 /*yield*/, resolveCodexWorkerPath()];
                 case 3:
                     workerPath = _a.sent();
                     if (!!workerPath) return [3 /*break*/, 5];
                     codexClient = getAssistantCodexClient();
-                    return [4 /*yield*/, codexClient.run(prompt, runOptions)];
+                    return [4 /*yield*/, codexClient.run(prompt, streamedOptions)];
                 case 4: return [2 /*return*/, _a.sent()];
                 case 5:
                     _a.trys.push([5, 7, , 9]);
-                    return [4 /*yield*/, runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config)];
+                    return [4 /*yield*/, runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config, streamStatusHandler)];
                 case 6: return [2 /*return*/, _a.sent()];
                 case 7:
                     error_3 = _a.sent();
@@ -2428,14 +2567,14 @@ function runCodexInWorkerThread(prompt, runOptions, config) {
                     }
                     console.error('Codex worker bootstrap failed, falling back to in-process run.', error_3);
                     codexClient = getAssistantCodexClient();
-                    return [4 /*yield*/, codexClient.run(prompt, runOptions)];
+                    return [4 /*yield*/, codexClient.run(prompt, streamedOptions)];
                 case 8: return [2 /*return*/, _a.sent()];
                 case 9: return [2 /*return*/];
             }
         });
     });
 }
-function runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config) {
+function runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config, streamStatusHandler) {
     return __awaiter(this, void 0, void 0, function () {
         var sanitizedOptions, worker, wrapped, timeoutMs, timeoutController, timeoutPromise, messagePromise, errorPromise, exitPromise, outcome, wrapped;
         var _this = this;
@@ -2449,7 +2588,8 @@ function runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config)
                             workerData: {
                                 prompt: prompt,
                                 runOptions: sanitizedOptions,
-                                config: config
+                                config: config,
+                                streamStatus: !!streamStatusHandler
                             }
                         });
                     }
@@ -2483,12 +2623,12 @@ function runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config)
                         });
                     }); })();
                     messagePromise = (function () { return __awaiter(_this, void 0, void 0, function () {
-                        var _a, message;
-                        return __generator(this, function (_b) {
-                            switch (_b.label) {
-                                case 0: return [4 /*yield*/, (0, events_1.once)(worker, 'message')];
+                        var message;
+                        return __generator(this, function (_a) {
+                            switch (_a.label) {
+                                case 0: return [4 /*yield*/, waitForCodexWorkerMessage(worker, streamStatusHandler)];
                                 case 1:
-                                    _a = __read.apply(void 0, [_b.sent(), 1]), message = _a[0];
+                                    message = _a.sent();
                                     return [2 /*return*/, { type: 'message', message: message }];
                             }
                         });
@@ -2524,7 +2664,6 @@ function runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config)
                     return [3 /*break*/, 4];
                 case 3:
                     timeoutController.abort();
-                    worker.removeAllListeners('message');
                     worker.removeAllListeners('error');
                     worker.removeAllListeners('exit');
                     return [7 /*endfinally*/];
@@ -2730,7 +2869,7 @@ function normalizeRouteMatchKey(value) {
     return normalizeRouteKey(value).toLowerCase();
 }
 function buildClientRouteIndex() {
-    var e_2, _a;
+    var e_3, _a;
     var _b;
     var routes = ((_b = resolveio_server_app_1.ResolveIOServer.getClientRoutes) === null || _b === void 0 ? void 0 : _b.call(resolveio_server_app_1.ResolveIOServer)) || [];
     var set = new Set();
@@ -2749,12 +2888,12 @@ function buildClientRouteIndex() {
             }
         }
     }
-    catch (e_2_1) { e_2 = { error: e_2_1 }; }
+    catch (e_3_1) { e_3 = { error: e_3_1 }; }
     finally {
         try {
             if (routes_1_1 && !routes_1_1.done && (_a = routes_1.return)) _a.call(routes_1);
         }
-        finally { if (e_2) throw e_2.error; }
+        finally { if (e_3) throw e_3.error; }
     }
     return { set: set, map: map, size: routes.length };
 }
@@ -2877,7 +3016,7 @@ function sanitizeAssistantResponse(value) {
     return normalizeAssistantRoutes(cleaned);
 }
 function evaluateAssistantGuardrails(message) {
-    var e_3, _a;
+    var e_4, _a;
     var normalized = String(message || '').toLowerCase();
     var patterns = [
         {
@@ -2923,12 +3062,12 @@ function evaluateAssistantGuardrails(message) {
             }
         }
     }
-    catch (e_3_1) { e_3 = { error: e_3_1 }; }
+    catch (e_4_1) { e_4 = { error: e_4_1 }; }
     finally {
         try {
             if (patterns_1_1 && !patterns_1_1.done && (_a = patterns_1.return)) _a.call(patterns_1);
         }
-        finally { if (e_3) throw e_3.error; }
+        finally { if (e_4) throw e_4.error; }
     }
     return null;
 }
@@ -3092,8 +3231,8 @@ function handleCodexUpload(id_conversation, file_name, content_base64, size, con
 }
 function readAttachmentContents(attachments) {
     return __awaiter(this, void 0, void 0, function () {
-        var limits, totalBytes, totalChars, chunks, cleaned, attachments_1, attachments_1_1, attachment, localPath, safe, stat, ext, name_1, type, readable, content, _a, e_4_1;
-        var e_4, _b;
+        var limits, totalBytes, totalChars, chunks, cleaned, attachments_1, attachments_1_1, attachment, localPath, safe, stat, ext, name_1, type, readable, content, _a, e_5_1;
+        var e_5, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -3172,14 +3311,14 @@ function readAttachmentContents(attachments) {
                     return [3 /*break*/, 2];
                 case 10: return [3 /*break*/, 13];
                 case 11:
-                    e_4_1 = _c.sent();
-                    e_4 = { error: e_4_1 };
+                    e_5_1 = _c.sent();
+                    e_5 = { error: e_5_1 };
                     return [3 /*break*/, 13];
                 case 12:
                     try {
                         if (attachments_1_1 && !attachments_1_1.done && (_b = attachments_1.return)) _b.call(attachments_1);
                     }
-                    finally { if (e_4) throw e_4.error; }
+                    finally { if (e_5) throw e_5.error; }
                     return [7 /*endfinally*/];
                 case 13: return [2 /*return*/, {
                         promptText: chunks.length ? "\n\nAttachments:\n".concat(chunks.join('\n\n')) : '',
@@ -3356,7 +3495,7 @@ function estimateUsage(messages, responseText, model) {
     };
 }
 function evaluateGuardrails(message) {
-    var e_5, _a;
+    var e_6, _a;
     var normalized = String(message || '').toLowerCase();
     var patterns = [
         { pattern: /\b(source\s*code|full\s*code|entire\s*code|repo\s*dump|repository|git\s*clone)\b/i, reason: 'Code access is restricted.' },
@@ -3378,12 +3517,12 @@ function evaluateGuardrails(message) {
             }
         }
     }
-    catch (e_5_1) { e_5 = { error: e_5_1 }; }
+    catch (e_6_1) { e_6 = { error: e_6_1 }; }
     finally {
         try {
             if (patterns_2_1 && !patterns_2_1.done && (_a = patterns_2.return)) _a.call(patterns_2);
         }
-        finally { if (e_5) throw e_5.error; }
+        finally { if (e_6) throw e_6.error; }
     }
     return null;
 }