From 83e8524137b2d1f8873c2146616585eaf02f59c8 Mon Sep 17 00:00:00 2001 From: thatguywob Date: Wed, 28 Oct 2026 23:12:31 +0000 Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=8C=B1=20chore:=20remove=20unreachabl?= =?UTF-8?q?e=20MITM=20cancellation=20guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Requests parsed by http.ReadRequest have no cancellation context attached in the MITM path, so this guard cannot fire. Retain caller-cancellation handling in the HTTP translator handler. Hive-Run: hivecommons/hive#15089 Hive-Plan: MITM cancellation dead-code cleanup Hive-Spec: hivecommons/hive#15089#unreachable-mitm-guard Signed-off-by: thatguywob --- src/crux/proxy/github_proxy_inference.go | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/crux/proxy/github_proxy_inference.go b/src/crux/proxy/github_proxy_inference.go index 1d09f7db6c..be2b6e0fe2 100644 --- a/src/crux/proxy/github_proxy_inference.go +++ b/src/crux/proxy/github_proxy_inference.go @@ -684,10 +684,6 @@ func (p *GitHubProxy) handleInferenceRequest(conn net.Conn, req *http.Request, a } resp, err := client.Do(upstreamReq) if err != nil { - if errors.Is(err, context.Canceled) && errors.Is(req.Context().Err(), context.Canceled) { - p.logger.Debug("inference request canceled", "agent", agentName) - return - } p.logger.Error("inference upstream failed", "agent", agentName, "url", upstreamURL, "error", err) if p.gatewayHealth != nil { p.gatewayHealth.RecordEndpointError(route.Backend, route.Endpoint, err, time.Now()) From cf59def6a30c997f1a774e569de771f53d7011fe Mon Sep 17 00:00:00 2001 From: thatguywob Date: Wed, 28 Oct 2026 23:25:15 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=8C=B1=20chore:=20add=20changelog=20f?= =?UTF-8?q?ragment=20for=20MITM=20cleanup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Record the MITM dead-code cleanup so changelog-fragment-guard passes without requiring label permissions. Hive-Run: hivecommons/hive#15089 Hive-Plan: MITM cancellation dead-code cleanup Hive-Spec: hivecommons/hive#15089#unreachable-mitm-guard Signed-off-by: thatguywob --- changelog.d/changed-15159-mitm-cancellation-guard.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog.d/changed-15159-mitm-cancellation-guard.md diff --git a/changelog.d/changed-15159-mitm-cancellation-guard.md b/changelog.d/changed-15159-mitm-cancellation-guard.md new file mode 100644 index 0000000000..8936a29b95 --- /dev/null +++ b/changelog.d/changed-15159-mitm-cancellation-guard.md @@ -0,0 +1 @@ +- Remove an unreachable cancellation check from the MITM inference proxy; runtime behavior is unchanged, and the HTTP translator retains its caller-cancellation handling ([#15159](https://github.com/hivecommons/hive/pull/15159)). From b86b662b8754d080b8e0dc6febd7e340984cb1f8 Mon Sep 17 00:00:00 2001 From: thatguywob Date: Wed, 28 Oct 2026 23:37:57 +0000 Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=8C=B1=20ci:=20allow=20full=20image?= =?UTF-8?q?=20build=20time=20for=20overlayfs=20guard?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The guard exhausted its ten-minute job budget while the optional Bob CLI download was retrying, before reaching its containerd assertions. Match the existing docker job budget because both build the full src/Dockerfile image. Hive-Run: hivecommons/hive#15089 Hive-Plan: MITM cancellation dead-code cleanup Hive-Spec: hivecommons/hive#15089#unreachable-mitm-guard Signed-off-by: thatguywob --- .github/workflows/v2-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/v2-ci.yml b/.github/workflows/v2-ci.yml index 458052a823..d15e78cbad 100644 --- a/.github/workflows/v2-ci.yml +++ b/.github/workflows/v2-ci.yml @@ -1375,7 +1375,9 @@ jobs: needs: required-context-scope if: ${{ always() && (needs.required-context-scope.result != 'success' || needs.required-context-scope.outputs.run-ci == 'true') }} runs-on: ubuntu-latest - timeout-minutes: 10 + # Match the docker job: this builds the same full image, whose optional + # CLI downloads can spend 10 minutes retrying before the OCI exec check. + timeout-minutes: 45 # No `needs: build-and-test` — see the note above the `docker` job. steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 From 8438229dd6ec82000a63f1aae8c5fada2805b7fa Mon Sep 17 00:00:00 2001 From: thatguywob Date: Thu, 29 Oct 2026 05:15:50 +0000 Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=8C=B1=20chore:=20keep=20MITM=20clean?= =?UTF-8?q?up=20scoped=20to=20proxy=20dead=20code?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Drop the unrelated overlayfs CI timeout increase as requested by maintainers. Retain only the unreachable MITM cancellation guard removal and its changelog fragment in the PR diff. Hive-Run: hivecommons/hive#15089 Hive-Plan: MITM cancellation dead-code cleanup Hive-Spec: hivecommons/hive#15089#unreachable-mitm-guard Signed-off-by: thatguywob --- .github/workflows/v2-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/v2-ci.yml b/.github/workflows/v2-ci.yml index d15e78cbad..458052a823 100644 --- a/.github/workflows/v2-ci.yml +++ b/.github/workflows/v2-ci.yml @@ -1375,9 +1375,7 @@ jobs: needs: required-context-scope if: ${{ always() && (needs.required-context-scope.result != 'success' || needs.required-context-scope.outputs.run-ci == 'true') }} runs-on: ubuntu-latest - # Match the docker job: this builds the same full image, whose optional - # CLI downloads can spend 10 minutes retrying before the OCI exec check. - timeout-minutes: 45 + timeout-minutes: 10 # No `needs: build-and-test` — see the note above the `docker` job. steps: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1