diff --git a/.aipass/aipass_global_prompt.md b/.aipass/aipass_global_prompt.md
index 6ad8142d..9e6a4bd6 100644
--- a/.aipass/aipass_global_prompt.md
+++ b/.aipass/aipass_global_prompt.md
@@ -147,6 +147,8 @@ drone @git lock                      # Who has the PR lock?
 
 **Local main is always ahead of origin — that's normal.** `drone @git pr` commits on local main first, then pushes a feature branch for the PR. Your local main will show "ahead of origin" — this is correct. Don't `git pull` to fix it. The user merges PRs and pulls when they choose. Diverged state is expected, not a problem.
 
+**Respect .gitignore — only commit what `git status` shows.** This is a public repo. Gitignored files are ignored for a reason — they contain personal data, local state, or branch-specific files that don't belong in the public repo. Key gitignored patterns: `.trinity/` (memories, passport, observations), `.ai_mail.local/` (mailbox), `DPLAN-*`, `FPLAN-*`, `APLAN-*` (local plans), `*.local.*` files, `logs/`, `.chroma/`. When committing, only look at `git status` output — if a file doesn't appear there, it's either unchanged or ignored. Don't go looking for files to commit. Changes drive commits, not file existence.
+
 ## Context Guardrail
 
 If the conversation suddenly shifts to a topic, project, or domain that doesn't relate to your current branch — **say something.** Don't just roll with it. The user may use voice input and multiple terminals. They may think they're talking to a different agent. A quick "Hey, this sounds like it's for [other project] — are you in the right terminal?" saves both of you from polluting memories with cross-context noise. Your job is to be the sanity check when the human has 5 windows open.
diff --git a/src/aipass/flow/templates/team_dev_plans/default.md b/src/aipass/flow/templates/team_dev_plans/default.md
new file mode 100644
index 00000000..cd55bfb4
--- /dev/null
+++ b/src/aipass/flow/templates/team_dev_plans/default.md
@@ -0,0 +1,149 @@
+# {plan_number}: {subject}
+
+Tag: {tag}
+
+> One-line description
+
+---
+
+## What is a TDPLAN?
+
+Team Design Plans (TDPLANs) are for **collaborative thinking across multiple branches** -- capturing ideas, brainstorming, investigating, planning, and making decisions that span branch boundaries. Each participating branch owns a section and works within it.
+
+**This IS for:**
+- Cross-branch design work where multiple branches each have responsibilities
+- Coordinated planning where branches need to see each other's progress
+- Problems that touch multiple systems and need parallel investigation
+- Shared decision-making where each branch contributes domain expertise
+
+**This is NOT for:**
+- Single-branch thinking -- that's a DPLAN (Design Plan)
+- Building code or executing tasks -- that's an FPLAN (Flow Plan)
+- Quick fixes -- just do those directly
+
+**TDPLANs have no fixed structure beyond the Team Sections.** The shared sections above are starting points. Add sections, remove sections, go wherever the thinking takes you. The Team Sections below are the structured part -- each branch owns theirs.
+
+**When this plan is ready to build**, create FPLANs per branch: `drone @flow create . "Subject"`. Each branch can create their own FPLAN from their section. The TDPLAN stays as the shared design record.
+
+**Never trim a TDPLAN.** The story -- conversations, decisions, dead ends, pivots -- is as important as the results.
+
+---
+
+## Vision
+What we're trying to achieve together
+
+## The Problem
+What exists now and why it needs multiple branches to solve
+
+## The Fix
+High-level approach -- how the pieces fit together across branches
+
+## Design Decisions
+
+| Decision | Options | Leaning | Notes |
+|----------|---------|---------|-------|
+| Example  | A / B   | A       | Why   |
+
+---
+
+## Team Sections
+
+**Each branch owns their section. Edit freely within your section. Don't touch other sections.**
+
+---
+
+### {tag} SECTION (description of role)
+
+**Owner:** @{tag}
+
+**Responsibilities:**
+- What this branch is responsible for in this plan
+
+**Implementation:**
+- How this branch plans to approach their part
+
+**Tests needed:**
+- [ ] Test case 1
+- [ ] Test case 2
+
+**Notes:**
+- Working notes, discoveries, decisions for this section
+
+**Status:** Planning / In Progress / Ready / Complete
+
+---
+
+### BRANCH_B SECTION (description of role)
+
+**Owner:** @branch_b
+
+**Responsibilities:**
+- What this branch is responsible for in this plan
+
+**Implementation:**
+- How this branch plans to approach their part
+
+**Tests needed:**
+- [ ] Test case 1
+- [ ] Test case 2
+
+**Notes:**
+- Working notes, discoveries, decisions for this section
+
+**Status:** Planning / In Progress / Ready / Complete
+
+---
+
+### BRANCH_C SECTION (description of role)
+
+**Owner:** @branch_c
+
+**Responsibilities:**
+- What this branch is responsible for in this plan
+
+**Implementation:**
+- How this branch plans to approach their part
+
+**Tests needed:**
+- [ ] Test case 1
+- [ ] Test case 2
+
+**Notes:**
+- Working notes, discoveries, decisions for this section
+
+**Status:** Planning / In Progress / Ready / Complete
+
+---
+
+Add or remove branch sections as needed. Copy the template above for each participating branch.
+
+---
+
+## Ideas
+Captured ideas, brainstorms, future possibilities. Add freely. Any branch can contribute here.
+
+## Relationships
+- **Related DPLANs:** None yet
+- **Related FPLANs:** None yet
+- **Related TDPLANs:** None yet
+- **Coordinating branch:** Who created this plan and coordinates
+- **Participating branches:** List all branches with sections
+- **Seedgo standards:** `drone @seedgo audit aipass @branch` | `drone @seedgo standards_query aipass_standards`
+
+## Status
+- [x] Planning
+- [ ] In Progress
+- [ ] Ready for Execution
+- [ ] Complete
+- [ ] Abandoned
+
+## Notes
+Session notes, discoveries, changes
+
+## Listen (TTS-friendly summary)
+
+Write a plain English summary of this plan here. No markdown, no symbols, no tables, no code blocks, no asterisks, no bullet points. Just natural sentences that can be read aloud by a text to speech tool. Update this section whenever the plan changes significantly.
+
+---
+*Created: {today}*
+*Updated: {today}*