[JosefAschauer]

Stacked on #2998. This branch contains #2998's commit (89624ed). The change here is the second commit, 3b6b3f8. I'll rebase it once #2998 lands.

Problem

The resolver's own reader of a class's bases (pythonBases, behind module-global and self. dispatch) reads only the class line. black and ruff wrap a long base list one base per line:

class Wrapped(
    Mixin,
    Base,
):
    ...

current = Wrapped()
current.run()   # no edge; the one-line form reaches Base.run

Such a class looked like it had no bases. Extraction already reads the whole list, so the class has its extends edges; only this reader missed them.

Fix

A new pythonBaseList reads from the class line to the list's closing parenthesis, counting nested parentheses, within the class's extent. It leaves out # comments, so a ) in a comment doesn't end the list. pythonBases uses it in place of the single-line regex.

Validation

• New __tests__/python-multiline-bases.test.ts: module globals over a one-line list (control), a wrapped list, a wrapped list with comments (one ends in :)), and a parameterized base wrapped inside the list. Each resolves run to Base::run, with a decoy Other.run in the file.

  Mutation-checked twice: reading only the first line fails the three wrapped cases, and leaving comments in fails the comment case.

• npx tsc --noEmit: clean.

• Full suite on Linux: 8772 passed, 4 failed. These are the same environmental failures as fix(python): a parameterized base links its class, like class Leaf(Base[str]) #2998 (bundle-launcher ×2, cli-sync ×2).

• Independent review (Grok): SHIP.

🤖 Generated with Claude Code

https://claude.ai/code/session_018hJjBUPFiLSFBssshFwHzq

[colbymchenry]

Thanks! The module-global case is real on main, your reader fixes it, and the tests pass on the newest main. One more reader has the same gap: the Python branch of declaredSupertypes, behind class-name calls like Wrapped.run(...), reads only three lines and needs the closing parenthesis on them, so a wrapped base list still has no bases there. Reusing pythonBaseList there would close it. Happy to look again once it's ready.

[JosefAschauer]

Thanks, good catch. declaredSupertypes' Python branch now reads the list through pythonBaseList (5d50558). The keyword-argument and factory rewrites (metaclass=…, BaseManager.from_queryset(QuerySet)) are kept as they were.

The test adds class-name calls (Wrapped.run(x)) next to the module-global ones:

• a one-line control;
• a wrapped list;
• a list whose comment holds a );
• decorated classes, both one-line and wrapped, to confirm a class node starts on its class line, which pythonBaseList relies on.

Without the change, the wrapped, commented and decorated-wrapped cases fail; with it, all 8 pass. On the branch:

• tsc --noEmit is clean.
• The full suite gives 8776 passed and 4 failed. The 4 are bundle-launcher (Windows archives) and cli-sync (quiet=true), and they fail the same way without this change.

This branch is still stacked on #2998, so it carries that commit too. Marking both ready.

[JosefAschauer]

Heads-up on ordering: this follow-up now changes the same case 'python' line in readDeclaredSupertypes as #3000 (type arguments are no supertypes), so whichever of the two lands second will conflict there. The two compose: read the list whole, then drop the brackets. This is the resolution I run locally on main plus both branches:

case 'python': {
  let bases = pythonBaseList(cls, context);
  while (bases && /\[[^[\]]*\]/.test(bases)) bases = bases.replace(/\[[^[\]]*\]/g, '');
  return names(bases?.replace(/\w+\s*=\s*[\w.]+/g, '').replace(/([A-Za-z_][\w.]*)\.\w+\s*\(/g, '$1 ('));
}

With both merged, the full suite passes apart from the known failures: bundle-launcher x2, cli-sync x2, and the explore-exact-target x2 that come from #2076. I'm happy to rebase whichever one is left once the other lands.

[JosefAschauer]

Thanks for landing #2998, #3000 and #2999! I've rebased this one onto current main (08b187a). It now carries only its own three commits, and the readDeclaredSupertypes conflict with #3083 is resolved as described above: the list is read whole, then type arguments are dropped. tsc is clean and the Python base tests pass (59 passed). The full suite fails only bundle-launcher x2, cli-sync x2 and gitignore-pattern-parity x4, and those four fail the same way on plain main 08b187a here.

[colbymchenry]

Thanks @JosefAschauer! This landed as #3103 with you as the commit author, using the combined resolution you posted for case 'python'. It made a big difference on real code: on polar, 942 from_session calls now reach RepositoryBase instead of a sibling repository. We added a test for wrapped bases with type arguments, made one line-split handle CRLF, and reworded the CHANGELOG bullet.