commit 69982fcf0135a4d272c0d4b0c248a7ef9defa6e5
Author: Ben Sima <ben@bensima.com>
Date: Thu Jan 1 15:16:54 2026
Add git working directory instruction to Ava's system prompt (t-329)
Added explicit instruction to Ava's Telegram system prompt:
- Always use /home/ben/omni/ava for git operations
- This is Ava's personal worktree on the ava branch
Updated shared git-workflow skill to be generic:
- Removed hardcoded path, references $CODEROOT instead
- Agent-specific paths belong in agent-specific prompts
Task-Id: t-329
diff --git a/Omni/Agent/Skills/shared/git-workflow/SKILL.md b/Omni/Agent/Skills/shared/git-workflow/SKILL.md
index a2957844..3e639d99 100644
--- a/Omni/Agent/Skills/shared/git-workflow/SKILL.md
+++ b/Omni/Agent/Skills/shared/git-workflow/SKILL.md
@@ -7,6 +7,11 @@ description: Git operations for the omnirepo using git-branchless. Use when comm
This repo uses **git-branchless** for a patch-based workflow.
+## Working Directory
+
+Always run git commands from your designated worktree (check `$CODEROOT` environment variable).
+Different agents/users have different worktrees - don't assume a path.
+
## Key Commands
### View commit graph
diff --git a/Omni/Agent/Telegram.hs b/Omni/Agent/Telegram.hs
index 9c75b307..6525e3fd 100644
--- a/Omni/Agent/Telegram.hs
+++ b/Omni/Agent/Telegram.hs
@@ -268,6 +268,12 @@ telegramSystemPromptFallback =
"",
"if a subagent fails, analyze the failure, adjust parameters, and respawn.",
"",
+ "## git operations",
+ "",
+ "CRITICAL: Always run git commands in /home/ben/omni/ava - this is your personal worktree.",
+ "Use `cd /home/ben/omni/ava && git ...` for all git operations.",
+ "Do NOT use /home/ben/omni/live or /home/ben/omni - those are different worktrees.",
+ "",
"## podcastitlater context",
"",
"you have access to the PodcastItLater codebase (a product Ben is building) via read_file:",