feat(bundle): Strategy 1 — vendored opinionated manifest (resolves baked-in bundle revisit)#4
Merged
Merged
Conversation
… opinionated manifest) Supersedes docs/designs/2026-05-19-baked-in-bundle-revisit.md. Captures the validated decision from the systems-design pass: - D1 vendoring scope: manifest text + 4 build-up agent files only - D2 cache key: aaa_version + sha256(bundle.md) - D3 first-run cost: accept 5–30 s cliff, document honestly - D4 sealed: manifest text only; modules track @main upstream - D5 transcript: out of scope (future hook concern) - D6 vs app-cli: diverge by design; no includes, no registry - D7 post-install: keep opt-in console script Also renames four aspirational claims in the design checkpoint to match shipped reality (vendored opinionated manifest, sealed manifest text, near-instant on warm cache, near-instant after first invocation). Next step is /write-plan against this doc.
…gy 1)
Three-phase TDD plan that operationalizes
docs/designs/2026-05-19-baked-in-bundle-decision.md:
Phase 1 (12 tasks): cache-key change (sha256 of bundle.md added to the
cache key) lands FIRST per the design doc's sequencing constraint,
so any developer iterating on bundle.md from commit 5 onward gets
correct content-hash invalidation. Then vendors explorer/planner/
coder/tester markdown from amplifier-foundation@main as wheel-local
files, and exposes AGENTS_DIR from bundle/__init__.py.
Phase 2 (11 tasks): manifest rewrite — drops the `includes:` block,
declares orchestrator/context/providers/tool modules/hook modules
and the four vendored agents explicitly. Extends pyproject.toml
force-include so the new markdown ships inside the wheel.
Phase 3 (8 tasks): four "honest renames" land in
design-checkpoint.md and CHEATSHEET.md (vendored bundle →
vendored opinionated manifest, sealed → sealed manifest text,
strips cold-start → near-instant on warm cache, near-instant
once stripped → near-instant after first invocation). Capstone
task exercises every §10 success metric — pytest, ruff, pyright,
cache clear, the literal cheatsheet test
`amplifier-agent run "Reply with exactly one word: pong"` (must
return a real reply, must not emit "No handler for URI"), the
D2 manifest-edit-invalidates-cache proof, and wheel-contents
verification.
Out-of-scope guardrails (per design doc §11): no tasks touch Mode A/B
split, wire protocol, Engine.boot/submit_turn/shutdown shape, provider
injection (commit e67bdd9), the stdio-coprocess framing, or transcript
persistence.
Total: 31 bite-sized tasks (2-5 min each) — exact paths, copy-pasteable
code, exact commands, expected outputs.
Manifest edits now self-invalidate the warm pickle. Resolves D2 from docs/designs/2026-05-19-baked-in-bundle-decision.md and lands before Phase 2's manifest rewrite so developers iterating on bundle.md get correct invalidation behavior immediately.
…main Source: experiments/build-up/agents/explorer.md from microsoft/amplifier-foundation@main. Per D1 of docs/designs/2026-05-19-baked-in-bundle-decision.md — agent definitions are vendored as wheel-local markdown so the bundle can resolve them without includes:/registry.
…ents inline Strategy 1 of docs/designs/2026-05-19-baked-in-bundle-decision.md. The manifest now declares orchestrator + context + provider + tools + the four vendored agents explicitly. No more includes: build-up-foundation, no dependency on amplifier-app-cli's bundle registry, no 'No handler for URI' warning.
… markdown files Add explicit per-file hatchling force-include entries for the four agent definition files that live under src/amplifier_agent_lib/bundle/agents/. Per-file entries (rather than globs) make wheel contents auditable from the pyproject.toml manifest alone. Passes test_built_wheel_contains_all_four_vendored_agents.
…eys/items Bundle.agents is dict[str, dict[str, Any]]; iterating over a dict yields string keys, not objects with .name/.source_path attributes. - test_vendored_bundle_declares_all_four_agents: replace dict comprehension over .name with set(bundle.agents) — dict keys ARE the agent names - test_vendored_agents_resolve_to_wheel_local_files: replace with to get both name and def dict pyright: 0 errors, 0 warnings (was 4 errors) ruff: All checks passed (unchanged)
…rce_path
Two-part fix to make test_vendored_bundle_declares_all_four_agents pass:
1. bundle.md: replace empty with . Foundation's _parse_agents() recognises the
include-list format and populates the agents dict with {name: name} entries.
2. loader.py: after load_bundle(), iterate over bundle.agents and call
bundle.resolve_agent_path() for each name. The resolved absolute Path
(base_path/agents/<name>.md) is stored as source_path in the agent's
definition dict so that test_vendored_agents_resolve_to_wheel_local_files
can assert the file exists under AGENTS_DIR.
All 267 tests pass.
- Add assertion in clear_cache() that the derived root has name 'prepared', making the implicit cache_dir_for_version() layout contract explicit and surfacing breakage immediately if the two-level path structure ever changes. - Rename test_bundle_md_declares_name_and_includes_foundation → test_bundle_md_declares_name_and_references_modules and update its assertion to check for 'github.com/microsoft/amplifier-module-' instead of the 'amplifier-foundation' include relationship that no longer exists in bundle.md after Phase 2 removed the includes: block. All 267 tests pass. ruff and pyright clean. Co-authored-by: Amplifier <amplifier@microsoft.com>
…ted manifest' Per §4.2 of docs/designs/2026-05-19-baked-in-bundle-decision.md — only the manifest text and four agent files are vendored. Modules live in their own repos. First-run cost is 5–30 s, not 'strips cold-start'.
…cache' Per §4.2 of docs/designs/2026-05-19-baked-in-bundle-decision.md — first invocation pays a 5–30 s cliff for manifest resolve + module installs. The 'near-instant' claim is honored on warm cache only.
Per §4.2 of docs/designs/2026-05-19-baked-in-bundle-decision.md — the YAML text inside the wheel is immutable per release. The @main refs it points to are not sealed. Strategy 1 ships an opinionated manifest, not sealed modules. Brian's direct quote at line 107 is preserved verbatim.
… opinionated manifest' Final honest-rename pass per §4.2 of docs/designs/2026-05-19-baked-in-bundle-decision.md. Only verbatim quotations remain unchanged; editorial uses now consistently say 'vendored opinionated manifest' to match shipped reality (manifest + agent files in wheel; modules at @main resolved at runtime).
Per §4.2 of docs/designs/2026-05-19-baked-in-bundle-decision.md — readers of the cheatsheet must not be misled into expecting sub-second cold-start. The warm cache delivers sub-second; the first run pays a documented cliff.
…ics PASS Empirical verification log for the baked-in-bundle Strategy 1 implementation. All success metrics from §10 of this design doc verified against the working implementation on feat/baked-in-bundle-revisit. The 'No handler for URI' warning is gone, manifest edits self-invalidate, and the four vendored agents ship in the wheel.
…n (MVP — mirrors app-cli pattern, no recursion / no cost bridging)
…wn on coordinator
Brings src/amplifier_agent_lib/bundle/bundle.md to functional parity with
the upstream experimental bundle at
amplifier-foundation@main:experiments/build-up/behaviors/build-up-foundation.yaml
(v0.4.0)
while honoring Strategy 1 (decision doc 2026-05-19) — no `includes:` block,
no foundation registry dependency. Behavior includes are inlined as direct
hook declarations.
Changes vs the previous v1.0.0 manifest:
* session.orchestrator.config: { extended_thinking: true } added
* session.context.config.max_tokens: 200000 → 300000
* session.raw: true added (matches upstream's session config)
* tools.tool-delegate gains the full features+settings config block from
upstream:
- features.self_delegation.enabled: false (parent cannot delegate to
itself — has no real tools at parent level, would just thrash)
- features.session_resume.enabled: true
- features.context_inheritance: { enabled: true, max_turns: 10 }
- features.provider_selection.enabled: true
- settings.exclude_tools: [tool-delegate] (children don't inherit
parent's delegate; they declare their own in frontmatter)
* hooks: [] → 5 inlined hooks (matching upstream's hooks block + 3 of the
4 behavior includes):
- hooks-status-context (env + datetime injection into LLM context)
- hooks-redaction (PII/secret redaction in logs)
- hooks-logging (events.jsonl to ~/.amplifier/projects/...)
- hooks-todo-reminder (gentle nudge to use the todo tool)
- hooks-session-naming (auto-name sessions at turn 2)
Deliberate divergences from literal upstream parity:
* session.provider kept declared in bundle.md (upstream has no provider
block — relies on app-layer injection only). We keep the declaration so
the cold-prepare step installs the anthropic-provider module BEFORE
_runtime.make_turn_handler's env-var injection (Option C / commit
e67bdd9) runs. Without the declaration, the runtime injection would
reference a module that isn't installed.
* hooks-streaming-ui dropped. Upstream uses it for a TUI host that
consumes thinking/tool/token-usage chunks to stdout. amplifier-agent's
CLI contract is "JSON envelope on stdout, diagnostics on stderr" —
streaming-ui writes ANSI-colored chunks to stdout and broke the
delegation e2e test (`stdout is not valid JSON: ...\x1b[90m...`). This
is an architectural mismatch, not a config issue.
* hooks-todo-display dropped for the same reason — it emits a progress
bar / border to stdout (show_progress_bar / show_border config flags).
* context.include block from upstream NOT used. Upstream loads
delegation-mechanics.md via a `build-up:` namespace alias that requires
registry population (Strategy 1 explicitly avoids the registry). The
delegation-mechanics content is instead inlined into the markdown body
of bundle.md so it lands in the parent's context the same way upstream
intends, just without the indirection.
Verification (fresh in this session, after cache clear):
$ shasum -a 256 src/amplifier_agent_lib/bundle/bundle.md
118495c6...0087c128 (new cache key derives from this)
$ uv run amplifier-agent cache clear
exit 0 (removed cache at ~/.cache/amplifier-agent/prepared)
$ uv run pytest -q
295 passed in 24.74s
$ uv run ruff check
All checks passed!
$ uv run pyright
0 errors, 0 warnings, 0 informations
The delegation e2e test (tests/cli/test_delegation_e2e.py — the
"PONG via explorer" smoke test that exercises real delegation through
the new manifest) is green. The bundle prepares cleanly with the 5 new
hook modules + 2 tools + provider + orchestrator + context + 4 agents
on the cold path.
Cold-start cost grows from ~5 modules to ~12 modules on a fresh machine;
expect 30-60s first-run instead of 5-30s. Warm-cache subsequent runs
unchanged (sub-second).
Assert that after load_and_prepare_bundle() returns, the explorer agent's
mount_plan entry contains a non-empty tools list with tool-bash declared.
This test fails today because bundle.load_agent_metadata() is never called
in the cold-prepare path — _parse_agents() only produces bare-bones
{"name": "explorer"} stubs, leaving all agent frontmatter invisible to
Bundle.prepare().
Mirrors the gap fixed in upstream
amplifier_app_cli/lib/bundle_loader/prepare.py:190.
added 2 commits
May 19, 2026 23:55
Insert bundle.load_agent_metadata() between load_bundle() and the
source_path enrichment loop in load_and_prepare_bundle().
Without this call, _parse_agents() only produces bare-bones
{"name": "explorer"} stubs; the tools/providers/hooks declared in each
agent's .md frontmatter are invisible to Bundle.prepare(). Child sessions
then inherit a resolver that has never installed tool-bash, tool-filesystem,
tool-search, etc., and silently fail to mount any tool the parent didn't
also declare. User-visible symptom: "explorer says it doesn't have bash."
load_agent_metadata() reads each agent's .md file (via resolve_agent_path(),
which uses bundle.base_path set by load_bundle()) and merges the full
frontmatter into bundle.agents[name] in-place. Bundle.prepare() then walks
mount_plan["agents"] and pre-activates every listed module, so the
BundleModuleResolver child sessions inherit already contains tool-bash etc.
The method is synchronous and swallows per-agent parse errors as
logger.warning(); the try/except at the call site re-raises any unexpected
top-level failure with a clear diagnostic message.
Mirrors the upstream fix in
amplifier_app_cli/lib/bundle_loader/prepare.py:190 (build-up-foundation
v0.3.0 release note).
Add a second @pytest.mark.integration test alongside the PONG test.
The new test asks the parent to delegate to explorer and have it run
'echo HELLOFROMBASH' in a bash shell, then assert the reply contains
'HELLOFROMBASH'.
This is the capstone test for the agent-tools install gap fix: the
parent does NOT have tool-bash (only tool-todo + tool-delegate), so
a successful bash execution proves:
1. tool-bash was installed at cold-prepare time via load_agent_metadata()
2. The BundleModuleResolver inherited by the child session contains
the tool-bash module path
3. The bash tool mounts cleanly in the child AmplifierSession
The test is skipped (not failed) when ANTHROPIC_API_KEY is absent, so
the suite stays runnable offline. Requires an API key for a live pass.
manojp99
pushed a commit
that referenced
this pull request
Jun 3, 2026
…ay.onEvent (#2, #4, #6) The engine emits one JSON object per line on the child subprocess's stderr stream for each wire-protocol notification (progress, result/delta, result/final, thinking/delta, thinking/final, tool/started, tool/completed, approval/request, approval/timeout, plus wire-level error). Before this change the wrapper buffered stderr as raw text and silently dropped every event — the existing Transport class implemented NDJSON parsing but was never wired anywhere (dead code). This change: - Adds parseNdjsonStream(stream, {onJson, onNonJson?}) — a standalone helper extracted from the parsing logic Transport already had. Resolves when the stream emits 'close'. Exported @public. - Wires parseNdjsonStream onto child.stderr inside SessionHandle.makeIterable(). JSON lines are parsed into 'notification' DisplayEvents and dispatched to params.display?.onEvent. Non-JSON lines (and JSON lines, for completeness) are still accumulated into stderrBuf so the stderrTail surface on parseRunOutput remains diagnostically useful. - Extends the DisplayEvent discriminated union with a new {type: 'notification', method: string, params: unknown} variant. **BREAKING**: existing exhaustive switch statements on event.type will no longer be exhaustive without a notification branch. - Threads SpawnAgentParams.display through to SessionHandle so the callback that was previously silently dropped is now actually fired (Issue #4). Closes #2, #4, #6. BREAKING CHANGE: display.onEvent callbacks are now actually invoked with wire-event notifications. Callers that registered onEvent expecting it to be a no-op may observe new event flow. The DisplayEvent union has a new 'notification' variant; exhaustive switch statements need a corresponding branch.
manojp99
pushed a commit
that referenced
this pull request
Jun 3, 2026
Wrapper hardening release closing 8 consumer-reported gaps at 0.5.0: #1 configPath surface #2 stderr NDJSON parsing #3 runChildProcess injection #4 display.onEvent dispatch #5 public re-exports #6 Transport dead code (root cause of #2/#4) #7 getEngineInfo() implementation #9 checkProtocolVersion() wired into init path #10 approval API mapped to engine -y/-n + approval.mode Issue #8 in the consumer report was a misread — InitializeParams. mcpConfigPath is intentionally retained in protocol-0.3.0. No type change needed; the schema is canonical and correct. This is a minor bump per 0.x convention even though some changes are BREAKING — the wrapper hasn't shipped a 1.0 yet, so breaking changes ride minor bumps. See CHANGELOG for the BREAKING list. Engine compatibility: requires amplifier-agent >= 0.4.0. Pinned protocol: 0.3.0.
manojp99
added a commit
that referenced
this pull request
Jun 3, 2026
…, approval, getEngineInfo, +5 more) (#36) * feat(wrapper-ts): re-export internal helpers from index.ts (#5) Adds named re-exports from the package entry point so consumers can import internal helpers without reaching into private deep paths: assembleArgv, AssembleArgvInput resolveMcpConfigPath, cleanupSpillFile, McpSpillResult buildEnv, resolveBinaryPath, probeEngineVersion, DEFAULT_ALLOWLIST, BLOCKED_ENV_KEYS, ResolveBinaryPathOptions, BuildEnvOptions Transport, TransportOptions, ExitInfo checkProtocolVersion, VersionCheckResult, VersionCheckOk, VersionCheckFail, CheckProtocolVersionOptions parseRunOutput, STDERR_TAIL_BYTES, SubprocessOutcome makeApprovalHandler, ApprovalAdapter, ApprovalRequest, ApprovalHandler Each export is annotated @public. Closes #5. * feat(wrapper-ts): wire checkProtocolVersion() into init path (#9) spawnAgent() now probes the engine's protocol version once during initialization (via amplifier-agent version --json) and runs checkProtocolVersion() against PROTOCOL_VERSION_REQUIRED_BY_WRAPPER BEFORE constructing a SessionHandle. Mismatch fails fast wrapper-side with AaaError(protocol_version_mismatch), saving a full subprocess roundtrip later. Adds two new SpawnAgentParams fields: - allowProtocolSkew?: boolean — bypass the check (mirrors engine's host_config.allowProtocolSkew) - _engineVersionProbe?: () => Promise<EngineVersionPayload> — test-only injection point for the probe Also bumps PROTOCOL_VERSION_REQUIRED_BY_WRAPPER from "0.2.0" to "0.3.0" to match the engine's current wire protocol (amplifier_agent_lib.protocol.methods.PROTOCOL_VERSION). The wrapper was shipping with a stale pin; the new check would have surfaced this at startup. Closes #9. * feat(wrapper-ts): add runChildProcess injection point (#3) Adds SpawnAgentParams.runChildProcess?: ChildProcessFactory — a public seam to substitute the subprocess factory used inside SessionHandle. When set, the wrapper invokes the factory in place of child_process.spawn, preserving the same options shape (detached, stdio, env, optional cwd). Useful for: - Sandboxing (e.g. wrapping the child in a container or namespace) - Test doubles (e.g. EventEmitter fakes that drive scripted outputs) - Harness wrapping (e.g. observing the subprocess from outside) ChildProcessFactory is exported as a @public type from index.ts. Closes #3. * feat(wrapper-ts)!: wire Transport NDJSON pipeline + dispatch to display.onEvent (#2, #4, #6) The engine emits one JSON object per line on the child subprocess's stderr stream for each wire-protocol notification (progress, result/delta, result/final, thinking/delta, thinking/final, tool/started, tool/completed, approval/request, approval/timeout, plus wire-level error). Before this change the wrapper buffered stderr as raw text and silently dropped every event — the existing Transport class implemented NDJSON parsing but was never wired anywhere (dead code). This change: - Adds parseNdjsonStream(stream, {onJson, onNonJson?}) — a standalone helper extracted from the parsing logic Transport already had. Resolves when the stream emits 'close'. Exported @public. - Wires parseNdjsonStream onto child.stderr inside SessionHandle.makeIterable(). JSON lines are parsed into 'notification' DisplayEvents and dispatched to params.display?.onEvent. Non-JSON lines (and JSON lines, for completeness) are still accumulated into stderrBuf so the stderrTail surface on parseRunOutput remains diagnostically useful. - Extends the DisplayEvent discriminated union with a new {type: 'notification', method: string, params: unknown} variant. **BREAKING**: existing exhaustive switch statements on event.type will no longer be exhaustive without a notification branch. - Threads SpawnAgentParams.display through to SessionHandle so the callback that was previously silently dropped is now actually fired (Issue #4). Closes #2, #4, #6. BREAKING CHANGE: display.onEvent callbacks are now actually invoked with wire-event notifications. Callers that registered onEvent expecting it to be a no-op may observe new event flow. The DisplayEvent union has a new 'notification' variant; exhaustive switch statements need a corresponding branch. * feat(wrapper-ts): surface --config flag via SpawnAgentParams.configPath (#1) Engine PR #27 / v0.4.0 added the --config <path> flag and the host_config layer (approval mode, MCP servers, provider defaults, allowProtocolSkew, etc.). The wrapper had no surface to forward this, so callers had to fall back to AMPLIFIER_AGENT_CONFIG in env.extra. This change: - Adds SpawnAgentParams.configPath?: string (public, @public TSDoc). - Adds AssembleArgvInput.configPath?: string. - assembleArgv emits --config <path> when configPath is set. - Threads configPath through SessionHandleParams to the per-submit argv assembly. Also drive-by adds approvalMode field to AssembleArgvInput (used by #10's commit). The argv-builder now reads input.approvalMode and emits -y / -n / nothing accordingly. Default remains -y for backward compat with callers that haven't opted into the approval API. Closes #1. * feat(wrapper-ts)!: wire approval API to engine -y/-n + approval.mode (#10) Previously, SpawnAgentParams.approval threw AaaError( approval_not_supported_in_v1) whenever set because it required the mid-turn onRequest callback that v1 doesn't support. This change extends SpawnAgentParams.approval to also accept the static-policy shape { mode: 'yes' | 'no' | 'prompt' }, which maps to engine argv: - 'yes' -> -y (auto-allow every tool call) - 'no' -> -n (auto-deny every tool call) - 'prompt' -> emit no flag; engine falls back to host_config.approval.mode or the bundle's TTY-based default. This is how a host hands policy resolution back to the engine. The legacy { onRequest, timeoutMs } form still throws approval_not_supported_in_v1 — the Mode A wire has no mid-turn channel. Mid-turn callbacks will return when WG-4 lands. Engine compatibility: { mode: 'prompt' } requires amplifier-agent >= 0.4.0 (PR #34 added host_config.approval.mode). Closes #10. BREAKING CHANGE: SpawnAgentParams.approval is now a union shape; callers passing { mode } no longer hit approval_not_supported_in_v1. Callers that defensively catch that error need to remove the try/catch when migrating to the mode shape. * feat(wrapper-ts): implement getEngineInfo() — engineVersion + bundleDigest (#7) Closes the Task-9 TODO: getEngineInfo() now returns the values captured during the engine version probe that spawnAgent() runs at init (Issue #9). Previously both fields were hardcoded empty strings. - engineVersion populated from `amplifier-agent version --json` payload's `version` field. - bundleDigest populated from the probe payload's optional `bundleDigest` field. The engine's current `version --json` output (from admin/version_info.py) only emits {version, protocolVersion} — bundleDigest will be empty string until a future engine release exposes it. Forward-compatible: when the engine adds it, the wrapper picks it up automatically with no further changes. DONE_WITH_CONCERNS for the bundleDigest follow-up: filed as an engine-side ask for a future PR. The wrapper does what it can with the data the engine surface exposes today; the contract is wired so the field will populate the moment the engine emits it. Closes #7. * chore(wrapper-ts): rebuild dist after hardening release changes Mirrors PR #29 / #31 pattern: dist/ is tracked so consumers installing from the git tarball get the compiled artifacts without a build step. Regenerated from npm run build after issues #1, #2, #3, #4, #5, #6, #7, #9, #10 landed. * chore(release): bump amplifier-agent-ts to 0.6.0 + CHANGELOG Wrapper hardening release closing 8 consumer-reported gaps at 0.5.0: #1 configPath surface #2 stderr NDJSON parsing #3 runChildProcess injection #4 display.onEvent dispatch #5 public re-exports #6 Transport dead code (root cause of #2/#4) #7 getEngineInfo() implementation #9 checkProtocolVersion() wired into init path #10 approval API mapped to engine -y/-n + approval.mode Issue #8 in the consumer report was a misread — InitializeParams. mcpConfigPath is intentionally retained in protocol-0.3.0. No type change needed; the schema is canonical and correct. This is a minor bump per 0.x convention even though some changes are BREAKING — the wrapper hasn't shipped a 1.0 yet, so breaking changes ride minor bumps. See CHANGELOG for the BREAKING list. Engine compatibility: requires amplifier-agent >= 0.4.0. Pinned protocol: 0.3.0. --------- Co-authored-by: Manoj Prabhakar Paidiparthy <mpaidiparthy@microsoft.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
This PR resolves the architectural gap discovered during the 2026-05-19 cheatsheet walk-through: the original claim of "Built-in bundle, vendored / near-instant cold-start" was structurally broken because the
includes: build-up-foundationblock depends on foundation's registry layer that amplifier-agent never populates.The fix: Strategy 1 — Vendored Opinionated Manifest. Drop the broken include, declare every module explicitly in
bundle.md, vendor the four build-up agents (explorer,planner,coder,tester) as wheel-local markdown, and add a content-hash to the cache key so manifest edits self-invalidate.Result: The cheatsheet §3 flagship test (
amplifier-agent run "Reply with one word: pong") now reaches the LLM end-to-end through the bundle itself — no workarounds, no "No handler for URI: build-up-foundation" warnings.Design Context
Full decision document:
docs/designs/2026-05-19-baked-in-bundle-decision.mdPredecessor (open-question) document:
docs/designs/2026-05-19-baked-in-bundle-revisit.mdThis PR depends on PR #3 (already merged to main) which landed Mode A wiring and provider injection that Strategy 1 builds on.
What This Branch Accomplishes
Phase 1 — Cache Key + Agent Vendoring
sha256(bundle.md)into the XDG cache key (decision D2) so manifest edits invalidate automaticallyexplorer.md,planner.md,coder.md,tester.mdfromamplifier-foundation@main/experiments/build-up/agents/AGENTS_DIRconstant fromamplifier_agent_lib.bundlepackagePhase 2 — Manifest Rewrite + Wheel Packaging
includes:block — eliminates the structural dependency on foundation's registry layer@mainrefs (decision D4) — modules update on their own cadencepyproject.tomlforce-include to ship agent markdown in the wheelPhase 3 — Documentation + Capstone Verification
"vendored bundle"→"vendored opinionated manifest"(we vendor the manifest text + agent files, not the modules)"sealed bundle"→"sealed manifest text"(modules resolve from@mainupstream)"strips bundle-loading"→"near-instant on warm cache"(cold first-run is still 5–30 s)"near-instant once stripped"→"near-instant after first invocation"(truth in advertising)Capstone Verification (Fresh Evidence)
Fresh cold-cache run (forced with
cache clear, then full test suite):Stderr diagnostics: No TypeError, no "No handler for URI: build-up-foundation" warning, providers loaded cleanly. This is the first time cheatsheet §3 reaches the LLM through the bundle itself.
Test Plan (for reviewers)
Branch Stats
2026-05-19-baked-in-bundle-decision.md)explorer.md,planner.md,coder.md,tester.md)test_bundle_agents.py,test_bundle_packaging.py,test_cheatsheet_first_run_cost.py,test_bundle_loader.py)bundle.md,cache.py,bundle/__init__.py,loader.py,admin/cache_clear.py,pyproject.toml, design-checkpoint.md, CHEATSHEET.mdKnown Non-Blocking Follow-Up Items
Byte-identity for
planner.md,coder.md,tester.md: These are condensed forms of upstream agent definitions rather than verbatim copies.explorer.mdIS byte-identical. The condensed forms preserve agent identity and the regression suite validates them; a future tidy-up could either (a) replace with verbatim copies and relax assertions, or (b) document the conscious condensation as a design choice.CHEATSHEET.md doc line numbers: Lines 27 and 308 still reference "202 passed" from an earlier snapshot; current is 274. Trivial doc fix.
Merge Checklist