Skip to content

sync upstream 07-22 refactor + substrate bump to 76bac5d0 (squashed patch) - #12

Merged
feifeigood merged 27 commits into
agentfleet/mainfrom
agentfleet/sync-upstream-20260726
Jul 26, 2026
Merged

sync upstream 07-22 refactor + substrate bump to 76bac5d0 (squashed patch)#12
feifeigood merged 27 commits into
agentfleet/mainfrom
agentfleet/sync-upstream-20260726

Conversation

@feifeigood

@feifeigood feifeigood commented Jul 26, 2026

Copy link
Copy Markdown
Owner

Reworks #11 per new fork policy: follow all upstream first, then stack our patches.

Structure (3 commits)

  1. Merge google/ax main (cbd2c56, the 07-22 24-commit refactor storm — upstream has been quiet since). Conflict resolution keeps upstream's renames and our patches:
  2. Squashed substrate bump patch (29f029f): pin 3cb7433b76bac5d0 (imagecache Phase 1 + fixes through upstream substrate #510) + name-based actor API adaptation in 3 files.
  3. Pin advance to upstream tip (1234e31): 76bac5d0aa1d14a7 (per maintainer instruction) — absorbs the 07-24 batch (Rename ControllerService to ExecutionService google/ax#237 mTLS strict verify, #405 external volumes, #496/#491/#516/#523/#532, microvm durable-dir). Zero code adaptation. Rename ControllerService to ExecutionService google/ax#237's cert-rotation exposure (upstream #531 open) stays masked by the 12h ate-cert-restart CronJob.

Squash the two deps commits at merge (or treat 29f029f..1234e31 as one unit when cherry-picking) to keep the single-patch maintenance model: future upstream follows = merge upstream → cherry-pick the patch.

Verification

go build ./... + go vet ./... + go test -race ./... at each step — 13 packages ok, 0 failures.

⚠️ Wire impact on af (adaptation in progress)

  • seqstep breaks af's turn stream + last-seq resume (2 non-test files) and renames ax's conversation_log.seq DB column; existing protojson payloads carry "seq" keys that the new stub silently drops (DiscardUnknown) → cutover needs a one-shot SQL migration (column rename + payload key rewrite) with ax+af scaled to 0.
  • ax.yaml top-level key harnesses:registry: (old key silently ignored → empty registry).
  • af adaptation PR (code + manifests + migration runbook) is being prepared; af and ax must ship in the same batch.

Supersedes #11.

🤖 Generated with Claude Code

https://claude.ai/code/session_017TK34TZokEcfPq5JdbUVWo

rakyll and others added 26 commits July 22, 2026 08:43
Squashed agentfleet patch (imagecache Phase 1 + post-Phase-1 fixes
through #510). Kept as a single commit on top of upstream sync merges
so future upstream follows can cherry-pick it cleanly.

- go.mod: substrate v0.0.0-20260706222328-3cb7433bd8a8
  -> v0.0.0-20260724043042-76bac5d05142
- internal/ate/client.go, internal/harness/substrate/substrate.go,
  internal/harness/harnesstest/harnesstest.go: ActorRef/ActorId ->
  name-based addressing per upstream wire change

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017TK34TZokEcfPq5JdbUVWo
Absorbs the 07-24 batch: google#237 inter-component mTLS strict verify,
#405 per-actor external volumes, #496 ateom de-privileged, #491
router health concurrency, #516 kubectl ate top workers, #523
ateapi graceful shutdown, #532 volume validation, and the three
ateom-microvm durable-dir commits. No client-API changes; zero
code adaptation. Cert-rotation risk from google#237 (upstream #531 still
open) stays masked by the 12h ate-cert-restart CronJob.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_017TK34TZokEcfPq5JdbUVWo
@feifeigood
feifeigood marked this pull request as ready for review July 26, 2026 01:59
@feifeigood
feifeigood merged commit 97c6151 into agentfleet/main Jul 26, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants