---

name: tbdflow description: Manage Trunk-Based Development workflows using the tbdflow CLI. Use this skill to create short-lived branches, make standardised commits, sync with trunk, merge completed work, generate changelogs, log intent notes, run non-blocking reviews, recover WIP snapshots, and emit machine-readable JSON output. version: 1.1.0 author: Claes Adamsson tags:

• git
• trunk-based-development
• devops
• cli

---

tbdflow Skill

Overview

This skill enables an AI agent to manage a Trunk-Based Development (TBD) workflow using the tbdflow CLI (v0.34.0).

The skill exists to:

• Enforce short-lived branches
• Standardise commits
• Reduce Git decision-making
• Maintain a fast, safe path back to trunk (main)
• Capture intent as low-friction breadcrumbs before it is lost
• Never lose work-in-progress (WIP Guard snapshots + recover)
• Emit machine-readable JSON (--json) for scripting, automation, and GUI frontends

tbdflow is the only interface the agent should use for Git workflow actions covered by this skill.

---

When to Use

Use this skill when the user wants to:

• Start work on a task, ticket, or feature
• Commit staged changes
• Sync with trunk or check repository status
• Merge completed work back to main
• See what has changed since the last release
• Log a design decision, failed attempt, or reasoning pivot
• Start or inspect a task and its intent log
• Request or manage a non-blocking post-commit review
• Recover a lost work-in-progress snapshot
• Get machine-readable JSON output for scripting or a GUI frontend

Typical trigger phrases include:

• "Start working on…"
• "Commit this"
• "Merge my work"
• "Sync me up"
• "What's new?"
• "Note that…" / "Log this decision"
• "Request a review of…" / "Approve that commit"
• "I lost my changes" / "Recover my work"
• "Give me that as JSON"

---

When Not to Use

Do not use this skill to:

• Create or manage long-lived branches
• Perform manual Git commands outside tbdflow
• Rewrite commit history
• Perform interactive rebases
• Merge without explicit user intent

If an action cannot be performed via tbdflow, explain the limitation instead of falling back to raw Git commands.

---

Prerequisites

Before invoking any tbdflow command, the agent must verify that the CLI is installed and accessible.

Installation Check

Run the following to confirm availability:

command -v tbdflow && tbdflow --version

If tbdflow is not found, the agent must attempt to install it automatically using one of the strategies below.

Installation Strategies (in order of preference)

1. Cargo Install (requires Rust toolchain)

If cargo is available on the system:

cargo install tbdflow

This downloads the latest release from crates.io and compiles it locally.

2. GitHub Releases (pre-built binary)

If cargo is not available but curl is:

curl -fsSL https://github.com/cladam/tbdflow/releases/latest/download/tbdflow-$(uname -m)-$(uname -s | tr '[:upper:]' '[:lower:]') -o /usr/local/bin/tbdflow
chmod +x /usr/local/bin/tbdflow

Adjust the binary path if /usr/local/bin is not writable (e.g. use ~/.local/bin).

3. Manual Prompt

If neither strategy is viable, inform the user:

tbdflow is not installed. Please install it using one of:

• cargo install tbdflow
• Download a binary from https://github.com/cladam/tbdflow/releases

See the README for details.

Post-Install Verification

After installation, always confirm:

tbdflow --version

If the version is outdated, suggest:

tbdflow update

---

Instructions

Follow the instructions below exactly. Each capability defines intent, constraints, and decision rules.

---

1. Standardised Committing

Intent Create a structured, conventional commit on trunk or a short-lived branch.

Staging Behaviour

• tbdflow automatically stages the relevant changes when committing
• The agent must not run git add or any raw Git staging commands
• No explicit staging step is required from the user or the agent

Preconditions

• The working tree contains changes intended for commit
• No unresolved merge conflicts are present

Command

tbdflow commit -t <type> [-s <scope>] -m "<message>" [--body "<body>"] [--issue <issue>] [-b] [--tag <tag>]

File-Based Input (automation-friendly)

• Use --message-file <path> to read the subject from a file (- for stdin). Conflicts with -m/--message.
• Use --body-file <path> to read the body from a file (- for stdin). Conflicts with --body.
• Prefer file-based input when the message/body contains characters that are awkward to escape on the shell.

Decision Rules

• Allowed commit types:

  • feat, fix, chore, docs, refactor, test, build, ci, perf, revert, style

• Never invent new commit types

• If no type is specified:

  • Default to chore unless behaviour changes

• DoD Checklist: If a .dod.yml file exists in the project root and --no-verify is not passed, an interactive checklist will appear. Unchecked items will result in a TODO: footer being appended to the commit message.

• Use -b / --breaking if the change introduces breaking behaviour, and --breaking-description to describe it

• Use --issue when the user references a ticket ID (JIRA, GitHub, etc.)

• Use --tag <tag> to create and push an annotated tag on the commit

• Any pending intent-log notes (see §7) are automatically appended to the commit body and then consumed

Use This When

• The user says “commit”, “save this”, or “check this in”
• The user describes completed work ready to be recorded

---

2. Creating Short-Lived Branches

Intent Start a new unit of work in a short-lived branch that will be merged back to trunk quickly.

Preconditions

• Working tree is clean or safely stashed
• The task is not exploratory or long-running

Command

tbdflow branch -t <type> -n <name> [--issue <issue>] [-f <from_commit>]

Decision Rules

• Branch naming follows:

  • <type>/<name> or
  • <type>/<issue>-<name>

• If the user provides a task description:

  • Slugify it for the -n parameter

• Use --issue when a ticket ID is available

• Use -f only if the user explicitly asks to branch from a non-HEAD commit

Use This When

• The user says “start working on…”
• A task requires isolation before merging to main

---

3. Workflow Completion & Integration

Intent Safely merge completed work back into trunk and clean up the branch.

Preconditions

• All intended commits are complete
• The branch is ready to be merged

Command

tbdflow complete -t <type> -n <name>

Decision Rules

• Infer <type> and <name> from:

  1. The current Git branch name
  2. Fallback: the most recent tbdflow branch invocation

• The merge is performed using --no-ff

• Both local and remote branch copies are deleted after merge

Use This When

• The user says “I’m done”, “merge my work”, or “ship this”

---

4. Syncing & Status

Intent Keep the local workspace aligned with trunk and provide situational awareness.

Commands

tbdflow sync
tbdflow status

Decision Rules

• Use sync to:

  • Pull and rebase from remote
  • Inspect recent history
  • Identify stale branches

• Use status to:

  • Show context-aware Git status, In monorepos, this excludes sub-project directories when at the root.
  • Handle monorepos correctly

Use This When

• The user says "sync", "catch me up", or "what's happening"
• Before committing, merging, or starting new work

---

5. Radar — Situational Awareness

Intent Orient before typing. Radar is the situational-awareness dashboard for TBD, answering three questions at a glance: is the trunk healthy (Trunk Status), where is work concentrating (Hotspots / churn), and is anyone touching the same files as me (Overlap Scan). The social coding safety net for TBD.

Commands

tbdflow radar

Decision Rules

• Use radar to:

  • Show trunk status — CI health (Green/Red/Pending/Unknown) and how long ago the last commit landed
  • Show hotspots — the top files churned on trunk in the last ~72 hours (avoid blind collisions)
  • Scan all active (unmerged) remote branches and compare their diffs against local uncommitted/staged changes
  • Show who is working on overlapping files (and optionally overlapping lines)
  • Provide actionable social coordination hints

• Radar is also integrated into:

  • tbdflow sync — shows a one-liner warning if overlap is detected
  • tbdflow commit — optionally warns or prompts for confirmation

Detection Levels

| Level | What it checks | Speed | |--------|---------------------------------------|--------------| | file | Same files touched (default) | ~5ms/branch | | line | Overlapping line ranges in same files | ~50ms/branch |

Configuration (.tbdflow.yml)

radar:
  enabled: true
  level: file          # file | line
  on_sync: true        # Show warnings during tbdflow sync
  on_commit: warn      # off | warn | confirm
  ignore_patterns: # Files to exclude from overlap detection
    - "*.lock"
    - "*-lock.*"
    - "CHANGELOG.md"

Use This When

• The user says "anyone else working on this?", "check for conflicts", or "radar"
• Before pushing to avoid merge hell
• When collaborating closely with teammates on trunk

---

6. Undo — The Panic Button

Intent Immediately revert a broken commit on trunk, restoring it to a green state. In TBD, if trunk breaks, you fix it or revert it — there is no middle ground.

Command

tbdflow undo <sha> [--no-push]

Preconditions

• The working tree is clean (no uncommitted changes)
• The commit SHA exists and is on the main branch

Decision Rules

• undo will:

  • Sync with remote (fast-forward only) before reverting
  • Verify the commit exists and is on trunk
  • Create a revert commit using git revert --no-edit
  • Push the revert to the remote (unless --no-push)

• Use --no-push when the user wants to inspect the revert locally before pushing

• The reverted changes remain in Git history and can be re-applied later

• This command only works on commits that are on the main branch

Use This When

• The user says "revert this", "undo that commit", or "trunk is broken"
• A commit on trunk caused a build failure, test regression, or production incident
• The fastest path to green is reverting rather than fixing forward

---

Pre-Commit Workflow

Always run tbdflow sync before tbdflow commit.

The sync command:

• Pulls and rebases from remote
• Shows current status (wraps git status)
• Ensures the workspace is aligned with trunk

This prevents conflicts and ensures commits are based on the latest trunk state.

---

Validation & Linting Behaviour

tbdflow enforces workflow correctness using an internal linter. The agent must understand and respect these rules.

---

Commit Message Rules

Subject Line (-m message)

| Rule | Requirement | Example | |----------------|--------------------------------------------------------------------------------------------------------------|--------------------------------------| | Max Length | 72 characters | "add user profile" ✓ | | Capitalisation | Must not start with a capital letter | "add feature" ✓, "Add feature" ✗ | | Punctuation | Must not end with a period | "fix bug" ✓, "fix bug." ✗ | | Type | Must be one of: feat, fix, chore, docs, refactor, test, build, ci, perf, revert, style | feat ✓, feature ✗ | | Scope | Optional, lowercase, no spaces | -s login ✓, -s "user login" ✗ | | Message | Required, non-empty, imperative mood | "add user profile" ✓, "" ✗ | | Breaking | Must use -b flag if breaking change | -b for breaking ✓ |

Commit Body (Optional)

| Rule | Requirement | |-------------|------------------------------------------------| | Line Length | Each line must not exceed 80 characters | | Separation | Must be separated from subject by a blank line |

Issue Key (--issue)

| Rule | Requirement | Example | |--------|-------------------------------------|----------------------------| | Format | Uppercase project key, dash, number | PROJ-123 ✓, proj-123 ✗ |

---

Branch Name Rules

| Rule | Requirement | Example | |-------|----------------------------------------|--------------------------------------------| | Type | Must match commit types | feat/ ✓, feature/ ✗ | | Name | Lowercase, hyphen-separated, no spaces | add-user-profile ✓, Add User Profile ✗ | | Issue | Optional, prefixed to name | feat/API-456-add-user ✓ |

---

Error Handling

If tbdflow rejects input:

1. Read the error message carefully
2. Correct the input based on the rules above
3. Retry with valid parameters
4. Do not fall back to raw Git commands

The agent should prefer generating valid inputs over relying on linter errors.

---

7. Breadcrumbs — Low-Friction Intent Logging

Intent Capture architectural decisions, failed attempts, or logic pivots during the development process before the final commit.

Breadcrumbs provide a lightweight way to document the why behind code changes — the reasoning that would otherwise be lost between keystrokes.

Commands

tbdflow note "<breadcrumb_message>"     # canonical form
tbdflow + "<breadcrumb_message>"        # shorthand alias
tbdflow n "<breadcrumb_message>"        # shorthand alias
tbdflow note --show                     # show the current intent log

Task context (optional but recommended)

Group breadcrumbs under a named task so the intent log tells a coherent story:

tbdflow task start "<task description>"  # begin a named task
tbdflow task show                        # show current task and notes
tbdflow task clear                       # discard the current intent log

Decision Rules

• Use this whenever you pivot your approach (e.g. switching from a Factory to a Trait)
• Use this to document a failed attempt that explains why the final code looks the way it does
• Use this to explain complex logic, patterns, or non-obvious trade-offs
• Do not use this for trivial changes (typos, formatting)
• These notes are automatically appended to the next tbdflow commit body
• Multiple breadcrumbs accumulate and are included in order

Storage & Safety

Breadcrumbs are stored locally in .tbdflow-intent.json at the repository root. This file is never committed — it is consumed and deleted after the next tbdflow commit.

tbdflow automatically ensures .tbdflow-intent.json is listed in .gitignore the first time a breadcrumb is saved. This prevents the git add . staging pattern from accidentally committing raw intent data.

If .gitignore does not exist, it will be created with the entry. If it already contains the entry, no changes are made.

Decision Rules: The Intent Log

Breadcrumbs are not optional decoration — they are the agent's audit trail.

• Log your struggle: if you try an approach and it fails or feels wrong, log it with tbdflow +. This gives the human auditor context on what you didn't do and why.
• Vibe-coding transparency: do not just push a final "perfect" diff. Use breadcrumbs to show the evolution of the logic — the dead ends, the trade-offs, the pivots.
• Minimum expectation: before committing a complex refactor or non-trivial feature, there should be at least 1–2 breadcrumbs explaining the major structural decisions.
• Observability over perfection: a clean diff with zero context is harder to review than a slightly messier one with a clear reasoning trail.

"Velocity is nothing without observability. The trunk is live, the struggle is logged, the audit is parallel."

Agent Behaviour

• Think out loud: use tbdflow + to document your chain of thought during development
• Prefer clarification over assumptions for destructive actions
• Default to the safest operation that preserves trunk integrity
• Treat breadcrumbs as a first-class part of the workflow, not an afterthought

Examples

| Scenario | Command | |------------------------------------|--------------------------------------------------------------------------------------------------------| | Switching architectural pattern | tbdflow + "switched from Factory to Trait: Factory felt over-engineered for this scope" | | Documenting a rejected edge-case | tbdflow + "decided against async here: the overhead outweighs the benefits for this sync task" | | Explaining complex regex/logic | tbdflow + "using lookahead in regex to handle nested brackets without recursion" |

Use This When

• The agent or user makes a non-trivial design decision mid-flight
• A failed approach informs the final implementation
• The commit message alone would not explain the reasoning

---

8. Changelog Generation

Intent Summarise changes using structured commit history.

Command

tbdflow changelog [--unreleased] [--from <ref>]

Decision Rules

• Use --unreleased when the user asks "What's new?"
• Use --from <ref> when comparing against a specific tag or version

Use This When

• The user asks for release notes
• The user wants a summary of recent changes

---

9. Non-Blocking Reviews

Intent Facilitate Trunk-Based post-commit review. Code is already on trunk; reviews are for course correction and knowledge sharing, not gatekeeping. Reviewers focus on Intent, Impact, and Insight.

Preconditions

• The review system is enabled in .tbdflow.yml (review.enabled: true)
• For github-issue / github-workflow strategies, the GitHub CLI (gh) is installed and authenticated

Commands

tbdflow review <sha>                 # request a review for a specific commit
tbdflow review --trigger             # request a review for the current HEAD
tbdflow review --digest [--since <time>]   # list commits needing review
tbdflow review --approve <hash>      # mark approved (closes issue, review-accepted)
tbdflow review --concern <hash> -m "<message>"   # raise a concern (keeps issue open)
tbdflow review --dismiss <hash> -m "<message>"    # dismiss (closes issue, review-dismissed)

Decision Rules

• Concerns are always non-blocking — they add a review-concern label, a comment, and a checklist item, and encourage fix-forward rather than blocking the trunk
• --approve and --dismiss close the associated issue; --concern keeps it open
• -m/--message is required with --concern and --dismiss
• When review rules with glob patterns are configured, reviews auto-trigger after a matching commit and route to the configured reviewers
• Strategies: github-issue (direct issues), github-workflow (GitHub Actions, audit trails), log-only (offline)

Use This When

• The user says "request a review", "approve this commit", "flag a concern", or "who reviewed X?"
• A commit needs asynchronous course-correction after landing on trunk

---

10. WIP Guard & Recovery

Intent Never lose work-in-progress. WIP Guard automatically captures immutable snapshots of the working directory at key moments so uncommitted work can always be recovered.

How it works

• Snapshots use git stash create — they don't touch the stash reflog, can't interfere with manual stashes, and persist in the object store until garbage collection (typically 14–30 days)
• Snapshots are captured automatically during tbdflow note/+, tbdflow sync, tbdflow radar (if dirty), and before the destructive part of tbdflow undo
• Before sync or undo, tbdflow checks for an in-progress rebase/merge/cherry-pick and halts with a clear message instead of creating a corrupt state

Commands

tbdflow recover --list        # show available snapshots
tbdflow recover <index>       # restore a snapshot by index
tbdflow recover <hash>        # restore a snapshot by commit hash

Decision Rules

• Snapshots are applied with git stash apply (not pop), so they remain available for repeated recovery
• Snapshots are branch-aware — tbdflow warns before applying a snapshot from a different branch context
• Snapshots are cleared once the work reaches trunk (the commit itself becomes the safety net)

Use This When

• The user says "I lost my changes", "recover my work", or "restore that snapshot"

---

11. Repository Initialisation

Intent Set up a repository for Trunk-Based Development, generating .tbdflow.yml and .dod.yml defaults.

Command

tbdflow init                          # interactive
tbdflow init --yes                    # non-interactive, accept all defaults
tbdflow init --yes --main-branch trunk
tbdflow init --yes --remote git@github.com:org/repo.git

Decision Rules

• Prefer --yes (non-interactive) for automated environments, scaffolding scripts, and agent-driven setup
• --main-branch sets the trunk name (default: main)
• --remote links a remote URL and pushes the initial commit
• Run init in each subdirectory of a monorepo to enable per-project scoping

Use This When

• The user says "set up tbdflow", "initialise this repo", or is scaffolding a new project

---

12. Machine-Readable JSON Output

Intent Emit structured JSON for scripting, automation, CI, and GUI frontends instead of human-readable text.

Command

tbdflow --json <command>

Supported commands

info, status, radar, sync, recover --list, task show, and note --show.

Output envelope

{ "success": true, "data": { ... } }

On failure the envelope includes a stable code for programmatic handling:

{ "success": false, "error": "Working directory is not clean", "code": "dirty_worktree" }

Stable error codes

missing_args, dirty_worktree, ci_failing, not_a_repo, unborn_no_commits, branch_not_found, tag_exists, not_on_main, cannot_complete_main, git_failed.

Decision Rules

• Use --json whenever the user asks for machine-readable output, or when driving an integration/GUI
• --json is a global flag and must precede the subcommand (e.g. tbdflow --json status)
• Parse the success field first; on false, branch on the code field rather than the human message
• status output is enriched with ahead/behind counts and trunk_ci; sync returns a blocked response (success: false, code: ci_failing) instead of prompting when CI is red

Use This When

• The user says "give me that as JSON", "output structured data", or is building tooling on top of tbdflow

---

Output Format

• Commands should be executed directly
• Explanations should be concise and factual
• Avoid narrating Git internals unless asked
• Prefer showing the command being run before or alongside results

---

Examples

| User Input | Action | |-----------------------------------------------|-----------------------------------------------------------------------------------------------------| | "Commit this as a bug fix for login." | tbdflow commit -t fix -s login -m "resolve timeout issue" | | "Start working on API-456: Add user profile." | tbdflow branch -t feat -n add-user-profile --issue API-456 | | "Merge my current work back to main." | tbdflow complete -t <current_type> -n <current_name> | | "Sync me up." | tbdflow sync | | "Anyone else working on this file?" | tbdflow radar | | "Revert commit abc1234, it broke the build." | tbdflow undo abc1234 | | "I switched from Factory to Trait." | tbdflow + "switched from Factory to Trait: Factory felt over-engineered for this scope" | | "Start a task for the auth refactor." | tbdflow task start "Refactor auth module" | | "Request a review of the latest commit." | tbdflow review --trigger | | "Approve commit abc1234." | tbdflow review --approve abc1234 | | "I lost my changes, recover them." | tbdflow recover --list then tbdflow recover <index> | | "Set up this repo for TBD non-interactively." | tbdflow init --yes | | "Give me the status as JSON." | tbdflow --json status | | "What changed since the last version?" | tbdflow changelog --unreleased |

---

Notes

• Treat main (trunk) as sacred
• Prefer safety and clarity over cleverness
• Ask for clarification only when an action could be destructive