Skip to content

Commit edcb905

Browse files
authored
Merge remote-tracking branch 'origin/main' into copilot/awf-fix-credential-hiding-overlays
Co-authored-by: lpcox <15877973+lpcox@users.noreply.github.com>
2 parents 38f6cb8 + 3d4313b commit edcb905

47 files changed

Lines changed: 938 additions & 1038 deletions

Some content is hidden

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

.github/aw/actions-lock.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -272,20 +272,20 @@
272272
"digest": "sha256:3d5dba0b0a139bbb11b5d5b8b44f277d2b18f69cf43090e3c283d750cf864baa",
273273
"pinned_image": "ghcr.io/github/gh-aw-firewall/squid:0.28.9@sha256:3d5dba0b0a139bbb11b5d5b8b44f277d2b18f69cf43090e3c283d750cf864baa"
274274
},
275-
"ghcr.io/github/gh-aw-mcpg:v0.4.13": {
276-
"image": "ghcr.io/github/gh-aw-mcpg:v0.4.13",
277-
"digest": "sha256:ec4008521c610e1113ed557ecec0ff64a2c2111e4cfa817bab54d9b7da24c7cc",
278-
"pinned_image": "ghcr.io/github/gh-aw-mcpg:v0.4.13@sha256:ec4008521c610e1113ed557ecec0ff64a2c2111e4cfa817bab54d9b7da24c7cc"
279-
},
280275
"ghcr.io/github/gh-aw-mcpg:v0.4.14": {
281276
"image": "ghcr.io/github/gh-aw-mcpg:v0.4.14",
282277
"digest": "sha256:b2f0c2b2f17b5fbe809e5bb99dc185b6ddd70df25295dc63a6d526350334eff5",
283278
"pinned_image": "ghcr.io/github/gh-aw-mcpg:v0.4.14@sha256:b2f0c2b2f17b5fbe809e5bb99dc185b6ddd70df25295dc63a6d526350334eff5"
284279
},
280+
"ghcr.io/github/gh-aw-mcpg:v0.4.15": {
281+
"image": "ghcr.io/github/gh-aw-mcpg:v0.4.15",
282+
"digest": "sha256:60cd97533e93d8e7be36b979c0f08a70846189bda6190f28bbd6d427bc0d9b6e",
283+
"pinned_image": "ghcr.io/github/gh-aw-mcpg:v0.4.15@sha256:60cd97533e93d8e7be36b979c0f08a70846189bda6190f28bbd6d427bc0d9b6e"
284+
},
285285
"ghcr.io/github/gh-aw-node": {
286286
"image": "ghcr.io/github/gh-aw-node",
287-
"digest": "sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b",
288-
"pinned_image": "ghcr.io/github/gh-aw-node@sha256:529d02eb970b1161aa25c593a9c3df57fdfad5a8add328cb3b6eccef66f3183b"
287+
"digest": "sha256:0daa8971fa4732b647150cb6524a6b0804b68d5d24f6f58b5dd1af23bd63fb23",
288+
"pinned_image": "ghcr.io/github/gh-aw-node@sha256:0daa8971fa4732b647150cb6524a6b0804b68d5d24f6f58b5dd1af23bd63fb23"
289289
},
290290
"ghcr.io/github/github-mcp-server:v1.11.0": {
291291
"image": "ghcr.io/github/github-mcp-server:v1.11.0",
@@ -294,8 +294,8 @@
294294
},
295295
"mcr.microsoft.com/playwright/mcp": {
296296
"image": "mcr.microsoft.com/playwright/mcp",
297-
"digest": "sha256:3d871c22ea2d4cca0966e2cfb1860e1cb03eb7353725a3d6cffd133296fb04eb",
298-
"pinned_image": "mcr.microsoft.com/playwright/mcp@sha256:3d871c22ea2d4cca0966e2cfb1860e1cb03eb7353725a3d6cffd133296fb04eb"
297+
"digest": "sha256:dda1f7f9b812e22946635c8af7df9288b96d3b9e3f0f1b8576d6823e2031c1de",
298+
"pinned_image": "mcr.microsoft.com/playwright/mcp@sha256:dda1f7f9b812e22946635c8af7df9288b96d3b9e3f0f1b8576d6823e2031c1de"
299299
}
300300
}
301301
}

.github/workflows/smoke-enclave-issues-read.lock.yml

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.github/workflows/smoke-enclave-issues-read.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ sandbox:
4343
id: awf
4444
version: v0.28.9
4545
mcp:
46-
version: v0.4.13
46+
version: v0.4.15
4747
strict: false
4848
concurrency:
4949
group: smoke-enclave-issues-read
@@ -124,18 +124,18 @@ Pass this exact finite-disclosure schema:
124124
Give the enclave agent this task:
125125

126126
```text
127-
Use only the narrow gh wrapper and run each command exactly once:
127+
Use only the `github` MCP server and call each tool exactly once:
128128
129-
1. gh api --method GET 'repos/github/gh-aw/issues?per_page=1'
130-
2. gh api --method GET 'repos/github/gh-aw/issues/50920'
131-
3. gh api --method GET 'repos/github/gh-aw/issues/50920/comments?per_page=1'
129+
1. `list_issues` with `owner: "github"`, `repo: "gh-aw"`, and `perPage: 1`
130+
2. `issue_read` with `owner: "github"`, `repo: "gh-aw"`, `method: "get"`, and `issue_number: 50920`
131+
3. `issue_read` with `owner: "github"`, `repo: "gh-aw"`, `method: "get_comments"`, `issue_number: 50920`, and `perPage: 1`
132132
133133
Return exactly:
134134
{"list_read":true,"issue_read":true,"comments_read":true}
135135
136-
Set a value to false if its command fails, the list or comments response is not
136+
Set a value to false if its tool call fails, the list or comments response is not
137137
a JSON array, or the issue response does not contain number 50920. Do not use
138-
stock gh issue commands, GraphQL, search, writes, or any other GitHub endpoint.
138+
GitHub CLI, GraphQL, search, writes, or any other GitHub tool.
139139
```
140140

141141
The test passes only when all three returned booleans are `true`.

containers/agent/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,16 @@ FROM golang:1.26.6-alpine@sha256:af8d6740070b8906d12eae1c3e3ea0957fb63f492051ea0
1212
ARG GH_VERSION=2.97.0
1313
ARG GH_SOURCE_SHA256=18cd1280f70911c9c16dd5965cdac0b9e6b16e54466f0c892ce2829ecdd339a6
1414
ARG GH_SOURCE_DATE_EPOCH=1785488640
15+
ARG GH_GRPC_VERSION=1.83.1
1516
RUN wget -q "https://github.com/cli/cli/archive/refs/tags/v${GH_VERSION}.tar.gz" -O /tmp/gh.tar.gz \
1617
&& echo "${GH_SOURCE_SHA256} /tmp/gh.tar.gz" | sha256sum -c - \
1718
&& tar -xzf /tmp/gh.tar.gz -C /tmp \
1819
&& cd "/tmp/cli-${GH_VERSION}" \
20+
&& go get "google.golang.org/grpc@v${GH_GRPC_VERSION}" \
1921
&& CGO_ENABLED=0 GH_VERSION="${GH_VERSION}" SOURCE_DATE_EPOCH="${GH_SOURCE_DATE_EPOCH}" \
2022
go run ./script/build.go bin/gh \
23+
&& go version -m bin/gh | awk -v version="v${GH_GRPC_VERSION}" \
24+
'$1 == "dep" && $2 == "google.golang.org/grpc" && $3 == version { found=1 } END { exit !found }' \
2125
&& /tmp/cli-${GH_VERSION}/bin/gh --version
2226

2327
FROM ${BASE_IMAGE} AS one-shot-token-build

0 commit comments

Comments
 (0)