Start merge conflict resolution

Co-authored-by: pelikhan <4175913+pelikhan@users.noreply.github.com>

Author: Copilot

.changeset/patch-bump-awf-v0-27-31.md

@@ -197,6 +197,11 @@
       "digest": "sha256:d0beee47dd38e2df577d15b9ddf763a2b771367326fecb02e1aa924bc395954a",
       "pinned_image": "ghcr.io/github/gh-aw-firewall/agent-act:0.27.30@sha256:d0beee47dd38e2df577d15b9ddf763a2b771367326fecb02e1aa924bc395954a"
     },
+    "ghcr.io/github/gh-aw-firewall/agent-act:0.27.31": {
+      "image": "ghcr.io/github/gh-aw-firewall/agent-act:0.27.31",
+      "digest": "sha256:58fee05c1c54ba5ca1e7056b3aaea30281841d5899093002e2c650710c50540f",
+      "pinned_image": "ghcr.io/github/gh-aw-firewall/agent-act:0.27.31@sha256:58fee05c1c54ba5ca1e7056b3aaea30281841d5899093002e2c650710c50540f"
+    },
     "ghcr.io/github/gh-aw-firewall/agent:0.25.18": {
       "image": "ghcr.io/github/gh-aw-firewall/agent:0.25.18",
       "digest": "sha256:c77e8c26bab6c39e8568d8e2f8c17015944849a8cbcdfb4bd9725d8893725ca2",
@@ -297,6 +302,11 @@
       "digest": "sha256:3cc1e14efa9e52ed1fc29d72a0eabf02ff86b30c6af9685fa9ddd687caca6613",
       "pinned_image": "ghcr.io/github/gh-aw-firewall/agent:0.27.30@sha256:3cc1e14efa9e52ed1fc29d72a0eabf02ff86b30c6af9685fa9ddd687caca6613"
     },
+    "ghcr.io/github/gh-aw-firewall/agent:0.27.31": {
+      "image": "ghcr.io/github/gh-aw-firewall/agent:0.27.31",
+      "digest": "sha256:84d861cb6da723ac10b7a00dddf778be681b8cd74b2091f18ce1d67fe4b3e7a1",
+      "pinned_image": "ghcr.io/github/gh-aw-firewall/agent:0.27.31@sha256:84d861cb6da723ac10b7a00dddf778be681b8cd74b2091f18ce1d67fe4b3e7a1"
+    },
     "ghcr.io/github/gh-aw-firewall/agent:0.27.4": {
       "image": "ghcr.io/github/gh-aw-firewall/agent:0.27.4",
       "digest": "sha256:b268ebf37df2428b19efcb383f001d65dc6a5ec10af43feb886d1a8477ab0e3a",
@@ -417,6 +427,11 @@
       "digest": "sha256:fdbd94bb668ed736a27c146633842db5c7e658dc7a0d6a0e6011e74e18132785",
       "pinned_image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.27.30@sha256:fdbd94bb668ed736a27c146633842db5c7e658dc7a0d6a0e6011e74e18132785"
     },
+    "ghcr.io/github/gh-aw-firewall/api-proxy:0.27.31": {
+      "image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.27.31",
+      "digest": "sha256:80d982fe7925c640d76cbbfbe94081d2d34f7657b7c37494d8d5488f5dae3c63",
+      "pinned_image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.27.31@sha256:80d982fe7925c640d76cbbfbe94081d2d34f7657b7c37494d8d5488f5dae3c63"
+    },
     "ghcr.io/github/gh-aw-firewall/api-proxy:0.27.4": {
       "image": "ghcr.io/github/gh-aw-firewall/api-proxy:0.27.4",
       "digest": "sha256:3ea0d12a2d124db8ed6e2d18aff040e30ab3568161f258a132fccdeede4198cd",
@@ -462,6 +477,11 @@
       "digest": "sha256:6ce8eb6ef9b959dd4bab4b005efba76f2dde0834a2716d18221965eb317ed2fa",
       "pinned_image": "ghcr.io/github/gh-aw-firewall/build-tools:0.27.30@sha256:6ce8eb6ef9b959dd4bab4b005efba76f2dde0834a2716d18221965eb317ed2fa"
     },
+    "ghcr.io/github/gh-aw-firewall/build-tools:0.27.31": {
+      "image": "ghcr.io/github/gh-aw-firewall/build-tools:0.27.31",
+      "digest": "sha256:b10c0c125cb63fc0f039503a4594b40391be7991985e6e19aee63d068a84d7ad",
+      "pinned_image": "ghcr.io/github/gh-aw-firewall/build-tools:0.27.31@sha256:b10c0c125cb63fc0f039503a4594b40391be7991985e6e19aee63d068a84d7ad"
+    },
     "ghcr.io/github/gh-aw-firewall/cli-proxy:0.25.28": {
       "image": "ghcr.io/github/gh-aw-firewall/cli-proxy:0.25.28",
       "digest": "sha256:fdf310e4678ce58d248c466b89399e9680a3003038fd19322c388559016aaac7",
@@ -547,6 +567,11 @@
       "digest": "sha256:959c876217038ac6f9c2047b591e819e5f1f726625a34490ccdcacaa71d83e4c",
       "pinned_image": "ghcr.io/github/gh-aw-firewall/cli-proxy:0.27.30@sha256:959c876217038ac6f9c2047b591e819e5f1f726625a34490ccdcacaa71d83e4c"
     },
+    "ghcr.io/github/gh-aw-firewall/cli-proxy:0.27.31": {
+      "image": "ghcr.io/github/gh-aw-firewall/cli-proxy:0.27.31",
+      "digest": "sha256:7c63bc4e57d6eac1be996bb793a5a2d74d40b15a616003f4b6805a457046c673",
+      "pinned_image": "ghcr.io/github/gh-aw-firewall/cli-proxy:0.27.31@sha256:7c63bc4e57d6eac1be996bb793a5a2d74d40b15a616003f4b6805a457046c673"
+    },
     "ghcr.io/github/gh-aw-firewall/cli-proxy:0.27.4": {
       "image": "ghcr.io/github/gh-aw-firewall/cli-proxy:0.27.4",
       "digest": "sha256:72c378c029d2fad4684847ab44c329e526ac6b1a78cdf97656870ea11d201545",
@@ -667,6 +692,11 @@
       "digest": "sha256:eb74fca5309c7542df0f32aef41b92c728ecef7ac3b0cca9f9a6b97cc324d22a",
       "pinned_image": "ghcr.io/github/gh-aw-firewall/squid:0.27.30@sha256:eb74fca5309c7542df0f32aef41b92c728ecef7ac3b0cca9f9a6b97cc324d22a"
     },
+    "ghcr.io/github/gh-aw-firewall/squid:0.27.31": {
+      "image": "ghcr.io/github/gh-aw-firewall/squid:0.27.31",
+      "digest": "sha256:c05a3f086946fab0833e078f46d35571080f187ca72f038958d45aa5cc150494",
+      "pinned_image": "ghcr.io/github/gh-aw-firewall/squid:0.27.31@sha256:c05a3f086946fab0833e078f46d35571080f187ca72f038958d45aa5cc150494"
+    },
     "ghcr.io/github/gh-aw-firewall/squid:0.27.4": {
       "image": "ghcr.io/github/gh-aw-firewall/squid:0.27.4",
       "digest": "sha256:87979038897e40caed22245b64d1daa796390d2dca289b99d3d1174c85740af8",

.github/aw/actions-lock.json

@@ -159,6 +159,8 @@ When the GitHub tool is configured, gh-aw injects a separate `<github-context>`
 | Tool | Purpose | Key Parameters |
 |------|---------|----------------|
 | `add_issue_comment` | Add a comment to an issue | `owner`, `repo`, `issue_number`, `body` |
+| `issue_dependency_read` | Read an issue's dependency relationships | `owner`, `repo`, `issue_number` |
+| `issue_dependency_write` | Add or remove issue dependencies | `owner`, `repo`, `issue_number` |
 | `issue_read` | Read issue details and comments | `owner`, `repo`, `issue_number` |
 | `issue_write` | Create or update an issue | `owner`, `repo`, `title`, `body`, `labels`, `assignees` |
 | `list_issue_types` | List available issue types for a repository | `owner`, `repo` |

.github/aw/github-mcp-server.md

@@ -344,6 +344,7 @@ description: Agentic workflow specific frontmatter fields for GitHub Agentic Wor
     ```
 
   - **`sandbox.agent.sudo`** (boolean) controls whether AWF runs in root mode. Default is `false`: AWF runs rootless in network-isolation egress mode (`--network-isolation`), with MCP sidecars attached as bridge containers on the internal `awf-net` network. Set `sudo: true` for the legacy root mode; in strict mode explicit `sudo: true` is an error (warning otherwise).
+  - **`sandbox.agent.runtime`** (string) selects an extra-isolation container runtime for the agent: `gvisor` (runs under gVisor's `runsc` for kernel-level isolation) or `docker-sbx` (Docker sbx microVM with KVM hypervisor-level isolation; needs `DOCKER_PAT`/`DOCKER_USERNAME` secrets and a KVM-capable runner). Both require `sudo: true` and are incompatible with `runner.topology: arc-dind`.
   - **Strict mode**: `sandbox.agent` blocks without an explicit `id: awf` are rejected in strict mode. Any non-nil, non-disabled agent config without `id`/`type` defaults to AWF at runtime.
 
 - **`tools:`** - Tool configuration for the coding agent (`github`, `agentic-workflows`, `edit`, `web-fetch`, `web-search`, `bash`, `playwright`, custom MCP server names, plus `timeout`/`startup-timeout`/`cli-proxy`). See [syntax-tools-imports.md](syntax-tools-imports.md#tool-configuration) for the full schema (GitHub `mode`/`toolsets`/integrity fields, bash allowlist decision rule, Playwright CLI mode).

.github/aw/syntax-agentic.md

@@ -85,6 +85,7 @@ The `tools:` field configures which tools the coding agent may use.
 - `blocked-users:` - Usernames whose content is unconditionally blocked (array or GitHub Actions expression); these users receive integrity below `none` and are always denied
 - `approval-labels:` - Label names that elevate a content item's integrity to `approved` when present (array or GitHub Actions expression); does not override `blocked-users`
 - `trusted-users:` - Usernames elevated to `approved` integrity regardless of `author_association` (array or GitHub Actions expression); takes precedence over `min-integrity` but not over `blocked-users`; requires `min-integrity` to be set
+- `private-to-public-flows:` - Opt out of MCP Gateway cross-visibility protections (which block private-repo data from reaching public sinks). `allow` disables `forcePublicRepos` and sink-visibility enforcement for all servers (**not compatible with strict mode**); an array of MCP server IDs (e.g. `[github, my-server]`) exempts only those servers from sink-visibility enforcement (strict-mode compatible, keeps `forcePublicRepos`). Security-sensitive — only use when private→public flows are intended.
 - `toolsets:` - Enable specific GitHub toolset groups (array only)
   - **Default toolsets** (when unspecified): `context`, `repos`, `issues`, `pull_requests` (excludes `users` as GitHub Actions tokens don't support user operations)
   - **Group aliases**: `default` (recommended action-friendly set), `action-friendly` (action-safe toolsets, excludes `users`), `all` (everything)