Vault git status and conflict-aware sync
vault_repo_syncSync an Obsidian vault with Git: check status, pull without auto-merge, push, or view recent commits. Conflicts reported for manual resolution.
Instructions
Read-mostly git wrapper for the configured Obsidian vault directory. Lets an artist see what's changed (status), fetch/fast-forward-only pull, push, or read recent history (log). Never auto-resolves conflicts. Never uses --force. Never invokes a shell. Conflicts are surfaced as structured data for manual resolution. Requires TDMCP_VAULT_PATH or the vault_path argument.
Input Schema
| Name | Required | Description | Default |
|---|---|---|---|
| vault_path | No | Absolute path to the vault git repo. Defaults to the configured TDMCP_VAULT_PATH. | |
| action | No | status: staged/unstaged/untracked + ahead/behind counts. pull: fetch + ff-only merge; reports conflicts but never auto-resolves. push: push current branch to its upstream; reports rejections. log: last N commits on the current branch. | status |
| remote | No | Remote name for pull/push. | origin |
| branch | No | Branch for pull/push. Defaults to the currently checked-out branch. | |
| limit | No | Max commits returned by action:'log'. | |
| timeout_ms | No | Hard timeout for the git child process. |