[sentry-junior]

Moves pagination, the response-cache policy, retry, and transport under toolkit-core/src/api-client/, the layout they will have inside @sentry/api (#1669, task 8.3). Every importer is rewritten. Nothing else changes.

It's the second PR in the group 8 stack. #1732, the foundation, has merged, so this one targets main.

What changes

• Moves. Only the relative imports inside the moved files change:
  • pagination.ts → api-client/pagination.ts
  • api-retry.ts → api-client/retry.ts
  • api-transport.ts → api-client/transport.ts
  • response-cache/{body,index,invalidation,keys,memory-store,policy,store,tiers}.ts → api-client/response-cache/
  • Their tests move with them.
• Stays put: response-cache/codec.ts. It's the node:zlib codec, host storage that won't move into @sentry/api. It's still excluded from the browser typecheck, and the ./response-cache/codec export doesn't change.
• Exports: ./pagination, ./api-retry, ./api-transport, and ./response-cache are replaced by the existing ./api-client/* wildcard plus one ./api-client/response-cache entry for the directory index. @sentry/toolkit-core is private, and every consumer is in this workspace and rewritten here.
• Importers. The codemod rewrites 11 import specifiers across the CLI (including script/generate-api-schema.ts), mcp-core/src/api-client/client.ts, and toolkit-core.
• Docs: api-patterns.md, the toolkit-core README, and code comments name the new subpaths.

Behavior changes

None.

This PR does not touch packages/mcp-server, packages/cli/src/lib/mcp.ts, or the evals stdio entry. The @sentry/mcp-server retirement PR owns those.

Commits

1. 85fae9151 Move the modules and rewrite importers (generated, move-transport-layer.mjs)
2. 85df504be Point comments and docs at the new paths (hand)

Verification

• The generated commit reproduces exactly: check out origin/main (9409280c1), run the command below, then oxfmt on the changed files. The tree matches 85fae9151.
• pnpm run tsc (including toolkit-core's browser typecheck), pnpm run lint, and node scripts/check-doc-links.mjs pass.
• Tests: toolkit-core 306 passed; mcp-core 1881 passed, 6 skipped; mcp-cloudflare 443 passed; mcp-server 87 passed; CLI test/lib test/commands test/script 11895 passed, 46 skipped, 6 failed.
• The 6 CLI failures are sandbox-only, and they fail the same way without this change. The sandbox runs with CAP_DAC_OVERRIDE, so these permission tests can't make a file unreadable: completions (EACCES, EPERM), dsn/code-scanner (unreadable file), init/tools/file-changes (I/O failure), telemetry (read-only DB), and upgrade (acquireLock permission error). CI runs them normally.

Codemod

The script isn't in the tree. To re-run it, check out the parent of the generated commit and run it from a scratch directory with ts-morph@28.0.0 installed. Then run oxfmt on the added, modified, and renamed package files.

move-transport-layer.mjs (commit 85fae91)

node move-transport-layer.mjs <repo-root>
git add -A -- packages
oxfmt $(git diff --cached --name-only --diff-filter=AMR)

// Codemod: move toolkit-core's pagination, response-cache policy, api-retry,
// and api-transport modules under src/api-client/, and rewrite every
// importer and the package's exports. The node:zlib cache codec stays at
// src/response-cache/codec.ts as a host-side module.
//
// Usage: node move-transport-layer.mjs <toolkit-repo-root>
// (run from a directory where `ts-morph@28.0.0` is installed)
import { readFileSync, writeFileSync } from "node:fs";
import path from "node:path";
import { Node, Project } from "ts-morph";

const root = path.resolve(process.argv[2] ?? ".");
const coreDir = path.join(root, "packages/toolkit-core");
const coreSrc = path.join(coreDir, "src");

// Old path -> new path, relative to toolkit-core/src.
const MOVES = new Map([
  ["pagination.ts", "api-client/pagination.ts"],
  ["pagination.test.ts", "api-client/pagination.test.ts"],
  ["api-retry.ts", "api-client/retry.ts"],
  ["api-retry.test.ts", "api-client/retry.test.ts"],
  ["api-transport.ts", "api-client/transport.ts"],
  ["api-transport.test.ts", "api-client/transport.test.ts"],
]);
const CACHE_FILES = [
  "body.ts",
  "index.ts",
  "invalidation.ts",
  "invalidation.test.ts",
  "keys.ts",
  "keys.test.ts",
  "memory-store.ts",
  "memory-store.test.ts",
  "policy.ts",
  "policy.test.ts",
  "policy.property.test.ts",
  "store.ts",
  "tiers.ts",
  "tiers.test.ts",
];
for (const file of CACHE_FILES) {
  MOVES.set(`response-cache/${file}`, `api-client/response-cache/${file}`);
}

// Package subpath -> new subpath. `response-cache/codec` does not move.
const SPECIFIERS = new Map([
  ["@sentry/toolkit-core/api-retry", "@sentry/toolkit-core/api-client/retry"],
  [
    "@sentry/toolkit-core/api-transport",
    "@sentry/toolkit-core/api-client/transport",
  ],
  [
    "@sentry/toolkit-core/pagination",
    "@sentry/toolkit-core/api-client/pagination",
  ],
  [
    "@sentry/toolkit-core/response-cache",
    "@sentry/toolkit-core/api-client/response-cache",
  ],
]);

// 1. Move the files inside toolkit-core. ts-morph rewrites relative imports
//    in and to them; then give every rewritten specifier the `.js` suffix
//    the package uses.
const core = new Project({
  tsConfigFilePath: path.join(coreDir, "tsconfig.json"),
});
const moved = new Set();
for (const [from, to] of MOVES) {
  const sourceFile = core.getSourceFileOrThrow(path.join(coreSrc, from));
  sourceFile.move(path.join(coreSrc, to));
  moved.add(sourceFile.getFilePath());
}
for (const sourceFile of core.getSourceFiles()) {
  const importer = sourceFile.getFilePath();
  for (const declaration of [
    ...sourceFile.getImportDeclarations(),
    ...sourceFile.getExportDeclarations(),
  ]) {
    const target = declaration.getModuleSpecifierSourceFile();
    if (!target || !declaration.getModuleSpecifierValue()?.startsWith(".")) {
      continue;
    }
    const targetPath = target.getFilePath();
    if (!moved.has(importer) && !moved.has(targetPath)) continue;
    let specifier = path.relative(
      path.dirname(importer),
      targetPath.replace(/\.ts$/, ""),
    );
    if (!specifier.startsWith(".")) specifier = `./${specifier}`;
    declaration.setModuleSpecifier(`${specifier}.js`);
  }
}
await core.save();

// 2. Rewrite package specifiers everywhere else, including dynamic imports
//    and vi.mock() calls: any string literal equal to an old subpath.
const others = new Project({ skipAddingFilesFromTsConfig: true });
others.addSourceFilesAtPaths([
  path.join(root, "{packages,apps}/*/{src,test,script,scripts}/**/*.{ts,tsx,mts}"),
  `!${path.join(root, "**/node_modules/**")}`,
  `!${path.join(root, "**/dist/**")}`,
  `!${path.join(coreDir, "**")}`,
]);
let rewritten = 0;
for (const sourceFile of others.getSourceFiles()) {
  let changed = false;
  sourceFile.forEachDescendant((node) => {
    if (!Node.isStringLiteral(node)) return;
    const next = SPECIFIERS.get(node.getLiteralValue());
    if (next) {
      node.setLiteralValue(next);
      changed = true;
      rewritten += 1;
    }
  });
  if (changed) await sourceFile.save();
}

// 3. Point the package exports at the new paths. The `./api-client/*`
//    wildcard covers pagination, retry, and transport; the cache needs its
//    index.
const manifestPath = path.join(coreDir, "package.json");
const manifest = JSON.parse(readFileSync(manifestPath, "utf8"));
const exports = {};
for (const [key, value] of Object.entries(manifest.exports)) {
  if (["./api-retry", "./api-transport", "./pagination", "./response-cache"].includes(key)) {
    continue;
  }
  if (key === "./api-client/*") {
    exports["./api-client/response-cache"] = {
      types: "./src/api-client/response-cache/index.ts",
      default: "./src/api-client/response-cache/index.ts",
    };
  }
  exports[key] = value;
}
manifest.exports = exports;
writeFileSync(manifestPath, `${JSON.stringify(manifest, null, 2)}\n`);

console.log(`moved ${moved.size} files, rewrote ${rewritten} specifiers`);

via BYK.

--

View Junior Session in Sentry

[vercel]

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Actions	Updated
sentry-local	Ready	Preview	Oct 29, 2026 8:12pm UTC