Skip to content

Commit d246ea4

Browse files
Merge branch 'main' into enhancement/2096-static-mcp-oauth
2 parents cd5ef9f + 37b66fe commit d246ea4

66 files changed

Lines changed: 6991 additions & 219 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/code-qa.yml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,16 @@ jobs:
9898
run: pnpm check-types
9999
- name: Validate Code QA workflow
100100
run: pnpm test:code-qa-ci
101+
- name: Validate Solheim provider smoke workflow
102+
run: pnpm test:solheim-smoke-ci
103+
- name: Test Solheim provider smoke units
104+
run: pnpm test:solheim-smoke:unit
105+
- name: Check Solheim provider smoke types
106+
run: pnpm solheim-smoke:check-types
107+
- name: Test agent evals units
108+
run: pnpm test:agent-evals:unit
109+
- name: Check agent evals types
110+
run: pnpm agent-evals:check-types
101111
- name: Model-check task lifecycle protocols
102112
run: pnpm lifecycle:model-check
103113
- name: Validate MCP OAuth integration

‎.github/workflows/label-pr-review-state-fork-review-followup.yml‎

Lines changed: 35 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -52,43 +52,44 @@ jobs:
5252
return;
5353
}
5454
55-
// Same-repository review runs already ran with a privileged
56-
// token and wrote their labels; only fork runs need the
57-
// follow-up.
58-
if (run.head_repository && run.head_repository.fork === false) {
59-
core.info('Ignoring same-repository pull_request_review run');
60-
return;
61-
}
62-
63-
// Resolve which PRs the completed run targeted. Fork runs
64-
// backfill pull_requests empty, so fall back to the exact head
65-
// owner, branch, and SHA lookup used by the resolve job of
66-
// label-pr-review-state.yml. Keep both copies in sync.
55+
// GitHub reports the base repository as head_repository on
56+
// every pull_request_review run, fork PR or not (issue
57+
// #2133), so the payload cannot tell fork from same-repo
58+
// runs. Dispatching for a same-repo PR is idempotent: the
59+
// reconciliation writes the same labels, and its completion
60+
// carries event 'workflow_dispatch', which the guard above
61+
// filters out.
62+
//
63+
// Resolve which PRs the completed run targeted. Review runs
64+
// backfill pull_requests empty for fork PRs, and the head
65+
// owner is not recoverable from head_repository, so the
66+
// fallback lists open PRs and matches the exact head branch,
67+
// SHA, and base repository. The workflow_run branch of
68+
// label-pr-review-state.yml keeps an owner-and-branch query
69+
// instead: its runs are CI runs triggered by pull_request,
70+
// whose head_repository is the real fork.
6771
let prNumbers = [];
6872
if (run.pull_requests?.length > 0) {
6973
prNumbers = run.pull_requests.map(pr => pr.number);
70-
} else {
71-
const headOwner = run.head_repository?.owner?.login;
72-
if (headOwner && run.head_branch && run.head_sha) {
73-
const candidates = await github.paginate(github.rest.pulls.list, {
74-
owner,
75-
repo,
76-
state: 'open',
77-
head: `${headOwner}:${run.head_branch}`,
78-
per_page: 100,
79-
});
80-
const baseRepository = `${owner}/${repo}`.toLowerCase();
81-
prNumbers = candidates
82-
.filter(pr =>
83-
pr.head?.sha === run.head_sha &&
84-
pr.base?.repo?.full_name?.toLowerCase() === baseRepository
85-
)
86-
.map(pr => pr.number);
87-
core.info(
88-
`Resolved workflow_run ${run.id ?? '(unknown)'} to ` +
89-
`${prNumbers.length} PR(s) by exact head owner, branch, and SHA`
90-
);
91-
}
74+
} else if (run.head_branch && run.head_sha) {
75+
const candidates = await github.paginate(github.rest.pulls.list, {
76+
owner,
77+
repo,
78+
state: 'open',
79+
per_page: 100,
80+
});
81+
const baseRepository = `${owner}/${repo}`.toLowerCase();
82+
prNumbers = candidates
83+
.filter(pr =>
84+
pr.head?.sha === run.head_sha &&
85+
pr.head?.ref === run.head_branch &&
86+
pr.base?.repo?.full_name?.toLowerCase() === baseRepository
87+
)
88+
.map(pr => pr.number);
89+
core.info(
90+
`Resolved workflow_run ${run.id ?? '(unknown)'} to ` +
91+
`${prNumbers.length} PR(s) by exact head branch, SHA, and base repository`
92+
);
9293
}
9394
9495
// Each dispatch starts a privileged workflow_dispatch run of the

‎.github/workflows/label-pr-review-state.yml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,8 +138,13 @@ jobs:
138138
// number in the payload; sweep triggers (hourly schedule, pushes to
139139
// main) list every open PR; workflow_run events use the run's
140140
// associated PRs, with a fork-safe backfill by exact head owner,
141-
// branch, and SHA when GitHub left pull_requests empty. Keep the
142-
// backfill in sync with label-pr-review-state-fork-review-followup.yml.
141+
// branch, and SHA when GitHub left pull_requests empty. The
142+
// workflows listed in workflow_run trigger on pull_request, whose
143+
// head_repository is the real fork, so the owner-and-branch query
144+
// is safe here. The follow-up workflow's copy of this backfill
145+
// matches by head branch, SHA, and base repository instead: its
146+
// pull_request_review runs report the base repository as
147+
// head_repository (issue #2133).
143148
let prNumbers = [];
144149
if (context.payload.pull_request?.number) {
145150
prNumbers = [context.payload.pull_request.number];
Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
name: Solheim provider smoke
2+
3+
# Project A: infrastructure validation only. No PR diff, review judgment, router,
4+
# deterministic review rule, or GitHub posting. Only trusted main-branch code runs.
5+
on:
6+
workflow_dispatch:
7+
8+
permissions:
9+
contents: read
10+
11+
concurrency:
12+
group: solheim-provider-smoke
13+
cancel-in-progress: false
14+
15+
jobs:
16+
smoke:
17+
if: github.ref == 'refs/heads/main'
18+
runs-on: ubuntu-24.04
19+
timeout-minutes: 25
20+
# Retain the existing protected environment and secret names for compatibility.
21+
# The environment requires reviewer approval, matching the deploy
22+
# environment. The job guard above restricts runs to main, so the
23+
# secret is released only for an approved main run. See
24+
# scripts/solheim-smoke/README.md.
25+
environment: final-vscode-review-smoke
26+
steps:
27+
- name: Checkout exact trusted main revision
28+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
29+
with:
30+
ref: ${{ github.sha }}
31+
persist-credentials: false
32+
33+
- name: Setup Node.js and pnpm
34+
uses: ./.github/actions/setup-node-pnpm
35+
with:
36+
install-args: "--frozen-lockfile"
37+
38+
- name: Build trusted extension and webview
39+
run: |
40+
pnpm -w bundle
41+
pnpm --filter @roo-code/vscode-webview build
42+
43+
- name: Install display dependencies
44+
run: sudo apt-get update && sudo apt-get install -y xvfb ffmpeg libasound2t64
45+
46+
- name: Run Solheim provider smoke
47+
id: provider
48+
timeout-minutes: 8
49+
env:
50+
SOLHEIM_API_KEY: ${{ secrets.FINAL_SMOKE_OPENAI_API_KEY }}
51+
SOLHEIM_SMOKE_OUT_DIR: ${{ runner.temp }}/solheim-provider-smoke
52+
run: xvfb-run -a -s "-screen 0 1280x720x24 -nolisten tcp" bash scripts/solheim-smoke/record.sh
53+
54+
# The recorder publishes smoke.mp4 only through an atomic rename
55+
# after a nonempty check and ffprobe validation, so the published
56+
# final is the commit marker: present and nonempty means complete.
57+
# There is no separate persisted status marker.
58+
- name: Verify recording integrity
59+
if: ${{ !cancelled() && (steps.provider.outcome == 'success' || steps.provider.outcome == 'failure') }}
60+
env:
61+
SOLHEIM_SMOKE_OUT_DIR: ${{ runner.temp }}/solheim-provider-smoke
62+
run: |
63+
test -s "$SOLHEIM_SMOKE_OUT_DIR/smoke.mp4"
64+
echo "Recording published and nonempty: $SOLHEIM_SMOKE_OUT_DIR/smoke.mp4"
65+
66+
# Verdict and trace evidence must survive even when the recording
67+
# is missing, so metadata and video are uploaded separately.
68+
- name: Upload provider smoke verdict and trace
69+
if: ${{ !cancelled() && (steps.provider.outcome == 'success' || steps.provider.outcome == 'failure') }}
70+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
71+
with:
72+
name: solheim-provider-smoke-${{ github.sha }}
73+
path: |
74+
${{ runner.temp }}/solheim-provider-smoke/verdict.json
75+
${{ runner.temp }}/solheim-provider-smoke/trace.json
76+
if-no-files-found: error
77+
retention-days: 7
78+
79+
# Exact validated final path only; the recorder leaves no temporary
80+
# file behind, so a failed upload here reports the missing recording.
81+
- name: Upload provider smoke recording
82+
if: ${{ !cancelled() && (steps.provider.outcome == 'success' || steps.provider.outcome == 'failure') }}
83+
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
84+
with:
85+
name: solheim-provider-smoke-recording-${{ github.sha }}
86+
path: ${{ runner.temp }}/solheim-provider-smoke/smoke.mp4
87+
if-no-files-found: error
88+
retention-days: 7

‎apps/vscode-e2e/src/fixtures/apply-diff.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export function addApplyDiffResultFixtures(mock: InstanceType<typeof LLMock>) {
3131
},
3232
{
3333
toolCallId: "call_apply_diff_error_001",
34-
expected: ["No sufficiently similar match found at line: 1", "This content does not exist"],
34+
expected: ["No sufficiently similar match found at line: 1", "- Best Match Location: "],
3535
result: "The apply_diff operation on `apply-diff-tool-fixture/error-handling.txt` was rejected - the search content did not match any content in the file, so it was not modified.",
3636
id: "call_apply_diff_error_002",
3737
},

0 commit comments

Comments
 (0)