A walkthrough of every open draft PR, what's blocking it, and the steps to get each one merged.
Branch: memory | Author: @jpmcb | Merge state: CONFLICTING
- Merge conflicts with main — the branch has diverged and needs a rebase.
- Review feedback from @vkovac2 — two inline comments raising the same core concern:
pkg/memory/driver.go:41—Recall(ctx, hash)only accepts a hash, but query-based backends like Cognee expect a natural language query string. The reviewer suggests adding a context/query string parameter.api/mcp/memory.go:39— For query-based backends, the hash needs to be resolved to a query viaDagLoaderbefore passing to the driver.
- Design question — Should there be one dataset per session/conversation, or a single shared dataset for
Store? This maps to the short-term vs long-term memory split described in the RFC (issue #81).
- Change
Recallto accept aRecallQuerystruct with bothHash(for DAG position) andQuery(natural language string for query-based backends). This keeps it extensible and satisfies both hash-based (local) and query-based (Cognee) drivers. - Update the MCP handler (
api/mcp/memory.go) to accept an optionalqueryfield in the tool input and pass it through. When only a hash is provided, resolve it to text viaDagLoaderbefore callingRecall. - Update the local driver, mock driver, and tests to match the new signature.
- Respond to the dataset scoping question — recommend documenting that scoping is a driver-level concern (local uses hash-keyed maps, Cognee can use datasets per session).
- Rebase onto main and resolve conflicts.
Branch: glenn/pcc-106-kafka | Author: @oppegard | Merge state: CLEAN
- Still marked WIP/Draft — no description, no reviews requested.
- No review feedback yet — the PR adds
segmentio/kafka-goas a dependency and presumably introduces a Kafka event streaming integration, but without a description or linked issue it's unclear what the scope and acceptance criteria are.
- Add a PR description explaining the design: what events are streamed, the Kafka topic structure, configuration options, and how it integrates with the proxy worker pool.
- Link to the tracking issue (PCC-106).
- Request review once the description is added — CI is already green.
- Mark as ready for review.
Branch: john/pcc-139 | Author: @jpmcb | Merge state: CLEAN
- Still marked WIP/Draft — CI is fully green, implementation looks complete (new
pkg/storage/postgres/package usingpgx/v5and the existing ent ORM driver). - No reviews requested — needs someone to review the postgres driver implementation.
- Verify the postgres driver works end-to-end with an actual Postgres instance (integration test or manual smoke test).
- Consider adding a CI integration test with a Postgres service container, or document that it's tested manually.
- Add connection string configuration to the CLI commands (
--postgresflag or config file option) if not already done. - Request review and mark as ready.
Branch: john/pcc-35 | Author: @jpmcb | Merge state: CONFLICTING
- Merge conflicts with main — needs a rebase.
- Still marked WIP/Draft — the PR migrates the codebase from
go.uber.org/zaptolog/slogwith a custompkg/loggerpackage. This is a wide-reaching change touchingapi/,proxy/, MCP server, and all command files. - No reviews requested.
- Rebase onto main and resolve conflicts.
- Ensure all existing usages of
zap.Loggerare migrated — grep for any remainingzapreferences. - Verify that the
tapeslogger.Nop()helper works correctly in tests. - Document the logger package's public API and configuration options.
- Request review — this is a foundational change that other PRs may depend on, so prioritize it.
Branch: viper | Author: @jpmcb | Merge state: CLEAN
- Still marked WIP/Draft — CI is green, implementation introduces Viper for config management across all CLI commands (chat, checkout, search, serve, proxy, start, deck).
- No reviews requested.
- Large scope — the PR adds a
config.FlagSetpattern,config.InitViper(), andconfig.BindRegisteredFlags()helpers, then migrates every command'sPreRunEto use Viper instead of the oldConfigerpattern.
- Add a PR description explaining the config architecture: how Viper loads config files, how flags are bound, and the precedence order (flags > env > config file > defaults).
- Verify backward compatibility — existing config files should still work.
- Consider whether this should land before or after PR #118 (logger), since both touch command initialization code. Landing viper first would reduce conflicts for the logger PR and vice versa. Coordinate the merge order.
- Request review and mark as ready.
Branch: agent-trace | Author: @jpmcb | Merge state: CONFLICTING
- Merge conflicts with main — needs a rebase.
- Still marked WIP/Draft — the PR adds a full agent-trace API implementation including a new
pkg/agenttracepackage, handlers, in-memory store, and extensive tests. - Signature change —
NewServerinapi/api.gogains a newagentTraceStoreparameter, which is a breaking change to the API server constructor.
- Rebase onto main and resolve conflicts.
- Decide on the
agentTraceStoreinjection pattern — currently it adds a positional parameter toNewServer. Consider putting it in theConfigstruct instead, consistent with howMemoryDriver,VectorDriver, andEmbedderare injected. - Ensure the
storage.AgentTraceQuerytype and store interface are well-documented. - Request review and mark as ready.
Branch: google-vertex | Author: @jpmcb | Merge state: UNSTABLE
- Failing CI —
GolangCI Lint Checkfails with agci(import ordering) error inpkg/llm/provider/vertex/types.go:8:1. - Still marked WIP/Draft.
- Run
make formatto fix the import ordering invertex/types.go— this is a one-line fix (gci wants a blank line between stdlib and third-party imports). - Push the fix and verify CI goes green.
- Request review and mark as ready.
Branch: aws-bedrock | Author: @jpmcb | Merge state: CLEAN
- Still marked WIP/Draft — CI is fully green.
- No reviews requested.
- Add a PR description with configuration examples (how to set up Bedrock provider, required AWS credentials/config).
- Verify the provider handles all edge cases (tool use, streaming via
InvokeModelWithResponseStream, system prompts). - Request review and mark as ready.
Branch: feat/agent-flag-passthrough | Author: @bdougie | Merge state: CLEAN
This is the only non-draft PR. CI is fully green. No reviews or review requests yet.
- The PR description notes it needs documentation for the
--passthrough convention. - The manual smoke test is unchecked — complete it:
tapes start claude -- --dangerously-skip-permissions. - Request review and merge.
To minimize rebase pain and dependency conflicts:
- PR #135 (flag passthrough) — ready now, no conflicts, independent
- PR #68 (Bedrock) — green CI, independent provider, just needs review
- PR #69 (Vertex) — one lint fix, then ready, independent provider
- PR #85 (Viper config) — foundational change, land early to reduce conflicts
- PR #118 (logger) — rebase after viper lands, foundational change
- PR #119 (Postgres driver) — independent of above, can go anytime after viper
- PR #86 (memory) — needs interface redesign per review feedback
- PR #72 (agent-trace) — needs rebase + constructor pattern decision
- PR #131 (Kafka) — needs description and scope clarity