@resolveio/server-lib 20.14.25 → 20.14.27

package/methods/ai-terminal.js

@@ -419,6 +419,7 @@ function loadAiTerminalMethods(methodManager) {
             }),
             forceWorker: true,
             maxConcurrencyPerInstance: 1,
+            timeoutOverride: resolveCodexTimeoutMs() + 15000,
             function: function (payload) {
                 return __awaiter(this, void 0, void 0, function () {
                     return __generator(this, function (_a) {
@@ -1148,6 +1149,18 @@ function resolveCodexTimeoutMs() {
     }
     return DEFAULT_CODEX_TIMEOUT_MS;
 }
+function resolveCodexWorkerThreadEnabled() {
+    var config = resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
+    var raw = normalizeOptionalString(config['AI_ASSISTANT_CODEX_USE_WORKER_THREAD']
+        || process.env.AI_ASSISTANT_CODEX_USE_WORKER_THREAD
+        || config['AI_ASSISTANT_CODEX_WORKER_THREAD']
+        || process.env.AI_ASSISTANT_CODEX_WORKER_THREAD);
+    var normalized = normalizeOptionalBoolean(raw);
+    if (typeof normalized === 'boolean') {
+        return normalized;
+    }
+    return process.env.IS_WORKER_INSTANCE !== 'true';
+}
 function resolveCodexModel() {
     var config = resolveio_server_app_1.ResolveIOServer.getServerConfig() || {};
     var raw = normalizeOptionalString(config['AI_ASSISTANT_CODEX_MODEL']
@@ -1189,21 +1202,26 @@ var CodexWorkerBootstrapError = /** @class */ (function (_super) {
 }(Error));
 function runCodexInWorkerThread(prompt, runOptions, config) {
     return __awaiter(this, void 0, void 0, function () {
-        var workerPath, codexClient, error_1, codexClient;
+        var codexClient, workerPath, codexClient, error_1, codexClient;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, resolveCodexWorkerPath()];
-                case 1:
-                    workerPath = _a.sent();
-                    if (!!workerPath) return [3 /*break*/, 3];
+                case 0:
+                    if (!!resolveCodexWorkerThreadEnabled()) return [3 /*break*/, 2];
                     codexClient = getAssistantCodexClient();
                     return [4 /*yield*/, codexClient.run(prompt, runOptions)];
-                case 2: return [2 /*return*/, _a.sent()];
+                case 1: return [2 /*return*/, _a.sent()];
+                case 2: return [4 /*yield*/, resolveCodexWorkerPath()];
                 case 3:
-                    _a.trys.push([3, 5, , 7]);
-                    return [4 /*yield*/, runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config)];
+                    workerPath = _a.sent();
+                    if (!!workerPath) return [3 /*break*/, 5];
+                    codexClient = getAssistantCodexClient();
+                    return [4 /*yield*/, codexClient.run(prompt, runOptions)];
                 case 4: return [2 /*return*/, _a.sent()];
                 case 5:
+                    _a.trys.push([5, 7, , 9]);
+                    return [4 /*yield*/, runCodexInWorkerThreadInternal(workerPath, prompt, runOptions, config)];
+                case 6: return [2 /*return*/, _a.sent()];
+                case 7:
                     error_1 = _a.sent();
                     if (!(error_1 instanceof CodexWorkerBootstrapError)) {
                         throw error_1;
@@ -1211,8 +1229,8 @@ function runCodexInWorkerThread(prompt, runOptions, config) {
                     console.error('Codex worker bootstrap failed, falling back to in-process run.', error_1);
                     codexClient = getAssistantCodexClient();
                     return [4 /*yield*/, codexClient.run(prompt, runOptions)];
-                case 6: return [2 /*return*/, _a.sent()];
-                case 7: return [2 /*return*/];
+                case 8: return [2 /*return*/, _a.sent()];
+                case 9: return [2 /*return*/];
             }
         });
     });
@@ -2084,6 +2102,22 @@ function normalizeOptionalNumber(value) {
     var parsed = Number(value);
     return Number.isFinite(parsed) ? parsed : undefined;
 }
+function normalizeOptionalBoolean(value) {
+    if (typeof value === 'boolean') {
+        return value;
+    }
+    var normalized = normalizeOptionalString(value).toLowerCase();
+    if (!normalized) {
+        return undefined;
+    }
+    if (['true', '1', 'yes', 'y', 'on'].includes(normalized)) {
+        return true;
+    }
+    if (['false', '0', 'no', 'n', 'off'].includes(normalized)) {
+        return false;
+    }
+    return undefined;
+}
 function normalizeHistoryLimit(value) {
     var parsed = Number(value);
     if (!Number.isFinite(parsed)) {