Fold thin docs back into AGENTS.md, restore request flow summary

error-handling.md (2 lines) and git-guidelines.md (3 bullets) were too
thin for their own files. Moved them into a Conventions section in
AGENTS.md alongside the referral system note. Restored the brief
request flow summary that was in the original knowledge.md.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

Author: jahooma

AGENTS.md

@@ -25,14 +25,26 @@ Codebuff is a tool for editing codebases via natural-language instructions to Bu
 - `agents/` — main agents shipped with codebuff
 - `.agents/` — local agent templates (prompt + programmatic agents)
 
+## Request Flow
+
+1. CLI/SDK sends user input + context to the Codebuff web API.
+2. Agent runtime streams events/chunks back through SDK callbacks.
+3. Tools execute locally (file edits, terminal commands, search) to satisfy tool calls.
+
+## Conventions
+
+- Prefer `ErrorOr<T>` return values (`success(...)`/`failure(...)` in `common/src/util/error.ts`) over throwing.
+- Never force-push `main` unless explicitly requested.
+- To exclude files from a commit: stage only what you want (`git add <paths>`). Never use `git restore`/`git checkout HEAD -- <file>` to "uncommit" changes.
+- Run interactive git commands in tmux (anything that opens an editor or prompts).
+- Referral codes are applied via the CLI (web onboarding only instructs the user); see `web/src/app/api/referrals/helpers.ts`.
+
 ## Docs
 
-- [`docs/architecture.md`](docs/architecture.md) — Package dependency graph, per-package details, key architectural patterns
+- [`docs/architecture.md`](docs/architecture.md) — Package dependency graph, per-package details, architectural patterns
 - [`docs/request-flow.md`](docs/request-flow.md) — Full request lifecycle from CLI through server and back
 - [`docs/error-schema.md`](docs/error-schema.md) — Server error response formats and client-side handling
-- [`docs/error-handling.md`](docs/error-handling.md) — ErrorOr pattern for return values
 - [`docs/development.md`](docs/development.md) — Dev setup, worktrees, logs, package management, DB migrations
-- [`docs/testing.md`](docs/testing.md) — Testing conventions, DI over mocking, tmux CLI testing
+- [`docs/testing.md`](docs/testing.md) — DI over mocking, tmux CLI testing
 - [`docs/environment-variables.md`](docs/environment-variables.md) — Env var rules, DI helpers, loading order
-- [`docs/agents-and-tools.md`](docs/agents-and-tools.md) — Agent system, shell shims, tool definitions, referral system
-- [`docs/git-guidelines.md`](docs/git-guidelines.md) — Git safety rules
+- [`docs/agents-and-tools.md`](docs/agents-and-tools.md) — Agent system, shell shims, tool definitions

docs/agents-and-tools.md

@@ -19,6 +19,3 @@ base-lite "fix this bug"
 
 - Tool definitions live in `common/src/tools` and are executed via the SDK helpers + agent-runtime.
 
-## Referral System
-
-Referral codes are applied via the CLI (web onboarding only instructs the user); see `web/src/app/api/referrals/helpers.ts`.