akshay-na/content-git-workflow

content-git-workflow

Preconditions

• workspace_root is a clone with SSH remote (git@…) working in the environment.
• Optional payload: git_branch, git_remote, commit_template_path (default $HOME/.gitmessage), pull_before (default true), push_after_commit (default true for execution_mode: automation), task_id, idempotency_key.

Sequence

1. git fetch (and git pull --rebase or merge per project ADR) when pull_before — abort with error payload to n8n on merge conflict or unexpected dirty tree unless policy allows stash.
2. Content agents modify allowed paths only (target_paths[] from pipeline).
3. git status/git diff — if no changes, skip commit (log git.commit_skipped_empty).
4. git add path-scoped; git commit with --file composed message OR --template "$HOME/.gitmessage" — append --no-gpg-sign for content corpus / ~/ai-brain automation (see brain-conventions.mdc). Never use --no-gpg-sign when the git root is the DotMate dotfiles repository (sign those commits).
   • Subject: Conventional Commits — type[(optional-scope)]: imperative summary, ≤ ~72 chars for the summary portion, no trailing period before an optional suffix, imperative mood. For content vault commits, use lifecycle types draft, staging, published when the change is mainly that stage (per brain-conventions.mdc); otherwise feat / chore / … as usual. When git commit targets git-backed ~/ai-brain, the first line must end with from <short-hostname> (see brain-conventions.mdc).
   • Body: same sections as ~/.gitmessage but brief: ≤ 2–3 bullets if any; Context: / Impact: one short line each by default.
   • Notes: — optional brief operational refs (e.g. Task-ID, ticket keys) only — no Co-authored-by: for AI/tools, AI-authored, Generated-by:, or “written by AI” on corpus / non-brain repos. Git-backed ~/ai-brain: after body/Notes:, one Co-authored-by: <Product> <synthetic-email> for agent commits per brain-conventions.mdc item 7.
   • Trailers: git-safety.mdc — no AI attribution except one Co-authored-by on ~/ai-brain agent commits (item 7).
5. git push to configured upstream; on non-FF → one retry with fetch/rebase/push; then fail closed (no git push --force to default branch).

Error codes (for n8n)

Suggest stable strings: git_pull_conflict, git_dirty_tree, git_commit_failed, git_push_rejected, git_ssh_failed, template_missing.

Idempotency

Same idempotency_key + clean tree + no new diff → no second empty commit; log skip observability row.

Observability

log_metric stages: git.sync, git.commit, git.push with task_id, branch, commit_sha when known.