Skip to content

Sync main 7bba93ae into the feature branch - #502

Merged
SaladDay merged 8 commits into
feature/agent-outside-sandboxfrom
aos/main-sync-3
Oct 7, 2026
Merged

SaladDay merged 8 commits into
feature/agent-outside-sandboxfrom
aos/main-sync-3

Conversation

@SaladDay

@SaladDay SaladDay commented Oct 7, 2026 •

Copy link
Copy Markdown
Collaborator

Merges main 7bba93a into feature/agent-outside-sandbox. It brings in #490, #495, #497, #498 (the adapter Prepared path is deleted) and #499 (the mcode opt-in and dead helpers are deleted). The wire version is proto.Version 0.13.0.

Conflicts were resolved toward main's deletions, and the feature branch's assignment and Link work is kept.

Local checks:

  • gofmt is clean.
  • go vet passes for the root, daemon and Core modules.
  • Darwin and windows daemon builds pass.
  • make check-names check-docs check-ci check-openapi check-harness-catalog pass.
  • Focused tests pass: proto, sandboxlink, daemon agent/dispatch/cli/agenthost/wireconformance/localworkspace, and Core runtimegateway/execution/api.
  • Core integration passed before the Delete the mcode opt-in and dead helpers #499 merge; it is re-running on this head.

View with [code]smith Autofix with [code]smith
Need help on this PR? Tag @codesmith-bot with what you need. Autofix is disabled.

* refactor(api): generate public contracts from pinned official OpenAPI

* test(api): validate OpenAPI 3.1 responses and preserve package rejection

* chore(api): remove unused Swagger parser dependency

* fix(api): derive web search union serialization from the official schema

* fix(api): preserve stored search items during public schema migration
* Delete the adapter Prepared path

Every Run starts through Executor.StartTurn, and read-only preparations
are served from the bound local workspace, so the adapter Prepared
surface and its registered preparation factories have no production
caller. Port the deletion from the agent-outside-sandbox branch with the
same shape: delete agent.Prepared, PreparedCancellation,
PreparationFactory, Runtime.Preparation, RegisterPreparation and
ResolvePreparation, the Codex, Claude SDK and MiniMax Code preparation
factories, and the Claude session's unused drain. Adapters declare
WorkspaceReadPreparation beside LocalEnvironment and dispatch readies the
local preparation directly. Delete the unenforced Runtime initialization
network field and bump the protocol version.

Delete the Codex one-shot start path (Prepared.start and Session.run),
which only tests reached, and port its behaviour tests to
Executor.StartTurn. Adapters no longer write the Preparation capability
that registration derives.

The local read-only preparation holds no resource, so delete its
always-nil Close, the preparationState.prepared closer, the read-only
cleanup_unconfirmed retry path and the handoff branches that
executor-less preparations never reach.

* Settle read-only preparation release synchronously

The read-only preparation holds no resource, so its release only drops
ownership. Drop it in the same state change instead of a cleanup
goroutine behind the busy flag, and delete closePreparationResource and
the shutdown close loop. A preparation that is still publishing its
readiness keeps ownership until that returns, as before.
# Conflicts:
#	Makefile
#	apps/daemon/internal/agent/claudesdk/declaration.go
#	apps/daemon/internal/agent/claudesdk/preparation_test.go
#	apps/daemon/internal/agent/codex/declaration.go
#	apps/daemon/internal/agent/codex/declaration_test.go
#	apps/daemon/internal/agent/codex/mcp_http_preflight_test.go
#	apps/daemon/internal/agent/codex/mcp_required_test.go
#	apps/daemon/internal/agent/codex/prepared.go
#	apps/daemon/internal/agent/codex/prepared_test.go
#	apps/daemon/internal/agent/codex/recovery_test.go
#	apps/daemon/internal/agent/configuration_test.go
#	apps/daemon/internal/agent/harness.go
#	apps/daemon/internal/agent/mcode/declaration.go
#	apps/daemon/internal/agent/registry.go
#	apps/daemon/internal/dispatch/local_directory.go
#	apps/daemon/internal/dispatch/preparation.go
#	apps/daemon/internal/dispatch/workspace_preparation_status_test.go
#	contracts/agents-api/harness-onboarding.md
#	contracts/agents-api/zh/harness-onboarding.md
#	contracts/agents-api/zh/index.md
#	docs/runtime-protocol.md
#	docs/zh/development.md
#	docs/zh/maintainers.md
#	docs/zh/runtime-protocol.md
# Conflicts:
#	apps/daemon/internal/agent/codex/executor_native_test.go
#	services/core/internal/runtimegateway/session.go
@SaladDay
SaladDay merged commit d87edbf into feature/agent-outside-sandbox Oct 7, 2026
@SaladDay
SaladDay deleted the aos/main-sync-3 branch October 7, 2026 14:59
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.

1 participant