@junctionpanel/server 0.1.59 → 0.1.61

package/dist/server/server/agent/providers/codex-app-server-agent.js

@@ -82,10 +82,16 @@ function normalizeCodexModelId(modelId) {
     }
     return normalized;
 }
-function mergeCodexConfiguredDefaults(primary, fallback) {
+function readCodexLegacyConfiguredDefaultsResponse(response) {
     return {
-        model: primary.model ?? fallback.model,
-        thinkingOptionId: primary.thinkingOptionId ?? fallback.thinkingOptionId,
+        model: normalizeCodexModelId(response?.config?.model),
+        thinkingOptionId: normalizeCodexThinkingOptionId(response?.config?.modelReasoningEffort ?? null),
+    };
+}
+function readCodexCurrentConfiguredDefaultsResponse(response) {
+    return {
+        model: normalizeCodexModelId(response?.config?.model),
+        thinkingOptionId: normalizeCodexThinkingOptionId(response?.config?.model_reasoning_effort ?? null),
     };
 }
 function resolveCodexBinary(runtimeSettings) {
@@ -523,6 +529,29 @@ class Pushable {
         };
     }
 }
+class CodexAppServerRequestError extends Error {
+    constructor(method, message, code) {
+        super(message);
+        this.name = "CodexAppServerRequestError";
+        this.method = method;
+        this.code = code;
+    }
+}
+function isCodexAppServerUnsupportedMethodError(error, method) {
+    if (!error || typeof error !== "object") {
+        return false;
+    }
+    const methodValue = "method" in error ? error.method : undefined;
+    if (methodValue !== method) {
+        return false;
+    }
+    const codeValue = "code" in error && typeof error.code === "number" ? error.code : undefined;
+    const messageValue = "message" in error && typeof error.message === "string" ? error.message : "";
+    const lowered = messageValue.toLowerCase();
+    return (codeValue === -32601 ||
+        lowered.includes("method not found") ||
+        lowered.includes(`unknown variant \`${method.toLowerCase()}\``));
+}
 class CodexAppServerClient {
     constructor(child, logger) {
         this.child = child;
@@ -573,7 +602,7 @@ class CodexAppServerClient {
                 this.pending.delete(id);
                 reject(new Error(`Codex app-server request timed out for ${method}`));
             }, timeoutMs);
-            this.pending.set(id, { resolve, reject, timer });
+            this.pending.set(id, { method, resolve, reject, timer });
         });
     }
     notify(method, params) {
@@ -615,7 +644,8 @@ class CodexAppServerClient {
                 clearTimeout(pending.timer);
                 this.pending.delete(id);
                 if (msg.error) {
-                    pending.reject(new Error(msg.error?.message ?? "Unknown error"));
+                    const errorPayload = msg.error;
+                    pending.reject(new CodexAppServerRequestError(pending.method ?? "unknown", errorPayload?.message ?? "Unknown error", errorPayload?.code));
                 }
                 else {
                     pending.resolve(msg.result);
@@ -1527,32 +1557,29 @@ const CodexNotificationSchema = z.union([
     z.object({ method: z.string(), params: z.unknown() }).transform(({ method, params }) => ({ kind: "unknown_method", method, params })),
 ]);
 async function readCodexConfiguredDefaults(client, logger) {
-    let savedConfigDefaults = {};
     try {
-        const response = (await client.request("getUserSavedConfig", {}));
-        savedConfigDefaults = {
-            model: normalizeCodexModelId(response?.config?.model),
-            thinkingOptionId: normalizeCodexThinkingOptionId(response?.config?.modelReasoningEffort ?? null),
-        };
+        const response = (await client.request("config/read", {}));
+        return readCodexCurrentConfiguredDefaultsResponse(response);
     }
     catch (error) {
-        logger.debug({ err: error }, "Failed to read Codex saved config defaults");
-    }
-    if (savedConfigDefaults.model && savedConfigDefaults.thinkingOptionId) {
-        return savedConfigDefaults;
+        if (!isCodexAppServerUnsupportedMethodError(error, "config/read")) {
+            logger.debug({ err: error }, "Failed to read Codex config defaults via config/read");
+            return {};
+        }
+        logger.debug({ err: error, fallbackMethod: "getUserSavedConfig" }, "Codex app-server does not support config/read; falling back to legacy config defaults request");
     }
-    let configReadDefaults = {};
     try {
-        const response = (await client.request("config/read", {}));
-        configReadDefaults = {
-            model: normalizeCodexModelId(response?.config?.model),
-            thinkingOptionId: normalizeCodexThinkingOptionId(response?.config?.model_reasoning_effort ?? null),
-        };
+        const response = (await client.request("getUserSavedConfig", {}));
+        return readCodexLegacyConfiguredDefaultsResponse(response);
     }
     catch (error) {
-        logger.debug({ err: error }, "Failed to read Codex config defaults");
+        if (isCodexAppServerUnsupportedMethodError(error, "getUserSavedConfig")) {
+            logger.debug({ err: error }, "Codex app-server does not support the legacy getUserSavedConfig request");
+            return {};
+        }
+        logger.debug({ err: error }, "Failed to read Codex legacy config defaults");
+        return {};
     }
-    return mergeCodexConfiguredDefaults(savedConfigDefaults, configReadDefaults);
 }
 export async function codexAppServerTurnInputFromPrompt(prompt, logger) {
     if (typeof prompt === "string") {
@@ -1592,6 +1619,8 @@ export const __codexAppServerInternals = {
     supportsPlanCollaborationMode,
     shouldRetryInitializeWithoutExperimentalApi,
     shouldRetryTurnStartWithoutCollaborationMode,
+    isCodexAppServerUnsupportedMethodError,
+    readCodexConfiguredDefaults,
     formatProposedPlanBlock,
     formatProposedPlanChunk,
     buildCompletedCodexTimelineItem,