@mrkaran/hodor 0.7.2 → 0.7.3

package/dist/{chunk-YKB3BRJM.js → chunk-GISFKKMM.js}

@@ -31,6 +31,135 @@ function getTemplatePath(name) {
   return resolve(dirname(fileURLToPath(import.meta.url)), "..", "templates", name);
 }
 
+// src/review-diff.ts
+var HODOR_REVIEW_SHA_RE = /^\s*<!--\s*hodor:sha:([a-f0-9]{40})\s*-->/i;
+function getReviewDiffArgs(options) {
+  const {
+    platform,
+    targetBranch,
+    diffBaseSha,
+    previousReviewSha,
+    reviewDiffMode,
+    localMode = false
+  } = options;
+  const rebasedGitlabReview = platform === "gitlab" && reviewDiffMode === "snapshot";
+  if (previousReviewSha && !rebasedGitlabReview) {
+    return reviewDiffMode === "snapshot" ? ["--no-pager", "diff", previousReviewSha, "HEAD"] : ["--no-pager", "diff", `${previousReviewSha}...HEAD`];
+  }
+  if (localMode) return ["--no-pager", "diff", targetBranch];
+  if (diffBaseSha) return ["--no-pager", "diff", diffBaseSha, "HEAD"];
+  return ["--no-pager", "diff", `origin/${targetBranch}...HEAD`];
+}
+function getHodorReviewShaCandidates(notes) {
+  if (!notes || notes.length === 0) return [];
+  const candidates = [];
+  for (const [index, note] of notes.entries()) {
+    const match = note.body?.match(HODOR_REVIEW_SHA_RE);
+    if (!match) continue;
+    const createdAtMs = Date.parse(note.created_at ?? "");
+    candidates.push({
+      sha: match[1],
+      createdAtMs: Number.isFinite(createdAtMs) ? createdAtMs : null,
+      index
+    });
+  }
+  candidates.sort((a, b) => {
+    if (a.createdAtMs != null && b.createdAtMs != null && a.createdAtMs !== b.createdAtMs) {
+      return b.createdAtMs - a.createdAtMs;
+    }
+    if (a.createdAtMs != null && b.createdAtMs == null) return -1;
+    if (a.createdAtMs == null && b.createdAtMs != null) return 1;
+    return a.index - b.index;
+  });
+  return [...new Set(candidates.map(({ sha }) => sha))];
+}
+async function findLatestReviewBase(notes, workspacePath) {
+  const candidates = getHodorReviewShaCandidates(notes);
+  if (candidates.length === 0) return null;
+  logger.info(`Found ${candidates.length} previous Hodor review marker(s)`);
+  for (const sha of candidates) {
+    try {
+      let objectType;
+      try {
+        ({ stdout: objectType } = await exec("git", ["cat-file", "-t", sha], {
+          cwd: workspacePath
+        }));
+      } catch {
+        await exec("git", ["fetch", "--quiet", "origin", sha], {
+          cwd: workspacePath
+        });
+        ({ stdout: objectType } = await exec("git", ["cat-file", "-t", sha], {
+          cwd: workspacePath
+        }));
+      }
+      if (objectType.trim() !== "commit") throw new Error("not a commit");
+      try {
+        await exec("git", ["merge-base", "--is-ancestor", sha, "HEAD"], {
+          cwd: workspacePath
+        });
+        return { sha, mode: "incremental" };
+      } catch {
+        logger.info(
+          `Previous review SHA ${sha.slice(0, 8)} is not an ancestor; using snapshot delta`
+        );
+        return { sha, mode: "snapshot" };
+      }
+    } catch {
+      logger.info(
+        `Skipping previous review SHA ${sha.slice(0, 8)}; commit is unavailable`
+      );
+    }
+  }
+  return null;
+}
+function getDiffStats(diff) {
+  let files = 0;
+  let additions = 0;
+  let deletions = 0;
+  for (const line of diff.split("\n")) {
+    if (line.startsWith("diff --git ")) files++;
+    else if (line.startsWith("+") && !line.startsWith("+++")) additions++;
+    else if (line.startsWith("-") && !line.startsWith("---")) deletions++;
+  }
+  return {
+    files,
+    additions,
+    deletions,
+    bytes: Buffer.byteLength(diff, "utf-8")
+  };
+}
+function getChangedFiles(diff) {
+  const files = [];
+  for (const match of diff.matchAll(/^diff --git a\/(.*?) b\/(.*?)$/gm)) {
+    files.push(match[2]);
+  }
+  return [...new Set(files)];
+}
+var DIFF_SKIP_PATTERNS = [
+  /(?:^|\/)testdata\//,
+  /(?:^|\/)(?:package-lock\.json|yarn\.lock|pnpm-lock\.yaml|go\.sum|Cargo\.lock|poetry\.lock|Gemfile\.lock|composer\.lock)$/,
+  /\.mdx?$/
+];
+function filterEmbeddedDiff(rawDiff) {
+  const skippedFiles = [];
+  const sections = rawDiff.split(/(?=^diff --git )/m);
+  const kept = [];
+  for (const section of sections) {
+    const match = section.match(/^diff --git a\/(.*?) b\//);
+    if (!match) {
+      kept.push(section);
+      continue;
+    }
+    const filePath = match[1];
+    if (DIFF_SKIP_PATTERNS.some((pattern) => pattern.test(filePath))) {
+      skippedFiles.push(filePath);
+    } else {
+      kept.push(section);
+    }
+  }
+  return { filtered: kept.join(""), skippedFiles };
+}
+
 // src/prompt.ts
 function buildPrReviewPrompt(opts) {
   const {
@@ -46,6 +175,9 @@ function buildPrReviewPrompt(opts) {
     localMode = false,
     singleTurn = false
   } = opts;
+  const rebasedGitlabReview = platform === "gitlab" && reviewDiffMode === "snapshot";
+  const hasPreviousReviewDelta = Boolean(previousReviewSha && !rebasedGitlabReview);
+  const previousReviewShaText = previousReviewSha ?? "";
   let templateText;
   try {
     templateText = readFileSync(getTemplatePath("review-task.md"), "utf-8");
@@ -62,44 +194,36 @@ function buildPrReviewPrompt(opts) {
   if (previousReviewSha && !/^[a-f0-9]{40}$/.test(previousReviewSha)) {
     throw new Error(`Invalid previous review SHA: ${previousReviewSha}`);
   }
-  let prDiffCmd;
-  let gitDiffCmd;
-  if (previousReviewSha) {
-    const separator = reviewDiffMode === "snapshot" ? " " : "...";
-    prDiffCmd = `git --no-pager diff ${previousReviewSha}${separator}HEAD --name-only`;
-    gitDiffCmd = `git --no-pager diff ${previousReviewSha}${separator}HEAD`;
-    logger.info(`${reviewDiffMode === "snapshot" ? "Snapshot" : "Incremental"} review: diffing from ${previousReviewSha.slice(0, 8)} to HEAD`);
-  } else if (localMode) {
-    prDiffCmd = `git --no-pager diff ${targetBranch} --name-only`;
-    gitDiffCmd = `git --no-pager diff ${targetBranch}`;
-  } else if (platform === "github" || platform === "gitea") {
-    prDiffCmd = `git --no-pager diff origin/${targetBranch}...HEAD --name-only`;
-    gitDiffCmd = `git --no-pager diff origin/${targetBranch}...HEAD`;
-  } else {
-    if (diffBaseSha) {
-      prDiffCmd = `git --no-pager diff ${diffBaseSha} HEAD --name-only`;
-      gitDiffCmd = `git --no-pager diff ${diffBaseSha} HEAD`;
-      logger.info(`Using GitLab CI_MERGE_REQUEST_DIFF_BASE_SHA: ${diffBaseSha.slice(0, 8)}`);
-    } else {
-      prDiffCmd = `git --no-pager diff origin/${targetBranch}...HEAD --name-only`;
-      gitDiffCmd = `git --no-pager diff origin/${targetBranch}...HEAD`;
-    }
+  const diffArgs = getReviewDiffArgs({
+    platform,
+    targetBranch,
+    diffBaseSha,
+    previousReviewSha,
+    reviewDiffMode,
+    localMode
+  });
+  const gitDiffCmd = `git ${diffArgs.join(" ")}`;
+  const prDiffCmd = `${gitDiffCmd} --name-only`;
+  if (hasPreviousReviewDelta) {
+    logger.info(`${reviewDiffMode === "snapshot" ? "Snapshot" : "Incremental"} review: diffing from ${previousReviewSha?.slice(0, 8)} to HEAD`);
+  } else if (rebasedGitlabReview) {
+    logger.info("Rebased GitLab review: diffing from the current MR base to HEAD");
   }
   let diffExplanation;
-  if (previousReviewSha) {
-    diffExplanation = reviewDiffMode === "snapshot" ? `**Snapshot delta mode**: The MR history was rewritten. This directly compares the last reviewed snapshot (commit \`${previousReviewSha.slice(0, 8)}\`) with the current HEAD; it does not imply ancestry.` : `**Incremental mode**: Showing only changes since the last hodor review (commit \`${previousReviewSha.slice(0, 8)}\`).`;
+  if (hasPreviousReviewDelta) {
+    diffExplanation = reviewDiffMode === "snapshot" ? `**Snapshot delta mode**: The MR history was rewritten. This directly compares the last reviewed snapshot (commit \`${previousReviewShaText.slice(0, 8)}\`) with the current HEAD; it does not imply ancestry.` : `**Incremental mode**: Showing only changes since the last hodor review (commit \`${previousReviewShaText.slice(0, 8)}\`).`;
   } else if (diffBaseSha) {
-    diffExplanation = `**GitLab CI Advantage**: This uses GitLab's pre-calculated merge base SHA (\`CI_MERGE_REQUEST_DIFF_BASE_SHA\`), which matches exactly what the GitLab UI shows. This is more reliable than three-dot syntax because it handles force pushes, rebases, and messy histories correctly.`;
+    diffExplanation = `**GitLab CI Advantage**: This uses the merge base resolved from the current target branch, which matches the current GitLab MR diff after force pushes and rebases.`;
   } else {
     diffExplanation = `**Three-dot syntax** shows ONLY changes introduced on the source branch, excluding changes already on \`${targetBranch}\`.`;
   }
   const { contextSection, notesSection, reminderSection } = buildMrSections(mrMetadata);
   const oneTurn = singleTurn && Boolean(embeddedDiff);
   let incrementalSection = "";
-  if (previousReviewSha) {
+  if (hasPreviousReviewDelta) {
     incrementalSection = `## ${reviewDiffMode === "snapshot" ? "Snapshot Delta" : "Incremental Review"} Mode
 
-This is a follow-up review. A previous hodor review was done at commit \`${previousReviewSha.slice(0, 8)}\`. ` + (reviewDiffMode === "snapshot" ? "The branch history was rewritten, so the diff below compares that reviewed snapshot directly with the current HEAD. " : "The diff below shows ONLY changes since that review. ") + "Your job is to review that delta, not the whole MR again.\n\nRules for incremental reviews:\n1. Only report findings introduced or still affected by the new delta.\n2. Do not re-report issues that are already mentioned in existing notes unless the new delta changes the same code and the issue remains newly relevant.\n3. If the delta is small and self-contained, decide from the embedded diff and submit the review without broad repository exploration.\n" + (oneTurn ? "4. No file-inspection tools are available; if a mechanical change like a route/path/string rename leaves a compatibility question you cannot settle from the diff, do not report it.\n" : "4. For mechanical changes like route/path/string renames, verify the direct call sites or tests only when the diff itself leaves a concrete compatibility question.\n") + "5. If the delta does not produce a qualifying finding under the selected review instructions, submit no findings.\n\n";
+This is a follow-up review. A previous hodor review was done at commit \`${previousReviewShaText.slice(0, 8)}\`. ` + (reviewDiffMode === "snapshot" ? "The branch history was rewritten, so the diff below compares that reviewed snapshot directly with the current HEAD. " : "The diff below shows ONLY changes since that review. ") + "Your job is to review that delta, not the whole MR again.\n\nRules for incremental reviews:\n1. Only report findings introduced or still affected by the new delta.\n2. Do not re-report issues that are already mentioned in existing notes unless the new delta changes the same code and the issue remains newly relevant.\n3. If the delta is small and self-contained, decide from the embedded diff and submit the review without broad repository exploration.\n" + (oneTurn ? "4. No file-inspection tools are available; if a mechanical change like a route/path/string rename leaves a compatibility question you cannot settle from the diff, do not report it.\n" : "4. For mechanical changes like route/path/string renames, verify the direct call sites or tests only when the diff itself leaves a concrete compatibility question.\n") + "5. If the delta does not produce a qualifying finding under the selected review instructions, submit no findings.\n\n";
   }
   let embeddedDiffSection;
   let diffFetchInstructions;
@@ -127,7 +251,7 @@ ${changedFiles.map((file) => `- \`${file}\``).join("\n")}
       startInstruction = "Analyze the diff above and call `submit_review` now, in this turn.";
     } else {
       reviewProcessSection = "## Review Process\n\n1. Analyze the embedded diff above thoroughly\n2. Use `grep` to search for patterns when needed\n3. Use bounded line-range reads when surrounding context is essential; avoid reading entire large files\n4. Do not repeat a diff, grep, or read operation whose result is already in context\n5. Submit your review using `submit_review`\n";
-      startInstruction = previousReviewSha ? "Analyze only the incremental diff provided above. If it is self-contained, submit your review without extra tool calls." : "Analyze the diff provided above, then submit your review using `submit_review`.";
+      startInstruction = hasPreviousReviewDelta ? "Analyze only the incremental diff provided above. If it is self-contained, submit your review without extra tool calls." : "Analyze the diff provided above, then submit your review using `submit_review`.";
     }
   } else {
     embeddedDiffSection = "";
@@ -314,6 +438,31 @@ function parseModelString(model) {
   }
   return { provider: "anthropic", modelId: trimmed };
 }
+var BEDROCK_REGIONAL_PREFIXES = ["global", "us", "eu", "apac", "in", "jp", "au", "ca"];
+function stripBedrockRegionalPrefix(modelId) {
+  const dot = modelId.indexOf(".");
+  if (dot <= 0) return null;
+  const prefix = modelId.slice(0, dot).toLowerCase();
+  if (!BEDROCK_REGIONAL_PREFIXES.includes(prefix)) return null;
+  return modelId.slice(dot + 1);
+}
+function isOpenAiBedrockModel(model) {
+  if (model.provider !== "amazon-bedrock") return false;
+  return [model.id, model.name].filter((value) => Boolean(value)).some((value) => value.toLowerCase().includes("openai"));
+}
+function addOpenAiBedrockReasoning(payload, effort) {
+  if (!payload || typeof payload !== "object" || Array.isArray(payload)) return payload;
+  const request = payload;
+  const existingFields = request.additionalModelRequestFields;
+  const additionalModelRequestFields = existingFields && typeof existingFields === "object" && !Array.isArray(existingFields) ? existingFields : {};
+  return {
+    ...request,
+    additionalModelRequestFields: {
+      ...additionalModelRequestFields,
+      reasoning: { effort }
+    }
+  };
+}
 function extractBedrockArnRegion(arn) {
   const parts = arn.split(":");
   return parts.length >= 4 && parts[3] ? parts[3] : "us-east-1";
@@ -1486,6 +1635,31 @@ async function detectCiWorkspace(owner, repo) {
   }
   return { path: null, targetBranch: null, diffBaseSha: null };
 }
+async function resolveGitlabDiffBaseSha(workspace, targetBranch, fallbackSha) {
+  if (!targetBranch) return fallbackSha;
+  try {
+    await exec("git", ["fetch", "--no-tags", "origin", targetBranch], { cwd: workspace });
+    const { stdout } = await exec("git", ["merge-base", "HEAD", "FETCH_HEAD"], { cwd: workspace });
+    const mergeBase = stdout.trim();
+    if (mergeBase) {
+      logger.info(`Calculated current GitLab MR diff base: ${mergeBase.slice(0, 8)}`);
+      return mergeBase;
+    }
+  } catch (err) {
+    logger.warn(`Could not calculate current GitLab MR diff base: ${err}`);
+  }
+  try {
+    const { stdout } = await exec("git", ["merge-base", "HEAD", `origin/${targetBranch}`], { cwd: workspace });
+    const mergeBase = stdout.trim();
+    if (mergeBase) {
+      logger.info(`Calculated GitLab MR diff base from origin/${targetBranch}: ${mergeBase.slice(0, 8)}`);
+      return mergeBase;
+    }
+  } catch {
+  }
+  if (fallbackSha) logger.warn(`Falling back to CI_MERGE_REQUEST_DIFF_BASE_SHA: ${fallbackSha.slice(0, 8)}`);
+  return fallbackSha;
+}
 function normalizeGitRemotePath(remoteUrl) {
   const trimmed = remoteUrl.trim().replace(/\.git$/, "");
   try {
@@ -1700,11 +1874,18 @@ async function setupWorkspace(opts) {
   try {
     const ci = await detectCiWorkspace(owner, repo);
     let detectedTargetBranch = ci.targetBranch;
-    const detectedDiffBaseSha = ci.diffBaseSha;
+    let detectedDiffBaseSha = ci.diffBaseSha;
     let workspace;
     let isTemporary = false;
     if (ci.path) {
       workspace = ci.path;
+      if (platform === "gitlab" && ci.targetBranch) {
+        detectedDiffBaseSha = await resolveGitlabDiffBaseSha(
+          workspace,
+          ci.targetBranch,
+          detectedDiffBaseSha
+        );
+      }
       if (platform === "github" && !detectedTargetBranch) {
         detectedTargetBranch = await getGithubBaseBranch(workspace, prNumber);
       }
@@ -1954,118 +2135,6 @@ function resolveReviewLocations(review, opts) {
   return { review: { ...review, findings }, stats };
 }
 
-// src/review-diff.ts
-var HODOR_REVIEW_SHA_RE = /^\s*<!--\s*hodor:sha:([a-f0-9]{40})\s*-->/i;
-function getHodorReviewShaCandidates(notes) {
-  if (!notes || notes.length === 0) return [];
-  const candidates = [];
-  for (const [index, note] of notes.entries()) {
-    const match = note.body?.match(HODOR_REVIEW_SHA_RE);
-    if (!match) continue;
-    const createdAtMs = Date.parse(note.created_at ?? "");
-    candidates.push({
-      sha: match[1],
-      createdAtMs: Number.isFinite(createdAtMs) ? createdAtMs : null,
-      index
-    });
-  }
-  candidates.sort((a, b) => {
-    if (a.createdAtMs != null && b.createdAtMs != null && a.createdAtMs !== b.createdAtMs) {
-      return b.createdAtMs - a.createdAtMs;
-    }
-    if (a.createdAtMs != null && b.createdAtMs == null) return -1;
-    if (a.createdAtMs == null && b.createdAtMs != null) return 1;
-    return a.index - b.index;
-  });
-  return [...new Set(candidates.map(({ sha }) => sha))];
-}
-async function findLatestReviewBase(notes, workspacePath) {
-  const candidates = getHodorReviewShaCandidates(notes);
-  if (candidates.length === 0) return null;
-  logger.info(`Found ${candidates.length} previous Hodor review marker(s)`);
-  for (const sha of candidates) {
-    try {
-      let objectType;
-      try {
-        ({ stdout: objectType } = await exec("git", ["cat-file", "-t", sha], {
-          cwd: workspacePath
-        }));
-      } catch {
-        await exec("git", ["fetch", "--quiet", "origin", sha], {
-          cwd: workspacePath
-        });
-        ({ stdout: objectType } = await exec("git", ["cat-file", "-t", sha], {
-          cwd: workspacePath
-        }));
-      }
-      if (objectType.trim() !== "commit") throw new Error("not a commit");
-      try {
-        await exec("git", ["merge-base", "--is-ancestor", sha, "HEAD"], {
-          cwd: workspacePath
-        });
-        return { sha, mode: "incremental" };
-      } catch {
-        logger.info(
-          `Previous review SHA ${sha.slice(0, 8)} is not an ancestor; using snapshot delta`
-        );
-        return { sha, mode: "snapshot" };
-      }
-    } catch {
-      logger.info(
-        `Skipping previous review SHA ${sha.slice(0, 8)}; commit is unavailable`
-      );
-    }
-  }
-  return null;
-}
-function getDiffStats(diff) {
-  let files = 0;
-  let additions = 0;
-  let deletions = 0;
-  for (const line of diff.split("\n")) {
-    if (line.startsWith("diff --git ")) files++;
-    else if (line.startsWith("+") && !line.startsWith("+++")) additions++;
-    else if (line.startsWith("-") && !line.startsWith("---")) deletions++;
-  }
-  return {
-    files,
-    additions,
-    deletions,
-    bytes: Buffer.byteLength(diff, "utf-8")
-  };
-}
-function getChangedFiles(diff) {
-  const files = [];
-  for (const match of diff.matchAll(/^diff --git a\/(.*?) b\/(.*?)$/gm)) {
-    files.push(match[2]);
-  }
-  return [...new Set(files)];
-}
-var DIFF_SKIP_PATTERNS = [
-  /(?:^|\/)testdata\//,
-  /(?:^|\/)(?:package-lock\.json|yarn\.lock|pnpm-lock\.yaml|go\.sum|Cargo\.lock|poetry\.lock|Gemfile\.lock|composer\.lock)$/,
-  /\.mdx?$/
-];
-function filterEmbeddedDiff(rawDiff) {
-  const skippedFiles = [];
-  const sections = rawDiff.split(/(?=^diff --git )/m);
-  const kept = [];
-  for (const section of sections) {
-    const match = section.match(/^diff --git a\/(.*?) b\//);
-    if (!match) {
-      kept.push(section);
-      continue;
-    }
-    const filePath = match[1];
-    if (DIFF_SKIP_PATTERNS.some((pattern) => pattern.test(filePath))) {
-      skippedFiles.push(filePath);
-    } else {
-      kept.push(section);
-    }
-  }
-  return { filtered: kept.join(""), skippedFiles };
-}
-
 // src/review-cache.ts
 import { createHash as createHash2 } from "crypto";
 import { gzipSync, gunzipSync } from "zlib";
@@ -2258,7 +2327,22 @@ async function reviewPr(opts) {
       );
     }
   } else if (!piModel) {
-    if (parsed.provider === "openrouter") {
+    if (parsed.provider === "amazon-bedrock") {
+      const inferredBaseModelId = stripBedrockRegionalPrefix(parsed.modelId);
+      const baseModelId = parsed.baseModelId ?? inferredBaseModelId;
+      const baseModel = baseModelId ? modelRuntime.getModel(parsed.provider, baseModelId) : void 0;
+      if (!baseModel) {
+        const hint = parsed.baseModelId ? `Base model "${parsed.baseModelId}" was not found in the installed pi-ai registry.` : `Append "@<base-model-id>" if this is a custom inference profile.`;
+        throw new Error(
+          `Unsupported Bedrock model "${parsed.modelId}". ${hint}`
+        );
+      }
+      const region = process.env.AWS_REGION ?? process.env.AWS_DEFAULT_REGION ?? "us-east-1";
+      piModel = buildBedrockArnModel({ arn: parsed.modelId, baseModel, region });
+      logger.info(
+        `Regional bedrock model, region: ${region}, capabilities from ${baseModel.id}`
+      );
+    } else if (parsed.provider === "openrouter") {
       piModel = {
         id: parsed.modelId,
         name: parsed.modelId,
@@ -2459,7 +2543,14 @@ async function reviewPr(opts) {
     let diffStats = null;
     let changedFiles = [];
     try {
-      const diffArgs = previousReviewSha ? previousReviewBase?.mode === "snapshot" ? ["--no-pager", "diff", previousReviewSha, "HEAD"] : ["--no-pager", "diff", `${previousReviewSha}...HEAD`] : diffBaseSha ? ["--no-pager", "diff", diffBaseSha, "HEAD"] : localMode ? ["--no-pager", "diff", targetBranch] : ["--no-pager", "diff", `origin/${targetBranch}...HEAD`];
+      const diffArgs = getReviewDiffArgs({
+        platform,
+        targetBranch,
+        diffBaseSha,
+        previousReviewSha,
+        reviewDiffMode: previousReviewBase?.mode,
+        localMode
+      });
       const { stdout: rawDiff } = await exec("git", diffArgs, { cwd: workspacePath });
       const { filtered: filteredDiff, skippedFiles } = filterEmbeddedDiff(rawDiff);
       if (skippedFiles.length > 0) {
@@ -2596,14 +2687,29 @@ async function reviewPr(opts) {
       resourceLoader
     });
     activeSession = session;
-    if (bedrockTags && parsed.provider === "amazon-bedrock") {
+    const openAiReasoning = thinkingLevel && isOpenAiBedrockModel(piModel) ? thinkingLevel : void 0;
+    if (parsed.provider === "amazon-bedrock" && (bedrockTags || openAiReasoning)) {
       const agent = session.agent;
       const originalStreamFn = agent.streamFn;
       agent.streamFn = (...args) => {
         const options = args[2] ?? {};
-        return originalStreamFn(args[0], args[1], { ...options, requestMetadata: bedrockTags });
+        const originalOnPayload = options.onPayload;
+        const onPayload = openAiReasoning ? async (payload, model2) => {
+          const transformed = originalOnPayload ? await originalOnPayload(payload, model2) : void 0;
+          return addOpenAiBedrockReasoning(
+            transformed === void 0 ? payload : transformed,
+            openAiReasoning
+          );
+        } : originalOnPayload;
+        return originalStreamFn(args[0], args[1], {
+          ...options,
+          ...bedrockTags ? { requestMetadata: bedrockTags } : {},
+          ...onPayload ? { onPayload } : {}
+        });
       };
-      logger.info(`Bedrock cost allocation tags: ${JSON.stringify(bedrockTags)}`);
+      if (bedrockTags) {
+        logger.info(`Bedrock cost allocation tags: ${JSON.stringify(bedrockTags)}`);
+      }
     }
     let turnCount = 0;
     let toolCallCount = 0;
@@ -2825,4 +2931,4 @@ export {
   postReviewStructured,
   reviewPr
 };
-//# sourceMappingURL=chunk-YKB3BRJM.js.map
+//# sourceMappingURL=chunk-GISFKKMM.js.map