- First-class LLM providers: Ollama, LM Studio, OpenRouter, NVIDIA Cloud (shared clients, config, max_tokens compat, reachability, pill parity). - llm-api: honor PRR_LLM_PROVIDER for openrouter/nvidiacloud; sync public provider in isAvailable; explicit provider fails checkStatus without key. - validateAndFilterModels: env key fallbacks for OpenRouter/NVIDIA; keep rotation when /v1/models is empty; align needs* with llm-api provider. - Local probes: classify connection failures via Error.cause chain. - GitHub: mergeable polling, fork/upstream base handling, pr-mergeable helper. - Thread working reactions; thread-replies and reporter robustness. - ElizaCloud retry policy, final-audit fallback, conflict/merge and state improvements; contributor-sheet tool; tests and catalog refresh. - README, CHANGELOG, DEVELOPMENT, AGENTS, MODELS, .env.example: WHYs for provider selection, rotation validation, and local backends.
Showing the changes to shared/git/git-diff.ts (1 of 125 files). Show all
Unified · Split
| @@ -10,6 +10,31 @@ import { debug } from '../logger.js'; · 9 unmodified lines | ||
| 10 | 10 | * reduces WRONG_LOCATION when the fixer looks up code at the comment's line. |
| 11 | 11 | * Only context lines (unchanged) are mapped; deleted/added lines are skipped. |
| 12 | 12 | */ |
| 13 | +/** | |
| 14 | + * Pick a git ref for **`base..HEAD`** diffs (line map, PR changed-file list) when the PR base is **`develop`** etc. | |
| 15 | + * WHY: On fork clones **`origin/<base>`** may not exist (fork never had that branch); **`upstream/<base>`** was fetched from the base repo (**`baseRepoCloneUrl`**). Using the wrong remote breaks **`computeLineMapFromDiff`** with “ambiguous argument” / missing ref (output.log audits on eliza fork PRs). | |
| 16 | + */ | |
| 17 | +export async function resolveRemoteTrackingRefForPrBase( | |
| 18 | + git: SimpleGit, | |
| 19 | + prInfo: { baseBranch: string; baseRepoCloneUrl?: string } | |
| 20 | +): Promise<string> { | |
| 21 | + const b = prInfo.baseBranch?.trim(); | |
| 22 | + if (!b) return 'HEAD~1'; | |
| 23 | + const preferUpstreamFirst = Boolean(prInfo.baseRepoCloneUrl?.trim()); | |
| 24 | + const candidates = preferUpstreamFirst | |
| 25 | + ? ([`upstream/${b}`, `origin/${b}`] as const) | |
| 26 | + : ([`origin/${b}`, `upstream/${b}`] as const); | |
| 27 | + for (const ref of candidates) { | |
| 28 | + try { | |
| 29 | + await git.revparse([ref]); | |
| 30 | + return ref; | |
| 31 | + } catch { | |
| 32 | + /* try next */ | |
| 33 | + } | |
| 34 | + } | |
| 35 | + return candidates[0]; | |
| 36 | +} | |
| 37 | + | |
| 13 | 38 | export async function computeLineMapFromDiff( |
| 14 | 39 | git: SimpleGit, |
| 15 | 40 | baseRef: string, |