⚡ perf(vscode): 摘修复用本地合并记录分组，列表改手风琴

vscode/src/git/release.ts

@@ -82,7 +82,15 @@ export function pickCurrentRelease(prefix: string, remoteBranches: string[]): st
   return remoteBranches.filter(b => b.startsWith(prefix)).sort().at(-1)
 }
 
-/** 同 PR 收一组（新→旧首次出现顺序）。pr 号来自 Gitea，不是扫提交说明。 */
+/** Gitea 默认合并说明：Merge pull request '标题' (#260) from … */
+export function parseGiteaMergeSubject(subject: string): { number: number, title: string } | undefined {
+  const m = /^Merge pull request '(.+)' \(#(\d+)\)/.exec(subject)
+  if (!m)
+    return undefined
+  return { title: m[1], number: Number(m[2]) }
+}
+
+/** 同 PR 收一组（新→旧首次出现顺序）。pr 号来自合并记录，不是扫提交说明。 */
 export function groupCommitsByPr(commits: UnreleasedCommit[]): ReleaseCommitGroup[] {
   const prGroups = new Map<number, ReleaseCommitGroup>()
   const prOrder: number[] = []
@@ -151,6 +159,56 @@ export async function listReleaseBranches(o: { cwd: string, prefix: string }): P
   return names.filter(b => b.startsWith(o.prefix)).sort().reverse()
 }
 
+/** 用本地 merge 记录把未发布 sha 对上 PR。不打 Gitea。 */
+export async function indexUnreleasedByMergePr(o: {
+  cwd: string
+  current: string
+  devBranch: string
+  shas: readonly string[]
+}): Promise<Map<string, { number: number, title: string }>> {
+  const needed = new Set(o.shas)
+  const out = new Map<string, { number: number, title: string }>()
+  if (needed.size === 0)
+    return out
+  const raw = await mustGit(
+    o.cwd,
+    ['log', '--right-only', '--cherry-pick', '--merges', '--format=%H%x00%s', unreleasedRange(o.current, o.devBranch)],
+    '读取合并记录失败',
+  )
+  if (!raw)
+    return out
+  for (const line of raw.split('\n')) {
+    const [sha, subject] = line.split('\0')
+    if (!sha || !subject)
+      continue
+    const parsed = parseGiteaMergeSubject(subject)
+    if (!parsed)
+      continue
+    const members = await mustGit(
+      o.cwd,
+      ['rev-list', '--no-merges', `${sha}^1..${sha}^2`],
+      `读取 PR #${parsed.number} 提交失败`,
+    )
+    for (const member of members ? members.split('\n') : []) {
+      if (needed.has(member))
+        out.set(member, parsed)
+    }
+    if (out.size === needed.size)
+      return out
+  }
+  return out
+}
+
+export function attachPulls<T extends { sha: string }>(
+  commits: T[],
+  index: Map<string, { number: number, title: string }>,
+): Array<T & { pr?: number, prTitle?: string }> {
+  return commits.map((c) => {
+    const hit = index.get(c.sha)
+    return hit ? { ...c, pr: hit.number, prTitle: hit.title } : c
+  })
+}
+
 export async function listUnreleasedCommits(o: { cwd: string, devBranch: string, current: string }): Promise<UnreleasedCommit[]> {
   const out = await mustGit(
     o.cwd,

vscode/src/gitea/api.ts

@@ -362,67 +362,6 @@ export async function getPullRequest(opts: {
   }
 }
 
-export async function listClosedPullsPage(opts: {
-  host: string
-  token: string
-  owner: string
-  repo: string
-  page: number
-}): Promise<Array<{ number: number, title: string, merged: boolean, mergeCommitSha: string | null }>> {
-  const url = new URL(`${baseUrl(opts.host)}/repos/${opts.owner}/${opts.repo}/pulls`)
-  url.searchParams.set('state', 'closed')
-  url.searchParams.set('sort', 'recentupdate')
-  url.searchParams.set('limit', String(PAGE_SIZE))
-  url.searchParams.set('page', String(opts.page))
-  const res = await fetch(url.toString(), { headers: authHeaders(opts.token) })
-  await ensureOk(res)
-  const batch = await res.json() as Array<{
-    number?: unknown
-    title?: unknown
-    merged?: unknown
-    merge_commit_sha?: unknown
-  }>
-  if (!Array.isArray(batch))
-    return []
-  return batch.map(p => ({
-    number: typeof p.number === 'number' ? p.number : Number(p.number),
-    title: typeof p.title === 'string' ? p.title : '',
-    merged: p.merged === true,
-    mergeCommitSha: typeof p.merge_commit_sha === 'string' && p.merge_commit_sha.length > 0
-      ? p.merge_commit_sha
-      : null,
-  }))
-}
-
-export async function listPullRequestCommitShas(opts: {
-  host: string
-  token: string
-  owner: string
-  repo: string
-  index: number
-}): Promise<string[]> {
-  const out: string[] = []
-  let page = 1
-  while (true) {
-    const url = new URL(`${baseUrl(opts.host)}/repos/${opts.owner}/${opts.repo}/pulls/${opts.index}/commits`)
-    url.searchParams.set('limit', String(PAGE_SIZE))
-    url.searchParams.set('page', String(page))
-    const res = await fetch(url.toString(), { headers: authHeaders(opts.token) })
-    await ensureOk(res)
-    const batch = await res.json() as Array<{ sha?: unknown }>
-    if (!Array.isArray(batch) || batch.length === 0)
-      break
-    for (const c of batch) {
-      if (typeof c.sha === 'string' && c.sha.length > 0)
-        out.push(c.sha)
-    }
-    if (batch.length < PAGE_SIZE)
-      break
-    page += 1
-  }
-  return out
-}
-
 export async function getIssue(opts: {
   host: string
   token: string

vscode/src/gitea/commitPulls.test.ts

@@ -1,35 +0,0 @@
-import { describe, expect, it } from 'vitest'
-import { indexCommitsByPull } from './commitPulls'
-
-describe('indexCommitsByPull', () => {
-  it('用已合并 PR 的提交列表把 sha 对上 PR，不看 commit message', async () => {
-    const map = await indexCommitsByPull(
-      ['3e519ea', '5572c4f', 'orphan'],
-      async (page) => {
-        if (page !== 1)
-          return []
-        return [
-          { number: 260, title: '连续包月会员订阅体系', merged: true, mergeCommitSha: 'merge260' },
-          { number: 99, title: '还没合', merged: false, mergeCommitSha: null },
-        ]
-      },
-      async (index) => {
-        if (index === 260)
-          return ['3e519ea', '5572c4f', 'other']
-        throw new Error(`should not fetch commits for PR ${index}`)
-      },
-    )
-    expect(map.get('3e519ea')).toEqual({ number: 260, title: '连续包月会员订阅体系' })
-    expect(map.get('5572c4f')).toEqual({ number: 260, title: '连续包月会员订阅体系' })
-    expect(map.has('orphan')).toBe(false)
-  })
-
-  it('squash 合入时用 mergeCommitSha 对上', async () => {
-    const map = await indexCommitsByPull(
-      ['squashsha'],
-      async () => [{ number: 8, title: 'squash pr', merged: true, mergeCommitSha: 'squashsha' }],
-      async () => ['original-on-branch'],
-    )
-    expect(map.get('squashsha')).toEqual({ number: 8, title: 'squash pr' })
-  })
-})

vscode/src/gitea/commitPulls.ts

@@ -1,57 +0,0 @@
-export interface PullRef {
-  number: number
-  title: string
-  merged: boolean
-  mergeCommitSha: string | null
-}
-
-export type ListPullsPage = (page: number) => Promise<PullRef[]>
-export type ListPullCommits = (index: number) => Promise<string[]>
-
-/**
- * 把未发布提交的 sha 对上已合并 PR。
- * 只认 Gitea 的 PR 提交列表 / squash 的 mergeCommitSha，不扫 commit message。
- */
-export async function indexCommitsByPull(
-  shas: readonly string[],
-  listPulls: ListPullsPage,
-  listCommits: ListPullCommits,
-): Promise<Map<string, { number: number, title: string }>> {
-  const needed = new Set(shas)
-  const out = new Map<string, { number: number, title: string }>()
-  if (needed.size === 0)
-    return out
-
-  for (let page = 1; page <= 20; page++) {
-    const batch = await listPulls(page)
-    if (batch.length === 0)
-      break
-    for (const pr of batch) {
-      if (!pr.merged)
-        continue
-      const ref = { number: pr.number, title: pr.title }
-      if (pr.mergeCommitSha && needed.has(pr.mergeCommitSha))
-        out.set(pr.mergeCommitSha, ref)
-      const commits = await listCommits(pr.number)
-      for (const sha of commits) {
-        if (needed.has(sha))
-          out.set(sha, ref)
-      }
-      if (out.size === needed.size)
-        return out
-    }
-    if (batch.length < 50)
-      break
-  }
-  return out
-}
-
-export function attachPulls<T extends { sha: string }>(
-  commits: T[],
-  index: Map<string, { number: number, title: string }>,
-): Array<T & { pr?: number, prTitle?: string }> {
-  return commits.map((c) => {
-    const hit = index.get(c.sha)
-    return hit ? { ...c, pr: hit.number, prTitle: hit.title } : c
-  })
-}

vscode/src/panel/handlers/release.ts

@@ -7,16 +7,14 @@
 
 import type { KanbanWebviewPanel } from '../KanbanPanel'
 import { window, workspace } from 'vscode'
-import { getToken } from '../../auth/secrets'
-import { listClosedPullsPage, listPullRequestCommitShas } from '../../gitea/api'
-import { attachPulls, indexCommitsByPull } from '../../gitea/commitPulls'
 import { gitFetch } from '../../git/branches'
-import { detectRepo } from '../../git/remote'
 import {
+  attachPulls,
   cherryPickToRelease,
   cutRelease,
   getReleaseStatus,
   groupCommitsByPr,
+  indexUnreleasedByMergePr,
   listReleaseBranches,
   listUnreleasedCommits,
   todayReleaseBranch,
@@ -105,28 +103,17 @@ export async function handleReleaseCherryPick(panel: KanbanWebviewPanel): Promis
       toast(panel, 'info', '没有待摘的提交')
       return
     }
-    let annotated = commits
-    const spinner = toast(panel, 'info', '正在按 PR 分组…', { spinner: true, dismissOnTimer: 0 })
-    try {
-      const remote = await detectRepo(root)
-      const token = remote ? await getToken(panel.context, remote.host) : undefined
-      if (remote && token) {
-        const gitea = { host: remote.host, token, owner: remote.owner, repo: remote.repo }
-        const index = await indexCommitsByPull(
-          commits.map(c => c.sha),
-          page => listClosedPullsPage({ ...gitea, page }),
-          pr => listPullRequestCommitShas({ ...gitea, index: pr }),
-        )
-        annotated = attachPulls(commits, index)
-      }
-    }
-    catch {
-      toast(panel, 'error', '按 PR 分组失败，先按未关联列出', { dismissOnTimer: 5000 })
-    }
-    finally {
-      dismiss(panel, spinner)
-    }
-    panel.postMessage({ type: 'release/pick-show', branch: current, groups: groupCommitsByPr(annotated) })
+    const index = await indexUnreleasedByMergePr({
+      cwd: root,
+      current,
+      devBranch: s.devBranch,
+      shas: commits.map(c => c.sha),
+    })
+    panel.postMessage({
+      type: 'release/pick-show',
+      branch: current,
+      groups: groupCommitsByPr(attachPulls(commits, index)),
+    })
   }
   catch (err) {
     toast(panel, 'error', err instanceof Error ? err.message : String(err), { dismissOnTimer: 10_000 })