@resolveio/server-lib 22.1.16 → 22.1.17

package/methods/ai-terminal.js

@@ -1519,7 +1519,7 @@ function executeAiFormPatch(payload, context) {
 }
 function executeAiAssistantCodexRun(payload, context) {
     return __awaiter(this, void 0, void 0, function () {
-        var input, message, aiWorkerDebug, requestId, codexModel, codexFallbackModels, guardrail, conversation_3, now_3, userMsg, assistantMsg, user, isSuperAdmin, canViewDebug, hasInvoiceAccess, customerId, conversation, now, attachments, navigationFastPath, userMsg, assistantMsg, assistantInsert, assistantMessageId_1, changeHistoryFastPath, userMsg, assistantMsg, assistantInsert, assistantMessageId_2, attachmentData, historyLimit, history, _a, historyLines, recentToolError, userDoc, initialProgress, assistantDoc, insertResult, assistantMessageId;
+        var input, message, aiWorkerDebug, requestId, codexModel, codexFallbackModels, guardrail, conversation_3, now_3, userMsg, assistantMsg, user, isSuperAdmin, canViewDebug, hasInvoiceAccess, customerId, conversation, now, attachments, navigationFastPath, userMsg, assistantMsg, assistantInsert, assistantMessageId_1, changeHistoryFastPath, changeHistoryFastPathBypassedReason, userMsg, assistantMsg, assistantInsert, assistantMessageId_2, attachmentData, historyLimit, history, _a, historyLines, recentToolError, userDoc, initialProgress, assistantDoc, insertResult, assistantMessageId;
         var _this = this;
         var _b, _c, _d;
         return __generator(this, function (_e) {
@@ -1646,7 +1646,12 @@ function executeAiAssistantCodexRun(payload, context) {
                     })];
                 case 12:
                     changeHistoryFastPath = _e.sent();
-                    if (!changeHistoryFastPath) return [3 /*break*/, 16];
+                    changeHistoryFastPathBypassedReason = (changeHistoryFastPath
+                        && (changeHistoryFastPath.reason === 'no_repo' || changeHistoryFastPath.reason === 'error')
+                        && !shouldReturnAssistantChangeHistoryUnavailableFastPath())
+                        ? changeHistoryFastPath.reason
+                        : '';
+                    if (!(changeHistoryFastPath && !changeHistoryFastPathBypassedReason)) return [3 /*break*/, 16];
                     userMsg = {
                         id_conversation: conversation._id,
                         role: 'user',
@@ -1819,6 +1824,11 @@ function executeAiAssistantCodexRun(payload, context) {
                                     contextRoute = normalizeOptionalString((_k = input === null || input === void 0 ? void 0 : input.context) === null || _k === void 0 ? void 0 : _k.route);
                                     contextMode = normalizeOptionalString((_l = input === null || input === void 0 ? void 0 : input.context) === null || _l === void 0 ? void 0 : _l.mode);
                                     recordStep('Queued', { requestId: requestId || undefined });
+                                    if (changeHistoryFastPathBypassedReason) {
+                                        recordStep('Planning: change-history fast path unavailable', {
+                                            reason: changeHistoryFastPathBypassedReason
+                                        });
+                                    }
                                     recordStep('Planning: request classification', {
                                         type: requestClassification.type,
                                         source: requestClassification.source,
@@ -1918,7 +1928,8 @@ function executeAiAssistantCodexRun(payload, context) {
                                         fieldHints: fieldHints,
                                         methodHints: methodHints,
                                         publicationHints: publicationHints,
-                                        recentToolError: recentToolError
+                                        recentToolError: recentToolError,
+                                        changeHistoryFastPathBypassedReason: changeHistoryFastPathBypassedReason
                                     });
                                     heuristicDirectivePrecomputed = dataQuestion
                                         ? buildAssistantHeuristicDirective(message, collectionHints, collectionNames)
@@ -2513,7 +2524,9 @@ function executeAiAssistantCodexRun(payload, context) {
                                             }
                                         });
                                     }
-                                    finalMetadata = __assign(__assign(__assign(__assign({ model: codexModel }, (codexFallbackModels.length ? { model_fallbacks: codexFallbackModels } : {})), (requestId ? { request_id: requestId } : {})), (toolResult ? { tool_result: toolResult } : {})), (assistantDebug ? { debug: assistantDebug } : {}));
+                                    finalMetadata = __assign(__assign(__assign(__assign(__assign({ model: codexModel }, (codexFallbackModels.length ? { model_fallbacks: codexFallbackModels } : {})), (requestId ? { request_id: requestId } : {})), (changeHistoryFastPathBypassedReason ? {
+                                        fast_path_change_history_bypassed_reason: changeHistoryFastPathBypassedReason
+                                    } : {})), (toolResult ? { tool_result: toolResult } : {})), (assistantDebug ? { debug: assistantDebug } : {}));
                                     finalUsage = codexUsage.total_tokens > 0 ? {
                                         model: codexModel || 'unknown',
                                         input_tokens: codexUsage.input_tokens,
@@ -16884,6 +16897,11 @@ function parseAssistantPathList(value) {
         .map(function (entry) { return normalizeOptionalString(entry); })
         .filter(Boolean);
 }
+function resolveAssistantConfiguredWorkspaceRoots(serverConfigParam, envParam) {
+    var serverConfig = serverConfigParam || resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
+    var env = envParam || process.env || {};
+    return mergeAssistantHintValues(parseAssistantPathList(serverConfig['AI_ASSISTANT_WORKSPACE_ROOTS']), parseAssistantPathList(env['AI_ASSISTANT_WORKSPACE_ROOTS']), parseAssistantPathList(serverConfig['AI_ASSISTANT_GIT_ROOTS']), parseAssistantPathList(env['AI_ASSISTANT_GIT_ROOTS']), parseAssistantPathList(serverConfig['AI_ASSISTANT_WORKSPACE_ROOT']), parseAssistantPathList(env['AI_ASSISTANT_WORKSPACE_ROOT']), parseAssistantPathList(serverConfig['AI_ASSISTANT_ROOT_WORKSPACE']), parseAssistantPathList(env['AI_ASSISTANT_ROOT_WORKSPACE']), parseAssistantPathList(serverConfig['AI_TERMINAL_WORKSPACE_ROOT']), parseAssistantPathList(env['AI_TERMINAL_WORKSPACE_ROOT']), parseAssistantPathList(serverConfig['AI_DASHBOARD_WORKSPACE_ROOT']), parseAssistantPathList(env['AI_DASHBOARD_WORKSPACE_ROOT']));
+}
 function buildAssistantParentDirectoryCandidates(basePath, maxDepth) {
     if (maxDepth === void 0) { maxDepth = 4; }
     var normalized = normalizeOptionalString(basePath);
@@ -16908,7 +16926,7 @@ function buildAssistantWorkspaceRootCandidates(params) {
     var cwdValue = normalizeOptionalString((params === null || params === void 0 ? void 0 : params.cwd) || process.cwd());
     var dirnameValue = normalizeOptionalString((params === null || params === void 0 ? void 0 : params.dirname) || __dirname);
     var homeDir = normalizeOptionalString(os.homedir());
-    var configuredRoots = mergeAssistantHintValues(parseAssistantPathList(serverConfig['AI_ASSISTANT_WORKSPACE_ROOTS']), parseAssistantPathList(env['AI_ASSISTANT_WORKSPACE_ROOTS']), parseAssistantPathList(serverConfig['AI_ASSISTANT_GIT_ROOTS']), parseAssistantPathList(env['AI_ASSISTANT_GIT_ROOTS']));
+    var configuredRoots = resolveAssistantConfiguredWorkspaceRoots(serverConfig, env);
     var pathCandidates = __spreadArray(__spreadArray(__spreadArray([
         serverConfig['AI_ASSISTANT_WORKSPACE_ROOT'],
         env['AI_ASSISTANT_WORKSPACE_ROOT'],
@@ -16943,20 +16961,21 @@ function buildAssistantWorkspaceRootCandidates(params) {
 }
 function resolveAssistantWorkspaceRoot() {
     return __awaiter(this, void 0, void 0, function () {
-        var candidates, firstExisting, candidates_8, candidates_8_1, candidate, _a, gitRoot, e_44_1;
+        var candidates, firstExisting, firstNestedGitRoot, candidates_8, candidates_8_1, candidate, _a, gitRoot, nestedGitRoots, e_44_1;
         var e_44, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
                     candidates = buildAssistantWorkspaceRootCandidates();
                     firstExisting = '';
+                    firstNestedGitRoot = '';
                     _c.label = 1;
                 case 1:
-                    _c.trys.push([1, 8, 9, 10]);
+                    _c.trys.push([1, 9, 10, 11]);
                     candidates_8 = __values(candidates), candidates_8_1 = candidates_8.next();
                     _c.label = 2;
                 case 2:
-                    if (!!candidates_8_1.done) return [3 /*break*/, 7];
+                    if (!!candidates_8_1.done) return [3 /*break*/, 8];
                     candidate = candidates_8_1.value;
                     _a = !candidate;
                     if (_a) return [3 /*break*/, 4];
@@ -16966,7 +16985,7 @@ function resolveAssistantWorkspaceRoot() {
                     _c.label = 4;
                 case 4:
                     if (_a) {
-                        return [3 /*break*/, 6];
+                        return [3 /*break*/, 7];
                     }
                     if (!firstExisting) {
                         firstExisting = candidate;
@@ -16975,24 +16994,34 @@ function resolveAssistantWorkspaceRoot() {
                 case 5:
                     gitRoot = _c.sent();
                     if (gitRoot) {
-                        return [2 /*return*/, candidate];
+                        return [2 /*return*/, gitRoot];
                     }
-                    _c.label = 6;
+                    if (!!firstNestedGitRoot) return [3 /*break*/, 7];
+                    return [4 /*yield*/, resolveAssistantWorkspaceGitRoots(candidate)];
                 case 6:
+                    nestedGitRoots = _c.sent();
+                    if (nestedGitRoots.length) {
+                        firstNestedGitRoot = nestedGitRoots[0];
+                    }
+                    _c.label = 7;
+                case 7:
                     candidates_8_1 = candidates_8.next();
                     return [3 /*break*/, 2];
-                case 7: return [3 /*break*/, 10];
-                case 8:
+                case 8: return [3 /*break*/, 11];
+                case 9:
                     e_44_1 = _c.sent();
                     e_44 = { error: e_44_1 };
-                    return [3 /*break*/, 10];
-                case 9:
+                    return [3 /*break*/, 11];
+                case 10:
                     try {
                         if (candidates_8_1 && !candidates_8_1.done && (_b = candidates_8.return)) _b.call(candidates_8);
                     }
                     finally { if (e_44) throw e_44.error; }
                     return [7 /*endfinally*/];
-                case 10:
+                case 11:
+                    if (firstNestedGitRoot) {
+                        return [2 /*return*/, firstNestedGitRoot];
+                    }
                     if (firstExisting) {
                         return [2 /*return*/, firstExisting];
                     }
@@ -17769,6 +17798,11 @@ function buildAssistantContext(input, userContext) {
     if (recentToolError) {
         lines.push("Most recent data-query error: ".concat(recentToolError));
     }
+    var changeHistoryBypassReason = normalizeOptionalString(userContext === null || userContext === void 0 ? void 0 : userContext.changeHistoryFastPathBypassedReason);
+    if (changeHistoryBypassReason) {
+        lines.push("Change history fast path unavailable: ".concat(changeHistoryBypassReason));
+        lines.push('For change-history requests, run git history lookups through available repository tooling before concluding history is unavailable.');
+    }
     var mongoDb = normalizeOptionalString((_c = input === null || input === void 0 ? void 0 : input.mongo) === null || _c === void 0 ? void 0 : _c.database);
     var mongoDbs = Array.isArray((_d = input === null || input === void 0 ? void 0 : input.mongo) === null || _d === void 0 ? void 0 : _d.databases)
         ? input.mongo.databases.map(function (value) { return normalizeOptionalString(value); }).filter(Boolean)
@@ -18734,7 +18768,7 @@ function resolveAssistantWorkspaceGitRoots(workspaceRoot) {
                     return [4 /*yield*/, resolveAssistantGitRoot(workspaceRoot)];
                 case 1:
                     _a.apply(void 0, [_h.sent()]);
-                    configuredRoots = mergeAssistantHintValues(parseAssistantPathList(process.env.AI_ASSISTANT_GIT_ROOTS), parseAssistantPathList(process.env.AI_ASSISTANT_WORKSPACE_ROOTS));
+                    configuredRoots = resolveAssistantConfiguredWorkspaceRoots();
                     _h.label = 2;
                 case 2:
                     _h.trys.push([2, 7, 8, 9]);
@@ -19016,6 +19050,12 @@ function buildAssistantChangeHistoryUnavailableResponse(message, reason) {
         generic: true
     };
 }
+function shouldReturnAssistantChangeHistoryUnavailableFastPath() {
+    var config = resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
+    var configured = normalizeOptionalBoolean(config['AI_ASSISTANT_CHANGE_HISTORY_UNAVAILABLE_FAST_PATH']
+        || process.env.AI_ASSISTANT_CHANGE_HISTORY_UNAVAILABLE_FAST_PATH);
+    return configured === true;
+}
 function resolveAssistantChangeHistoryGitRepoUrls() {
     var serverConfig = resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
     var rawValues = [