@iam-brain/opencode-codex-auth 1.1.0 → 1.1.2

package/dist/lib/codex-native/request-transform.js

@@ -1,7 +1,7 @@
 import { resolveInstructionsForModel } from "../model-catalog";
 import { sanitizeRequestPayloadForCompat } from "../compat-sanitizer";
 import { isRecord } from "../util";
-import { ensureOpenCodeToolingCompatibility, isOrchestratorInstructions } from "./collaboration";
+import { isOrchestratorInstructions, replaceCodexToolCallsForOpenCode } from "./collaboration";
 function asString(value) {
     if (typeof value !== "string")
         return undefined;
@@ -318,70 +318,317 @@ export function applyCodexRuntimeDefaultsToParams(input) {
     }
 }
 export async function sanitizeOutboundRequestIfNeeded(request, enabled) {
-    if (!enabled)
-        return { request, changed: false };
-    const method = request.method.toUpperCase();
-    if (method !== "POST")
-        return { request, changed: false };
-    let payload;
-    try {
-        const raw = await request.clone().text();
-        if (!raw)
-            return { request, changed: false };
-        payload = JSON.parse(raw);
+    const transformed = await transformOutboundRequestPayload({
+        request,
+        stripReasoningReplayEnabled: false,
+        remapDeveloperMessagesToUserEnabled: false,
+        compatInputSanitizerEnabled: enabled,
+        promptCacheKeyOverrideEnabled: false
+    });
+    return {
+        request: transformed.request,
+        changed: transformed.compatSanitizer.changed
+    };
+}
+function stripReasoningReplayFromPayload(payload) {
+    if (!Array.isArray(payload.input)) {
+        return {
+            changed: false,
+            reason: "missing_input_array",
+            removedPartCount: 0,
+            removedFieldCount: 0
+        };
     }
-    catch (error) {
-        if (!(error instanceof SyntaxError)) {
-            // fall through with unchanged request on non-JSON payload parsing issues
+    let changed = false;
+    let removedPartCount = 0;
+    let removedFieldCount = 0;
+    const nextInput = [];
+    for (const item of payload.input) {
+        if (isReasoningReplayPart(item)) {
+            changed = true;
+            removedPartCount += 1;
+            continue;
+        }
+        if (!isRecord(item)) {
+            nextInput.push(item);
+            continue;
+        }
+        const nextItem = { ...item };
+        const role = asString(nextItem.role)?.toLowerCase();
+        if (role === "assistant" && Array.isArray(nextItem.content)) {
+            const contentOut = [];
+            for (const entry of nextItem.content) {
+                if (isReasoningReplayPart(entry)) {
+                    changed = true;
+                    removedPartCount += 1;
+                    continue;
+                }
+                const strippedEntry = stripReasoningReplayFields(entry);
+                if (strippedEntry.removed > 0) {
+                    changed = true;
+                    removedFieldCount += strippedEntry.removed;
+                }
+                contentOut.push(strippedEntry.value);
+            }
+            nextItem.content = contentOut;
+        }
+        const strippedItem = stripReasoningReplayFields(nextItem);
+        if (strippedItem.removed > 0) {
+            changed = true;
+            removedFieldCount += strippedItem.removed;
         }
-        return { request, changed: false };
+        nextInput.push(strippedItem.value);
     }
-    if (!isRecord(payload))
-        return { request, changed: false };
-    const sanitized = sanitizeRequestPayloadForCompat(payload);
-    if (!sanitized.changed)
-        return { request, changed: false };
-    const sanitizedRequest = rebuildRequestWithJsonBody(request, sanitized.payload);
-    return { request: sanitizedRequest, changed: true };
+    if (!changed) {
+        return {
+            changed: false,
+            reason: "no_reasoning_replay",
+            removedPartCount,
+            removedFieldCount
+        };
+    }
+    payload.input = nextInput;
+    return {
+        changed: true,
+        reason: "updated",
+        removedPartCount,
+        removedFieldCount
+    };
 }
-export async function applyPromptCacheKeyOverrideToRequest(input) {
-    if (!input.enabled) {
-        return { request: input.request, changed: false, reason: "disabled" };
+function remapDeveloperMessagesToUserOnPayload(payload) {
+    if (!Array.isArray(payload.input)) {
+        return {
+            changed: false,
+            reason: "missing_input_array",
+            remappedCount: 0,
+            preservedCount: 0
+        };
     }
-    const promptCacheKey = asString(input.promptCacheKey);
+    let nextInput;
+    let remappedCount = 0;
+    let preservedCount = 0;
+    let developerCount = 0;
+    for (let index = 0; index < payload.input.length; index += 1) {
+        const item = payload.input[index];
+        if (!isRecord(item))
+            continue;
+        if (item.role !== "developer")
+            continue;
+        developerCount += 1;
+        if (shouldPreserveDeveloperRole(item)) {
+            preservedCount += 1;
+            continue;
+        }
+        if (!nextInput)
+            nextInput = payload.input.slice();
+        nextInput[index] = {
+            ...item,
+            role: "user"
+        };
+        remappedCount += 1;
+    }
+    if (!nextInput) {
+        return {
+            changed: false,
+            reason: developerCount === 0 ? "no_developer_messages" : "permissions_only",
+            remappedCount,
+            preservedCount
+        };
+    }
+    payload.input = nextInput;
+    return {
+        changed: true,
+        reason: "updated",
+        remappedCount,
+        preservedCount
+    };
+}
+function applyPromptCacheKeyOverrideToPayload(payload, promptCacheKey) {
     if (!promptCacheKey) {
-        return { request: input.request, changed: false, reason: "missing_key" };
+        return { changed: false, reason: "missing_key" };
     }
+    const current = asString(payload.prompt_cache_key);
+    if (current === promptCacheKey) {
+        return { changed: false, reason: "already_matches" };
+    }
+    payload.prompt_cache_key = promptCacheKey;
+    return {
+        changed: true,
+        reason: current ? "replaced" : "set"
+    };
+}
+export async function transformOutboundRequestPayload(input) {
+    const disabledReplay = {
+        changed: false,
+        reason: "disabled",
+        removedPartCount: 0,
+        removedFieldCount: 0
+    };
+    const disabledRoleRemap = {
+        changed: false,
+        reason: "disabled",
+        remappedCount: 0,
+        preservedCount: 0
+    };
+    const disabledPromptCacheKey = {
+        changed: false,
+        reason: "disabled"
+    };
+    const disabledCompatSanitizer = {
+        changed: false,
+        reason: "disabled"
+    };
     const method = input.request.method.toUpperCase();
     if (method !== "POST") {
-        return { request: input.request, changed: false, reason: "non_post" };
+        return {
+            request: input.request,
+            changed: false,
+            replay: input.stripReasoningReplayEnabled
+                ? { ...disabledReplay, reason: "non_post" }
+                : disabledReplay,
+            developerRoleRemap: input.remapDeveloperMessagesToUserEnabled
+                ? { ...disabledRoleRemap, reason: "non_post" }
+                : disabledRoleRemap,
+            promptCacheKey: input.promptCacheKeyOverrideEnabled
+                ? { ...disabledPromptCacheKey, reason: "non_post" }
+                : disabledPromptCacheKey,
+            compatSanitizer: input.compatInputSanitizerEnabled
+                ? { ...disabledCompatSanitizer, reason: "non_post" }
+                : disabledCompatSanitizer
+        };
+    }
+    let raw;
+    try {
+        raw = await input.request.clone().text();
+    }
+    catch {
+        return {
+            request: input.request,
+            changed: false,
+            replay: input.stripReasoningReplayEnabled
+                ? { ...disabledReplay, reason: "invalid_json" }
+                : disabledReplay,
+            developerRoleRemap: input.remapDeveloperMessagesToUserEnabled
+                ? { ...disabledRoleRemap, reason: "invalid_json" }
+                : disabledRoleRemap,
+            promptCacheKey: input.promptCacheKeyOverrideEnabled
+                ? { ...disabledPromptCacheKey, reason: "invalid_json" }
+                : disabledPromptCacheKey,
+            compatSanitizer: input.compatInputSanitizerEnabled
+                ? { ...disabledCompatSanitizer, reason: "invalid_json" }
+                : disabledCompatSanitizer
+        };
+    }
+    if (!raw) {
+        return {
+            request: input.request,
+            changed: false,
+            replay: input.stripReasoningReplayEnabled ? { ...disabledReplay, reason: "empty_body" } : disabledReplay,
+            developerRoleRemap: input.remapDeveloperMessagesToUserEnabled
+                ? { ...disabledRoleRemap, reason: "empty_body" }
+                : disabledRoleRemap,
+            promptCacheKey: input.promptCacheKeyOverrideEnabled
+                ? { ...disabledPromptCacheKey, reason: "empty_body" }
+                : disabledPromptCacheKey,
+            compatSanitizer: input.compatInputSanitizerEnabled
+                ? { ...disabledCompatSanitizer, reason: "empty_body" }
+                : disabledCompatSanitizer
+        };
     }
     let payload;
     try {
-        const raw = await input.request.clone().text();
-        if (!raw)
-            return { request: input.request, changed: false, reason: "empty_body" };
         payload = JSON.parse(raw);
     }
-    catch (error) {
-        if (!(error instanceof SyntaxError)) {
-            // request body could not be parsed as JSON
-        }
-        return { request: input.request, changed: false, reason: "invalid_json" };
+    catch {
+        return {
+            request: input.request,
+            changed: false,
+            replay: input.stripReasoningReplayEnabled
+                ? { ...disabledReplay, reason: "invalid_json" }
+                : disabledReplay,
+            developerRoleRemap: input.remapDeveloperMessagesToUserEnabled
+                ? { ...disabledRoleRemap, reason: "invalid_json" }
+                : disabledRoleRemap,
+            promptCacheKey: input.promptCacheKeyOverrideEnabled
+                ? { ...disabledPromptCacheKey, reason: "invalid_json" }
+                : disabledPromptCacheKey,
+            compatSanitizer: input.compatInputSanitizerEnabled
+                ? { ...disabledCompatSanitizer, reason: "invalid_json" }
+                : disabledCompatSanitizer
+        };
     }
     if (!isRecord(payload)) {
-        return { request: input.request, changed: false, reason: "non_object_body" };
+        return {
+            request: input.request,
+            changed: false,
+            replay: input.stripReasoningReplayEnabled
+                ? { ...disabledReplay, reason: "non_object_body" }
+                : disabledReplay,
+            developerRoleRemap: input.remapDeveloperMessagesToUserEnabled
+                ? { ...disabledRoleRemap, reason: "non_object_body" }
+                : disabledRoleRemap,
+            promptCacheKey: input.promptCacheKeyOverrideEnabled
+                ? { ...disabledPromptCacheKey, reason: "non_object_body" }
+                : disabledPromptCacheKey,
+            compatSanitizer: input.compatInputSanitizerEnabled
+                ? { ...disabledCompatSanitizer, reason: "non_object_body" }
+                : disabledCompatSanitizer
+        };
     }
-    const current = asString(payload.prompt_cache_key);
-    if (current === promptCacheKey) {
-        return { request: input.request, changed: false, reason: "already_matches" };
+    let changed = false;
+    const replay = input.stripReasoningReplayEnabled
+        ? stripReasoningReplayFromPayload(payload)
+        : disabledReplay;
+    changed = changed || replay.changed;
+    const developerRoleRemap = input.remapDeveloperMessagesToUserEnabled
+        ? remapDeveloperMessagesToUserOnPayload(payload)
+        : disabledRoleRemap;
+    changed = changed || developerRoleRemap.changed;
+    const promptCacheKey = input.promptCacheKeyOverrideEnabled
+        ? applyPromptCacheKeyOverrideToPayload(payload, asString(input.promptCacheKeyOverride))
+        : disabledPromptCacheKey;
+    changed = changed || promptCacheKey.changed;
+    const compatSanitizedPayload = input.compatInputSanitizerEnabled ? sanitizeRequestPayloadForCompat(payload) : null;
+    const compatSanitizer = input.compatInputSanitizerEnabled
+        ? {
+            changed: compatSanitizedPayload?.changed === true,
+            reason: compatSanitizedPayload?.changed === true ? "updated" : "already_matches"
+        }
+        : disabledCompatSanitizer;
+    const finalPayload = compatSanitizedPayload?.payload ?? payload;
+    changed = changed || compatSanitizer.changed;
+    if (!changed) {
+        return {
+            request: input.request,
+            changed: false,
+            replay,
+            developerRoleRemap,
+            promptCacheKey,
+            compatSanitizer
+        };
     }
-    payload.prompt_cache_key = promptCacheKey;
-    const updatedRequest = rebuildRequestWithJsonBody(input.request, payload);
     return {
-        request: updatedRequest,
+        request: rebuildRequestWithJsonBody(input.request, finalPayload),
         changed: true,
-        reason: current ? "replaced" : "set"
+        replay,
+        developerRoleRemap,
+        promptCacheKey,
+        compatSanitizer
+    };
+}
+export async function applyPromptCacheKeyOverrideToRequest(input) {
+    const transformed = await transformOutboundRequestPayload({
+        request: input.request,
+        stripReasoningReplayEnabled: false,
+        remapDeveloperMessagesToUserEnabled: false,
+        compatInputSanitizerEnabled: false,
+        promptCacheKeyOverrideEnabled: input.enabled,
+        promptCacheKeyOverride: input.promptCacheKey
+    });
+    return {
+        request: transformed.request,
+        changed: transformed.promptCacheKey.changed,
+        reason: transformed.promptCacheKey.reason
     };
 }
 function rebuildRequestWithJsonBody(request, body) {
@@ -425,109 +672,19 @@ function shouldPreserveDeveloperRole(item) {
         text.includes("filesystem sandboxing defines which files can be read or written"));
 }
 export async function remapDeveloperMessagesToUserOnRequest(input) {
-    if (!input.enabled) {
-        return {
-            request: input.request,
-            changed: false,
-            reason: "disabled",
-            remappedCount: 0,
-            preservedCount: 0
-        };
-    }
-    const method = input.request.method.toUpperCase();
-    if (method !== "POST") {
-        return {
-            request: input.request,
-            changed: false,
-            reason: "non_post",
-            remappedCount: 0,
-            preservedCount: 0
-        };
-    }
-    let payload;
-    try {
-        const raw = await input.request.clone().text();
-        if (!raw) {
-            return {
-                request: input.request,
-                changed: false,
-                reason: "empty_body",
-                remappedCount: 0,
-                preservedCount: 0
-            };
-        }
-        payload = JSON.parse(raw);
-    }
-    catch (error) {
-        if (!(error instanceof SyntaxError)) {
-            // request body could not be parsed as JSON
-        }
-        return {
-            request: input.request,
-            changed: false,
-            reason: "invalid_json",
-            remappedCount: 0,
-            preservedCount: 0
-        };
-    }
-    if (!isRecord(payload)) {
-        return {
-            request: input.request,
-            changed: false,
-            reason: "non_object_body",
-            remappedCount: 0,
-            preservedCount: 0
-        };
-    }
-    if (!Array.isArray(payload.input)) {
-        return {
-            request: input.request,
-            changed: false,
-            reason: "missing_input_array",
-            remappedCount: 0,
-            preservedCount: 0
-        };
-    }
-    let nextInput;
-    let remappedCount = 0;
-    let preservedCount = 0;
-    let developerCount = 0;
-    for (let index = 0; index < payload.input.length; index += 1) {
-        const item = payload.input[index];
-        if (!isRecord(item))
-            continue;
-        if (item.role !== "developer")
-            continue;
-        developerCount += 1;
-        if (shouldPreserveDeveloperRole(item)) {
-            preservedCount += 1;
-            continue;
-        }
-        if (!nextInput)
-            nextInput = payload.input.slice();
-        nextInput[index] = {
-            ...item,
-            role: "user"
-        };
-        remappedCount += 1;
-    }
-    if (!nextInput) {
-        return {
-            request: input.request,
-            changed: false,
-            reason: developerCount === 0 ? "no_developer_messages" : "permissions_only",
-            remappedCount,
-            preservedCount
-        };
-    }
-    payload.input = nextInput;
-    const updatedRequest = rebuildRequestWithJsonBody(input.request, payload);
+    const transformed = await transformOutboundRequestPayload({
+        request: input.request,
+        stripReasoningReplayEnabled: false,
+        remapDeveloperMessagesToUserEnabled: input.enabled,
+        compatInputSanitizerEnabled: false,
+        promptCacheKeyOverrideEnabled: false
+    });
     return {
-        request: updatedRequest,
-        changed: true,
-        reason: "updated",
-        remappedCount,
-        preservedCount
+        request: transformed.request,
+        changed: transformed.developerRoleRemap.changed,
+        reason: transformed.developerRoleRemap.reason,
+        remappedCount: transformed.developerRoleRemap.remappedCount,
+        preservedCount: transformed.developerRoleRemap.preservedCount
     };
 }
 function stripReasoningReplayFields(value) {
@@ -565,126 +722,19 @@ function isReasoningReplayPart(entry) {
     return type.startsWith("reasoning");
 }
 export async function stripReasoningReplayFromRequest(input) {
-    if (!input.enabled) {
-        return {
-            request: input.request,
-            changed: false,
-            reason: "disabled",
-            removedPartCount: 0,
-            removedFieldCount: 0
-        };
-    }
-    const method = input.request.method.toUpperCase();
-    if (method !== "POST") {
-        return {
-            request: input.request,
-            changed: false,
-            reason: "non_post",
-            removedPartCount: 0,
-            removedFieldCount: 0
-        };
-    }
-    let payload;
-    try {
-        const raw = await input.request.clone().text();
-        if (!raw) {
-            return {
-                request: input.request,
-                changed: false,
-                reason: "empty_body",
-                removedPartCount: 0,
-                removedFieldCount: 0
-            };
-        }
-        payload = JSON.parse(raw);
-    }
-    catch (error) {
-        if (!(error instanceof SyntaxError)) {
-            // request body could not be parsed as JSON
-        }
-        return {
-            request: input.request,
-            changed: false,
-            reason: "invalid_json",
-            removedPartCount: 0,
-            removedFieldCount: 0
-        };
-    }
-    if (!isRecord(payload)) {
-        return {
-            request: input.request,
-            changed: false,
-            reason: "non_object_body",
-            removedPartCount: 0,
-            removedFieldCount: 0
-        };
-    }
-    if (!Array.isArray(payload.input)) {
-        return {
-            request: input.request,
-            changed: false,
-            reason: "missing_input_array",
-            removedPartCount: 0,
-            removedFieldCount: 0
-        };
-    }
-    let changed = false;
-    let removedPartCount = 0;
-    let removedFieldCount = 0;
-    const nextInput = [];
-    for (const item of payload.input) {
-        if (isReasoningReplayPart(item)) {
-            changed = true;
-            removedPartCount += 1;
-            continue;
-        }
-        if (!isRecord(item)) {
-            nextInput.push(item);
-            continue;
-        }
-        const nextItem = { ...item };
-        const role = asString(nextItem.role)?.toLowerCase();
-        if (role === "assistant" && Array.isArray(nextItem.content)) {
-            const contentOut = [];
-            for (const entry of nextItem.content) {
-                if (isReasoningReplayPart(entry)) {
-                    changed = true;
-                    removedPartCount += 1;
-                    continue;
-                }
-                const strippedEntry = stripReasoningReplayFields(entry);
-                if (strippedEntry.removed > 0) {
-                    changed = true;
-                    removedFieldCount += strippedEntry.removed;
-                }
-                contentOut.push(strippedEntry.value);
-            }
-            nextItem.content = contentOut;
-        }
-        const strippedItem = stripReasoningReplayFields(nextItem);
-        if (strippedItem.removed > 0) {
-            changed = true;
-            removedFieldCount += strippedItem.removed;
-        }
-        nextInput.push(strippedItem.value);
-    }
-    if (!changed) {
-        return {
-            request: input.request,
-            changed: false,
-            reason: "no_reasoning_replay",
-            removedPartCount,
-            removedFieldCount
-        };
-    }
-    payload.input = nextInput;
-    const updatedRequest = rebuildRequestWithJsonBody(input.request, payload);
+    const transformed = await transformOutboundRequestPayload({
+        request: input.request,
+        stripReasoningReplayEnabled: input.enabled,
+        remapDeveloperMessagesToUserEnabled: false,
+        compatInputSanitizerEnabled: false,
+        promptCacheKeyOverrideEnabled: false
+    });
     return {
-        request: updatedRequest,
-        changed: true,
-        reason: "updated",
-        removedPartCount,
-        removedFieldCount
+        request: transformed.request,
+        changed: transformed.replay.changed,
+        reason: transformed.replay.reason,
+        removedPartCount: transformed.replay.removedPartCount,
+        removedFieldCount: transformed.replay.removedFieldCount
     };
 }
 function getVariantCandidatesFromBody(input) {
@@ -768,26 +818,21 @@ export async function applyCatalogInstructionOverrideToRequest(input) {
     const rendered = resolveInstructionsForModel(catalogModel, effectivePersonality);
     if (!rendered)
         return { request: input.request, changed: false, reason: "rendered_empty_or_unsafe" };
+    const renderedForRequest = input.replaceCodexToolCalls === true ? replaceCodexToolCallsForOpenCode(rendered) ?? rendered : rendered;
     const currentInstructions = asString(payload.instructions);
     const preserveOrchestratorInstructions = input.preserveOrchestratorInstructions !== false;
     if (preserveOrchestratorInstructions && isOrchestratorInstructions(currentInstructions)) {
-        const compatible = ensureOpenCodeToolingCompatibility(currentInstructions);
-        if (compatible && compatible.trim() !== (currentInstructions?.trim() ?? "")) {
-            payload.instructions = compatible;
-            const updatedRequest = rebuildRequestWithJsonBody(input.request, payload);
-            return { request: updatedRequest, changed: true, reason: "tooling_compatibility_added" };
-        }
         return { request: input.request, changed: false, reason: "orchestrator_instructions_preserved" };
     }
-    if (currentInstructions === rendered) {
+    if (currentInstructions === renderedForRequest) {
         return { request: input.request, changed: false, reason: "already_matches" };
     }
-    if (currentInstructions && currentInstructions.includes(rendered)) {
+    if (currentInstructions && currentInstructions.includes(renderedForRequest)) {
         return { request: input.request, changed: false, reason: "already_contains_rendered" };
     }
     const collaborationTail = currentInstructions ? extractCollaborationInstructionTail(currentInstructions) : undefined;
-    const nextInstructionsBase = collaborationTail ? `${rendered}\n\n${collaborationTail}` : rendered;
-    const nextInstructions = ensureOpenCodeToolingCompatibility(nextInstructionsBase) ?? nextInstructionsBase;
+    const nextInstructionsBase = collaborationTail ? `${renderedForRequest}\n\n${collaborationTail}` : renderedForRequest;
+    const nextInstructions = nextInstructionsBase;
     if (currentInstructions === nextInstructions) {
         return { request: input.request, changed: false, reason: "already_matches" };
     }