fix: auto-initialize extension context in kit.New()

Extensions were being loaded automatically by SetupAgent but the context
was never initialized unless the SDK user explicitly called
SetExtensionContext. This left extensions with a zero-value Context where
all function fields are nil.

Now kit.New() automatically calls SetExtensionContext with minimal defaults
(CWD, Model, Interactive=false) when extensions are loaded. SDK users can
still call SetExtensionContext to override with richer implementations
(TUI callbacks, prompts, etc.).

Combined with the normalizeContext() safety net in the runner, extensions
are now guaranteed to work in SDK mode without explicit context wiring.

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,79 +0,0 @@
-name: Bug Report
-description: Report a bug or issue with Kit
-title: "fix: "
-labels: ["bug"]
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Bug Description
-      description: What happened? What did you expect to happen?
-      placeholder: |
-        The BorderColor field in ToolRenderConfig is documented but never applied 
-        during tool rendering. I expected the tool block to render with my custom 
-        color, but it uses the default styling instead.
-    validations:
-      required: true
-
-  - type: textarea
-    id: reproduction
-    attributes:
-      label: Steps to Reproduce
-      description: Provide clear steps to reproduce the issue
-      placeholder: |
-        1. Create an extension with `api.RegisterToolRenderer(ext.ToolRenderConfig{...})`
-        2. Set `BorderColor: "#89b4fa"` in the config
-        3. Run a tool that uses this renderer
-        4. Observe the border color is not applied
-      render: markdown
-    validations:
-      required: true
-
-  - type: textarea
-    id: code
-    attributes:
-      label: Relevant Code / Configuration
-      description: Paste any code, configuration, or error messages
-      placeholder: |
-        ```go
-        api.RegisterToolRenderer(ext.ToolRenderConfig{
-            ToolName:    "bash",
-            DisplayName: "Shell",
-            BorderColor: "#a6e3a1",  // This is ignored!
-            Background:  "#1e1e2e",  // This is ignored!
-        })
-        ```
-      render: go
-
-  - type: input
-    id: component
-    attributes:
-      label: Affected Component
-      description: Which part of Kit is affected?
-      placeholder: e.g., extensions, ui, tool rendering, session management
-
-  - type: input
-    id: version
-    attributes:
-      label: Kit Version
-      description: What version of Kit are you running?
-      placeholder: e.g., v0.1.0, commit hash, or "main"
-
-  - type: textarea
-    id: context
-    attributes:
-      label: Additional Context
-      description: Any other context, proposed fixes, or related issues
-      placeholder: |
-        The issue appears to be in `internal/ui/messages.go:RenderToolMessage()` 
-        which ignores the BorderColor and Background fields from ToolRendererData.
-
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Checklist
-      options:
-        - label: I've searched existing issues and this hasn't been reported yet
-          required: true
-        - label: I've tested with the latest version of Kit
-          required: false

.github/ISSUE_TEMPLATE/config.yml

@@ -1,11 +0,0 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Kit Documentation
-    url: https://github.com/mark3labs/kit/tree/main/www/pages
-    about: Check the documentation before filing an issue
-  - name: Extension Examples
-    url: https://github.com/mark3labs/kit/tree/main/examples/extensions
-    about: See working extension examples for reference
-  - name: Discussions
-    url: https://github.com/mark3labs/kit/discussions
-    about: For questions, ideas, or general discussion

.github/ISSUE_TEMPLATE/documentation.yml

@@ -1,40 +0,0 @@
-name: Documentation Issue
-description: Report missing, incorrect, or unclear documentation
-title: "docs: "
-labels: ["documentation"]
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Documentation Issue
-      description: What's wrong or missing in the documentation?
-      placeholder: |
-        The ToolRenderConfig documentation mentions BorderColor and Background fields,
-        but the code doesn't actually use them. The docs should either be updated 
-        to reflect reality, or the bug should be fixed.
-    validations:
-      required: true
-
-  - type: input
-    id: location
-    attributes:
-      label: Documentation Location
-      description: Where is the affected documentation?
-      placeholder: e.g., README.md, examples/extensions/tool-renderer-demo.go, pkg/kit docs
-
-  - type: textarea
-    id: suggestion
-    attributes:
-      label: Suggested Improvement
-      description: How should the documentation be improved?
-      placeholder: |
-        Add a note that BorderColor and Background are not yet implemented, 
-        or fix the bug and document the correct behavior.
-
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Checklist
-      options:
-        - label: I've checked that this documentation issue still exists in the latest version
-          required: true

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,64 +0,0 @@
-name: Feature Request
-description: Suggest a new feature or enhancement for Kit
-title: "feat: "
-labels: ["enhancement"]
-body:
-  - type: textarea
-    id: description
-    attributes:
-      label: Feature Description
-      description: What would you like to see added or changed?
-      placeholder: |
-        I'd like to be able to customize the border color of tool result blocks 
-        dynamically based on the tool type or result status.
-    validations:
-      required: true
-
-  - type: textarea
-    id: motivation
-    attributes:
-      label: Motivation / Use Case
-      description: Why is this feature needed? What problem does it solve?
-      placeholder: |
-        When running multiple tools in sequence, it's hard to visually distinguish 
-        between file reads (blue), shell commands (green), and errors (red) 
-        without custom border colors.
-    validations:
-      required: true
-
-  - type: textarea
-    id: proposed
-    attributes:
-      label: Proposed Implementation
-      description: How do you think this should work? (optional)
-      placeholder: |
-        Extend `ToolRenderConfig` to accept a function that receives the tool 
-        result and returns a color based on the content:
-        
-        ```go
-        BorderColorFunc: func(result string, isError bool) string {
-            if isError {
-                return "#f38ba8"
-            }
-            return "#89b4fa"
-        }
-        ```
-      render: go
-
-  - type: checkboxes
-    id: alternatives
-    attributes:
-      label: Alternatives Considered
-      options:
-        - label: I've considered workarounds or alternative approaches
-          required: false
-
-  - type: checkboxes
-    id: terms
-    attributes:
-      label: Checklist
-      options:
-        - label: I've searched existing issues and this hasn't been requested yet
-          required: true
-        - label: This feature aligns with Kit's design philosophy (TUI-first, extension-based)
-          required: false

.gitignore

@@ -3,7 +3,6 @@
 .env
 .kit/*
 !.kit/extensions/
-!.kit/prompts/
 aidocs/
 *.log
 /kit

.kit/extensions/go-edit-lint.go

@@ -28,15 +28,11 @@ type lintResult struct {
 	Err    error
 }
 
-// Package-level state: set of .go files edited during the current agent turn.
-var editedFiles map[string]bool
-
 func Init(api ext.API) {
 	api.OnSessionStart(func(_ ext.SessionStartEvent, ctx ext.Context) {
-		ctx.Print("go-edit-lint extension loaded - will run gopls and golangci-lint after agent turns that edit Go files")
+		ctx.Print("go-edit-lint extension loaded - will run gopls and golangci-lint on Go file edits")
 	})
 
-	// Track edited .go files — don't lint yet.
 	api.OnToolResult(func(e ext.ToolResultEvent, ctx ext.Context) *ext.ToolResultResult {
 		if e.IsError || !isEditOrWrite(e.ToolName) {
 			return nil
@@ -47,72 +43,30 @@ func Init(api ext.API) {
 			return nil
 		}
 
-		if editedFiles == nil {
-			editedFiles = make(map[string]bool)
-		}
-		editedFiles[absPath] = true
-		return nil
-	})
-
-	// After the agent turn ends, lint all collected files.
-	api.OnAgentEnd(func(e ext.AgentEndEvent, ctx ext.Context) {
-		if len(editedFiles) == 0 {
-			return
-		}
-
-		// Snapshot and reset immediately so the next turn starts clean.
-		files := editedFiles
-		editedFiles = nil
-
-		// Skip lint on errored turns.
-		if e.StopReason == "error" {
-			return
-		}
-
-		// Collect unique directories and file list for gopls.
-		var allGoplsOutput []string
-		for absPath := range files {
-			res := runGopls(ctx.CWD, absPath)
-			formatted := formatToolResult(res, "")
-			if formatted != "" {
-				allGoplsOutput = append(allGoplsOutput, fmt.Sprintf("# %s\n%s", filepath.Base(absPath), formatted))
-			}
-		}
-
-		lintRes := runGolangCILint(ctx.CWD, "./...")
-
-		goplsSection := "No diagnostics."
-		if len(allGoplsOutput) > 0 {
-			goplsSection = strings.Join(allGoplsOutput, "\n\n")
-		}
-		lintSection := formatToolResult(lintRes, "No lint issues.")
-
-		// Build file list for the report header.
-		var fileNames []string
-		for absPath := range files {
-			fileNames = append(fileNames, filepath.Base(absPath))
-		}
-
-		report := fmt.Sprintf(
-			"<go_diagnostics files=%q>\n[gopls]\n%s\n\n[golangci-lint]\n%s\n</go_diagnostics>",
-			strings.Join(fileNames, ", "),
-			goplsSection,
-			lintSection,
-		)
-
+		report := runGoDiagnostics(ctx.CWD, absPath)
+		
+		// Check if there are issues and add explicit prompt for the LLM to react
 		goplsIssues, lintIssues := countIssues(report)
 		hasIssues := goplsIssues > 0 || lintIssues > 0
-
+		
+		var enhanced string
+		if hasIssues {
+			enhanced = e.Content + "\n\n" + report + "\n\n⚠️ DIAGNOSTICS FOUND: Please review the issues above and fix them before proceeding."
+		} else {
+			enhanced = e.Content + "\n\n" + report
+		}
+
+		// Show TUI message block for diagnostics visibility (only if there are issues)
 		if hasIssues {
-			// Show TUI block so the user sees it too.
 			var msgLines []string
-			msgLines = append(msgLines, fmt.Sprintf("Files: %s", strings.Join(fileNames, ", ")))
+			msgLines = append(msgLines, fmt.Sprintf("File: %s", filepath.Base(absPath)))
 			if goplsIssues > 0 {
 				msgLines = append(msgLines, fmt.Sprintf("gopls: %d issue(s)", goplsIssues))
 			}
 			if lintIssues > 0 {
 				msgLines = append(msgLines, fmt.Sprintf("golangci-lint: %d issue(s)", lintIssues))
 			}
+			msgLines = append(msgLines, "", "⚠️ Please fix these issues before proceeding.")
 
 			borderColor := "#f9e2af" // yellow
 			if goplsIssues > 0 && lintIssues > 0 {
@@ -124,16 +78,9 @@ func Init(api ext.API) {
 				BorderColor: borderColor,
 				Subtitle:    "go-edit-lint",
 			})
-
-			// Inject a follow-up message so the agent fixes the issues.
-			ctx.SendMessage(report + "\n\n⚠️ DIAGNOSTICS FOUND: Please review and fix the issues above.")
-		} else {
-			ctx.PrintBlock(ext.PrintBlockOpts{
-				Text:        fmt.Sprintf("Files: %s\n✓ All clean", strings.Join(fileNames, ", ")),
-				BorderColor: "#a6e3a1",
-				Subtitle:    "go-edit-lint",
-			})
 		}
+
+		return &ext.ToolResultResult{Content: &enhanced}
 	})
 }
 
@@ -159,6 +106,18 @@ func resolveGoFilePath(inputJSON, cwd string) (string, bool) {
 	return absPath, true
 }
 
+func runGoDiagnostics(cwd, absPath string) string {
+	gopls := runGopls(cwd, absPath)
+	lint := runGolangCILint(cwd, "./...")
+
+	return fmt.Sprintf(
+		"<go_diagnostics file=%q>\n[gopls]\n%s\n\n[golangci-lint]\n%s\n</go_diagnostics>",
+		filepath.Base(absPath),
+		formatToolResult(gopls, "No diagnostics."),
+		formatToolResult(lint, "No lint issues."),
+	)
+}
+
 func runGopls(cwd, absPath string) lintResult {
 	ctx, cancel := context.WithTimeout(context.Background(), diagnosticsTimeout)
 	defer cancel()
@@ -219,9 +178,7 @@ func formatToolResult(res lintResult, emptyFallback string) string {
 	out := strings.TrimSpace(res.Output)
 	if out == "" {
 		if res.Err == nil {
-			if emptyFallback != "" {
-				lines = append(lines, emptyFallback)
-			}
+			lines = append(lines, emptyFallback)
 		}
 	} else {
 		lines = append(lines, out)
@@ -240,15 +197,17 @@ func truncate(s string, max int) string {
 }
 
 func countIssues(report string) (goplsCount, lintCount int) {
+	// Extract gopls section
 	goplsStart := strings.Index(report, "[gopls]")
 	lintStart := strings.Index(report, "[golangci-lint]")
 	endTag := strings.Index(report, "</go_diagnostics>")
 
 	if goplsStart != -1 && lintStart != -1 {
 		goplsSection := report[goplsStart:lintStart]
+		// Count non-empty lines excluding the header and "No diagnostics." message
 		for _, line := range strings.Split(goplsSection, "\n") {
 			line = strings.TrimSpace(line)
-			if line != "" && line != "[gopls]" && line != "No diagnostics." && !strings.HasPrefix(line, "#") {
+			if line != "" && line != "[gopls]" && line != "No diagnostics." {
 				goplsCount++
 			}
 		}
@@ -256,6 +215,7 @@ func countIssues(report string) (goplsCount, lintCount int) {
 
 	if lintStart != -1 && endTag != -1 {
 		lintSection := report[lintStart:endTag]
+		// Count non-empty lines excluding the header and "No lint issues." message
 		for _, line := range strings.Split(lintSection, "\n") {
 			line = strings.TrimSpace(line)
 			if line != "" && line != "[golangci-lint]" && line != "No lint issues." {

.kit/prompts/acp-smoke-test.md

@@ -1,37 +0,0 @@
----
-description: Run ACP smoke test against opencode/kimi-k2.5 to verify JSON-RPC stdio works
----
-
-Run the ACP smoke test to verify the Kit ACP server works correctly over JSON-RPC stdio with streaming responses.
-
-## Steps
-
-1. Build the kit binary:
-   ```bash
-   go build -o output/kit ./cmd/kit
-   ```
-
-2. Run the smoke test Python script against opencode/kimi-k2.5:
-   ```bash
-   python3 scripts/acp_smoke_test.py
-   ```
-
-3. Verify the output shows:
-   - `session/new` returns a valid `sessionId`
-   - `session/prompt` streams `agent_thought_chunk` notifications (reasoning)
-   - `session/prompt` streams `agent_message_chunk` notifications (response)
-   - Final result has `stopReason: "end_turn"`
-   - `✓ SMOKE TEST PASSED` at the end
-
-4. If the test fails, check:
-   - `output/kit` binary exists and is executable
-   - `OPENCODE_API_KEY` or `OPENCODE_ZEN_API_KEY` environment variable is set
-   - `scripts/acp_smoke_test.py` exists
-   - The model `opencode/kimi-k2.5` is available (`kit models opencode | grep kimi-k2.5`)
-
-5. For testing with a different model, edit the script or set the `MODEL` variable:
-   ```bash
-   MODEL=anthropic/claude-sonnet-4-5 python3 scripts/acp_smoke_test.py
-   ```
-
-The smoke test exercises the full ACP protocol: session lifecycle, streaming notifications, and tool-free prompt completion.

.kit/prompts/commit-push.md

@@ -1,30 +0,0 @@
----
-description: Stage, commit, and push changes with an auto-generated conventional commit message
----
-
-Review the current git status and diff, then stage all changes, write a concise conventional commit message, commit, and push to the current branch.
-
-## Steps
-
-1. **Check status**: `git status` — understand what has changed
-2. **Review the diff**: `git diff` (and `git diff --cached` if anything is already staged) — read the actual changes
-3. **Stage everything**: `git add -A`
-4. **Craft the commit message** following Conventional Commits:
-   - Format: `<type>(<scope>): <short summary>`
-   - Types: `feat`, `fix`, `refactor`, `chore`, `docs`, `test`, `perf`, `build`
-   - Scope: optional, the subsystem affected (e.g. `ui`, `cmd`, `config`)
-   - Summary: imperative mood, lowercase, no trailing period, ≤72 chars
-   - Body: add a blank line then bullet points for non-trivial changes
-   - Do **not** include "Generated by" or similar noise
-5. **Commit**: `git commit -m "<message>"`
-6. **Push**: `git push`
-
-## Guidelines
-
-- Read the actual diff — do not guess from filenames alone
-- Prefer one well-scoped commit; do not split unless the changes are clearly unrelated
-- Keep the subject line under 72 characters
-- Use the body to explain *what* and *why*, not *how*
-- If there is nothing to commit, say so and stop
-
-$@

.kit/prompts/feature-request.md

@@ -1,86 +0,0 @@
----
-description: Create a feature request using the GitHub template
----
-
-Create a feature request for the Kit repository. The user wants to request: $@
-
-## Feature Request Template
-
-This prompt uses the `feature_request` GitHub template which requires:
-
-| Field | Required | Purpose |
-|-------|----------|---------|
-| **Feature Description** | Yes | What should be added or changed |
-| **Motivation / Use Case** | Yes | Why is this needed? What problem does it solve? |
-| **Proposed Implementation** | No | How do you think this should work? |
-
-## Steps
-
-1. **Understand the request** from `$@`
-   - What capability is missing?
-   - What would the ideal behavior look like?
-
-2. **Ask clarifying questions** if needed:
-   - "What problem does this solve for you?"
-   - "How would you expect this to work?"
-   - "Are there similar features in other tools you use?"
-
-3. **Craft the title** using conventional format:
-   - `feat: <short description>`
-   - Lowercase, imperative mood, ≤72 chars
-   - Good examples:
-     - `feat: add keyboard shortcut for clearing input`
-     - `feat: support custom themes per extension`
-     - `feat: add fuzzy matching to model selector`
-   - Bad examples:
-     - `Feature request: can we have...` (too vague)
-     - `It would be nice if...` (not imperative)
-
-4. **Build the body** with the template fields:
-
-   **Feature Description:**
-   - Clear statement of what to add/change
-   - Be specific about the behavior
-   - Include UI/UX details if relevant
-
-   **Motivation / Use Case:**
-   - What problem does this solve?
-   - Current workaround (if any) and why it's insufficient
-   - Who benefits from this feature?
-
-   **Proposed Implementation** (optional but helpful):
-   - High-level approach
-   - API changes if applicable
-   - Example usage code
-
-5. **Create the issue**:
-   ```bash
-   gh issue create --template feature_request --title "feat: ..." --body "..."
-   ```
-
-6. **Confirm success**:
-   - Show the issue URL and number
-   - Mention it was created with the feature_request template
-
-## Guidelines
-
-- Focus on the *problem* first, then the solution
-- Include concrete examples of how the feature would be used
-- Consider edge cases and mention them
-- If proposing API changes, show before/after code
-- Check if similar features exist in related tools (mention them for reference)
-- Align with Kit's philosophy: TUI-first, extension-based, keyboard-driven
-
-## Example
-
-User: `/feature-request I want to be able to customize tool border colors dynamically`
-
-You:
-1. Title: `feat: dynamic border colors for tool results based on status`
-2. Body:
-   - **Feature Description**: Allow `ToolRenderConfig` to accept a function that determines border color based on tool result content or status, enabling dynamic visual feedback.
-   - **Motivation**: When running multiple tools, it's hard to distinguish file reads (blue), shell commands (green), and errors (red) without custom colors per result.
-   - **Proposed Implementation**: Add `BorderColorFunc` callback that receives `(result string, isError bool)` and returns a color string.
-
-3. Execute: `gh issue create --template feature_request --title "feat: ..." --body "..."`
-4. Confirm: Created issue #43 using feature_request template

.kit/prompts/file-issue.md

@@ -1,100 +0,0 @@
----
-description: File a GitHub issue using the appropriate template
----
-
-File a GitHub issue for the Kit repository. The user wants to create an issue about: $@
-
-## Issue Templates Available
-
-This repository has structured issue templates. You MUST use the appropriate template:
-
-| Type | Template | Use For |
-|------|----------|---------|
-| `bug` | `bug_report` | Something is broken, not working as expected |
-| `feat` | `feature_request` | New feature, enhancement, improvement |
-| `docs` | `documentation` | Missing, incorrect, or unclear documentation |
-
-## Steps
-
-1. **Determine the issue type** from `$@`:
-   - Bug → use `--template bug_report`
-   - Feature → use `--template feature_request`  
-   - Documentation → use `--template documentation`
-
-2. **Ask clarifying questions** if critical info is missing:
-   - For bugs: "What were you doing when this happened?" (reproduction steps)
-   - For features: "What problem does this solve?" (motivation)
-   - For docs: "Where did you look for this information?" (location)
-
-3. **Craft the title** using conventional format:
-   - `<type>: <short description>`
-   - Lowercase, imperative mood, ≤72 chars
-   - Examples:
-     - `fix: ToolRenderConfig BorderColor ignored during rendering`
-     - `feat: add keyboard shortcut for clearing input`
-     - `docs: clarify extension widget lifecycle`
-
-4. **File the issue** using the template:
-   ```bash
-   # For bugs
-   gh issue create --template bug_report --title "fix: ..." --body "..."
-   
-   # For features
-   gh issue create --template feature_request --title "feat: ..." --body "..."
-   
-   # For documentation
-   gh issue create --template documentation --title "docs: ..." --body "..."
-   ```
-
-   The template will guide the user through the required fields. You need to provide:
-   - **Bug reports**: Description, reproduction steps, expected vs actual behavior
-   - **Feature requests**: Description, motivation/use case, optional proposed implementation
-   - **Documentation**: Description, location of docs, suggested improvement
-
-5. **Confirm success** by showing:
-   - The issue URL
-   - The issue number
-   - Which template was used
-
-## Template Field Guide
-
-### Bug Report (`bug_report`)
-Required fields in the body:
-- **Bug Description** - what happened vs expected
-- **Steps to Reproduce** - numbered list to recreate the bug
-- **Relevant Code** - code snippets, configuration, error messages
-- **Component** - which part of Kit (ui, extensions, session, etc.)
-- **Version** - Kit version or commit hash
-
-### Feature Request (`feature_request`)
-Required fields in the body:
-- **Feature Description** - what to add/change
-- **Motivation / Use Case** - why this is needed
-- **Proposed Implementation** - how it could work (optional)
-
-### Documentation (`documentation`)
-Required fields in the body:
-- **Documentation Issue** - what's wrong or missing
-- **Documentation Location** - file or URL where docs exist
-- **Suggested Improvement** - how to fix the docs
-
-## Guidelines
-
-- ALWAYS use `--template <name>` instead of bare `gh issue create`
-- Include file paths and line numbers when you know them
-- Use triple backticks for code blocks
-- Keep the body factual - avoid speculation unless in "Proposed Fix" section
-- If you're unsure about technical details, say so in the issue
-- For UI bugs, describe what you see vs what you expect
-- For API bugs, include the relevant struct/function names
-
-## Example Usage
-
-User: `/file-issue The ToolRenderConfig BorderColor field is documented but never used in rendering`
-
-You: 
-1. Determine this is a **bug** (documented field doesn't work)
-2. Use `--template bug_report`
-3. Gather: reproduction steps (register renderer with BorderColor), expected (custom color), actual (default color)
-4. Create issue with title `fix: ToolRenderConfig BorderColor and Background fields are ignored`
-5. Confirm: Created issue #42 using bug_report template

.kit/prompts/new-prompt.md

@@ -1,47 +0,0 @@
----
-description: Scaffold a new prompt template in .kit/prompts/
----
-
-Create a new kit prompt template. The user wants a prompt that does: $@
-
-## What a prompt template is
-
-A prompt template is a `.md` file in `.kit/prompts/` (project-local) or `~/.kit/prompts/` (global).
-It becomes a `/slug` slash command in the kit input box — typed as `/filename` with optional arguments.
-
-## File format
-
-```
----
-description: One-line description shown in autocomplete
----
-
-Body text of the prompt. Use $@ for all user-supplied arguments,
-$1 $2 etc. for positional arguments.
-```
-
-- **Filename** → slug: `commit-push.md` becomes `/commit-push`
-- **Frontmatter**: only `description` is recognised; keep it under ~80 chars
-- **Body**: plain markdown; the full text is submitted as the user's message when the template fires
-- **Arguments**: `$@` expands to everything the user typed after the slash command name;
-  `$1`, `$2` for individual positional args; omit entirely if no arguments are needed
-
-## Steps
-
-1. **Understand the workflow** the user described in `$@` — ask a clarifying question if the intent is ambiguous
-2. **Choose a filename**: short, lowercase, hyphen-separated, descriptive (e.g. `code-review.md`)
-3. **Write the description**: one sentence, imperative, fits in autocomplete
-4. **Draft the body**:
-   - Open with a single sentence stating the goal
-   - Use `## Steps` for multi-step workflows; use plain prose for simple prompts
-   - Be specific: name commands, flags, and file paths where relevant
-   - End with `$@` on its own line if the user might want to pass context or a hint; omit if the prompt is self-contained
-5. **Write the file** to `.kit/prompts/<slug>.md`
-6. **Confirm** by showing the final file content and the slash command that activates it
-
-## Guidelines
-
-- Keep prompts action-oriented — they should tell kit *what to do*, not just *what to think about*
-- Prefer concrete steps over vague instructions
-- A prompt that does one thing well beats one that tries to cover every edge case
-- If the workflow already exists as a prompt, suggest extending it instead of duplicating

.kit/prompts/release-tagger.md

@@ -1,70 +0,0 @@
----
-description: Semantic version tagging workflow - analyzes commits and tags releases
----
-
-# Release Tagging Workflow
-
-Tag a new version of this Go project following semantic versioning.
-
-## Steps
-
-1. **Fetch remote tags**: `git fetch --tags origin`
-
-2. **Find latest version**: `git tag -l | sort -V | tail -5` to see recent tags
-
-3. **Analyze changes since last tag**:
-   - `git log <latest-tag>..HEAD --oneline` - list commits
-   - `git diff <latest-tag>..HEAD --stat` - see file stats
-   - `git diff <latest-tag>..HEAD --name-only` - see changed files
-
-4. **Determine version bump** (Semantic Versioning):
-   - **MAJOR (X.0.0)**: Breaking API changes, incompatible modifications
-   - **MINOR (0.X.0)**: New features, backward-compatible additions
-   - **PATCH (0.0.X)**: Bug fixes, backward-compatible fixes
-   
-   Look for indicators:
-   - `feat:` or `feature:` commits → MINOR
-   - `fix:` or `bugfix:` commits → PATCH
-   - `breaking:` or `BREAKING CHANGE:` → MAJOR
-   - Breaking API changes in `pkg/` or public interfaces → MAJOR
-   - New commands, flags, or features → MINOR
-   - Documentation-only changes → PATCH (or skip)
-
-5. **Calculate new version**: Increment appropriate segment, reset lower segments to 0
-
-6. **Draft tag message**:
-   - Summarize key changes from commits
-   - Group by type (Features, Fixes, Breaking Changes)
-   - Keep concise but informative
-
-7. **Create annotated tag**: `git tag -a vX.Y.Z -m "vX.Y.Z - <summary>\n\n<detailed list>"`
-
-8. **Push tag**: `git push origin vX.Y.Z`
-
-## Guidelines
-
-- Always fetch remote tags first to avoid conflicts
-- Use annotated tags (`-a`) with descriptive messages
-- Follow semver strictly - when in doubt, prefer conservative bump (patch over minor)
-- For Go projects, changes to `pkg/` or exported APIs warrant careful version consideration
-- If no changes since last tag, suggest skipping the release
-- Include commit summaries in the tag message body
-
-## Example Tag Message Format
-
-```
-v0.30.1 - Bug fixes for model handling and UI improvements
-
-Fixes:
-- Properly handle think tags from Qwen/DeepSeek models
-- Handle custom provider model persistence and bare model names
-
-Improvements:
-- UI style refactoring and cleanup
-```
-
-Wait for the user to confirm the version and message before executing tag commands.
-
----
-
-$@

AGENTS.md

@@ -1,3 +1,22 @@
+<!-- OPENSPEC:START -->
+# OpenSpec Instructions
+
+These instructions are for AI assistants working in this project.
+
+Always open `@/openspec/AGENTS.md` when the request:
+- Mentions planning or proposals (words like proposal, spec, change, plan)
+- Introduces new capabilities, breaking changes, architecture shifts, or big performance/security work
+- Sounds ambiguous and you need the authoritative spec before coding
+
+Use `@/openspec/AGENTS.md` to learn:
+- How to create and apply change proposals
+- Spec format and conventions
+- Project structure and guidelines
+
+Keep this managed block so 'openspec update' can refresh the instructions.
+
+<!-- OPENSPEC:END -->
+
 # KIT Agent Guidelines
 
 ## Build/Test Commands
@@ -23,33 +42,6 @@
 - **Extension system** (`internal/extensions/`): Yaegi-interpreted Go, 13 lifecycle events, custom tools/commands/widgets/overlays/editor interceptors
 - **TUI** (`internal/ui/`): Bubble Tea v2 parent-child model (`AppModel` → `InputComponent`, `StreamComponent`, etc.)
 - **Decoupling pattern**: `cmd/root.go` has converter functions (e.g. `widgetProviderForUI()`) that bridge `internal/extensions/` types to `internal/ui/` types — the UI never imports extensions directly
-- **Public SDK** (`pkg/kit/`): The public-facing Go SDK for embedding Kit as a library. See rules below.
-
-## Public SDK (`pkg/kit/`) Rules
-
-`pkg/kit/` is the **public API surface** consumed by external Go developers. All exported symbols, types, function names, and godoc comments in this package are part of the SDK contract.
-
-### No Dependency Name Leakage
-Internal dependency names (e.g. `charm.land/fantasy`, library-specific jargon) **must not** appear in:
-- **Exported function/method names** — use generic terms (`LLM`, `Provider`, `Message`) instead of library names
-- **Exported type names** — type aliases should use domain names (e.g. `LLMMessage`, not `FantasyMessage`)
-- **Godoc comments** on exported symbols — these are visible in `go doc` output and pkg.go.dev
-- **Struct field names and tags** on exported types
-
-Using dependency types directly in **function bodies** (private implementation) is fine — that's invisible to SDK consumers.
-
-### Naming Conventions for SDK Symbols
-- Type aliases re-exporting dependency types: use `LLM*` prefix (e.g. `LLMMessage`, `LLMUsage`, `LLMResponse`)
-- Conversion helpers: use `ConvertToLLM*` / `ConvertFromLLM*` (not the dependency name)
-- Provider queries: use `GetLLMProviders` (not `GetFantasyProviders`)
-- When wrapping internal methods, the `pkg/kit/` name should be dependency-agnostic even if the `internal/` method still uses the old name
-
-### Deprecation Pattern
-When renaming a public SDK symbol, keep the old name as a deprecated wrapper for one release cycle:
-```go
-// Deprecated: Use NewName instead.
-func OldName() { return NewName() }
-```
 
 ## Key Patterns
 
@@ -100,21 +92,3 @@ Positional args are the prompt. `@file` args attach file content. Key flags: `--
 - Never guess or manually search the filesystem for external projects
 - Example: `btca ask -r https://github.com/user/repo -q "How does X work?"`
 - See `.agents/skills/btca-cli/SKILL.md` for full btca usage
-
-## BTCA Configured Resources
-The following external repositories are configured in `btca.config.jsonc` for research:
-
-- bubbletea
-- lipgloss
-- bubbles
-- glamour
-- fantasy
-- catwalk
-- crush
-- pi
-- iteratr
-- yaegi
-- acp-go-sdk
-- opencode
-- herald
-- herald-md

AUTOSCROLL_FIX_SUMMARY.md

@@ -1,80 +0,0 @@
-# Autoscroll Fix - Final Summary
-
-## Root Cause
-
-The autoscroll was failing for streaming assistant messages due to a bug in how `GotoBottom()` calculated item heights.
-
-### The Problem
-
-1. **Reasoning blocks** (`StreamingMessageItem` with `role="reasoning"`) are **never cached** because they have live duration counters that update every render
-2. The `Height()` method returns `0` when `cachedRender == ""`
-3. `GotoBottom()` was calling:
-   ```go
-   itemHeight := item.Height()  // Returns 0 for reasoning
-   if itemHeight == 0 {
-       item.Render(s.width)  // Renders but doesn't cache (reasoning)
-       itemHeight = item.Height()  // Still returns 0!
-   }
-   ```
-4. This caused incorrect scroll position calculations, especially during reasoning → assistant transitions
-
-## The Solution
-
-Changed `GotoBottom()` and `AtBottom()` to calculate height **directly from the rendered string** instead of relying on the cached height:
-
-```go
-// OLD: item.Height() which checks cached render
-itemHeight := item.Height()
-if itemHeight == 0 {
-    item.Render(s.width)
-    itemHeight = item.Height()  // Still might be 0!
-}
-
-// NEW: Calculate from rendered string directly
-rendered := item.Render(s.width)
-itemHeight := strings.Count(rendered, "\n") + 1
-```
-
-This works for **all** items regardless of whether they cache their render or not.
-
-## Files Changed
-
-### `internal/ui/scrolllist.go`
-- **`GotoBottom()`**: Calculate height from rendered string (2 loops)
-- **`AtBottom()`**: Calculate height from rendered string (1 loop)
-
-### `internal/ui/model.go`
-- **`appendStreamingChunk()`**: For existing messages, call `GotoBottom()` directly (iteratr pattern)
-- **`refreshContent()`**: Simplified to only call `SetItems()` (removed redundant `GotoBottom()`)
-- **Bash streaming handler**: Removed redundant `GotoBottom()` after `refreshContent()`
-
-## Testing Results
-
-✅ **Test prompt**: "explore this repo"
-
-**Before fix**:
-- Autoscroll stopped after reasoning block completed
-- Viewport stuck showing end of reasoning ("Thought for 203ms")
-- Assistant response streamed off-screen below
-
-**After fix**:
-- Autoscroll works throughout reasoning block
-- Autoscroll continues during reasoning → assistant transition  
-- Viewport stays at bottom showing latest assistant content
-- Final position shows end of response (build commands section)
-
-## Behavior Verified
-
-1. ✅ Streaming text auto-scrolls to bottom
-2. ✅ Works across reasoning → assistant transition
-3. ✅ Manual scroll up (PgUp) disables autoscroll
-4. ✅ Scroll to bottom (Alt+End) re-enables autoscroll
-5. ✅ Accurate positioning with no offset errors
-
-## Performance Note
-
-The fix calls `Render()` on all items during `GotoBottom()` calculations. This is acceptable because:
-- `Render()` is already optimized with caching for non-reasoning items
-- `GotoBottom()` is only called during content updates (not every frame)
-- Reasoning blocks need to render anyway for live duration updates
-- This matches iteratr's approach of ensuring items are rendered before height calculations

README.md

@@ -18,7 +18,7 @@ A powerful, extensible AI coding agent CLI with multi-provider support, built-in
 ## Features
 
 - **Multi-Provider LLM Support**: Anthropic, OpenAI, Google Gemini, Ollama, Azure OpenAI, AWS Bedrock, OpenRouter, and more
-- **Built-in Core Tools**: bash, read, write, edit, grep, find, ls, subagent - no MCP overhead
+- **Built-in Core Tools**: bash, read, write, edit, grep, find, ls, spawn_subagent - no MCP overhead
 - **MCP Integration**: Connect external MCP servers for expanded capabilities
 - **Extension System**: Write custom tools, commands, widgets, and UI modifications in Go
 - **Theming**: 22 built-in color themes (KITT, Catppuccin, Dracula, Nord, etc.) with runtime switching, persistence, and custom theme files
@@ -209,7 +209,7 @@ kit auth status              # Check authentication status
 
 # Model database
 kit models [provider]        # List available models (optionally filter by provider)
-kit models --all             # Show all providers (not just LLM-compatible)
+kit models --all             # Show all providers (not just Fantasy-compatible)
 kit update-models [source]   # Update model database (from models.dev, URL, file, or 'embedded')
 
 # Extension management
@@ -307,12 +307,6 @@ kit -e examples/extensions/minimal.go
 - **Themes**: Register and switch color themes via `RegisterTheme`, `SetTheme`, `ListThemes`
 - **Custom Events**: Inter-extension communication via `EmitCustomEvent`
 
-**Bridged SDK APIs** (NEW): Extensions can now access internal SDK capabilities:
-- **Tree Navigation**: Navigate conversation history (`GetTreeNode`, `GetCurrentBranch`, `NavigateTo`), summarize branches (`SummarizeBranch`), and implement fresh context loops (`CollapseBranch`)
-- **Skill Loading**: Dynamically load and inject skills at runtime (`LoadSkill`, `DiscoverSkills`, `InjectSkillAsContext`)
-- **Template Parsing**: Parse and render templates with `{{variables}}` (`ParseTemplate`, `RenderTemplate`), parse CLI-style arguments (`ParseArguments`, `SimpleParseArguments`), and evaluate model conditionals (`EvaluateModelConditional`, `RenderWithModelConditionals`)
-- **Model Resolution**: Resolve model fallback chains (`ResolveModelChain`), query model capabilities (`GetModelCapabilities`, `CheckModelAvailable`), and extract provider/model ID (`GetCurrentProvider`, `GetCurrentModelID`)
-
 ### Extension Examples
 
 See the `examples/extensions/` directory:
@@ -324,7 +318,6 @@ See the `examples/extensions/` directory:
 - `compact-notify.go` - Notification on compaction
 - `confirm-destructive.go` - Confirm destructive operations
 - `context-inject.go` - Inject context into conversations
-- `conversation-manager.go` - **NEW** Tree navigation, branch summarization, and fresh context loops
 - `custom-editor-demo.go` - Vim-like modal editor
 - `dev-reload.go` - Development live-reload
 - `header-footer-demo.go` - Custom headers and footers
@@ -339,7 +332,6 @@ See the `examples/extensions/` directory:
 - `plan-mode.go` - Read-only planning mode
 - `project-rules.go` - Project-specific rules
 - `prompt-demo.go` - Interactive prompts (select/confirm/input)
-- `prompt-templates.go` - **NEW** Frontmatter-driven templates with model switching and skill injection
 - `protected-paths.go` - Path protection for sensitive files
 - `subagent-widget.go` - Multi-agent orchestration with status widget
 - `subagent-test.go` - Subagent testing utilities
@@ -477,7 +469,7 @@ During an interactive session, use these slash commands:
 | `/import <path>` | Import and switch to a session from a JSONL file |
 | `/share` | Upload session to GitHub Gist and get a shareable viewer URL |
 | `/tree` | Navigate the session tree |
-| `/fork` | Fork to new session from an earlier message |
+| `/fork` | Branch from an earlier message |
 | `/new` | Start a fresh session |
 
 ## Go SDK
@@ -502,7 +494,7 @@ func main() {
     if err != nil {
         log.Fatal(err)
     }
-    defer func() { _ = host.Close() }()
+    defer host.Close()
     
     // Send a prompt
     response, err := host.Prompt(ctx, "What is 2+2?")
@@ -531,12 +523,7 @@ host, err := kit.New(ctx, &kit.Options{
     NoSession:    true,                // Ephemeral mode
 
     // Tool options
-    Tools:            []kit.Tool{...},     // Replace default tool set entirely
-    ExtraTools:       []kit.Tool{...},     // Add tools alongside defaults
-    DisableCoreTools: true,                // Use no core tools (0 tools, for chat-only)
-
-    // Configuration
-    SkipConfig:   true,                   // Skip .kit.yml files (viper defaults + env vars still apply)
+    ExtraTools:   []kit.Tool{...},     // Additional tools alongside defaults
 
     // Compaction
     AutoCompact:  true,                // Auto-compact near context limit
@@ -548,26 +535,23 @@ host, err := kit.New(ctx, &kit.Options{
 ### With Callbacks
 
 ```go
-unsub := host.OnToolCall(func(e kit.ToolCallEvent) {
-    println("Calling tool:", e.ToolName)
-})
-defer unsub()
-
-unsub2 := host.OnToolResult(func(e kit.ToolResultEvent) {
-    if e.IsError {
-        println("Tool failed:", e.ToolName)
-    }
-})
-defer unsub2()
-
-unsub3 := host.OnStreaming(func(e kit.MessageUpdateEvent) {
-    print(e.Chunk)
-})
-defer unsub3()
-
-response, err := host.Prompt(
+response, err := host.PromptWithCallbacks(
     ctx,
     "List files in current directory",
+    func(name, args string) {
+        // Tool call started
+        println("Calling tool:", name)
+    },
+    func(name, args, result string, isError bool) {
+        // Tool call completed
+        if isError {
+            println("Tool failed:", name)
+        }
+    },
+    func(chunk string) {
+        // Streaming text chunk
+        print(chunk)
+    },
 )
 ```
 
@@ -731,7 +715,7 @@ Use `custom/custom` when pointing Kit at any OpenAI-compatible endpoint with `--
 kit --provider-url "http://localhost:8080/v1" "Hello"
 ```
 
-This automatically defaults to `custom/custom` without needing to specify a model. The custom provider routes through the `openaicompat` provider and supports:
+This automatically defaults to `custom/custom` without needing to specify a model. The custom provider routes through fantasy's `openaicompat` provider and supports:
 
 - Zero cost tracking (input/output = 0)
 - 262K context window, 65K output limit

btca.config.jsonc

@@ -76,18 +76,6 @@
       "name": "opencode",
       "url": "https://github.com/anomalyco/opencode",
       "branch": "dev"
-    },
-    {
-      "type": "git",
-      "name": "herald",
-      "url": "https://github.com/indaco/herald",
-      "branch": "main"
-    },
-    {
-      "type": "git",
-      "name": "herald-md",
-      "url": "https://github.com/indaco/herald-md",
-      "branch": "main"
     }
   ],
   "model": "claude-haiku-4-5",

cmd/acp.go

@@ -11,7 +11,6 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/charmbracelet/log"
 	acp "github.com/coder/acp-go-sdk"
 
 	"github.com/mark3labs/kit/internal/acpserver"
@@ -55,8 +54,6 @@ func runACP(cmd *cobra.Command, _ []string) error {
 		conn.SetLogger(slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{
 			Level: slog.LevelDebug,
 		})))
-		// Also set charmbracelet/log level for acpserver package logging
-		log.SetLevel(log.DebugLevel)
 	}
 
 	// Wait for either the client to disconnect or a signal.

cmd/models.go

@@ -55,7 +55,7 @@ func printAllProviders(showAll bool) error {
 	if showAll {
 		providerIDs = kit.GetSupportedProviders()
 	} else {
-		providerIDs = kit.GetLLMProviders()
+		providerIDs = kit.GetFantasyProviders()
 	}
 	sort.Strings(providerIDs)
 

cmd/setup.go

@@ -41,6 +41,7 @@ func BuildAppOptions(mcpConfig *config.Config, modelName string, serverNames, to
 		StreamingEnabled: viper.GetBool("stream"),
 		Quiet:            quietFlag,
 		Debug:            viper.GetBool("debug"),
+		CompactMode:      viper.GetBool("compact"),
 	}
 }
 
@@ -130,6 +131,7 @@ func SetupCLIForNonInteractive(k *kit.Kit) (*ui.CLI, error) {
 		Agent:          agentAdapter,
 		ModelString:    viper.GetString("model"),
 		Debug:          viper.GetBool("debug"),
+		Compact:        viper.GetBool("compact"),
 		Quiet:          quietFlag,
 		ShowDebug:      false,
 		ProviderAPIKey: viper.GetString("provider-api-key"),

examples/extensions/all_extensions_load_test.go

@@ -1,27 +0,0 @@
-package main
-
-import (
-	"testing"
-
-	"github.com/mark3labs/kit/pkg/extensions/test"
-)
-
-// TestAllExtensions_Load is a smoke test that verifies every single-file
-// example extension in this directory can be loaded by the Yaegi interpreter
-// without errors. This catches syntax errors, missing symbols, bad imports,
-// and Init signature mismatches.
-func TestAllExtensions_Load(t *testing.T) {
-	files := extensionFiles(t)
-
-	for _, file := range files {
-		t.Run(file, func(t *testing.T) {
-			harness := test.New(t)
-			ext := harness.LoadFile(file)
-			if ext == nil {
-				t.Fatalf("%s: extension should not be nil after loading", file)
-			}
-		})
-	}
-
-	t.Logf("successfully loaded %d extensions", len(files))
-}

examples/extensions/all_extensions_sanity_test.go

@@ -1,253 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/mark3labs/kit/internal/extensions"
-	"github.com/mark3labs/kit/pkg/extensions/test"
-)
-
-// extensionFiles returns all single-file extensions in the current directory.
-// It skips test files, the test template, and files without an Init function.
-func extensionFiles(t *testing.T) []string {
-	t.Helper()
-
-	skip := map[string]bool{
-		"extension_test_template.go": true,
-	}
-
-	entries, err := os.ReadDir(".")
-	if err != nil {
-		t.Fatalf("failed to read directory: %v", err)
-	}
-
-	var files []string
-	for _, entry := range entries {
-		name := entry.Name()
-		if entry.IsDir() || filepath.Ext(name) != ".go" {
-			continue
-		}
-		if strings.HasSuffix(name, "_test.go") || skip[name] {
-			continue
-		}
-		src, err := os.ReadFile(name)
-		if err != nil {
-			t.Fatalf("failed to read %s: %v", name, err)
-		}
-		if !strings.Contains(string(src), "func Init(") {
-			continue
-		}
-		files = append(files, name)
-	}
-
-	if len(files) == 0 {
-		t.Fatal("no extensions found — check the directory")
-	}
-	return files
-}
-
-// TestAllExtensions_Lifecycle verifies that every extension survives a full
-// SessionStart → SessionShutdown round-trip without errors.
-func TestAllExtensions_Lifecycle(t *testing.T) {
-	for _, file := range extensionFiles(t) {
-		t.Run(file, func(t *testing.T) {
-			harness := test.New(t)
-			harness.LoadFile(file)
-
-			_, err := harness.Emit(extensions.SessionStartEvent{
-				SessionID: "smoke-test-session",
-			})
-			if err != nil {
-				t.Fatalf("SessionStart error: %v", err)
-			}
-
-			_, err = harness.Emit(extensions.SessionShutdownEvent{})
-			if err != nil {
-				t.Fatalf("SessionShutdown error: %v", err)
-			}
-		})
-	}
-}
-
-// TestAllExtensions_CommandSanity checks that every registered command has
-// a non-empty name, a non-empty description, no spaces in the name, no
-// leading slash, a non-nil Execute function, and no duplicate names.
-func TestAllExtensions_CommandSanity(t *testing.T) {
-	for _, file := range extensionFiles(t) {
-		t.Run(file, func(t *testing.T) {
-			harness := test.New(t)
-			harness.LoadFile(file)
-
-			cmds := harness.RegisteredCommands()
-			seen := make(map[string]bool)
-			for _, cmd := range cmds {
-				if cmd.Name == "" {
-					t.Error("command has empty name")
-				}
-				if strings.Contains(cmd.Name, " ") {
-					t.Errorf("command %q contains spaces", cmd.Name)
-				}
-				if strings.HasPrefix(cmd.Name, "/") {
-					t.Errorf("command %q has leading slash (framework adds it)", cmd.Name)
-				}
-				if cmd.Description == "" {
-					t.Errorf("command %q has empty description", cmd.Name)
-				}
-				if cmd.Execute == nil {
-					t.Errorf("command %q has nil Execute function", cmd.Name)
-				}
-				if seen[cmd.Name] {
-					t.Errorf("duplicate command name %q", cmd.Name)
-				}
-				seen[cmd.Name] = true
-			}
-		})
-	}
-}
-
-// TestAllExtensions_ToolSanity checks that every registered tool has a
-// non-empty name, a non-empty description, at least one executor, valid
-// JSON in its Parameters field, and no duplicate names.
-func TestAllExtensions_ToolSanity(t *testing.T) {
-	for _, file := range extensionFiles(t) {
-		t.Run(file, func(t *testing.T) {
-			harness := test.New(t)
-			harness.LoadFile(file)
-
-			tools := harness.RegisteredTools()
-			seen := make(map[string]bool)
-			for _, tool := range tools {
-				if tool.Name == "" {
-					t.Error("tool has empty name")
-				}
-				if tool.Description == "" {
-					t.Errorf("tool %q has empty description", tool.Name)
-				}
-				if tool.Execute == nil && tool.ExecuteWithContext == nil {
-					t.Errorf("tool %q has no executor (both Execute and ExecuteWithContext are nil)", tool.Name)
-				}
-				if tool.Parameters != "" && !json.Valid([]byte(tool.Parameters)) {
-					t.Errorf("tool %q has invalid JSON in Parameters: %s", tool.Name, tool.Parameters)
-				}
-				if seen[tool.Name] {
-					t.Errorf("duplicate tool name %q", tool.Name)
-				}
-				seen[tool.Name] = true
-			}
-		})
-	}
-}
-
-// TestAllExtensions_ZeroValueEvents fires every event type (as zero-value
-// structs) at each extension and verifies no errors are returned. Extensions
-// should be resilient to events they don't handle and to events with empty
-// fields.
-func TestAllExtensions_ZeroValueEvents(t *testing.T) {
-	// Build the set of zero-value events for every event type.
-	zeroEvents := []extensions.Event{
-		extensions.ToolCallEvent{},
-		extensions.ToolExecutionStartEvent{},
-		extensions.ToolExecutionEndEvent{},
-		extensions.ToolOutputEvent{},
-		extensions.ToolResultEvent{},
-		extensions.InputEvent{},
-		extensions.BeforeAgentStartEvent{},
-		extensions.AgentStartEvent{},
-		extensions.AgentEndEvent{},
-		extensions.MessageStartEvent{},
-		extensions.MessageUpdateEvent{},
-		extensions.MessageEndEvent{},
-		extensions.SessionStartEvent{},
-		extensions.SessionShutdownEvent{},
-		extensions.ModelChangeEvent{},
-		extensions.ContextPrepareEvent{},
-		extensions.BeforeForkEvent{},
-		extensions.BeforeSessionSwitchEvent{},
-		extensions.BeforeCompactEvent{},
-		extensions.SubagentStartEvent{},
-		extensions.SubagentChunkEvent{},
-		extensions.SubagentEndEvent{},
-	}
-
-	for _, file := range extensionFiles(t) {
-		t.Run(file, func(t *testing.T) {
-			harness := test.New(t)
-			harness.LoadFile(file)
-
-			for _, ev := range zeroEvents {
-				_, err := harness.Emit(ev)
-				if err != nil {
-					t.Errorf("event %T returned error: %v", ev, err)
-				}
-			}
-		})
-	}
-}
-
-// TestAllExtensions_WidgetSanity emits SessionStart and then checks that
-// any widgets set during initialization have non-empty IDs and valid
-// placements.
-func TestAllExtensions_WidgetSanity(t *testing.T) {
-	validPlacements := map[extensions.WidgetPlacement]bool{
-		"above": true,
-		"below": true,
-	}
-
-	for _, file := range extensionFiles(t) {
-		t.Run(file, func(t *testing.T) {
-			harness := test.New(t)
-			harness.LoadFile(file)
-
-			// Trigger SessionStart so extensions that set widgets on init do so.
-			_, _ = harness.Emit(extensions.SessionStartEvent{
-				SessionID: "widget-sanity-test",
-			})
-
-			// Widgets is an exported field on MockContext; reads are safe
-			// here because Emit returned synchronously.
-			for id, w := range harness.Context().Widgets {
-				if w.ID == "" {
-					t.Errorf("widget stored with key %q has empty ID", id)
-				}
-				if w.ID != id {
-					t.Errorf("widget key %q doesn't match widget ID %q", id, w.ID)
-				}
-				if !validPlacements[w.Placement] {
-					t.Errorf("widget %q has invalid placement %q (want \"above\" or \"below\")", id, w.Placement)
-				}
-			}
-		})
-	}
-}
-
-// TestAllExtensions_IdempotentLifecycle verifies that receiving SessionStart
-// twice and SessionShutdown twice doesn't cause errors — extensions should
-// be defensive about repeated lifecycle events.
-func TestAllExtensions_IdempotentLifecycle(t *testing.T) {
-	for _, file := range extensionFiles(t) {
-		t.Run(file, func(t *testing.T) {
-			harness := test.New(t)
-			harness.LoadFile(file)
-
-			for i := range 2 {
-				_, err := harness.Emit(extensions.SessionStartEvent{
-					SessionID: "idempotent-test",
-				})
-				if err != nil {
-					t.Fatalf("SessionStart #%d error: %v", i+1, err)
-				}
-			}
-
-			for i := range 2 {
-				_, err := harness.Emit(extensions.SessionShutdownEvent{})
-				if err != nil {
-					t.Fatalf("SessionShutdown #%d error: %v", i+1, err)
-				}
-			}
-		})
-	}
-}

examples/extensions/bridge_demo.go

@@ -1,170 +0,0 @@
-//go:build ignore
-
-// bridge_demo.go - Demonstrates the new bridged SDK APIs for extensions.
-// This extension showcases tree navigation, skill loading, template parsing,
-// and model resolution capabilities.
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-
-	"kit/ext"
-)
-
-var (
-	discoveredSkills []ext.Skill
-	currentBranch    []ext.TreeNode
-)
-
-func Init(api ext.API) {
-	// Register /tree-info command to demonstrate tree navigation
-	api.RegisterCommand(ext.CommandDef{
-		Name:        "tree-info",
-		Description: "Show current conversation tree information",
-		Execute: func(args string, ctx ext.Context) (string, error) {
-			branch := ctx.GetCurrentBranch()
-			info := fmt.Sprintf("Current branch has %d nodes:\n", len(branch))
-			for i, node := range branch {
-				info += fmt.Sprintf("  [%d] %s (%s): %s...\n", i, node.Type, node.ID[:8], truncate(node.Content, 40))
-			}
-			ctx.PrintInfo(info)
-			return "", nil
-		},
-	})
-
-	// Register /discover-skills command
-	api.RegisterCommand(ext.CommandDef{
-		Name:        "discover-skills",
-		Description: "Discover and list available skills",
-		Execute: func(args string, ctx ext.Context) (string, error) {
-			result := ctx.DiscoverSkills()
-			if result.Error != "" {
-				return "", fmt.Errorf("discovery failed: %s", result.Error)
-			}
-			discoveredSkills = result.Skills
-
-			info := fmt.Sprintf("Discovered %d skills:\n", len(result.Skills))
-			for _, s := range result.Skills {
-				info += fmt.Sprintf("  - %s: %s\n", s.Name, s.Description)
-			}
-			ctx.PrintInfo(info)
-			return "", nil
-		},
-	})
-
-	// Register /parse-template command
-	api.RegisterCommand(ext.CommandDef{
-		Name:        "parse-template",
-		Description: "Parse a template and show extracted variables",
-		Execute: func(args string, ctx ext.Context) (string, error) {
-			if args == "" {
-				args = "Hello {{name}}, welcome to {{place}}!"
-			}
-			tpl := ctx.ParseTemplate("demo", args)
-			info := fmt.Sprintf("Template: %s\nVariables: %v", tpl.Content, tpl.Variables)
-			ctx.PrintInfo(info)
-			return "", nil
-		},
-	})
-
-	// Register /render-template command
-	api.RegisterCommand(ext.CommandDef{
-		Name:        "render-template",
-		Description: "Render a template with variables (usage: /render-template name=John place=Kit)",
-		Execute: func(args string, ctx ext.Context) (string, error) {
-			tpl := ctx.ParseTemplate("demo", "Hello {{name}}, welcome to {{place}}!")
-			vars := ctx.ParseArguments(args, ext.ArgumentPattern{
-				Flags: map[string]string{"name": "name", "place": "place"},
-			})
-			rendered := ctx.RenderTemplate(tpl, vars.Vars)
-			ctx.PrintInfo("Rendered: " + rendered)
-			return "", nil
-		},
-	})
-
-	// Register /check-model command
-	api.RegisterCommand(ext.CommandDef{
-		Name:        "check-model",
-		Description: "Check model capabilities and availability",
-		Execute: func(args string, ctx ext.Context) (string, error) {
-			model := args
-			if model == "" {
-				model = ctx.Model
-			}
-
-			available := ctx.CheckModelAvailable(model)
-			caps, err := ctx.GetModelCapabilities(model)
-
-			info := fmt.Sprintf("Model: %s\n", model)
-			info += fmt.Sprintf("Available: %v\n", available)
-			if err == "" {
-				info += fmt.Sprintf("Provider: %s\n", caps.Provider)
-				info += fmt.Sprintf("Context Limit: %d\n", caps.ContextLimit)
-				info += fmt.Sprintf("Reasoning: %v\n", caps.Reasoning)
-			} else {
-				info += fmt.Sprintf("Error: %s\n", err)
-			}
-			ctx.PrintInfo(info)
-			return "", nil
-		},
-	})
-
-	// Register /resolve-chain command
-	api.RegisterCommand(ext.CommandDef{
-		Name:        "resolve-chain",
-		Description: "Resolve a model chain (usage: /resolve-chain claude-opus,gpt-4o,claude-sonnet)",
-		Execute: func(args string, ctx ext.Context) (string, error) {
-			if args == "" {
-				args = "anthropic/claude-opus-4,anthropic/claude-sonnet-4,openai/gpt-4o"
-			}
-			prefs := ctx.SimpleParseArguments(args, 1)
-			chain := []string{}
-			if len(prefs) > 1 {
-				// Split the first arg by comma
-				for _, p := range strings.Split(prefs[1], ",") {
-					p = strings.TrimSpace(p)
-					if p != "" {
-						chain = append(chain, p)
-					}
-				}
-			}
-
-			result := ctx.ResolveModelChain(chain)
-			info, _ := json.MarshalIndent(result, "", "  ")
-			ctx.PrintInfo("Resolution Result:\n" + string(info))
-			return "", nil
-		},
-	})
-
-	// Register /test-conditional command
-	api.RegisterCommand(ext.CommandDef{
-		Name:        "test-conditional",
-		Description: "Test model conditional rendering",
-		Execute: func(args string, ctx ext.Context) (string, error) {
-			content := `<if-model is="claude-*">This is for Claude models<else>This is for other models</if-model>`
-			rendered := ctx.RenderWithModelConditionals(content)
-			ctx.PrintInfo("Input: " + content)
-			ctx.PrintInfo("Output: " + rendered)
-			ctx.PrintInfo(fmt.Sprintf("Current model matches 'claude-*': %v", ctx.EvaluateModelConditional("claude-*")))
-			return "", nil
-		},
-	})
-
-	// OnSessionStart: discover skills automatically
-	api.OnSessionStart(func(e ext.SessionStartEvent, ctx ext.Context) {
-		result := ctx.DiscoverSkills()
-		if result.Error == "" && len(result.Skills) > 0 {
-			discoveredSkills = result.Skills
-			ctx.SetStatus("bridge-demo", fmt.Sprintf("%d skills", len(result.Skills)), 50)
-		}
-	})
-}
-
-func truncate(s string, max int) string {
-	if len(s) <= max {
-		return s
-	}
-	return s[:max-3] + "..."
-}

examples/extensions/conversation-manager.go

@@ -1,406 +0,0 @@
-//go:build ignore
-
-// conversation-manager.go - Advanced conversation tree navigation and management.
-// This extension demonstrates:
-// - Tree navigation (GetTreeNode, GetCurrentBranch, NavigateTo)
-// - Branch summarization and collapsing
-// - Interactive tree exploration
-//
-// Commands:
-//   /tree              - Show conversation tree structure
-//   /branch            - Show current branch path
-//   /goto <entry-id>   - Navigate to a specific entry
-//   /summarize <n>     - Summarize last N messages
-//   /fresh-context     - Collapse branch and start fresh
-//   /loop <n> <prompt> - Execute prompt N times with fresh context each iteration
-
-package main
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-
-	"kit/ext"
-)
-
-var (
-	loopActive    bool
-	loopCount     int
-	loopCurrent   int
-	loopPrompt    string
-	loopStartNode string
-)
-
-func Init(api ext.API) {
-	// /tree - Show tree structure
-	api.RegisterCommand(ext.CommandDef{
-		Name:        "tree",
-		Description: "Show conversation tree structure",
-		Execute: func(args string, ctx ext.Context) (string, error) {
-			showTree(ctx)
-			return "", nil
-		},
-	})
-
-	// /branch - Show current branch
-	api.RegisterCommand(ext.CommandDef{
-		Name:        "branch",
-		Description: "Show current conversation branch",
-		Execute: func(args string, ctx ext.Context) (string, error) {
-			showBranch(ctx)
-			return "", nil
-		},
-	})
-
-	// /goto - Navigate to entry
-	api.RegisterCommand(ext.CommandDef{
-		Name:        "goto",
-		Description: "Navigate to a specific entry ID (usage: /goto <entry-id>)",
-		Execute: func(args string, ctx ext.Context) (string, error) {
-			if args == "" {
-				ctx.PrintError("Usage: /goto <entry-id>")
-				return "", nil
-			}
-			result := ctx.NavigateTo(args)
-			if !result.Success {
-				ctx.PrintError(fmt.Sprintf("Navigation failed: %s", result.Error))
-				return "", nil
-			}
-			ctx.PrintInfo(fmt.Sprintf("Navigated to entry: %s", args))
-
-			// Show the node we navigated to
-			node := ctx.GetTreeNode(args)
-			if node != nil {
-				ctx.PrintInfo(fmt.Sprintf("Entry type: %s, Role: %s", node.Type, node.Role))
-			}
-			return "", nil
-		},
-	})
-
-	// /summarize - Summarize recent messages
-	api.RegisterCommand(ext.CommandDef{
-		Name:        "summarize",
-		Description: "Summarize last N messages (usage: /summarize [n=5])",
-		Execute: func(args string, ctx ext.Context) (string, error) {
-			n := 5
-			if args != "" {
-				if parsed, err := strconv.Atoi(args); err == nil && parsed > 0 {
-					n = parsed
-				}
-			}
-
-			branch := ctx.GetCurrentBranch()
-			if len(branch) < 2 {
-				ctx.PrintError("Not enough messages to summarize")
-				return "", nil
-			}
-
-			// Find range to summarize
-			startIdx := len(branch) - n - 1
-			if startIdx < 0 {
-				startIdx = 0
-			}
-			endIdx := len(branch) - 1
-
-			fromID := branch[startIdx].ID
-			toID := branch[endIdx].ID
-
-			ctx.PrintInfo(fmt.Sprintf("Summarizing messages %d to %d...", startIdx, endIdx))
-			summary := ctx.SummarizeBranch(fromID, toID)
-
-			if summary == "" {
-				ctx.PrintError("Failed to generate summary")
-				return "", nil
-			}
-
-			ctx.PrintBlock(ext.PrintBlockOpts{
-				Text:        summary,
-				BorderColor: "#89b4fa",
-				Subtitle:    "conversation-manager · Summary",
-			})
-			return "", nil
-		},
-	})
-
-	// /fresh-context - Collapse and restart
-	api.RegisterCommand(ext.CommandDef{
-		Name:        "fresh-context",
-		Description: "Collapse conversation to summary and start fresh",
-		Execute: func(args string, ctx ext.Context) (string, error) {
-			branch := ctx.GetCurrentBranch()
-			if len(branch) < 3 {
-				ctx.PrintError("Not enough context to collapse")
-				return "", nil
-			}
-
-			// Keep first message (system), summarize rest
-			fromID := branch[1].ID
-			toID := branch[len(branch)-1].ID
-
-			ctx.PrintInfo("Generating summary for context collapse...")
-			summary := ctx.SummarizeBranch(fromID, toID)
-
-			if summary == "" {
-				ctx.PrintError("Failed to generate summary")
-				return "", nil
-			}
-
-			// Collapse the branch
-			result := ctx.CollapseBranch(fromID, toID, summary)
-			if !result.Success {
-				ctx.PrintError(fmt.Sprintf("Collapse failed: %s", result.Error))
-				return "", nil
-			}
-
-			ctx.PrintInfo("Context collapsed. Starting fresh with summary.")
-			ctx.PrintBlock(ext.PrintBlockOpts{
-				Text:        summary,
-				BorderColor: "#a6e3a1",
-				Subtitle:    "conversation-manager · Collapsed Context",
-			})
-
-			// Set a widget showing we're in fresh mode
-			ctx.SetWidget(ext.WidgetConfig{
-				ID:        "fresh-context",
-				Placement: ext.WidgetAbove,
-				Content:   ext.WidgetContent{Text: "🌱 Fresh Context Mode - Previous conversation collapsed"},
-				Style:     ext.WidgetStyle{BorderColor: "#a6e3a1"},
-			})
-
-			return "", nil
-		},
-	})
-
-	// /loop - Execute with fresh context each iteration
-	api.RegisterCommand(ext.CommandDef{
-		Name:        "loop",
-		Description: "Execute prompt N times with fresh context (usage: /loop 5 analyze this code)",
-		Execute: func(args string, ctx ext.Context) (string, error) {
-			if loopActive {
-				ctx.PrintError("Loop already in progress. Wait for completion.")
-				return "", nil
-			}
-
-			// Parse arguments
-			parts := strings.SplitN(args, " ", 2)
-			if len(parts) < 2 {
-				ctx.PrintError("Usage: /loop <count> <prompt>")
-				return "", nil
-			}
-
-			count, err := strconv.Atoi(parts[0])
-			if err != nil || count <= 0 || count > 10 {
-				ctx.PrintError("Invalid count (must be 1-10)")
-				return "", nil
-			}
-
-			loopCount = count
-			loopCurrent = 0
-			loopPrompt = parts[1]
-			loopActive = true
-
-			// Store current branch position
-			branch := ctx.GetCurrentBranch()
-			if len(branch) > 0 {
-				loopStartNode = branch[len(branch)-1].ID
-			}
-
-			ctx.PrintInfo(fmt.Sprintf("Starting loop: %d iterations", loopCount))
-			ctx.SetWidget(ext.WidgetConfig{
-				ID:        "loop-progress",
-				Placement: ext.WidgetAbove,
-				Content:   ext.WidgetContent{Text: fmt.Sprintf("🔄 Loop: 0/%d - %s", loopCount, loopPrompt)},
-				Style:     ext.WidgetStyle{BorderColor: "#fab387"},
-			})
-
-			// Start first iteration
-			executeLoopIteration(ctx)
-			return "", nil
-		},
-	})
-
-	// OnAgentEnd handles loop continuation
-	api.OnAgentEnd(func(e ext.AgentEndEvent, ctx ext.Context) {
-		if !loopActive {
-			return
-		}
-
-		loopCurrent++
-
-		if loopCurrent >= loopCount {
-			// Loop complete
-			loopActive = false
-			ctx.RemoveWidget("loop-progress")
-			ctx.PrintInfo(fmt.Sprintf("✅ Loop complete: %d/%d iterations", loopCurrent, loopCount))
-
-			// Show final summary
-			branch := ctx.GetCurrentBranch()
-			if len(branch) > 0 && loopStartNode != "" {
-				summary := ctx.SummarizeBranch(loopStartNode, branch[len(branch)-1].ID)
-				if summary != "" {
-					ctx.PrintBlock(ext.PrintBlockOpts{
-						Text:        summary,
-						BorderColor: "#a6e3a1",
-						Subtitle:    "conversation-manager · Loop Summary",
-					})
-				}
-			}
-			return
-		}
-
-		// Update progress
-		ctx.SetWidget(ext.WidgetConfig{
-			ID:        "loop-progress",
-			Placement: ext.WidgetAbove,
-			Content:   ext.WidgetContent{Text: fmt.Sprintf("🔄 Loop: %d/%d - %s", loopCurrent, loopCount, loopPrompt)},
-			Style:     ext.WidgetStyle{BorderColor: "#fab387"},
-		})
-
-		// Collapse previous iteration for fresh context
-		branch := ctx.GetCurrentBranch()
-		if len(branch) >= 2 {
-			// Find the user messages (look for the one before the last assistant message)
-			// We want to collapse from the user message that started this iteration
-			// to the last assistant response
-			var collapseStartIdx = -1
-			for i := len(branch) - 1; i >= 0; i-- {
-				if branch[i].Role == "assistant" {
-					// Found the last assistant message, now find the user message before it
-					for j := i - 1; j >= 0; j-- {
-						if branch[j].Role == "user" {
-							collapseStartIdx = j
-							break
-						}
-					}
-					break
-				}
-			}
-
-			if collapseStartIdx >= 0 {
-				fromID := branch[collapseStartIdx].ID
-				toID := branch[len(branch)-1].ID
-
-				ctx.PrintInfo(fmt.Sprintf("Collapsing iteration %d for fresh context...", loopCurrent))
-				summary := ctx.SummarizeBranch(fromID, toID)
-				if summary != "" {
-					result := ctx.CollapseBranch(fromID, toID, summary)
-					if result.Success {
-						ctx.PrintInfo("Context collapsed successfully")
-					} else {
-						ctx.PrintError(fmt.Sprintf("Collapse failed: %s", result.Error))
-					}
-				}
-			}
-		}
-
-		// Small delay to let UI update
-		time.Sleep(500 * time.Millisecond)
-
-		// Trigger next iteration
-		executeLoopIteration(ctx)
-	})
-}
-
-// showTree displays the conversation tree structure
-func showTree(ctx ext.Context) {
-	branch := ctx.GetCurrentBranch()
-	if len(branch) == 0 {
-		ctx.PrintInfo("Tree is empty")
-		return
-	}
-
-	var output strings.Builder
-	output.WriteString(fmt.Sprintf("Conversation Tree (%d nodes):\n\n", len(branch)))
-
-	for i, node := range branch {
-		prefix := "  "
-		if i == len(branch)-1 {
-			prefix = "▶ " // Current node
-		} else {
-			prefix = "  "
-		}
-
-		roleIcon := "💬"
-		switch node.Role {
-		case "user":
-			roleIcon = "👤"
-		case "assistant":
-			roleIcon = "🤖"
-		case "system":
-			roleIcon = "⚙️"
-		}
-
-		content := truncate(node.Content, 50)
-		if node.Type == "branch_summary" {
-			roleIcon = "📋"
-			content = "[Summary] " + truncate(node.Content, 40)
-		}
-
-		output.WriteString(fmt.Sprintf("%s%s %s: %s (%s...)\n", prefix, roleIcon, node.Role, node.ID[:8], content))
-
-		// Show children count if any
-		children := ctx.GetChildren(node.ID)
-		if len(children) > 0 {
-			output.WriteString(fmt.Sprintf("    └─ %d branch(es)\n", len(children)))
-		}
-	}
-
-	ctx.PrintBlock(ext.PrintBlockOpts{
-		Text:        output.String(),
-		BorderColor: "#89b4fa",
-		Subtitle:    "conversation-manager · Tree View",
-	})
-}
-
-// showBranch displays the current branch path
-func showBranch(ctx ext.Context) {
-	branch := ctx.GetCurrentBranch()
-	if len(branch) == 0 {
-		ctx.PrintInfo("No active branch")
-		return
-	}
-
-	var output strings.Builder
-	output.WriteString(fmt.Sprintf("Current Branch (%d nodes from root to leaf):\n\n", len(branch)))
-
-	for i, node := range branch {
-		marker := "  "
-		if i == len(branch)-1 {
-			marker = "▶ " // Current leaf
-		}
-
-		output.WriteString(fmt.Sprintf("%s[%d] %s (%s): %s\n",
-			marker, i, node.Type, node.ID[:8], truncate(node.Content, 40)))
-	}
-
-	// Show current node details
-	leaf := branch[len(branch)-1]
-	output.WriteString(fmt.Sprintf("\nCurrent Leaf:\n"))
-	output.WriteString(fmt.Sprintf("  ID: %s\n", leaf.ID))
-	output.WriteString(fmt.Sprintf("  Type: %s\n", leaf.Type))
-	output.WriteString(fmt.Sprintf("  Role: %s\n", leaf.Role))
-	output.WriteString(fmt.Sprintf("  Model: %s\n", leaf.Model))
-	output.WriteString(fmt.Sprintf("  Children: %d\n", len(leaf.Children)))
-
-	ctx.PrintBlock(ext.PrintBlockOpts{
-		Text:        output.String(),
-		BorderColor: "#cba6f7",
-		Subtitle:    "conversation-manager · Branch View",
-	})
-}
-
-// executeLoopIteration triggers the next loop iteration
-func executeLoopIteration(ctx ext.Context) {
-	iterationPrompt := fmt.Sprintf("[%d/%d] %s", loopCurrent+1, loopCount, loopPrompt)
-	ctx.SendMessage(iterationPrompt)
-}
-
-// truncate helper
-func truncate(s string, max int) string {
-	if len(s) <= max {
-		return s
-	}
-	return s[:max-3] + "..."
-}

examples/extensions/dev-reload.go

@@ -7,12 +7,10 @@
 // development: edit your extension source, then type /reload to pick up
 // changes immediately.
 //
-// Note: Extensions in autoloaded directories (~/.config/kit/extensions/
-// and .kit/extensions/) are automatically reloaded on save. The /reload
-// command is useful for extensions loaded via -e from other locations.
-//
-// Event handlers, slash commands, tool definitions, tool renderers,
-// message renderers, and keyboard shortcuts all update immediately.
+// Event handlers, slash commands, tool renderers, message renderers, and
+// keyboard shortcuts update immediately. Extension-defined tools are NOT
+// updated (they are baked into the agent at creation time and require a
+// restart).
 //
 // Commands:
 //   /reload   — hot-reload all extensions from disk

examples/extensions/kit-telegram/main.go

@@ -168,10 +168,6 @@ var (
 	// Test
 	pendingTest *PendingTest
 
-	// Typing indicator
-	typingTicker *time.Ticker
-	typingStop   chan struct{}
-
 	// Latest context for background goroutines
 	latestCtx    ext.Context
 	latestCtxSet bool
@@ -207,23 +203,8 @@ func configDir() string {
 	return filepath.Join(home, ".config", "kit")
 }
 
-func globalConfigDir() string {
-	home, _ := os.UserHomeDir()
-	return filepath.Join(home, ".config", "kit")
-}
-
 func configPath() string {
-	// Prefer project-local config, fall back to global config.
-	local := filepath.Join(configDir(), "kit-telegram.json")
-	if _, err := os.Stat(local); err == nil {
-		return local
-	}
-	global := filepath.Join(globalConfigDir(), "kit-telegram.json")
-	if _, err := os.Stat(global); err == nil {
-		return global
-	}
-	// Neither exists — return local path (will be created on connect).
-	return local
+	return filepath.Join(configDir(), "kit-telegram.json")
 }
 
 func failureLogDir() string {
@@ -406,14 +387,6 @@ func tgEditMessageText(token string, chatID int64, messageID int, text string) (
 	return &msg, nil
 }
 
-func tgSendChatAction(token string, chatID int64, action string) error {
-	_, err := telegramRequest(token, "sendChatAction", map[string]any{
-		"chat_id": chatID,
-		"action":  action,
-	}, 15)
-	return err
-}
-
 // ──────────────────────────────────────────────
 // Error classification
 // ──────────────────────────────────────────────
@@ -664,48 +637,6 @@ func clearHealthTimer() {
 	}
 }
 
-// ──────────────────────────────────────────────
-// Typing indicator
-// ──────────────────────────────────────────────
-
-func startTypingLoop() {
-	mu.Lock()
-	defer mu.Unlock()
-	if typingTicker != nil {
-		return
-	}
-	cfg := config
-	if cfg == nil || !cfg.Enabled {
-		return
-	}
-	token := cfg.BotToken
-	chatID := cfg.ChatID
-	typingTicker = time.NewTicker(4 * time.Second)
-	typingStop = make(chan struct{})
-	// Send immediately, then every 4 seconds.
-	go func() {
-		tgSendChatAction(token, chatID, "typing")
-		for {
-			select {
-			case <-typingTicker.C:
-				tgSendChatAction(token, chatID, "typing")
-			case <-typingStop:
-				return
-			}
-		}
-	}()
-}
-
-func stopTypingLoop() {
-	mu.Lock()
-	defer mu.Unlock()
-	if typingTicker != nil {
-		typingTicker.Stop()
-		close(typingStop)
-		typingTicker = nil
-	}
-}
-
 // ──────────────────────────────────────────────
 // Polling lifecycle
 // ──────────────────────────────────────────────
@@ -977,7 +908,7 @@ func summarizeToolAction(toolName string, inputJSON string) string {
 		return "searching " + getStr("pattern", "text")
 	case "ls":
 		return "listing " + getStr("path", "directory")
-	case "subagent":
+	case "spawn_subagent":
 		return "spawning subagent"
 	default:
 		return "using " + toolName
@@ -2174,7 +2105,6 @@ func Init(api ext.API) {
 		mu.Unlock()
 
 		sendShutdownDisconnectedMessage()
-		stopTypingLoop()
 		stopPolling()
 		clearHealthTimer()
 		clearFooter()
@@ -2198,7 +2128,6 @@ func Init(api ext.API) {
 		mu.Unlock()
 
 		report("run.start", fmt.Sprintf("runId=%d", run.ID))
-		startTypingLoop()
 		ensureProgressMessage()
 		updateProgressMessage()
 	})
@@ -2211,8 +2140,6 @@ func Init(api ext.API) {
 		run := activeRun
 		mu.Unlock()
 
-		stopTypingLoop()
-
 		if run != nil {
 			// Capture final response from event
 			if e.Response != "" {

examples/extensions/lsp-diagnostics.go

@@ -2,7 +2,9 @@
 
 // lsp-diagnostics.go — LSP-powered diagnostics for Kit's edit tool.
 //
-// Starts language servers on demand and surfaces diagnostics after file edits:
+// Starts language servers on demand and surfaces diagnostics after file edits,
+// following the same pattern used by Charm's crush editor:
+//
 //  1. After an edit, notify the LSP server of the file change
 //  2. Wait for the server to publish fresh diagnostics
 //  3. Append diagnostic output to the edit tool's result
@@ -410,7 +412,7 @@ func (c *lspClient) changeFile(absPath, content string) {
 }
 
 // waitForDiagnostics polls until the server publishes new diagnostics or
-// the timeout elapses.
+// the timeout elapses. Mirrors crush's WaitForDiagnostics pattern.
 func (c *lspClient) waitForDiagnostics(timeout time.Duration) {
 	c.diagMu.Lock()
 	startVersion := c.diagVersion

examples/extensions/prompt-templates.go

@@ -1,269 +0,0 @@
-//go:build ignore
-
-// prompt-templates.go - Frontmatter-driven prompt templates with model switching.
-// This extension demonstrates the new bridged SDK APIs:
-// - Tree navigation for conversation management
-// - Template parsing with {{variable}} substitution
-// - Model resolution with fallback chains
-// - Skill injection
-//
-// Usage:
-//   1. Create ~/.config/kit/prompts/debug.md with frontmatter:
-//      ---
-//      description: Debug Python code
-//      model: claude-sonnet-4-20250514
-//      skill: python
-//      ---
-//      Help me debug this Python code: {{input}}
-//
-//   2. In Kit: /debug my_script.py
-
-package main
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"kit/ext"
-)
-
-// PromptTemplate represents a loaded template with frontmatter
-type PromptTemplate struct {
-	Name        string
-	Description string
-	Model       string
-	Skill       string
-	Content     string
-	Variables   []string
-	Path        string
-}
-
-var (
-	templates   = make(map[string]PromptTemplate)
-	templateDir string
-)
-
-func Init(api ext.API) {
-	// Determine template directory
-	home, _ := os.UserHomeDir()
-	templateDir = filepath.Join(home, ".config", "kit", "prompts")
-
-	// Ensure directory exists
-	os.MkdirAll(templateDir, 0755)
-
-	// Register commands
-	api.RegisterCommand(ext.CommandDef{
-		Name:        "reload-templates",
-		Description: "Reload prompt templates from disk",
-		Execute: func(args string, ctx ext.Context) (string, error) {
-			loadTemplates(ctx)
-			ctx.PrintInfo(fmt.Sprintf("Loaded %d templates from %s", len(templates), templateDir))
-			return "", nil
-		},
-	})
-
-	// Dynamic template commands are registered after loading
-	api.OnSessionStart(func(e ext.SessionStartEvent, ctx ext.Context) {
-		loadTemplates(ctx)
-		registerTemplateCommands(api, ctx)
-	})
-}
-
-// loadTemplates discovers and loads all template files
-func loadTemplates(ctx ext.Context) {
-	templates = make(map[string]PromptTemplate)
-
-	entries, err := os.ReadDir(templateDir)
-	if err != nil {
-		return
-	}
-
-	for _, entry := range entries {
-		if entry.IsDir() || !strings.HasSuffix(entry.Name(), ".md") {
-			continue
-		}
-
-		path := filepath.Join(templateDir, entry.Name())
-		tpl, err := loadTemplateFile(path)
-		if err != nil {
-			continue
-		}
-
-		name := strings.TrimSuffix(entry.Name(), ".md")
-		templates[name] = tpl
-	}
-}
-
-// loadTemplateFile parses a template with YAML frontmatter
-func loadTemplateFile(path string) (PromptTemplate, error) {
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return PromptTemplate{}, err
-	}
-
-	content := string(data)
-	tpl := PromptTemplate{Path: path}
-
-	// Parse frontmatter
-	if strings.HasPrefix(content, "---") {
-		parts := strings.SplitN(content[3:], "---", 2)
-		if len(parts) == 2 {
-			frontmatter := strings.TrimSpace(parts[0])
-			body := strings.TrimSpace(parts[1])
-
-			// Simple line-by-line frontmatter parsing
-			for _, line := range strings.Split(frontmatter, "\n") {
-				line = strings.TrimSpace(line)
-				if line == "" || strings.HasPrefix(line, "#") {
-					continue
-				}
-
-				key, value, found := strings.Cut(line, ":")
-				if found {
-					key = strings.TrimSpace(key)
-					value = strings.TrimSpace(value)
-					switch key {
-					case "description":
-						tpl.Description = value
-					case "model":
-						tpl.Model = value
-					case "skill":
-						tpl.Skill = value
-					}
-				}
-			}
-			tpl.Content = body
-		} else {
-			tpl.Content = content
-		}
-	} else {
-		tpl.Content = content
-	}
-
-	// Parse {{variables}} using simple string parsing
-	// (Can't use ctx.ParseTemplate here since we're in Init, not a handler)
-	var vars []string
-	for {
-		start := strings.Index(tpl.Content, "{{")
-		if start == -1 {
-			break
-		}
-		end := strings.Index(tpl.Content[start:], "}}")
-		if end == -1 {
-			break
-		}
-		varName := strings.TrimSpace(tpl.Content[start+2 : start+end])
-		vars = append(vars, varName)
-		tpl.Content = tpl.Content[:start] + "{{" + varName + "}}" + tpl.Content[start+end+2:]
-	}
-	tpl.Variables = vars
-
-	return tpl, nil
-}
-
-// registerTemplateCommands dynamically registers commands for each template
-func registerTemplateCommands(api ext.API, ctx ext.Context) {
-	for name, tpl := range templates {
-		// Skip if already registered (we'd need to track this)
-		tplCopy := tpl // Capture for closure
-		nameCopy := name
-
-		// Build description with metadata
-		desc := tplCopy.Description
-		if desc == "" {
-			desc = fmt.Sprintf("Run %s template", nameCopy)
-		}
-		if tplCopy.Model != "" {
-			desc += fmt.Sprintf(" [%s", tplCopy.Model)
-			if tplCopy.Skill != "" {
-				desc += fmt.Sprintf(" +%s", tplCopy.Skill)
-			}
-			desc += "]"
-		}
-
-		api.RegisterCommand(ext.CommandDef{
-			Name:        nameCopy,
-			Description: desc,
-			Execute: func(args string, ctx ext.Context) (string, error) {
-				return executeTemplate(ctx, tplCopy, args)
-			},
-		})
-	}
-}
-
-// executeTemplate runs a template with the given arguments
-func executeTemplate(ctx ext.Context, tpl PromptTemplate, args string) (string, error) {
-	// Store original model for restoration
-	originalModel := ctx.Model
-
-	// 1. Resolve and switch model if specified
-	if tpl.Model != "" {
-		// Parse model chain (comma-separated)
-		preferences := strings.Split(tpl.Model, ",")
-		for i := range preferences {
-			preferences[i] = strings.TrimSpace(preferences[i])
-		}
-
-		result := ctx.ResolveModelChain(preferences)
-		if result.Error != "" {
-			ctx.PrintError(fmt.Sprintf("Model resolution failed: %s", result.Error))
-			// Continue with current model
-		} else {
-			ctx.PrintInfo(fmt.Sprintf("Switching to model: %s", result.Model))
-			if err := ctx.SetModel(result.Model); err != nil {
-				ctx.PrintError(fmt.Sprintf("Failed to switch model: %s", err.Error()))
-			}
-		}
-	}
-
-	// 2. Inject skill if specified
-	if tpl.Skill != "" {
-		err := ctx.InjectSkillAsContext(tpl.Skill)
-		if err != "" {
-			ctx.PrintError(fmt.Sprintf("Skill injection failed: %s", err))
-		} else {
-			ctx.PrintInfo(fmt.Sprintf("Injected skill: %s", tpl.Skill))
-		}
-	}
-
-	// 3. Parse and render template
-	parsed := ctx.ParseTemplate(tpl.Name, tpl.Content)
-
-	// Build variable map
-	vars := make(map[string]string)
-
-	// Simple argument parsing: first arg is $1 (input), rest is $@
-	if len(parsed.Variables) > 0 {
-		argsList := ctx.SimpleParseArguments(args, len(parsed.Variables))
-		for i, varName := range parsed.Variables {
-			if i < len(parsed.Variables) && i+1 < len(argsList) {
-				vars[varName] = argsList[i+1]
-			}
-		}
-		// If single variable, use full args
-		if len(parsed.Variables) == 1 && vars[parsed.Variables[0]] == "" {
-			vars[parsed.Variables[0]] = args
-		}
-	}
-
-	// Render with model conditionals
-	content := ctx.RenderWithModelConditionals(tpl.Content)
-	rendered := ctx.RenderTemplate(ext.PromptTemplate{Name: tpl.Name, Content: content, Variables: parsed.Variables}, vars)
-
-	// 4. Send the rendered prompt
-	ctx.SendMessage(rendered)
-
-	// 5. Schedule model restoration after turn completes
-	// We use a goroutine to wait and restore
-	if tpl.Model != "" && originalModel != "" {
-		go func() {
-			// Note: In a real implementation, we'd use OnAgentEnd event
-			// For now, the user can manually switch back
-			ctx.SetStatus("template-mode", fmt.Sprintf("Template: %s (model will restore)", tpl.Name), 20)
-		}()
-	}
-
-	return fmt.Sprintf("Executing template: %s", tpl.Name), nil
-}

examples/extensions/subagent-test.go

@@ -37,7 +37,7 @@ func Init(api ext.API) {
 			"Subagent Test Extension loaded\n\n" +
 				"/subtest <task>    Spawn blocking subagent\n" +
 				"/subbg <task>      Spawn background subagent\n\n" +
-				"The LLM can also use the subagent tool.")
+				"The LLM can also use the spawn_subagent tool.")
 	})
 
 	api.OnAgentEnd(func(_ ext.AgentEndEvent, ctx ext.Context) {

go.mod

@@ -3,25 +3,17 @@ module github.com/mark3labs/kit
 go 1.26.1
 
 require (
-	charm.land/bubbles/v2 v2.1.0
+	charm.land/bubbles/v2 v2.0.0
 	charm.land/bubbletea/v2 v2.0.2
 	charm.land/fantasy v0.17.1
 	charm.land/huh/v2 v2.0.3
 	charm.land/lipgloss/v2 v2.0.2
 	github.com/alecthomas/chroma/v2 v2.23.1
-	github.com/atotto/clipboard v0.1.4
 	github.com/aymanbagabas/go-udiff v0.4.1
 	github.com/charmbracelet/fang v1.0.0
 	github.com/charmbracelet/log v1.0.0
-	github.com/charmbracelet/openai-go v0.0.0-20260319145158-d0740cc34266
-	github.com/charmbracelet/ultraviolet v0.0.0-20260330092749-0f94982c930b
-	github.com/clipperhouse/displaywidth v0.11.0
-	github.com/clipperhouse/uax29/v2 v2.7.0
 	github.com/coder/acp-go-sdk v0.6.3
-	github.com/fsnotify/fsnotify v1.9.0
-	github.com/indaco/herald v0.13.0
-	github.com/indaco/herald-md v0.3.0
-	github.com/mark3labs/mcp-go v0.47.0
+	github.com/mark3labs/mcp-go v0.46.0
 	github.com/spf13/cobra v1.10.2
 	github.com/spf13/viper v1.21.0
 	github.com/traefik/yaegi v0.16.1
@@ -35,60 +27,71 @@ require (
 	cloud.google.com/go/auth/oauth2adapt v0.2.8 // indirect
 	cloud.google.com/go/compute/metadata v0.9.0 // indirect
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 // indirect
-	github.com/Azure/azure-sdk-for-go/sdk/internal v1.12.0 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.41.5 // indirect
+	github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 // indirect
+	github.com/atotto/clipboard v0.1.4 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.41.4 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.32.14 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.19.14 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.21 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.32.12 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.19.12 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.20 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.20 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.20 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21 // indirect
-	github.com/aws/aws-sdk-go-v2/service/signin v1.0.9 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.30.15 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.19 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.41.10 // indirect
-	github.com/aws/smithy-go v1.24.3 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.20 // indirect
+	github.com/aws/aws-sdk-go-v2/service/signin v1.0.8 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.30.13 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.17 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.41.9 // indirect
+	github.com/aws/smithy-go v1.24.2 // indirect
+	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/catppuccin/go v0.3.0 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/charmbracelet/anthropic-sdk-go v0.0.0-20260223140439-63879b0b8dab // indirect
 	github.com/charmbracelet/colorprofile v0.4.3 // indirect
 	github.com/charmbracelet/harmonica v0.2.0 // indirect
 	github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834 // indirect
+	github.com/charmbracelet/openai-go v0.0.0-20260319145158-d0740cc34266 // indirect
+	github.com/charmbracelet/ultraviolet v0.0.0-20260316091819-b93f6a3b8502 // indirect
 	github.com/charmbracelet/x/cellbuf v0.0.15 // indirect
-	github.com/charmbracelet/x/exp/charmtone v0.0.0-20260330094520-2dce04b6f8a4 // indirect
+	github.com/charmbracelet/x/exp/charmtone v0.0.0-20260323091123-df7b1bcffcca // indirect
 	github.com/charmbracelet/x/exp/ordered v0.1.0 // indirect
-	github.com/charmbracelet/x/exp/slice v0.0.0-20260330094520-2dce04b6f8a4 // indirect
+	github.com/charmbracelet/x/exp/slice v0.0.0-20260323091123-df7b1bcffcca // indirect
 	github.com/charmbracelet/x/exp/strings v0.1.0 // indirect
 	github.com/charmbracelet/x/json v0.2.0 // indirect
 	github.com/charmbracelet/x/termios v0.1.1 // indirect
 	github.com/charmbracelet/x/windows v0.2.2 // indirect
+	github.com/clipperhouse/displaywidth v0.11.0 // indirect
+	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
 	github.com/dlclark/regexp2 v1.11.5 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/go-json-experiment/json v0.0.0-20260214004413-d219187c3433 // indirect
 	github.com/go-logfmt/logfmt v0.6.1 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
 	github.com/goccy/go-yaml v1.19.2 // indirect
+	github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/jsonschema-go v0.4.2 // indirect
 	github.com/google/s2a-go v0.1.9 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/googleapis/enterprise-certificate-proxy v0.3.14 // indirect
-	github.com/googleapis/gax-go/v2 v2.21.0 // indirect
+	github.com/googleapis/gax-go/v2 v2.20.0 // indirect
+	github.com/gorilla/css v1.0.1 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
-	github.com/kaptinlin/go-i18n v0.3.0 // indirect
+	github.com/kaptinlin/go-i18n v0.2.12 // indirect
 	github.com/kaptinlin/jsonpointer v0.4.17 // indirect
-	github.com/kaptinlin/jsonschema v0.7.7 // indirect
-	github.com/kaptinlin/messageformat-go v0.4.19 // indirect
+	github.com/kaptinlin/jsonschema v0.7.6 // indirect
+	github.com/kaptinlin/messageformat-go v0.4.18 // indirect
+	github.com/microcosm-cc/bluemonday v1.0.27 // indirect
 	github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
 	github.com/muesli/mango v0.2.0 // indirect
 	github.com/muesli/mango-cobra v1.3.0 // indirect
 	github.com/muesli/mango-pflag v0.2.0 // indirect
+	github.com/muesli/reflow v0.3.0 // indirect
 	github.com/muesli/roff v0.1.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.3.0 // indirect
 	github.com/sagikazarmark/locafero v0.12.0 // indirect
@@ -102,34 +105,36 @@ require (
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
 	github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
 	github.com/yuin/goldmark v1.8.2 // indirect
+	github.com/yuin/goldmark-emoji v1.0.6 // indirect
 	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 // indirect
-	go.opentelemetry.io/otel v1.43.0 // indirect
-	go.opentelemetry.io/otel/metric v1.43.0 // indirect
-	go.opentelemetry.io/otel/trace v1.43.0 // indirect
+	go.opentelemetry.io/otel v1.42.0 // indirect
+	go.opentelemetry.io/otel/metric v1.42.0 // indirect
+	go.opentelemetry.io/otel/trace v1.42.0 // indirect
 	go.yaml.in/yaml/v3 v3.0.4 // indirect
 	golang.org/x/crypto v0.49.0 // indirect
 	golang.org/x/exp v0.0.0-20260312153236-7ab1446f8b90 // indirect
 	golang.org/x/net v0.52.0 // indirect
 	golang.org/x/oauth2 v0.36.0 // indirect
 	golang.org/x/time v0.15.0 // indirect
-	google.golang.org/api v0.274.0 // indirect
-	google.golang.org/genai v1.52.1 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 // indirect
-	google.golang.org/grpc v1.80.0 // indirect
+	google.golang.org/api v0.273.0 // indirect
+	google.golang.org/genai v1.51.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 // indirect
+	google.golang.org/grpc v1.79.3 // indirect
 	google.golang.org/protobuf v1.36.11 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )
 
 require (
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
+	github.com/charmbracelet/glamour v1.0.0
 	github.com/charmbracelet/x/ansi v0.11.6
 	github.com/charmbracelet/x/term v0.2.2 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/lucasb-eyer/go-colorful v1.4.0 // indirect
+	github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-runewidth v0.0.22 // indirect
+	github.com/mattn/go-runewidth v0.0.21 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
 	github.com/muesli/termenv v0.16.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect

go.sum

@@ -1,5 +1,5 @@
-charm.land/bubbles/v2 v2.1.0 h1:YSnNh5cPYlYjPxRrzs5VEn3vwhtEn3jVGRBT3M7/I0g=
-charm.land/bubbles/v2 v2.1.0/go.mod h1:l97h4hym2hvWBVfmJDtrEHHCtkIKeTEb3TTJ4ZOB3wY=
+charm.land/bubbles/v2 v2.0.0 h1:tE3eK/pHjmtrDiRdoC9uGNLgpopOd8fjhEe31B/ai5s=
+charm.land/bubbles/v2 v2.0.0/go.mod h1:rCHoleP2XhU8um45NTuOWBPNVHxnkXKTiZqcclL/qOI=
 charm.land/bubbletea/v2 v2.0.2 h1:4CRtRnuZOdFDTWSff9r8QFt/9+z6Emubz3aDMnf/dx0=
 charm.land/bubbletea/v2 v2.0.2/go.mod h1:3LRff2U4WIYXy7MTxfbAQ+AdfM3D8Xuvz2wbsOD9OHQ=
 charm.land/fantasy v0.17.1 h1:SQzfnyJPDuQWt6e//KKmQmEEXdqHMC0IZz10XwkLcEM=
@@ -18,12 +18,12 @@ cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdB
 cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0 h1:fou+2+WFTib47nS+nz/ozhEBnvU96bKHy6LjRsY4E28=
 github.com/Azure/azure-sdk-for-go/sdk/azcore v1.21.0/go.mod h1:t76Ruy8AHvUAC8GfMWJMa0ElSbuIcO03NLpynfbgsPA=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1 h1:Hk5QBxZQC1jb2Fwj6mpzme37xbCDdNTxU7O9eb5+LB4=
-github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.13.1/go.mod h1:IYus9qsFobWIc2YVwe/WPjcnyCkPKtnHAqUYeebc8z0=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.12.0 h1:fhqpLE3UEXi9lPaBRpQ6XuRW0nU7hgg4zlmZZa+a9q4=
-github.com/Azure/azure-sdk-for-go/sdk/internal v1.12.0/go.mod h1:7dCRMLwisfRH3dBupKeNCioWYUZ4SS09Z14H+7i8ZoY=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0 h1:XRzhVemXdgvJqCH0sFfrBUTnUJSBrBf7++ypk+twtRs=
-github.com/AzureAD/microsoft-authentication-library-for-go v1.6.0/go.mod h1:HKpQxkWaGLJ+D/5H8QRpyQXA1eKjxkFlOMwck5+33Jk=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 h1:B+blDbyVIG3WaikNxPnhPiJ1MThR03b3vKGtER95TP4=
+github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1/go.mod h1:JdM5psgjfBf5fo2uWOZhflPWyDBZ/O/CNAH9CtsuZE4=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2 h1:9iefClla7iYpfYWdzPCRDozdmndjTm8DXdpCzPajMgA=
+github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.2/go.mod h1:XtLgD3ZD34DAaVIIAyG3objl5DynM3CQ/vMcbBNJZGI=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 h1:oygO0locgZJe7PpYPXT5A29ZkwJaPqcva7BVeemZOZs=
+github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI=
 github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ=
 github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE=
 github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
@@ -34,40 +34,42 @@ github.com/alecthomas/repr v0.5.2 h1:SU73FTI9D1P5UNtvseffFSGmdNci/O6RsqzeXJtP0Qs
 github.com/alecthomas/repr v0.5.2/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
-github.com/aws/aws-sdk-go-v2 v1.41.5 h1:dj5kopbwUsVUVFgO4Fi5BIT3t4WyqIDjGKCangnV/yY=
-github.com/aws/aws-sdk-go-v2 v1.41.5/go.mod h1:mwsPRE8ceUUpiTgF7QmQIJ7lgsKUPQOUl3o72QBrE1o=
+github.com/aws/aws-sdk-go-v2 v1.41.4 h1:10f50G7WyU02T56ox1wWXq+zTX9I1zxG46HYuG1hH/k=
+github.com/aws/aws-sdk-go-v2 v1.41.4/go.mod h1:mwsPRE8ceUUpiTgF7QmQIJ7lgsKUPQOUl3o72QBrE1o=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8 h1:eBMB84YGghSocM7PsjmmPffTa+1FBUeNvGvFou6V/4o=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.8/go.mod h1:lyw7GFp3qENLh7kwzf7iMzAxDn+NzjXEAGjKS2UOKqI=
-github.com/aws/aws-sdk-go-v2/config v1.32.14 h1:opVIRo/ZbbI8OIqSOKmpFaY7IwfFUOCCXBsUpJOwDdI=
-github.com/aws/aws-sdk-go-v2/config v1.32.14/go.mod h1:U4/V0uKxh0Tl5sxmCBZ3AecYny4UNlVmObYjKuuaiOo=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.14 h1:n+UcGWAIZHkXzYt87uMFBv/l8THYELoX6gVcUvgl6fI=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.14/go.mod h1:cJKuyWB59Mqi0jM3nFYQRmnHVQIcgoxjEMAbLkpr62w=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.21 h1:NUS3K4BTDArQqNu2ih7yeDLaS3bmHD0YndtA6UP884g=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.21/go.mod h1:YWNWJQNjKigKY1RHVJCuupeWDrrHjRqHm0N9rdrWzYI=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21 h1:Rgg6wvjjtX8bNHcvi9OnXWwcE0a2vGpbwmtICOsvcf4=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.21/go.mod h1:A/kJFst/nm//cyqonihbdpQZwiUhhzpqTsdbhDdRF9c=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21 h1:PEgGVtPoB6NTpPrBgqSE5hE/o47Ij9qk/SEZFbUOe9A=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.21/go.mod h1:p+hz+PRAYlY3zcpJhPwXlLC4C+kqn70WIHwnzAfs6ps=
+github.com/aws/aws-sdk-go-v2/config v1.32.12 h1:O3csC7HUGn2895eNrLytOJQdoL2xyJy0iYXhoZ1OmP0=
+github.com/aws/aws-sdk-go-v2/config v1.32.12/go.mod h1:96zTvoOFR4FURjI+/5wY1vc1ABceROO4lWgWJuxgy0g=
+github.com/aws/aws-sdk-go-v2/credentials v1.19.12 h1:oqtA6v+y5fZg//tcTWahyN9PEn5eDU/Wpvc2+kJ4aY8=
+github.com/aws/aws-sdk-go-v2/credentials v1.19.12/go.mod h1:U3R1RtSHx6NB0DvEQFGyf/0sbrpJrluENHdPy1j/3TE=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.20 h1:zOgq3uezl5nznfoK3ODuqbhVg1JzAGDUhXOsU0IDCAo=
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.20/go.mod h1:z/MVwUARehy6GAg/yQ1GO2IMl0k++cu1ohP9zo887wE=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.20 h1:CNXO7mvgThFGqOFgbNAP2nol2qAWBOGfqR/7tQlvLmc=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.20/go.mod h1:oydPDJKcfMhgfcgBUZaG+toBbwy8yPWubJXBVERtI4o=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.20 h1:tN6W/hg+pkM+tf9XDkWUbDEjGLb+raoBMFsTodcoYKw=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.20/go.mod h1:YJ898MhD067hSHA6xYCx5ts/jEd8BSOLtQDL3iZsvbc=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6 h1:qYQ4pzQ2Oz6WpQ8T3HvGHnZydA72MnLuFK9tJwmrbHw=
 github.com/aws/aws-sdk-go-v2/internal/ini v1.8.6/go.mod h1:O3h0IK87yXci+kg6flUKzJnWeziQUKciKrLjcatSNcY=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7 h1:5EniKhLZe4xzL7a+fU3C2tfUN4nWIqlLesfrjkuPFTY=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.7/go.mod h1:x0nZssQ3qZSnIcePWLvcoFisRXJzcTVvYpAAdYX8+GI=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21 h1:c31//R3xgIJMSC8S6hEVq+38DcvUlgFY0FM6mSI5oto=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.21/go.mod h1:r6+pf23ouCB718FUxaqzZdbpYFyDtehyZcmP5KL9FkA=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.9 h1:QKZH0S178gCmFEgst8hN0mCX1KxLgHBKKY/CLqwP8lg=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.9/go.mod h1:7yuQJoT+OoH8aqIxw9vwF+8KpvLZ8AWmvmUWHsGQZvI=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.15 h1:lFd1+ZSEYJZYvv9d6kXzhkZu07si3f+GQ1AaYwa2LUM=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.15/go.mod h1:WSvS1NLr7JaPunCXqpJnWk1Bjo7IxzZXrZi1QQCkuqM=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.19 h1:dzztQ1YmfPrxdrOiuZRMF6fuOwWlWpD2StNLTceKpys=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.19/go.mod h1:YO8TrYtFdl5w/4vmjL8zaBSsiNp3w0L1FfKVKenZT7w=
-github.com/aws/aws-sdk-go-v2/service/sts v1.41.10 h1:p8ogvvLugcR/zLBXTXrTkj0RYBUdErbMnAFFp12Lm/U=
-github.com/aws/aws-sdk-go-v2/service/sts v1.41.10/go.mod h1:60dv0eZJfeVXfbT1tFJinbHrDfSJ2GZl4Q//OSSNAVw=
-github.com/aws/smithy-go v1.24.3 h1:XgOAaUgx+HhVBoP4v8n6HCQoTRDhoMghKqw4LNHsDNg=
-github.com/aws/smithy-go v1.24.3/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.20 h1:2HvVAIq+YqgGotK6EkMf+KIEqTISmTYh5zLpYyeTo1Y=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.20/go.mod h1:V4X406Y666khGa8ghKmphma/7C0DAtEQYhkq9z4vpbk=
+github.com/aws/aws-sdk-go-v2/service/signin v1.0.8 h1:0GFOLzEbOyZABS3PhYfBIx2rNBACYcKty+XGkTgw1ow=
+github.com/aws/aws-sdk-go-v2/service/signin v1.0.8/go.mod h1:LXypKvk85AROkKhOG6/YEcHFPoX+prKTowKnVdcaIxE=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.13 h1:kiIDLZ005EcKomYYITtfsjn7dtOwHDOFy7IbPXKek2o=
+github.com/aws/aws-sdk-go-v2/service/sso v1.30.13/go.mod h1:2h/xGEowcW/g38g06g3KpRWDlT+OTfxxI0o1KqayAB8=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.17 h1:jzKAXIlhZhJbnYwHbvUQZEB8KfgAEuG0dc08Bkda7NU=
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.17/go.mod h1:Al9fFsXjv4KfbzQHGe6V4NZSZQXecFcvaIF4e70FoRA=
+github.com/aws/aws-sdk-go-v2/service/sts v1.41.9 h1:Cng+OOwCHmFljXIxpEVXAGMnBia8MSU6Ch5i9PgBkcU=
+github.com/aws/aws-sdk-go-v2/service/sts v1.41.9/go.mod h1:LrlIndBDdjA/EeXeyNBle+gyCwTlizzW5ycgWnvIxkk=
+github.com/aws/smithy-go v1.24.2 h1:FzA3bu/nt/vDvmnkg+R8Xl46gmzEDam6mZ1hzmwXFng=
+github.com/aws/smithy-go v1.24.2/go.mod h1:YE2RhdIuDbA5E5bTdciG9KrW3+TiEONeUWCqxX9i1Fc=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
 github.com/aymanbagabas/go-udiff v0.4.1 h1:OEIrQ8maEeDBXQDoGCbbTTXYJMYRCRO1fnodZ12Gv5o=
 github.com/aymanbagabas/go-udiff v0.4.1/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w=
+github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
+github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
 github.com/catppuccin/go v0.3.0 h1:d+0/YicIq+hSTo5oPuRi5kOpqkVA5tAsU6dNhvRu+aY=
 github.com/catppuccin/go v0.3.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc=
 github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
@@ -78,6 +80,8 @@ github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex
 github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q=
 github.com/charmbracelet/fang v1.0.0 h1:jESBY40agJOlLYnnv9jE0mLqDGTxEk0hkOnx7YGyRlQ=
 github.com/charmbracelet/fang v1.0.0/go.mod h1:P5/DNb9DddQ0Z0dbc0P3ol4/ix5Po7Ofr2KMBfAqoCo=
+github.com/charmbracelet/glamour v1.0.0 h1:AWMLOVFHTsysl4WV8T8QgkQ0s/ZNZo7CiE4WKhk8l08=
+github.com/charmbracelet/glamour v1.0.0/go.mod h1:DSdohgOBkMr2ZQNhw4LZxSGpx3SvpeujNoXrQyH2hxo=
 github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
 github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
 github.com/charmbracelet/lipgloss v1.1.1-0.20250404203927-76690c660834 h1:ZR7e0ro+SZZiIZD7msJyA+NjkCNNavuiPBLgerbOziE=
@@ -86,8 +90,8 @@ github.com/charmbracelet/log v1.0.0 h1:HVVVMmfOorfj3BA9i8X8UL69Hoz9lI0PYwXfJvOdR
 github.com/charmbracelet/log v1.0.0/go.mod h1:uYgY3SmLpwJWxmlrPwXvzVYujxis1vAKRV/0VQB7yWA=
 github.com/charmbracelet/openai-go v0.0.0-20260319145158-d0740cc34266 h1:BW/sZtyd1JyYy0h5adMm3tzpNyL857LWjuTRET6OhpY=
 github.com/charmbracelet/openai-go v0.0.0-20260319145158-d0740cc34266/go.mod h1:1DahUaExbUZx/jD+FNT2PKP4L9rLE5+ZBRuI8mZjd/E=
-github.com/charmbracelet/ultraviolet v0.0.0-20260330092749-0f94982c930b h1:ASDO9RT6SNKTQN87jO2bRfxHFJq8cgeYdFzivY2gCeM=
-github.com/charmbracelet/ultraviolet v0.0.0-20260330092749-0f94982c930b/go.mod h1:Vo8TffMf0q7Uho/n8e6XpBZvOWtd3g39yX+9P5rRutA=
+github.com/charmbracelet/ultraviolet v0.0.0-20260316091819-b93f6a3b8502 h1:hzWNs3UQRSUTS6YCbLaQnwqKBFXT5Yh1OOw6+26apqg=
+github.com/charmbracelet/ultraviolet v0.0.0-20260316091819-b93f6a3b8502/go.mod h1:mkUCcxn9w9j89JJp3pOza5tmDQZPgIB75UfmQlFYvas=
 github.com/charmbracelet/x/ansi v0.11.6 h1:GhV21SiDz/45W9AnV2R61xZMRri5NlLnl6CVF7ihZW8=
 github.com/charmbracelet/x/ansi v0.11.6/go.mod h1:2JNYLgQUsyqaiLovhU2Rv/pb8r6ydXKS3NIttu3VGZQ=
 github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI=
@@ -96,14 +100,14 @@ github.com/charmbracelet/x/conpty v0.1.1 h1:s1bUxjoi7EpqiXysVtC+a8RrvPPNcNvAjfi4
 github.com/charmbracelet/x/conpty v0.1.1/go.mod h1:OmtR77VODEFbiTzGE9G1XiRJAga6011PIm4u5fTNZpk=
 github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86 h1:JSt3B+U9iqk37QUU2Rvb6DSBYRLtWqFqfxf8l5hOZUA=
 github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86/go.mod h1:2P0UgXMEa6TsToMSuFqKFQR+fZTO9CNGUNokkPatT/0=
-github.com/charmbracelet/x/exp/charmtone v0.0.0-20260330094520-2dce04b6f8a4 h1:pIj18ZCZO4WOVj7jwjLoUb1lC7rS/I8oC3fZWXugNaY=
-github.com/charmbracelet/x/exp/charmtone v0.0.0-20260330094520-2dce04b6f8a4/go.mod h1:nsExn0DGyX0lh9LwLHTn2Gg+hafdzfSXnC+QmEJTZFY=
+github.com/charmbracelet/x/exp/charmtone v0.0.0-20260323091123-df7b1bcffcca h1:62yAoS1Ynbuzwcn1LkNBxi3IMF5p0E0cHCoaLOOmN9w=
+github.com/charmbracelet/x/exp/charmtone v0.0.0-20260323091123-df7b1bcffcca/go.mod h1:nsExn0DGyX0lh9LwLHTn2Gg+hafdzfSXnC+QmEJTZFY=
 github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f h1:pk6gmGpCE7F3FcjaOEKYriCvpmIN4+6OS/RD0vm4uIA=
 github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f/go.mod h1:IfZAMTHB6XkZSeXUqriemErjAWCCzT0LwjKFYCZyw0I=
 github.com/charmbracelet/x/exp/ordered v0.1.0 h1:55/qLwjIh0gL0Vni+QAWk7T/qRVP6sBf+2agPBgnOFE=
 github.com/charmbracelet/x/exp/ordered v0.1.0/go.mod h1:5UHwmG+is5THxMyCJHNPCn2/ecI07aKNrW+LcResjJ8=
-github.com/charmbracelet/x/exp/slice v0.0.0-20260330094520-2dce04b6f8a4 h1:VSd4zShIAf/4FgEDFJpapEcAPrc7h3dyyN7V9JlJpQw=
-github.com/charmbracelet/x/exp/slice v0.0.0-20260330094520-2dce04b6f8a4/go.mod h1:vqEfX6xzqW1pKKZUUiFOKg0OQ7bCh54Q2vR/tserrRA=
+github.com/charmbracelet/x/exp/slice v0.0.0-20260323091123-df7b1bcffcca h1:QQoyQLgUzojMNWHVHToN6d9qTvT0KWtxUKIRPx/Ox5o=
+github.com/charmbracelet/x/exp/slice v0.0.0-20260323091123-df7b1bcffcca/go.mod h1:vqEfX6xzqW1pKKZUUiFOKg0OQ7bCh54Q2vR/tserrRA=
 github.com/charmbracelet/x/exp/strings v0.1.0 h1:i69S2XI7uG1u4NLGeJPSYU++Nmjvpo9nwd6aoEm7gkA=
 github.com/charmbracelet/x/exp/strings v0.1.0/go.mod h1:/ehtMPNh9K4odGFkqYJKpIYyePhdp1hLBRvyY4bWkH8=
 github.com/charmbracelet/x/json v0.2.0 h1:DqB+ZGx2h+Z+1s98HOuOyli+i97wsFQIxP2ZQANTPrQ=
@@ -173,40 +177,41 @@ github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/enterprise-certificate-proxy v0.3.14 h1:yh8ncqsbUY4shRD5dA6RlzjJaT4hi3kII+zYw8wmLb8=
 github.com/googleapis/enterprise-certificate-proxy v0.3.14/go.mod h1:vqVt9yG9480NtzREnTlmGSBmFrA+bzb0yl0TxoBQXOg=
-github.com/googleapis/gax-go/v2 v2.21.0 h1:h45NjjzEO3faG9Lg/cFrBh2PgegVVgzqKzuZl/wMbiI=
-github.com/googleapis/gax-go/v2 v2.21.0/go.mod h1:But/NJU6TnZsrLai/xBAQLLz+Hc7fHZJt/hsCz3Fih4=
+github.com/googleapis/gax-go/v2 v2.20.0 h1:NIKVuLhDlIV74muWlsMM4CcQZqN6JJ20Qcxd9YMuYcs=
+github.com/googleapis/gax-go/v2 v2.20.0/go.mod h1:But/NJU6TnZsrLai/xBAQLLz+Hc7fHZJt/hsCz3Fih4=
+github.com/gorilla/css v1.0.1 h1:ntNaBIghp6JmvWnxbZKANoLyuXTPZ4cAMlo6RyhlbO8=
+github.com/gorilla/css v1.0.1/go.mod h1:BvnYkspnSzMmwRK+b8/xgNPLiIuNZr6vbZBTPQ2A3b0=
 github.com/gorilla/websocket v1.5.3 h1:saDtZ6Pbx/0u+bgYQ3q96pZgCzfhKXGPqt7kZ72aNNg=
 github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/indaco/herald v0.13.0 h1:+xVG9Fx5NpuWhwku/9IlRL6I009NnX4VUGKvlZHTRxU=
-github.com/indaco/herald v0.13.0/go.mod h1:T5g1+XLYvpjouhzAGHnAHDCKizhESkoV6+QPZ3DhgWA=
-github.com/indaco/herald-md v0.3.0 h1:hN1cKyrexPPM9PeHBsKuaWvIizSi/iYvM9yzRgtdb8M=
-github.com/indaco/herald-md v0.3.0/go.mod h1:RUHVaDSG45ymJjKyxpDwBocLXrZo93FB4OeYMsw9B9s=
-github.com/kaptinlin/go-i18n v0.3.0 h1:wP76dvYg04bvwTb+8NB+CmdZ2kL7lSSCQ9B/kFv7QHo=
-github.com/kaptinlin/go-i18n v0.3.0/go.mod h1:pVcu9qsW5pOIOoZFJXesRYmLos1vMQrby70JPAoWmJU=
+github.com/kaptinlin/go-i18n v0.2.12 h1:ywDsvb4KDFddMC2dpI/rrIzGU2mWUSvHmWUm9BMsdl4=
+github.com/kaptinlin/go-i18n v0.2.12/go.mod h1:pVcu9qsW5pOIOoZFJXesRYmLos1vMQrby70JPAoWmJU=
 github.com/kaptinlin/jsonpointer v0.4.17 h1:mY9k8ciWncxbsECyaxKnR0MdmxamNdp2tLQkAKVrtSk=
 github.com/kaptinlin/jsonpointer v0.4.17/go.mod h1:SsfsjqnHG5zuKo1DTBzk1VknaHlL4osHw+X9kZKukpU=
-github.com/kaptinlin/jsonschema v0.7.7 h1:41BlQJ9dskH0oE5DSzBUrl/w4JQYIr6N6L0B5GNyDoM=
-github.com/kaptinlin/jsonschema v0.7.7/go.mod h1:rKjWfyySHSxAD7Li2ctYkPlOu960igoKBvZ2ADRtd5Q=
-github.com/kaptinlin/messageformat-go v0.4.19 h1:A5kuuZ1ybXDQ7kD1aoEWGAOemX7hLsMY0yolgSbgpRI=
-github.com/kaptinlin/messageformat-go v0.4.19/go.mod h1:utSDTfiXTxl66OC5RIEuObLH7Ue3YjbA2X86SYMBYWg=
+github.com/kaptinlin/jsonschema v0.7.6 h1:UUMqZGFAk7nOzQsYAxvgygm4wpDp/nwXxA4VP9mCPCs=
+github.com/kaptinlin/jsonschema v0.7.6/go.mod h1:GGk/oE+F1lWUfYrzKaCf4QWZmMdytt0LL4XdFEFB0LE=
+github.com/kaptinlin/messageformat-go v0.4.18 h1:RBlHVWgZyoxTcUgGWBsl2AcyScq/urqbLZvzgryTmSI=
+github.com/kaptinlin/messageformat-go v0.4.18/go.mod h1:ntI3154RnqJgr7GaC+vZBnIExl2V3sv9selvRNNEM24=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
-github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mark3labs/mcp-go v0.47.0 h1:h44yeM3DduDyQgzImYWu4pt6VRkqP/0p/95AGhWngnA=
-github.com/mark3labs/mcp-go v0.47.0/go.mod h1:JKTC7R2LLVagkEWK7Kwu7DbmA6iIvnNAod6yrHiQMag=
+github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
+github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/mark3labs/mcp-go v0.46.0 h1:8KRibF4wcKejbLsHxCA/QBVUr5fQ9nwz/n8lGqmaALo=
+github.com/mark3labs/mcp-go v0.46.0/go.mod h1:JKTC7R2LLVagkEWK7Kwu7DbmA6iIvnNAod6yrHiQMag=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-runewidth v0.0.22 h1:76lXsPn6FyHtTY+jt2fTTvsMUCZq1k0qwRsAMuxzKAk=
-github.com/mattn/go-runewidth v0.0.22/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
+github.com/mattn/go-runewidth v0.0.12/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk=
+github.com/mattn/go-runewidth v0.0.21 h1:jJKAZiQH+2mIinzCJIaIG9Be1+0NR+5sz/lYEEjdM8w=
+github.com/mattn/go-runewidth v0.0.21/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
+github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk=
+github.com/microcosm-cc/bluemonday v1.0.27/go.mod h1:jFi9vgW+H7c3V0lb6nR74Ib/DIB5OBs92Dimizgw2cA=
 github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4=
 github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
@@ -217,6 +222,8 @@ github.com/muesli/mango-cobra v1.3.0 h1:vQy5GvPg3ndOSpduxutqFoINhWk3vD5K2dXo5E8p
 github.com/muesli/mango-cobra v1.3.0/go.mod h1:Cj1ZrBu3806Qw7UjxnAUgE+7tllUBj1NCLQDwwGx19E=
 github.com/muesli/mango-pflag v0.2.0 h1:QViokgKDZQCzKhYe1zH8D+UlPJzBSGoP9yx0hBG0t5k=
 github.com/muesli/mango-pflag v0.2.0/go.mod h1:X9LT1p/pbGA1wjvEbtwnixujKErkP0jVmrxwrw3fL0Y=
+github.com/muesli/reflow v0.3.0 h1:IFsN6K9NfGtjeggFP+68I4chLZV2yIKsXJFNZ+eWh6s=
+github.com/muesli/reflow v0.3.0/go.mod h1:pbwTDkVPibjO2kyvBQRBxTWEEGDGq0FlB1BIKtnHY/8=
 github.com/muesli/roff v0.1.0 h1:YD0lalCotmYuF5HhZliKWlIx7IEhiXeSfq7hNjFqGF8=
 github.com/muesli/roff v0.1.0/go.mod h1:pjAHQM9hdUUwm/krAfrLGgJkXJ+YuhtsfZ42kieB2Ig=
 github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
@@ -229,6 +236,8 @@ github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 h1:GFCKgm
 github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
 github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
+github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
@@ -270,22 +279,24 @@ github.com/yosida95/uritemplate/v3 v3.0.2 h1:Ed3Oyj9yrmi9087+NczuL5BwkIc4wvTb5zI
 github.com/yosida95/uritemplate/v3 v3.0.2/go.mod h1:ILOh0sOhIJR3+L/8afwt/kE++YT040gmv5BQTMR2HP4=
 github.com/yuin/goldmark v1.8.2 h1:kEGpgqJXdgbkhcOgBxkC0X0PmoPG1ZyoZ117rDVp4zE=
 github.com/yuin/goldmark v1.8.2/go.mod h1:ip/1k0VRfGynBgxOz0yCqHrbZXhcjxyuS66Brc7iBKg=
+github.com/yuin/goldmark-emoji v1.0.6 h1:QWfF2FYaXwL74tfGOW5izeiZepUDroDJfWubQI9HTHs=
+github.com/yuin/goldmark-emoji v1.0.6/go.mod h1:ukxJDKFpdFb5x0a5HqbdlcKtebh086iJpI31LTKmWuA=
 go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
 go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0 h1:yI1/OhfEPy7J9eoa6Sj051C7n5dvpj0QX8g4sRchg04=
 go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0/go.mod h1:NoUCKYWK+3ecatC4HjkRktREheMeEtrXoQxrqYFeHSc=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0 h1:OyrsyzuttWTSur2qN/Lm0m2a8yqyIjUVBZcxFPuXq2o=
 go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0/go.mod h1:C2NGBr+kAB4bk3xtMXfZ94gqFDtg/GkI7e9zqGh5Beg=
-go.opentelemetry.io/otel v1.43.0 h1:mYIM03dnh5zfN7HautFE4ieIig9amkNANT+xcVxAj9I=
-go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
-go.opentelemetry.io/otel/metric v1.43.0 h1:d7638QeInOnuwOONPp4JAOGfbCEpYb+K6DVWvdxGzgM=
-go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
+go.opentelemetry.io/otel v1.42.0 h1:lSQGzTgVR3+sgJDAU/7/ZMjN9Z+vUip7leaqBKy4sho=
+go.opentelemetry.io/otel v1.42.0/go.mod h1:lJNsdRMxCUIWuMlVJWzecSMuNjE7dOYyWlqOXWkdqCc=
+go.opentelemetry.io/otel/metric v1.42.0 h1:2jXG+3oZLNXEPfNmnpxKDeZsFI5o4J+nz6xUlaFdF/4=
+go.opentelemetry.io/otel/metric v1.42.0/go.mod h1:RlUN/7vTU7Ao/diDkEpQpnz3/92J9ko05BIwxYa2SSI=
 go.opentelemetry.io/otel/sdk v1.42.0 h1:LyC8+jqk6UJwdrI/8VydAq/hvkFKNHZVIWuslJXYsDo=
 go.opentelemetry.io/otel/sdk v1.42.0/go.mod h1:rGHCAxd9DAph0joO4W6OPwxjNTYWghRWmkHuGbayMts=
 go.opentelemetry.io/otel/sdk/metric v1.42.0 h1:D/1QR46Clz6ajyZ3G8SgNlTJKBdGp84q9RKCAZ3YGuA=
 go.opentelemetry.io/otel/sdk/metric v1.42.0/go.mod h1:Ua6AAlDKdZ7tdvaQKfSmnFTdHx37+J4ba8MwVCYM5hc=
-go.opentelemetry.io/otel/trace v1.43.0 h1:BkNrHpup+4k4w+ZZ86CZoHHEkohws8AY+WTX09nk+3A=
-go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
+go.opentelemetry.io/otel/trace v1.42.0 h1:OUCgIPt+mzOnaUTpOQcBiM/PLQ/Op7oq6g4LenLmOYY=
+go.opentelemetry.io/otel/trace v1.42.0/go.mod h1:f3K9S+IFqnumBkKhRJMeaZeNk9epyhnCmQh/EysQCdc=
 go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
 go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
 golang.org/x/crypto v0.49.0 h1:+Ng2ULVvLHnJ/ZFEq4KdcDd/cfjrrjjNSXNzxg0Y4U4=
@@ -307,20 +318,20 @@ golang.org/x/text v0.35.0 h1:JOVx6vVDFokkpaq1AEptVzLTpDe9KGpj5tR4/X+ybL8=
 golang.org/x/text v0.35.0/go.mod h1:khi/HExzZJ2pGnjenulevKNX1W67CUy0AsXcNubPGCA=
 golang.org/x/time v0.15.0 h1:bbrp8t3bGUeFOx08pvsMYRTCVSMk89u4tKbNOZbp88U=
 golang.org/x/time v0.15.0/go.mod h1:Y4YMaQmXwGQZoFaVFk4YpCt4FLQMYKZe9oeV/f4MSno=
-gonum.org/v1/gonum v0.17.0 h1:VbpOemQlsSMrYmn7T2OUvQ4dqxQXU+ouZFQsZOx50z4=
-gonum.org/v1/gonum v0.17.0/go.mod h1:El3tOrEuMpv2UdMrbNlKEh9vd86bmQ6vqIcDwxEOc1E=
-google.golang.org/api v0.274.0 h1:aYhycS5QQCwxHLwfEHRRLf9yNsfvp1JadKKWBE54RFA=
-google.golang.org/api v0.274.0/go.mod h1:JbAt7mF+XVmWu6xNP8/+CTiGH30ofmCmk9nM8d8fHew=
-google.golang.org/genai v1.52.1 h1:dYoljKtLDXMiBdVaClSJ/ZPwZ7j1N0lGjMhwOKOQUlk=
-google.golang.org/genai v1.52.1/go.mod h1:A3kkl0nyBjyFlNjgxIwKq70julKbIxpSxqKO5gw/gmk=
+gonum.org/v1/gonum v0.16.0 h1:5+ul4Swaf3ESvrOnidPp4GZbzf0mxVQpDCYUQE7OJfk=
+gonum.org/v1/gonum v0.16.0/go.mod h1:fef3am4MQ93R2HHpKnLk4/Tbh/s0+wqD5nfa6Pnwy4E=
+google.golang.org/api v0.273.0 h1:r/Bcv36Xa/te1ugaN1kdJ5LoA5Wj/cL+a4gj6FiPBjQ=
+google.golang.org/api v0.273.0/go.mod h1:JbAt7mF+XVmWu6xNP8/+CTiGH30ofmCmk9nM8d8fHew=
+google.golang.org/genai v1.51.0 h1:IZGuUqgfx40INv3hLFGCbOSGp0qFqm7LVmDghzNIYqg=
+google.golang.org/genai v1.51.0/go.mod h1:A3kkl0nyBjyFlNjgxIwKq70julKbIxpSxqKO5gw/gmk=
 google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7 h1:XzmzkmB14QhVhgnawEVsOn6OFsnpyxNPRY9QV01dNB0=
 google.golang.org/genproto v0.0.0-20260319201613-d00831a3d3e7/go.mod h1:L43LFes82YgSonw6iTXTxXUX1OlULt4AQtkik4ULL/I=
 google.golang.org/genproto/googleapis/api v0.0.0-20260319201613-d00831a3d3e7 h1:41r6JMbpzBMen0R/4TZeeAmGXSJC7DftGINUodzTkPI=
 google.golang.org/genproto/googleapis/api v0.0.0-20260319201613-d00831a3d3e7/go.mod h1:EIQZ5bFCfRQDV4MhRle7+OgjNtZ6P1PiZBgAKuxXu/Y=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9 h1:m8qni9SQFH0tJc1X0vmnpw/0t+AImlSvp30sEupozUg=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20260401024825-9d38bb4040a9/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
-google.golang.org/grpc v1.80.0 h1:Xr6m2WmWZLETvUNvIUmeD5OAagMw3FiKmMlTdViWsHM=
-google.golang.org/grpc v1.80.0/go.mod h1:ho/dLnxwi3EDJA4Zghp7k2Ec1+c2jqup0bFkw07bwF4=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7 h1:ndE4FoJqsIceKP2oYSnUZqhTdYufCYYkqwtFzfrhI7w=
+google.golang.org/genproto/googleapis/rpc v0.0.0-20260319201613-d00831a3d3e7/go.mod h1:4Hqkh8ycfw05ld/3BWL7rJOSfebL2Q+DVDeRgYgxUU8=
+google.golang.org/grpc v1.79.3 h1:sybAEdRIEtvcD68Gx7dmnwjZKlyfuc61Dyo9pGXXkKE=
+google.golang.org/grpc v1.79.3/go.mod h1:KmT0Kjez+0dde/v2j9vzwoAScgEPx/Bw1CYChhHLrHQ=
 google.golang.org/protobuf v1.36.11 h1:fV6ZwhNocDyBLK0dj+fg8ektcVegBBuEolpbTQyBNVE=
 google.golang.org/protobuf v1.36.11/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

internal/acpserver/agent.go

@@ -7,11 +7,8 @@ package acpserver
 
 import (
 	"context"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"os"
-	"strings"
 	"sync/atomic"
 
 	"github.com/charmbracelet/log"
@@ -23,17 +20,6 @@ import (
 // Version is injected at build time; fallback to "dev".
 var Version = "dev"
 
-// thinkingTagOpen and thinkingTagClose are the XML-style tags that some models
-// (Qwen, DeepSeek) wrap reasoning content in. We parse these to extract
-// reasoning/thinking content and send it as ACP thought updates.
-// Also support <think> format used by some models.
-const (
-	thinkingTagOpen    = "<thinking>"
-	thinkingTagClose   = "</thinking>"
-	shortThinkTagOpen  = "<think>"
-	shortThinkTagClose = "</think>"
-)
-
 // Agent implements the acp.Agent interface, delegating to Kit for LLM
 // execution, tool calls, and session management.
 type Agent struct {
@@ -42,10 +28,6 @@ type Agent struct {
 
 	// toolCallCounter provides unique IDs for tool calls within a turn.
 	toolCallCounter atomic.Int64
-
-	// inThinkingTag tracks whether we're currently inside a <thinking> tag
-	// when parsing streaming content from models that wrap reasoning in XML tags.
-	inThinkingTag bool
 }
 
 // NewAgent creates a new ACP agent backed by Kit.
@@ -129,23 +111,13 @@ func (a *Agent) Prompt(ctx context.Context, params acp.PromptRequest) (acp.Promp
 		)
 	}
 
-	// Extract text and file attachments from prompt content blocks.
-	promptText, files := extractPromptContent(params.Prompt)
-	if promptText == "" && len(files) == 0 {
+	// Extract text from prompt content blocks.
+	promptText := extractPromptText(params.Prompt)
+	if promptText == "" {
 		return acp.PromptResponse{}, acp.NewInvalidParams("empty prompt")
 	}
 
-	// If we have files but no text prompt, add a default prompt
-	// This is required because the underlying LLM library needs a non-empty prompt
-	// when there are no previous messages in the conversation.
-	if promptText == "" && len(files) > 0 {
-		promptText = "Please analyze the attached file."
-	}
-
-	log.Debug("acp: prompt", "session", sessionID, "prompt_len", len(promptText), "files", len(files))
-
-	// Reset thinking tag state for this new prompt turn
-	a.inThinkingTag = false
+	log.Debug("acp: prompt", "session", sessionID, "prompt_len", len(promptText))
 
 	// Create a cancellable context for this prompt turn.
 	promptCtx, cancel := context.WithCancel(ctx)
@@ -157,13 +129,7 @@ func (a *Agent) Prompt(ctx context.Context, params acp.PromptRequest) (acp.Promp
 	defer unsub()
 
 	// Run the prompt through Kit's full turn lifecycle.
-	// Use PromptResultWithFiles when file attachments are present.
-	var err error
-	if len(files) > 0 {
-		_, err = sess.kit.PromptResultWithFiles(promptCtx, promptText, files)
-	} else {
-		_, err = sess.kit.PromptResult(promptCtx, promptText)
-	}
+	_, err := sess.kit.PromptResult(promptCtx, promptText)
 	if err != nil {
 		if promptCtx.Err() != nil {
 			return acp.PromptResponse{
@@ -196,24 +162,6 @@ func (a *Agent) SetSessionMode(_ context.Context, _ acp.SetSessionModeRequest) (
 	return acp.SetSessionModeResponse{}, nil
 }
 
-// SetSessionModel changes the active model for a session.
-func (a *Agent) SetSessionModel(ctx context.Context, params acp.SetSessionModelRequest) (acp.SetSessionModelResponse, error) {
-	sessionID := string(params.SessionId)
-	sess, ok := a.registry.get(sessionID)
-	if !ok {
-		return acp.SetSessionModelResponse{}, acp.NewInvalidParams(fmt.Sprintf("session not found: %s", sessionID))
-	}
-
-	modelID := string(params.ModelId)
-	log.Debug("acp: set_session_model", "session", sessionID, "model", modelID)
-
-	if err := sess.kit.SetModel(ctx, modelID); err != nil {
-		return acp.SetSessionModelResponse{}, fmt.Errorf("set model: %w", err)
-	}
-
-	return acp.SetSessionModelResponse{}, nil
-}
-
 // ---------------------------------------------------------------------------
 // Event streaming: Kit events → ACP SessionUpdate notifications
 // ---------------------------------------------------------------------------
@@ -230,24 +178,8 @@ func (a *Agent) subscribeEvents(ctx context.Context, k *kit.Kit, sessionID acp.S
 		var update *acp.SessionUpdate
 		switch ev := e.(type) {
 		case kit.MessageUpdateEvent:
-			// Handle models that wrap reasoning in <thinking> tags (Qwen, DeepSeek)
-			// Parse the chunk and separate reasoning from regular text
-			reasoning, text := a.parseThinkingTags(ev.Chunk)
-
-			// Send reasoning update if we have reasoning content
-			if reasoning != "" {
-				u := acp.UpdateAgentThoughtText(reasoning)
-				_ = a.conn.SessionUpdate(ctx, acp.SessionNotification{
-					SessionId: sessionID,
-					Update:    u,
-				})
-			}
-
-			// Send text update if we have text content
-			if text != "" {
-				u := acp.UpdateAgentMessageText(text)
-				update = &u
-			}
+			u := acp.UpdateAgentMessageText(ev.Chunk)
+			update = &u
 
 		case kit.ReasoningDeltaEvent:
 			u := acp.UpdateAgentThoughtText(ev.Delta)
@@ -299,271 +231,19 @@ func (a *Agent) subscribeEvents(ctx context.Context, k *kit.Kit, sessionID acp.S
 // Helpers
 // ---------------------------------------------------------------------------
 
-// extractPromptContent extracts text and file attachments from ACP content blocks.
-// It converts supported content blocks (image, audio, resource) to Kit's LLMFilePart.
-func extractPromptContent(blocks []acp.ContentBlock) (string, []kit.LLMFilePart) {
-	var textParts []string
-	var files []kit.LLMFilePart
-
-	log.Debug("acp: extracting content", "blocks", len(blocks))
-
-	for i, block := range blocks {
-		switch {
-		// Text content
-		case block.Text != nil:
-			log.Debug("acp: content block", "index", i, "type", "text", "len", len(block.Text.Text))
-			textParts = append(textParts, block.Text.Text)
-
-		// Image data (base64)
-		case block.Image != nil:
-			mimeType := block.Image.MimeType
-			if mimeType == "" {
-				mimeType = "image/png" // Default fallback
+// extractPromptText extracts the concatenated text content from ACP content
+// blocks. Non-text blocks are ignored for now.
+func extractPromptText(blocks []acp.ContentBlock) string {
+	var text string
+	for _, block := range blocks {
+		if block.Text != nil {
+			if text != "" {
+				text += "\n"
 			}
-			log.Debug("acp: content block", "index", i, "type", "image", "mime", mimeType, "data_len", len(block.Image.Data))
-			if data, err := base64.StdEncoding.DecodeString(block.Image.Data); err == nil {
-				files = append(files, kit.LLMFilePart{
-					Filename:  "image.png",
-					Data:      data,
-					MediaType: mimeType,
-				})
-			} else {
-				log.Debug("acp: failed to decode image", "error", err)
-			}
-
-		// Audio data (base64)
-		case block.Audio != nil:
-			mimeType := block.Audio.MimeType
-			if mimeType == "" {
-				mimeType = "audio/wav" // Default fallback
-			}
-			log.Debug("acp: content block", "index", i, "type", "audio", "mime", mimeType)
-			if data, err := base64.StdEncoding.DecodeString(block.Audio.Data); err == nil {
-				files = append(files, kit.LLMFilePart{
-					Filename:  "audio.wav",
-					Data:      data,
-					MediaType: mimeType,
-				})
-			} else {
-				log.Debug("acp: failed to decode audio", "error", err)
-			}
-
-		// Embedded resource (text or binary file content)
-		case block.Resource != nil:
-			log.Debug("acp: content block", "index", i, "type", "resource")
-			res := block.Resource.Resource
-			// Text resource - append as text content with file reference
-			if res.TextResourceContents != nil {
-				uri := res.TextResourceContents.Uri
-				content := res.TextResourceContents.Text
-				mimeType := "text/plain"
-				if res.TextResourceContents.MimeType != nil {
-					mimeType = *res.TextResourceContents.MimeType
-				}
-				log.Debug("acp: text resource", "uri", uri, "mime", mimeType, "len", len(content))
-				// Text files are included as formatted text, NOT as FilePart
-				// FilePart is for binary files (images, audio, PDFs) only
-				textParts = append(textParts, fmt.Sprintf("[File: %s]\n```\n%s\n```", uri, content))
-			}
-			// Binary resource (base64 blob) - these become FilePart
-			if res.BlobResourceContents != nil {
-				uri := res.BlobResourceContents.Uri
-				mimeType := "application/octet-stream"
-				if res.BlobResourceContents.MimeType != nil {
-					mimeType = *res.BlobResourceContents.MimeType
-				}
-				log.Debug("acp: binary resource", "uri", uri, "mime", mimeType, "blob_len", len(res.BlobResourceContents.Blob))
-				if data, err := base64.StdEncoding.DecodeString(res.BlobResourceContents.Blob); err == nil {
-					files = append(files, kit.LLMFilePart{
-						Filename:  extractFilenameFromURI(uri),
-						Data:      data,
-						MediaType: mimeType,
-					})
-				} else {
-					log.Debug("acp: failed to decode binary resource", "error", err)
-				}
-			}
-
-		// Resource link (file reference without embedded content)
-		case block.ResourceLink != nil:
-			uri := block.ResourceLink.Uri
-			name := block.ResourceLink.Name
-			log.Debug("acp: content block", "index", i, "type", "resource_link", "uri", uri, "name", name)
-			// For resource links, we'll try to read the file from disk
-			// This requires the file URI to be accessible (file:// scheme)
-			if content, err := readResourceFromURI(uri); err == nil {
-				// Detect if it's a text file or binary file
-				mimeType := "text/plain"
-				if block.ResourceLink.MimeType != nil {
-					mimeType = *block.ResourceLink.MimeType
-				}
-				log.Debug("acp: resource link loaded", "uri", uri, "mime", mimeType, "size", len(content))
-
-				// Only create FilePart for binary files (images, audio, PDFs, etc.)
-				// Text files are included as formatted text in the message
-				if isTextMimeType(mimeType) || looksLikeText(content) {
-					textParts = append(textParts, fmt.Sprintf("[File: %s]\n```\n%s\n```", uri, string(content)))
-				} else {
-					// Binary file - create FilePart for models that support it
-					files = append(files, kit.LLMFilePart{
-						Filename:  extractFilenameFromURI(uri),
-						Data:      content,
-						MediaType: mimeType,
-					})
-				}
-			} else {
-				// If we can't read it, include as a text reference
-				log.Debug("acp: resource link failed to load", "uri", uri, "error", err)
-				textParts = append(textParts, fmt.Sprintf("[Referenced file: %s]", uri))
-			}
-
-		default:
-			log.Debug("acp: content block", "index", i, "type", "unknown/unhandled")
+			text += block.Text.Text
 		}
 	}
-
-	// Debug log the extracted content
-	for i, f := range files {
-		log.Debug("acp: extracted file", "index", i, "filename", f.Filename, "mime", f.MediaType, "size", len(f.Data))
-	}
-
-	return strings.Join(textParts, "\n"), files
-}
-
-// parseThinkingTags parses a text chunk for <thinking> or  tags and separates
-// reasoning content from regular text. This handles models (Qwen, DeepSeek)
-// that wrap reasoning in XML-style tags instead of using proper reasoning events.
-// Returns (reasoningContent, textContent).
-func (a *Agent) parseThinkingTags(chunk string) (reasoning string, text string) {
-	// Handle empty chunk
-	if chunk == "" {
-		return "", ""
-	}
-
-	// Determine which tag format to use (long or short)
-	openTag := thinkingTagOpen
-	closeTag := thinkingTagClose
-
-	if strings.Contains(chunk, shortThinkTagOpen) || strings.Contains(chunk, shortThinkTagClose) {
-		openTag = shortThinkTagOpen
-		closeTag = shortThinkTagClose
-	} else if !strings.Contains(chunk, thinkingTagOpen) && !strings.Contains(chunk, thinkingTagClose) && !a.inThinkingTag {
-		// No tags at all and not in thinking mode - return as text
-		return "", chunk
-	}
-
-	// Check for opening tag
-	if strings.Contains(chunk, openTag) {
-		parts := strings.SplitN(chunk, openTag, 2)
-
-		// Content before the opening tag is regular text
-		if !a.inThinkingTag && parts[0] != "" {
-			text = parts[0]
-		}
-
-		a.inThinkingTag = true
-
-		// Content after the opening tag is reasoning
-		if len(parts) > 1 {
-			// Check if the same chunk contains the closing tag
-			if strings.Contains(parts[1], closeTag) {
-				innerParts := strings.SplitN(parts[1], closeTag, 2)
-				reasoning = innerParts[0]
-				a.inThinkingTag = false
-
-				// Content after closing tag is regular text
-				if len(innerParts) > 1 && innerParts[1] != "" {
-					text += innerParts[1]
-				}
-			} else if parts[1] != "" {
-				// No closing tag yet, all remaining content is reasoning
-				reasoning = parts[1]
-			}
-		}
-		return reasoning, text
-	}
-
-	// Check for closing tag
-	if strings.Contains(chunk, closeTag) {
-		parts := strings.SplitN(chunk, closeTag, 2)
-		a.inThinkingTag = false
-
-		// Content before closing tag is reasoning
-		reasoning = parts[0]
-
-		// Content after closing tag is regular text
-		if len(parts) > 1 && parts[1] != "" {
-			text = parts[1]
-		}
-		return reasoning, text
-	}
-
-	// No tags found - content goes to current mode
-	if a.inThinkingTag {
-		return chunk, ""
-	}
-	return "", chunk
-}
-
-// isTextMimeType returns true if the MIME type indicates text content.
-func isTextMimeType(mimeType string) bool {
-	return strings.HasPrefix(mimeType, "text/") ||
-		mimeType == "application/json" ||
-		mimeType == "application/xml" ||
-		mimeType == "application/javascript" ||
-		mimeType == "application/typescript" ||
-		mimeType == "application/x-sh" ||
-		mimeType == "application/x-python" ||
-		mimeType == "application/x-yaml" ||
-		mimeType == "application/x-toml"
-}
-
-// looksLikeText checks if the content appears to be text (not binary).
-// It samples the first 512 bytes and checks for null bytes or high
-// concentration of non-printable characters.
-func looksLikeText(data []byte) bool {
-	if len(data) == 0 {
-		return true
-	}
-	// Check first 512 bytes (or less if file is smaller)
-	sampleSize := min(len(data), 512)
-	sample := data[:sampleSize]
-
-	// Count non-printable characters
-	nonPrintable := 0
-	for _, b := range sample {
-		// Null byte indicates binary
-		if b == 0 {
-			return false
-		}
-		// Count control characters (except common whitespace)
-		if b < 32 && b != '\n' && b != '\r' && b != '\t' {
-			nonPrintable++
-		}
-	}
-
-	// If more than 30% non-printable, consider it binary
-	return float64(nonPrintable)/float64(sampleSize) < 0.3
-}
-
-// extractFilenameFromURI extracts a filename from a file URI or path.
-func extractFilenameFromURI(uri string) string {
-	// Handle file:// URIs
-	uri = strings.TrimPrefix(uri, "file://")
-	// Extract basename
-	if idx := strings.LastIndex(uri, "/"); idx >= 0 {
-		return uri[idx+1:]
-	}
-	return uri
-}
-
-// readResourceFromURI attempts to read file content from a file:// URI.
-func readResourceFromURI(uri string) ([]byte, error) {
-	if !strings.HasPrefix(uri, "file://") {
-		return nil, fmt.Errorf("unsupported URI scheme: %s", uri)
-	}
-	path := uri[7:] // Remove file:// prefix
-	return os.ReadFile(path)
+	return text
 }
 
 // parseToolArgs attempts to parse a JSON tool args string into a map for

internal/acpserver/session.go

@@ -62,8 +62,8 @@ func (r *sessionRegistry) create(ctx context.Context, cwd string) (*acpSession,
 	// work in ACP mode. TUI-dependent features (widgets, prompts, editor)
 	// become no-ops or return cancelled; all data/model/tool APIs work
 	// identically to interactive mode.
-	if kitInstance.Extensions().HasExtensions() {
-		kitInstance.Extensions().SetContext(extensions.Context{
+	if kitInstance.HasExtensions() {
+		kitInstance.SetExtensionContext(extensions.Context{
 			SessionID:   sessionID,
 			CWD:         cwd,
 			Model:       kitInstance.GetModelString(),
@@ -121,31 +121,31 @@ func (r *sessionRegistry) create(ctx context.Context, cwd string) (*acpSession,
 					MessageCount:    s.MessageCount,
 				}
 			},
-			GetMessages:    func() []extensions.SessionMessage { return kitInstance.Extensions().GetSessionMessages() },
-			GetSessionPath: func() string { return kitInstance.GetSessionPath() },
+			GetMessages:    func() []extensions.SessionMessage { return kitInstance.GetSessionMessages() },
+			GetSessionPath: func() string { return kitInstance.GetSessionFilePath() },
 			AppendEntry: func(entryType, data string) (string, error) {
-				return kitInstance.Extensions().AppendEntry(entryType, data)
+				return kitInstance.AppendExtensionEntry(entryType, data)
 			},
 			GetEntries: func(entryType string) []extensions.ExtensionEntry {
-				return kitInstance.Extensions().GetEntries(entryType)
+				return kitInstance.GetExtensionEntries(entryType)
 			},
 
 			// Options, model, and tool management.
-			GetOption: func(name string) string { return kitInstance.Extensions().GetOption(name) },
-			SetOption: func(name, value string) { kitInstance.Extensions().SetOption(name, value) },
+			GetOption: func(name string) string { return kitInstance.GetExtensionOption(name) },
+			SetOption: func(name, value string) { kitInstance.SetExtensionOption(name, value) },
 			SetModel: func(modelString string) error {
-				previousModel := kitInstance.Extensions().GetContext().Model
+				previousModel := kitInstance.GetExtensionContext().Model
 				if err := kitInstance.SetModel(context.Background(), modelString); err != nil {
 					return err
 				}
-				kitInstance.Extensions().UpdateContextModel(modelString)
-				kitInstance.Extensions().EmitModelChange(modelString, previousModel, "extension")
+				kitInstance.UpdateExtensionContextModel(modelString)
+				kitInstance.EmitModelChange(modelString, previousModel, "extension")
 				return nil
 			},
 			GetAvailableModels: func() []extensions.ModelInfoEntry { return kitInstance.GetAvailableModels() },
-			EmitCustomEvent:    func(name, data string) { kitInstance.Extensions().EmitCustomEvent(name, data) },
-			GetAllTools:        func() []extensions.ToolInfo { return kitInstance.Extensions().GetToolInfos() },
-			SetActiveTools:     func(names []string) { kitInstance.Extensions().SetActiveTools(names) },
+			EmitCustomEvent:    func(name, data string) { kitInstance.EmitExtensionCustomEvent(name, data) },
+			GetAllTools:        func() []extensions.ToolInfo { return kitInstance.GetExtensionToolInfos() },
+			SetActiveTools:     func(names []string) { kitInstance.SetExtensionActiveTools(names) },
 
 			// LLM completions and subagents.
 			Complete: func(req extensions.CompleteRequest) (extensions.CompleteResponse, error) {
@@ -173,7 +173,7 @@ func (r *sessionRegistry) create(ctx context.Context, cwd string) (*acpSession,
 				}
 				extResult := &extensions.SubagentResult{
 					Response:  result.Response,
-					Error:     err,
+					Error:     result.Error,
 					SessionID: result.SessionID,
 					Elapsed:   result.Elapsed,
 				}
@@ -188,15 +188,15 @@ func (r *sessionRegistry) create(ctx context.Context, cwd string) (*acpSession,
 
 			// Render — fall back to logging.
 			RenderMessage: func(name, content string) {
-				renderer := kitInstance.Extensions().GetMessageRenderer(name)
+				renderer := kitInstance.GetExtensionMessageRenderer(name)
 				if renderer != nil && renderer.Render != nil {
 					content = renderer.Render(content, 80)
 				}
 				log.Info("extension: message", "renderer", name, "content", content)
 			},
-			ReloadExtensions: func() error { return kitInstance.Extensions().Reload() },
+			ReloadExtensions: func() error { return kitInstance.ReloadExtensions() },
 		})
-		kitInstance.Extensions().EmitSessionStart()
+		kitInstance.EmitSessionStart()
 	}
 
 	sess := &acpSession{

internal/agent/agent.go

@@ -25,34 +25,19 @@ type AgentConfig struct {
 	StreamingEnabled bool
 	DebugLogger      tools.DebugLogger
 
-	// AuthHandler handles OAuth authorization for remote MCP servers.
-	// When set, remote transports are configured with OAuth support.
-	// If nil, remote MCP servers that require OAuth will fail to connect.
-	AuthHandler tools.MCPAuthHandler
-
 	// CoreTools overrides the default core tool set. If empty, core.AllTools()
 	// is used. This allows SDK users to provide a custom tool set (e.g.
 	// CodingTools or tools with a custom WorkDir).
 	CoreTools []fantasy.AgentTool
 
-	// DisableCoreTools, when true, prevents loading any core tools.
-	// If both DisableCoreTools is true and CoreTools is empty, the agent
-	// will have no tools (useful for simple chat completions).
-	DisableCoreTools bool
-
 	// ToolWrapper is an optional function that wraps the combined tool list
-	// before it is passed to the LLM agent. Used by the extensions system
+	// before it is passed to the Fantasy agent. Used by the extensions system
 	// to intercept tool calls/results.
 	ToolWrapper func([]fantasy.AgentTool) []fantasy.AgentTool
 
 	// ExtraTools are additional tools to include alongside core and MCP tools.
 	// Used by extensions to register custom tools.
 	ExtraTools []fantasy.AgentTool
-
-	// OnMCPServerLoaded, if non-nil, is called when each MCP server finishes
-	// loading (successfully or with error). The callback receives the server
-	// name, tool count, and any error. Called from the background goroutine.
-	OnMCPServerLoaded func(serverName string, toolCount int, err error)
 }
 
 // ToolCallHandler is a function type for handling tool calls as they happen.
@@ -78,10 +63,6 @@ type ToolCallContentHandler func(content string)
 // ReasoningDeltaHandler is a function type for handling streaming reasoning/thinking deltas.
 type ReasoningDeltaHandler func(delta string)
 
-// ReasoningCompleteHandler is a function type for handling reasoning/thinking completion.
-// Called when the last reasoning token has been processed, before text streaming starts.
-type ReasoningCompleteHandler func()
-
 // ToolOutputHandler is a function type for handling streaming tool output chunks.
 // Used by tools like bash to stream output as it arrives rather than waiting
 // for the command to complete. The isStderr flag indicates if the chunk
@@ -94,14 +75,10 @@ type ToolOutputHandler = core.ToolOutputCallback
 // tracking during long-running tool-calling conversations.
 type StepUsageHandler func(inputTokens, outputTokens, cacheReadTokens, cacheCreationTokens int64)
 
-// Agent represents an AI agent with core tool integration using the LLM library.
+// Agent represents an AI agent with core tool integration using the fantasy library.
 // Core tools (bash, read, write, edit, grep, find, ls) are registered as direct
-// AgentTool implementations — no MCP layer, no serialization overhead.
+// fantasy.AgentTool implementations — no MCP layer, no serialization overhead.
 // Additional tools from external MCP servers can be loaded alongside core tools.
-//
-// When MCP servers are configured, tool loading happens in the background so the
-// agent (and UI) can start immediately. The first LLM call automatically waits
-// for MCP tools to finish loading before proceeding.
 type Agent struct {
 	toolManager      *tools.MCPToolManager
 	fantasyAgent     fantasy.Agent
@@ -115,18 +92,6 @@ type Agent struct {
 	coreTools        []fantasy.AgentTool
 	extraTools       []fantasy.AgentTool
 	toolWrapper      func([]fantasy.AgentTool) []fantasy.AgentTool // stored for SetModel rebuild
-
-	// providerOptions and modelConfig are stored for rebuilding the fantasy
-	// agent when MCP tools arrive asynchronously or on SetModel.
-	providerOptions     fantasy.ProviderOptions
-	skipMaxOutputTokens bool
-	modelConfig         *models.ProviderConfig
-
-	// mcpReady is closed when background MCP tool loading completes (success
-	// or failure). nil when no MCP servers are configured.
-	mcpReady chan struct{}
-	// mcpErr holds any error from background MCP loading.
-	mcpErr error
 }
 
 // GenerateWithLoopResult contains the result and conversation history from an agent interaction.
@@ -135,7 +100,7 @@ type GenerateWithLoopResult struct {
 	FinalResponse *fantasy.Response
 	// ConversationMessages contains all messages in the conversation including tool calls and results
 	ConversationMessages []fantasy.Message
-	// Messages contains the conversation as custom content blocks
+	// Messages contains the conversation as custom content blocks (crush-style)
 	Messages []message.Message
 	// TotalUsage contains aggregate token usage across all steps
 	TotalUsage fantasy.Usage
@@ -145,35 +110,44 @@ type GenerateWithLoopResult struct {
 
 // NewAgent creates a new Agent with core tools and optional MCP tool integration.
 // Core tools (bash, read, write, edit, grep, find, ls) are always registered.
-// If MCP servers are configured, their tools are loaded in the background —
-// the agent returns immediately and is usable with core tools only. The first
-// LLM call (GenerateWithLoop) automatically waits for MCP tools to finish
-// loading and rebuilds the agent with the full tool set.
+// External MCP tools are loaded from the config if any MCP servers are configured.
 func NewAgent(ctx context.Context, agentConfig *AgentConfig) (*Agent, error) {
-	// Create the LLM provider
+	// Create the LLM provider via fantasy
 	providerResult, err := models.CreateProvider(ctx, agentConfig.ModelConfig)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create model provider: %v", err)
 	}
 
-	// Register core tools (direct AgentTool implementations, no MCP overhead).
+	// Register core tools (direct fantasy implementations, no MCP overhead).
 	// Use caller-provided tools if set, otherwise default to all core tools.
-	// DisableCoreTools allows explicitly having zero tools (for chat-only mode).
-	var coreTools []fantasy.AgentTool
-	if agentConfig.DisableCoreTools && len(agentConfig.CoreTools) == 0 {
-		// Explicitly zero tools - chat-only mode
-		coreTools = nil
-	} else if len(agentConfig.CoreTools) > 0 {
-		// Custom tools provided - use them
-		coreTools = agentConfig.CoreTools
-	} else {
-		// Default: load all core tools
+	coreTools := agentConfig.CoreTools
+	if len(coreTools) == 0 {
 		coreTools = core.AllTools()
 	}
 
-	// Build the initial tool list: core tools + extension tools (no MCP yet).
+	// Build the combined tool list: core tools + any external MCP tools
 	allTools := make([]fantasy.AgentTool, len(coreTools))
 	copy(allTools, coreTools)
+
+	// Load external MCP tools if configured
+	var toolManager *tools.MCPToolManager
+	if agentConfig.MCPConfig != nil && len(agentConfig.MCPConfig.MCPServers) > 0 {
+		toolManager = tools.NewMCPToolManager()
+		toolManager.SetModel(providerResult.Model)
+
+		if agentConfig.DebugLogger != nil {
+			toolManager.SetDebugLogger(agentConfig.DebugLogger)
+		}
+
+		if err := toolManager.LoadTools(ctx, agentConfig.MCPConfig); err != nil {
+			// MCP tool loading failures are non-fatal; core tools still work
+			fmt.Printf("Warning: Failed to load MCP tools: %v\n", err)
+		} else {
+			mcpTools := toolManager.GetTools()
+			allTools = append(allTools, mcpTools...)
+		}
+	}
+
 	// Append any extra tools provided by extensions.
 	if len(agentConfig.ExtraTools) > 0 {
 		allTools = append(allTools, agentConfig.ExtraTools...)
@@ -184,145 +158,7 @@ func NewAgent(ctx context.Context, agentConfig *AgentConfig) (*Agent, error) {
 		allTools = agentConfig.ToolWrapper(allTools)
 	}
 
-	// Build agent options
-	agentOpts := buildAgentOptions(agentConfig, providerResult, allTools)
-
-	// Create the agent
-	fantasyAgent := fantasy.NewAgent(providerResult.Model, agentOpts...)
-
-	// Determine provider type from model string
-	providerType := "default"
-	if agentConfig.ModelConfig != nil && agentConfig.ModelConfig.ModelString != "" {
-		if p, _, err := models.ParseModelString(agentConfig.ModelConfig.ModelString); err == nil {
-			providerType = p
-		}
-	}
-
-	a := &Agent{
-		fantasyAgent:        fantasyAgent,
-		model:               providerResult.Model,
-		providerCloser:      providerResult.Closer,
-		maxSteps:            agentConfig.MaxSteps,
-		systemPrompt:        agentConfig.SystemPrompt,
-		loadingMessage:      providerResult.Message,
-		providerType:        providerType,
-		streamingEnabled:    agentConfig.StreamingEnabled,
-		coreTools:           coreTools,
-		extraTools:          agentConfig.ExtraTools,
-		toolWrapper:         agentConfig.ToolWrapper,
-		providerOptions:     providerResult.ProviderOptions,
-		skipMaxOutputTokens: providerResult.SkipMaxOutputTokens,
-		modelConfig:         agentConfig.ModelConfig,
-	}
-
-	// Start MCP tool loading in the background if servers are configured.
-	// The mcpReady channel is closed when loading completes (success or failure).
-	if agentConfig.MCPConfig != nil && len(agentConfig.MCPConfig.MCPServers) > 0 {
-		toolManager := tools.NewMCPToolManager()
-		toolManager.SetModel(providerResult.Model)
-		if agentConfig.AuthHandler != nil {
-			toolManager.SetAuthHandler(agentConfig.AuthHandler)
-		}
-		if agentConfig.DebugLogger != nil {
-			toolManager.SetDebugLogger(agentConfig.DebugLogger)
-		}
-		// Set per-server loaded callback if provided.
-		if agentConfig.OnMCPServerLoaded != nil {
-			toolManager.SetOnServerLoaded(agentConfig.OnMCPServerLoaded)
-		}
-		a.toolManager = toolManager
-		a.mcpReady = make(chan struct{})
-
-		go func() {
-			defer close(a.mcpReady)
-			if err := toolManager.LoadTools(ctx, agentConfig.MCPConfig); err != nil {
-				a.mcpErr = err
-				fmt.Printf("Warning: Failed to load MCP tools: %v\n", err)
-			}
-		}()
-	}
-
-	return a, nil
-}
-
-// WaitForMCPTools blocks until background MCP tool loading completes.
-// Returns nil if no MCP servers are configured or if loading succeeded.
-// Returns the loading error if all servers failed. Safe to call multiple times.
-func (a *Agent) WaitForMCPTools() error {
-	if a.mcpReady == nil {
-		return nil
-	}
-	<-a.mcpReady
-	return a.mcpErr
-}
-
-// MCPToolsReady returns true if MCP tool loading has completed (or was never
-// started). This is a non-blocking check useful for UI status display.
-func (a *Agent) MCPToolsReady() bool {
-	if a.mcpReady == nil {
-		return true
-	}
-	select {
-	case <-a.mcpReady:
-		return true
-	default:
-		return false
-	}
-}
-
-// ensureMCPTools waits for MCP tools to load and rebuilds the fantasy agent
-// with the full tool set. Called lazily before the first LLM call.
-// This is idempotent — subsequent calls after the first rebuild are no-ops.
-func (a *Agent) ensureMCPTools() {
-	if a.mcpReady == nil {
-		return
-	}
-	<-a.mcpReady
-
-	// If there are MCP tools, rebuild the fantasy agent to include them.
-	if a.toolManager != nil && len(a.toolManager.GetTools()) > 0 {
-		a.rebuildFantasyAgent()
-	}
-
-	// Nil out the channel so future calls are instant no-ops and we
-	// don't rebuild again.
-	a.mcpReady = nil
-}
-
-// rebuildFantasyAgent reconstructs the fantasy agent with the current full
-// tool set (core + MCP + extension tools). Used after MCP tools arrive
-// asynchronously and by SetModel.
-func (a *Agent) rebuildFantasyAgent() {
-	allTools := make([]fantasy.AgentTool, len(a.coreTools))
-	copy(allTools, a.coreTools)
-	if a.toolManager != nil {
-		allTools = append(allTools, a.toolManager.GetTools()...)
-	}
-	if len(a.extraTools) > 0 {
-		allTools = append(allTools, a.extraTools...)
-	}
-	if a.toolWrapper != nil {
-		allTools = a.toolWrapper(allTools)
-	}
-
-	providerResult := &models.ProviderResult{
-		Model:               a.model,
-		ProviderOptions:     a.providerOptions,
-		SkipMaxOutputTokens: a.skipMaxOutputTokens,
-	}
-	agentOpts := buildAgentOptions(&AgentConfig{
-		ModelConfig:  a.modelConfig,
-		SystemPrompt: a.systemPrompt,
-		MaxSteps:     a.maxSteps,
-	}, providerResult, allTools)
-
-	a.fantasyAgent = fantasy.NewAgent(a.model, agentOpts...)
-}
-
-// buildAgentOptions constructs the fantasy.AgentOption slice from config,
-// provider result, and the combined tool list. Shared by NewAgent,
-// rebuildFantasyAgent, and SetModel.
-func buildAgentOptions(agentConfig *AgentConfig, providerResult *models.ProviderResult, allTools []fantasy.AgentTool) []fantasy.AgentOption {
+	// Build fantasy agent options
 	var agentOpts []fantasy.AgentOption
 
 	if agentConfig.SystemPrompt != "" {
@@ -360,15 +196,33 @@ func buildAgentOptions(agentConfig *AgentConfig, providerResult *models.Provider
 		if agentConfig.ModelConfig.TopK != nil {
 			agentOpts = append(agentOpts, fantasy.WithTopK(int64(*agentConfig.ModelConfig.TopK)))
 		}
-		if agentConfig.ModelConfig.FrequencyPenalty != nil {
-			agentOpts = append(agentOpts, fantasy.WithFrequencyPenalty(float64(*agentConfig.ModelConfig.FrequencyPenalty)))
-		}
-		if agentConfig.ModelConfig.PresencePenalty != nil {
-			agentOpts = append(agentOpts, fantasy.WithPresencePenalty(float64(*agentConfig.ModelConfig.PresencePenalty)))
+	}
+
+	// Create the fantasy agent
+	fantasyAgent := fantasy.NewAgent(providerResult.Model, agentOpts...)
+
+	// Determine provider type from model string
+	providerType := "default"
+	if agentConfig.ModelConfig != nil && agentConfig.ModelConfig.ModelString != "" {
+		if p, _, err := models.ParseModelString(agentConfig.ModelConfig.ModelString); err == nil {
+			providerType = p
 		}
 	}
 
-	return agentOpts
+	return &Agent{
+		toolManager:      toolManager,
+		fantasyAgent:     fantasyAgent,
+		model:            providerResult.Model,
+		providerCloser:   providerResult.Closer,
+		maxSteps:         agentConfig.MaxSteps,
+		systemPrompt:     agentConfig.SystemPrompt,
+		loadingMessage:   providerResult.Message,
+		providerType:     providerType,
+		streamingEnabled: agentConfig.StreamingEnabled,
+		coreTools:        coreTools,
+		extraTools:       agentConfig.ExtraTools,
+		toolWrapper:      agentConfig.ToolWrapper,
+	}, nil
 }
 
 // GenerateWithLoop processes messages with a custom loop that displays tool calls in real-time.
@@ -377,47 +231,38 @@ func (a *Agent) GenerateWithLoop(ctx context.Context, messages []fantasy.Message
 	onResponse ResponseHandler, onToolCallContent ToolCallContentHandler,
 ) (*GenerateWithLoopResult, error) {
 	return a.GenerateWithLoopAndStreaming(ctx, messages, onToolCall, onToolExecution, onToolResult,
-		onResponse, onToolCallContent, nil, nil, nil, nil, nil)
+		onResponse, onToolCallContent, nil, nil, nil, nil)
 }
 
-// GenerateWithLoopAndStreaming processes messages using the agent with streaming and callbacks.
-// The agent handles the tool call loop internally. We map the rich callback system
+// GenerateWithLoopAndStreaming processes messages using the fantasy agent with streaming and callbacks.
+// Fantasy handles the tool call loop internally. We map fantasy's rich callback system
 // to kit's existing callback interface for UI integration.
 func (a *Agent) GenerateWithLoopAndStreaming(ctx context.Context, messages []fantasy.Message,
 	onToolCall ToolCallHandler, onToolExecution ToolExecutionHandler, onToolResult ToolResultHandler,
 	onResponse ResponseHandler, onToolCallContent ToolCallContentHandler,
 	onStreamingResponse StreamingResponseHandler,
 	onReasoningDelta ReasoningDeltaHandler,
-	onReasoningComplete ReasoningCompleteHandler,
 	onToolOutput ToolOutputHandler,
 	onStepUsage StepUsageHandler,
 ) (*GenerateWithLoopResult, error) {
 
-	// Wait for background MCP tool loading to complete and rebuild the
-	// fantasy agent with the full tool set. This is a no-op when no MCP
-	// servers are configured or tools have already been integrated.
-	a.ensureMCPTools()
-
 	// Inject tool output handler into context for use by core tools (e.g., bash).
 	if onToolOutput != nil {
 		ctx = core.ContextWithToolOutputCallback(ctx, onToolOutput)
 	}
 
-	// The agent requires the current user input as Prompt, with prior messages as history.
+	// Fantasy requires the current user input as Prompt, with prior messages as history.
 	// Extract the last user message text and files as the prompt, and pass everything
 	// before it as Messages. Files (e.g. clipboard images) are passed via the Files
-	// field so the agent includes them in the API request.
+	// field so Fantasy includes them in the API request.
 	prompt, files, history := splitPromptAndHistory(messages)
 
-	// Apply message-level cache control for Anthropic models.
-	// This avoids type conflicts with provider-level options.
-	history = applyCacheControlToMessages(history)
-
-	// Track current tool call args for callbacks
+	// Track current tool call info for callbacks
+	var currentToolName string
 	var currentToolArgs string
 
 	// Use the streaming path when streaming is enabled OR when any callbacks are
-	// provided. The agent only exposes tool/step callbacks on AgentStreamCall, so
+	// provided. Fantasy only exposes tool/step callbacks on AgentStreamCall, so
 	// Stream is required to observe tool execution in real time. The non-streaming
 	// Generate path is reserved for the simple case with no callbacks at all.
 	hasCallbacks := onToolCall != nil || onToolExecution != nil || onToolResult != nil ||
@@ -425,12 +270,12 @@ func (a *Agent) GenerateWithLoopAndStreaming(ctx context.Context, messages []fan
 
 	if a.streamingEnabled || hasCallbacks {
 		// Track completed step messages so we can return partial results
-		// on cancellation. The agent's Stream() discards accumulated steps
+		// on cancellation. Fantasy's Stream() discards accumulated steps
 		// when it returns an error, but the OnStepFinish callback fires
 		// for every step that completed before the error occurred.
 		var completedStepMessages []fantasy.Message
 
-		// Use the streaming agent
+		// Use fantasy's streaming agent
 		streamCall := fantasy.AgentStreamCall{
 			Prompt:   prompt,
 			Files:    files,
@@ -447,17 +292,6 @@ func (a *Agent) GenerateWithLoopAndStreaming(ctx context.Context, messages []fan
 				return nil
 			},
 
-			// Reasoning/thinking complete callback
-			OnReasoningEnd: func(id string, _ fantasy.ReasoningContent) error {
-				if ctx.Err() != nil {
-					return ctx.Err()
-				}
-				if onReasoningComplete != nil {
-					onReasoningComplete()
-				}
-				return nil
-			},
-
 			// Text streaming callback
 			OnTextDelta: func(id, text string) error {
 				if ctx.Err() != nil {
@@ -474,6 +308,7 @@ func (a *Agent) GenerateWithLoopAndStreaming(ctx context.Context, messages []fan
 				if ctx.Err() != nil {
 					return ctx.Err()
 				}
+				currentToolName = tc.ToolName
 				currentToolArgs = tc.Input
 
 				// Notify about the tool call
@@ -544,7 +379,7 @@ func (a *Agent) GenerateWithLoopAndStreaming(ctx context.Context, messages []fan
 				opts fantasy.PrepareStepFunctionOptions,
 			) (context.Context, fantasy.PrepareStepResult, error) {
 				// Drain all pending steer messages (non-blocking).
-				var steered []SteerMessage
+				var steered []string
 				for {
 					select {
 					case msg := <-steerCh:
@@ -561,20 +396,15 @@ func (a *Agent) GenerateWithLoopAndStreaming(ctx context.Context, messages []fan
 				if len(steered) > 0 {
 					// Inject each steer message as a user message so the
 					// LLM sees the redirection on the next step.
-					for _, sm := range steered {
+					for _, text := range steered {
 						result.Messages = append(result.Messages,
-							fantasy.NewUserMessage(sm.Text, sm.Files...))
+							fantasy.NewUserMessage(text))
 					}
 					// Notify that steer messages were consumed.
 					if onConsumed != nil {
 						onConsumed(len(steered))
 					}
 				}
-
-				// Apply message-level cache control for Anthropic models.
-				// This avoids type conflicts with provider-level options.
-				result.Messages = applyCacheControlToMessages(result.Messages)
-
 				return stepCtx, result, nil
 			}
 		}
@@ -598,12 +428,9 @@ func (a *Agent) GenerateWithLoopAndStreaming(ctx context.Context, messages []fan
 			return nil, err
 		}
 
-		// Fire the response callback so callers (e.g. the TUI) can reset
-		// streaming state. This must fire even when the response text is
-		// empty (e.g. reasoning-only responses) so the UI properly resets
-		// the stream component and avoids duplicate content on the next
-		// flush.
-		if onResponse != nil {
+		// Fire the response callback for callers that use it (e.g. non-streaming
+		// callers that still want the final response notification).
+		if onResponse != nil && result.Response.Content.Text() != "" {
 			onResponse(result.Response.Content.Text())
 		}
 
@@ -620,17 +447,18 @@ func (a *Agent) GenerateWithLoopAndStreaming(ctx context.Context, messages []fan
 		return nil, err
 	}
 
-	// For non-streaming, fire the response callback so callers can reset
-	// streaming state (see streaming path comment above).
-	if onResponse != nil {
+	// For non-streaming, fire the response callback with the final text
+	if onResponse != nil && result.Response.Content.Text() != "" {
 		onResponse(result.Response.Content.Text())
 	}
 
+	_ = currentToolName // satisfy compiler for non-streaming path
+
 	return convertAgentResult(result, messages), nil
 }
 
 // splitPromptAndHistory extracts the last user message as the prompt string,
-// and returns everything before it as conversation history. The agent's
+// and returns everything before it as conversation history. Fantasy's agent
 // requires the current turn's input as Prompt (string), with prior messages
 // passed separately as Messages (history).
 func splitPromptAndHistory(messages []fantasy.Message) (string, []fantasy.FilePart, []fantasy.Message) {
@@ -673,8 +501,8 @@ func splitPromptAndHistory(messages []fantasy.Message) (string, []fantasy.FilePa
 	return "", nil, messages
 }
 
-// convertAgentResult converts an AgentResult to our GenerateWithLoopResult.
-// It builds both the message slice and the new custom content blocks.
+// convertAgentResult converts a fantasy AgentResult to our GenerateWithLoopResult.
+// It builds both the legacy fantasy.Message slice and the new custom content blocks.
 func convertAgentResult(result *fantasy.AgentResult, originalMessages []fantasy.Message) *GenerateWithLoopResult {
 	// Collect all conversation messages: original + all step messages
 	var allFantasyMessages []fantasy.Message
@@ -687,7 +515,7 @@ func convertAgentResult(result *fantasy.AgentResult, originalMessages []fantasy.
 	// Convert to custom content blocks
 	var allMessages []message.Message
 	for _, fm := range allFantasyMessages {
-		allMessages = append(allMessages, message.FromLLMMessage(fm))
+		allMessages = append(allMessages, message.FromFantasyMessage(fm))
 	}
 
 	return &GenerateWithLoopResult{
@@ -699,7 +527,7 @@ func convertAgentResult(result *fantasy.AgentResult, originalMessages []fantasy.
 	}
 }
 
-// extractToolResultText extracts the text and error status from a ToolResultContent.
+// extractToolResultText extracts the text and error status from a fantasy ToolResultContent.
 // For core tools, the result is already clean text (no MCP JSON wrapping).
 // For MCP tools, it unwraps the MCP content structure.
 func extractToolResultText(tr fantasy.ToolResultContent) (string, bool) {
@@ -712,7 +540,7 @@ func extractToolResultText(tr fantasy.ToolResultContent) (string, bool) {
 		return errResult.Error.Error(), true
 	}
 
-	// Get text directly from the result type.
+	// Get text directly from the Fantasy result type.
 	if textResult, ok := tr.Result.(fantasy.ToolResultOutputContentText); ok {
 		// Try to unwrap MCP JSON structure (for external MCP tools).
 		// Core tools return plain text, so this is a no-op for them.
@@ -790,14 +618,6 @@ func (a *Agent) GetExtensionToolCount() int {
 	return len(a.extraTools)
 }
 
-// SetExtraTools replaces the agent's extra tools (e.g. extension-registered
-// tools) and rebuilds the internal agent with the updated tool list. The
-// model, system prompt, and all other configuration are preserved.
-func (a *Agent) SetExtraTools(extraTools []fantasy.AgentTool) {
-	a.extraTools = extraTools
-	a.rebuildFantasyAgent()
-}
-
 // GetLoadingMessage returns the loading message from provider creation.
 func (a *Agent) GetLoadingMessage() string {
 	return a.loadingMessage
@@ -815,14 +635,60 @@ func (a *Agent) GetLoadedServerNames() []string {
 // system prompt, and configuration are preserved. The old provider is closed
 // if it has a closer. Returns the previous model string for notification.
 func (a *Agent) SetModel(ctx context.Context, config *models.ProviderConfig) error {
-	// Ensure MCP tools are loaded before rebuilding (SetModel may be called
-	// before the first LLM call).
-	a.ensureMCPTools()
-
 	providerResult, err := models.CreateProvider(ctx, config)
 	if err != nil {
 		return fmt.Errorf("failed to create model provider: %v", err)
 	}
+
+	// Rebuild tool list (same as NewAgent).
+	allTools := make([]fantasy.AgentTool, len(a.coreTools))
+	copy(allTools, a.coreTools)
+	if a.toolManager != nil {
+		allTools = append(allTools, a.toolManager.GetTools()...)
+	}
+	if len(a.extraTools) > 0 {
+		allTools = append(allTools, a.extraTools...)
+	}
+	if a.toolWrapper != nil {
+		allTools = a.toolWrapper(allTools)
+	}
+
+	// Rebuild fantasy agent options.
+	var agentOpts []fantasy.AgentOption
+	if a.systemPrompt != "" {
+		agentOpts = append(agentOpts, fantasy.WithSystemPrompt(a.systemPrompt))
+	}
+	if len(allTools) > 0 {
+		agentOpts = append(agentOpts, fantasy.WithTools(allTools...))
+	}
+	if a.maxSteps > 0 {
+		agentOpts = append(agentOpts, fantasy.WithStopConditions(
+			fantasy.StepCountIs(a.maxSteps),
+		))
+	}
+
+	// Pass provider-specific options (e.g. OpenAI Responses API reasoning settings).
+	if providerResult.ProviderOptions != nil {
+		agentOpts = append(agentOpts, fantasy.WithProviderOptions(providerResult.ProviderOptions))
+	}
+
+	// Pass generation parameters when available.
+	// Skip max_output_tokens for providers that don't support it (e.g., Codex OAuth)
+	if config.MaxTokens > 0 && !providerResult.SkipMaxOutputTokens {
+		agentOpts = append(agentOpts, fantasy.WithMaxOutputTokens(int64(config.MaxTokens)))
+	}
+	if config.Temperature != nil {
+		agentOpts = append(agentOpts, fantasy.WithTemperature(float64(*config.Temperature)))
+	}
+	if config.TopP != nil {
+		agentOpts = append(agentOpts, fantasy.WithTopP(float64(*config.TopP)))
+	}
+	if config.TopK != nil {
+		agentOpts = append(agentOpts, fantasy.WithTopK(int64(*config.TopK)))
+	}
+
+	newFantasyAgent := fantasy.NewAgent(providerResult.Model, agentOpts...)
+
 	// Close old provider.
 	if a.providerCloser != nil {
 		_ = a.providerCloser.Close()
@@ -834,11 +700,9 @@ func (a *Agent) SetModel(ctx context.Context, config *models.ProviderConfig) err
 	}
 
 	// Swap fields.
+	a.fantasyAgent = newFantasyAgent
 	a.model = providerResult.Model
 	a.providerCloser = providerResult.Closer
-	a.providerOptions = providerResult.ProviderOptions
-	a.skipMaxOutputTokens = providerResult.SkipMaxOutputTokens
-	a.modelConfig = config
 
 	// Update provider type.
 	if config.ModelString != "" {
@@ -847,25 +711,16 @@ func (a *Agent) SetModel(ctx context.Context, config *models.ProviderConfig) err
 		}
 	}
 
-	// Rebuild the fantasy agent with the new model and current tool set.
-	a.rebuildFantasyAgent()
-
 	return nil
 }
 
-// GetModel returns the underlying LanguageModel.
+// GetModel returns the underlying fantasy LanguageModel.
 func (a *Agent) GetModel() fantasy.LanguageModel {
 	return a.model
 }
 
 // Close closes the agent and cleans up resources.
-// If MCP tools are still loading in the background, Close waits for them
-// to finish before closing connections to avoid resource leaks.
 func (a *Agent) Close() error {
-	// Wait for background MCP loading to finish before closing connections.
-	if a.mcpReady != nil {
-		<-a.mcpReady
-	}
 	var toolErr error
 	if a.toolManager != nil {
 		toolErr = a.toolManager.Close()

internal/agent/cache_control.go

@@ -1,84 +0,0 @@
-package agent
-
-import (
-	"charm.land/fantasy"
-	"charm.land/fantasy/providers/anthropic"
-)
-
-// cacheControlOptions returns provider options for Anthropic cache control.
-// This is used at the message level to avoid type conflicts with provider-level options.
-func cacheControlOptions() fantasy.ProviderOptions {
-	return anthropic.NewProviderCacheControlOptions(&anthropic.ProviderCacheControlOptions{
-		CacheControl: anthropic.CacheControl{
-			Type: "ephemeral",
-		},
-	})
-}
-
-// applyCacheControlToMessages adds cache control to specific messages.
-// Anthropic allows max 4 cache blocks per request.
-// Counts existing cache blocks and only adds new ones up to the limit.
-func applyCacheControlToMessages(messages []fantasy.Message) []fantasy.Message {
-	if len(messages) == 0 {
-		return messages
-	}
-
-	// Make a copy to avoid modifying the original slice
-	result := make([]fantasy.Message, len(messages))
-	copy(result, messages)
-
-	cacheOpts := cacheControlOptions()
-	maxCacheBlocks := 4
-
-	// Helper to check if message already has cache control
-	hasCache := func(msg fantasy.Message) bool {
-		if msg.ProviderOptions == nil {
-			return false
-		}
-		if _, ok := msg.ProviderOptions["anthropic"]; ok {
-			return true
-		}
-		return false
-	}
-
-	// Count existing cache blocks
-	existingCacheCount := 0
-	for _, msg := range result {
-		if hasCache(msg) {
-			existingCacheCount++
-		}
-	}
-
-	// If we're already at or over the limit, don't add more
-	if existingCacheCount >= maxCacheBlocks {
-		return result
-	}
-
-	// How many new cache blocks can we add?
-	remaining := maxCacheBlocks - existingCacheCount
-
-	// First: find and cache the last system message (most important)
-	lastSystemIdx := -1
-	for i, msg := range result {
-		if msg.Role == fantasy.MessageRoleSystem {
-			lastSystemIdx = i
-		}
-	}
-
-	if lastSystemIdx >= 0 && remaining > 0 && !hasCache(result[lastSystemIdx]) {
-		result[lastSystemIdx].ProviderOptions = cacheOpts
-		remaining--
-	}
-
-	// Second: cache the most recent messages (up to remaining limit)
-	// Work backwards from the end to prioritize recent context
-	for i := len(result) - 1; i >= 0 && remaining > 0; i-- {
-		if hasCache(result[i]) {
-			continue
-		}
-		result[i].ProviderOptions = cacheOpts
-		remaining--
-	}
-
-	return result
-}

internal/agent/factory.go

@@ -36,22 +36,13 @@ type AgentCreationOptions struct {
 	SpinnerFunc SpinnerFunc // Function to show spinner (provided by caller)
 	// DebugLogger is an optional logger for debugging MCP communications
 	DebugLogger tools.DebugLogger // Optional debug logger
-	// AuthHandler handles OAuth authorization for remote MCP servers
-	AuthHandler tools.MCPAuthHandler
 	// CoreTools overrides the default core tool set. If empty, core.AllTools()
 	// is used.
 	CoreTools []fantasy.AgentTool
-	// DisableCoreTools, when true, prevents loading any core tools.
-	// If both DisableCoreTools is true and CoreTools is empty, the agent
-	// will have no tools (useful for simple chat completions).
-	DisableCoreTools bool
-	// ToolWrapper wraps the combined tool list before agent creation.
+	// ToolWrapper wraps the combined tool list before Fantasy agent creation.
 	ToolWrapper func([]fantasy.AgentTool) []fantasy.AgentTool
 	// ExtraTools are additional tools to include (e.g. from extensions).
 	ExtraTools []fantasy.AgentTool
-	// OnMCPServerLoaded, if non-nil, is called when each MCP server finishes
-	// loading (successfully or with error). Called from the background goroutine.
-	OnMCPServerLoaded func(serverName string, toolCount int, err error)
 }
 
 // CreateAgent creates an agent with optional spinner for Ollama models.
@@ -59,18 +50,15 @@ type AgentCreationOptions struct {
 // Returns the created agent or an error if creation fails.
 func CreateAgent(ctx context.Context, opts *AgentCreationOptions) (*Agent, error) {
 	agentConfig := &AgentConfig{
-		ModelConfig:       opts.ModelConfig,
-		MCPConfig:         opts.MCPConfig,
-		SystemPrompt:      opts.SystemPrompt,
-		MaxSteps:          opts.MaxSteps,
-		StreamingEnabled:  opts.StreamingEnabled,
-		DebugLogger:       opts.DebugLogger,
-		AuthHandler:       opts.AuthHandler,
-		CoreTools:         opts.CoreTools,
-		DisableCoreTools:  opts.DisableCoreTools,
-		ToolWrapper:       opts.ToolWrapper,
-		ExtraTools:        opts.ExtraTools,
-		OnMCPServerLoaded: opts.OnMCPServerLoaded,
+		ModelConfig:      opts.ModelConfig,
+		MCPConfig:        opts.MCPConfig,
+		SystemPrompt:     opts.SystemPrompt,
+		MaxSteps:         opts.MaxSteps,
+		StreamingEnabled: opts.StreamingEnabled,
+		DebugLogger:      opts.DebugLogger,
+		CoreTools:        opts.CoreTools,
+		ToolWrapper:      opts.ToolWrapper,
+		ExtraTools:       opts.ExtraTools,
 	}
 
 	var agent *Agent

internal/agent/steer.go

@@ -1,17 +1,6 @@
 package agent
 
-import (
-	"context"
-
-	"charm.land/fantasy"
-)
-
-// SteerMessage carries a steering prompt and optional file attachments
-// (e.g. clipboard images) through the steer channel.
-type SteerMessage struct {
-	Text  string
-	Files []fantasy.FilePart
-}
+import "context"
 
 // steerChKey is the context key for the steer channel.
 type steerChKey struct{}
@@ -22,7 +11,7 @@ type steerConsumedKey struct{}
 // ContextWithSteerCh returns a new context with the steer channel attached.
 // The agent's PrepareStep function checks this channel between steps and
 // injects any pending steer messages as user messages before the next LLM call.
-func ContextWithSteerCh(ctx context.Context, ch <-chan SteerMessage) context.Context {
+func ContextWithSteerCh(ctx context.Context, ch <-chan string) context.Context {
 	return context.WithValue(ctx, steerChKey{}, ch)
 }
 
@@ -34,8 +23,8 @@ func ContextWithSteerConsumed(ctx context.Context, fn func(count int)) context.C
 }
 
 // steerChFromContext extracts the steer channel from the context, or nil.
-func steerChFromContext(ctx context.Context) <-chan SteerMessage {
-	ch, _ := ctx.Value(steerChKey{}).(<-chan SteerMessage)
+func steerChFromContext(ctx context.Context) <-chan string {
+	ch, _ := ctx.Value(steerChKey{}).(<-chan string)
 	return ch
 }
 

internal/app/app.go

@@ -3,11 +3,8 @@ package app
 import (
 	"context"
 	"fmt"
-	"log"
 	"os"
 	"sync"
-	"sync/atomic"
-	"time"
 
 	tea "charm.land/bubbletea/v2"
 	"charm.land/fantasy"
@@ -20,7 +17,7 @@ import (
 // queueItem holds a prompt and optional image attachments for the execution queue.
 type queueItem struct {
 	Prompt string
-	Files  []kit.LLMFilePart
+	Files  []fantasy.FilePart
 }
 
 // App is the application-layer orchestrator. It owns the agentic loop,
@@ -69,20 +66,11 @@ type App struct {
 	// rootCtx/rootCancel are used to signal shutdown to all goroutines.
 	rootCtx    context.Context
 	rootCancel context.CancelFunc
-
-	// widgetUpdatePending is set to true when a WidgetUpdateEvent has been
-	// sent to the TUI but not yet consumed by its event loop. While the flag
-	// is set, subsequent NotifyWidgetUpdate calls are coalesced (dropped) to
-	// prevent fast extension tickers from flooding the BubbleTea mailbox with
-	// redundant re-render triggers. The flag is cleared after a short debounce
-	// (~1 frame) so new updates are always let through once the TUI has had a
-	// chance to process the pending event.
-	widgetUpdatePending atomic.Bool
 }
 
 // New creates a new App with the provided options and pre-loaded messages.
 // initialMessages may be nil or empty for a fresh session.
-func New(opts Options, initialMessages []kit.LLMMessage) *App {
+func New(opts Options, initialMessages []fantasy.Message) *App {
 	rootCtx, rootCancel := context.WithCancel(context.Background())
 	return &App{
 		opts:       opts,
@@ -126,8 +114,9 @@ func (a *App) Run(prompt string) int {
 // If the app is idle the prompt executes immediately; otherwise it is queued.
 // Returns the current queue depth (0 = started immediately, >0 = queued).
 //
-// Satisfies ui.AppController.
-func (a *App) RunWithFiles(prompt string, files []kit.LLMFilePart) int {
+// Satisfies ui.AppController (via RunWithImages which converts ImageAttachment
+// to fantasy.FilePart).
+func (a *App) RunWithFiles(prompt string, files []fantasy.FilePart) int {
 	a.mu.Lock()
 
 	if a.closed {
@@ -162,24 +151,6 @@ func (a *App) CancelCurrentStep() {
 	cancel()
 }
 
-// IsBusy returns true when the agent is currently processing a turn.
-func (a *App) IsBusy() bool {
-	a.mu.Lock()
-	defer a.mu.Unlock()
-	return a.busy
-}
-
-// Abort cancels the current agent step (if running) and clears the queue.
-// Unlike InterruptAndSend, no new message is injected — the agent simply
-// stops. Safe to call when idle (no-op).
-func (a *App) Abort() {
-	a.mu.Lock()
-	a.queue = a.queue[:0]
-	cancel := a.cancelStep
-	a.mu.Unlock()
-	cancel()
-}
-
 // QueueLength returns the number of prompts currently waiting in the queue.
 //
 // Satisfies ui.AppController.
@@ -205,15 +176,6 @@ func (a *App) QueueLength() int {
 //
 // Satisfies ui.AppController.
 func (a *App) Steer(prompt string) int {
-	return a.SteerWithFiles(prompt, nil)
-}
-
-// SteerWithFiles injects a steering message with optional file attachments
-// (e.g. pasted images) into the currently running agent turn. Behaves like
-// Steer but includes file parts alongside the text.
-//
-// Satisfies ui.AppController.
-func (a *App) SteerWithFiles(prompt string, files []kit.LLMFilePart) int {
 	a.mu.Lock()
 
 	if a.closed {
@@ -222,8 +184,8 @@ func (a *App) SteerWithFiles(prompt string, files []kit.LLMFilePart) int {
 	}
 
 	if !a.busy {
-		// Not busy — start immediately, same as RunWithFiles().
-		item := queueItem{Prompt: prompt, Files: files}
+		// Not busy — start immediately, same as Run().
+		item := queueItem{Prompt: prompt}
 		a.busy = true
 		a.wg.Add(1)
 		a.mu.Unlock()
@@ -238,7 +200,7 @@ func (a *App) SteerWithFiles(prompt string, files []kit.LLMFilePart) int {
 	// execution, before next LLM call). If PrepareStep doesn't fire
 	// (text-only response), drainQueue will pick it up after the turn.
 	if a.opts.Kit != nil {
-		a.opts.Kit.InjectSteerWithFiles(prompt, files)
+		a.opts.Kit.InjectSteer(prompt)
 	}
 	return 1
 }
@@ -297,17 +259,6 @@ func (a *App) ClearMessages() {
 	}
 }
 
-// ReloadMessagesFromTree clears the in-memory message store and reloads it
-// from the tree session's current branch. Unlike ClearMessages, this does NOT
-// reset the tree session's leaf pointer. Used after Branch() to sync the
-// store with the new branch position.
-func (a *App) ReloadMessagesFromTree() {
-	a.store.Clear()
-	if a.opts.TreeSession != nil {
-		a.store.Replace(a.opts.TreeSession.GetLLMMessages())
-	}
-}
-
 // GetTreeSession returns the tree session manager, or nil if not configured.
 func (a *App) GetTreeSession() *session.TreeManager {
 	return a.opts.TreeSession
@@ -329,7 +280,7 @@ func (a *App) SwitchTreeSession(ts *session.TreeManager) {
 	// Reload messages from new session.
 	a.store.Clear()
 	if ts != nil {
-		a.store.Replace(ts.GetLLMMessages())
+		a.store.Replace(ts.GetFantasyMessages())
 	}
 }
 
@@ -340,12 +291,12 @@ func (a *App) SwitchTreeSession(ts *session.TreeManager) {
 //
 // Satisfies ui.AppController.
 func (a *App) AddContextMessage(text string) {
-	kitMsg := fantasy.NewUserMessage(text)
-	a.store.Add(kitMsg)
+	msg := fantasy.NewUserMessage(text)
+	a.store.Add(msg)
 
 	// Persist to tree session if active.
 	if ts := a.opts.TreeSession; ts != nil {
-		_, _ = ts.AppendLLMMessage(fantasy.NewUserMessage(text))
+		_, _ = ts.AppendFantasyMessage(msg)
 	}
 }
 
@@ -383,15 +334,6 @@ func (a *App) CompactConversation(customInstructions string) error {
 			a.mu.Unlock()
 		}()
 
-		// Subscribe to SDK events for streaming compaction summary to the TUI.
-		sendFn := func(msg tea.Msg) {
-			if a.program != nil {
-				a.program.Send(msg)
-			}
-		}
-		unsub := a.subscribeSDKEvents(sendFn, nil)
-		defer unsub()
-
 		result, err := a.opts.Kit.Compact(a.rootCtx, nil, customInstructions)
 		if err != nil {
 			a.sendEvent(CompactErrorEvent{Err: err})
@@ -404,7 +346,7 @@ func (a *App) CompactConversation(customInstructions string) error {
 
 		// Sync in-memory store with the compacted session.
 		if a.opts.TreeSession != nil {
-			a.store.Replace(a.opts.TreeSession.GetLLMMessages())
+			a.store.Replace(a.opts.TreeSession.GetFantasyMessages())
 		}
 
 		a.sendEvent(CompactCompleteEvent{
@@ -417,78 +359,6 @@ func (a *App) CompactConversation(customInstructions string) error {
 	return nil
 }
 
-// CompactAsync is like CompactConversation but calls onComplete/onError
-// callbacks instead of sending TUI events. Used by the extension API's
-// ctx.Compact() which needs callback-based notification.
-func (a *App) CompactAsync(customInstructions string, onComplete func(), onError func(string)) error {
-	a.mu.Lock()
-	if a.closed {
-		a.mu.Unlock()
-		return fmt.Errorf("app is closed")
-	}
-	if a.busy {
-		a.mu.Unlock()
-		return fmt.Errorf("cannot compact while the agent is working")
-	}
-	if a.opts.Kit == nil {
-		a.mu.Unlock()
-		return fmt.Errorf("SDK instance not available")
-	}
-	a.busy = true
-	a.wg.Add(1)
-	a.mu.Unlock()
-
-	go func() {
-		defer a.wg.Done()
-		defer func() {
-			a.mu.Lock()
-			a.busy = false
-			a.mu.Unlock()
-		}()
-
-		// Subscribe to SDK events for streaming compaction summary to the TUI.
-		sendFn := func(msg tea.Msg) {
-			if a.program != nil {
-				a.program.Send(msg)
-			}
-		}
-		unsub := a.subscribeSDKEvents(sendFn, nil)
-		defer unsub()
-
-		result, err := a.opts.Kit.Compact(a.rootCtx, nil, customInstructions)
-		if err != nil {
-			a.sendEvent(CompactErrorEvent{Err: err})
-			if onError != nil {
-				onError(err.Error())
-			}
-			return
-		}
-		if result == nil {
-			a.sendEvent(CompactErrorEvent{Err: fmt.Errorf("nothing to compact")})
-			if onError != nil {
-				onError("nothing to compact")
-			}
-			return
-		}
-
-		// Sync in-memory store with the compacted session.
-		if a.opts.TreeSession != nil {
-			a.store.Replace(a.opts.TreeSession.GetLLMMessages())
-		}
-
-		a.sendEvent(CompactCompleteEvent{
-			Summary:         result.Summary,
-			OriginalTokens:  result.OriginalTokens,
-			CompactedTokens: result.CompactedTokens,
-			MessagesRemoved: result.MessagesRemoved,
-		})
-		if onComplete != nil {
-			onComplete()
-		}
-	}()
-	return nil
-}
-
 // --------------------------------------------------------------------------
 // Non-interactive execution
 // --------------------------------------------------------------------------
@@ -613,10 +483,11 @@ func (a *App) drainQueue(first queueItem) {
 		a.mu.Lock()
 		items = append(items, a.queue...)
 		a.queue = a.queue[:0] // Clear the queue
+		queueLen := len(a.queue)
 		a.mu.Unlock()
 
-		// Notify UI: all queued messages have been consumed into this batch.
-		a.sendEvent(QueueUpdatedEvent{Length: 0})
+		// Send queue updated event (queue is now empty)
+		a.sendEvent(QueueUpdatedEvent{Length: queueLen})
 
 		// Process all collected items as a single batch
 		a.runQueueBatch(items)
@@ -629,8 +500,8 @@ func (a *App) drainQueue(first queueItem) {
 			if leftover := a.opts.Kit.DrainSteer(); len(leftover) > 0 {
 				a.mu.Lock()
 				steerItems := make([]queueItem, len(leftover))
-				for i, sm := range leftover {
-					steerItems[i] = queueItem{Prompt: sm.Text, Files: sm.Files}
+				for i, text := range leftover {
+					steerItems[i] = queueItem{Prompt: text}
 				}
 				a.queue = append(steerItems, a.queue...)
 				a.mu.Unlock()
@@ -649,11 +520,6 @@ func (a *App) drainQueue(first queueItem) {
 		}
 		a.mu.Unlock()
 
-		if hasMore {
-			// Notify UI: these newly queued messages have been consumed into the next batch.
-			a.sendEvent(QueueUpdatedEvent{Length: 0})
-		}
-
 		if !hasMore {
 			// No more items, we're done
 			break
@@ -701,7 +567,7 @@ func (a *App) runQueueBatch(items []queueItem) {
 			// call/result pairs; only the in-progress message or tool
 			// call is discarded. Sync the in-memory store to match.
 			if ts := a.opts.TreeSession; ts != nil {
-				a.store.Replace(ts.GetLLMMessages())
+				a.store.Replace(ts.GetFantasyMessages())
 			}
 			a.sendEvent(StepCancelledEvent{})
 			return
@@ -720,7 +586,7 @@ func (a *App) runQueueBatch(items []queueItem) {
 // executeStep runs a single agentic step by delegating to the SDK's
 // PromptResult() (or PromptResultWithFiles for multimodal), which handles
 // session persistence, hooks, extension events, and the generation loop.
-func (a *App) executeStep(ctx context.Context, prompt string, eventFn func(tea.Msg), files []kit.LLMFilePart) (*kit.TurnResult, error) {
+func (a *App) executeStep(ctx context.Context, prompt string, eventFn func(tea.Msg), files []fantasy.FilePart) (*kit.TurnResult, error) {
 	// Test hook: bypass SDK entirely.
 	if a.opts.PromptFunc != nil {
 		return a.opts.PromptFunc(ctx, prompt)
@@ -732,10 +598,9 @@ func (a *App) executeStep(ctx context.Context, prompt string, eventFn func(tea.M
 		}
 	}
 
-	// Subscribe to SDK events for TUI rendering and per-step usage updates.
-	// The subscription is temporary — it lives only for the duration of this step.
-	var sawStepUsage atomic.Bool
-	unsub := a.subscribeSDKEvents(sendFn, &sawStepUsage)
+	// Subscribe to SDK events for TUI rendering. The subscription is
+	// temporary — it lives only for the duration of this step.
+	unsub := a.subscribeSDKEvents(sendFn)
 	defer unsub()
 
 	// Show spinner while the agent works.
@@ -755,9 +620,8 @@ func (a *App) executeStep(ctx context.Context, prompt string, eventFn func(tea.M
 	// Sync in-memory store with the SDK's authoritative conversation.
 	a.store.Replace(result.Messages)
 
-	// Update usage tracker. If per-step usage was already recorded from
-	// StepUsageEvent callbacks, avoid double-counting totals.
-	a.updateUsageFromTurnResult(result, prompt, sawStepUsage.Load())
+	// Update usage tracker.
+	a.updateUsageFromTurnResult(result, prompt)
 
 	return result, nil
 }
@@ -781,10 +645,9 @@ func (a *App) executeBatch(ctx context.Context, items []queueItem, eventFn func(
 		}
 	}
 
-	// Subscribe to SDK events for TUI rendering and per-step usage updates.
-	// The subscription is temporary — it lives only for the duration of this step.
-	var sawStepUsage atomic.Bool
-	unsub := a.subscribeSDKEvents(sendFn, &sawStepUsage)
+	// Subscribe to SDK events for TUI rendering. The subscription is
+	// temporary — it lives only for the duration of this step.
+	unsub := a.subscribeSDKEvents(sendFn)
 	defer unsub()
 
 	// Show spinner while the agent works.
@@ -817,8 +680,8 @@ func (a *App) executeBatch(ctx context.Context, items []queueItem, eventFn func(
 			messages = append(messages, item.Prompt)
 		}
 
-		// File attachments are not supported in batch mode; fall back to
-		// processing only the first item that carries files.
+		// TODO: Handle file attachments in batch mode
+		// For now, files are ignored in batch mode (rare edge case)
 		if hasFiles {
 			// If files exist, fall back to processing just the first item with files
 			for _, item := range items {
@@ -839,10 +702,8 @@ func (a *App) executeBatch(ctx context.Context, items []queueItem, eventFn func(
 	// Sync in-memory store with the SDK's authoritative conversation.
 	a.store.Replace(result.Messages)
 
-	// Update usage tracker (using last item's prompt for fallback estimation).
-	// If per-step usage was already recorded from StepUsageEvent callbacks,
-	// avoid double-counting totals.
-	a.updateUsageFromTurnResult(result, items[len(items)-1].Prompt, sawStepUsage.Load())
+	// Update usage tracker (using last item's prompt for tracking).
+	a.updateUsageFromTurnResult(result, items[len(items)-1].Prompt)
 
 	return result, nil
 }
@@ -859,10 +720,9 @@ func (a *App) sendEvent(msg tea.Msg) {
 }
 
 // subscribeSDKEvents registers temporary SDK event subscribers that convert
-// SDK events to tea.Msg events and dispatch them via sendFn. When stepUsageSeen
-// is provided, it is set to true after any non-zero StepUsageEvent is observed.
-// Returns an unsubscribe function that removes all listeners.
-func (a *App) subscribeSDKEvents(sendFn func(tea.Msg), stepUsageSeen *atomic.Bool) func() {
+// SDK events to tea.Msg events and dispatch them via sendFn. Returns an
+// unsubscribe function that removes all listeners.
+func (a *App) subscribeSDKEvents(sendFn func(tea.Msg)) func() {
 	k := a.opts.Kit
 	var unsubs []func()
 
@@ -887,8 +747,6 @@ func (a *App) subscribeSDKEvents(sendFn func(tea.Msg), stepUsageSeen *atomic.Boo
 			sendFn(StreamChunkEvent{Content: ev.Chunk})
 		case kit.ReasoningDeltaEvent:
 			sendFn(ReasoningChunkEvent{Delta: ev.Delta})
-		case kit.ReasoningCompleteEvent:
-			sendFn(ReasoningCompleteEvent{})
 		case kit.ToolOutputEvent:
 			sendFn(ToolOutputEvent{
 				ToolCallID: ev.ToolCallID,
@@ -898,8 +756,6 @@ func (a *App) subscribeSDKEvents(sendFn func(tea.Msg), stepUsageSeen *atomic.Boo
 			})
 		case kit.SteerConsumedEvent:
 			sendFn(SteerConsumedEvent{})
-		case kit.StepUsageEvent:
-			a.recordStepUsage(ev, stepUsageSeen)
 		}
 	}))
 
@@ -968,73 +824,12 @@ func (a *App) NotifyModelChanged(provider, model string) {
 // NotifyWidgetUpdate sends a WidgetUpdateEvent to the TUI so it re-renders
 // extension widgets. Called from the extension context's SetWidget/RemoveWidget
 // closures. In non-interactive mode this is a no-op (widgets are TUI-only).
-//
-// Coalescing: if a WidgetUpdateEvent is already queued and not yet consumed
-// by the TUI event loop, additional calls within the same ~16 ms window are
-// dropped. This prevents fast extension tickers from flooding BubbleTea's
-// mailbox with redundant re-render triggers.
 func (a *App) NotifyWidgetUpdate() {
-	// Coalesce: only one pending update at a time.
-	if !a.widgetUpdatePending.CompareAndSwap(false, true) {
-		return
-	}
 	a.mu.Lock()
 	prog := a.program
 	a.mu.Unlock()
 	if prog != nil {
 		prog.Send(WidgetUpdateEvent{})
-		// Reset the pending flag after a short debounce so subsequent calls
-		// within the same render cycle are also coalesced, but new updates
-		// after the cycle are allowed through.
-		go func() {
-			time.Sleep(16 * time.Millisecond) // ~1 frame at 60 fps
-			a.widgetUpdatePending.Store(false)
-		}()
-	} else {
-		// No program registered (non-interactive mode); clear the flag so
-		// future calls are never permanently blocked.
-		a.widgetUpdatePending.Store(false)
-	}
-}
-
-// NotifyContentReload sends a ContentReloadEvent to the TUI so it refreshes
-// prompt templates and skills from their provider callbacks. Called by file
-// watchers when .md/.txt files change in prompt or skill directories.
-// In non-interactive mode this is a no-op.
-func (a *App) NotifyContentReload() {
-	a.mu.Lock()
-	prog := a.program
-	a.mu.Unlock()
-	if prog != nil {
-		prog.Send(ContentReloadEvent{})
-	}
-}
-
-// NotifyMCPToolsReady sends an MCPToolsReadyEvent to the TUI so it refreshes
-// tool names and MCP tool count from provider callbacks. Called when background
-// MCP tool loading completes. In non-interactive mode this is a no-op.
-func (a *App) NotifyMCPToolsReady() {
-	a.mu.Lock()
-	prog := a.program
-	a.mu.Unlock()
-	if prog != nil {
-		prog.Send(MCPToolsReadyEvent{})
-	}
-}
-
-// NotifyMCPServerLoaded sends an MCPServerLoadedEvent to the TUI so it can
-// display a system message when a single MCP server finishes loading. Called
-// per server as background MCP tool loading progresses.
-func (a *App) NotifyMCPServerLoaded(serverName string, toolCount int, err error) {
-	a.mu.Lock()
-	prog := a.program
-	a.mu.Unlock()
-	if prog != nil {
-		prog.Send(MCPServerLoadedEvent{
-			ServerName: serverName,
-			ToolCount:  toolCount,
-			Error:      err,
-		})
 	}
 }
 
@@ -1130,106 +925,40 @@ func (a *App) PrintBlockFromExtension(opts extensions.PrintBlockOpts) {
 	}
 }
 
-// recordStepUsage applies token/cost usage reported for a completed step.
-// Step usage events arrive even when a turn is later cancelled, so this keeps
-// the usage widget accurate on all stop paths.
-func (a *App) recordStepUsage(ev kit.StepUsageEvent, stepUsageSeen *atomic.Bool) {
-	hasUsage := ev.InputTokens > 0 || ev.OutputTokens > 0 || ev.CacheReadTokens > 0 || ev.CacheWriteTokens > 0
-	if a.opts.Debug {
-		log.Printf("[DEBUG] recordStepUsage: hasUsage=%v input=%d output=%d cacheRead=%d cacheWrite=%d",
-			hasUsage, ev.InputTokens, ev.OutputTokens, ev.CacheReadTokens, ev.CacheWriteTokens)
-	}
-	if !hasUsage {
-		return
-	}
-	if stepUsageSeen != nil {
-		stepUsageSeen.Store(true)
-	}
-	if a.opts.UsageTracker == nil {
-		return
-	}
-	a.opts.UsageTracker.UpdateUsage(
-		int(ev.InputTokens),
-		int(ev.OutputTokens),
-		int(ev.CacheReadTokens),
-		int(ev.CacheWriteTokens),
-	)
-	// NOTE: We do NOT call SetContextTokens here. Context fill is set once
-	// at turn completion via updateUsageFromTurnResult using FinalUsage.InputTokens,
-	// which reflects the full accumulated context. Per-step context tokens would
-	// cause the display to jump around during multi-step tool calls.
-}
-
 // updateUsageFromTurnResult records token usage from an SDK TurnResult into the
 // configured UsageTracker. Called once per turn after the turn completes.
 //
-// When sawStepUsage is true, totals were already accumulated incrementally via
-// StepUsageEvent callbacks; in that case this method only updates context fill.
-// Otherwise it falls back to TotalUsage from the API response.
-//
-// NOTE: We only use ACTUAL token counts from API responses for cost tracking.
-// Estimation is never used for costs - only API-reported tokens are accurate.
-func (a *App) updateUsageFromTurnResult(result *kit.TurnResult, userPrompt string, sawStepUsage bool) {
+// Cost/token accumulation uses TotalUsage (sum across all tool-calling steps in
+// the turn). Context-window fill uses FinalUsage.InputTokens only — that is the
+// number of tokens sent to the model on the last API call, which equals the
+// actual context window occupation (all accumulated messages + tool results).
+// OutputTokens are not added here because they are the response length, not
+// context fill.
+func (a *App) updateUsageFromTurnResult(result *kit.TurnResult, userPrompt string) {
 	if a.opts.UsageTracker == nil || result == nil {
 		return
 	}
 
-	// Debug logging for token tracking
-	if a.opts.Debug {
-		if result.TotalUsage != nil {
-			log.Printf("[DEBUG] updateUsageFromTurnResult TotalUsage: input=%d output=%d cacheRead=%d cacheCreate=%d",
-				result.TotalUsage.InputTokens, result.TotalUsage.OutputTokens,
-				result.TotalUsage.CacheReadTokens, result.TotalUsage.CacheCreationTokens)
-		} else {
-			log.Printf("[DEBUG] updateUsageFromTurnResult: TotalUsage=nil")
-		}
-		if result.FinalUsage != nil {
-			log.Printf("[DEBUG] updateUsageFromTurnResult FinalUsage: input=%d output=%d cacheRead=%d cacheCreate=%d",
-				result.FinalUsage.InputTokens, result.FinalUsage.OutputTokens,
-				result.FinalUsage.CacheReadTokens, result.FinalUsage.CacheCreationTokens)
-		} else {
-			log.Printf("[DEBUG] updateUsageFromTurnResult: FinalUsage=nil")
-		}
-		log.Printf("[DEBUG] updateUsageFromTurnResult: sawStepUsage=%v", sawStepUsage)
-	}
-
 	// --- Accumulate cost/token totals for the session ---
-	// Only use actual API-reported tokens for cost tracking.
-	// If sawStepUsage is true, totals were already updated via StepUsageEvent.
-	// Check any token field > 0 (not just InputTokens) because cached prompts
-	// can result in InputTokens=0 while OutputTokens>0 (OpenAI-compatible behavior).
-	hasTotalUsage := result.TotalUsage != nil &&
-		(result.TotalUsage.InputTokens > 0 ||
-			result.TotalUsage.OutputTokens > 0 ||
-			result.TotalUsage.CacheReadTokens > 0 ||
-			result.TotalUsage.CacheCreationTokens > 0)
-	if a.opts.Debug {
-		log.Printf("[DEBUG] updateUsageFromTurnResult: hasTotalUsage=%v", hasTotalUsage)
-	}
-	if !sawStepUsage && hasTotalUsage {
-		if a.opts.Debug {
-			log.Printf("[DEBUG] updateUsageFromTurnResult: calling UpdateUsage input=%d output=%d cacheRead=%d cacheCreate=%d",
-				result.TotalUsage.InputTokens, result.TotalUsage.OutputTokens,
-				result.TotalUsage.CacheReadTokens, result.TotalUsage.CacheCreationTokens)
-		}
+	if result.TotalUsage != nil && result.TotalUsage.InputTokens > 0 {
 		a.opts.UsageTracker.UpdateUsage(
 			int(result.TotalUsage.InputTokens),
 			int(result.TotalUsage.OutputTokens),
 			int(result.TotalUsage.CacheReadTokens),
 			int(result.TotalUsage.CacheCreationTokens),
 		)
+	} else {
+		// Provider didn't report token counts — fall back to character-based
+		// estimates so the footer shows something rather than nothing.
+		a.opts.UsageTracker.EstimateAndUpdateUsage(userPrompt, result.Response)
 	}
 
 	// --- Context window fill (drives the % bar) ---
-	// Use FinalUsage.InputTokens as the context window fill. The API's InputTokens
-	// already includes the full conversation history (system prompt + all previous
-	// messages + current user message). Adding OutputTokens would double-count since
-	// the output becomes part of the input for the next turn.
+	// Use FinalUsage.InputTokens: the input token count of the last API call
+	// equals the number of tokens currently occupying the context window.
+	// Adding OutputTokens would overstate fill since the response is not part
+	// of the context that was *sent* to the model.
 	if result.FinalUsage != nil && result.FinalUsage.InputTokens > 0 {
-		if a.opts.Debug {
-			log.Printf("[DEBUG] updateUsageFromTurnResult: calling SetContextTokens=%d (FinalUsage.InputTokens)",
-				result.FinalUsage.InputTokens)
-		}
 		a.opts.UsageTracker.SetContextTokens(int(result.FinalUsage.InputTokens))
 	}
 }

internal/app/app_test.go

@@ -14,47 +14,6 @@ import (
 // Helpers
 // --------------------------------------------------------------------------
 
-type usageUpdaterStub struct {
-	mu sync.Mutex
-
-	updateCalls   int
-	estimateCalls int
-	contextCalls  int
-
-	lastUpdateInput      int
-	lastUpdateOutput     int
-	lastUpdateCacheRead  int
-	lastUpdateCacheWrite int
-	lastContextTokens    int
-	lastEstimateInput    string
-	lastEstimateOutput   string
-}
-
-func (s *usageUpdaterStub) UpdateUsage(inputTokens, outputTokens, cacheReadTokens, cacheWriteTokens int) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.updateCalls++
-	s.lastUpdateInput = inputTokens
-	s.lastUpdateOutput = outputTokens
-	s.lastUpdateCacheRead = cacheReadTokens
-	s.lastUpdateCacheWrite = cacheWriteTokens
-}
-
-func (s *usageUpdaterStub) EstimateAndUpdateUsage(inputText, outputText string) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.estimateCalls++
-	s.lastEstimateInput = inputText
-	s.lastEstimateOutput = outputText
-}
-
-func (s *usageUpdaterStub) SetContextTokens(tokens int) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	s.contextCalls++
-	s.lastContextTokens = tokens
-}
-
 // turnResult builds a minimal TurnResult with response text t.
 func turnResult(t string) *kit.TurnResult {
 	return &kit.TurnResult{Response: t}
@@ -530,133 +489,3 @@ func TestQueueLength_reflects(t *testing.T) {
 		t.Fatalf("expected 3, got %d", got)
 	}
 }
-
-// TestRecordStepUsage_updatesTracker verifies that per-step usage updates are
-// recorded immediately for cost tracking. Context tokens are NOT updated here
-// (only via updateUsageFromTurnResult) to avoid display jumps during multi-step
-// tool calls.
-func TestRecordStepUsage_updatesTracker(t *testing.T) {
-	usage := &usageUpdaterStub{}
-	app := New(Options{UsageTracker: usage}, nil)
-	defer app.Close()
-
-	app.recordStepUsage(kit.StepUsageEvent{
-		InputTokens:      120,
-		OutputTokens:     45,
-		CacheReadTokens:  5,
-		CacheWriteTokens: 2,
-	}, nil)
-
-	usage.mu.Lock()
-	defer usage.mu.Unlock()
-
-	if usage.updateCalls != 1 {
-		t.Fatalf("expected 1 update call, got %d", usage.updateCalls)
-	}
-	if usage.lastUpdateInput != 120 || usage.lastUpdateOutput != 45 || usage.lastUpdateCacheRead != 5 || usage.lastUpdateCacheWrite != 2 {
-		t.Fatalf("unexpected usage update payload: in=%d out=%d cache_read=%d cache_write=%d",
-			usage.lastUpdateInput, usage.lastUpdateOutput, usage.lastUpdateCacheRead, usage.lastUpdateCacheWrite)
-	}
-	// Context tokens should NOT be updated by recordStepUsage (only by updateUsageFromTurnResult)
-	if usage.contextCalls != 0 {
-		t.Fatalf("expected 0 context token updates from recordStepUsage, got %d", usage.contextCalls)
-	}
-}
-
-// TestUpdateUsageFromTurnResult_skipsTotalsWhenStepUsageSeen ensures we avoid
-// double-counting totals once StepUsageEvent-based updates were already applied.
-func TestUpdateUsageFromTurnResult_skipsTotalsWhenStepUsageSeen(t *testing.T) {
-	usage := &usageUpdaterStub{}
-	app := New(Options{UsageTracker: usage}, nil)
-	defer app.Close()
-
-	app.updateUsageFromTurnResult(&kit.TurnResult{
-		Response: "ok",
-		TotalUsage: &kit.LLMUsage{
-			InputTokens:         999,
-			OutputTokens:        111,
-			CacheReadTokens:     7,
-			CacheCreationTokens: 3,
-		},
-		FinalUsage: &kit.LLMUsage{InputTokens: 456},
-	}, "prompt", true)
-
-	usage.mu.Lock()
-	defer usage.mu.Unlock()
-
-	if usage.updateCalls != 0 {
-		t.Fatalf("expected no total usage update when sawStepUsage=true, got %d", usage.updateCalls)
-	}
-	if usage.estimateCalls != 0 {
-		t.Fatalf("expected no estimate update when sawStepUsage=true, got %d", usage.estimateCalls)
-	}
-	// Context tokens should be InputTokens only (456)
-	if usage.contextCalls != 1 || usage.lastContextTokens != 456 {
-		t.Fatalf("expected final context tokens=456 (InputTokens only), got calls=%d tokens=%d", usage.contextCalls, usage.lastContextTokens)
-	}
-}
-
-// TestUpdateUsageFromTurnResult_recordsWhenInputTokensZero verifies that usage
-// is recorded when InputTokens=0 but OutputTokens>0 (OpenAI-compatible cache behavior).
-func TestUpdateUsageFromTurnResult_recordsWhenInputTokensZero(t *testing.T) {
-	usage := &usageUpdaterStub{}
-	app := New(Options{UsageTracker: usage}, nil)
-	defer app.Close()
-
-	// Simulate OpenAI-compatible behavior: all prompt tokens cached, InputTokens=0
-	app.updateUsageFromTurnResult(&kit.TurnResult{
-		Response: "ok",
-		TotalUsage: &kit.LLMUsage{
-			InputTokens:         0,   // All cached - subtracted from prompt
-			OutputTokens:        150, // Actual generated tokens
-			CacheReadTokens:     500, // Cache hit
-			CacheCreationTokens: 0,
-		},
-		FinalUsage: &kit.LLMUsage{InputTokens: 0, OutputTokens: 150},
-	}, "prompt", false)
-
-	usage.mu.Lock()
-	defer usage.mu.Unlock()
-
-	if usage.updateCalls != 1 {
-		t.Fatalf("expected 1 update call when InputTokens=0 but OutputTokens>0, got %d", usage.updateCalls)
-	}
-	if usage.lastUpdateInput != 0 || usage.lastUpdateOutput != 150 {
-		t.Fatalf("expected input=0 output=150, got input=%d output=%d",
-			usage.lastUpdateInput, usage.lastUpdateOutput)
-	}
-	if usage.lastUpdateCacheRead != 500 {
-		t.Fatalf("expected cache_read=500, got %d", usage.lastUpdateCacheRead)
-	}
-}
-
-// TestUpdateUsageFromTurnResult_contextTokensUsesInputOnly verifies that context
-// window fill uses InputTokens only (not input+output). The API's InputTokens
-// already includes the full conversation history; adding output would double-count.
-func TestUpdateUsageFromTurnResult_contextTokensUsesInputOnly(t *testing.T) {
-	usage := &usageUpdaterStub{}
-	app := New(Options{UsageTracker: usage}, nil)
-	defer app.Close()
-
-	app.updateUsageFromTurnResult(&kit.TurnResult{
-		Response: "ok",
-		TotalUsage: &kit.LLMUsage{
-			InputTokens:  1000,
-			OutputTokens: 200,
-		},
-		FinalUsage: &kit.LLMUsage{
-			InputTokens:  1000, // Full context including history
-			OutputTokens: 200,
-		},
-	}, "prompt", false)
-
-	usage.mu.Lock()
-	defer usage.mu.Unlock()
-
-	// Context tokens should be InputTokens only (1000), not input+output (1200)
-	// because InputTokens already includes the full conversation history
-	if usage.contextCalls != 1 || usage.lastContextTokens != 1000 {
-		t.Fatalf("expected context tokens=1000 (InputTokens only), got calls=%d tokens=%d",
-			usage.contextCalls, usage.lastContextTokens)
-	}
-}

internal/app/events.go

@@ -1,6 +1,6 @@
 package app
 
-import kit "github.com/mark3labs/kit/pkg/kit"
+import "charm.land/fantasy"
 
 // StreamChunkEvent is sent by the app layer when a streaming text delta arrives
 // from the LLM. Each chunk contains an incremental portion of the response.
@@ -16,11 +16,6 @@ type ReasoningChunkEvent struct {
 	Delta string
 }
 
-// ReasoningCompleteEvent is sent when reasoning/thinking is finished, after
-// the last reasoning token has been processed. The TUI uses this to freeze
-// the reasoning duration counter.
-type ReasoningCompleteEvent struct{}
-
 // ToolCallStartedEvent is sent when a tool call has been parsed and is about to execute.
 // It carries the tool name and its arguments for display purposes.
 type ToolCallStartedEvent struct {
@@ -123,8 +118,8 @@ type SpinnerEvent struct {
 // MessageCreatedEvent is sent when a new message is added to the message store.
 // This allows the TUI to stay in sync with the conversation history.
 type MessageCreatedEvent struct {
-	// Message is the message that was added to the store.
-	Message kit.LLMMessage
+	// Message is the fantasy message that was added to the store.
+	Message fantasy.Message
 }
 
 // CompactCompleteEvent is sent when a /compact operation finishes successfully.
@@ -167,25 +162,6 @@ type ModelChangedEvent struct {
 // from its WidgetProvider on the next render cycle.
 type WidgetUpdateEvent struct{}
 
-// ContentReloadEvent is sent when prompt templates or skills are reloaded
-// from disk (e.g. by a file watcher detecting changes). The TUI refreshes
-// its autocomplete entries and internal state from the provider callbacks.
-type ContentReloadEvent struct{}
-
-// MCPToolsReadyEvent is sent when background MCP tool loading completes.
-// The TUI refreshes its tool names and MCP tool count from provider callbacks
-// so that /tools and the startup info bar reflect the loaded MCP tools.
-type MCPToolsReadyEvent struct{}
-
-// MCPServerLoadedEvent is sent when a single MCP server finishes loading
-// (successfully or with error). The TUI displays a system message so users
-// see real-time progress as each server initializes.
-type MCPServerLoadedEvent struct {
-	ServerName string
-	ToolCount  int
-	Error      error // nil on success
-}
-
 // EditorTextSetEvent is sent when an extension calls ctx.SetEditorText to
 // pre-fill the input editor with text. The TUI handles this by setting the
 // textarea content and moving the cursor to the end.

internal/app/messages.go

@@ -3,14 +3,14 @@ package app
 import (
 	"sync"
 
-	kit "github.com/mark3labs/kit/pkg/kit"
+	"charm.land/fantasy"
 )
 
 // MessageStore is a thread-safe in-memory store for the conversation history.
 // On-disk persistence is handled by the TreeManager at the app/SDK layer.
 type MessageStore struct {
 	mu       sync.RWMutex
-	messages []kit.LLMMessage
+	messages []fantasy.Message
 }
 
 // NewMessageStore creates an empty MessageStore.
@@ -20,14 +20,14 @@ func NewMessageStore() *MessageStore {
 
 // NewMessageStoreWithMessages creates a MessageStore pre-populated with the
 // given messages. This is used when loading an existing session at startup.
-func NewMessageStoreWithMessages(msgs []kit.LLMMessage) *MessageStore {
-	cp := make([]kit.LLMMessage, len(msgs))
+func NewMessageStoreWithMessages(msgs []fantasy.Message) *MessageStore {
+	cp := make([]fantasy.Message, len(msgs))
 	copy(cp, msgs)
 	return &MessageStore{messages: cp}
 }
 
 // Add appends a single message to the store.
-func (s *MessageStore) Add(msg kit.LLMMessage) {
+func (s *MessageStore) Add(msg fantasy.Message) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 	s.messages = append(s.messages, msg)
@@ -36,22 +36,22 @@ func (s *MessageStore) Add(msg kit.LLMMessage) {
 // Replace replaces the entire message history with the given slice. This is
 // used after an agent step returns the full updated conversation (including
 // tool calls and results).
-func (s *MessageStore) Replace(msgs []kit.LLMMessage) {
+func (s *MessageStore) Replace(msgs []fantasy.Message) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
-	cp := make([]kit.LLMMessage, len(msgs))
+	cp := make([]fantasy.Message, len(msgs))
 	copy(cp, msgs)
 	s.messages = cp
 }
 
 // GetAll returns a snapshot copy of the current message slice.
 // The returned slice is safe to modify without affecting the store.
-func (s *MessageStore) GetAll() []kit.LLMMessage {
+func (s *MessageStore) GetAll() []fantasy.Message {
 	s.mu.RLock()
 	defer s.mu.RUnlock()
 
-	cp := make([]kit.LLMMessage, len(s.messages))
+	cp := make([]fantasy.Message, len(s.messages))
 	copy(cp, s.messages)
 	return cp
 }

internal/app/messages_test.go

@@ -4,29 +4,16 @@ import (
 	"testing"
 
 	"charm.land/fantasy"
-
-	kit "github.com/mark3labs/kit/pkg/kit"
 )
 
-// makeTextMsg builds a minimal kit.LLMMessage using fantasy.NewUserMessage
-// or constructing with the given role.
-func makeTextMsg(role, text string) kit.LLMMessage {
-	return kit.LLMMessage{
-		Role:    kit.LLMMessageRole(role),
+// makeTextMsg builds a minimal fantasy.Message with a single TextPart.
+func makeTextMsg(role, text string) fantasy.Message {
+	return fantasy.Message{
+		Role:    fantasy.MessageRole(role),
 		Content: []fantasy.MessagePart{fantasy.TextPart{Text: text}},
 	}
 }
 
-// textOf extracts the plain text from an LLMMessage for assertions.
-func textOf(msg kit.LLMMessage) string {
-	for _, part := range msg.Content {
-		if tp, ok := part.(fantasy.TextPart); ok {
-			return tp.Text
-		}
-	}
-	return ""
-}
-
 // --------------------------------------------------------------------------
 // NewMessageStore / NewMessageStoreWithMessages
 // --------------------------------------------------------------------------
@@ -42,7 +29,7 @@ func TestNewMessageStore_empty(t *testing.T) {
 }
 
 func TestNewMessageStoreWithMessages_preloaded(t *testing.T) {
-	msgs := []kit.LLMMessage{
+	msgs := []fantasy.Message{
 		makeTextMsg("user", "hello"),
 		makeTextMsg("assistant", "hi"),
 	}
@@ -55,7 +42,7 @@ func TestNewMessageStoreWithMessages_preloaded(t *testing.T) {
 // NewMessageStoreWithMessages must deep-copy the slice so that external
 // modifications don't affect the store.
 func TestNewMessageStoreWithMessages_isolatesInput(t *testing.T) {
-	msgs := []kit.LLMMessage{makeTextMsg("user", "hello")}
+	msgs := []fantasy.Message{makeTextMsg("user", "hello")}
 	s := NewMessageStoreWithMessages(msgs)
 
 	// Mutate the source slice.
@@ -65,8 +52,9 @@ func TestNewMessageStoreWithMessages_isolatesInput(t *testing.T) {
 	if len(got) != 1 {
 		t.Fatalf("expected 1 message, got %d", len(got))
 	}
-	if textOf(got[0]) != "hello" {
-		t.Fatalf("store was mutated by external slice change; got %q", textOf(got[0]))
+	tp, ok := got[0].Content[0].(fantasy.TextPart)
+	if !ok || tp.Text != "hello" {
+		t.Fatalf("store was mutated by external slice change; got %q", tp.Text)
 	}
 }
 
@@ -92,8 +80,9 @@ func TestAdd_preservesOrder(t *testing.T) {
 	}
 	got := s.GetAll()
 	for i, expected := range texts {
-		if textOf(got[i]) != expected {
-			t.Fatalf("message[%d]: expected %q, got %q", i, expected, textOf(got[i]))
+		tp, ok := got[i].Content[0].(fantasy.TextPart)
+		if !ok || tp.Text != expected {
+			t.Fatalf("message[%d]: expected %q, got %q", i, expected, tp.Text)
 		}
 	}
 }
@@ -106,7 +95,7 @@ func TestReplace_swapsHistory(t *testing.T) {
 	s := NewMessageStore()
 	s.Add(makeTextMsg("user", "old"))
 
-	replacement := []kit.LLMMessage{
+	replacement := []fantasy.Message{
 		makeTextMsg("user", "new1"),
 		makeTextMsg("assistant", "new2"),
 	}
@@ -116,22 +105,25 @@ func TestReplace_swapsHistory(t *testing.T) {
 		t.Fatalf("expected 2 messages after replace, got %d", s.Len())
 	}
 	got := s.GetAll()
-	if textOf(got[0]) != "new1" || textOf(got[1]) != "new2" {
-		t.Fatalf("unexpected messages after replace: %q %q", textOf(got[0]), textOf(got[1]))
+	tp0, _ := got[0].Content[0].(fantasy.TextPart)
+	tp1, _ := got[1].Content[0].(fantasy.TextPart)
+	if tp0.Text != "new1" || tp1.Text != "new2" {
+		t.Fatalf("unexpected messages after replace: %q %q", tp0.Text, tp1.Text)
 	}
 }
 
 // Replace must deep-copy the incoming slice.
 func TestReplace_isolatesInput(t *testing.T) {
 	s := NewMessageStore()
-	replacement := []kit.LLMMessage{makeTextMsg("user", "original")}
+	replacement := []fantasy.Message{makeTextMsg("user", "original")}
 	s.Replace(replacement)
 
 	replacement[0] = makeTextMsg("user", "mutated")
 
 	got := s.GetAll()
-	if textOf(got[0]) != "original" {
-		t.Fatalf("store was mutated by external slice change after Replace; got %q", textOf(got[0]))
+	tp, _ := got[0].Content[0].(fantasy.TextPart)
+	if tp.Text != "original" {
+		t.Fatalf("store was mutated by external slice change after Replace; got %q", tp.Text)
 	}
 }
 
@@ -148,8 +140,9 @@ func TestGetAll_returnsCopy(t *testing.T) {
 	got[0] = makeTextMsg("user", "mutated")
 
 	internal := s.GetAll()
-	if textOf(internal[0]) != "hello" {
-		t.Fatalf("GetAll returned non-copy; store was mutated to %q", textOf(internal[0]))
+	tp, _ := internal[0].Content[0].(fantasy.TextPart)
+	if tp.Text != "hello" {
+		t.Fatalf("GetAll returned non-copy; store was mutated to %q", tp.Text)
 	}
 }
 
@@ -186,8 +179,9 @@ func TestClear_allowsSubsequentAdds(t *testing.T) {
 		t.Fatalf("expected 1 message after Clear+Add, got %d", s.Len())
 	}
 	got := s.GetAll()
-	if textOf(got[0]) != "after" {
-		t.Fatalf("expected %q, got %q", "after", textOf(got[0]))
+	tp, _ := got[0].Content[0].(fantasy.TextPart)
+	if tp.Text != "after" {
+		t.Fatalf("expected %q, got %q", "after", tp.Text)
 	}
 }
 

internal/app/options.go

@@ -67,6 +67,10 @@ type Options struct {
 	// Debug enables verbose debug logging.
 	Debug bool
 
+	// CompactMode selects the compact renderer instead of the block renderer for
+	// message formatting.
+	CompactMode bool
+
 	// UsageTracker is an optional callback for recording token usage after each
 	// agent step. When non-nil, the app layer calls UpdateUsage (or
 	// EstimateAndUpdateUsage as a fallback) using the usage data returned by the

internal/auth/credentials.go

@@ -43,30 +43,13 @@ type OpenAICredentials struct {
 	CreatedAt    time.Time `json:"created_at"`
 }
 
-// oauthTokenExpired reports whether an OAuth token with the given type and
-// expiry unix timestamp is past its expiry. Returns false for API key
-// credentials or when no expiry is set.
-func oauthTokenExpired(credType string, expiresAt int64) bool {
-	if credType != "oauth" || expiresAt == 0 {
-		return false
-	}
-	return time.Now().Unix() >= expiresAt
-}
-
-// oauthTokenNeedsRefresh reports whether an OAuth token will expire within the
-// next 5 minutes, allowing proactive refresh before it becomes invalid.
-// Returns false for API key credentials or when no expiry is set.
-func oauthTokenNeedsRefresh(credType string, expiresAt int64) bool {
-	if credType != "oauth" || expiresAt == 0 {
-		return false
-	}
-	return time.Now().Unix() >= (expiresAt - 300) // 5 minutes buffer
-}
-
 // IsExpired checks if the OAuth token is expired based on the ExpiresAt timestamp.
 // Returns false for API key authentication or if no expiration is set.
 func (c *AnthropicCredentials) IsExpired() bool {
-	return oauthTokenExpired(c.Type, c.ExpiresAt)
+	if c.Type != "oauth" || c.ExpiresAt == 0 {
+		return false
+	}
+	return time.Now().Unix() >= c.ExpiresAt
 }
 
 // NeedsRefresh checks if the OAuth token needs refresh, returning true if the token
@@ -74,13 +57,19 @@ func (c *AnthropicCredentials) IsExpired() bool {
 // to avoid authentication failures during operations. Returns false for API key
 // authentication or if no expiration is set.
 func (c *AnthropicCredentials) NeedsRefresh() bool {
-	return oauthTokenNeedsRefresh(c.Type, c.ExpiresAt)
+	if c.Type != "oauth" || c.ExpiresAt == 0 {
+		return false
+	}
+	return time.Now().Unix() >= (c.ExpiresAt - 300) // 5 minutes buffer
 }
 
 // IsExpired checks if the OAuth token is expired based on the ExpiresAt timestamp.
 // Returns false for API key authentication or if no expiration is set.
 func (c *OpenAICredentials) IsExpired() bool {
-	return oauthTokenExpired(c.Type, c.ExpiresAt)
+	if c.Type != "oauth" || c.ExpiresAt == 0 {
+		return false
+	}
+	return time.Now().Unix() >= c.ExpiresAt
 }
 
 // NeedsRefresh checks if the OAuth token needs refresh, returning true if the token
@@ -88,7 +77,10 @@ func (c *OpenAICredentials) IsExpired() bool {
 // to avoid authentication failures during operations. Returns false for API key
 // authentication or if no expiration is set.
 func (c *OpenAICredentials) NeedsRefresh() bool {
-	return oauthTokenNeedsRefresh(c.Type, c.ExpiresAt)
+	if c.Type != "oauth" || c.ExpiresAt == 0 {
+		return false
+	}
+	return time.Now().Unix() >= (c.ExpiresAt - 300) // 5 minutes buffer
 }
 
 // CredentialManager handles secure storage and retrieval of authentication credentials.

internal/compaction/compaction.go

@@ -428,10 +428,6 @@ type PreviousCompaction struct {
 	ModifiedFiles []string
 }
 
-// StreamCallback is called for each chunk of text during streaming compaction.
-// Return a non-nil error to cancel the stream.
-type StreamCallback func(delta string) error
-
 // Compact summarises older messages using the LLM, returning the compaction
 // result and a new message slice (summary message + preserved recent
 // messages).
@@ -446,8 +442,6 @@ type StreamCallback func(delta string) error
 //
 // prev carries file tracking from a previous compaction for cumulative
 // tracking. Pass nil if there is no prior compaction.
-// onChunk is an optional callback for streaming summary text. Pass nil for
-// non-streaming compaction.
 func Compact(
 	ctx context.Context,
 	model fantasy.LanguageModel,
@@ -455,7 +449,6 @@ func Compact(
 	opts CompactionOptions,
 	customInstructions string,
 	prev *PreviousCompaction,
-	onChunk StreamCallback,
 ) (*CompactionResult, []fantasy.Message, error) {
 	opts.defaults()
 
@@ -494,9 +487,9 @@ func Compact(
 	var err error
 
 	if IsSplitTurn(messages, cutPoint) {
-		summaryText, err = compactSplitTurn(ctx, model, oldMessages, messages, cutPoint, opts, customInstructions, onChunk)
+		summaryText, err = compactSplitTurn(ctx, model, oldMessages, messages, cutPoint, opts, customInstructions)
 	} else {
-		summaryText, err = compactNormal(ctx, model, oldMessages, opts, customInstructions, onChunk)
+		summaryText, err = compactNormal(ctx, model, oldMessages, opts, customInstructions)
 	}
 	if err != nil {
 		return nil, nil, err
@@ -534,17 +527,15 @@ func Compact(
 }
 
 // compactNormal generates a summary for a clean turn-boundary cut.
-// If onChunk is provided, text deltas are streamed to it.
 func compactNormal(
 	ctx context.Context,
 	model fantasy.LanguageModel,
 	oldMessages []fantasy.Message,
 	opts CompactionOptions,
 	customInstructions string,
-	onChunk StreamCallback,
 ) (string, error) {
 	conversationText := serializeMessages(oldMessages)
-	return generateSummary(ctx, model, conversationText, opts, customInstructions, onChunk)
+	return generateSummary(ctx, model, conversationText, opts, customInstructions)
 }
 
 // compactSplitTurn handles the case where the cut point lands mid-turn.
@@ -555,7 +546,6 @@ func compactNormal(
 //
 // The merged result preserves context from both the older history and the
 // beginning of the current long turn.
-// If onChunk is provided, both summaries and the separator are streamed.
 func compactSplitTurn(
 	ctx context.Context,
 	model fantasy.LanguageModel,
@@ -564,7 +554,6 @@ func compactSplitTurn(
 	cutPoint int,
 	opts CompactionOptions,
 	customInstructions string,
-	onChunk StreamCallback,
 ) (string, error) {
 	// Find where the split turn starts.
 	turnStart := findTurnStart(allMessages, cutPoint)
@@ -584,19 +573,12 @@ func compactSplitTurn(
 	// Generate history summary if there are complete turns before the split.
 	if len(historyMessages) >= 2 {
 		historySummary, err = generateSummary(ctx, model,
-			serializeMessages(historyMessages), opts, "", onChunk)
+			serializeMessages(historyMessages), opts, "")
 		if err != nil {
 			return "", fmt.Errorf("split turn history summary failed: %w", err)
 		}
 	}
 
-	// Stream the separator between history and turn prefix summaries.
-	if onChunk != nil && historySummary != "" {
-		if err := onChunk("\n\n---\n\n## Current Turn (in progress)\n\n"); err != nil {
-			return "", fmt.Errorf("streaming separator failed: %w", err)
-		}
-	}
-
 	// Generate turn prefix summary.
 	turnPrefixText := serializeMessages(turnPrefixMessages)
 	turnPrefixPrompt := "The messages above are the BEGINNING of a long turn that was split. " +
@@ -606,10 +588,16 @@ func compactSplitTurn(
 		turnPrefixPrompt += "\n\nAdditional instructions: " + customInstructions
 	}
 
-	turnPrefixSummary, err := generateSummary(ctx, model, turnPrefixText, opts, turnPrefixPrompt, onChunk)
+	summaryAgent := fantasy.NewAgent(model,
+		fantasy.WithSystemPrompt(defaultSystemPrompt),
+	)
+	result, err := summaryAgent.Generate(ctx, fantasy.AgentCall{
+		Prompt: turnPrefixText + "\n\n" + turnPrefixPrompt,
+	})
 	if err != nil {
 		return "", fmt.Errorf("split turn prefix summary failed: %w", err)
 	}
+	turnPrefixSummary := result.Response.Content.Text()
 
 	// Merge the two summaries.
 	if historySummary != "" && turnPrefixSummary != "" {
@@ -622,14 +610,12 @@ func compactSplitTurn(
 }
 
 // generateSummary calls the LLM to produce a structured summary.
-// If onChunk is provided, the summary is streamed using Agent.Stream().
 func generateSummary(
 	ctx context.Context,
 	model fantasy.LanguageModel,
 	conversationText string,
 	opts CompactionOptions,
 	customInstructions string,
-	onChunk StreamCallback,
 ) (string, error) {
 	userPrompt := opts.SummaryPrompt
 	if userPrompt == "" {
@@ -642,31 +628,8 @@ func generateSummary(
 	summaryAgent := fantasy.NewAgent(model,
 		fantasy.WithSystemPrompt(defaultSystemPrompt),
 	)
-
-	prompt := conversationText + "\n\n" + userPrompt
-
-	// Use streaming if onChunk is provided.
-	if onChunk != nil {
-		var fullText strings.Builder
-		_, err := summaryAgent.Stream(ctx, fantasy.AgentStreamCall{
-			Prompt: prompt,
-			OnTextDelta: func(_, delta string) error {
-				if delta != "" {
-					fullText.WriteString(delta)
-					return onChunk(delta)
-				}
-				return nil
-			},
-		})
-		if err != nil {
-			return "", fmt.Errorf("compaction summarisation (streaming) failed: %w", err)
-		}
-		return fullText.String(), nil
-	}
-
-	// Non-streaming path.
 	result, err := summaryAgent.Generate(ctx, fantasy.AgentCall{
-		Prompt: prompt,
+		Prompt: conversationText + "\n\n" + userPrompt,
 	})
 	if err != nil {
 		return "", fmt.Errorf("compaction summarisation failed: %w", err)

internal/compaction/compaction_test.go

@@ -243,7 +243,7 @@ func TestCompact_TooFewMessages(t *testing.T) {
 		makeTextMessageN(fantasy.MessageRoleUser, 400),
 	}
 
-	result, newMsgs, err := Compact(context.TODO(), nil, msgs, CompactionOptions{}, "", nil, nil)
+	result, newMsgs, err := Compact(context.TODO(), nil, msgs, CompactionOptions{}, "", nil)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -262,7 +262,7 @@ func TestCompact_WithinBudget(t *testing.T) {
 		makeTextMessageN(fantasy.MessageRoleAssistant, 400),
 	}
 
-	result, newMsgs, err := Compact(context.TODO(), nil, msgs, CompactionOptions{}, "", nil, nil)
+	result, newMsgs, err := Compact(context.TODO(), nil, msgs, CompactionOptions{}, "", nil)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}

internal/config/config.go

@@ -162,8 +162,6 @@ type Theme struct {
 // and merged into the custom provider in the model registry.
 type CustomModelConfig struct {
 	Name        string      `json:"name" yaml:"name"`
-	BaseURL     string      `json:"baseUrl,omitempty" yaml:"baseUrl,omitempty"`
-	APIKey      string      `json:"apiKey,omitempty" yaml:"apiKey,omitempty"`
 	Family      string      `json:"family,omitempty" yaml:"family,omitempty"`
 	Attachment  bool        `json:"attachment,omitempty" yaml:"attachment,omitempty"`
 	Reasoning   bool        `json:"reasoning,omitempty" yaml:"reasoning,omitempty"`
@@ -193,19 +191,18 @@ type Config struct {
 	Model          string                     `json:"model,omitempty" yaml:"model,omitempty"`
 	MaxSteps       int                        `json:"max-steps,omitempty" yaml:"max-steps,omitempty"`
 	Debug          bool                       `json:"debug,omitempty" yaml:"debug,omitempty"`
+	Compact        bool                       `json:"compact,omitempty" yaml:"compact,omitempty"`
 	SystemPrompt   string                     `json:"system-prompt,omitempty" yaml:"system-prompt,omitempty"`
 	ProviderAPIKey string                     `json:"provider-api-key,omitempty" yaml:"provider-api-key,omitempty"`
 	ProviderURL    string                     `json:"provider-url,omitempty" yaml:"provider-url,omitempty"`
 	Stream         *bool                      `json:"stream,omitempty" yaml:"stream,omitempty"`
 	Theme          any                        `json:"theme" yaml:"theme"`
 	// Model generation parameters
-	MaxTokens        int      `json:"max-tokens,omitempty" yaml:"max-tokens,omitempty"`
-	Temperature      *float32 `json:"temperature,omitempty" yaml:"temperature,omitempty"`
-	TopP             *float32 `json:"top-p,omitempty" yaml:"top-p,omitempty"`
-	TopK             *int32   `json:"top-k,omitempty" yaml:"top-k,omitempty"`
-	FrequencyPenalty *float32 `json:"frequency-penalty,omitempty" yaml:"frequency-penalty,omitempty"`
-	PresencePenalty  *float32 `json:"presence-penalty,omitempty" yaml:"presence-penalty,omitempty"`
-	StopSequences    []string `json:"stop-sequences,omitempty" yaml:"stop-sequences,omitempty"`
+	MaxTokens     int      `json:"max-tokens,omitempty" yaml:"max-tokens,omitempty"`
+	Temperature   *float32 `json:"temperature,omitempty" yaml:"temperature,omitempty"`
+	TopP          *float32 `json:"top-p,omitempty" yaml:"top-p,omitempty"`
+	TopK          *int32   `json:"top-k,omitempty" yaml:"top-k,omitempty"`
+	StopSequences []string `json:"stop-sequences,omitempty" yaml:"stop-sequences,omitempty"`
 
 	// Thinking / extended reasoning
 	ThinkingLevel string `json:"thinking-level,omitempty" yaml:"thinking-level,omitempty"`
@@ -372,8 +369,6 @@ mcpServers:
 # temperature: 0.7                             # Randomness (0.0-1.0)
 # top-p: 0.95                                  # Nucleus sampling (0.0-1.0)
 # top-k: 40                                    # Top K sampling
-# frequency-penalty: 0.0                        # Penalize frequent tokens (0.0-2.0)
-# presence-penalty: 0.0                         # Penalize present tokens (0.0-2.0)
 # stop-sequences: ["Human:", "Assistant:"]     # Custom stop sequences
 
 # API Configuration (can also use environment variables)
@@ -408,9 +403,10 @@ func FilepathOr[T any](key string, value *T) error {
 				if err != nil {
 					return err
 				}
-				absPath = filepath.Join(home, absPath[2:])
+				filepath.Join(home, absPath[2:])
 			}
 			if !filepath.IsAbs(absPath) {
+				// base := GetConfigPath()
 				base := configPath
 				if base == "" {
 					fmt.Fprintf(os.Stderr, "unable to build relative path to config.")

internal/core/bash.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"os"
 	"os/exec"
-	"regexp"
 	"strings"
 	"sync"
 	"time"
@@ -40,8 +39,20 @@ func toolOutputCallbackFromContext(ctx context.Context) ToolOutputCallback {
 const defaultBashTimeout = 120 * time.Second
 const maxBashTimeout = 600 * time.Second
 
-// bannedCmdRe matches bash builtin commands that are not allowed for security reasons.
-var bannedCmdRe = regexp.MustCompile(`^(alias|bg|bind|builtin|caller|command|compgen|complete|compopt|coproc|dirs|disown|enable|fc|fg|hash|help|history|jobs|kill|logout|mapfile|popd|pushd|readonly|select|set|shopt|source|suspend|times|trap|type|typeset|ulimit|umask|unalias|wait)\s`)
+var bannedCommands = []string{
+	"alias ", "bg ", "bind ", "builtin ",
+	"caller ", "command ", "compgen ",
+	"complete ", "compopt ", "coproc ",
+	"dirs ", "disown ", "enable ",
+	"fc ", "fg ", "hash ", "help ",
+	"history ", "jobs ", "kill ",
+	"logout ", "mapfile ", "popd ",
+	"pushd ", "readonly ", "select ",
+	"set ", "shopt ", "source ",
+	"suspend ", "times ", "trap ",
+	"type ", "typeset ", "ulimit ",
+	"umask ", "unalias ", "wait ",
+}
 
 type bashArgs struct {
 	Command string  `json:"command"`
@@ -83,8 +94,10 @@ func executeBash(ctx context.Context, call fantasy.ToolCall, workDir string) (fa
 	}
 
 	// Check for banned commands
-	if bannedCmdRe.MatchString(args.Command) {
-		return fantasy.NewTextErrorResponse(fmt.Sprintf("command '%s' is not allowed", args.Command)), nil
+	for _, banned := range bannedCommands {
+		if strings.HasPrefix(args.Command, banned) {
+			return fantasy.NewTextErrorResponse(fmt.Sprintf("command '%s' is not allowed", args.Command)), nil
+		}
 	}
 
 	// Determine timeout

internal/core/read.go

@@ -67,7 +67,7 @@ func executeRead(ctx context.Context, call fantasy.ToolCall, workDir string) (fa
 	}
 
 	if info.IsDir() {
-		return fantasy.NewTextErrorResponse(fmt.Sprintf("'%s' is a directory, not a file. Use the ls tool to list directory contents.", args.Path)), nil
+		return readDirectory(absPath)
 	}
 
 	content, err := os.ReadFile(absPath)
@@ -116,6 +116,25 @@ func executeRead(ctx context.Context, call fantasy.ToolCall, workDir string) (fa
 	return fantasy.NewTextResponse(tr.Content), nil
 }
 
+func readDirectory(absPath string) (fantasy.ToolResponse, error) {
+	entries, err := os.ReadDir(absPath)
+	if err != nil {
+		return fantasy.NewTextErrorResponse(fmt.Sprintf("failed to read directory: %v", err)), nil
+	}
+
+	var result strings.Builder
+	for _, entry := range entries {
+		name := entry.Name()
+		if entry.IsDir() {
+			name += "/"
+		}
+		result.WriteString(name + "\n")
+	}
+
+	tr := truncateHead(result.String(), 500, defaultMaxBytes)
+	return fantasy.NewTextResponse(tr.Content), nil
+}
+
 // resolvePathWithWorkDir resolves a path to an absolute path relative to the
 // given workDir. If workDir is empty, os.Getwd() is used.
 func resolvePathWithWorkDir(path, workDir string) (string, error) {

internal/core/subagent.go

@@ -28,14 +28,14 @@ type SubagentSpawnResult struct {
 // SubagentSpawnFunc is a callback that spawns an in-process subagent. The
 // parent Kit instance injects this into the context so the core tool can
 // call back without importing pkg/kit (which would create a cycle).
-// The toolCallID parameter is the LLM-assigned ID of the subagent
+// The toolCallID parameter is the LLM-assigned ID of the spawn_subagent
 // tool call, enabling the parent to correlate subagent events.
 type SubagentSpawnFunc func(ctx context.Context, toolCallID, prompt, model, systemPrompt string, timeout time.Duration) (*SubagentSpawnResult, error)
 
 type subagentCtxKey struct{}
 
 // WithSubagentSpawner stores a spawn function in the context so that the
-// subagent core tool can create in-process subagents.
+// spawn_subagent core tool can create in-process subagents.
 func WithSubagentSpawner(ctx context.Context, fn SubagentSpawnFunc) context.Context {
 	return context.WithValue(ctx, subagentCtxKey{}, fn)
 }
@@ -49,7 +49,7 @@ func getSubagentSpawner(ctx context.Context) SubagentSpawnFunc {
 }
 
 // ---------------------------------------------------------------------------
-// subagent tool
+// spawn_subagent tool
 // ---------------------------------------------------------------------------
 
 type subagentArgs struct {
@@ -59,11 +59,11 @@ type subagentArgs struct {
 	TimeoutSeconds int    `json:"timeout_seconds,omitempty"`
 }
 
-// NewSubagentTool creates the subagent core tool.
+// NewSubagentTool creates the spawn_subagent core tool.
 func NewSubagentTool(opts ...ToolOption) fantasy.AgentTool {
 	return &coreTool{
 		info: fantasy.ToolInfo{
-			Name: "subagent",
+			Name: "spawn_subagent",
 			Description: `Spawn a subagent to perform a task autonomously.
 
 The subagent runs as a separate in-process Kit instance with full tool access
@@ -130,22 +130,13 @@ func executeSubagent(ctx context.Context, call fantasy.ToolCall) (fantasy.ToolRe
 		), fmt.Errorf("no subagent spawner in context")
 	}
 
-	// Build a clean context for the subagent that inherits values (e.g. the
-	// spawner callback) but is completely detached from the parent's
-	// deadline AND cancellation. The subagent gets its own independent
-	// timeout (applied downstream in Kit.Subagent).
-	//
-	// Why full detachment instead of propagating parent cancellation?
-	// The parent context may already be done (deadline exceeded or
-	// cancelled) by the time this tool handler executes — for example when
-	// the generation loop context carries a deadline, when the user
-	// double-ESC cancels mid-turn, or when parallel tool execution
-	// encounters a race between stream completion and tool dispatch. Using
-	// context.WithoutCancel (Go 1.21+) ensures the subagent always starts
-	// cleanly with a fresh timeout, following the pattern used by crush for
-	// shutdown-resilient child work. The subagent's own timeout
-	// (defaultSubagentTimeout / user-specified) provides the safety net.
-	spawnCtx := context.WithoutCancel(valuesContext{parent: ctx})
+	// Detach from the parent's deadline so the subagent gets its own
+	// independent timeout (applied downstream in Kit.Subagent). The parent
+	// context may carry a tight deadline from the LLM generation loop or
+	// other tool timeouts that would prematurely kill the subagent.
+	// We preserve context values (spawner, etc.) and propagate parent
+	// cancellation (e.g. user hits Ctrl-C) without inheriting the deadline.
+	spawnCtx := detachedWithCancel(ctx)
 
 	// Spawn in-process subagent.
 	result, err := spawner(spawnCtx, call.ID, args.Task, args.Model, args.SystemPrompt, timeout)
@@ -182,21 +173,37 @@ func executeSubagent(ctx context.Context, call fantasy.ToolCall) (fantasy.ToolRe
 }
 
 // ---------------------------------------------------------------------------
-// Context helpers
+// Context detachment
 // ---------------------------------------------------------------------------
 
-// valuesContext preserves a parent context's values (e.g. the subagent
-// spawner callback) while stripping its deadline and cancellation. Combined
-// with context.WithoutCancel() this gives the subagent a completely clean
-// context that only inherits value-based dependencies.
-type valuesContext struct {
+// detachedContext wraps a parent context, preserving its values but removing
+// its deadline and cancellation. This allows the subagent to have its own
+// independent timeout while still accessing context-stored values (e.g. the
+// subagent spawner function).
+type detachedContext struct {
 	parent context.Context
 }
 
-func (v valuesContext) Deadline() (time.Time, bool) { return time.Time{}, false }
-func (v valuesContext) Done() <-chan struct{}       { return nil }
-func (v valuesContext) Err() error                  { return nil }
-func (v valuesContext) Value(key any) any           { return v.parent.Value(key) }
+func (d detachedContext) Deadline() (time.Time, bool) { return time.Time{}, false }
+func (d detachedContext) Done() <-chan struct{}       { return nil }
+func (d detachedContext) Err() error                  { return nil }
+func (d detachedContext) Value(key any) any           { return d.parent.Value(key) }
+
+// detachedWithCancel creates a new context that inherits values from the
+// parent but has no deadline. Cancellation of the parent is propagated: when
+// the parent is cancelled the returned context is also cancelled, but the
+// parent's deadline does not apply to the child.
+func detachedWithCancel(parent context.Context) context.Context {
+	child, cancel := context.WithCancel(detachedContext{parent: parent})
+	go func() {
+		select {
+		case <-parent.Done():
+			cancel()
+		case <-child.Done():
+		}
+	}()
+	return child
+}
 
 // truncateResponse limits the response length to avoid overwhelming context windows.
 func truncateResponse(s string, maxLen int) string {

internal/core/subagent_test.go

@@ -1,115 +0,0 @@
-package core
-
-import (
-	"context"
-	"testing"
-	"time"
-)
-
-func TestValuesContext_StripsDeadlineAndCancellation(t *testing.T) {
-	// Parent with a tight deadline.
-	parent, cancel := context.WithTimeout(context.Background(), 1*time.Millisecond)
-	defer cancel()
-	time.Sleep(5 * time.Millisecond) // Let deadline expire.
-
-	if parent.Err() == nil {
-		t.Fatal("expected parent to be expired")
-	}
-
-	vc := valuesContext{parent: parent}
-
-	if _, ok := vc.Deadline(); ok {
-		t.Error("valuesContext should report no deadline")
-	}
-	if vc.Done() != nil {
-		t.Error("valuesContext.Done() should return nil")
-	}
-	if vc.Err() != nil {
-		t.Errorf("valuesContext.Err() should be nil, got %v", vc.Err())
-	}
-}
-
-func TestValuesContext_PreservesValues(t *testing.T) {
-	type testKey struct{}
-	parent := context.WithValue(context.Background(), testKey{}, "hello")
-
-	vc := valuesContext{parent: parent}
-
-	got, ok := vc.Value(testKey{}).(string)
-	if !ok || got != "hello" {
-		t.Errorf("expected value 'hello', got %q (ok=%v)", got, ok)
-	}
-}
-
-func TestSpawnContext_SurvivesCancelledParent(t *testing.T) {
-	// Simulate the exact scenario from the bug: the parent generation
-	// context is already cancelled when the subagent tool handler runs.
-	parent, cancel := context.WithCancel(context.Background())
-	cancel() // Cancelled before detach.
-
-	// This is what executeSubagent now does:
-	spawnCtx := context.WithoutCancel(valuesContext{parent: parent})
-
-	// The spawn context must be alive.
-	if spawnCtx.Err() != nil {
-		t.Fatalf("spawnCtx should be alive, got err: %v", spawnCtx.Err())
-	}
-
-	// Adding a timeout should produce a working context.
-	tCtx, tCancel := context.WithTimeout(spawnCtx, 5*time.Second)
-	defer tCancel()
-
-	if tCtx.Err() != nil {
-		t.Fatalf("timeout context should be alive, got err: %v", tCtx.Err())
-	}
-}
-
-func TestSpawnContext_SurvivesDeadlineExceededParent(t *testing.T) {
-	// Simulate: parent had a deadline that already expired.
-	parent, pCancel := context.WithTimeout(context.Background(), 1*time.Millisecond)
-	defer pCancel()
-	time.Sleep(5 * time.Millisecond)
-
-	if parent.Err() != context.DeadlineExceeded {
-		t.Fatalf("expected parent deadline exceeded, got: %v", parent.Err())
-	}
-
-	spawnCtx := context.WithoutCancel(valuesContext{parent: parent})
-
-	if spawnCtx.Err() != nil {
-		t.Fatalf("spawnCtx should be alive after deadline-exceeded parent, got: %v", spawnCtx.Err())
-	}
-}
-
-func TestSpawnContext_PreservesSpawnerValue(t *testing.T) {
-	// Verify the subagent spawner callback survives context detachment.
-	called := false
-	spawner := SubagentSpawnFunc(func(ctx context.Context, toolCallID, prompt, model, systemPrompt string, timeout time.Duration) (*SubagentSpawnResult, error) {
-		called = true
-		return &SubagentSpawnResult{Response: "ok"}, nil
-	})
-
-	parent := WithSubagentSpawner(context.Background(), spawner)
-	// Cancel the parent.
-	parentCtx, cancel := context.WithCancel(parent)
-	cancel()
-
-	spawnCtx := context.WithoutCancel(valuesContext{parent: parentCtx})
-
-	// Should be able to retrieve the spawner from the detached context.
-	recovered := getSubagentSpawner(spawnCtx)
-	if recovered == nil {
-		t.Fatal("spawner should be recoverable from detached context")
-	}
-
-	result, err := recovered(spawnCtx, "tc1", "test task", "", "", time.Minute)
-	if err != nil {
-		t.Fatalf("spawner call failed: %v", err)
-	}
-	if !called {
-		t.Error("spawner was not called")
-	}
-	if result.Response != "ok" {
-		t.Errorf("expected 'ok', got %q", result.Response)
-	}
-}

internal/core/tools.go

@@ -86,7 +86,7 @@ func ReadOnlyTools(opts ...ToolOption) []fantasy.AgentTool {
 	}
 }
 
-// SubagentTools returns all core tools except subagent. This prevents
+// SubagentTools returns all core tools except spawn_subagent. This prevents
 // infinite recursion when a subagent is itself a Kit instance.
 func SubagentTools(opts ...ToolOption) []fantasy.AgentTool {
 	return []fantasy.AgentTool{

internal/extensions/api.go

@@ -77,64 +77,6 @@ type Context struct {
 	//   ctx.CancelAndSend("Stop what you're doing and focus on the tests")
 	CancelAndSend func(string)
 
-	// Abort cancels the current agent turn (if running) and clears the
-	// message queue. Unlike CancelAndSend, no new message is injected —
-	// the agent simply stops. Safe to call when idle (no-op).
-	//
-	// Example:
-	//
-	//   ctx.Abort()  // stop whatever the agent is doing
-	Abort func()
-
-	// IsIdle returns true when the agent is not processing a turn.
-	// Extensions can use this to decide whether to dispatch immediately
-	// or queue work for later.
-	//
-	// Example:
-	//
-	//   if ctx.IsIdle() {
-	//       ctx.SendMessage("start new task")
-	//   }
-	IsIdle func() bool
-
-	// Compact triggers context compaction, summarising older messages to
-	// free context window space. Returns an error if compaction cannot
-	// start (e.g. agent is busy or app is closed). The actual compaction
-	// runs asynchronously; use OnComplete/OnError callbacks in
-	// CompactConfig to observe the result.
-	//
-	// Example:
-	//
-	//   err := ctx.Compact(ext.CompactConfig{
-	//       OnComplete: func() { ctx.PrintInfo("Compaction done") },
-	//       OnError:    func(errMsg string) { ctx.PrintError("Compact failed: " + errMsg) },
-	//   })
-	Compact func(CompactConfig) error
-
-	// SendMultimodalMessage injects a message with file attachments (images,
-	// documents) into the conversation and triggers a new agent turn. Files
-	// are described by FilePart structs containing the raw bytes, filename,
-	// and MIME type. If the agent is busy the message is queued.
-	//
-	// Example:
-	//
-	//   data, _ := os.ReadFile("photo.jpg")
-	//   ctx.SendMultimodalMessage("Describe this image", []ext.FilePart{
-	//       {Filename: "photo.jpg", Data: data, MediaType: "image/jpeg"},
-	//   })
-	SendMultimodalMessage func(text string, files []FilePart)
-
-	// GetSessionUsage returns aggregated token usage and cost statistics
-	// for the current session. This includes total input/output tokens,
-	// cache read/write tokens, total cost, and request count.
-	//
-	// Example:
-	//
-	//   usage := ctx.GetSessionUsage()
-	//   fmt.Sprintf("Tokens: ↑%d ↓%d Cost: $%.3f",
-	//       usage.TotalInputTokens, usage.TotalOutputTokens, usage.TotalCost)
-	GetSessionUsage func() SessionUsage
-
 	// SetWidget places or updates a persistent widget in the TUI. Widgets
 	// remain visible across agent turns until explicitly removed. The
 	// widget is identified by WidgetConfig.ID; calling SetWidget with the
@@ -630,102 +572,6 @@ type Context struct {
 	//   })
 	//   // handle.Kill() to cancel, handle.Wait() to block
 	SpawnSubagent func(SubagentConfig) (*SubagentHandle, *SubagentResult, error)
-
-	// -------------------------------------------------------------------------
-	// Tree Navigation API (Phase 1 Bridge)
-	// -------------------------------------------------------------------------
-
-	// GetTreeNode returns a node by ID with full metadata and children.
-	// Returns nil if entry not found.
-	GetTreeNode func(entryID string) *TreeNode
-
-	// GetCurrentBranch returns the path from root to current leaf.
-	// Each node contains full metadata (unlike GetMessages which flattens).
-	GetCurrentBranch func() []TreeNode
-
-	// GetChildren returns direct child IDs of an entry.
-	GetChildren func(entryID string) []string
-
-	// NavigateTo branches/forks the session to the specified entry ID.
-	// Equivalent to SDK's Branch() but for extensions.
-	NavigateTo func(entryID string) TreeNavigationResult
-
-	// SummarizeBranch uses LLM to summarize a branch range.
-	// Returns summary text or error string (empty if success).
-	SummarizeBranch func(fromID, toID string) string
-
-	// CollapseBranch replaces a branch range with a summary entry.
-	// This is the "fresh context" primitive for context window management.
-	CollapseBranch func(fromID, toID, summary string) TreeNavigationResult
-
-	// -------------------------------------------------------------------------
-	// Skill Loading API (Phase 2 Bridge)
-	// -------------------------------------------------------------------------
-
-	// LoadSkill loads a single skill file from path.
-	// Parses YAML frontmatter, returns skill with content ready for injection.
-	LoadSkill func(path string) (*Skill, string)
-
-	// LoadSkillsFromDir discovers and loads all skills from a directory.
-	LoadSkillsFromDir func(dir string) SkillLoadResult
-
-	// DiscoverSkills finds skills in standard locations.
-	// Checks ~/.config/kit/skills/, .kit/skills/, .agents/skills/
-	DiscoverSkills func() SkillLoadResult
-
-	// InjectSkillAsContext sends a skill's content as a system message.
-	// Looks up skill by name from discovered skills.
-	InjectSkillAsContext func(skillName string) string
-
-	// InjectRawSkillAsContext loads and immediately injects a skill file.
-	InjectRawSkillAsContext func(path string) string
-
-	// GetAvailableSkills returns all currently loaded/discovered skills.
-	GetAvailableSkills func() []Skill
-
-	// -------------------------------------------------------------------------
-	// Template Parsing API (Phase 3 Bridge)
-	// -------------------------------------------------------------------------
-
-	// ParseTemplate extracts {{variables}} from template content.
-	ParseTemplate func(name, content string) PromptTemplate
-
-	// RenderTemplate substitutes variables into template content.
-	RenderTemplate func(tpl PromptTemplate, vars map[string]string) string
-
-	// ParseArguments parses command-line style arguments.
-	ParseArguments func(input string, pattern ArgumentPattern) ParseResult
-
-	// SimpleParseArguments parses $1, $2, $@ style arguments.
-	// Returns slice where [0]=full input, [1]=$1, [2]=$2, ... [n]=$@
-	SimpleParseArguments func(input string, count int) []string
-
-	// EvaluateModelConditional checks if condition matches current model.
-	// Condition supports wildcards: * matches any, ? matches single char.
-	EvaluateModelConditional func(condition string) bool
-
-	// RenderWithModelConditionals processes <if-model> blocks in content.
-	RenderWithModelConditionals func(content string) string
-
-	// -------------------------------------------------------------------------
-	// Model Resolution API (Phase 4 Bridge)
-	// -------------------------------------------------------------------------
-
-	// ResolveModelChain attempts each model in order until one is available.
-	ResolveModelChain func(preferences []string) ModelResolutionResult
-
-	// GetModelCapabilities returns capabilities for a specific model.
-	// If model is empty, uses current model.
-	GetModelCapabilities func(model string) (ModelCapabilities, string)
-
-	// CheckModelAvailable verifies if a model string is valid.
-	CheckModelAvailable func(model string) bool
-
-	// GetCurrentProvider returns just the provider part of current model.
-	GetCurrentProvider func() string
-
-	// GetCurrentModelID returns just the model ID part of current model.
-	GetCurrentModelID func() string
 }
 
 // ---------------------------------------------------------------------------
@@ -752,148 +598,6 @@ type SessionMessage struct {
 	Timestamp string
 }
 
-// ---------------------------------------------------------------------------
-// Tree navigation types (exposed to Yaegi — concrete structs)
-// ---------------------------------------------------------------------------
-
-// TreeNode represents a node in the session tree for navigation.
-// Extensions use this to traverse conversation history and implement
-// features like "fresh context" loops and branch summarization.
-type TreeNode struct {
-	// ID is the unique entry identifier.
-	ID string
-	// ParentID links this entry to its parent (empty if root).
-	ParentID string
-	// Type is the entry type: "message", "branch_summary", "model_change", "extension_data", "tool_execution".
-	Type string
-	// Role is the message role for message entries: "user", "assistant", "system", "tool".
-	Role string
-	// Content is the text content or summary.
-	Content string
-	// Model is the model that generated this (for assistant messages).
-	Model string
-	// Provider is the provider used.
-	Provider string
-	// Timestamp is the RFC3339-formatted creation time.
-	Timestamp string
-	// Children is the list of child entry IDs for tree traversal.
-	Children []string
-}
-
-// TreeNavigationResult reports success or failure of tree operations.
-type TreeNavigationResult struct {
-	// Success is true if the operation completed.
-	Success bool
-	// Error describes what went wrong (empty if success).
-	Error string
-}
-
-// ---------------------------------------------------------------------------
-// Skill types (exposed to Yaegi — concrete structs)
-// ---------------------------------------------------------------------------
-
-// Skill represents a loaded skill file with parsed YAML frontmatter.
-type Skill struct {
-	// Name is the human-readable identifier.
-	Name string
-	// Description summarizes what this skill provides.
-	Description string
-	// Content is the markdown body (frontmatter stripped).
-	Content string
-	// Path is the absolute filesystem path.
-	Path string
-	// Tags are optional labels for categorization.
-	Tags []string
-	// When controls automatic inclusion: "always", "on-demand", or file-glob.
-	When string
-}
-
-// SkillLoadResult reports skills loaded from a directory.
-type SkillLoadResult struct {
-	// Skills is the list of loaded skills.
-	Skills []Skill
-	// Error describes loading failures (empty if success).
-	Error string
-}
-
-// ---------------------------------------------------------------------------
-// Template parsing types (exposed to Yaegi — concrete structs)
-// ---------------------------------------------------------------------------
-
-// PromptTemplate represents a parsed template with variable placeholders.
-type PromptTemplate struct {
-	// Name is the template identifier.
-	Name string
-	// Content is the original template content.
-	Content string
-	// Variables are the extracted {{variable}} names.
-	Variables []string
-}
-
-// ArgumentPattern defines how to parse command arguments.
-type ArgumentPattern struct {
-	// Positional names for $1, $2, etc.
-	Positional []string
-	// Rest is the variable name for $@ (all remaining).
-	Rest string
-	// Flags maps flag names to variable names (e.g., "--loop" -> "loop").
-	Flags map[string]string
-}
-
-// ParseResult reports argument parsing outcome.
-type ParseResult struct {
-	// Vars maps variable names to values for positional args.
-	Vars map[string]string
-	// Flags maps flag names to values.
-	Flags map[string]string
-	// Rest is remaining unparsed text.
-	Rest string
-	// Error describes parsing failures (empty if success).
-	Error string
-}
-
-// ModelConditional represents an <if-model> block for evaluation.
-type ModelConditional struct {
-	// Condition is the model pattern (e.g., "claude-*", "anthropic/*").
-	Condition string
-	// Content is rendered if condition matches.
-	Content string
-	// Else is rendered if condition doesn't match.
-	Else string
-}
-
-// ---------------------------------------------------------------------------
-// Model resolution types (exposed to Yaegi — concrete structs)
-// ---------------------------------------------------------------------------
-
-// ModelCapabilities describes what a model supports.
-type ModelCapabilities struct {
-	// Provider is the provider ID (e.g., "anthropic").
-	Provider string
-	// ModelID is the model identifier (e.g., "claude-sonnet-4-20250929").
-	ModelID string
-	// ContextLimit is the maximum context window in tokens.
-	ContextLimit int
-	// OutputLimit is the maximum output tokens.
-	OutputLimit int
-	// Reasoning indicates if the model supports reasoning/thinking.
-	Reasoning bool
-	// Streaming indicates if the model supports streaming.
-	Streaming bool
-}
-
-// ModelResolutionResult reports model chain resolution outcome.
-type ModelResolutionResult struct {
-	// Model is the selected model in "provider/model" format.
-	Model string
-	// Capabilities describes the selected model.
-	Capabilities ModelCapabilities
-	// Attempted lists models tried before success.
-	Attempted []string
-	// Error describes resolution failures (empty if success).
-	Error string
-}
-
 // ExtensionEntry represents persisted extension data stored in the session.
 // Extensions use AppendEntry to save custom state and GetEntries to retrieve
 // it on session resume.
@@ -995,48 +699,6 @@ type StatusBarEntry struct {
 	Priority int
 }
 
-// CompactConfig configures a programmatic context compaction request.
-type CompactConfig struct {
-	// CustomInstructions is optional text appended to the summary prompt
-	// (e.g. "Focus on the API design decisions"). Empty uses the default.
-	CustomInstructions string
-	// OnComplete is called when compaction finishes successfully.
-	// May be nil if the caller doesn't need notification.
-	OnComplete func()
-	// OnError is called when compaction fails. The argument is the error message.
-	// May be nil if the caller doesn't need notification.
-	OnError func(errMsg string)
-}
-
-// FilePart describes a file attachment for multimodal messages. Extensions
-// use this with SendMultimodalMessage to attach images or documents.
-type FilePart struct {
-	// Filename is the name of the file (e.g. "photo.jpg").
-	Filename string
-	// Data is the raw file content.
-	Data []byte
-	// MediaType is the MIME type (e.g. "image/jpeg", "application/pdf").
-	MediaType string
-}
-
-// SessionUsage contains aggregated token usage and cost statistics for
-// the current session. Extensions use this with GetSessionUsage() to
-// report usage information.
-type SessionUsage struct {
-	// TotalInputTokens is the sum of input tokens across all requests.
-	TotalInputTokens int
-	// TotalOutputTokens is the sum of output tokens across all requests.
-	TotalOutputTokens int
-	// TotalCacheReadTokens is the sum of cache read tokens.
-	TotalCacheReadTokens int
-	// TotalCacheWriteTokens is the sum of cache write tokens.
-	TotalCacheWriteTokens int
-	// TotalCost is the total cost in USD across all requests.
-	TotalCost float64
-	// RequestCount is the number of LLM requests made in this session.
-	RequestCount int
-}
-
 // PrintBlockOpts configures a custom styled block for PrintBlock.
 type PrintBlockOpts struct {
 	// Text is the main content to display.
@@ -1122,7 +784,7 @@ func (a *API) OnToolResult(handler func(ToolResultEvent, Context) *ToolResultRes
 	a.onToolResult(handler)
 }
 
-// OnSubagentStart registers a handler that fires when a subagent tool
+// OnSubagentStart registers a handler that fires when a spawn_subagent tool
 // call begins executing. Use the ToolCallID to correlate with subsequent
 // OnSubagentChunk and OnSubagentEnd events for the same subagent.
 func (a *API) OnSubagentStart(handler func(SubagentStartEvent, Context)) {
@@ -1137,7 +799,7 @@ func (a *API) OnSubagentChunk(handler func(SubagentChunkEvent, Context)) {
 	a.onSubagentChunk(handler)
 }
 
-// OnSubagentEnd registers a handler that fires when a subagent call
+// OnSubagentEnd registers a handler that fires when a spawn_subagent call
 // completes. ErrorMsg is non-empty when the subagent failed.
 func (a *API) OnSubagentEnd(handler func(SubagentEndEvent, Context)) {
 	a.onSubagentEnd(handler)
@@ -2146,9 +1808,9 @@ func (BeforeCompactResult) isResult() {}
 // Subagent lifecycle events (exposed to Yaegi — concrete structs)
 // ---------------------------------------------------------------------------
 
-// SubagentStartEvent fires when a subagent tool call begins executing.
+// SubagentStartEvent fires when a spawn_subagent tool call begins executing.
 type SubagentStartEvent struct {
-	// ToolCallID is the LLM-assigned ID of the subagent tool call.
+	// ToolCallID is the LLM-assigned ID of the spawn_subagent tool call.
 	// Use this to correlate SubagentChunkEvent and SubagentEndEvent.
 	ToolCallID string
 	// Task is the task description passed to the subagent.
@@ -2188,7 +1850,7 @@ type SubagentChunkEvent struct {
 
 func (e SubagentChunkEvent) Type() EventType { return SubagentChunk }
 
-// SubagentEndEvent fires when a subagent tool call completes.
+// SubagentEndEvent fires when a spawn_subagent tool call completes.
 type SubagentEndEvent struct {
 	// ToolCallID matches the SubagentStartEvent.ToolCallID for this subagent.
 	ToolCallID string

internal/extensions/events.go

@@ -72,7 +72,7 @@ const (
 	// cancel compaction by returning Cancel=true.
 	BeforeCompact EventType = "before_compact"
 
-	// SubagentStart fires when a subagent tool call begins executing.
+	// SubagentStart fires when a spawn_subagent tool call begins executing.
 	// Carries the tool call ID and the task description.
 	SubagentStart EventType = "subagent_start"
 
@@ -80,7 +80,7 @@ const (
 	// subagent: text chunks, tool calls, tool results, etc.
 	SubagentChunk EventType = "subagent_chunk"
 
-	// SubagentEnd fires when a subagent tool call completes (success
+	// SubagentEnd fires when a spawn_subagent tool call completes (success
 	// or error). Carries the final response and any error message.
 	SubagentEnd EventType = "subagent_end"
 )

internal/extensions/installer.go

@@ -154,11 +154,6 @@ func NewInstaller(projectDir string) *Installer {
 
 // Install clones a git repository to the appropriate scope.
 func (i *Installer) Install(source *GitSource, scope InstallScope) error {
-	return i.install(source, scope, nil)
-}
-
-// install is the internal implementation that supports optional include paths.
-func (i *Installer) install(source *GitSource, scope InstallScope, includePaths []string) error {
 	targetDir := i.getInstallPath(source, scope)
 
 	// Check if already installed
@@ -204,7 +199,6 @@ func (i *Installer) install(source *GitSource, scope InstallScope, includePaths
 		Pinned:    source.Pinned,
 		Scope:     scope,
 		Installed: time.Now(),
-		Include:   includePaths,
 	}
 	if err := i.addToManifest(entry, scope); err != nil {
 		// Don't fail the install, just log the error
@@ -274,22 +268,7 @@ func (i *Installer) Update(source *GitSource, scope InstallScope) error {
 	cleanCmd.Dir = targetDir
 	_ = cleanCmd.Run() // Ignore errors - clean is best effort
 
-	// Update manifest timestamp, preserving existing fields like Include
-	existing, _ := i.loadManifest(scope)
-	var include []string
-	var installed time.Time
-	if existing != nil {
-		for _, p := range existing.Packages {
-			if p.Host+"/"+p.Path == source.Identity() {
-				include = p.Include
-				installed = p.Installed
-				break
-			}
-		}
-	}
-	if installed.IsZero() {
-		installed = time.Now()
-	}
+	// Update manifest timestamp
 	entry := ManifestEntry{
 		Source:    source.String(),
 		Repo:      source.Repo,
@@ -298,9 +277,8 @@ func (i *Installer) Update(source *GitSource, scope InstallScope) error {
 		Ref:       "",
 		Pinned:    false,
 		Scope:     scope,
-		Installed: installed,
+		Installed: time.Now(),
 		Updated:   time.Now(),
-		Include:   include,
 	}
 	_ = i.addToManifest(entry, scope) // Best effort - don't fail update if manifest fails
 
@@ -525,7 +503,30 @@ func (i *Installer) PreviewExtensions(source *GitSource) ([]ExtensionPreview, st
 // InstallWithInclude clones a repo and installs only the specified extensions.
 // includePaths are relative paths like "./git/main.go" - if empty, installs all.
 func (i *Installer) InstallWithInclude(source *GitSource, scope InstallScope, includePaths []string) error {
-	return i.install(source, scope, includePaths)
+	// First, do a regular install
+	if err := i.Install(source, scope); err != nil {
+		return err
+	}
+
+	// If specific includes were requested, update the manifest
+	if len(includePaths) > 0 {
+		entry := ManifestEntry{
+			Source:  source.String(),
+			Repo:    source.Repo,
+			Host:    source.Host,
+			Path:    source.Path,
+			Ref:     source.Ref,
+			Pinned:  source.Pinned,
+			Scope:   scope,
+			Include: includePaths,
+		}
+
+		if err := addEntryToManifest(entry, scope); err != nil {
+			return fmt.Errorf("updating manifest with includes: %w", err)
+		}
+	}
+
+	return nil
 }
 
 // CleanupTempDir removes a temporary directory used for preview.

internal/extensions/loader.go

@@ -47,56 +47,46 @@ func LoadExtensions(extraPaths []string) ([]LoadedExtension, error) {
 	return loaded, nil
 }
 
-// pathSet is a thread-safe helper for deduplicating and ordering file paths.
-type pathSet struct {
-	m    map[string]bool
-	list []string
-}
-
-func newPathSet() *pathSet {
-	return &pathSet{m: make(map[string]bool)}
-}
-
-func (ps *pathSet) add(p string) bool {
-	abs, err := filepath.Abs(p)
-	if err != nil {
-		return false
-	}
-	if ps.m[abs] {
-		return false
-	}
-	ps.m[abs] = true
-	ps.list = append(ps.list, abs)
-	return true
-}
-
 // discoverExtensionPaths returns deduplicated paths to extension files in
 // load-order (global first, then project-local, then explicit).
 func discoverExtensionPaths(extraPaths []string) []string {
-	ps := newPathSet()
+	seen := make(map[string]bool)
+	var paths []string
+
+	add := func(p string) {
+		abs, err := filepath.Abs(p)
+		if err != nil {
+			return
+		}
+		if seen[abs] {
+			return
+		}
+		seen[abs] = true
+		paths = append(paths, abs)
+	}
 
 	// Global extensions: $XDG_CONFIG_HOME/kit/extensions/ (default ~/.config/kit/extensions/)
 	globalDir := globalExtensionsDir()
 	for _, p := range findExtensionsInDir(globalDir) {
-		ps.add(p)
+		add(p)
 	}
 
 	// Global installed git packages: $XDG_DATA_HOME/kit/git/
 	globalGitDir := globalGitInstallRoot()
 	for _, p := range findExtensionsInGitPackages(globalGitDir) {
-		ps.add(p)
+		add(p)
 	}
 
 	// Project-local extensions: .kit/extensions/
 	localDir := filepath.Join(".kit", "extensions")
 	for _, p := range findExtensionsInDir(localDir) {
-		ps.add(p)
+		add(p)
 	}
 
 	// Project-local installed git packages: .kit/git/
 	projectGitDir := filepath.Join(".kit", "git")
 	for _, p := range findExtensionsInGitPackages(projectGitDir) {
-		ps.add(p)
+		add(p)
 	}
 
 	// Explicit paths (highest precedence)
@@ -107,14 +97,14 @@ func discoverExtensionPaths(extraPaths []string) []string {
 		}
 		if info.IsDir() {
 			for _, found := range findExtensionsInDir(p) {
-				ps.add(found)
+				add(found)
 			}
 		} else if strings.HasSuffix(p, ".go") {
-			ps.add(p)
+			add(p)
 		}
 	}
 
-	return ps.list
+	return paths
 }
 
 // findExtensionsInDir returns .go files in dir and main.go in immediate subdirs.
@@ -133,7 +123,7 @@ func findExtensionsInDir(dir string) []string {
 
 	for _, entry := range entries {
 		full := filepath.Join(dir, entry.Name())
-		if !entry.IsDir() && strings.HasSuffix(entry.Name(), ".go") && !strings.HasSuffix(entry.Name(), "_test.go") {
+		if !entry.IsDir() && strings.HasSuffix(entry.Name(), ".go") {
 			results = append(results, full)
 		} else if entry.IsDir() {
 			main := filepath.Join(full, "main.go")
@@ -190,13 +180,9 @@ func findExtensionsInRepo(repoPath string) []string {
 			isExtDir := base == "extensions" || base == "ext" ||
 				strings.HasSuffix(base, "-extensions") || strings.HasSuffix(base, "-ext")
 
-			// Allow walking into examples/ so we can reach examples/extensions/ etc,
-			// but don't treat examples/ itself or non-extension subdirs as extension locations.
-			if relPath == "examples" {
-				return nil
-			}
+			isExamplesSubdir := relPath == "examples" || strings.HasPrefix(relPath, "examples/")
 
-			if !isExtDir {
+			if !isExtDir && !isExamplesSubdir {
 				mainPath := filepath.Join(path, "main.go")
 				if _, err := os.Stat(mainPath); err == nil {
 					if relPath == base { // Top-level directory
@@ -206,6 +192,13 @@ func findExtensionsInRepo(repoPath string) []string {
 						}
 						return filepath.SkipDir
 					}
+					if isExamplesSubdir || isExtDir {
+						if !multiFileDirs[relPath] {
+							multiFileDirs[relPath] = true
+							results = append(results, mainPath)
+						}
+						return filepath.SkipDir
+					}
 				}
 				return filepath.SkipDir
 			}
@@ -224,7 +217,7 @@ func findExtensionsInRepo(repoPath string) []string {
 		}
 
 		// It's a file
-		if !strings.HasSuffix(info.Name(), ".go") || strings.HasSuffix(info.Name(), "_test.go") {
+		if !strings.HasSuffix(info.Name(), ".go") {
 			return nil
 		}
 

internal/extensions/manifest.go

@@ -253,13 +253,10 @@ func ScanForExtensions(dir string) ([]ExtensionPreview, error) {
 			isExtDir := base == "extensions" || base == "ext" ||
 				strings.HasSuffix(base, "-extensions") || strings.HasSuffix(base, "-ext")
 
-			// Allow walking into examples/ so we can reach examples/extensions/ etc,
-			// but don't treat examples/ itself or non-extension subdirs as extension locations.
-			if relPath == "examples" {
-				return nil
-			}
+			// Or check if it's a subdirectory of examples/ that might contain extensions
+			isExamplesSubdir := relPath == "examples" || strings.HasPrefix(relPath, "examples/")
 
-			if !isExtDir {
+			if !isExtDir && !isExamplesSubdir {
 				// Check for main.go before skipping
 				mainPath := filepath.Join(path, "main.go")
 				if _, err := os.Stat(mainPath); err == nil {
@@ -275,6 +272,18 @@ func ScanForExtensions(dir string) ([]ExtensionPreview, error) {
 						}
 						return filepath.SkipDir
 					}
+					// Inside a valid extensions directory
+					if isExamplesSubdir || isExtDir {
+						if !multiFileDirs[relPath] {
+							multiFileDirs[relPath] = true
+							previews = append(previews, ExtensionPreview{
+								Path:   "./" + relPath + "/main.go",
+								Name:   deriveExtensionName(relPath+"/main.go", true),
+								IsMain: true,
+							})
+						}
+						return filepath.SkipDir
+					}
 				}
 
 				// Not an extension location
@@ -300,7 +309,7 @@ func ScanForExtensions(dir string) ([]ExtensionPreview, error) {
 		}
 
 		// It's a file - check if it's a valid extension
-		if !strings.HasSuffix(info.Name(), ".go") || strings.HasSuffix(info.Name(), "_test.go") {
+		if !strings.HasSuffix(info.Name(), ".go") {
 			return nil
 		}
 

internal/extensions/runner.go

@@ -86,21 +86,6 @@ func normalizeContext(ctx Context) Context {
 	if ctx.CancelAndSend == nil {
 		ctx.CancelAndSend = func(string) {}
 	}
-	if ctx.Abort == nil {
-		ctx.Abort = func() {}
-	}
-	if ctx.IsIdle == nil {
-		ctx.IsIdle = func() bool { return true }
-	}
-	if ctx.Compact == nil {
-		ctx.Compact = func(CompactConfig) error { return fmt.Errorf("compact not available") }
-	}
-	if ctx.SendMultimodalMessage == nil {
-		ctx.SendMultimodalMessage = func(string, []FilePart) {}
-	}
-	if ctx.GetSessionUsage == nil {
-		ctx.GetSessionUsage = func() SessionUsage { return SessionUsage{} }
-	}
 	if ctx.SetWidget == nil {
 		ctx.SetWidget = func(WidgetConfig) {}
 	}
@@ -229,102 +214,6 @@ func normalizeContext(ctx Context) Context {
 			return nil, nil, nil
 		}
 	}
-
-	// -------------------------------------------------------------------------
-	// Tree Navigation API no-ops
-	// -------------------------------------------------------------------------
-	if ctx.GetTreeNode == nil {
-		ctx.GetTreeNode = func(string) *TreeNode { return nil }
-	}
-	if ctx.GetCurrentBranch == nil {
-		ctx.GetCurrentBranch = func() []TreeNode { return nil }
-	}
-	if ctx.GetChildren == nil {
-		ctx.GetChildren = func(string) []string { return nil }
-	}
-	if ctx.NavigateTo == nil {
-		ctx.NavigateTo = func(string) TreeNavigationResult {
-			return TreeNavigationResult{Success: false, Error: "not implemented"}
-		}
-	}
-	if ctx.SummarizeBranch == nil {
-		ctx.SummarizeBranch = func(string, string) string {
-			return ""
-		}
-	}
-	if ctx.CollapseBranch == nil {
-		ctx.CollapseBranch = func(string, string, string) TreeNavigationResult {
-			return TreeNavigationResult{Success: false, Error: "not implemented"}
-		}
-	}
-
-	// -------------------------------------------------------------------------
-	// Skill Loading API no-ops
-	// -------------------------------------------------------------------------
-	if ctx.LoadSkill == nil {
-		ctx.LoadSkill = func(string) (*Skill, string) { return nil, "" }
-	}
-	if ctx.LoadSkillsFromDir == nil {
-		ctx.LoadSkillsFromDir = func(string) SkillLoadResult { return SkillLoadResult{} }
-	}
-	if ctx.DiscoverSkills == nil {
-		ctx.DiscoverSkills = func() SkillLoadResult { return SkillLoadResult{} }
-	}
-	if ctx.InjectSkillAsContext == nil {
-		ctx.InjectSkillAsContext = func(string) string { return "" }
-	}
-	if ctx.InjectRawSkillAsContext == nil {
-		ctx.InjectRawSkillAsContext = func(string) string { return "" }
-	}
-	if ctx.GetAvailableSkills == nil {
-		ctx.GetAvailableSkills = func() []Skill { return nil }
-	}
-
-	// -------------------------------------------------------------------------
-	// Template Parsing API no-ops
-	// -------------------------------------------------------------------------
-	if ctx.ParseTemplate == nil {
-		ctx.ParseTemplate = func(string, string) PromptTemplate { return PromptTemplate{} }
-	}
-	if ctx.RenderTemplate == nil {
-		ctx.RenderTemplate = func(PromptTemplate, map[string]string) string { return "" }
-	}
-	if ctx.ParseArguments == nil {
-		ctx.ParseArguments = func(string, ArgumentPattern) ParseResult { return ParseResult{} }
-	}
-	if ctx.SimpleParseArguments == nil {
-		ctx.SimpleParseArguments = func(string, int) []string { return nil }
-	}
-	if ctx.EvaluateModelConditional == nil {
-		ctx.EvaluateModelConditional = func(string) bool { return false }
-	}
-	if ctx.RenderWithModelConditionals == nil {
-		ctx.RenderWithModelConditionals = func(string) string { return "" }
-	}
-
-	// -------------------------------------------------------------------------
-	// Model Resolution API no-ops
-	// -------------------------------------------------------------------------
-	if ctx.ResolveModelChain == nil {
-		ctx.ResolveModelChain = func([]string) ModelResolutionResult {
-			return ModelResolutionResult{Error: "not implemented"}
-		}
-	}
-	if ctx.GetModelCapabilities == nil {
-		ctx.GetModelCapabilities = func(string) (ModelCapabilities, string) {
-			return ModelCapabilities{}, "not implemented"
-		}
-	}
-	if ctx.CheckModelAvailable == nil {
-		ctx.CheckModelAvailable = func(string) bool { return false }
-	}
-	if ctx.GetCurrentProvider == nil {
-		ctx.GetCurrentProvider = func() string { return "" }
-	}
-	if ctx.GetCurrentModelID == nil {
-		ctx.GetCurrentModelID = func() string { return "" }
-	}
-
 	return ctx
 }
 

internal/extensions/subagent.go

@@ -173,10 +173,10 @@ type subagentJSONOutput struct {
 	} `json:"usage,omitempty"`
 }
 
-var subagentCounter atomic.Uint64
+var subagentCounter uint64
 
 func generateSubagentID() string {
-	n := subagentCounter.Add(1)
+	n := atomic.AddUint64(&subagentCounter, 1)
 	return fmt.Sprintf("sub-%d-%d", time.Now().UnixNano(), n)
 }
 

internal/extensions/symbols.go

@@ -31,7 +31,6 @@ func Symbols() interp.Exports {
 			// Session types
 			"SessionMessage": reflect.ValueOf((*SessionMessage)(nil)),
 			"ExtensionEntry": reflect.ValueOf((*ExtensionEntry)(nil)),
-			"SessionUsage":   reflect.ValueOf((*SessionUsage)(nil)),
 
 			// Option types
 			"OptionDef": reflect.ValueOf((*OptionDef)(nil)),
@@ -45,8 +44,6 @@ func Symbols() interp.Exports {
 			// LLM completion types
 			"CompleteRequest":  reflect.ValueOf((*CompleteRequest)(nil)),
 			"CompleteResponse": reflect.ValueOf((*CompleteResponse)(nil)),
-			"CompactConfig":    reflect.ValueOf((*CompactConfig)(nil)),
-			"FilePart":         reflect.ValueOf((*FilePart)(nil)),
 
 			// Status bar types
 			"StatusBarEntry": reflect.ValueOf((*StatusBarEntry)(nil)),
@@ -131,24 +128,6 @@ func Symbols() interp.Exports {
 			"ThemeColor":       reflect.ValueOf((*ThemeColor)(nil)),
 			"ThemeColorConfig": reflect.ValueOf((*ThemeColorConfig)(nil)),
 
-			// Tree navigation types
-			"TreeNode":             reflect.ValueOf((*TreeNode)(nil)),
-			"TreeNavigationResult": reflect.ValueOf((*TreeNavigationResult)(nil)),
-
-			// Skill types
-			"Skill":           reflect.ValueOf((*Skill)(nil)),
-			"SkillLoadResult": reflect.ValueOf((*SkillLoadResult)(nil)),
-
-			// Template parsing types
-			"PromptTemplate":   reflect.ValueOf((*PromptTemplate)(nil)),
-			"ArgumentPattern":  reflect.ValueOf((*ArgumentPattern)(nil)),
-			"ParseResult":      reflect.ValueOf((*ParseResult)(nil)),
-			"ModelConditional": reflect.ValueOf((*ModelConditional)(nil)),
-
-			// Model resolution types
-			"ModelCapabilities":     reflect.ValueOf((*ModelCapabilities)(nil)),
-			"ModelResolutionResult": reflect.ValueOf((*ModelResolutionResult)(nil)),
-
 			// Event structs
 			"ToolCallEvent":           reflect.ValueOf((*ToolCallEvent)(nil)),
 			"ToolCallResult":          reflect.ValueOf((*ToolCallResult)(nil)),

internal/extensions/watcher.go

@@ -1,192 +0,0 @@
-package extensions
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/charmbracelet/log"
-	"github.com/fsnotify/fsnotify"
-)
-
-// Watcher monitors extension directories for file changes and triggers
-// a reload callback when .go files are created, modified, or removed.
-// It uses fsnotify for kernel-level file notifications (inotify on Linux,
-// kqueue on macOS) with debouncing to coalesce rapid editor writes.
-type Watcher struct {
-	watcher  *fsnotify.Watcher
-	onReload func()
-	debounce time.Duration
-	cancel   context.CancelFunc
-	done     chan struct{}
-	mu       sync.Mutex
-}
-
-// NewWatcher creates a file watcher that monitors the given directories
-// for .go file changes. When a change is detected (after debouncing),
-// onReload is called. The watcher must be started with Start() and
-// stopped with Close().
-func NewWatcher(dirs []string, onReload func()) (*Watcher, error) {
-	fsw, err := fsnotify.NewWatcher()
-	if err != nil {
-		return nil, fmt.Errorf("creating file watcher: %w", err)
-	}
-
-	for _, dir := range dirs {
-		// Watch the directory itself.
-		if err := fsw.Add(dir); err != nil {
-			log.Debug("watcher: skipping directory", "dir", dir, "err", err)
-			continue
-		}
-
-		// Also watch immediate subdirectories (for */main.go pattern).
-		entries, err := os.ReadDir(dir)
-		if err != nil {
-			continue
-		}
-		for _, entry := range entries {
-			if entry.IsDir() {
-				subdir := filepath.Join(dir, entry.Name())
-				if err := fsw.Add(subdir); err != nil {
-					log.Debug("watcher: skipping subdirectory", "dir", subdir, "err", err)
-				}
-			}
-		}
-	}
-
-	return &Watcher{
-		watcher:  fsw,
-		onReload: onReload,
-		debounce: 300 * time.Millisecond,
-		done:     make(chan struct{}),
-	}, nil
-}
-
-// Start begins watching for file changes. It blocks until the context
-// is cancelled or Close() is called. Typically called in a goroutine.
-func (w *Watcher) Start(ctx context.Context) {
-	w.mu.Lock()
-	ctx, w.cancel = context.WithCancel(ctx)
-	w.mu.Unlock()
-
-	defer close(w.done)
-
-	var timer *time.Timer
-	var timerC <-chan time.Time
-
-	for {
-		select {
-		case <-ctx.Done():
-			if timer != nil {
-				timer.Stop()
-			}
-			return
-
-		case event, ok := <-w.watcher.Events:
-			if !ok {
-				return
-			}
-
-			// Only care about .go files.
-			if !strings.HasSuffix(event.Name, ".go") {
-				continue
-			}
-
-			// React to write, create, remove, rename events.
-			if event.Op&(fsnotify.Write|fsnotify.Create|fsnotify.Remove|fsnotify.Rename) == 0 {
-				continue
-			}
-
-			log.Debug("watcher: file changed", "file", event.Name, "op", event.Op)
-
-			// Debounce: reset timer on each event.
-			if timer != nil {
-				timer.Stop()
-			}
-			timer = time.NewTimer(w.debounce)
-			timerC = timer.C
-
-		case <-timerC:
-			timerC = nil
-			timer = nil
-			log.Debug("watcher: reloading extensions")
-			w.onReload()
-
-		case err, ok := <-w.watcher.Errors:
-			if !ok {
-				return
-			}
-			log.Warn("watcher: error", "err", err)
-		}
-	}
-}
-
-// Close stops the watcher and releases resources.
-func (w *Watcher) Close() error {
-	w.mu.Lock()
-	cancel := w.cancel
-	w.mu.Unlock()
-
-	if cancel != nil {
-		cancel()
-	}
-
-	// Wait for the event loop to finish.
-	<-w.done
-	return w.watcher.Close()
-}
-
-// WatchedDirs returns the directories to watch for extension changes.
-// This includes the global extensions directory and the project-local
-// .kit/extensions/ directory (if they exist). Explicit -e paths that
-// point to directories are also included; explicit file paths cause
-// their parent directory to be watched instead.
-func WatchedDirs(extraPaths []string) []string {
-	var dirs []string
-	seen := make(map[string]bool)
-
-	add := func(dir string) {
-		abs, err := filepath.Abs(dir)
-		if err != nil {
-			return
-		}
-		if seen[abs] {
-			return
-		}
-
-		// Verify the directory exists.
-		info, err := os.Stat(abs)
-		if err != nil || !info.IsDir() {
-			return
-		}
-
-		seen[abs] = true
-		dirs = append(dirs, abs)
-	}
-
-	// Global extensions dir.
-	add(globalExtensionsDir())
-
-	// Project-local extensions dir.
-	add(filepath.Join(".kit", "extensions"))
-
-	// Explicit paths that are directories.
-	for _, p := range extraPaths {
-		info, err := os.Stat(p)
-		if err != nil {
-			continue
-		}
-		if info.IsDir() {
-			add(p)
-		} else {
-			// For explicit files, watch the parent directory.
-			add(filepath.Dir(p))
-		}
-	}
-
-	return dirs
-}

internal/extensions/watcher_test.go

@@ -1,158 +0,0 @@
-package extensions
-
-import (
-	"os"
-	"path/filepath"
-	"sync/atomic"
-	"testing"
-	"time"
-)
-
-func TestWatcher_ReloadsOnGoFileChange(t *testing.T) {
-	dir := t.TempDir()
-
-	// Write an initial extension file.
-	extFile := filepath.Join(dir, "test.go")
-	if err := os.WriteFile(extFile, []byte("package main\n"), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	var reloadCount atomic.Int32
-
-	w, err := NewWatcher([]string{dir}, func() {
-		reloadCount.Add(1)
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	go w.Start(t.Context())
-
-	// Modify the file.
-	time.Sleep(50 * time.Millisecond) // let watcher settle
-	if err := os.WriteFile(extFile, []byte("package main\n// changed\n"), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	// Wait for debounce (300ms) + margin.
-	time.Sleep(600 * time.Millisecond)
-
-	if got := reloadCount.Load(); got != 1 {
-		t.Errorf("expected 1 reload, got %d", got)
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestWatcher_IgnoresNonGoFiles(t *testing.T) {
-	dir := t.TempDir()
-
-	var reloadCount atomic.Int32
-
-	w, err := NewWatcher([]string{dir}, func() {
-		reloadCount.Add(1)
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	go w.Start(t.Context())
-
-	// Write a non-.go file.
-	time.Sleep(50 * time.Millisecond)
-	txtFile := filepath.Join(dir, "notes.txt")
-	if err := os.WriteFile(txtFile, []byte("hello"), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	// Wait past the debounce window.
-	time.Sleep(600 * time.Millisecond)
-
-	if got := reloadCount.Load(); got != 0 {
-		t.Errorf("expected 0 reloads for .txt file, got %d", got)
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestWatcher_Debounces(t *testing.T) {
-	dir := t.TempDir()
-
-	extFile := filepath.Join(dir, "ext.go")
-	if err := os.WriteFile(extFile, []byte("package main\n"), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	var reloadCount atomic.Int32
-
-	w, err := NewWatcher([]string{dir}, func() {
-		reloadCount.Add(1)
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	go w.Start(t.Context())
-
-	time.Sleep(50 * time.Millisecond)
-
-	// Rapid-fire writes (simulating editor save: write temp, rename, etc.).
-	for range 5 {
-		if err := os.WriteFile(extFile, []byte("package main\n// changed\n"), 0o644); err != nil {
-			t.Fatal(err)
-		}
-		time.Sleep(50 * time.Millisecond)
-	}
-
-	// Wait for debounce to fire.
-	time.Sleep(600 * time.Millisecond)
-
-	if got := reloadCount.Load(); got != 1 {
-		t.Errorf("expected 1 debounced reload, got %d", got)
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestWatchedDirs_Deduplicates(t *testing.T) {
-	dir := t.TempDir()
-	dirs := WatchedDirs([]string{dir, dir})
-
-	count := 0
-	for _, d := range dirs {
-		abs, _ := filepath.Abs(dir)
-		if d == abs {
-			count++
-		}
-	}
-	if count != 1 {
-		t.Errorf("expected directory to appear once, got %d", count)
-	}
-}
-
-func TestWatchedDirs_FileParent(t *testing.T) {
-	dir := t.TempDir()
-	file := filepath.Join(dir, "ext.go")
-	if err := os.WriteFile(file, []byte("package main\n"), 0o644); err != nil {
-		t.Fatal(err)
-	}
-
-	dirs := WatchedDirs([]string{file})
-
-	abs, _ := filepath.Abs(dir)
-	found := false
-	for _, d := range dirs {
-		if d == abs {
-			found = true
-		}
-	}
-	if !found {
-		t.Errorf("expected parent dir %s in watched dirs %v", abs, dirs)
-	}
-}

internal/extensions/wrapper.go

@@ -42,14 +42,14 @@ func ExtensionToolsAsFantasy(defs []ToolDef, runner *Runner) []fantasy.AgentTool
 
 // coreToolKinds maps built-in tool names to their kind classification.
 var coreToolKinds = map[string]string{
-	"bash":     "execute",
-	"edit":     "edit",
-	"write":    "edit",
-	"read":     "read",
-	"ls":       "read",
-	"grep":     "search",
-	"find":     "search",
-	"subagent": "agent",
+	"bash":           "execute",
+	"edit":           "edit",
+	"write":          "edit",
+	"read":           "read",
+	"ls":             "read",
+	"grep":           "search",
+	"find":           "search",
+	"spawn_subagent": "agent",
 }
 
 // toolKindFor returns the ToolKind for a given tool name, defaulting to

internal/kitsetup/setup.go

@@ -33,10 +33,6 @@ type AgentSetupOptions struct {
 	// CoreTools overrides the default core tool set. If empty, core.AllTools()
 	// is used. Allows SDK users to pass custom tools (e.g. with WithWorkDir).
 	CoreTools []fantasy.AgentTool
-	// DisableCoreTools, when true, prevents loading any core tools.
-	// If both DisableCoreTools is true and CoreTools is empty, the agent
-	// will have no tools (useful for simple chat completions).
-	DisableCoreTools bool
 	// ExtraTools are additional tools added alongside core, MCP, and extension
 	// tools. They do not replace the defaults — they extend them.
 	ExtraTools []fantasy.AgentTool
@@ -44,30 +40,6 @@ type AgentSetupOptions struct {
 	// wrapping. Used by the SDK hook system. Both wrappers compose:
 	// extension wrapper runs first (inner), then this wrapper (outer).
 	ToolWrapper func([]fantasy.AgentTool) []fantasy.AgentTool
-
-	// ProviderConfig, when non-nil, is used directly instead of calling
-	// BuildProviderConfig(). Callers that already hold viperInitMu can
-	// pre-build this and release the lock before calling SetupAgent, so the
-	// slow agent/MCP initialisation runs concurrently with other New() calls.
-	ProviderConfig *models.ProviderConfig
-	// Debug enables debug logging. When zero-value, viper is consulted.
-	// Only meaningful when ProviderConfig is also set.
-	Debug bool
-	// NoExtensions skips extension loading. When false, viper is consulted.
-	// Only meaningful when ProviderConfig is also set.
-	NoExtensions bool
-	// MaxSteps overrides the agent step limit. 0 means use viper value.
-	// Only meaningful when ProviderConfig is also set.
-	MaxSteps int
-	// StreamingEnabled controls streaming. Only meaningful when ProviderConfig
-	// is also set.
-	StreamingEnabled bool
-	// AuthHandler handles OAuth authorization for remote MCP servers.
-	// When set, remote transports are configured with OAuth support.
-	AuthHandler tools.MCPAuthHandler
-	// OnMCPServerLoaded, if non-nil, is called when each MCP server finishes
-	// loading (successfully or with error). Called from the background goroutine.
-	OnMCPServerLoaded func(serverName string, toolCount int, err error)
 }
 
 // AgentSetupResult bundles the created agent and any debug logger so the caller
@@ -91,27 +63,23 @@ func BuildProviderConfig() (*models.ProviderConfig, string, error) {
 	temperature := float32(viper.GetFloat64("temperature"))
 	topP := float32(viper.GetFloat64("top-p"))
 	topK := int32(viper.GetInt("top-k"))
-	frequencyPenalty := float32(viper.GetFloat64("frequency-penalty"))
-	presencePenalty := float32(viper.GetFloat64("presence-penalty"))
 	numGPU := int32(viper.GetInt("num-gpu-layers"))
 	mainGPU := int32(viper.GetInt("main-gpu"))
 
 	cfg := &models.ProviderConfig{
-		ModelString:      viper.GetString("model"),
-		SystemPrompt:     systemPrompt,
-		ProviderAPIKey:   viper.GetString("provider-api-key"),
-		ProviderURL:      viper.GetString("provider-url"),
-		MaxTokens:        viper.GetInt("max-tokens"),
-		Temperature:      &temperature,
-		TopP:             &topP,
-		TopK:             &topK,
-		FrequencyPenalty: &frequencyPenalty,
-		PresencePenalty:  &presencePenalty,
-		StopSequences:    viper.GetStringSlice("stop-sequences"),
-		NumGPU:           &numGPU,
-		MainGPU:          &mainGPU,
-		TLSSkipVerify:    viper.GetBool("tls-skip-verify"),
-		ThinkingLevel:    models.ParseThinkingLevel(viper.GetString("thinking-level")),
+		ModelString:    viper.GetString("model"),
+		SystemPrompt:   systemPrompt,
+		ProviderAPIKey: viper.GetString("provider-api-key"),
+		ProviderURL:    viper.GetString("provider-url"),
+		MaxTokens:      viper.GetInt("max-tokens"),
+		Temperature:    &temperature,
+		TopP:           &topP,
+		TopK:           &topK,
+		StopSequences:  viper.GetStringSlice("stop-sequences"),
+		NumGPU:         &numGPU,
+		MainGPU:        &mainGPU,
+		TLSSkipVerify:  viper.GetBool("tls-skip-verify"),
+		ThinkingLevel:  models.ParseThinkingLevel(viper.GetString("thinking-level")),
 	}
 
 	return cfg, systemPrompt, nil
@@ -120,36 +88,15 @@ func BuildProviderConfig() (*models.ProviderConfig, string, error) {
 // SetupAgent creates an agent from the current viper state + the provided
 // options. It wraps BuildProviderConfig and agent.CreateAgent.
 func SetupAgent(ctx context.Context, opts AgentSetupOptions) (*AgentSetupResult, error) {
-	var modelConfig *models.ProviderConfig
-	var systemPrompt string
-
-	if opts.ProviderConfig != nil {
-		// Pre-built config supplied by caller (e.g. Kit.New after releasing
-		// viperInitMu). Use it directly — no viper reads needed here.
-		modelConfig = opts.ProviderConfig
-		systemPrompt = modelConfig.SystemPrompt
-	} else {
-		var err error
-		modelConfig, systemPrompt, err = BuildProviderConfig()
-		if err != nil {
-			return nil, err
-		}
+	modelConfig, systemPrompt, err := BuildProviderConfig()
+	if err != nil {
+		return nil, err
 	}
 
-	// Resolve debug / no-extensions / max-steps / streaming: prefer explicit
-	// fields (set when ProviderConfig was pre-built) over viper fallback.
-	debugEnabled := opts.Debug || viper.GetBool("debug")
-	noExtensions := opts.NoExtensions || viper.GetBool("no-extensions")
-	maxSteps := opts.MaxSteps
-	if maxSteps == 0 {
-		maxSteps = viper.GetInt("max-steps")
-	}
-	streamingEnabled := opts.StreamingEnabled || viper.GetBool("stream")
-
 	// Create the appropriate debug logger.
 	var debugLogger tools.DebugLogger
 	var bufferedLogger *tools.BufferedDebugLogger
-	if debugEnabled {
+	if viper.GetBool("debug") {
 		if opts.UseBufferedLogger {
 			bufferedLogger = tools.NewBufferedDebugLogger(true)
 			debugLogger = bufferedLogger
@@ -161,7 +108,7 @@ func SetupAgent(ctx context.Context, opts AgentSetupOptions) (*AgentSetupResult,
 	// Load extensions unless --no-extensions is set.
 	var extRunner *extensions.Runner
 	var extCreationOpts extensionCreationOpts
-	if !noExtensions {
+	if !viper.GetBool("no-extensions") {
 		var extErr error
 		extRunner, extCreationOpts, extErr = loadExtensions()
 		if extErr != nil {
@@ -190,21 +137,18 @@ func SetupAgent(ctx context.Context, opts AgentSetupOptions) (*AgentSetupResult,
 	}
 
 	a, err := agent.CreateAgent(ctx, &agent.AgentCreationOptions{
-		ModelConfig:       modelConfig,
-		MCPConfig:         opts.MCPConfig,
-		SystemPrompt:      systemPrompt,
-		MaxSteps:          maxSteps,
-		StreamingEnabled:  streamingEnabled,
-		ShowSpinner:       opts.ShowSpinner,
-		Quiet:             opts.Quiet,
-		SpinnerFunc:       opts.SpinnerFunc,
-		DebugLogger:       debugLogger,
-		AuthHandler:       opts.AuthHandler,
-		CoreTools:         opts.CoreTools,
-		DisableCoreTools:  opts.DisableCoreTools,
-		ToolWrapper:       toolWrapper,
-		ExtraTools:        extraTools,
-		OnMCPServerLoaded: opts.OnMCPServerLoaded,
+		ModelConfig:      modelConfig,
+		MCPConfig:        opts.MCPConfig,
+		SystemPrompt:     systemPrompt,
+		MaxSteps:         viper.GetInt("max-steps"),
+		StreamingEnabled: viper.GetBool("stream"),
+		ShowSpinner:      opts.ShowSpinner,
+		Quiet:            opts.Quiet,
+		SpinnerFunc:      opts.SpinnerFunc,
+		DebugLogger:      debugLogger,
+		CoreTools:        opts.CoreTools,
+		ToolWrapper:      toolWrapper,
+		ExtraTools:       extraTools,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to create agent: %w", err)

internal/message/content.go

@@ -4,18 +4,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"regexp"
 	"strings"
 	"time"
 
 	"charm.land/fantasy"
 )
 
-// thinkTagRegex matches  ...  tags that some models (Qwen, DeepSeek) wrap
-// reasoning content in. Used to strip these tags from text content.
-// The (?s) flag makes . match newlines.
-var thinkTagRegex = regexp.MustCompile(`(?s)` + `` + `think` + `` + `(.*?)` + `` + `/think` + ``)
-
 // sanitizeToolCallID ensures the ID matches Anthropic's required pattern:
 // ^[a-zA-Z0-9_-]+$ (alphanumeric, underscores, and hyphens only).
 // Invalid characters are replaced with underscores.
@@ -121,9 +115,9 @@ const (
 )
 
 // Message is a single conversation message containing a heterogeneous slice
-// of ContentPart blocks. This design enables a single assistant message to
-// carry text, reasoning, and multiple tool calls as discrete, typed blocks
-// rather than flattening everything into strings.
+// of ContentPart blocks. This design (borrowed from crush) enables a single
+// assistant message to carry text, reasoning, and multiple tool calls as
+// discrete, typed blocks rather than flattening everything into strings.
 type Message struct {
 	ID        string        `json:"id"`
 	Role      MessageRole   `json:"role"`
@@ -318,18 +312,12 @@ func UnmarshalParts(data []byte) ([]ContentPart, error) {
 	return parts, nil
 }
 
-// --- LLM bridge ---
+// --- Fantasy bridge ---
 
-// ToLLMMessages converts a Message to one or more LLM message values.
-// An assistant message with tool calls produces a single message with
+// ToFantasyMessages converts a Message to one or more fantasy.Message values.
+// An assistant message with tool calls produces a single fantasy message with
 // mixed TextPart and ToolCallPart content. Tool-role messages produce
 // ToolResultPart entries.
-func (m *Message) ToLLMMessages() []fantasy.Message {
-	return m.ToFantasyMessages()
-}
-
-// Deprecated: Use ToLLMMessages instead.
-// ToFantasyMessages converts a Message to one or more LLM message values.
 func (m *Message) ToFantasyMessages() []fantasy.Message {
 	switch m.Role {
 	case RoleAssistant:
@@ -428,14 +416,7 @@ func (m *Message) ToFantasyMessages() []fantasy.Message {
 	}
 }
 
-// FromLLMMessage converts an LLM message into our Message type,
-// extracting all content parts into the appropriate block types.
-func FromLLMMessage(msg fantasy.Message) Message {
-	return FromFantasyMessage(msg)
-}
-
-// Deprecated: Use FromLLMMessage instead.
-// FromFantasyMessage converts an LLM message into our Message type,
+// FromFantasyMessage converts a fantasy.Message into our Message type,
 // extracting all content parts into the appropriate block types.
 func FromFantasyMessage(msg fantasy.Message) Message {
 	m := Message{
@@ -449,11 +430,7 @@ func FromFantasyMessage(msg fantasy.Message) Message {
 		switch p := part.(type) {
 		case fantasy.TextPart:
 			if p.Text != "" {
-				// Strip  ...  tags that some models wrap reasoning in
-				cleanedText := thinkTagRegex.ReplaceAllString(p.Text, "")
-				if cleanedText != "" {
-					m.Parts = append(m.Parts, TextContent{Text: cleanedText})
-				}
+				m.Parts = append(m.Parts, TextContent{Text: p.Text})
 			}
 		case fantasy.ToolCallPart:
 			m.Parts = append(m.Parts, ToolCall{

internal/models/cache_options.go

@@ -1,87 +0,0 @@
-package models
-
-import (
-	"crypto/sha256"
-	"encoding/hex"
-	"maps"
-	"os"
-
-	"charm.land/fantasy"
-	"charm.land/fantasy/providers/openai"
-)
-
-// buildCacheProviderOptions returns caching options for supported models.
-// Caching is enabled by default for all supported models to reduce costs.
-// Set KIT_DISABLE_CACHE=1 or ProviderConfig.DisableCaching=true to opt out.
-func buildCacheProviderOptions(modelInfo *ModelInfo, config *ProviderConfig) fantasy.ProviderOptions {
-	// Check explicit opt-out via config
-	if config.DisableCaching {
-		return nil
-	}
-
-	// Check global opt-out via environment
-	if os.Getenv("KIT_DISABLE_CACHE") != "" {
-		return nil
-	}
-
-	// Check if model supports caching
-	if modelInfo == nil || !modelInfo.SupportsCaching() {
-		return nil
-	}
-
-	switch modelInfo.CacheType() {
-	case "anthropic-ephemeral":
-		// Provider-level Anthropic caching disabled - use message-level caching instead.
-		return nil
-	case "openai-prompt-cache":
-		return buildOpenAICacheOptions(config, modelInfo.ID)
-	case "google-cached-content":
-		// Google caching not yet implemented.
-		return nil
-	default:
-		return nil
-	}
-}
-
-// buildOpenAICacheOptions enables prompt caching for OpenAI models.
-// Uses a deterministic cache key based on system prompt and model ID.
-func buildOpenAICacheOptions(config *ProviderConfig, modelID string) fantasy.ProviderOptions {
-	cacheKey := generateCacheKey(config.SystemPrompt, modelID)
-
-	return fantasy.ProviderOptions{
-		openai.Name: &openai.ProviderOptions{
-			PromptCacheKey: &cacheKey,
-		},
-	}
-}
-
-// generateCacheKey creates a deterministic cache key from system prompt and model.
-// This ensures the same system prompt + model combination gets cache hits.
-func generateCacheKey(systemPrompt, modelID string) string {
-	if systemPrompt == "" {
-		systemPrompt = "default"
-	}
-
-	h := sha256.New()
-	h.Write([]byte(systemPrompt))
-	h.Write([]byte(modelID))
-
-	// Prefix with "kit-" to identify KIT-generated cache keys
-	return "kit-" + hex.EncodeToString(h.Sum(nil))[:24]
-}
-
-// mergeProviderOptions merges multiple ProviderOptions maps.
-// Later maps take precedence over earlier ones.
-func mergeProviderOptions(opts ...fantasy.ProviderOptions) fantasy.ProviderOptions {
-	result := make(fantasy.ProviderOptions)
-
-	for _, opt := range opts {
-		maps.Copy(result, opt)
-	}
-
-	if len(result) == 0 {
-		return nil
-	}
-
-	return result
-}

internal/models/cache_options_test.go

@@ -1,248 +0,0 @@
-package models
-
-import (
-	"os"
-	"testing"
-
-	"charm.land/fantasy"
-)
-
-func TestModelInfo_SupportsCaching(t *testing.T) {
-	tests := []struct {
-		name     string
-		family   string
-		expected bool
-	}{
-		{"Claude model", "claude-3-5-sonnet", true},
-		{"Claude 4 model", "claude-4-opus", true},
-		{"GPT model", "gpt-4", true},
-		{"GPT-5 model", "gpt-5", true},
-		{"O1 model", "o1", true},
-		{"O3 model", "o3", true},
-		{"O4 model", "o4-mini", true},
-		{"Codex model", "codex", true},
-		{"Gemini model", "gemini-2.5-pro", true},
-		{"Gemini 1.5 model", "gemini-1.5-flash", true},
-		{"Llama model", "llama-3", false},
-		{"Unknown model", "unknown", false},
-		{"Empty family", "", false},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			m := &ModelInfo{Family: tt.family}
-			if got := m.SupportsCaching(); got != tt.expected {
-				t.Errorf("ModelInfo.SupportsCaching() = %v, want %v", got, tt.expected)
-			}
-		})
-	}
-}
-
-func TestModelInfo_CacheType(t *testing.T) {
-	tests := []struct {
-		name     string
-		family   string
-		expected string
-	}{
-		{"Claude model", "claude-3-5-sonnet", "anthropic-ephemeral"},
-		{"GPT model", "gpt-4", "openai-prompt-cache"},
-		{"O1 model", "o1", "openai-prompt-cache"},
-		{"Gemini model", "gemini-2.5-pro", "google-cached-content"},
-		{"Unknown model", "llama-3", ""},
-		{"Empty family", "", ""},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			m := &ModelInfo{Family: tt.family}
-			if got := m.CacheType(); got != tt.expected {
-				t.Errorf("ModelInfo.CacheType() = %v, want %v", got, tt.expected)
-			}
-		})
-	}
-}
-
-func TestGenerateCacheKey(t *testing.T) {
-	key1 := generateCacheKey("system prompt", "model-id")
-	key2 := generateCacheKey("system prompt", "model-id")
-	if key1 != key2 {
-		t.Errorf("generateCacheKey should be deterministic: got %q and %q", key1, key2)
-	}
-
-	key3 := generateCacheKey("different prompt", "model-id")
-	if key1 == key3 {
-		t.Errorf("generateCacheKey should produce different keys for different inputs")
-	}
-
-	key4 := generateCacheKey("", "model-id")
-	key5 := generateCacheKey("default", "model-id")
-	if key4 != key5 {
-		t.Errorf("generateCacheKey should treat empty prompt as 'default'")
-	}
-
-	if len(key1) < 4 || key1[:4] != "kit-" {
-		t.Errorf("generateCacheKey should produce keys with 'kit-' prefix, got %q", key1)
-	}
-}
-
-func TestBuildCacheProviderOptions_Disabled(t *testing.T) {
-	config := &ProviderConfig{DisableCaching: true}
-	modelInfo := &ModelInfo{Family: "claude-3", ID: "claude-3-opus"}
-
-	if opts := buildCacheProviderOptions(modelInfo, config); opts != nil {
-		t.Errorf("buildCacheProviderOptions should return nil when DisableCaching=true")
-	}
-}
-
-func TestBuildCacheProviderOptions_EnvironmentVariable(t *testing.T) {
-	_ = os.Setenv("KIT_DISABLE_CACHE", "1")
-	defer func() { _ = os.Unsetenv("KIT_DISABLE_CACHE") }()
-
-	config := &ProviderConfig{DisableCaching: false}
-	modelInfo := &ModelInfo{Family: "claude-3", ID: "claude-3-opus"}
-
-	if opts := buildCacheProviderOptions(modelInfo, config); opts != nil {
-		t.Errorf("buildCacheProviderOptions should return nil when KIT_DISABLE_CACHE is set")
-	}
-}
-
-func TestBuildCacheProviderOptions_UnsupportedModel(t *testing.T) {
-	config := &ProviderConfig{DisableCaching: false}
-	modelInfo := &ModelInfo{Family: "llama-3", ID: "llama-3-70b"}
-
-	if opts := buildCacheProviderOptions(modelInfo, config); opts != nil {
-		t.Errorf("buildCacheProviderOptions should return nil for unsupported model families")
-	}
-}
-
-func TestBuildCacheProviderOptions_NilModelInfo(t *testing.T) {
-	config := &ProviderConfig{DisableCaching: false}
-
-	if opts := buildCacheProviderOptions(nil, config); opts != nil {
-		t.Errorf("buildCacheProviderOptions should return nil when modelInfo is nil")
-	}
-}
-
-func TestBuildCacheProviderOptions_Anthropic(t *testing.T) {
-	_ = os.Unsetenv("KIT_DISABLE_CACHE")
-
-	config := &ProviderConfig{DisableCaching: false}
-	modelInfo := &ModelInfo{Family: "claude-3", ID: "claude-3-opus"}
-
-	opts := buildCacheProviderOptions(modelInfo, config)
-	// Provider-level Anthropic caching is disabled; message-level caching is used instead
-	if opts != nil {
-		t.Logf("Provider-level Anthropic caching disabled; using message-level caching")
-	}
-}
-
-func TestBuildCacheProviderOptions_OpenAI(t *testing.T) {
-	_ = os.Unsetenv("KIT_DISABLE_CACHE")
-
-	config := &ProviderConfig{
-		DisableCaching: false,
-		SystemPrompt:   "test system prompt",
-	}
-	modelInfo := &ModelInfo{Family: "gpt-4", ID: "gpt-4o"}
-
-	opts := buildCacheProviderOptions(modelInfo, config)
-	if opts == nil {
-		t.Fatalf("buildCacheProviderOptions should return options for OpenAI models")
-	}
-
-	if _, ok := opts["openai"]; !ok {
-		t.Errorf("buildCacheProviderOptions should include 'openai' key for GPT models")
-	}
-}
-
-func TestCachingPriorityOverThinking(t *testing.T) {
-	_ = os.Unsetenv("KIT_DISABLE_CACHE")
-
-	// Anthropic uses message-level caching; provider-level returns nil
-	config1 := &ProviderConfig{
-		DisableCaching: false,
-		ThinkingLevel:  ThinkingOff,
-	}
-	modelInfo1 := &ModelInfo{Family: "claude-3", ID: "claude-3-opus"}
-	opts1 := buildCacheProviderOptions(modelInfo1, config1)
-	if opts1 != nil {
-		t.Logf("Provider-level Anthropic caching disabled; using message-level caching")
-	}
-
-	// OpenAI provider-level caching works with thinking enabled
-	config2 := &ProviderConfig{
-		DisableCaching: false,
-		SystemPrompt:   "test prompt",
-		ThinkingLevel:  ThinkingMedium,
-	}
-	modelInfo2 := &ModelInfo{Family: "gpt-4", ID: "gpt-4o"}
-	opts2 := buildCacheProviderOptions(modelInfo2, config2)
-	if opts2 == nil {
-		t.Errorf("OpenAI caching should work with thinking enabled")
-	}
-
-	// OpenAI caching also works with thinking disabled
-	config3 := &ProviderConfig{
-		DisableCaching: false,
-		SystemPrompt:   "test prompt",
-		ThinkingLevel:  ThinkingOff,
-	}
-	opts3 := buildCacheProviderOptions(modelInfo2, config3)
-	if opts3 == nil {
-		t.Errorf("OpenAI caching should work when thinking is OFF")
-	}
-}
-
-func TestMergeProviderOptions(t *testing.T) {
-	opts1 := fantasy.ProviderOptions{
-		"provider1": &testProviderData{value: "value1"},
-	}
-	opts2 := fantasy.ProviderOptions{
-		"provider2": &testProviderData{value: "value2"},
-	}
-
-	merged := mergeProviderOptions(opts1, opts2)
-
-	if len(merged) != 2 {
-		t.Errorf("mergeProviderOptions should combine options from multiple maps, got %d items", len(merged))
-	}
-
-	if _, ok := merged["provider1"]; !ok {
-		t.Errorf("merged options should contain 'provider1' key")
-	}
-
-	if _, ok := merged["provider2"]; !ok {
-		t.Errorf("merged options should contain 'provider2' key")
-	}
-
-	// Later options should override earlier ones
-	opts3 := fantasy.ProviderOptions{
-		"provider1": &testProviderData{value: "overridden"},
-	}
-	merged2 := mergeProviderOptions(opts1, opts3)
-
-	if data, ok := merged2["provider1"].(*testProviderData); ok {
-		if data.value != "overridden" {
-			t.Errorf("later options should override earlier ones, got %q", data.value)
-		}
-	}
-
-	if mergeProviderOptions() != nil {
-		t.Errorf("mergeProviderOptions with no args should return nil")
-	}
-}
-
-// testProviderData is a simple implementation of ProviderOptionsData for testing
-type testProviderData struct {
-	value string
-}
-
-func (t *testProviderData) Options() {}
-
-func (t *testProviderData) MarshalJSON() ([]byte, error) {
-	return []byte(`"` + t.value + `"`), nil
-}
-
-func (t *testProviderData) UnmarshalJSON(data []byte) error {
-	return nil
-}

internal/models/custom.go

@@ -37,8 +37,6 @@ func modelConfigToModelInfo(modelID string, cfg CustomModelConfig) ModelInfo {
 		Attachment:  cfg.Attachment,
 		Reasoning:   cfg.Reasoning,
 		Temperature: cfg.Temperature,
-		BaseURL:     cfg.BaseURL,
-		APIKey:      cfg.APIKey,
 		Cost: Cost{
 			Input:  cfg.Cost.Input,
 			Output: cfg.Cost.Output,
@@ -54,8 +52,6 @@ func modelConfigToModelInfo(modelID string, cfg CustomModelConfig) ModelInfo {
 // This is a duplicate here to avoid circular dependencies with internal/config.
 type CustomModelConfig struct {
 	Name        string      `json:"name" yaml:"name"`
-	BaseURL     string      `json:"baseUrl,omitempty" yaml:"baseUrl,omitempty"`
-	APIKey      string      `json:"apiKey,omitempty" yaml:"apiKey,omitempty"`
 	Family      string      `json:"family,omitempty" yaml:"family,omitempty"`
 	Attachment  bool        `json:"attachment,omitempty" yaml:"attachment,omitempty"`
 	Reasoning   bool        `json:"reasoning,omitempty" yaml:"reasoning,omitempty"`

internal/models/modelsdb.go

@@ -48,10 +48,10 @@ type modelsDBLimit struct {
 	Output  int `json:"output"`
 }
 
-// npmToLLMProvider maps npm package names from models.dev to LLM
+// npmToFantasyProvider maps npm package names from models.dev to fantasy
 // provider identifiers. Providers not in this map but with an api URL
 // can be auto-routed through openaicompat.
-var npmToLLMProvider = map[string]string{
+var npmToFantasyProvider = map[string]string{
 	"@ai-sdk/anthropic":               "anthropic",
 	"@ai-sdk/openai":                  "openai",
 	"@ai-sdk/google":                  "google",

internal/models/providers.go

@@ -22,7 +22,6 @@ import (
 	"charm.land/fantasy/providers/openaicompat"
 	"charm.land/fantasy/providers/openrouter"
 	"charm.land/fantasy/providers/vercel"
-	openaisdk "github.com/charmbracelet/openai-go"
 
 	"github.com/mark3labs/kit/internal/auth"
 	"github.com/mark3labs/kit/internal/ui/progress"
@@ -143,22 +142,19 @@ func ParseThinkingLevel(s string) ThinkingLevel {
 
 // ProviderConfig holds configuration for creating LLM providers.
 type ProviderConfig struct {
-	ModelString      string
-	SystemPrompt     string
-	ProviderAPIKey   string
-	ProviderURL      string
-	MaxTokens        int
-	Temperature      *float32
-	TopP             *float32
-	TopK             *int32
-	FrequencyPenalty *float32
-	PresencePenalty  *float32
-	StopSequences    []string
-	NumGPU           *int32
-	MainGPU          *int32
-	TLSSkipVerify    bool
-	ThinkingLevel    ThinkingLevel
-	DisableCaching   bool // Opt-out: set to true to disable automatic prompt caching
+	ModelString    string
+	SystemPrompt   string
+	ProviderAPIKey string
+	ProviderURL    string
+	MaxTokens      int
+	Temperature    *float32
+	TopP           *float32
+	TopK           *int32
+	StopSequences  []string
+	NumGPU         *int32
+	MainGPU        *int32
+	TLSSkipVerify  bool
+	ThinkingLevel  ThinkingLevel
 }
 
 // ProviderResult contains the result of provider creation.
@@ -241,59 +237,30 @@ func CreateProvider(ctx context.Context, config *ProviderConfig) (*ProviderResul
 		validateModelConfig(config, modelInfo)
 	}
 
-	// Create the base provider
-	var result *ProviderResult
-	var createErr error
-
 	switch provider {
 	case "anthropic":
-		result, createErr = createAnthropicProvider(ctx, config, modelName)
+		return createAnthropicProvider(ctx, config, modelName)
 	case "openai":
-		result, createErr = createOpenAIProvider(ctx, config, modelName)
+		return createOpenAIProvider(ctx, config, modelName)
 	case "google", "gemini":
-		result, createErr = createGoogleProvider(ctx, config, modelName)
+		return createGoogleProvider(ctx, config, modelName)
 	case "ollama":
-		result, createErr = createOllamaProvider(ctx, config, modelName)
+		return createOllamaProvider(ctx, config, modelName)
 	case "azure":
-		result, createErr = createAzureProvider(ctx, config, modelName)
+		return createAzureProvider(ctx, config, modelName)
 	case "google-vertex-anthropic":
-		result, createErr = createVertexAnthropicProvider(ctx, config, modelName)
+		return createVertexAnthropicProvider(ctx, config, modelName)
 	case "openrouter":
-		result, createErr = createOpenRouterProvider(ctx, config, modelName)
+		return createOpenRouterProvider(ctx, config, modelName)
 	case "bedrock":
-		result, createErr = createBedrockProvider(ctx, config, modelName)
+		return createBedrockProvider(ctx, config, modelName)
 	case "vercel":
-		result, createErr = createVercelProvider(ctx, config, modelName)
+		return createVercelProvider(ctx, config, modelName)
 	case "custom":
-		result, createErr = createCustomProvider(ctx, config, modelName)
+		return createCustomProvider(ctx, config, modelName)
 	default:
-		result, createErr = autoRouteProvider(ctx, config, provider, modelName, registry)
+		return autoRouteProvider(ctx, config, provider, modelName, registry)
 	}
-
-	if createErr != nil {
-		return nil, createErr
-	}
-
-	// AUTOMATICALLY ENABLE CACHING for supported models (unless disabled).
-	// This works for BOTH native and auto-routed providers by detecting
-	// the model family from the model metadata.
-	if cacheOpts := buildCacheProviderOptions(modelInfo, config); cacheOpts != nil {
-		if result.ProviderOptions == nil {
-			result.ProviderOptions = cacheOpts
-		} else {
-			// Merge cache options with existing provider options.
-			// Only add cache options for providers that don't already have
-			// options set, to avoid type conflicts (e.g., Anthropic has
-			// different types for regular options vs cache control options).
-			for k, v := range cacheOpts {
-				if _, exists := result.ProviderOptions[k]; !exists {
-					result.ProviderOptions[k] = v
-				}
-			}
-		}
-	}
-
-	return result, nil
 }
 
 // autoRouteProvider attempts to create a provider by looking up its npm package
@@ -313,14 +280,14 @@ func autoRouteProvider(ctx context.Context, config *ProviderConfig, provider, mo
 		npmPackage = modelInfo.ProviderNPM
 	}
 
-	// Determine the LLM provider for this npm package
-	llmProvider := npmToLLMProvider[npmPackage]
-	if llmProvider == "" && providerInfo.API != "" {
+	// Determine the fantasy provider for this npm package
+	fantasyProvider := npmToFantasyProvider[npmPackage]
+	if fantasyProvider == "" && providerInfo.API != "" {
 		// Unknown npm but has API URL → route through openaicompat
-		llmProvider = "openaicompat"
+		fantasyProvider = "openaicompat"
 	}
 
-	switch llmProvider {
+	switch fantasyProvider {
 	case "openaicompat":
 		return createAutoRoutedOpenAICompatProvider(ctx, config, modelName, providerInfo)
 	case "anthropic":
@@ -334,7 +301,7 @@ func autoRouteProvider(ctx context.Context, config *ProviderConfig, provider, mo
 		}
 		return createAutoRoutedOpenAIProvider(ctx, config, modelName, providerInfo)
 	default:
-		return nil, fmt.Errorf("unsupported provider: %s (npm: %s has no LLM provider mapping)", provider, npmPackage)
+		return nil, fmt.Errorf("unsupported provider: %s (npm: %s has no fantasy mapping)", provider, npmPackage)
 	}
 }
 
@@ -526,13 +493,13 @@ func buildOpenAIProviderOptions(config *ProviderConfig, modelName string) fantas
 func thinkingLevelToReasoningEffort(level ThinkingLevel) *openai.ReasoningEffort {
 	switch level {
 	case ThinkingMinimal:
-		return new(openai.ReasoningEffortMinimal)
+		return openai.ReasoningEffortOption(openai.ReasoningEffortMinimal)
 	case ThinkingLow:
-		return new(openai.ReasoningEffortLow)
+		return openai.ReasoningEffortOption(openai.ReasoningEffortLow)
 	case ThinkingMedium:
-		return new(openai.ReasoningEffortMedium)
+		return openai.ReasoningEffortOption(openai.ReasoningEffortMedium)
 	case ThinkingHigh:
-		return new(openai.ReasoningEffortHigh)
+		return openai.ReasoningEffortOption(openai.ReasoningEffortHigh)
 	default:
 		return nil
 	}
@@ -543,15 +510,10 @@ func thinkingLevelToReasoningEffort(level ThinkingLevel) *openai.ReasoningEffort
 // SendReasoning to true and configures the thinking budget. For thinking-off
 // or non-reasoning models the returned map is nil.
 //
-// NOTE: With message-level caching, thinking and caching can work together.
-// Message-level cache control (ProviderCacheControlOptions) doesn't conflict
-// with provider-level thinking options (ProviderOptions).
-//
 // Anthropic requires max_tokens > thinking.budget_tokens. If the configured
 // MaxTokens is too low, it is bumped to budget + 4096 to leave room for the
 // actual response.
 func buildAnthropicProviderOptions(config *ProviderConfig, modelName string) fantasy.ProviderOptions {
-	// Thinking is OFF by default. If user hasn't explicitly enabled it, return nil.
 	if config.ThinkingLevel == "" || config.ThinkingLevel == ThinkingOff {
 		return nil
 	}
@@ -1001,29 +963,12 @@ func createVercelProvider(ctx context.Context, config *ProviderConfig, modelName
 	return &ProviderResult{Model: model}, nil
 }
 
-// customToPromptFunc converts prompts to OpenAI format using the default conversion.
-func customToPromptFunc(prompt fantasy.Prompt, systemPrompt, user string) ([]openaisdk.ChatCompletionMessageParamUnion, []fantasy.CallWarning) {
-	return openai.DefaultToPrompt(prompt, systemPrompt, user)
-}
-
 func createCustomProvider(ctx context.Context, config *ProviderConfig, modelName string) (*ProviderResult, error) {
-	// Resolve base URL: per-model override > global provider-url flag/config
-	registry := GetGlobalRegistry()
-	modelInfo := registry.LookupModel("custom", modelName)
-
-	baseURL := config.ProviderURL
-	if modelInfo != nil && modelInfo.BaseURL != "" {
-		baseURL = modelInfo.BaseURL
-	}
-
-	if baseURL == "" {
-		return nil, fmt.Errorf("custom provider requires --provider-url or a baseUrl in the model config")
+	if config.ProviderURL == "" {
+		return nil, fmt.Errorf("custom provider requires --provider-url")
 	}
 
 	apiKey := config.ProviderAPIKey
-	if modelInfo != nil && modelInfo.APIKey != "" {
-		apiKey = modelInfo.APIKey
-	}
 	if apiKey == "" {
 		apiKey = os.Getenv("CUSTOM_API_KEY")
 	}
@@ -1032,21 +977,16 @@ func createCustomProvider(ctx context.Context, config *ProviderConfig, modelName
 		apiKey = "custom"
 	}
 
-	// <think> tag extraction is handled transparently at the agent layer,
-	// so no provider-level hooks are needed here.
-	var opts []openai.Option
-	opts = append(opts, openai.WithBaseURL(baseURL))
-	opts = append(opts, openai.WithAPIKey(apiKey))
-	opts = append(opts, openai.WithName("custom"))
-	opts = append(opts, openai.WithLanguageModelOptions(
-		openai.WithLanguageModelToPromptFunc(customToPromptFunc),
-	))
+	var opts []openaicompat.Option
+	opts = append(opts, openaicompat.WithBaseURL(config.ProviderURL))
+	opts = append(opts, openaicompat.WithAPIKey(apiKey))
+	opts = append(opts, openaicompat.WithName("custom"))
 
 	if config.TLSSkipVerify {
-		opts = append(opts, openai.WithHTTPClient(createHTTPClientWithTLSConfig(true)))
+		opts = append(opts, openaicompat.WithHTTPClient(createHTTPClientWithTLSConfig(true)))
 	}
 
-	p, err := openai.New(opts...)
+	p, err := openaicompat.New(opts...)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create custom provider: %w", err)
 	}
@@ -1166,12 +1106,6 @@ func buildOllamaOptions(config *ProviderConfig) map[string]any {
 	if config.TopK != nil {
 		options["top_k"] = int(*config.TopK)
 	}
-	if config.FrequencyPenalty != nil {
-		options["frequency_penalty"] = *config.FrequencyPenalty
-	}
-	if config.PresencePenalty != nil {
-		options["presence_penalty"] = *config.PresencePenalty
-	}
 	if len(config.StopSequences) > 0 {
 		options["stop"] = config.StopSequences
 	}

internal/models/registry.go

@@ -17,53 +17,12 @@ var embeddedModelsJSON []byte
 type ModelInfo struct {
 	ID          string
 	Name        string
-	Family      string // Model family (e.g., "claude", "gpt", "gemini")
 	Attachment  bool
 	Reasoning   bool
 	Temperature bool
 	Cost        Cost
 	Limit       Limit
 	ProviderNPM string // Model-specific provider npm override (e.g. "@ai-sdk/anthropic")
-	BaseURL     string // Per-model base URL override (custom models only)
-	APIKey      string // Per-model API key override (custom models only)
-}
-
-// SupportsCaching returns true if this model family supports prompt caching.
-// This enables automatic cost savings for supported models regardless of provider.
-func (m *ModelInfo) SupportsCaching() bool {
-	switch {
-	case strings.HasPrefix(m.Family, "claude"):
-		return true
-	case strings.HasPrefix(m.Family, "gpt"),
-		strings.HasPrefix(m.Family, "o1"),
-		strings.HasPrefix(m.Family, "o3"),
-		strings.HasPrefix(m.Family, "o4"),
-		strings.HasPrefix(m.Family, "codex"):
-		return true
-	case strings.HasPrefix(m.Family, "gemini"):
-		return true
-	default:
-		return false
-	}
-}
-
-// CacheType returns the appropriate cache mechanism for this model family.
-// Returns empty string if caching is not supported.
-func (m *ModelInfo) CacheType() string {
-	switch {
-	case strings.HasPrefix(m.Family, "claude"):
-		return "anthropic-ephemeral"
-	case strings.HasPrefix(m.Family, "gpt"),
-		strings.HasPrefix(m.Family, "o1"),
-		strings.HasPrefix(m.Family, "o3"),
-		strings.HasPrefix(m.Family, "o4"),
-		strings.HasPrefix(m.Family, "codex"):
-		return "openai-prompt-cache"
-	case strings.HasPrefix(m.Family, "gemini"):
-		return "google-cached-content"
-	default:
-		return ""
-	}
 }
 
 // Cost represents the pricing information for a model.
@@ -127,7 +86,6 @@ func buildFromModelsDB() map[string]ProviderInfo {
 			modelsMap[modelID] = ModelInfo{
 				ID:          dm.ID,
 				Name:        dm.Name,
-				Family:      dm.Family,
 				Attachment:  dm.Attachment,
 				Reasoning:   dm.Reasoning,
 				Temperature: dm.Temperature,
@@ -350,32 +308,27 @@ func (r *ModelsRegistry) GetSupportedProviders() []string {
 	return providers
 }
 
-// GetLLMProviders returns provider IDs that have LLM support,
+// GetFantasyProviders returns provider IDs that can be used with fantasy,
 // either through a native provider or via openaicompat auto-routing.
-func (r *ModelsRegistry) GetLLMProviders() []string {
+func (r *ModelsRegistry) GetFantasyProviders() []string {
 	var providers []string
 	for providerID, info := range r.providers {
-		if isProviderLLMSupported(providerID, &info) {
+		if isProviderFantasySupported(providerID, &info) {
 			providers = append(providers, providerID)
 		}
 	}
 	return providers
 }
 
-// Deprecated: Use GetLLMProviders instead.
-func (r *ModelsRegistry) GetFantasyProviders() []string {
-	return r.GetLLMProviders()
-}
-
-// isProviderLLMSupported checks if a provider can be used with the LLM layer.
-func isProviderLLMSupported(providerID string, info *ProviderInfo) bool {
-	// Ollama and custom are always supported (model names are user-defined).
-	if providerID == "ollama" || providerID == "custom" {
+// isProviderFantasySupported checks if a provider can be used with fantasy.
+func isProviderFantasySupported(providerID string, info *ProviderInfo) bool {
+	// Ollama is always supported (via openaicompat pointed at localhost)
+	if providerID == "ollama" {
 		return true
 	}
 
-	// Check if npm maps to an LLM provider
-	if _, ok := npmToLLMProvider[info.NPM]; ok {
+	// Check if npm maps to a fantasy provider
+	if _, ok := npmToFantasyProvider[info.NPM]; ok {
 		return true
 	}
 
@@ -402,52 +355,6 @@ func (r *ModelsRegistry) GetProviderInfo(provider string) *ProviderInfo {
 	return &info
 }
 
-// ValidateModelString checks whether a model string is well-formed and refers
-// to a known provider. It returns a user-friendly error with suggestions when
-// the model or provider is unrecognised. Passing validation does not guarantee
-// that API authentication will succeed — it only catches obvious mistakes
-// (typos, missing provider prefix, non-existent provider names) early so that
-// callers such as subagent spawning can return fast feedback.
-//
-// Unknown models under a known provider are allowed (the provider API is the
-// authority), but a completely unknown provider is rejected.
-func (r *ModelsRegistry) ValidateModelString(modelString string) error {
-	provider, modelName, err := ParseModelString(modelString)
-	if err != nil {
-		return err
-	}
-
-	// Ollama and custom are always valid — model names are user-defined.
-	if provider == "ollama" || provider == "custom" {
-		return nil
-	}
-
-	// Check if the provider exists in the registry.
-	providerInfo := r.GetProviderInfo(provider)
-	if providerInfo == nil {
-		known := r.GetSupportedProviders()
-		return fmt.Errorf(
-			"unknown provider %q in model string %q. Known providers: %s",
-			provider, modelString, strings.Join(known, ", "),
-		)
-	}
-
-	// Provider exists — check if the model is known. An unknown model is
-	// only a warning (the provider API decides), but we surface suggestions
-	// so the caller can self-correct.
-	if r.LookupModel(provider, modelName) == nil {
-		if suggestions := r.SuggestModels(provider, modelName); len(suggestions) > 0 {
-			return fmt.Errorf(
-				"model %q not found for provider %s. Did you mean one of: %s",
-				modelName, provider, strings.Join(suggestions, ", "),
-			)
-		}
-		// No suggestions — let it through; the provider API is the authority.
-	}
-
-	return nil
-}
-
 // Global registry instance
 var globalRegistry = NewModelsRegistry()
 

internal/models/registry_test.go

@@ -1,92 +0,0 @@
-package models
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestValidateModelString(t *testing.T) {
-	registry := GetGlobalRegistry()
-
-	tests := []struct {
-		name      string
-		model     string
-		wantErr   bool
-		errSubstr string // expected substring in error message (empty = don't check)
-	}{
-		{
-			name:    "valid anthropic model",
-			model:   "anthropic/claude-sonnet-4-6",
-			wantErr: false,
-		},
-		{
-			name:      "missing provider prefix",
-			model:     "claude-sonnet-4-6",
-			wantErr:   true,
-			errSubstr: "invalid model format",
-		},
-		{
-			name:      "empty string",
-			model:     "",
-			wantErr:   true,
-			errSubstr: "invalid model format",
-		},
-		{
-			name:      "unknown provider",
-			model:     "fakeprovider/some-model",
-			wantErr:   true,
-			errSubstr: "unknown provider",
-		},
-		{
-			name:    "ollama always valid",
-			model:   "ollama/llama3",
-			wantErr: false,
-		},
-		{
-			name:    "custom always valid",
-			model:   "custom/my-fine-tune",
-			wantErr: false,
-		},
-		{
-			name:      "empty provider",
-			model:     "/claude-sonnet-4-6",
-			wantErr:   true,
-			errSubstr: "invalid model format",
-		},
-		{
-			name:      "empty model name",
-			model:     "anthropic/",
-			wantErr:   true,
-			errSubstr: "invalid model format",
-		},
-		{
-			name:    "unknown model under known provider (no suggestions)",
-			model:   "anthropic/totally-unknown-xyz-999",
-			wantErr: false, // no suggestions → passes through
-		},
-		{
-			name:      "typo model under known provider with suggestions",
-			model:     "anthropic/claude-sonet", // misspelled "sonnet"
-			wantErr:   true,
-			errSubstr: "Did you mean",
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := registry.ValidateModelString(tt.model)
-			if tt.wantErr && err == nil {
-				t.Errorf("ValidateModelString(%q) = nil, want error", tt.model)
-			}
-			if !tt.wantErr && err != nil {
-				t.Errorf("ValidateModelString(%q) = %v, want nil", tt.model, err)
-			}
-			if tt.errSubstr != "" && err != nil {
-				if !strings.Contains(err.Error(), tt.errSubstr) {
-					t.Errorf("ValidateModelString(%q) error = %q, want substring %q",
-						tt.model, err.Error(), tt.errSubstr)
-				}
-			}
-		})
-	}
-}

internal/session/entry.go

@@ -24,7 +24,6 @@ const (
 	EntryTypeSessionInfo   EntryType = "session_info"
 	EntryTypeExtensionData EntryType = "extension_data"
 	EntryTypeCompaction    EntryType = "compaction"
-	EntryTypeSystemPrompt  EntryType = "system_prompt"
 )
 
 // CurrentVersion is the session format version for JSONL tree sessions.
@@ -118,19 +117,6 @@ type CompactionEntry struct {
 	ModifiedFiles    []string `json:"modified_files,omitempty"`
 }
 
-// SystemPromptEntry records the system prompt and model used for the session.
-// This is primarily for sharing/debugging to see what instructions were
-// active during the conversation. It does NOT participate in the tree
-// structure (no ParentID) and is not used when building LLM context.
-type SystemPromptEntry struct {
-	Type      EntryType `json:"type"`      // always "system_prompt"
-	ID        string    `json:"id"`        // unique entry ID
-	Timestamp time.Time `json:"timestamp"` // when captured
-	Content   string    `json:"content"`   // the system prompt text
-	Model     string    `json:"model"`     // the model used (e.g., "claude-sonnet-4-5")
-	Provider  string    `json:"provider"`  // the provider used (e.g., "anthropic")
-}
-
 // GenerateEntryID creates a unique entry identifier (16 hex chars).
 func GenerateEntryID() string {
 	bytes := make([]byte, 8)
@@ -231,18 +217,6 @@ func NewCompactionEntry(parentID, summary, firstKeptEntryID string, tokensBefore
 	}
 }
 
-// NewSystemPromptEntry creates a SystemPromptEntry.
-func NewSystemPromptEntry(content, model, provider string) *SystemPromptEntry {
-	return &SystemPromptEntry{
-		Type:      EntryTypeSystemPrompt,
-		ID:        GenerateEntryID(),
-		Timestamp: time.Now(),
-		Content:   content,
-		Model:     model,
-		Provider:  provider,
-	}
-}
-
 // --- JSONL marshaling helpers ---
 
 // MarshalEntry serializes any entry to a JSON line (no trailing newline).
@@ -321,13 +295,6 @@ func UnmarshalEntry(data []byte) (any, error) {
 		}
 		return &e, nil
 
-	case EntryTypeSystemPrompt:
-		var e SystemPromptEntry
-		if err := json.Unmarshal(data, &e); err != nil {
-			return nil, fmt.Errorf("failed to unmarshal system_prompt entry: %w", err)
-		}
-		return &e, nil
-
 	default:
 		return nil, fmt.Errorf("unknown entry type: %q", env.Type)
 	}

internal/session/entry_test.go

@@ -1,113 +0,0 @@
-package session
-
-import (
-	"encoding/json"
-	"testing"
-)
-
-func TestSystemPromptEntry(t *testing.T) {
-	// Test creation
-	content := "You are a helpful coding assistant."
-	model := "claude-sonnet-4-5"
-	provider := "anthropic"
-	entry := NewSystemPromptEntry(content, model, provider)
-
-	if entry.Type != EntryTypeSystemPrompt {
-		t.Errorf("Expected type %q, got %q", EntryTypeSystemPrompt, entry.Type)
-	}
-
-	if entry.Content != content {
-		t.Errorf("Expected content %q, got %q", content, entry.Content)
-	}
-
-	if entry.Model != model {
-		t.Errorf("Expected model %q, got %q", model, entry.Model)
-	}
-
-	if entry.Provider != provider {
-		t.Errorf("Expected provider %q, got %q", provider, entry.Provider)
-	}
-
-	if entry.ID == "" {
-		t.Error("Expected non-empty ID")
-	}
-
-	// Test marshaling
-	data, err := MarshalEntry(entry)
-	if err != nil {
-		t.Fatalf("Failed to marshal: %v", err)
-	}
-
-	// Test unmarshaling
-	unmarshaled, err := UnmarshalEntry(data)
-	if err != nil {
-		t.Fatalf("Failed to unmarshal: %v", err)
-	}
-
-	sysPrompt, ok := unmarshaled.(*SystemPromptEntry)
-	if !ok {
-		t.Fatalf("Expected *SystemPromptEntry, got %T", unmarshaled)
-	}
-
-	if sysPrompt.Type != EntryTypeSystemPrompt {
-		t.Errorf("Unmarshaled: expected type %q, got %q", EntryTypeSystemPrompt, sysPrompt.Type)
-	}
-
-	if sysPrompt.Content != content {
-		t.Errorf("Unmarshaled: expected content %q, got %q", content, sysPrompt.Content)
-	}
-
-	if sysPrompt.Model != model {
-		t.Errorf("Unmarshaled: expected model %q, got %q", model, sysPrompt.Model)
-	}
-
-	if sysPrompt.Provider != provider {
-		t.Errorf("Unmarshaled: expected provider %q, got %q", provider, sysPrompt.Provider)
-	}
-
-	if sysPrompt.ID != entry.ID {
-		t.Errorf("Unmarshaled: expected ID %q, got %q", entry.ID, sysPrompt.ID)
-	}
-}
-
-func TestSystemPromptEntryJSONStructure(t *testing.T) {
-	content := "Test system prompt content"
-	model := "gpt-4o"
-	provider := "openai"
-	entry := NewSystemPromptEntry(content, model, provider)
-
-	data, err := MarshalEntry(entry)
-	if err != nil {
-		t.Fatalf("Failed to marshal: %v", err)
-	}
-
-	// Verify JSON structure
-	var raw map[string]any
-	if err := json.Unmarshal(data, &raw); err != nil {
-		t.Fatalf("Failed to unmarshal to raw map: %v", err)
-	}
-
-	if raw["type"] != "system_prompt" {
-		t.Errorf("Expected type 'system_prompt', got %v", raw["type"])
-	}
-
-	if raw["content"] != content {
-		t.Errorf("Expected content %q, got %v", content, raw["content"])
-	}
-
-	if raw["model"] != model {
-		t.Errorf("Expected model %q, got %v", model, raw["model"])
-	}
-
-	if raw["provider"] != provider {
-		t.Errorf("Expected provider %q, got %v", provider, raw["provider"])
-	}
-
-	if raw["id"] == "" || raw["id"] == nil {
-		t.Error("Expected non-empty id field")
-	}
-
-	if raw["timestamp"] == "" || raw["timestamp"] == nil {
-		t.Error("Expected non-empty timestamp field")
-	}
-}

internal/session/tree_manager.go

@@ -114,187 +114,6 @@ func CreateTreeSession(cwd string) (*TreeManager, error) {
 	return tm, nil
 }
 
-// ForkToNewSession creates a new session file containing the history up to and
-// including the target entry ID. This matches Pi's /fork behavior: it creates
-// a completely new session file with a parent_session reference, copying all
-// entries from the root to the target point.
-func (tm *TreeManager) ForkToNewSession(cwd string, targetID string) (*TreeManager, error) {
-	tm.mu.RLock()
-	defer tm.mu.RUnlock()
-
-	// Get the branch from root to target (root-to-leaf order).
-	branch := tm.getBranchLocked(targetID)
-	if len(branch) == 0 {
-		return nil, fmt.Errorf("target entry %q not found", targetID)
-	}
-
-	// Create a new session file.
-	newTm, err := CreateTreeSession(cwd)
-	if err != nil {
-		return nil, err
-	}
-
-	// Set the parent session reference in the header.
-	newTm.header.ParentSession = tm.filePath
-	newTm.header.ParentSessionID = tm.header.ID
-
-	// Rewrite the header with the parent reference.
-	// We need to close and recreate the file to rewrite the header.
-	if err := newTm.file.Close(); err != nil {
-		return nil, fmt.Errorf("failed to close new session file: %w", err)
-	}
-
-	// Recreate the file and write the updated header.
-	f, err := os.Create(newTm.filePath)
-	if err != nil {
-		return nil, fmt.Errorf("failed to recreate session file: %w", err)
-	}
-	newTm.file = f
-
-	if err := newTm.writeEntry(&newTm.header); err != nil {
-		_ = f.Close()
-		return nil, fmt.Errorf("failed to write session header: %w", err)
-	}
-
-	// Copy entries from the branch to the new session.
-	// We need to remap IDs since the new session is independent.
-	idMap := make(map[string]string) // old ID -> new ID
-	var prevNewID string
-
-	for _, entry := range branch {
-		oldID := tm.EntryID(entry)
-		newID := GenerateEntryID()
-		idMap[oldID] = newID
-
-		// Create a copy of the entry with the new ID and remapped parent.
-		var newEntry any
-		switch e := entry.(type) {
-		case *MessageEntry:
-			newEntry = &MessageEntry{
-				Entry: Entry{
-					Type:      EntryTypeMessage,
-					ID:        newID,
-					ParentID:  prevNewID, // Chain sequentially in new session
-					Timestamp: e.Timestamp,
-				},
-				Role:     e.Role,
-				Parts:    e.Parts,
-				Model:    e.Model,
-				Provider: e.Provider,
-			}
-			// Copy label if present.
-			if label, ok := tm.labels[oldID]; ok {
-				newTm.labels[newID] = label
-			}
-
-		case *ModelChangeEntry:
-			newEntry = &ModelChangeEntry{
-				Entry: Entry{
-					Type:      EntryTypeModelChange,
-					ID:        newID,
-					ParentID:  prevNewID,
-					Timestamp: e.Timestamp,
-				},
-				Provider: e.Provider,
-				ModelID:  e.ModelID,
-			}
-
-		case *LabelEntry:
-			// Remap the target ID if it's in our copied branch.
-			newTargetID := e.TargetID
-			if mapped, ok := idMap[e.TargetID]; ok {
-				newTargetID = mapped
-			}
-			newEntry = &LabelEntry{
-				Entry: Entry{
-					Type:      EntryTypeLabel,
-					ID:        newID,
-					ParentID:  prevNewID,
-					Timestamp: e.Timestamp,
-				},
-				TargetID: newTargetID,
-				Label:    e.Label,
-			}
-
-		case *SessionInfoEntry:
-			newEntry = &SessionInfoEntry{
-				Entry: Entry{
-					Type:      EntryTypeSessionInfo,
-					ID:        newID,
-					ParentID:  prevNewID,
-					Timestamp: e.Timestamp,
-				},
-				Name: e.Name,
-			}
-			newTm.sessionName = e.Name
-
-		case *ExtensionDataEntry:
-			newEntry = &ExtensionDataEntry{
-				Entry: Entry{
-					Type:      EntryTypeExtensionData,
-					ID:        newID,
-					ParentID:  prevNewID,
-					Timestamp: e.Timestamp,
-				},
-				ExtType: e.ExtType,
-				Data:    e.Data,
-			}
-
-		case *BranchSummaryEntry:
-			// Remap the from ID if it's in our copied branch.
-			newFromID := e.FromID
-			if mapped, ok := idMap[e.FromID]; ok {
-				newFromID = mapped
-			}
-			newEntry = &BranchSummaryEntry{
-				Entry: Entry{
-					Type:      EntryTypeBranchSummary,
-					ID:        newID,
-					ParentID:  prevNewID,
-					Timestamp: e.Timestamp,
-				},
-				FromID:  newFromID,
-				Summary: e.Summary,
-			}
-
-		case *CompactionEntry:
-			// Remap the first kept entry ID if it's in our copied branch.
-			newFirstKeptID := e.FirstKeptEntryID
-			if mapped, ok := idMap[e.FirstKeptEntryID]; ok {
-				newFirstKeptID = mapped
-			}
-			newEntry = &CompactionEntry{
-				Entry: Entry{
-					Type:      EntryTypeCompaction,
-					ID:        newID,
-					ParentID:  prevNewID,
-					Timestamp: e.Timestamp,
-				},
-				Summary:          e.Summary,
-				FirstKeptEntryID: newFirstKeptID,
-				TokensBefore:     e.TokensBefore,
-				TokensAfter:      e.TokensAfter,
-				MessagesRemoved:  e.MessagesRemoved,
-				ReadFiles:        e.ReadFiles,
-				ModifiedFiles:    e.ModifiedFiles,
-			}
-		}
-
-		if newEntry != nil {
-			if err := newTm.appendAndPersist(newEntry); err != nil {
-				_ = f.Close()
-				return nil, fmt.Errorf("failed to copy entry: %w", err)
-			}
-			prevNewID = newID
-		}
-	}
-
-	// Set the leaf to the last entry in the new session.
-	newTm.leafID = prevNewID
-
-	return newTm, nil
-}
-
 // OpenTreeSession opens an existing JSONL session file.
 func OpenTreeSession(path string) (*TreeManager, error) {
 	data, err := os.ReadFile(path)
@@ -362,7 +181,7 @@ func OpenTreeSession(path string) (*TreeManager, error) {
 
 	// Set leaf to the last entry.
 	if len(tm.entries) > 0 {
-		tm.leafID = tm.EntryID(tm.entries[len(tm.entries)-1])
+		tm.leafID = tm.entryID(tm.entries[len(tm.entries)-1])
 	}
 
 	// Open file for appending.
@@ -423,14 +242,9 @@ func (tm *TreeManager) AppendMessage(msg message.Message) (string, error) {
 	return entry.ID, nil
 }
 
-// AppendLLMMessage converts an LLM message and appends it.
-func (tm *TreeManager) AppendLLMMessage(msg fantasy.Message) (string, error) {
-	return tm.AppendMessage(message.FromLLMMessage(msg))
-}
-
-// Deprecated: Use AppendLLMMessage instead.
+// AppendFantasyMessage converts a fantasy.Message and appends it.
 func (tm *TreeManager) AppendFantasyMessage(msg fantasy.Message) (string, error) {
-	return tm.AppendLLMMessage(msg)
+	return tm.AppendMessage(message.FromFantasyMessage(msg))
 }
 
 // AppendModelChange records a model/provider change.
@@ -707,7 +521,7 @@ func (tm *TreeManager) BuildContext() (messages []fantasy.Message, provider stri
 	for _, entry := range branch {
 		// Once we reach the first kept entry, stop skipping.
 		if skipping {
-			entryID := tm.EntryID(entry)
+			entryID := tm.entryID(entry)
 			if entryID == lastCompaction.FirstKeptEntryID {
 				skipping = false
 			} else {
@@ -721,7 +535,7 @@ func (tm *TreeManager) BuildContext() (messages []fantasy.Message, provider stri
 			if err != nil {
 				continue // skip malformed entries
 			}
-			msgs := msg.ToLLMMessages()
+			msgs := msg.ToFantasyMessages()
 			messages = append(messages, msgs...)
 
 		case *BranchSummaryEntry:
@@ -870,7 +684,7 @@ func (tm *TreeManager) GetContextEntryIDs() []string {
 	skipping := lastCompaction != nil
 	for _, entry := range branch {
 		if skipping {
-			entryID := tm.EntryID(entry)
+			entryID := tm.entryID(entry)
 			if entryID == lastCompaction.FirstKeptEntryID {
 				skipping = false
 			} else {
@@ -884,7 +698,7 @@ func (tm *TreeManager) GetContextEntryIDs() []string {
 			if err != nil {
 				continue
 			}
-			msgs := msg.ToLLMMessages()
+			msgs := msg.ToFantasyMessages()
 			for range msgs {
 				ids = append(ids, e.ID)
 			}
@@ -923,41 +737,31 @@ func (tm *TreeManager) GetLastCompaction() *CompactionEntry {
 
 // --- Legacy bridge ---
 
-// AddLLMMessages appends multiple LLM messages as entries. This is
+// AddFantasyMessages appends multiple fantasy messages as entries. This is
 // used when syncing from the agent's ConversationMessages after a step.
-func (tm *TreeManager) AddLLMMessages(msgs []fantasy.Message) error {
+func (tm *TreeManager) AddFantasyMessages(msgs []fantasy.Message) error {
 	for _, msg := range msgs {
-		if _, err := tm.AppendLLMMessage(msg); err != nil {
+		if _, err := tm.AppendFantasyMessage(msg); err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
-// Deprecated: Use AddLLMMessages instead.
-func (tm *TreeManager) AddFantasyMessages(msgs []fantasy.Message) error {
-	return tm.AddLLMMessages(msgs)
-}
-
-// GetLLMMessages builds the context and returns just the messages.
+// GetFantasyMessages builds the context and returns just the messages.
 // This satisfies the same conceptual role as the old Manager.GetMessages().
-func (tm *TreeManager) GetLLMMessages() []fantasy.Message {
+func (tm *TreeManager) GetFantasyMessages() []fantasy.Message {
 	msgs, _, _ := tm.BuildContext()
 	return msgs
 }
 
-// Deprecated: Use GetLLMMessages instead.
-func (tm *TreeManager) GetFantasyMessages() []fantasy.Message {
-	return tm.GetLLMMessages()
-}
-
 // --- Internal helpers ---
 
 // addEntryToIndex adds an entry to the in-memory indices.
 func (tm *TreeManager) addEntryToIndex(entry any) {
 	tm.entries = append(tm.entries, entry)
 
-	id := tm.EntryID(entry)
+	id := tm.entryID(entry)
 	parentID := tm.entryParentID(entry)
 
 	if id != "" {
@@ -994,8 +798,8 @@ func (tm *TreeManager) writeEntry(entry any) error {
 	return err
 }
 
-// EntryID extracts the ID from any entry type.
-func (tm *TreeManager) EntryID(entry any) string {
+// entryID extracts the ID from any entry type.
+func (tm *TreeManager) entryID(entry any) string {
 	switch e := entry.(type) {
 	case *MessageEntry:
 		return e.ID

internal/tools/connection_pool.go

@@ -68,7 +68,6 @@ type MCPConnectionPool struct {
 	cancel      context.CancelFunc
 	debug       bool
 	debugLogger DebugLogger
-	oauthFlow   *OAuthFlowRunner
 }
 
 // NewMCPConnectionPool creates a new MCP connection pool with the specified configuration.
@@ -76,7 +75,7 @@ type MCPConnectionPool struct {
 // goroutine for periodic health checks that runs until Close is called.
 // The model parameter is used for MCP servers that require sampling support.
 // Thread-safe for concurrent use immediately after creation.
-func NewMCPConnectionPool(config *ConnectionPoolConfig, model fantasy.LanguageModel, debug bool, authHandler MCPAuthHandler) *MCPConnectionPool {
+func NewMCPConnectionPool(config *ConnectionPoolConfig, model fantasy.LanguageModel, debug bool) *MCPConnectionPool {
 	if config == nil {
 		config = DefaultConnectionPoolConfig()
 	}
@@ -91,10 +90,6 @@ func NewMCPConnectionPool(config *ConnectionPoolConfig, model fantasy.LanguageMo
 		debug:       debug,
 	}
 
-	if authHandler != nil {
-		pool.oauthFlow = NewOAuthFlowRunner(authHandler)
-	}
-
 	go pool.startHealthCheck()
 	return pool
 }
@@ -108,15 +103,6 @@ func (p *MCPConnectionPool) SetDebugLogger(logger DebugLogger) {
 	p.debugLogger = logger
 }
 
-// SetOAuthFlow sets the OAuth flow runner for the connection pool.
-// When set, the pool can trigger OAuth re-authorization when a tool call fails
-// with an OAuth error (e.g. expired token). Thread-safe and can be called at any time.
-func (p *MCPConnectionPool) SetOAuthFlow(flow *OAuthFlowRunner) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	p.oauthFlow = flow
-}
-
 // GetConnection retrieves or creates a connection for the specified MCP server.
 // If a healthy, non-idle connection exists in the pool, it will be reused.
 // Otherwise, a new connection is created and added to the pool.
@@ -141,7 +127,9 @@ func (p *MCPConnectionPool) GetConnection(ctx context.Context, serverName string
 			return conn, nil
 		} else {
 			if p.debugLogger != nil && p.debugLogger.IsDebugEnabled() {
-				p.debugLogger.LogDebug(fmt.Sprintf("[POOL] Connection %s unhealthy, removing", serverName))
+				if p.debugLogger != nil && p.debugLogger.IsDebugEnabled() {
+					p.debugLogger.LogDebug(fmt.Sprintf("[POOL] Connection %s unhealthy, removing", serverName))
+				}
 			}
 			_ = conn.client.Close()
 			delete(p.connections, serverName)
@@ -244,43 +232,18 @@ func (p *MCPConnectionPool) performHealthCheck(ctx context.Context, conn *MCPCon
 
 // createConnection creates a new connection
 func (p *MCPConnectionPool) createConnection(ctx context.Context, serverName string, serverConfig config.MCPServerConfig) (*MCPConnection, error) {
-	mcpClient, err := p.createMCPClient(ctx, serverName, serverConfig)
+	client, err := p.createMCPClient(ctx, serverName, serverConfig)
 	if err != nil {
-		// SSE transport can return OAuth error during Start()
-		if p.oauthFlow != nil && IsOAuthError(err) {
-			if flowErr := p.oauthFlow.RunAuthFlow(ctx, serverName, err); flowErr != nil {
-				return nil, fmt.Errorf("OAuth authorization failed: %w", flowErr)
-			}
-			// Retry after successful auth
-			mcpClient, err = p.createMCPClient(ctx, serverName, serverConfig)
-			if err != nil {
-				return nil, err
-			}
-		} else {
-			return nil, err
-		}
+		return nil, err
 	}
 
-	if err := p.initializeClient(ctx, mcpClient); err != nil {
-		// Streamable HTTP transport returns OAuth error during Initialize()
-		if p.oauthFlow != nil && IsOAuthError(err) {
-			if flowErr := p.oauthFlow.RunAuthFlow(ctx, serverName, err); flowErr != nil {
-				_ = mcpClient.Close()
-				return nil, fmt.Errorf("OAuth authorization failed: %w", flowErr)
-			}
-			// Retry initialization after successful auth
-			if err := p.initializeClient(ctx, mcpClient); err != nil {
-				_ = mcpClient.Close()
-				return nil, err
-			}
-		} else {
-			_ = mcpClient.Close()
-			return nil, err
-		}
+	if err := p.initializeClient(ctx, client); err != nil {
+		_ = client.Close()
+		return nil, err
 	}
 
 	conn := &MCPConnection{
-		client:       mcpClient,
+		client:       client,
 		serverName:   serverName,
 		serverConfig: serverConfig,
 		lastUsed:     time.Now(),
@@ -362,29 +325,13 @@ func (p *MCPConnectionPool) createSSEClient(ctx context.Context, serverConfig co
 		}
 	}
 
-	// Enable OAuth for remote transports when an auth handler is configured.
-	// The OAuthConfig uses PKCE and the handler's redirect URI. Client ID and
-	// scopes are discovered automatically via dynamic client registration and
-	// server metadata (RFC 9728).
-	if p.oauthFlow != nil {
-		tokenStore, tsErr := NewFileTokenStore(serverConfig.URL)
-		if tsErr != nil {
-			return nil, fmt.Errorf("failed to create token store: %w", tsErr)
-		}
-		options = append(options, transport.WithOAuth(transport.OAuthConfig{
-			RedirectURI: p.oauthFlow.handler.RedirectURI(),
-			PKCEEnabled: true,
-			TokenStore:  tokenStore,
-		}))
-	}
-
 	sseClient, err := client.NewSSEMCPClient(serverConfig.URL, options...)
 	if err != nil {
 		return nil, err
 	}
 
 	if err := sseClient.Start(ctx); err != nil {
-		return nil, fmt.Errorf("failed to start SSE client: %w", err)
+		return nil, fmt.Errorf("failed to start SSE client: %v", err)
 	}
 
 	return sseClient, nil
@@ -409,29 +356,13 @@ func (p *MCPConnectionPool) createStreamableClient(ctx context.Context, serverCo
 		}
 	}
 
-	// Enable OAuth for remote transports when an auth handler is configured.
-	// The OAuthConfig uses PKCE and the handler's redirect URI. Client ID and
-	// scopes are discovered automatically via dynamic client registration and
-	// server metadata (RFC 9728).
-	if p.oauthFlow != nil {
-		tokenStore, tsErr := NewFileTokenStore(serverConfig.URL)
-		if tsErr != nil {
-			return nil, fmt.Errorf("failed to create token store: %w", tsErr)
-		}
-		options = append(options, transport.WithHTTPOAuth(transport.OAuthConfig{
-			RedirectURI: p.oauthFlow.handler.RedirectURI(),
-			PKCEEnabled: true,
-			TokenStore:  tokenStore,
-		}))
-	}
-
 	streamableClient, err := client.NewStreamableHttpClient(serverConfig.URL, options...)
 	if err != nil {
 		return nil, err
 	}
 
 	if err := streamableClient.Start(ctx); err != nil {
-		return nil, fmt.Errorf("failed to start streamable HTTP client: %w", err)
+		return nil, fmt.Errorf("failed to start streamable HTTP client: %v", err)
 	}
 
 	return streamableClient, nil
@@ -452,7 +383,7 @@ func (p *MCPConnectionPool) initializeClient(ctx context.Context, client client.
 
 	_, err := client.Initialize(initCtx, initRequest)
 	if err != nil {
-		return fmt.Errorf("initialization timeout or failed: %w", err)
+		return fmt.Errorf("initialization timeout or failed: %v", err)
 	}
 
 	if p.debugLogger != nil && p.debugLogger.IsDebugEnabled() {
@@ -610,9 +541,6 @@ func (p *MCPConnectionPool) Close() error {
 
 // isConnectionError checks if the error is connection-related
 func isConnectionError(err error) bool {
-	if IsOAuthError(err) {
-		return false // OAuth errors are recoverable, not connection failures
-	}
 	errStr := err.Error()
 	return strings.Contains(errStr, "Connection not found") ||
 		strings.Contains(errStr, "transport error") ||

internal/tools/fantasy_adapter.go

@@ -59,30 +59,9 @@ func (t *mcpFantasyTool) Run(ctx context.Context, call fantasy.ToolCall) (fantas
 		},
 	})
 	if err != nil {
-		// Handle OAuth re-authorization: token may have expired mid-session.
-		if t.mapping.manager.connectionPool.oauthFlow != nil && IsOAuthError(err) {
-			if flowErr := t.mapping.manager.connectionPool.oauthFlow.RunAuthFlow(ctx, t.mapping.serverName, err); flowErr != nil {
-				return fantasy.ToolResponse{}, fmt.Errorf("OAuth re-authorization failed for tool %s: %w", t.mapping.originalName, flowErr)
-			}
-			// Retry the tool call after successful re-auth.
-			result, err = conn.client.CallTool(ctx, mcp.CallToolRequest{
-				Request: mcp.Request{
-					Method: "tools/call",
-				},
-				Params: mcp.CallToolParams{
-					Name:      t.mapping.originalName,
-					Arguments: arguments,
-				},
-			})
-			if err != nil {
-				t.mapping.manager.connectionPool.HandleConnectionError(t.mapping.serverName, err)
-				return fantasy.ToolResponse{}, fmt.Errorf("failed to call mcp tool after re-auth: %w", err)
-			}
-		} else {
-			// Mark connection as unhealthy for automatic recovery
-			t.mapping.manager.connectionPool.HandleConnectionError(t.mapping.serverName, err)
-			return fantasy.ToolResponse{}, fmt.Errorf("failed to call mcp tool: %w", err)
-		}
+		// Mark connection as unhealthy for automatic recovery
+		t.mapping.manager.connectionPool.HandleConnectionError(t.mapping.serverName, err)
+		return fantasy.ToolResponse{}, fmt.Errorf("failed to call mcp tool: %w", err)
 	}
 
 	// Marshal the MCP result to JSON string

internal/tools/mcp.go

@@ -4,10 +4,8 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"maps"
 	"slices"
 	"strings"
-	"sync"
 
 	"charm.land/fantasy"
 	"github.com/mark3labs/kit/internal/config"
@@ -23,16 +21,10 @@ type MCPToolManager struct {
 	connectionPool *MCPConnectionPool
 	tools          []fantasy.AgentTool
 	toolMap        map[string]*toolMapping // maps prefixed tool names to their server and original name
-	mu             sync.Mutex              // protects tools and toolMap during parallel loading
 	model          fantasy.LanguageModel   // LLM model for sampling
-	authHandler    MCPAuthHandler          // OAuth handler for remote servers (nil = no OAuth)
 	config         *config.Config
 	debug          bool
 	debugLogger    DebugLogger
-
-	// onServerLoaded, if non-nil, is called when each server finishes loading.
-	// Called with server name, tool count, and error (nil on success).
-	onServerLoaded func(serverName string, toolCount int, err error)
 }
 
 // toolMapping stores the mapping between prefixed tool names and their original details
@@ -61,14 +53,6 @@ func (m *MCPToolManager) SetModel(model fantasy.LanguageModel) {
 	m.model = model
 }
 
-// SetAuthHandler sets the OAuth handler for remote MCP server authentication.
-// When set, remote transports (streamable HTTP, SSE) are configured with OAuth
-// support, enabling automatic authorization flows when servers require authentication.
-// This method should be called before LoadTools.
-func (m *MCPToolManager) SetAuthHandler(handler MCPAuthHandler) {
-	m.authHandler = handler
-}
-
 // SetDebugLogger sets the debug logger for the tool manager.
 // The logger will be used to output detailed debugging information about MCP connections,
 // tool loading, and execution. If a connection pool exists, it will also be configured
@@ -80,87 +64,48 @@ func (m *MCPToolManager) SetDebugLogger(logger DebugLogger) {
 	}
 }
 
-// SetOnServerLoaded sets the callback that's invoked when each MCP server finishes
-// loading. The callback receives the server name, tool count, and any error.
-// Call this before LoadTools to receive per-server notifications.
-func (m *MCPToolManager) SetOnServerLoaded(cb func(serverName string, toolCount int, err error)) {
-	m.onServerLoaded = cb
-}
-
 // LoadTools loads tools from all configured MCP servers based on the provided configuration.
 // It initializes the connection pool, connects to each configured server, and loads their tools.
 // Tools from different servers are prefixed with the server name to avoid naming conflicts.
 // Returns an error only if all configured servers fail to load; partial failures are logged as warnings.
 // This method is thread-safe and idempotent.
-func (m *MCPToolManager) LoadTools(ctx context.Context, cfg *config.Config) error {
+func (m *MCPToolManager) LoadTools(ctx context.Context, config *config.Config) error {
 	// Initialize connection pool
-	m.config = cfg
-	m.debug = cfg.Debug
+	m.config = config
+	m.debug = config.Debug
 	if m.debugLogger == nil {
-		m.debugLogger = NewSimpleDebugLogger(cfg.Debug)
+		m.debugLogger = NewSimpleDebugLogger(config.Debug)
 	}
-	m.connectionPool = NewMCPConnectionPool(DefaultConnectionPoolConfig(), m.model, cfg.Debug, m.authHandler)
+	m.connectionPool = NewMCPConnectionPool(DefaultConnectionPoolConfig(), m.model, config.Debug)
 	m.connectionPool.SetDebugLogger(m.debugLogger)
 
-	// Load all servers in parallel. Each server connection (subprocess
-	// spawn, MCP initialize handshake, ListTools) is independent and
-	// typically dominated by process startup latency. Running them
-	// concurrently reduces total wall-clock time from O(n * avg) to
-	// O(max).
-	type serverResult struct {
-		name string
-		err  error
-	}
-
-	results := make(chan serverResult, len(cfg.MCPServers))
-	var wg sync.WaitGroup
-
-	for serverName, serverConfig := range cfg.MCPServers {
-		wg.Add(1)
-		go func(name string, sc config.MCPServerConfig) {
-			defer wg.Done()
-			count, err := m.loadServerTools(ctx, name, sc)
-			results <- serverResult{name: name, err: err}
-			// Notify callback if set (for real-time UI updates).
-			if m.onServerLoaded != nil {
-				m.onServerLoaded(name, count, err)
-			}
-		}(serverName, serverConfig)
-	}
-
-	// Close results channel once all goroutines finish.
-	go func() {
-		wg.Wait()
-		close(results)
-	}()
-
 	var loadErrors []string
-	for r := range results {
-		if r.err != nil {
-			loadErrors = append(loadErrors, fmt.Sprintf("server %s: %v", r.name, r.err))
-			fmt.Printf("Warning: Failed to load MCP server '%s': %v\n", r.name, r.err)
+
+	for serverName, serverConfig := range config.MCPServers {
+		if err := m.loadServerTools(ctx, serverName, serverConfig); err != nil {
+			loadErrors = append(loadErrors, fmt.Sprintf("server %s: %v", serverName, err))
+			fmt.Printf("Warning: Failed to load MCP server '%s': %v\n", serverName, err)
+			continue
 		}
 	}
 
 	// If all servers failed to load, return an error
-	if len(loadErrors) == len(cfg.MCPServers) && len(cfg.MCPServers) > 0 {
+	if len(loadErrors) == len(config.MCPServers) && len(config.MCPServers) > 0 {
 		return fmt.Errorf("all MCP servers failed to load: %s", strings.Join(loadErrors, "; "))
 	}
 
 	return nil
 }
 
-// loadServerTools loads tools from a single MCP server.
-// Thread-safe: may be called concurrently for different servers.
-// Returns the number of tools loaded from this server, or -1 on error.
-func (m *MCPToolManager) loadServerTools(ctx context.Context, serverName string, serverConfig config.MCPServerConfig) (int, error) {
+// loadServerTools loads tools from a single MCP server
+func (m *MCPToolManager) loadServerTools(ctx context.Context, serverName string, serverConfig config.MCPServerConfig) error {
 	// Add debug logging
 	m.debugLogConnectionInfo(serverName, serverConfig)
 
 	// Get connection from pool
 	conn, err := m.connectionPool.GetConnection(ctx, serverName, serverConfig)
 	if err != nil {
-		return -1, fmt.Errorf("failed to get connection from pool: %v", err)
+		return fmt.Errorf("failed to get connection from pool: %v", err)
 	}
 
 	// Get tools from this server
@@ -168,7 +113,7 @@ func (m *MCPToolManager) loadServerTools(ctx context.Context, serverName string,
 	if err != nil {
 		// Handle connection error
 		m.connectionPool.HandleConnectionError(serverName, err)
-		return -1, fmt.Errorf("failed to list tools: %v", err)
+		return fmt.Errorf("failed to list tools: %v", err)
 	}
 
 	// Create name set for allowed tools
@@ -180,10 +125,6 @@ func (m *MCPToolManager) loadServerTools(ctx context.Context, serverName string,
 		}
 	}
 
-	// Build tools locally before acquiring the lock.
-	var localTools []fantasy.AgentTool
-	localMap := make(map[string]*toolMapping)
-
 	// Convert MCP tools to fantasy AgentTools with prefixed names
 	for _, mcpTool := range listResults.Tools {
 		// Filter tools based on allowedTools/excludedTools
@@ -201,7 +142,7 @@ func (m *MCPToolManager) loadServerTools(ctx context.Context, serverName string,
 		// Convert MCP InputSchema to map[string]any for fantasy ToolInfo
 		marshaledSchema, err := json.Marshal(mcpTool.InputSchema)
 		if err != nil {
-			return -1, fmt.Errorf("conv mcp tool input schema fail(marshal): %w, tool name: %s", err, mcpTool.Name)
+			return fmt.Errorf("conv mcp tool input schema fail(marshal): %w, tool name: %s", err, mcpTool.Name)
 		}
 
 		// Fix for JSON Schema draft-07 vs draft-04 compatibility
@@ -210,7 +151,7 @@ func (m *MCPToolManager) loadServerTools(ctx context.Context, serverName string,
 		// Parse into map[string]any for fantasy's parameters format
 		var schemaMap map[string]any
 		if err := json.Unmarshal(marshaledSchema, &schemaMap); err != nil {
-			return -1, fmt.Errorf("conv mcp tool input schema fail(unmarshal): %w, tool name: %s", err, mcpTool.Name)
+			return fmt.Errorf("conv mcp tool input schema fail(unmarshal): %w, tool name: %s", err, mcpTool.Name)
 		}
 
 		// Extract properties and required from the schema
@@ -243,7 +184,7 @@ func (m *MCPToolManager) loadServerTools(ctx context.Context, serverName string,
 			serverConfig: serverConfig,
 			manager:      m,
 		}
-		localMap[prefixedName] = mapping
+		m.toolMap[prefixedName] = mapping
 
 		// Create fantasy AgentTool
 		fantasyTool := &mcpFantasyTool{
@@ -256,16 +197,10 @@ func (m *MCPToolManager) loadServerTools(ctx context.Context, serverName string,
 			mapping: mapping,
 		}
 
-		localTools = append(localTools, fantasyTool)
+		m.tools = append(m.tools, fantasyTool)
 	}
 
-	// Merge into the manager under the lock.
-	m.mu.Lock()
-	maps.Copy(m.toolMap, localMap)
-	m.tools = append(m.tools, localTools...)
-	m.mu.Unlock()
-
-	return len(localTools), nil
+	return nil
 }
 
 // GetTools returns all loaded tools as fantasy AgentTools from all configured MCP servers.

internal/tools/mcp_test.go

@@ -3,7 +3,6 @@ package tools
 import (
 	"context"
 	"encoding/json"
-	"strings"
 	"testing"
 	"time"
 
@@ -71,7 +70,7 @@ func TestMCPToolManager_LoadTools_GracefulFailure(t *testing.T) {
 	}
 
 	// The error should mention that all servers failed
-	if err != nil && !strings.Contains(err.Error(), "all MCP servers failed") {
+	if err != nil && !contains(err.Error(), "all MCP servers failed") {
 		t.Errorf("Expected error message to mention all servers failed, got: %v", err)
 	}
 
@@ -460,3 +459,13 @@ func sliceEqual(a, b []any) bool {
 	}
 	return true
 }
+
+// Helper function to check if a string contains a substring
+func contains(s, substr string) bool {
+	for i := 0; i <= len(s)-len(substr); i++ {
+		if s[i:i+len(substr)] == substr {
+			return true
+		}
+	}
+	return false
+}

internal/tools/oauth_flow.go

@@ -1,109 +0,0 @@
-package tools
-
-import (
-	"context"
-	"fmt"
-	"net/url"
-
-	"github.com/mark3labs/mcp-go/client"
-)
-
-// MCPAuthHandler is the internal interface for handling MCP OAuth flows.
-// The SDK-level kit.MCPAuthHandler is adapted to this interface in cmd/root.go
-// or pkg/kit/kit.go, keeping the tools package decoupled from the SDK.
-type MCPAuthHandler interface {
-	// RedirectURI returns the OAuth redirect URI for transport setup.
-	RedirectURI() string
-	// HandleAuth is called when a server requires OAuth authorization.
-	// It receives the server name and the authorization URL the user must visit.
-	// It returns the full callback URL (containing code and state query params)
-	// after the user completes authorization.
-	HandleAuth(ctx context.Context, serverName string, authURL string) (callbackURL string, err error)
-}
-
-// OAuthFlowRunner handles the OAuth authorization flow when an MCP server
-// returns an OAuthAuthorizationRequiredError. It coordinates dynamic client
-// registration, PKCE generation, user authorization (via MCPAuthHandler),
-// and token exchange.
-type OAuthFlowRunner struct {
-	handler MCPAuthHandler
-}
-
-// NewOAuthFlowRunner creates a new OAuthFlowRunner with the given auth handler.
-func NewOAuthFlowRunner(handler MCPAuthHandler) *OAuthFlowRunner {
-	return &OAuthFlowRunner{handler: handler}
-}
-
-// RunAuthFlow executes the OAuth authorization flow for the given server.
-// It extracts the OAuthHandler from the error, performs dynamic client registration
-// if needed, generates PKCE parameters, delegates to the MCPAuthHandler for user
-// interaction, and exchanges the authorization code for a token.
-func (r *OAuthFlowRunner) RunAuthFlow(ctx context.Context, serverName string, authErr error) error {
-	// Extract the OAuthHandler from the authorization-required error.
-	oauthHandler := client.GetOAuthHandler(authErr)
-	if oauthHandler == nil {
-		return fmt.Errorf("oauth flow: failed to extract OAuth handler from error: %w", authErr)
-	}
-
-	// Perform dynamic client registration if no client ID is configured yet.
-	if oauthHandler.GetClientID() == "" {
-		if err := oauthHandler.RegisterClient(ctx, "kit"); err != nil {
-			return fmt.Errorf("oauth flow: dynamic client registration failed: %w", err)
-		}
-	}
-
-	// Generate PKCE code verifier and challenge.
-	codeVerifier, err := client.GenerateCodeVerifier()
-	if err != nil {
-		return fmt.Errorf("oauth flow: failed to generate code verifier: %w", err)
-	}
-	codeChallenge := client.GenerateCodeChallenge(codeVerifier)
-
-	// Generate a random state parameter for CSRF protection.
-	state, err := client.GenerateState()
-	if err != nil {
-		return fmt.Errorf("oauth flow: failed to generate state: %w", err)
-	}
-
-	// Build the authorization URL the user needs to visit.
-	authURL, err := oauthHandler.GetAuthorizationURL(ctx, state, codeChallenge)
-	if err != nil {
-		return fmt.Errorf("oauth flow: failed to get authorization URL: %w", err)
-	}
-
-	// Delegate to the MCPAuthHandler for user-facing authorization (e.g. open
-	// browser, wait for redirect). It returns the full callback URL containing
-	// the authorization code and state.
-	callbackURL, err := r.handler.HandleAuth(ctx, serverName, authURL)
-	if err != nil {
-		return fmt.Errorf("oauth flow: user authorization failed: %w", err)
-	}
-
-	// Parse the callback URL to extract the authorization code and state.
-	parsed, err := url.Parse(callbackURL)
-	if err != nil {
-		return fmt.Errorf("oauth flow: failed to parse callback URL: %w", err)
-	}
-
-	code := parsed.Query().Get("code")
-	returnedState := parsed.Query().Get("state")
-
-	if code == "" {
-		return fmt.Errorf("oauth flow: callback URL missing 'code' parameter")
-	}
-	if returnedState == "" {
-		return fmt.Errorf("oauth flow: callback URL missing 'state' parameter")
-	}
-
-	// Exchange the authorization code for an access token.
-	if err := oauthHandler.ProcessAuthorizationResponse(ctx, code, returnedState, codeVerifier); err != nil {
-		return fmt.Errorf("oauth flow: token exchange failed: %w", err)
-	}
-
-	return nil
-}
-
-// IsOAuthError returns true if the error is an OAuthAuthorizationRequiredError.
-func IsOAuthError(err error) bool {
-	return client.IsOAuthAuthorizationRequiredError(err)
-}

internal/tools/token_store.go

@@ -1,155 +0,0 @@
-package tools
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
-	"sync"
-
-	"github.com/mark3labs/mcp-go/client/transport"
-)
-
-// Compile-time check that FileTokenStore implements transport.TokenStore.
-var _ transport.TokenStore = (*FileTokenStore)(nil)
-
-// FileTokenStore is a file-backed implementation of transport.TokenStore that
-// persists OAuth tokens as JSON on disk. Tokens are stored in a shared JSON file
-// keyed by server URL, allowing multiple MCP servers to maintain independent tokens.
-//
-// The token file is located at $XDG_CONFIG_HOME/.kit/mcp_tokens.json, falling back
-// to ~/.config/.kit/mcp_tokens.json when XDG_CONFIG_HOME is not set.
-//
-// FileTokenStore is safe for concurrent use.
-type FileTokenStore struct {
-	serverKey string
-	filePath  string
-	mu        sync.RWMutex
-}
-
-// NewFileTokenStore creates a new FileTokenStore for the given server URL.
-// The serverKey is used as the map key in the shared token file, and should
-// typically be the MCP server's base URL.
-//
-// Returns an error if the token file path cannot be resolved.
-func NewFileTokenStore(serverKey string) (*FileTokenStore, error) {
-	filePath, err := resolveTokenFilePath()
-	if err != nil {
-		return nil, fmt.Errorf("resolving token file path: %w", err)
-	}
-
-	return &FileTokenStore{
-		serverKey: serverKey,
-		filePath:  filePath,
-	}, nil
-}
-
-// GetToken returns the stored token for this store's server key.
-// Returns transport.ErrNoToken if no token exists for the server key or if
-// the token file does not yet exist.
-// Returns context.Canceled or context.DeadlineExceeded if the context is done.
-func (s *FileTokenStore) GetToken(ctx context.Context) (*transport.Token, error) {
-	if err := ctx.Err(); err != nil {
-		return nil, err
-	}
-
-	s.mu.RLock()
-	defer s.mu.RUnlock()
-
-	tokens, err := readTokenFile(s.filePath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil, transport.ErrNoToken
-		}
-		return nil, fmt.Errorf("reading token file: %w", err)
-	}
-
-	token, ok := tokens[s.serverKey]
-	if !ok {
-		return nil, transport.ErrNoToken
-	}
-
-	return token, nil
-}
-
-// SaveToken persists the given token for this store's server key.
-// If the token file or its parent directories do not exist, they are created.
-// Existing tokens for other server keys are preserved.
-// Returns context.Canceled or context.DeadlineExceeded if the context is done.
-func (s *FileTokenStore) SaveToken(ctx context.Context, token *transport.Token) error {
-	if err := ctx.Err(); err != nil {
-		return err
-	}
-
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	tokens, err := readTokenFile(s.filePath)
-	if err != nil && !os.IsNotExist(err) {
-		return fmt.Errorf("reading token file: %w", err)
-	}
-	if tokens == nil {
-		tokens = make(map[string]*transport.Token)
-	}
-
-	tokens[s.serverKey] = token
-
-	if err := writeTokenFile(s.filePath, tokens); err != nil {
-		return fmt.Errorf("writing token file: %w", err)
-	}
-
-	return nil
-}
-
-// resolveTokenFilePath determines the path to the token file using
-// XDG_CONFIG_HOME if set, otherwise falling back to ~/.config/.kit/.
-func resolveTokenFilePath() (string, error) {
-	configDir := os.Getenv("XDG_CONFIG_HOME")
-	if configDir == "" {
-		home, err := os.UserHomeDir()
-		if err != nil {
-			return "", fmt.Errorf("determining user home directory: %w", err)
-		}
-		configDir = filepath.Join(home, ".config")
-	}
-
-	return filepath.Join(configDir, ".kit", "mcp_tokens.json"), nil
-}
-
-// readTokenFile reads and unmarshals the token file into a server-keyed map.
-// Returns os.ErrNotExist (via os.IsNotExist) if the file does not exist.
-func readTokenFile(path string) (map[string]*transport.Token, error) {
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return nil, err
-	}
-
-	var tokens map[string]*transport.Token
-	if err := json.Unmarshal(data, &tokens); err != nil {
-		return nil, fmt.Errorf("unmarshaling token file: %w", err)
-	}
-
-	return tokens, nil
-}
-
-// writeTokenFile marshals the token map and writes it to disk, creating
-// parent directories as needed. The file is written with 0600 permissions
-// to protect sensitive token data.
-func writeTokenFile(path string, tokens map[string]*transport.Token) error {
-	dir := filepath.Dir(path)
-	if err := os.MkdirAll(dir, 0700); err != nil {
-		return fmt.Errorf("creating token directory %s: %w", dir, err)
-	}
-
-	data, err := json.MarshalIndent(tokens, "", "  ")
-	if err != nil {
-		return fmt.Errorf("marshaling tokens: %w", err)
-	}
-
-	if err := os.WriteFile(path, data, 0600); err != nil {
-		return fmt.Errorf("writing token file %s: %w", path, err)
-	}
-
-	return nil
-}

internal/ui/block_renderer.go

@@ -4,8 +4,6 @@ import (
 	"image/color"
 
 	"charm.land/lipgloss/v2"
-
-	"github.com/mark3labs/kit/internal/ui/style"
 )
 
 // blockRenderer handles rendering of content blocks with configurable options
@@ -177,7 +175,7 @@ func renderContentBlock(content string, containerWidth int, options ...rendering
 		borderChars = 1
 	}
 
-	theme := style.GetTheme()
+	theme := GetTheme()
 
 	// Resolve foreground color: caller override or theme default.
 	fgColor := theme.Text

internal/ui/children_test.go

@@ -6,7 +6,6 @@ import (
 
 	tea "charm.land/bubbletea/v2"
 	"github.com/mark3labs/kit/internal/app"
-	"github.com/mark3labs/kit/internal/ui/core"
 )
 
 // ==========================================================================
@@ -60,7 +59,7 @@ func TestInputComponent_SubmitEmitsSubmitMsg(t *testing.T) {
 		t.Fatal("expected a cmd from pressing enter on non-empty input")
 	}
 
-	sm, ok := msg.(core.SubmitMsg)
+	sm, ok := msg.(submitMsg)
 	if !ok {
 		t.Fatalf("expected submitMsg, got %T", msg)
 	}
@@ -84,7 +83,7 @@ func TestInputComponent_CtrlD_SubmitEmitsSubmitMsg(t *testing.T) {
 	if msg == nil {
 		t.Fatal("expected a cmd from ctrl+d on non-empty input")
 	}
-	sm, ok := msg.(core.SubmitMsg)
+	sm, ok := msg.(submitMsg)
 	if !ok {
 		t.Fatalf("expected submitMsg from ctrl+d, got %T", msg)
 	}
@@ -150,13 +149,11 @@ func TestInputComponent_QuitReturnsTeaQuit(t *testing.T) {
 }
 
 // --------------------------------------------------------------------------
-// TestInputComponent_ClearForwardsAsSubmitMsg verifies that /clear (and its
-// aliases) are forwarded as submitMsg to the parent model so that the parent
-// can call ClearMessages(), update scrollback, and print the confirmation
-// message in one place. InputComponent must NOT call ClearMessages() directly.
+// TestInputComponent_ClearCallsClearMessages verifies that /clear (and its
+// aliases) calls appCtrl.ClearMessages() and returns no submitMsg.
 // --------------------------------------------------------------------------
 
-func TestInputComponent_ClearForwardsAsSubmitMsg(t *testing.T) {
+func TestInputComponent_ClearCallsClearMessages(t *testing.T) {
 	aliases := []string{"/clear", "/c", "/cls"}
 	for _, alias := range aliases {
 		t.Run(alias, func(t *testing.T) {
@@ -167,29 +164,22 @@ func TestInputComponent_ClearForwardsAsSubmitMsg(t *testing.T) {
 
 			_, cmd := sendInputMsg(c, tea.KeyPressMsg{Code: tea.KeyEnter})
 
-			// InputComponent must NOT call ClearMessages() directly.
-			if ctrl.clearMsgCalled != 0 {
-				t.Fatalf("%s: InputComponent must not call ClearMessages(), got %d", alias, ctrl.clearMsgCalled)
+			if ctrl.clearMsgCalled != 1 {
+				t.Fatalf("%s: expected ClearMessages() called once, got %d", alias, ctrl.clearMsgCalled)
 			}
-			// A submitMsg must be emitted so the parent model handles /clear.
-			if cmd == nil {
-				t.Fatalf("%s: expected submitMsg cmd, got nil", alias)
-			}
-			msg := runCmd(cmd)
-			sm, ok := msg.(core.SubmitMsg)
-			if !ok {
-				t.Fatalf("%s: expected submitMsg, got %T", alias, msg)
-			}
-			if sm.Text != alias {
-				t.Fatalf("%s: expected submitMsg text %q, got %q", alias, alias, sm.Text)
+			// No cmd should be returned (no submitMsg forwarded to parent).
+			if cmd != nil {
+				msg := runCmd(cmd)
+				if _, ok := msg.(submitMsg); ok {
+					t.Fatalf("%s: /clear should not emit submitMsg, got submitMsg", alias)
+				}
 			}
 		})
 	}
 }
 
 // TestInputComponent_ClearNilCtrl_NoPanic verifies that /clear with a nil
-// appCtrl does not panic. Since /clear is now forwarded to the parent via
-// submitMsg, no appCtrl interaction happens in InputComponent at all.
+// appCtrl does not panic.
 func TestInputComponent_ClearNilCtrl_NoPanic(t *testing.T) {
 	c := newTestInput(nil)
 	c.textarea.SetValue("/clear")
@@ -231,7 +221,7 @@ func TestInputComponent_ClearQueue_ForwardsAsSubmitMsg(t *testing.T) {
 				t.Fatalf("%s: expected submitMsg cmd, got nil", alias)
 			}
 			msg := runCmd(cmd)
-			sm, ok := msg.(core.SubmitMsg)
+			sm, ok := msg.(submitMsg)
 			if !ok {
 				t.Fatalf("%s: expected submitMsg, got %T", alias, msg)
 			}
@@ -259,7 +249,7 @@ func TestInputComponent_UnknownSlashCommand_ForwardsAsSubmit(t *testing.T) {
 	if msg == nil {
 		t.Fatal("expected submitMsg for unknown slash command")
 	}
-	sm, ok := msg.(core.SubmitMsg)
+	sm, ok := msg.(submitMsg)
 	if !ok {
 		t.Fatalf("expected submitMsg for unknown slash command, got %T", msg)
 	}
@@ -276,9 +266,10 @@ func TestInputComponent_UnknownSlashCommand_ForwardsAsSubmit(t *testing.T) {
 // Helpers
 // --------------------------------------------------------------------------
 
-// newTestStream creates a StreamComponent with a fixed width and model name.
+// newTestStream creates a StreamComponent with a fixed width and model name,
+// in non-compact mode.
 func newTestStream() *StreamComponent {
-	return NewStreamComponent(80, "test-model")
+	return NewStreamComponent(false, 80, "test-model")
 }
 
 // sendStreamMsg calls component.Update and returns the updated component.
@@ -358,7 +349,7 @@ func TestStreamComponent_SpinnerKeepsRunningDuringStreaming(t *testing.T) {
 	c = sendStreamMsg(c, app.StreamChunkEvent{Content: "hello"})
 
 	// Flush pending chunks (simulates the 16ms tick firing).
-	c = sendStreamMsg(c, streamFlushTickMsg{generation: c.flushGeneration})
+	c = sendStreamMsg(c, streamFlushTickMsg{})
 
 	if !c.spinning {
 		t.Fatal("expected spinning=true after first chunk")
@@ -385,7 +376,7 @@ func TestStreamComponent_ChunkAccumulation(t *testing.T) {
 	}
 
 	// Flush pending chunks (simulates the 16ms tick firing).
-	c = sendStreamMsg(c, streamFlushTickMsg{generation: c.flushGeneration})
+	c = sendStreamMsg(c, streamFlushTickMsg{})
 
 	got := c.streamContent.String()
 	want := "Hello, world!"
@@ -405,7 +396,6 @@ func TestStreamComponent_ToolExecution_IsStarting_ShowsSpinner(t *testing.T) {
 	c := newTestStream()
 
 	_, cmd := c.Update(app.ToolExecutionEvent{
-		ToolCallID: "call-exec-1",
 		ToolName:   "exec_tool",
 		IsStarting: true,
 	})
@@ -413,9 +403,8 @@ func TestStreamComponent_ToolExecution_IsStarting_ShowsSpinner(t *testing.T) {
 	if !c.spinning {
 		t.Fatal("expected spinning=true during tool execution")
 	}
-	tools := c.activeToolDisplays()
-	if len(tools) != 1 || !strings.Contains(tools[0], "exec_tool") {
-		t.Fatalf("expected activeTools to contain tool name, got %v", tools)
+	if len(c.activeTools) != 1 || !strings.Contains(c.activeTools[0], "exec_tool") {
+		t.Fatalf("expected activeTools to contain tool name, got %v", c.activeTools)
 	}
 	if cmd == nil {
 		t.Fatal("expected tick cmd from ToolExecutionEvent{IsStarting:true}")
@@ -429,13 +418,11 @@ func TestStreamComponent_ToolExecution_NotStarting_KeepsSpinning(t *testing.T) {
 	c = sendStreamMsg(c, app.SpinnerEvent{Show: true})
 	// Simulate a tool starting
 	c = sendStreamMsg(c, app.ToolExecutionEvent{
-		ToolCallID: "call-some-1",
 		ToolName:   "some_tool",
 		IsStarting: true,
 	})
 
 	c = sendStreamMsg(c, app.ToolExecutionEvent{
-		ToolCallID: "call-some-1",
 		ToolName:   "some_tool",
 		IsStarting: false,
 	})
@@ -453,9 +440,9 @@ func TestStreamComponent_ParallelToolExecution(t *testing.T) {
 	c := newTestStream()
 
 	// Start three tools in parallel
-	c = sendStreamMsg(c, app.ToolExecutionEvent{ToolCallID: "call-read", ToolName: "read", IsStarting: true})
-	c = sendStreamMsg(c, app.ToolExecutionEvent{ToolCallID: "call-grep", ToolName: "grep", IsStarting: true})
-	c = sendStreamMsg(c, app.ToolExecutionEvent{ToolCallID: "call-find", ToolName: "find", IsStarting: true})
+	c = sendStreamMsg(c, app.ToolExecutionEvent{ToolName: "read", IsStarting: true})
+	c = sendStreamMsg(c, app.ToolExecutionEvent{ToolName: "grep", IsStarting: true})
+	c = sendStreamMsg(c, app.ToolExecutionEvent{ToolName: "find", IsStarting: true})
 
 	if len(c.activeTools) != 3 {
 		t.Fatalf("expected 3 active tools, got %d: %v", len(c.activeTools), c.activeTools)
@@ -468,44 +455,19 @@ func TestStreamComponent_ParallelToolExecution(t *testing.T) {
 	}
 
 	// Finish one tool
-	c = sendStreamMsg(c, app.ToolExecutionEvent{ToolCallID: "call-grep", ToolName: "grep", IsStarting: false})
+	c = sendStreamMsg(c, app.ToolExecutionEvent{ToolName: "grep", IsStarting: false})
 	if len(c.activeTools) != 2 {
 		t.Fatalf("expected 2 active tools after one finished, got %d: %v", len(c.activeTools), c.activeTools)
 	}
 
 	// Finish remaining tools
-	c = sendStreamMsg(c, app.ToolExecutionEvent{ToolCallID: "call-read", ToolName: "read", IsStarting: false})
-	c = sendStreamMsg(c, app.ToolExecutionEvent{ToolCallID: "call-find", ToolName: "find", IsStarting: false})
+	c = sendStreamMsg(c, app.ToolExecutionEvent{ToolName: "read", IsStarting: false})
+	c = sendStreamMsg(c, app.ToolExecutionEvent{ToolName: "find", IsStarting: false})
 	if len(c.activeTools) != 0 {
 		t.Fatalf("expected 0 active tools after all finished, got %d: %v", len(c.activeTools), c.activeTools)
 	}
 }
 
-// TestStreamComponent_ParallelSameToolName_UsesToolCallID verifies finishing one
-// tool call does not remove another concurrent call with the same tool name.
-func TestStreamComponent_ParallelSameToolName_UsesToolCallID(t *testing.T) {
-	c := newTestStream()
-
-	c = sendStreamMsg(c, app.ToolExecutionEvent{ToolCallID: "call-read-1", ToolName: "read", IsStarting: true})
-	c = sendStreamMsg(c, app.ToolExecutionEvent{ToolCallID: "call-read-2", ToolName: "read", IsStarting: true})
-
-	tools := c.activeToolDisplays()
-	if len(tools) != 2 {
-		t.Fatalf("expected 2 active read calls, got %d (%v)", len(tools), tools)
-	}
-
-	c = sendStreamMsg(c, app.ToolExecutionEvent{ToolCallID: "call-read-1", ToolName: "read", IsStarting: false})
-	tools = c.activeToolDisplays()
-	if len(tools) != 1 {
-		t.Fatalf("expected 1 active read call after finishing one ID, got %d (%v)", len(tools), tools)
-	}
-
-	c = sendStreamMsg(c, app.ToolExecutionEvent{ToolCallID: "call-read-2", ToolName: "read", IsStarting: false})
-	if len(c.activeToolDisplays()) != 0 {
-		t.Fatalf("expected no active tools after finishing both IDs, got %v", c.activeToolDisplays())
-	}
-}
-
 // --------------------------------------------------------------------------
 // TestStreamComponent_GetRenderedContent verifies the method returns rendered
 // text when content is accumulated, and empty string when not.
@@ -659,78 +621,3 @@ func TestStreamComponent_StaleTick_Discarded(t *testing.T) {
 		t.Fatal("current-gen tick should reschedule")
 	}
 }
-
-// TestStreamComponent_StaleFlushTick_Discarded verifies that flush ticks from a
-// previous generation (e.g. pre-Reset) are ignored.
-func TestStreamComponent_StaleFlushTick_Discarded(t *testing.T) {
-	c := newTestStream()
-
-	// Start a pending flush and capture its generation.
-	c = sendStreamMsg(c, app.StreamChunkEvent{Content: "old"})
-	staleGen := c.flushGeneration
-	if !c.flushPending {
-		t.Fatal("precondition: expected flushPending=true after first chunk")
-	}
-
-	// Reset should invalidate in-flight flush ticks.
-	c.Reset()
-	if c.flushGeneration == staleGen {
-		t.Fatal("expected flushGeneration to change after Reset")
-	}
-
-	// New content in a new generation.
-	c = sendStreamMsg(c, app.StreamChunkEvent{Content: "new"})
-	if got := c.pendingStream.String(); got != "new" {
-		t.Fatalf("expected pendingStream='new', got %q", got)
-	}
-
-	// Stale flush tick should be ignored.
-	c = sendStreamMsg(c, streamFlushTickMsg{generation: staleGen})
-	if got := c.pendingStream.String(); got != "new" {
-		t.Fatalf("stale flush tick should not commit pending stream, got %q", got)
-	}
-
-	// Current generation flush should commit.
-	c = sendStreamMsg(c, streamFlushTickMsg{generation: c.flushGeneration})
-	if got := c.pendingStream.String(); got != "" {
-		t.Fatalf("expected pendingStream empty after current flush, got %q", got)
-	}
-	if got := c.streamContent.String(); got != "new" {
-		t.Fatalf("expected streamContent='new' after current flush, got %q", got)
-	}
-}
-
-// TestStreamComponent_ConsumeOverflow_NoHeight verifies that when height is
-// unconstrained (0), ConsumeOverflow always returns "".
-func TestStreamComponent_ConsumeOverflow_NoOp(t *testing.T) {
-	c := newTestStream()
-	// Commit some content directly.
-	c.streamContent.WriteString("line1\nline2\nline3")
-	c.phase = streamPhaseActive
-
-	// ConsumeOverflow is a no-op in alt screen mode — always returns "".
-	if got := c.ConsumeOverflow(); got != "" {
-		t.Fatalf("expected empty from no-op ConsumeOverflow, got %q", got)
-	}
-
-	// Also returns "" with a height set.
-	c.height = 2
-	if got := c.ConsumeOverflow(); got != "" {
-		t.Fatalf("expected empty from no-op ConsumeOverflow with height, got %q", got)
-	}
-}
-
-// TestStreamComponent_GetRenderedContent_ReturnsAll verifies that
-// GetRenderedContent returns all accumulated content.
-func TestStreamComponent_GetRenderedContent_ReturnsAll(t *testing.T) {
-	c := newTestStream()
-	c.renderer = nil
-	c.phase = streamPhaseActive
-
-	c.streamContent.WriteString("a\nb\nc\nd\ne")
-
-	got := c.GetRenderedContent()
-	if got != "a\nb\nc\nd\ne" {
-		t.Fatalf("expected full content, got %q", got)
-	}
-}

internal/ui/cli.go

@@ -8,31 +8,36 @@ import (
 	"charm.land/fantasy"
 	"charm.land/lipgloss/v2"
 	"golang.org/x/term"
-
-	"github.com/mark3labs/kit/internal/ui/style"
 )
 
 // CLI manages the command-line interface for KIT, providing message rendering,
-// user input handling, and display management. It handles streaming responses,
-// tracks token usage, and manages the overall conversation flow between the
-// user and AI assistants.
+// user input handling, and display management. It supports both standard and compact
+// display modes, handles streaming responses, tracks token usage, and manages the
+// overall conversation flow between the user and AI assistants.
 type CLI struct {
 	renderer     Renderer
 	usageTracker *UsageTracker
 	width        int
+	compactMode  bool
 	debug        bool
 	modelName    string
 }
 
-// NewCLI creates and initializes a new CLI instance. The debug parameter enables
-// debug message rendering. Returns an initialized CLI ready for interaction or an
+// NewCLI creates and initializes a new CLI instance with the specified display modes.
+// The debug parameter enables debug message rendering, while compact enables a more
+// condensed display format. Returns an initialized CLI ready for interaction or an
 // error if initialization fails.
-func NewCLI(debug bool) (*CLI, error) {
+func NewCLI(debug bool, compact bool) (*CLI, error) {
 	cli := &CLI{
-		debug: debug,
+		compactMode: compact,
+		debug:       debug,
 	}
 	cli.updateSize()
-	cli.renderer = newMessageRenderer(cli.width, debug)
+	if compact {
+		cli.renderer = NewCompactRenderer(cli.width, debug)
+	} else {
+		cli.renderer = newMessageRenderer(cli.width, debug)
+	}
 
 	return cli, nil
 }
@@ -127,7 +132,7 @@ func (c *CLI) DisplayInfo(message string) {
 // DisplayExtensionBlock renders a custom styled block with the given border
 // color and optional subtitle. Used by extensions via ctx.PrintBlock.
 func (c *CLI) DisplayExtensionBlock(text, borderColor, subtitle string) {
-	theme := style.GetTheme()
+	theme := GetTheme()
 
 	borderClr := theme.Info
 	if borderColor != "" {
@@ -174,8 +179,9 @@ func (c *CLI) DisplayDebugConfig(config map[string]any) {
 }
 
 // UpdateUsageFromResponse records token usage using metadata from the fantasy
-// response. Only actual API-reported tokens are used for cost tracking.
-// If the provider doesn't report token counts, no usage is recorded.
+// response when available. Falls back to text-based estimation if the metadata is
+// missing or appears unreliable. This provides more accurate usage tracking when
+// providers supply token count information.
 func (c *CLI) UpdateUsageFromResponse(response *fantasy.Response, inputText string) {
 	if c.usageTracker == nil {
 		return
@@ -185,9 +191,8 @@ func (c *CLI) UpdateUsageFromResponse(response *fantasy.Response, inputText stri
 	inputTokens := int(usage.InputTokens)
 	outputTokens := int(usage.OutputTokens)
 
-	// Only use actual API-reported tokens for cost tracking.
-	// We intentionally do NOT estimate tokens - estimation is inaccurate
-	// and should never be used for cost calculations.
+	// Validate that the metadata seems reasonable
+	// Use API-reported tokens if input tokens are available (output may be 0 in some cases)
 	if inputTokens > 0 {
 		cacheReadTokens := int(usage.CacheReadTokens)
 		cacheWriteTokens := int(usage.CacheCreationTokens)
@@ -195,9 +200,11 @@ func (c *CLI) UpdateUsageFromResponse(response *fantasy.Response, inputText stri
 		// Per-response usage is a single API call, so it represents the
 		// actual context window fill level.
 		c.usageTracker.SetContextTokens(inputTokens + outputTokens)
+	} else {
+		// Fallback to estimation if no metadata is available.
+		// EstimateAndUpdateUsage sets context tokens internally.
+		c.usageTracker.EstimateAndUpdateUsage(inputText, response.Content.Text())
 	}
-	// If inputTokens is 0, the provider didn't report usage - we skip recording
-	// rather than estimating, to ensure cost accuracy.
 }
 
 // DisplayUsageAfterResponse renders and displays token usage information immediately

internal/ui/clipboard/clipboard.go

@@ -1,26 +0,0 @@
-package clipboard
-
-import (
-	tea "charm.land/bubbletea/v2"
-	"github.com/atotto/clipboard"
-)
-
-// CopyToClipboard writes text to both the system clipboard and via OSC 52.
-// Returns a tea.Cmd that can be used in Bubble Tea's Update flow.
-func CopyToClipboard(text string) tea.Cmd {
-	if text == "" {
-		return nil
-	}
-
-	return tea.Sequence(
-		// Method 1: OSC 52 escape sequence (works in modern terminals)
-		tea.SetClipboard(text),
-
-		// Method 2: Native system clipboard (atotto/clipboard)
-		func() tea.Msg {
-			// Best effort - ignore errors
-			_ = clipboard.WriteAll(text)
-			return nil
-		},
-	)
-}

internal/ui/commands.go

@@ -1,4 +1,4 @@
-package commands
+package ui
 
 import (
 	"slices"
@@ -7,10 +7,6 @@ import (
 	"github.com/mark3labs/kit/internal/models"
 )
 
-// ListThemesFunc is set by the ui package to provide theme name completion.
-// This breaks the circular dependency between commands and ui packages.
-var ListThemesFunc func() []string
-
 // SlashCommand represents a user-invokable slash command with its metadata.
 // Commands can have multiple aliases and are organized by category for better
 // discoverability and help display.
@@ -103,10 +99,7 @@ var SlashCommands = []SlashCommand{
 		Description: "Switch color theme (e.g. /theme catppuccin)",
 		Category:    "System",
 		Complete: func(prefix string) []string {
-			if ListThemesFunc == nil {
-				return nil
-			}
-			names := ListThemesFunc()
+			names := ListThemes()
 			if prefix == "" {
 				return names
 			}
@@ -119,12 +112,6 @@ var SlashCommands = []SlashCommand{
 			return matches
 		},
 	},
-	{
-		Name:        "/reload-ext",
-		Description: "Hot-reload all extensions from disk",
-		Category:    "System",
-		Aliases:     []string{"/re"},
-	},
 	{
 		Name:        "/quit",
 		Description: "Exit the application",
@@ -140,7 +127,7 @@ var SlashCommands = []SlashCommand{
 	},
 	{
 		Name:        "/fork",
-		Description: "Fork to new session from an earlier message",
+		Description: "Branch from an earlier message",
 		Category:    "Navigation",
 	},
 	{

internal/ui/compact_renderer.go

@@ -0,0 +1,494 @@
+package ui
+
+import (
+	"fmt"
+	"strings"
+	"time"
+
+	"charm.land/lipgloss/v2"
+)
+
+// CompactRenderer handles rendering messages in a space-efficient compact format,
+// optimized for terminals with limited vertical space. It displays messages with
+// minimal decorations while maintaining readability and essential information.
+type CompactRenderer struct {
+	width int
+	debug bool
+
+	// getToolRenderer returns extension-provided rendering overrides for a
+	// specific tool. May be nil if no extensions are loaded. Used in
+	// RenderToolMessage to check for custom header/body formatting before
+	// falling back to builtin renderers.
+	getToolRenderer func(toolName string) *ToolRendererData
+}
+
+// NewCompactRenderer creates and initializes a new CompactRenderer with the specified
+// terminal width and debug mode setting. The width parameter determines line wrapping,
+// while debug enables additional diagnostic output in rendered messages.
+func NewCompactRenderer(width int, debug bool) *CompactRenderer {
+	return &CompactRenderer{
+		width: width,
+		debug: debug,
+	}
+}
+
+// SetWidth updates the terminal width for the renderer, affecting how content
+// is wrapped and formatted in subsequent render operations.
+func (r *CompactRenderer) SetWidth(width int) {
+	r.width = width
+}
+
+// RenderUserMessage renders a user's input message in compact format with a
+// distinctive symbol (>) and label. The content is formatted to preserve structure
+// while minimizing vertical space usage. Returns a UIMessage with formatted content
+// and metadata.
+func (r *CompactRenderer) RenderUserMessage(content string, timestamp time.Time) UIMessage {
+	theme := getTheme()
+	symbol := lipgloss.NewStyle().Foreground(theme.Info).Render(">")
+	label := lipgloss.NewStyle().Foreground(theme.Info).Bold(true).Render("User")
+
+	// Only run markdown rendering when the message contains code spans or
+	// fenced code blocks. Plain text is rendered directly so that newlines
+	// are preserved without the extra paragraph spacing glamour adds.
+	var compactContent string
+	if strings.Contains(content, "`") {
+		mdContent := strings.ReplaceAll(content, "\n", "\n\n")
+		compactContent = r.formatUserAssistantContent(mdContent)
+		compactContent = removeBlankLines(compactContent)
+	} else {
+		compactContent = content
+	}
+
+	// Handle multi-line content
+	lines := strings.Split(compactContent, "\n")
+	var formattedLines []string
+
+	for i, line := range lines {
+		if i == 0 {
+			// First line includes symbol and label
+			formattedLines = append(formattedLines, fmt.Sprintf("%s  %s %s", symbol, label, line))
+		} else {
+			// Subsequent lines without indentation for compact mode
+			formattedLines = append(formattedLines, line)
+		}
+	}
+
+	return UIMessage{
+		Type:      UserMessage,
+		Content:   strings.Join(formattedLines, "\n"),
+		Height:    len(formattedLines),
+		Timestamp: timestamp,
+	}
+}
+
+// RenderAssistantMessage renders an AI assistant's response in compact format with
+// a distinctive symbol (<) and the model name as label. Empty content is ignored
+// and returns an empty message. Returns a UIMessage with formatted content and metadata.
+func (r *CompactRenderer) RenderAssistantMessage(content string, timestamp time.Time, modelName string) UIMessage {
+	// Ignore empty responses - don't render anything
+	compactContent := r.formatUserAssistantContent(content)
+	if compactContent == "" {
+		return UIMessage{
+			Type:      AssistantMessage,
+			Content:   "",
+			Height:    0,
+			Timestamp: timestamp,
+		}
+	}
+
+	theme := getTheme()
+	symbol := lipgloss.NewStyle().Foreground(theme.Primary).Render("<")
+
+	// Use the full model name, fallback to "Assistant" if empty
+	if modelName == "" {
+		modelName = "Assistant"
+	}
+	label := lipgloss.NewStyle().Foreground(theme.Primary).Bold(true).Render(modelName)
+
+	// Handle multi-line content
+	lines := strings.Split(compactContent, "\n")
+	var formattedLines []string
+
+	for i, line := range lines {
+		if i == 0 {
+			// First line includes symbol and label
+			formattedLines = append(formattedLines, fmt.Sprintf("%s  %s %s", symbol, label, line))
+		} else {
+			// Subsequent lines without indentation for compact mode
+			formattedLines = append(formattedLines, line)
+		}
+	}
+
+	return UIMessage{
+		Type:      AssistantMessage,
+		Content:   strings.Join(formattedLines, "\n"),
+		Height:    len(formattedLines),
+		Timestamp: timestamp,
+	}
+}
+
+// RenderToolCallMessage renders a tool call notification in compact format, showing
+// the tool being executed with its arguments in a single line. The tool name is
+// highlighted and arguments are displayed in a muted color for visual distinction.
+func (r *CompactRenderer) RenderToolCallMessage(toolName, toolArgs string, timestamp time.Time) UIMessage {
+	theme := getTheme()
+	symbol := lipgloss.NewStyle().Foreground(theme.Tool).Render("[")
+	label := lipgloss.NewStyle().Foreground(theme.Tool).Bold(true).Render(toolName)
+
+	// Format args for compact display
+	argsDisplay := r.formatToolArgs(toolArgs)
+	if argsDisplay != "" {
+		argsDisplay = lipgloss.NewStyle().Foreground(theme.Muted).Render(argsDisplay)
+	}
+
+	line := fmt.Sprintf("%s  %s %s", symbol, label, argsDisplay)
+
+	return UIMessage{
+		Type:      ToolCallMessage,
+		Content:   line,
+		Height:    1,
+		Timestamp: timestamp,
+	}
+}
+
+// RenderToolMessage renders a unified tool block in compact format, combining
+// the tool invocation header (icon + display name + params) with the execution
+// result body. Status is indicated by icon: checkmark for success, cross for error.
+func (r *CompactRenderer) RenderToolMessage(toolName, toolArgs, toolResult string, isError bool) UIMessage {
+	theme := getTheme()
+
+	// Resolve extension renderer once for all overrides.
+	var extRd *ToolRendererData
+	if r.getToolRenderer != nil {
+		extRd = r.getToolRenderer(toolName)
+	}
+
+	// Status icon
+	var icon string
+	iconColor := theme.Success
+	if isError {
+		icon = "×"
+		iconColor = theme.Error
+	} else {
+		icon = "✓"
+	}
+
+	iconStr := lipgloss.NewStyle().Foreground(iconColor).Bold(true).Render(icon)
+
+	// Extension can override display name.
+	displayName := toolDisplayName(toolName)
+	if extRd != nil && extRd.DisplayName != "" {
+		displayName = extRd.DisplayName
+	}
+	nameStr := lipgloss.NewStyle().Foreground(theme.Info).Bold(true).Render(displayName)
+
+	// Format params — check extension renderer first.
+	paramBudget := max(r.width-10-len(displayName), 20)
+	var params string
+	if extRd != nil && extRd.RenderHeader != nil {
+		params = extRd.RenderHeader(toolArgs, paramBudget)
+	}
+	if params == "" {
+		params = formatToolParams(toolArgs, paramBudget)
+	}
+
+	// Build header line
+	header := iconStr + " " + nameStr
+	if params != "" {
+		header += " " + lipgloss.NewStyle().Foreground(theme.Muted).Render(params)
+	}
+
+	// Format body: check extension renderer first, then compact builtin, then default.
+	var body string
+	if extRd != nil && extRd.RenderBody != nil {
+		body = extRd.RenderBody(toolResult, isError, r.width-4)
+		// Apply markdown rendering if requested and body is non-empty.
+		if body != "" && extRd.BodyMarkdown {
+			body = strings.TrimSuffix(toMarkdown(body, r.width-4), "\n")
+		}
+	}
+	if body == "" {
+		if isError {
+			body = lipgloss.NewStyle().Foreground(theme.Error).Render(r.formatToolResult(toolResult))
+		} else {
+			// Use compact summary renderers instead of full tool body renderers.
+			body = renderToolBodyCompact(toolName, toolArgs, toolResult, r.width-4)
+			if body == "" {
+				formatted := r.formatToolResult(toolResult)
+				if formatted == "" {
+					body = lipgloss.NewStyle().Foreground(theme.Muted).Italic(true).Render("(no output)")
+				} else {
+					body = lipgloss.NewStyle().Foreground(theme.Muted).Render(formatted)
+				}
+			}
+		}
+	}
+
+	// Combine header + indented body
+	var lines []string
+	lines = append(lines, header)
+	if body != "" {
+		for line := range strings.SplitSeq(body, "\n") {
+			lines = append(lines, "  "+line)
+		}
+	}
+
+	return UIMessage{
+		Type:    ToolMessage,
+		Content: strings.Join(lines, "\n"),
+		Height:  len(lines),
+	}
+}
+
+// RenderSystemMessage renders a system notification or informational message in
+// compact format with a distinctive symbol (*) and "System" label. Content is
+// formatted to fit on a single line for minimal space usage.
+func (r *CompactRenderer) RenderSystemMessage(content string, timestamp time.Time) UIMessage {
+	theme := getTheme()
+	symbol := lipgloss.NewStyle().Foreground(theme.Muted).Render("◇")
+	label := lipgloss.NewStyle().Foreground(theme.Muted).Bold(true).Render("System")
+
+	compactContent := r.formatCompactContent(content)
+
+	line := fmt.Sprintf("%s  %-8s %s", symbol, label, compactContent)
+
+	return UIMessage{
+		Type:      SystemMessage,
+		Content:   line,
+		Height:    1,
+		Timestamp: timestamp,
+	}
+}
+
+// RenderErrorMessage renders an error notification in compact format with a
+// distinctive error symbol (!) and styling to ensure visibility. The error
+// content is displayed in a single line with appropriate color highlighting.
+func (r *CompactRenderer) RenderErrorMessage(errorMsg string, timestamp time.Time) UIMessage {
+	theme := getTheme()
+	symbol := lipgloss.NewStyle().Foreground(theme.Error).Render("!")
+	label := lipgloss.NewStyle().Foreground(theme.Error).Bold(true).Render("Error")
+
+	compactContent := lipgloss.NewStyle().Foreground(theme.Error).Render(r.formatCompactContent(errorMsg))
+
+	line := fmt.Sprintf("%s  %-8s %s", symbol, label, compactContent)
+
+	return UIMessage{
+		Type:      ErrorMessage,
+		Content:   line,
+		Height:    1,
+		Timestamp: timestamp,
+	}
+}
+
+// RenderDebugMessage renders diagnostic information in compact format when debug
+// mode is enabled. Messages are truncated if they exceed the available width to
+// maintain single-line display.
+func (r *CompactRenderer) RenderDebugMessage(message string, timestamp time.Time) UIMessage {
+	theme := getTheme()
+	symbol := lipgloss.NewStyle().Foreground(theme.Tool).Render("*")
+	label := lipgloss.NewStyle().Foreground(theme.Tool).Bold(true).Render("Debug")
+
+	// Truncate message if too long
+	content := message
+	if len(content) > r.width-20 {
+		content = content[:r.width-23] + "..."
+	}
+
+	line := fmt.Sprintf("%s  %-8s %s", symbol, label, content)
+
+	return UIMessage{
+		Type:      SystemMessage,
+		Content:   line,
+		Height:    1,
+		Timestamp: timestamp,
+	}
+}
+
+// RenderDebugConfigMessage renders configuration settings in compact format for
+// debugging purposes. Config entries are displayed as key=value pairs separated
+// by commas, truncated if necessary to fit on a single line.
+func (r *CompactRenderer) RenderDebugConfigMessage(config map[string]any, timestamp time.Time) UIMessage {
+	theme := getTheme()
+	symbol := lipgloss.NewStyle().Foreground(theme.Tool).Render("*")
+	label := lipgloss.NewStyle().Foreground(theme.Tool).Bold(true).Render("Debug")
+
+	// Format config as compact key=value pairs
+	var configPairs []string
+	for key, value := range config {
+		if value != nil {
+			configPairs = append(configPairs, fmt.Sprintf("%s=%v", key, value))
+		}
+	}
+
+	content := strings.Join(configPairs, ", ")
+	if len(content) > r.width-20 {
+		content = content[:r.width-23] + "..."
+	}
+
+	line := fmt.Sprintf("%s  %-8s %s", symbol, label, content)
+
+	return UIMessage{
+		Type:      SystemMessage,
+		Content:   line,
+		Height:    1,
+		Timestamp: timestamp,
+	}
+}
+
+// formatCompactContent formats content for compact single-line display
+func (r *CompactRenderer) formatCompactContent(content string) string {
+	if content == "" {
+		return ""
+	}
+
+	// Remove markdown formatting for compact display
+	content = strings.ReplaceAll(content, "\n", " ")
+	content = strings.ReplaceAll(content, "\t", " ")
+
+	// Collapse multiple spaces
+	for strings.Contains(content, "  ") {
+		content = strings.ReplaceAll(content, "  ", " ")
+	}
+
+	content = strings.TrimSpace(content)
+
+	// Truncate if too long (unless in debug mode)
+	maxLen := max(
+		// Reserve space for symbol and label more conservatively
+		r.width-28,
+		// Minimum width for readability
+		40)
+	if !r.debug && len(content) > maxLen {
+		content = content[:maxLen-3] + "..."
+	}
+
+	return content
+}
+
+// formatUserAssistantContent formats user and assistant content using glamour markdown rendering
+func (r *CompactRenderer) formatUserAssistantContent(content string) string {
+	if content == "" {
+		return ""
+	}
+
+	// Calculate available width more conservatively
+	// Account for: symbol (1) + spaces (2) + label (up to 20 chars) + space (1) + margin (4)
+	availableWidth := max(r.width-28,
+		// Minimum width for readability
+		40)
+
+	// Use glamour to render markdown content with proper width
+	rendered := toMarkdown(content, availableWidth)
+	return strings.TrimSuffix(rendered, "\n")
+}
+
+// wrapText wraps text to the specified width, preserving existing line breaks
+func (r *CompactRenderer) wrapText(text string, width int) string {
+	if width <= 0 {
+		return text
+	}
+
+	lines := strings.Split(text, "\n")
+	var wrappedLines []string
+
+	for _, line := range lines {
+		if len(line) <= width {
+			wrappedLines = append(wrappedLines, line)
+			continue
+		}
+
+		// Wrap long lines
+		words := strings.Fields(line)
+		if len(words) == 0 {
+			wrappedLines = append(wrappedLines, line)
+			continue
+		}
+
+		currentLine := ""
+		for _, word := range words {
+			// If adding this word would exceed the width, start a new line
+			if len(currentLine)+len(word)+1 > width && currentLine != "" {
+				wrappedLines = append(wrappedLines, currentLine)
+				currentLine = word
+			} else {
+				if currentLine == "" {
+					currentLine = word
+				} else {
+					currentLine += " " + word
+				}
+			}
+		}
+		if currentLine != "" {
+			wrappedLines = append(wrappedLines, currentLine)
+		}
+	}
+
+	return strings.Join(wrappedLines, "\n")
+}
+
+// formatToolArgs formats tool arguments for compact display
+func (r *CompactRenderer) formatToolArgs(args string) string {
+	if args == "" || args == "{}" {
+		return ""
+	}
+
+	// Remove JSON braces and format compactly
+	args = strings.TrimSpace(args)
+	if strings.HasPrefix(args, "{") && strings.HasSuffix(args, "}") {
+		args = strings.TrimPrefix(args, "{")
+		args = strings.TrimSuffix(args, "}")
+		args = strings.TrimSpace(args)
+	}
+
+	// Remove quotes around simple values
+	args = strings.ReplaceAll(args, `"`, "")
+
+	// Remove parameter names (e.g., "command: ls" -> "ls", "path: /home" -> "/home")
+	// Look for pattern "key: value" and extract just the value
+	if colonIndex := strings.Index(args, ":"); colonIndex != -1 {
+		args = strings.TrimSpace(args[colonIndex+1:])
+	}
+
+	return r.formatCompactContent(args)
+}
+
+// formatToolResult formats tool results preserving formatting but limiting to 5 lines
+func (r *CompactRenderer) formatToolResult(result string) string {
+	if result == "" {
+		return ""
+	}
+
+	// Check if this is bash output with stdout/stderr tags
+	if strings.Contains(result, "<stdout>") || strings.Contains(result, "<stderr>") {
+		result = r.formatBashOutput(result)
+	}
+
+	// Calculate available width more conservatively
+	availableWidth := max(r.width-28,
+		// Minimum width for readability
+		40)
+
+	// First wrap the text to prevent long lines (tool results are usually plain text, not markdown)
+	wrappedResult := r.wrapText(result, availableWidth)
+
+	// Then limit to 5 lines
+	lines := strings.Split(wrappedResult, "\n")
+	if len(lines) > 5 {
+		lines = lines[:5]
+		// Add truncation indicator
+		if len(lines) == 5 && lines[4] != "" {
+			lines[4] = lines[4] + "..."
+		} else {
+			lines = append(lines, "...")
+		}
+	}
+
+	return strings.Join(lines, "\n")
+}
+
+// formatBashOutput formats bash command output by removing stdout/stderr tags
+// and styling appropriately. Delegates tag parsing to the shared parseBashOutput
+// helper.
+func (r *CompactRenderer) formatBashOutput(result string) string {
+	return parseBashOutput(result, getTheme())
+}

internal/ui/enhanced_styles.go

@@ -1,4 +1,4 @@
-package style
+package ui
 
 import (
 	"fmt"
@@ -35,11 +35,8 @@ func GetTheme() Theme {
 
 // SetTheme updates the global UI theme, affecting all subsequent rendering
 // operations. This allows runtime theme switching for different visual preferences.
-// It also invalidates the markdownTypographyCache so the next call to
-// GetMarkdownTypography picks up the new theme.
 func SetTheme(theme Theme) {
 	currentTheme = theme
-	markdownTypographyCache = nil // invalidate cached renderer; colors may have changed
 }
 
 // MarkdownThemeColors defines colors for markdown rendering and syntax highlighting.
@@ -295,27 +292,44 @@ func ApplyGradient(text string, colorA, colorB color.Color) string {
 	return result.String()
 }
 
-// KitBanner returns the KIT ASCII art title with KITT scanner lights,
-// rendered with a KITT red gradient.
-func KitBanner() string {
-	kittDark := lipgloss.Color("#8B0000")
-	kittBright := lipgloss.Color("#FF2200")
-	lines := []string{
-		"             ██╗  ██╗ ██╗ ████████╗",
-		"             ██║ ██╔╝ ██║ ╚══██╔══╝",
-		"             █████╔╝  ██║    ██║",
-		"             ██╔═██╗  ██║    ██║",
-		"             ██║  ██╗ ██║    ██║",
-		"             ╚═╝  ╚═╝ ╚═╝    ╚═╝",
-		"░░ ░░ ░░ ▒▒ ▒▒ ▓▓ ▓▓ ████ ▓▓ ▓▓ ▒▒ ▒▒ ░░ ░░ ░░",
-	}
-
-	var result strings.Builder
-	for i, line := range lines {
-		if i > 0 {
-			result.WriteString("\n")
-		}
-		result.WriteString(ApplyGradient(line, kittDark, kittBright))
-	}
-	return result.String()
+// CreateGradientText creates styled text with a gradient effect between two colors.
+func CreateGradientText(text string, startColor, endColor color.Color) string {
+	return ApplyGradient(text, startColor, endColor)
+}
+
+// Compact styling utilities
+
+// StyleCompactSymbol creates a lipgloss style for message type indicators in
+// compact mode, using bold colored text to distinguish different message categories.
+func StyleCompactSymbol(symbol string, c color.Color) lipgloss.Style {
+	return lipgloss.NewStyle().
+		Foreground(c).
+		Bold(true)
+}
+
+// StyleCompactLabel creates a lipgloss style for message labels in compact mode
+// with fixed width for alignment and bold colored text for readability.
+func StyleCompactLabel(c color.Color) lipgloss.Style {
+	return lipgloss.NewStyle().
+		Foreground(c).
+		Bold(true).
+		Width(8)
+}
+
+// StyleCompactContent creates a simple lipgloss style for message content in
+// compact mode, applying only color without additional formatting.
+func StyleCompactContent(c color.Color) lipgloss.Style {
+	return lipgloss.NewStyle().
+		Foreground(c)
+}
+
+// FormatCompactLine assembles a complete compact mode message line with consistent
+// spacing and styling. Combines a symbol, fixed-width label, and content with their
+// respective colors to create a uniform appearance across all message types.
+func FormatCompactLine(symbol, label, content string, symbolColor, labelColor, contentColor color.Color) string {
+	styledSymbol := StyleCompactSymbol(symbol, symbolColor).Render(symbol)
+	styledLabel := StyleCompactLabel(labelColor).Render(label)
+	styledContent := StyleCompactContent(contentColor).Render(content)
+
+	return fmt.Sprintf("%s  %-8s %s", styledSymbol, styledLabel, styledContent)
 }

internal/ui/events.go

@@ -1,4 +1,4 @@
-package core
+package ui
 
 // ImageAttachment holds a clipboard image that will be sent alongside the
 // user's text prompt to the LLM. The data is raw image bytes; MediaType is
@@ -10,9 +10,9 @@ type ImageAttachment struct {
 	MediaType string
 }
 
-// SubmitMsg is sent by the InputComponent when the user submits a text prompt.
+// submitMsg is sent by the InputComponent when the user submits a text prompt.
 // The parent model receives this and calls app.Run(Text) to start agent processing.
-type SubmitMsg struct {
+type submitMsg struct {
 	// Text is the user's input text to send to the agent.
 	Text string
 	// Images holds clipboard image attachments to send alongside the text.
@@ -20,10 +20,10 @@ type SubmitMsg struct {
 	Images []ImageAttachment
 }
 
-// CancelTimerExpiredMsg is sent by the tea.Tick command that starts when the user
+// cancelTimerExpiredMsg is sent by the tea.Tick command that starts when the user
 // presses ESC once during stateWorking. If this message arrives before the user
 // presses ESC a second time, the canceling state is reset to false.
-type CancelTimerExpiredMsg struct{}
+type cancelTimerExpiredMsg struct{}
 
 // --- Tree session events ---
 
@@ -42,14 +42,14 @@ type TreeNodeSelectedMsg struct {
 // TreeCancelledMsg is sent when the user cancels the tree selector (ESC).
 type TreeCancelledMsg struct{}
 
-// ShellCommandMsg is sent by the InputComponent when the user submits a
+// shellCommandMsg is sent by the InputComponent when the user submits a
 // ! or !! prefixed command. The parent model intercepts this to execute
 // the shell command directly instead of forwarding to the LLM.
 //
 // Matching pi's behavior:
 //   - !cmd  → run shell command, output INCLUDED in LLM context
 //   - !!cmd → run shell command, output EXCLUDED from LLM context
-type ShellCommandMsg struct {
+type shellCommandMsg struct {
 	// Command is the shell command to execute (prefix stripped).
 	Command string
 	// ExcludeFromContext is true for !! (output excluded from LLM context),
@@ -57,9 +57,9 @@ type ShellCommandMsg struct {
 	ExcludeFromContext bool
 }
 
-// ShellCommandResultMsg carries the result of a shell command execution
+// shellCommandResultMsg carries the result of a shell command execution
 // back to the parent model for display.
-type ShellCommandResultMsg struct {
+type shellCommandResultMsg struct {
 	// Command is the original shell command that was executed.
 	Command string
 	// Output is the combined stdout/stderr output.
@@ -68,6 +68,6 @@ type ShellCommandResultMsg struct {
 	ExitCode int
 	// Err is non-nil if the command failed to start or timed out.
 	Err error
-	// ExcludeFromContext mirrors the flag from ShellCommandMsg.
+	// ExcludeFromContext mirrors the flag from shellCommandMsg.
 	ExcludeFromContext bool
 }

internal/ui/exports.go

@@ -1,62 +0,0 @@
-package ui
-
-// This file re-exports types from subpackages for backward compatibility.
-// External importers can continue using ui.XXX without needing to import
-// from subpackages directly.
-
-import (
-	"github.com/mark3labs/kit/internal/ui/commands"
-	"github.com/mark3labs/kit/internal/ui/core"
-	"github.com/mark3labs/kit/internal/ui/fileutil"
-	"github.com/mark3labs/kit/internal/ui/prefs"
-	"github.com/mark3labs/kit/internal/ui/style"
-)
-
-// Re-export from core package
-type (
-	ImageAttachment       = core.ImageAttachment
-	SubmitMsg             = core.SubmitMsg
-	CancelTimerExpiredMsg = core.CancelTimerExpiredMsg
-	TreeNodeSelectedMsg   = core.TreeNodeSelectedMsg
-	TreeCancelledMsg      = core.TreeCancelledMsg
-	ShellCommandMsg       = core.ShellCommandMsg
-	ShellCommandResultMsg = core.ShellCommandResultMsg
-)
-
-// Re-export from commands package
-type (
-	SlashCommand     = commands.SlashCommand
-	ExtensionCommand = commands.ExtensionCommand
-)
-
-// Re-export functions from fileutil package
-var ProcessFileAttachments = fileutil.ProcessFileAttachments
-
-// Re-export from prefs package
-var (
-	LoadThemePreference         = prefs.LoadThemePreference
-	SaveThemePreference         = prefs.SaveThemePreference
-	LoadModelPreference         = prefs.LoadModelPreference
-	SaveModelPreference         = prefs.SaveModelPreference
-	LoadThinkingLevelPreference = prefs.LoadThinkingLevelPreference
-	SaveThinkingLevelPreference = prefs.SaveThinkingLevelPreference
-)
-
-// Re-export from style package
-type (
-	Theme               = style.Theme
-	MarkdownThemeColors = style.MarkdownThemeColors
-)
-
-var (
-	GetTheme                = style.GetTheme
-	SetTheme                = style.SetTheme
-	DefaultTheme            = style.DefaultTheme
-	ApplyTheme              = style.ApplyTheme
-	ApplyThemeWithoutSave   = style.ApplyThemeWithoutSave
-	ListThemes              = style.ListThemes
-	RegisterThemeFromConfig = style.RegisterThemeFromConfig
-	KitBanner               = style.KitBanner
-	AdaptiveColor           = style.AdaptiveColor
-	IsDarkBackground        = style.IsDarkBackground
-)

internal/ui/factory.go

@@ -25,6 +25,7 @@ type CLISetupOptions struct {
 	Agent          AgentInterface
 	ModelString    string
 	Debug          bool
+	Compact        bool
 	Quiet          bool
 	ShowDebug      bool   // Whether to show debug config
 	ProviderAPIKey string // For OAuth detection
@@ -75,7 +76,7 @@ func SetupCLI(opts *CLISetupOptions) (*CLI, error) {
 		return nil, nil // No CLI in quiet mode
 	}
 
-	cli, err := NewCLI(opts.Debug)
+	cli, err := NewCLI(opts.Debug, opts.Compact)
 	if err != nil {
 		return nil, fmt.Errorf("failed to create CLI: %v", err)
 	}

internal/ui/file_processor.go

@@ -1,4 +1,4 @@
-package fileutil
+package ui
 
 import (
 	"fmt"

internal/ui/file_suggestions.go

@@ -6,6 +6,7 @@ import (
 	"path/filepath"
 	"sort"
 	"strings"
+	"unicode/utf8"
 )
 
 // FileSuggestion represents a single file or directory suggestion for the @
@@ -344,14 +345,44 @@ func scoreFilePath(query, path string) int {
 	}
 
 	// Fuzzy character match on basename.
-	if score := fuzzyCharacterMatch(query, baseNameLower); score > 0 {
+	if score := fuzzyCharMatch(query, baseNameLower); score > 0 {
 		return score
 	}
 
 	// Fuzzy character match on full path.
-	if score := fuzzyCharacterMatch(query, pathLower); score > 0 {
+	if score := fuzzyCharMatch(query, pathLower); score > 0 {
 		return score - 50
 	}
 
 	return 0
 }
+
+// fuzzyCharMatch performs character-by-character fuzzy matching. Returns a
+// positive score if all query characters appear in order in the target.
+func fuzzyCharMatch(query, target string) int {
+	if utf8.RuneCountInString(query) > utf8.RuneCountInString(target) {
+		return 0
+	}
+
+	qRunes := []rune(query)
+	tRunes := []rune(target)
+	qi := 0
+	score := 100
+	consecutive := 0
+
+	for ti := 0; ti < len(tRunes) && qi < len(qRunes); ti++ {
+		if tRunes[ti] == qRunes[qi] {
+			qi++
+			consecutive++
+			score += consecutive * 5
+		} else {
+			consecutive = 0
+			score -= 2
+		}
+	}
+
+	if qi < len(qRunes) {
+		return 0
+	}
+	return score
+}

internal/ui/format.go

@@ -5,34 +5,32 @@ import (
 	"time"
 
 	"charm.land/lipgloss/v2"
-
-	"github.com/mark3labs/kit/internal/ui/style"
 )
 
-// Renderer is the interface satisfied by MessageRenderer. It allows model.go
-// and cli.go to call rendering methods uniformly.
+// Renderer is the interface satisfied by both MessageRenderer and
+// CompactRenderer. It allows model.go and cli.go to call rendering methods
+// without branching on compact mode.
 type Renderer interface {
 	RenderUserMessage(content string, timestamp time.Time) UIMessage
 	RenderAssistantMessage(content string, timestamp time.Time, modelName string) UIMessage
-	RenderReasoningBlock(content string, timestamp time.Time) UIMessage
 	RenderToolMessage(toolName, toolArgs, toolResult string, isError bool) UIMessage
 	RenderSystemMessage(content string, timestamp time.Time) UIMessage
 	RenderErrorMessage(errorMsg string, timestamp time.Time) UIMessage
 	RenderDebugMessage(message string, timestamp time.Time) UIMessage
 	RenderDebugConfigMessage(config map[string]any, timestamp time.Time) UIMessage
 	SetWidth(width int)
-	UpdateTheme()
 }
 
-// Compile-time check that MessageRenderer satisfies the Renderer interface.
+// Compile-time checks that both renderers satisfy the Renderer interface.
 var _ Renderer = (*MessageRenderer)(nil)
+var _ Renderer = (*CompactRenderer)(nil)
 
 // parseBashOutput parses <stdout>/<stderr> tagged output from bash tool
 // results, styling stderr with the theme's error color. Returns the
 // combined, styled output string with tags stripped.
 //
-// Shared by MessageRenderer.
-func parseBashOutput(result string, theme style.Theme) string {
+// Shared by both MessageRenderer and CompactRenderer.
+func parseBashOutput(result string, theme Theme) string {
 	var formattedResult strings.Builder
 	remaining := result
 

internal/ui/fuzzy.go

@@ -2,22 +2,20 @@ package ui
 
 import (
 	"strings"
-
-	"github.com/mark3labs/kit/internal/ui/commands"
 )
 
 // FuzzyMatch represents the result of a fuzzy string matching operation,
 // containing the matched command and its relevance score. Higher scores
 // indicate better matches.
 type FuzzyMatch struct {
-	Command *commands.SlashCommand
+	Command *SlashCommand
 	Score   int
 }
 
 // FuzzyMatchCommands performs fuzzy string matching on the provided slash commands
 // based on the query string. Returns a slice of matches sorted by relevance score
 // in descending order. An empty query returns all commands with zero scores.
-func FuzzyMatchCommands(query string, commands []commands.SlashCommand) []FuzzyMatch {
+func FuzzyMatchCommands(query string, commands []SlashCommand) []FuzzyMatch {
 	if query == "" || query == "/" {
 		// Return all commands when query is empty or just "/"
 		matches := make([]FuzzyMatch, len(commands))
@@ -59,7 +57,7 @@ func FuzzyMatchCommands(query string, commands []commands.SlashCommand) []FuzzyM
 }
 
 // fuzzyScore calculates the fuzzy match score for a command
-func fuzzyScore(query string, cmd *commands.SlashCommand) int {
+func fuzzyScore(query string, cmd *SlashCommand) int {
 	// Check exact match first
 	cmdName := strings.ToLower(strings.TrimPrefix(cmd.Name, "/"))
 	if cmdName == query {
@@ -115,23 +113,19 @@ func fuzzyScore(query string, cmd *commands.SlashCommand) int {
 	return 0
 }
 
-// fuzzyCharacterMatch performs character-by-character fuzzy matching using
-// rune-safe iteration so multi-byte Unicode characters are handled correctly.
-// Returns a positive score if all query runes appear in order within target.
+// fuzzyCharacterMatch performs character-by-character fuzzy matching
 func fuzzyCharacterMatch(query, target string) int {
-	qRunes := []rune(query)
-	tRunes := []rune(target)
-	if len(qRunes) > len(tRunes) {
+	if len(query) > len(target) {
 		return 0
 	}
 
-	qi := 0
+	queryIdx := 0
 	score := 100
 	consecutiveMatches := 0
 
-	for ti := 0; ti < len(tRunes) && qi < len(qRunes); ti++ {
-		if tRunes[ti] == qRunes[qi] {
-			qi++
+	for i := 0; i < len(target) && queryIdx < len(query); i++ {
+		if target[i] == query[queryIdx] {
+			queryIdx++
 			consecutiveMatches++
 			score += consecutiveMatches * 10
 		} else {
@@ -141,7 +135,7 @@ func fuzzyCharacterMatch(query, target string) int {
 	}
 
 	// Must match all characters in query
-	if qi < len(qRunes) {
+	if queryIdx < len(query) {
 		return 0
 	}
 

internal/ui/input.go

@@ -10,9 +10,6 @@ import (
 	"charm.land/lipgloss/v2"
 
 	"github.com/mark3labs/kit/internal/clipboard"
-	"github.com/mark3labs/kit/internal/ui/commands"
-	"github.com/mark3labs/kit/internal/ui/core"
-	"github.com/mark3labs/kit/internal/ui/style"
 )
 
 // InputComponent is the interactive text input field for the parent AppModel.
@@ -32,7 +29,7 @@ import (
 // app.Run().
 type InputComponent struct {
 	textarea    textarea.Model
-	commands    []commands.SlashCommand
+	commands    []SlashCommand
 	showPopup   bool
 	filtered    []FuzzyMatch
 	selected    int
@@ -45,17 +42,17 @@ type InputComponent struct {
 	// Argument completion state. When the user types "/cmd " followed by
 	// a partial argument and the command has a Complete function, the popup
 	// switches to argument-completion mode showing suggestions from Complete.
-	argMode      bool                    // true when showing arg completions
-	argCommand   string                  // command prefix for arg mode (e.g. "/bookmark")
-	argSynthCmds []commands.SlashCommand // backing storage for synthetic arg entries
+	argMode      bool           // true when showing arg completions
+	argCommand   string         // command prefix for arg mode (e.g. "/bookmark")
+	argSynthCmds []SlashCommand // backing storage for synthetic arg entries
 
 	// File completion state. When the user types @ followed by a partial
 	// file path, the popup shows file/directory suggestions from the cwd.
-	fileMode        bool                    // true when showing @file completions
-	filePrefix      string                  // current text after @ being matched
-	fileAtStartIdx  int                     // byte offset of @ in the textarea value
-	fileSuggestions []FileSuggestion        // backing storage for file entries
-	fileSynthCmds   []commands.SlashCommand // synthetic commands.SlashCommands wrapping file entries
+	fileMode        bool             // true when showing @file completions
+	filePrefix      string           // current text after @ being matched
+	fileAtStartIdx  int              // byte offset of @ in the textarea value
+	fileSuggestions []FileSuggestion // backing storage for file entries
+	fileSynthCmds   []SlashCommand   // synthetic SlashCommands wrapping file entries
 
 	// cwd is the working directory used for @file path resolution and
 	// autocomplete suggestions. Set by the parent via SetCwd.
@@ -74,7 +71,7 @@ type InputComponent struct {
 
 	// pendingImages holds clipboard images attached to the next submission.
 	// Images are added via Ctrl+V and cleared on submit or Ctrl+U.
-	pendingImages []core.ImageAttachment
+	pendingImages []ImageAttachment
 
 	// history stores previously submitted prompts (most recent last).
 	// Limited to maxHistory entries; duplicates of the previous entry are
@@ -97,7 +94,7 @@ const maxHistory = 100
 
 // clipboardImageMsg is the result of an async clipboard image read.
 type clipboardImageMsg struct {
-	image *core.ImageAttachment
+	image *ImageAttachment
 	err   error
 }
 
@@ -122,7 +119,7 @@ func NewInputComponent(width int, title string, appCtrl AppController) *InputCom
 	)
 
 	// Style the textarea using theme colors.
-	theme := style.GetTheme()
+	theme := GetTheme()
 	styles := ta.Styles()
 	styles.Focused.Base = lipgloss.NewStyle()
 	styles.Focused.Placeholder = lipgloss.NewStyle().Foreground(theme.VeryMuted)
@@ -133,7 +130,7 @@ func NewInputComponent(width int, title string, appCtrl AppController) *InputCom
 
 	return &InputComponent{
 		textarea:    ta,
-		commands:    commands.SlashCommands,
+		commands:    SlashCommands,
 		width:       width,
 		popupHeight: 7,
 		title:       title,
@@ -332,7 +329,7 @@ func (s *InputComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 					s.filePrefix = prefix
 					s.fileAtStartIdx = atIdx
 					s.fileSuggestions = suggestions
-					s.fileSynthCmds = make([]commands.SlashCommand, len(suggestions))
+					s.fileSynthCmds = make([]SlashCommand, len(suggestions))
 					s.filtered = make([]FuzzyMatch, len(suggestions))
 					for i, fs := range suggestions {
 						name := fs.RelPath
@@ -340,7 +337,7 @@ func (s *InputComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 						if fs.IsDir {
 							desc = "directory"
 						}
-						s.fileSynthCmds[i] = commands.SlashCommand{Name: name, Description: desc}
+						s.fileSynthCmds[i] = SlashCommand{Name: name, Description: desc}
 						s.filtered[i] = FuzzyMatch{Command: &s.fileSynthCmds[i], Score: fs.Score}
 					}
 					s.selected = 0
@@ -399,27 +396,34 @@ func (s *InputComponent) handleSubmit(value string) tea.Cmd {
 		cmd := strings.TrimSpace(trimmed[2:])
 		if cmd != "" {
 			return func() tea.Msg {
-				return core.ShellCommandMsg{Command: cmd, ExcludeFromContext: true}
+				return shellCommandMsg{Command: cmd, ExcludeFromContext: true}
 			}
 		}
 	} else if strings.HasPrefix(trimmed, "!") {
 		cmd := strings.TrimSpace(trimmed[1:])
 		if cmd != "" {
 			return func() tea.Msg {
-				return core.ShellCommandMsg{Command: cmd, ExcludeFromContext: false}
+				return shellCommandMsg{Command: cmd, ExcludeFromContext: false}
 			}
 		}
 	}
 
 	// Resolve via canonical command lookup so aliases are handled uniformly.
-	// Only /quit is handled locally — all other slash commands (including
-	// /clear and /clear-queue) are forwarded to the parent model via
-	// submitMsg so the parent can update its own state (ScrollList, queue
-	// counts, etc.) in one place.
-	if sc := commands.GetCommandByName(trimmed); sc != nil {
+	// Only /quit and /clear are handled locally — /clear-queue must go
+	// through the parent model so it can update queueCount directly
+	// (calling ClearQueue here would skip the UI state update since we
+	// can't send events from within Update without deadlocking).
+	if sc := GetCommandByName(trimmed); sc != nil {
 		switch sc.Name {
 		case "/quit":
 			return tea.Quit
+
+		case "/clear":
+			if s.appCtrl != nil {
+				s.appCtrl.ClearMessages()
+			}
+			// Don't forward to app.Run(); just clear silently.
+			return nil
 		}
 	}
 
@@ -429,7 +433,7 @@ func (s *InputComponent) handleSubmit(value string) tea.Cmd {
 	images := s.pendingImages
 	s.pendingImages = nil
 	return func() tea.Msg {
-		return core.SubmitMsg{Text: trimmed, Images: images}
+		return submitMsg{Text: trimmed, Images: images}
 	}
 }
 
@@ -466,7 +470,7 @@ func (s *InputComponent) resetHistoryBrowsing() {
 func (s *InputComponent) View() tea.View {
 	containerStyle := lipgloss.NewStyle()
 
-	theme := style.GetTheme()
+	theme := GetTheme()
 
 	// PaddingLeft(3) aligns with message content: border(1) + paddingLeft(2).
 	titleStyle := lipgloss.NewStyle().
@@ -489,8 +493,10 @@ func (s *InputComponent) View() tea.View {
 	view.WriteString("\n")
 	view.WriteString(inputBoxStyle.Render(s.textarea.View()))
 
-	// Popup is now rendered as a centered overlay in AppModel.View()
-	// instead of inline here to prevent bottom overflow
+	if s.showPopup && len(s.filtered) > 0 {
+		view.WriteString("\n")
+		view.WriteString(s.renderPopup())
+	}
 
 	// Show image attachment indicator when images are pending.
 	if len(s.pendingImages) > 0 {
@@ -538,62 +544,19 @@ func (s *InputComponent) View() tea.View {
 }
 
 // renderPopup renders the autocomplete popup for slash command suggestions.
-// When rendered inline (not centered), returns the styled popup content.
-// RenderPopupCentered renders the popup as a centered overlay.
-func (s *InputComponent) RenderPopupCentered(termWidth, termHeight int) string {
-	if !s.showPopup || len(s.filtered) == 0 {
-		return ""
-	}
-
-	popupContent := s.renderPopupWithOptions(true)
-
-	// Center popup using lipgloss.Place
-	positioned := lipgloss.Place(
-		termWidth,
-		termHeight,
-		lipgloss.Center,
-		lipgloss.Center,
-		popupContent,
-	)
-
-	return positioned
-}
-
-// renderPopupWithOptions renders the popup content with optional center styling.
-func (s *InputComponent) renderPopupWithOptions(centered bool) string {
-	theme := style.GetTheme()
+func (s *InputComponent) renderPopup() string {
+	theme := GetTheme()
 	popupWidth := max(s.width-4, 20)
-
-	// Use the theme background for the popup - the full-width item backgrounds
-	// and primary-colored selection will provide sufficient contrast
-	popupBg := theme.Background
-
 	popupStyle := lipgloss.NewStyle().
 		Border(lipgloss.RoundedBorder()).
-		BorderForeground(theme.Primary).
-		Background(popupBg).
+		BorderForeground(theme.MutedBorder).
 		Padding(1, 2).
 		Width(popupWidth).
-		MarginLeft(0).
-		MarginBottom(1) // Visual depth/shadow effect
+		MarginLeft(0)
 
 	// Inner content width: popup minus border (2) and horizontal padding (4).
 	innerWidth := max(popupWidth-6, 10)
 
-	// Item background styles for high contrast
-	normalItemBg := lipgloss.NewStyle().
-		Background(popupBg).
-		Foreground(theme.Text).
-		Width(innerWidth).
-		Padding(0, 1)
-
-	selectedItemBg := lipgloss.NewStyle().
-		Background(theme.Primary).
-		Foreground(theme.Background).
-		Width(innerWidth).
-		Padding(0, 1).
-		Bold(true)
-
 	var items []string
 
 	visibleItems := min(len(s.filtered), s.popupHeight)
@@ -607,45 +570,44 @@ func (s *InputComponent) renderPopupWithOptions(centered bool) string {
 		match := s.filtered[i]
 		sc := match.Command
 
-		// Choose the appropriate background style
-		itemStyle := normalItemBg
-		if i == s.selected {
-			itemStyle = selectedItemBg
-		}
-
-		// Build indicator with proper coloring
 		var indicator string
 		if i == s.selected {
-			indicator = "> "
+			indicator = lipgloss.NewStyle().Foreground(theme.Primary).Render("> ")
 		} else {
 			indicator = "  "
 		}
 
-		// Build content with name and description
-		var content string
+		nameStyle := lipgloss.NewStyle().Foreground(theme.Secondary).Bold(true)
+		descStyle := lipgloss.NewStyle().Foreground(theme.Muted)
+		if i == s.selected {
+			nameStyle = nameStyle.Foreground(theme.Primary)
+			descStyle = descStyle.Foreground(theme.Text)
+		}
+
 		if s.fileMode {
-			// File mode: use full width for the path, show description inline
+			// File mode: use full width for the path, show description
+			// (e.g. "directory") inline after a gap.
 			maxNameLen := max(innerWidth-16, 8)
 			displayName := sc.Name
 			if len(displayName) > maxNameLen && maxNameLen > 3 {
 				displayName = displayName[:maxNameLen-3] + "..."
 			}
-
+			name := nameStyle.Render(displayName)
 			if sc.Description != "" && innerWidth > 30 {
-				content = indicator + displayName + "  " + sc.Description
+				items = append(items, indicator+name+"  "+descStyle.Render(sc.Description))
 			} else {
-				content = indicator + displayName
+				items = append(items, indicator+name)
 			}
 		} else {
-			// Line layout: indicator(2) + name(nameWidth-2 visual) + desc
+			// Line layout: indicator(2) + name(nameWidth-2 visual) + desc.
 			if innerWidth < 20 {
-				// Very narrow: show truncated name only
+				// Very narrow: show truncated name only, no fixed column.
 				displayName := sc.Name
 				maxName := max(innerWidth-2, 3)
 				if len(displayName) > maxName {
 					displayName = displayName[:maxName-1] + "…"
 				}
-				content = indicator + displayName
+				items = append(items, indicator+nameStyle.Render(displayName))
 			} else {
 				nameWidth := 15
 				if innerWidth < 25 {
@@ -656,41 +618,33 @@ func (s *InputComponent) renderPopupWithOptions(centered bool) string {
 				if len(displayName) > maxNameChars {
 					displayName = displayName[:maxNameChars-1] + "…"
 				}
+				name := nameStyle.Width(maxNameChars).Render(displayName)
 
-				// Description gets remaining space
+				// Description gets remaining space.
 				maxDescLen := max(innerWidth-nameWidth, 0)
 				desc := sc.Description
-				if maxDescLen >= 4 && desc != "" {
+				if maxDescLen < 4 {
+					items = append(items, indicator+name)
+				} else {
 					if len(desc) > maxDescLen {
 						desc = desc[:maxDescLen-3] + "..."
 					}
-					content = indicator + lipgloss.NewStyle().Width(maxNameChars).Render(displayName) + desc
-				} else {
-					content = indicator + displayName
+					items = append(items, indicator+name+descStyle.Render(desc))
 				}
 			}
 		}
-
-		items = append(items, itemStyle.Render(content))
 	}
 
-	// Add scroll indicators with background
-	scrollStyle := lipgloss.NewStyle().
-		Background(popupBg).
-		Foreground(theme.VeryMuted).
-		Width(innerWidth).
-		Padding(0, 1)
-
 	if startIdx > 0 {
-		items = append([]string{scrollStyle.Render("  ↑ more above")}, items...)
+		items = append([]string{lipgloss.NewStyle().Foreground(theme.VeryMuted).Render("  ↑ more above")}, items...)
 	}
 	if endIdx < len(s.filtered) {
-		items = append(items, scrollStyle.Render("  ↓ more below"))
+		items = append(items, lipgloss.NewStyle().Foreground(theme.VeryMuted).Render("  ↓ more below"))
 	}
 
 	content := strings.Join(items, "\n")
 
-	// Adapt footer text to available width with background
+	// Adapt footer text to available width.
 	var footerText string
 	if innerWidth >= 50 {
 		footerText = "↑↓ navigate • tab complete • ↵ select • esc dismiss"
@@ -699,10 +653,7 @@ func (s *InputComponent) renderPopupWithOptions(centered bool) string {
 	} else {
 		footerText = "↑↓ tab ↵ esc"
 	}
-	footer := lipgloss.NewStyle().
-		Background(popupBg).
-		Foreground(theme.VeryMuted).
-		Italic(true).
+	footer := lipgloss.NewStyle().Foreground(theme.VeryMuted).Italic(true).
 		Render(footerText)
 
 	return popupStyle.Render(content + "\n\n" + footer)
@@ -732,10 +683,10 @@ func (s *InputComponent) completeArgs(line string) []FuzzyMatch {
 
 	s.argMode = true
 	s.argCommand = cmdName
-	s.argSynthCmds = make([]commands.SlashCommand, len(suggestions))
+	s.argSynthCmds = make([]SlashCommand, len(suggestions))
 	s.filtered = make([]FuzzyMatch, len(suggestions))
 	for i, sug := range suggestions {
-		s.argSynthCmds[i] = commands.SlashCommand{Name: sug}
+		s.argSynthCmds[i] = SlashCommand{Name: sug}
 		s.filtered[i] = FuzzyMatch{Command: &s.argSynthCmds[i]}
 	}
 	return s.filtered
@@ -743,7 +694,7 @@ func (s *InputComponent) completeArgs(line string) []FuzzyMatch {
 
 // findCommandWithComplete looks up a command by name that has a non-nil
 // Complete function.
-func (s *InputComponent) findCommandWithComplete(name string) *commands.SlashCommand {
+func (s *InputComponent) findCommandWithComplete(name string) *SlashCommand {
 	for i := range s.commands {
 		if s.commands[i].Name == name && s.commands[i].Complete != nil {
 			return &s.commands[i]
@@ -761,7 +712,7 @@ func readClipboardImageCmd() tea.Cmd {
 			return clipboardImageMsg{err: err}
 		}
 		return clipboardImageMsg{
-			image: &core.ImageAttachment{
+			image: &ImageAttachment{
 				Data:      img.Data,
 				MediaType: img.MediaType,
 			},
@@ -771,7 +722,7 @@ func readClipboardImageCmd() tea.Cmd {
 
 // ClearPendingImages removes all pending image attachments and returns them.
 // Used by the parent model when consuming images for submission.
-func (s *InputComponent) ClearPendingImages() []core.ImageAttachment {
+func (s *InputComponent) ClearPendingImages() []ImageAttachment {
 	images := s.pendingImages
 	s.pendingImages = nil
 	return images

internal/ui/message_items.go

@@ -1,381 +0,0 @@
-package ui
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"charm.land/lipgloss/v2"
-
-	"github.com/mark3labs/kit/internal/ui/render"
-	"github.com/mark3labs/kit/internal/ui/style"
-)
-
-// --------------------------------------------------------------------------
-// MessageItem implementations for ScrollList
-// --------------------------------------------------------------------------
-
-// TextMessageItem represents a completed text message (user or assistant)
-// in the scrollback. It uses pre-rendered styled content from MessageRenderer.
-type TextMessageItem struct {
-	id          string
-	role        string // "user" or "assistant"
-	content     string // Raw content (for re-rendering if needed)
-	preRendered string // Pre-rendered styled content from MessageRenderer
-	timestamp   time.Time
-}
-
-// NewTextMessageItem creates a new text message for the scrollback.
-// The content should be pre-rendered using MessageRenderer for proper styling.
-func NewTextMessageItem(id string, role string, content string) *TextMessageItem {
-	return &TextMessageItem{
-		id:        id,
-		role:      role,
-		content:   content,
-		timestamp: time.Now(),
-	}
-}
-
-// NewStyledMessageItem creates a message item with pre-rendered styled content.
-// This is the preferred way to create messages when you have styled content from MessageRenderer.
-func NewStyledMessageItem(id string, role string, rawContent string, preRendered string) *TextMessageItem {
-	return &TextMessageItem{
-		id:          id,
-		role:        role,
-		content:     rawContent,
-		preRendered: preRendered,
-		timestamp:   time.Now(),
-	}
-}
-
-func (m *TextMessageItem) ID() string {
-	return m.id
-}
-
-func (m *TextMessageItem) Render(width int) string {
-	// If we have pre-rendered styled content, return it
-	if m.preRendered != "" {
-		return m.preRendered
-	}
-
-	// Fallback to simple formatting if no pre-rendered content
-	return m.renderContent(width)
-}
-
-func (m *TextMessageItem) Height() int {
-	rendered := m.Render(0) // Width doesn't matter since we use pre-rendered
-	if rendered == "" {
-		return 0
-	}
-	return strings.Count(rendered, "\n") + 1
-}
-
-func (m *TextMessageItem) renderContent(width int) string {
-	var parts []string
-
-	// Role indicator
-	if m.role == "user" {
-		parts = append(parts, "│ ▸ You")
-	} else {
-		parts = append(parts, "") // Assistant messages start without role
-	}
-
-	// Content with simple wrapping
-	contentWidth := max(width-4, 20)
-
-	for line := range strings.SplitSeq(m.content, "\n") {
-		if len(line) <= contentWidth {
-			parts = append(parts, "│ "+line)
-		} else {
-			// Basic wrap
-			for len(line) > contentWidth {
-				parts = append(parts, "│ "+line[:contentWidth])
-				line = line[contentWidth:]
-			}
-			if len(line) > 0 {
-				parts = append(parts, "│ "+line)
-			}
-		}
-	}
-
-	return strings.Join(parts, "\n")
-}
-
-// --------------------------------------------------------------------------
-// StreamingMessageItem - Live streaming assistant/reasoning text
-// --------------------------------------------------------------------------
-
-// StreamingMessageItem represents actively streaming assistant or reasoning text.
-// It accumulates content chunks and re-renders on each update for live display.
-type StreamingMessageItem struct {
-	id            string
-	role          string // "assistant" or "reasoning"
-	content       string // Accumulated streaming content
-	timestamp     time.Time
-	startTime     time.Time // When streaming started (for live duration counter)
-	modelName     string
-	streaming     bool          // true while actively streaming
-	finalDuration time.Duration // Frozen duration when complete
-	cachedRender  string
-	cachedWidth   int
-}
-
-// NewStreamingMessageItem creates a new streaming message item.
-func NewStreamingMessageItem(id, role string, modelName string) *StreamingMessageItem {
-	now := time.Now()
-	return &StreamingMessageItem{
-		id:        id,
-		role:      role,
-		timestamp: now,
-		startTime: now,
-		modelName: modelName,
-		streaming: true,
-	}
-}
-
-// ID returns the unique identifier.
-func (s *StreamingMessageItem) ID() string {
-	return s.id
-}
-
-// Render renders the streaming message with live content.
-func (s *StreamingMessageItem) Render(width int) string {
-	// For reasoning, never cache - we need live duration updates
-	// For assistant, cache is OK
-	if s.role != "reasoning" && s.cachedWidth == width && s.cachedRender != "" {
-		return s.cachedRender
-	}
-
-	var rendered string
-	if s.role == "reasoning" {
-		// Calculate duration in milliseconds for render.ReasoningBlock
-		var durationMs int64
-		if s.finalDuration > 0 {
-			durationMs = s.finalDuration.Milliseconds()
-		} else if !s.startTime.IsZero() {
-			durationMs = time.Since(s.startTime).Milliseconds()
-		}
-		ty := createTypography(style.GetTheme())
-		rendered = render.ReasoningBlock(s.content, durationMs, ty, style.GetTheme())
-	} else {
-		// Render as assistant message
-		rendered = render.AssistantBlock(s.content, width, style.GetTheme())
-	}
-
-	// Cache and return (but reasoning is never cached due to live duration)
-	if s.role != "reasoning" {
-		s.cachedRender = rendered
-		s.cachedWidth = width
-	}
-	return rendered
-}
-
-// Height returns the number of lines.
-func (s *StreamingMessageItem) Height() int {
-	// For reasoning blocks, cachedRender is never populated (rendering is
-	// width-independent and includes a live timer). Fall back to Render(0)
-	// so callers always get the correct height.
-	rendered := s.cachedRender
-	if rendered == "" {
-		rendered = s.Render(0)
-	}
-	if rendered == "" {
-		return 0
-	}
-	return strings.Count(rendered, "\n") + 1
-}
-
-// AppendChunk adds a content chunk and invalidates the render cache.
-func (s *StreamingMessageItem) AppendChunk(chunk string) {
-	s.content += chunk
-	s.cachedWidth = 0 // Invalidate cache
-}
-
-// MarkComplete marks the streaming message as complete and freezes the duration.
-func (s *StreamingMessageItem) MarkComplete() {
-	s.streaming = false
-	// Freeze the duration for reasoning blocks
-	if s.role == "reasoning" && !s.startTime.IsZero() {
-		s.finalDuration = time.Since(s.startTime)
-	}
-}
-
-// --------------------------------------------------------------------------
-// StreamingBashOutputItem - Live bash command output
-// --------------------------------------------------------------------------
-
-// StreamingBashOutputItem represents live bash command output.
-type StreamingBashOutputItem struct {
-	id           string
-	command      string
-	stdoutLines  []string
-	stderrLines  []string
-	maxLines     int
-	complete     bool
-	cachedRender string
-	cachedWidth  int
-}
-
-// NewStreamingBashOutputItem creates a new streaming bash output item.
-func NewStreamingBashOutputItem(id string, command string) *StreamingBashOutputItem {
-	return &StreamingBashOutputItem{
-		id:          id,
-		command:     command,
-		stdoutLines: make([]string, 0),
-		stderrLines: make([]string, 0),
-		maxLines:    100, // Cap lines to prevent memory issues
-		complete:    false,
-	}
-}
-
-func (m *StreamingBashOutputItem) ID() string {
-	return m.id
-}
-
-func (m *StreamingBashOutputItem) Render(width int) string {
-	// Return cached if width matches and complete
-	if m.complete && m.cachedWidth == width && m.cachedRender != "" {
-		return m.cachedRender
-	}
-
-	theme := style.GetTheme()
-	var parts []string
-
-	// Header with command
-	if m.command != "" {
-		headerStyle := lipgloss.NewStyle().
-			Foreground(theme.Muted).
-			Italic(true)
-		parts = append(parts, headerStyle.Render(fmt.Sprintf("▸ %s", m.command)))
-	}
-
-	const lineIndent = "  "
-	lineWidth := width - len(lineIndent)
-
-	// Stdout lines
-	if len(m.stdoutLines) > 0 {
-		outputStyle := lipgloss.NewStyle().
-			Foreground(theme.Text).
-			Background(theme.CodeBg).
-			PaddingLeft(1).
-			Width(lineWidth)
-		for _, line := range m.stdoutLines {
-			parts = append(parts, lineIndent+outputStyle.Render(line))
-		}
-	}
-
-	// Stderr lines
-	if len(m.stderrLines) > 0 {
-		stderrStyle := lipgloss.NewStyle().
-			Foreground(theme.Error).
-			Background(theme.CodeBg).
-			PaddingLeft(1).
-			Width(lineWidth)
-		for _, line := range m.stderrLines {
-			parts = append(parts, lineIndent+stderrStyle.Render(line))
-		}
-	}
-
-	result := strings.Join(parts, "\n")
-	if m.complete {
-		m.cachedRender = result
-		m.cachedWidth = width
-	}
-	return result
-}
-
-func (m *StreamingBashOutputItem) Height() int {
-	if m.cachedRender != "" {
-		return strings.Count(m.cachedRender, "\n") + 1
-	}
-	// Estimate: command header + stdout + stderr
-	return 1 + len(m.stdoutLines) + len(m.stderrLines)
-}
-
-// AppendStdout adds a stdout line to the output.
-func (m *StreamingBashOutputItem) AppendStdout(line string) {
-	m.stdoutLines = append(m.stdoutLines, line)
-	// Cap lines
-	if len(m.stdoutLines) > m.maxLines {
-		m.stdoutLines = m.stdoutLines[len(m.stdoutLines)-m.maxLines:]
-	}
-	m.cachedWidth = 0 // Invalidate cache
-}
-
-// AppendStderr adds a stderr line to the output.
-func (m *StreamingBashOutputItem) AppendStderr(line string) {
-	m.stderrLines = append(m.stderrLines, line)
-	// Cap lines
-	if len(m.stderrLines) > m.maxLines {
-		m.stderrLines = m.stderrLines[len(m.stderrLines)-m.maxLines:]
-	}
-	m.cachedWidth = 0 // Invalidate cache
-}
-
-// MarkComplete marks the bash output as complete.
-func (m *StreamingBashOutputItem) MarkComplete() {
-	m.complete = true
-}
-
-// --------------------------------------------------------------------------
-// SystemMessageItem - System messages (commands, info, errors)
-// --------------------------------------------------------------------------
-
-// SystemMessageItem represents a system message (commands, info, errors).
-type SystemMessageItem struct {
-	id           string
-	content      string
-	timestamp    time.Time
-	cachedRender string
-	cachedWidth  int
-}
-
-// NewSystemMessageItem creates a new system message for the scrollback.
-func NewSystemMessageItem(id, content string) *SystemMessageItem {
-	return &SystemMessageItem{
-		id:        id,
-		content:   content,
-		timestamp: time.Now(),
-	}
-}
-
-func (m *SystemMessageItem) ID() string {
-	return m.id
-}
-
-func (m *SystemMessageItem) Render(width int) string {
-	// Return cached render if width matches
-	if m.cachedWidth == width && m.cachedRender != "" {
-		return m.cachedRender
-	}
-
-	// Simple system message formatting
-	rendered := "│ " + strings.ReplaceAll(m.content, "\n", "\n│ ")
-
-	// Cache and return
-	m.cachedRender = rendered
-	m.cachedWidth = width
-	return rendered
-}
-
-func (m *SystemMessageItem) Height() int {
-	if m.cachedRender != "" {
-		return strings.Count(m.cachedRender, "\n") + 1
-	}
-	// Estimate
-	if m.cachedWidth > 0 {
-		return (len(m.content) / max(m.cachedWidth-10, 40)) + 3
-	}
-	return 3
-}
-
-// --------------------------------------------------------------------------
-// Helper: generateMessageID
-// --------------------------------------------------------------------------
-
-var messageCounter = 0
-
-func generateMessageID() string {
-	messageCounter++
-	return fmt.Sprintf("msg-%d-%d", time.Now().UnixNano(), messageCounter)
-}

internal/ui/messages.go

@@ -3,17 +3,17 @@ package ui
 import (
 	"encoding/json"
 	"fmt"
+	"regexp"
 	"sort"
 	"strings"
 	"time"
 
 	"charm.land/lipgloss/v2"
-	"github.com/indaco/herald"
-
-	"github.com/mark3labs/kit/internal/ui/render"
-	"github.com/mark3labs/kit/internal/ui/style"
 )
 
+// ansiEscapeRe matches ANSI escape sequences used for terminal styling.
+var ansiEscapeRe = regexp.MustCompile(`\x1b\[[0-9;]*m`)
+
 // MessageType represents different categories of messages displayed in the UI,
 // each with distinct visual styling and formatting rules.
 type MessageType int
@@ -22,9 +22,9 @@ const (
 	UserMessage MessageType = iota
 	AssistantMessage
 	ToolMessage
-	ToolCallMessage
-	SystemMessage
-	ErrorMessage
+	ToolCallMessage // New type for showing tool calls in progress
+	SystemMessage   // New type for KIT system messages (help, tools, etc.)
+	ErrorMessage    // New type for error messages
 )
 
 // UIMessage encapsulates a fully rendered message ready for display in the UI,
@@ -40,9 +40,29 @@ type UIMessage struct {
 	Streaming bool
 }
 
-// toolDisplayName returns a human-friendly display name for a tool,
-// title-casing the first letter of the raw name.
+// Helper functions to get theme colors
+func getTheme() Theme {
+	return GetTheme()
+}
+
+// toolDisplayNames maps raw tool names to human-friendly display names.
+var toolDisplayNames = map[string]string{
+	"bash":          "Bash",
+	"read":          "Read",
+	"write":         "Write",
+	"edit":          "Edit",
+	"grep":          "Grep",
+	"find":          "Find",
+	"ls":            "Ls",
+	"run_shell_cmd": "Bash",
+}
+
+// toolDisplayName returns a human-friendly display name for a tool.
+// Falls back to capitalizing the first letter of the raw name.
 func toolDisplayName(rawName string) string {
+	if display, ok := toolDisplayNames[rawName]; ok {
+		return display
+	}
 	if rawName != "" {
 		return strings.ToUpper(rawName[:1]) + rawName[1:]
 	}
@@ -50,6 +70,8 @@ func toolDisplayName(rawName string) string {
 }
 
 // formatToolParams formats tool input parameters for inline header display.
+// Extracts the primary parameter (command/filePath) first, then shows
+// remaining params as (key=val, ...). Truncates to maxWidth.
 func formatToolParams(toolArgs string, maxWidth int) string {
 	args := strings.TrimSpace(toolArgs)
 	if args == "" || args == "{}" {
@@ -58,6 +80,7 @@ func formatToolParams(toolArgs string, maxWidth int) string {
 
 	var params map[string]any
 	if err := json.Unmarshal([]byte(args), &params); err != nil {
+		// Fallback: strip braces and return raw content
 		args = strings.TrimPrefix(args, "{")
 		args = strings.TrimSuffix(args, "}")
 		args = strings.TrimSpace(args)
@@ -71,6 +94,7 @@ func formatToolParams(toolArgs string, maxWidth int) string {
 		return ""
 	}
 
+	// Identify primary parameter by checking known keys in priority order
 	primaryKeys := []string{"command", "filePath", "path", "pattern", "query", "url"}
 	var primaryKey string
 	var primaryVal string
@@ -87,6 +111,8 @@ func formatToolParams(toolArgs string, maxWidth int) string {
 		result.WriteString(primaryVal)
 	}
 
+	// Collect remaining parameters, skipping body-content keys (already
+	// rendered in the tool body) and any values that are too large.
 	bodyKeys := map[string]bool{
 		"content":  true,
 		"old_text": true,
@@ -129,30 +155,65 @@ func formatToolParams(toolArgs string, maxWidth int) string {
 }
 
 // MessageRenderer handles the formatting and rendering of different message types
+// with consistent styling, markdown support, and appropriate visual hierarchies
+// for the standard (non-compact) display mode.
 type MessageRenderer struct {
-	width           int
-	debug           bool
-	ty              *herald.Typography
+	width int
+	debug bool
+
+	// getToolRenderer returns extension-provided rendering overrides for a
+	// specific tool. May be nil if no extensions are loaded. Used in
+	// RenderToolMessage to check for custom header/body formatting before
+	// falling back to builtin renderers.
 	getToolRenderer func(toolName string) *ToolRendererData
 }
 
-// newMessageRenderer creates and initializes a new MessageRenderer
+// newMessageRenderer creates and initializes a new MessageRenderer with the specified
+// terminal width and debug mode setting. The width parameter determines line wrapping
+// and layout calculations.
 func newMessageRenderer(width int, debug bool) *MessageRenderer {
 	return &MessageRenderer{
 		width: width,
 		debug: debug,
-		ty:    createTypography(style.GetTheme()),
 	}
 }
 
-// SetWidth updates the terminal width for the renderer
+// SetWidth updates the terminal width for the renderer, affecting how content
+// is wrapped and formatted in subsequent render operations.
 func (r *MessageRenderer) SetWidth(width int) {
 	r.width = width
 }
 
-// RenderUserMessage renders a user's input message using herald Tip alert
+// RenderUserMessage renders a user's input message with distinctive right-aligned
+// formatting, including the system username, timestamp, and markdown-rendered content.
+// The message is displayed with a colored right border for visual distinction.
 func (r *MessageRenderer) RenderUserMessage(content string, timestamp time.Time) UIMessage {
-	rendered := render.UserBlock(content, r.ty, style.GetTheme())
+	theme := getTheme()
+
+	// Only run markdown rendering when the message contains code spans or
+	// fenced code blocks. Plain text is rendered directly so that newlines
+	// are preserved without the extra paragraph spacing glamour adds.
+	var messageContent string
+	if strings.Contains(content, "`") {
+		// Glamour treats single \n as a soft break, so convert to paragraph
+		// breaks and collapse the resulting blank lines after rendering.
+		mdContent := strings.ReplaceAll(content, "\n", "\n\n")
+		messageContent = r.renderMarkdown(mdContent, r.width-8)
+		messageContent = removeBlankLines(messageContent)
+	} else {
+		messageContent = content
+	}
+
+	fullContent := strings.TrimSuffix(messageContent, "\n")
+
+	// Left border with Blue color for user messages.
+	rendered := renderContentBlock(
+		fullContent,
+		r.width,
+		WithAlign(lipgloss.Left),
+		WithBorderColor(theme.Info),
+		WithMarginBottom(1),
+	)
 
 	return UIMessage{
 		Type:      UserMessage,
@@ -162,9 +223,32 @@ func (r *MessageRenderer) RenderUserMessage(content string, timestamp time.Time)
 	}
 }
 
-// RenderAssistantMessage renders an AI assistant's response
+// RenderAssistantMessage renders an AI assistant's response with left-aligned formatting,
+// including the model name, timestamp, and markdown-rendered content. Empty responses
+// are ignored and return an empty message. The message features a colored left border
+// for visual distinction.
 func (r *MessageRenderer) RenderAssistantMessage(content string, timestamp time.Time, modelName string) UIMessage {
-	rendered := render.AssistantBlock(content, r.width, style.GetTheme())
+	// Ignore empty responses - don't render anything
+	if strings.TrimSpace(content) == "" {
+		return UIMessage{
+			Type:      AssistantMessage,
+			Content:   "",
+			Height:    0,
+			Timestamp: timestamp,
+		}
+	}
+
+	theme := getTheme()
+	messageContent := r.renderMarkdown(content, r.width-8)
+	fullContent := strings.TrimSuffix(messageContent, "\n")
+
+	// Left border with Primary (Mauve) color for assistant messages.
+	rendered := renderContentBlock(
+		fullContent,
+		r.width,
+		WithBorderColor(theme.Primary),
+		WithMarginBottom(1),
+	)
 
 	return UIMessage{
 		Type:      AssistantMessage,
@@ -174,23 +258,30 @@ func (r *MessageRenderer) RenderAssistantMessage(content string, timestamp time.
 	}
 }
 
-// RenderReasoningBlock renders a reasoning/thinking block with the same styling
-// as live streaming: muted italic text with margin. This is used when resuming
-// sessions to display saved reasoning content.
-func (r *MessageRenderer) RenderReasoningBlock(content string, timestamp time.Time) UIMessage {
-	rendered := render.ReasoningBlock(content, 0, r.ty, style.GetTheme())
-
-	return UIMessage{
-		Type:      AssistantMessage,
-		Content:   rendered,
-		Height:    lipgloss.Height(rendered),
-		Timestamp: timestamp,
-	}
-}
-
-// RenderSystemMessage renders KIT system messages using herald Note alert
+// RenderSystemMessage renders KIT system messages such as help text, command outputs,
+// and informational notifications. These messages are displayed with a distinctive system
+// color border and "KIT System" label to differentiate them from user and AI content.
 func (r *MessageRenderer) RenderSystemMessage(content string, timestamp time.Time) UIMessage {
-	rendered := render.SystemBlock(content, r.ty, style.GetTheme())
+	theme := getTheme()
+
+	var messageContent string
+	if strings.TrimSpace(content) == "" {
+		messageContent = "No content available"
+	} else if strings.Contains(content, "`") {
+		messageContent = r.renderMarkdown(content, r.width-8)
+	} else {
+		messageContent = content
+	}
+
+	fullContent := "◇ " + strings.TrimSuffix(messageContent, "\n")
+
+	rendered := renderContentBlock(
+		fullContent,
+		r.width,
+		WithNoBorder(),
+		WithForeground(theme.Muted),
+		WithMarginBottom(1),
+	)
 
 	return UIMessage{
 		Type:      SystemMessage,
@@ -200,9 +291,27 @@ func (r *MessageRenderer) RenderSystemMessage(content string, timestamp time.Tim
 	}
 }
 
-// RenderDebugMessage renders diagnostic and debugging information
+// RenderDebugMessage renders diagnostic and debugging information with special formatting
+// including a debug icon, colored border, and structured layout. Debug messages are only
+// displayed when debug mode is enabled and help developers troubleshoot issues.
 func (r *MessageRenderer) RenderDebugMessage(message string, timestamp time.Time) UIMessage {
-	header := r.ty.H6("🔍 Debug Output")
+	baseStyle := lipgloss.NewStyle()
+
+	theme := getTheme()
+	style := baseStyle.
+		Width(r.width - 3).
+		BorderLeft(true).
+		Foreground(theme.Muted).
+		BorderForeground(theme.Tool).
+		BorderStyle(lipgloss.ThickBorder()).
+		PaddingLeft(1).
+		MarginLeft(2).
+		MarginBottom(1)
+
+	header := baseStyle.
+		Foreground(theme.Tool).
+		Bold(true).
+		Render("🔍 Debug Output")
 
 	lines := strings.Split(message, "\n")
 	var formattedLines []string
@@ -212,51 +321,87 @@ func (r *MessageRenderer) RenderDebugMessage(message string, timestamp time.Time
 		}
 	}
 
-	content := r.ty.Compose(
+	content := baseStyle.
+		Foreground(theme.Muted).
+		Render(strings.Join(formattedLines, "\n"))
+
+	fullContent := lipgloss.JoinVertical(lipgloss.Left,
 		header,
-		r.ty.P(strings.Join(formattedLines, "\n")),
+		content,
 	)
-	content = styleMarginBottom1.Render(content)
 
 	return UIMessage{
-		Content: content,
-		Height:  lipgloss.Height(content),
+		Content: style.Render(fullContent),
+		Height:  lipgloss.Height(style.Render(fullContent)),
 	}
 }
 
-// RenderDebugConfigMessage renders configuration settings
+// RenderDebugConfigMessage renders configuration settings in a formatted debug display
+// with key-value pairs shown in a structured layout. Used to display runtime configuration
+// for debugging purposes with a distinctive icon and border styling.
 func (r *MessageRenderer) RenderDebugConfigMessage(config map[string]any, timestamp time.Time) UIMessage {
-	header := r.ty.H6("🔧 Debug Configuration")
+	baseStyle := lipgloss.NewStyle()
+
+	theme := getTheme()
+	style := baseStyle.
+		Width(r.width - 1).
+		BorderLeft(true).
+		Foreground(theme.Muted).
+		BorderForeground(theme.Tool).
+		BorderStyle(lipgloss.ThickBorder()).
+		PaddingLeft(1)
+
+	header := baseStyle.
+		Foreground(theme.Tool).
+		Bold(true).
+		Render("🔧 Debug Configuration")
 
 	var configLines []string
 	for key, value := range config {
 		if value != nil {
-			configLines = append(configLines, fmt.Sprintf("%s: %v", key, value))
+			configLines = append(configLines, fmt.Sprintf("  %s: %v", key, value))
 		}
 	}
 
-	var content string
+	configContent := baseStyle.
+		Foreground(theme.Muted).
+		Render(strings.Join(configLines, "\n"))
+
+	parts := []string{header}
 	if len(configLines) > 0 {
-		content = r.ty.Compose(
-			header,
-			r.ty.P(strings.Join(configLines, "\n")),
-		)
-	} else {
-		content = header
+		parts = append(parts, configContent)
 	}
-	content = styleMarginBottom1.Render(content)
+
+	rendered := style.Render(
+		lipgloss.JoinVertical(lipgloss.Left, parts...),
+	)
 
 	return UIMessage{
 		Type:      SystemMessage,
-		Content:   content,
-		Height:    lipgloss.Height(content),
+		Content:   rendered,
+		Height:    lipgloss.Height(rendered),
 		Timestamp: timestamp,
 	}
 }
 
-// RenderErrorMessage renders error notifications
+// RenderErrorMessage renders error notifications with distinctive red coloring and
+// bold text to ensure visibility. Error messages include timestamp information and
+// are displayed with an error-colored border for immediate recognition.
 func (r *MessageRenderer) RenderErrorMessage(errorMsg string, timestamp time.Time) UIMessage {
-	rendered := render.ErrorBlock(errorMsg, r.ty, style.GetTheme())
+	theme := getTheme()
+
+	errorContent := lipgloss.NewStyle().
+		Foreground(theme.Error).
+		Bold(true).
+		Render(errorMsg)
+
+	rendered := renderContentBlock(
+		errorContent,
+		r.width,
+		WithAlign(lipgloss.Left),
+		WithBorderColor(theme.Error),
+		WithMarginBottom(1),
+	)
 
 	return UIMessage{
 		Type:      ErrorMessage,
@@ -266,18 +411,93 @@ func (r *MessageRenderer) RenderErrorMessage(errorMsg string, timestamp time.Tim
 	}
 }
 
-// RenderToolMessage renders a unified tool block
+// RenderToolCallMessage renders a notification that a tool is being executed, showing
+// the tool name, formatted arguments (if any), and execution timestamp. The message
+// uses tool-specific coloring to distinguish it from regular conversation messages.
+func (r *MessageRenderer) RenderToolCallMessage(toolName, toolArgs string, timestamp time.Time) UIMessage {
+	// Format timestamp
+	timeStr := timestamp.Local().Format("15:04")
+
+	// Format arguments with better presentation
+	theme := getTheme()
+	var argsContent string
+	if toolArgs != "" && toolArgs != "{}" {
+		argsContent = lipgloss.NewStyle().
+			Foreground(theme.Muted).
+			Italic(true).
+			Render(fmt.Sprintf("Arguments: %s", r.formatToolArgs(toolArgs)))
+	}
+
+	// Create info line
+	info := fmt.Sprintf(" Executing %s (%s)", toolName, timeStr)
+
+	// Combine parts
+	var fullContent string
+	if argsContent != "" {
+		fullContent = argsContent + "\n" +
+			lipgloss.NewStyle().Foreground(theme.VeryMuted).Render(info)
+	} else {
+		fullContent = lipgloss.NewStyle().Foreground(theme.VeryMuted).Render(info)
+	}
+
+	// Use the new block renderer
+	rendered := renderContentBlock(
+		fullContent,
+		r.width,
+		WithAlign(lipgloss.Left),
+		WithBorderColor(theme.Tool),
+		WithMarginBottom(1),
+	)
+
+	return UIMessage{
+		Type:      ToolCallMessage,
+		Content:   rendered,
+		Height:    lipgloss.Height(rendered),
+		Timestamp: timestamp,
+	}
+}
+
+// RenderToolMessage renders a unified tool block combining the tool invocation
+// header (icon + display name + params) with the execution result body. The
+// border color indicates status: green for success, red for error. This replaces
+// the previous two-block approach (separate call + result blocks).
 func (r *MessageRenderer) RenderToolMessage(toolName, toolArgs, toolResult string, isError bool) UIMessage {
+	theme := getTheme()
+
+	// Resolve extension renderer once for all overrides.
 	var extRd *ToolRendererData
 	if r.getToolRenderer != nil {
 		extRd = r.getToolRenderer(toolName)
 	}
 
+	// --- Header: [icon] [name] [params] ---
+	var icon string
+	borderColor := theme.Success
+	iconColor := theme.Success
+	if isError {
+		icon = "×"
+		borderColor = theme.Error
+		iconColor = theme.Error
+	} else {
+		icon = "✓"
+	}
+
+	// Extension can override border color (applies to both success and error).
+	if extRd != nil && extRd.BorderColor != "" {
+		borderColor = lipgloss.Color(extRd.BorderColor)
+	}
+
+	iconStr := lipgloss.NewStyle().Foreground(iconColor).Bold(true).Render(icon)
+
+	// Extension can override display name.
 	displayName := toolDisplayName(toolName)
 	if extRd != nil && extRd.DisplayName != "" {
 		displayName = extRd.DisplayName
 	}
+	nameStr := lipgloss.NewStyle().Foreground(theme.Info).Bold(true).Render(displayName)
 
+	// Format params with width budget for the header line.
+	// Check extension renderer for custom header params first.
 	paramBudget := max(r.width-10-len(displayName), 20)
 	var params string
 	if extRd != nil && extRd.RenderHeader != nil {
@@ -287,76 +507,97 @@ func (r *MessageRenderer) RenderToolMessage(toolName, toolArgs, toolResult strin
 		params = formatToolParams(toolArgs, paramBudget)
 	}
 
-	var icon string
-	iconColor := style.GetTheme().Success
-	if isError {
-		icon = "×"
-		iconColor = style.GetTheme().Error
-	} else {
-		icon = "✓"
-	}
-
-	// Style the tool name with color
-	theme := style.GetTheme()
-	nameColor := theme.Info
-	if isError {
-		nameColor = theme.Error
-	}
-	styledName := lipgloss.NewStyle().Foreground(nameColor).Bold(true).Render(displayName)
-	styledIcon := lipgloss.NewStyle().Foreground(iconColor).Render(icon)
-
-	// Build the content: icon + name + params on first line, then body
-	headerLine := styledIcon + " " + styledName
+	header := iconStr + " " + nameStr
 	if params != "" {
-		headerLine += " " + lipgloss.NewStyle().Foreground(theme.Muted).Render(params)
+		header += " " + lipgloss.NewStyle().Foreground(theme.Muted).Render(params)
 	}
 
-	// Get body content
+	// --- Body: check extension renderer first, then builtin, then default ---
 	var body string
 	if extRd != nil && extRd.RenderBody != nil {
 		body = extRd.RenderBody(toolResult, isError, r.width-8)
+		// Apply markdown rendering if requested and body is non-empty.
 		if body != "" && extRd.BodyMarkdown {
-			body = strings.TrimSuffix(style.ToMarkdown(body, r.width-8), "\n")
+			body = strings.TrimSuffix(toMarkdown(body, r.width-8), "\n")
 		}
 	}
 	if body == "" {
 		if isError {
-			body = r.formatToolResult(toolName, toolResult)
+			body = lipgloss.NewStyle().
+				Foreground(theme.Error).
+				Render(toolResult)
 		} else {
 			body = renderToolBody(toolName, toolArgs, toolResult, r.width-8)
 			if body == "" {
-				body = r.formatToolResult(toolName, toolResult)
+				body = r.formatToolResult(toolName, toolResult, r.width-8)
 			}
 		}
 	}
 
 	if strings.TrimSpace(body) == "" {
-		body = r.ty.Italic("(no output)")
+		body = lipgloss.NewStyle().
+			Italic(true).
+			Foreground(theme.Muted).
+			Render("(no output)")
 	}
 
-	// Wrap all tool errors in a herald Caution alert so the error text
-	// renders inside a contained block instead of spilling into the layout.
-	if isError && strings.TrimSpace(body) != "" {
-		body = r.ty.Alert(herald.AlertCaution, body)
+	// Combine header + body into a single block.
+	fullContent := header + "\n\n" + strings.TrimSuffix(body, "\n")
+
+	// Build rendering options; extension can override background.
+	blockOpts := []renderingOption{
+		WithAlign(lipgloss.Left),
+		WithBorderColor(borderColor),
+		WithMarginBottom(1),
+	}
+	if extRd != nil && extRd.Background != "" {
+		blockOpts = append(blockOpts, WithBackground(lipgloss.Color(extRd.Background)))
 	}
 
-	// Compose: icon + name + params, then body
-	fullContent := r.ty.Compose(
-		headerLine,
-		"",
-		body,
+	rendered := renderContentBlock(
+		fullContent,
+		r.width,
+		blockOpts...,
 	)
-	fullContent = styleMarginBottom1.Render(fullContent)
 
 	return UIMessage{
 		Type:    ToolMessage,
-		Content: fullContent,
-		Height:  lipgloss.Height(fullContent),
+		Content: rendered,
+		Height:  lipgloss.Height(rendered),
 	}
 }
 
+// formatToolArgs formats tool arguments for display
+func (r *MessageRenderer) formatToolArgs(args string) string {
+	// Remove outer braces and clean up JSON formatting
+	args = strings.TrimSpace(args)
+	if strings.HasPrefix(args, "{") && strings.HasSuffix(args, "}") {
+		args = strings.TrimPrefix(args, "{")
+		args = strings.TrimSuffix(args, "}")
+		args = strings.TrimSpace(args)
+	}
+
+	// If it's empty after cleanup, return a placeholder
+	if args == "" {
+		return "(no arguments)"
+	}
+
+	// Truncate if too long, but skip truncation in debug mode
+	if !r.debug {
+		maxLen := 100
+		if len(args) > maxLen {
+			return args[:maxLen] + "..."
+		}
+	}
+
+	return args
+}
+
 // formatToolResult formats tool results based on tool type
-func (r *MessageRenderer) formatToolResult(toolName, result string) string {
+func (r *MessageRenderer) formatToolResult(toolName, result string, width int) string {
+	baseStyle := lipgloss.NewStyle()
+
+	// Truncate very long results only if not in debug mode
 	if !r.debug {
 		maxLines := 10
 		lines := strings.Split(result, "\n")
@@ -365,48 +606,58 @@ func (r *MessageRenderer) formatToolResult(toolName, result string) string {
 		}
 	}
 
-	if strings.Contains(toolName, "bash") || strings.Contains(toolName, "command") ||
-		strings.Contains(toolName, "shell") {
+	// Format bash/command output with better formatting
+	if strings.Contains(toolName, "bash") || strings.Contains(toolName, "command") || strings.Contains(toolName, "shell") || toolName == "run_shell_cmd" {
+		theme := getTheme()
+
+		// Split result into sections if it contains both stdout and stderr
 		if strings.Contains(result, "<stdout>") || strings.Contains(result, "<stderr>") {
-			return parseBashOutput(result, style.GetTheme())
+			return r.formatBashOutput(result, width, theme)
 		}
+
+		// For simple output, just render as monospace text with proper line breaks
+		return baseStyle.
+			Width(width).
+			Foreground(theme.Muted).
+			Render(result)
 	}
 
-	return result
+	// For other tools, render as muted text
+	theme := getTheme()
+	return baseStyle.
+		Width(width).
+		Foreground(theme.Muted).
+		Render(result)
 }
 
-// createTypography creates a typography instance from theme
-func createTypography(theme style.Theme) *herald.Typography {
-	return herald.New(
-		herald.WithPalette(herald.ColorPalette{
-			Primary:   theme.Primary,
-			Secondary: theme.Secondary,
-			Tertiary:  theme.Info,
-			Accent:    theme.Accent,
-			Highlight: theme.Highlight,
-			Muted:     theme.Muted,
-			Text:      theme.Text,
-			Surface:   theme.Background,
-			Base:      theme.CodeBg,
-		}),
-		herald.WithAlertPalette(herald.AlertPalette{
-			Note:      theme.Info,
-			Tip:       theme.Success,
-			Important: theme.Accent,
-			Warning:   theme.Warning,
-			Caution:   theme.Error,
-		}),
-		herald.WithCodeLineNumbers(true),
-		// Customize alert labels
-		herald.WithAlertLabel(herald.AlertNote, "Info"),
-		herald.WithAlertLabel(herald.AlertTip, "You"),
-		herald.WithAlertLabel(herald.AlertWarning, "Working"),
-		herald.WithAlertLabel(herald.AlertCaution, "Error"),
-	)
+// formatBashOutput formats bash command output with proper section handling.
+// Delegates tag parsing to the shared parseBashOutput helper.
+func (r *MessageRenderer) formatBashOutput(result string, width int, theme Theme) string {
+	parsed := parseBashOutput(result, theme)
+	return lipgloss.NewStyle().
+		Width(width).
+		Foreground(theme.Muted).
+		Render(parsed)
 }
 
-// UpdateTheme refreshes the renderer's typography instance with colors from
-// the current theme. This is called when the user changes themes via /theme.
-func (r *MessageRenderer) UpdateTheme() {
-	r.ty = createTypography(style.GetTheme())
+// renderMarkdown renders markdown content using glamour
+func (r *MessageRenderer) renderMarkdown(content string, width int) string {
+	rendered := toMarkdown(content, width)
+	return strings.TrimSuffix(rendered, "\n")
+}
+
+// removeBlankLines removes lines that are visually blank from rendered output.
+// Glamour wraps every character (including padding spaces) with ANSI color
+// codes, so we must strip escape sequences before checking whether a line is
+// empty. This collapses paragraph spacing so user messages render without
+// extra vertical gaps.
+func removeBlankLines(s string) string {
+	lines := strings.Split(s, "\n")
+	filtered := lines[:0]
+	for _, line := range lines {
+		if strings.TrimSpace(ansiEscapeRe.ReplaceAllString(line, "")) != "" {
+			filtered = append(filtered, line)
+		}
+	}
+	return strings.Join(filtered, "\n")
 }