diff --git a/README.md b/README.md
index 97cd516..53329b1 100644
--- a/README.md
+++ b/README.md
@@ -146,9 +146,9 @@ gh-issue-sync write-skill --agent codex --scope project
 | Agent | User Scope | Project Scope |
 |-------|------------|---------------|
 | `codex` | `~/.codex/skills/` | `.codex/skills/` |
-| `pi` | `~/.pi/skills/` | `.pi/skills/` |
+| `pi` | `~/.pi/agent/skills/` | `.pi/skills/` |
 | `claude` | `~/.claude/skills/` | `.claude/skills/` |
-| `opencode` | `~/.config/opencode/skill/` | `.opencode/skill/` |
+| `opencode` | `~/.config/opencode/skills/` | `.opencode/skills/` |
 | `amp`, `generic` | `~/.config/agents/skills/` | `.agents/skills/` |
 
 To install to a custom location:
diff --git a/cmd/gh-issue-sync/main.go b/cmd/gh-issue-sync/main.go
index 6200383..6f205d2 100644
--- a/cmd/gh-issue-sync/main.go
+++ b/cmd/gh-issue-sync/main.go
@@ -338,7 +338,11 @@ func (c *WriteSkillCommand) Execute(args []string) error {
 		case "codex":
 			agentDir = ".codex"
 		case "pi":
-			agentDir = ".pi"
+			if c.Scope == "user" {
+				agentDir = filepath.Join(".pi", "agent")
+			} else {
+				agentDir = ".pi"
+			}
 		case "claude":
 			agentDir = ".claude"
 		case "opencode":
@@ -347,7 +351,7 @@ func (c *WriteSkillCommand) Execute(args []string) error {
 			} else {
 				agentDir = ".opencode"
 			}
-			skillSubdir = "skill"
+			skillSubdir = "skills"
 		case "amp", "generic":
 			if c.Scope == "user" {
 				agentDir = filepath.Join(".config", "agents")