devrites 5.5.0 → 5.7.0

package/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 All notable changes to DevRites are documented here. The format follows [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and DevRites adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). Releases are generated automatically by [semantic-release](https://semantic-release.gitbook.io/) from Conventional Commits on `main`.
 
+## [5.7.0](https://github.com/ViktorsBaikers/DevRites/compare/v5.6.0...v5.7.0) (2026-09-13)
+
+### Added
+
+* **installer:** pi as fourth host target + skill frontmatter YAML fix ([#70](https://github.com/ViktorsBaikers/DevRites/issues/70)) ([9275755](https://github.com/ViktorsBaikers/DevRites/commit/92757555f4c6cf74f8cdec5f8e8688ec28360508))
+
+## [5.6.0](https://github.com/ViktorsBaikers/DevRites/compare/v5.5.0...v5.6.0) (2026-09-13)
+
+### Added
+
+* **rite:** add pi as fourth host target ([#69](https://github.com/ViktorsBaikers/DevRites/issues/69)) ([8249a6b](https://github.com/ViktorsBaikers/DevRites/commit/8249a6b9d5bef3dfd2411089fdcd34845f535b12))
+
 ## [5.5.0](https://github.com/ViktorsBaikers/DevRites/compare/v5.4.0...v5.5.0) (2026-09-13)
 
 ### Added

package/README.md

@@ -33,7 +33,7 @@ project-conventional push, tag, or PR action, and archive the workspace.
 Unattended runs may create local WIP checkpoint commits along the way, but they
 remain local unless Ship's disclosed plan includes an approved remote action.
 
-**Status:** [`v5.5.0`](https://github.com/ViktorsBaikers/DevRites/releases/tag/v5.5.0): see [`CHANGELOG.md`](CHANGELOG.md) for release notes.
+**Status:** [`v5.7.0`](https://github.com/ViktorsBaikers/DevRites/releases/tag/v5.7.0): see [`CHANGELOG.md`](CHANGELOG.md) for release notes.
 
 This is the latest published release; `main` may contain unreleased work.
 
@@ -47,8 +47,8 @@ Run this from the root of your project. Node.js 18 or later is required.
 npx devrites@latest
 ```
 
-The installer adds project-local support for Claude Code and Codex. It does not
-write skills, agents, or hooks to `~/.claude` or `~/.codex`.
+The installer adds project-local support for Claude Code, Codex, omp, and pi.
+It does not write skills, agents, or hooks to `~/.claude`, `~/.codex`, or `~/.pi`.
 
 ### 2. Choose the smallest route
 
@@ -78,8 +78,9 @@ proof and next action.
 ## How the lifecycle works
 
 Claude Code supports both `/rite <verb>` and `/rite-<verb>`. Codex uses the same
-forms with `$`: `$rite <verb>` and `$rite-<verb>`. The menu and direct forms run
-the same skill.
+forms with `$`: `$rite <verb>` and `$rite-<verb>`. omp and pi use the Claude
+slash forms (on pi they run as prompt templates under `.pi/prompts`, with
+`/skill:rite-<verb>` equivalent). The menu and direct forms run the same skill.
 
 | # | Stage | Direct command | What happens |
 | ---: | --- | --- | --- |
@@ -294,7 +295,8 @@ Useful install flags:
 | `--target DIR` | Use another project directory. |
 | `--dry-run` | Show planned file operations without changing anything. |
 | `--force` | Replace or remove foreign or customized managed files. The installer still rejects symlinks and path escapes. |
-| `--no-codex` | Skip `.agents`, `.codex`, and `AGENTS.md` integration. |
+| `--no-codex` | Skip `.agents`, `.codex`, and the Codex `AGENTS.md` block. |
+| `--no-pi` | Skip `.pi` skills, agents, prompt commands, and the pi `AGENTS.md` block. |
 | `--no-agents` | Skip hook-free native specialist profiles. |
 | `--no-skills` | Skip skills and their bundled standards. |
 | `--no-binary` | Do not keep the shared `devrites-engine` binary in a user or system bin directory. |

package/engine/internal/devritespaths/paths.go

@@ -16,9 +16,12 @@ const (
 	ClaudeSkillsTarget    = ".claude/skills"
 	CodexSkillsTarget     = ".agents/skills"
 	OmpSkillsTarget       = ".omp/skills"
+	PiSkillsTarget        = ".pi/skills"
 	ClaudeAgentsTarget    = ".claude/agents"
 	CodexAgentsTarget     = ".codex/agents"
 	OmpAgentsTarget       = ".omp/agents"
+	PiAgentsTarget        = ".pi/agents"
+	PiPromptsTarget       = ".pi/prompts"
 	ClaudeWorkflowsTarget = ".claude/workflows"
 
 	ManifestName = ".claude/devrites.manifest"

package/engine/internal/hostpack/hostpack.go

@@ -17,9 +17,12 @@ const (
 	ClaudeSkillsTarget    = devritespaths.ClaudeSkillsTarget
 	CodexSkillsTarget     = devritespaths.CodexSkillsTarget
 	OmpSkillsTarget       = devritespaths.OmpSkillsTarget
+	PiSkillsTarget        = devritespaths.PiSkillsTarget
 	ClaudeAgentsTarget    = devritespaths.ClaudeAgentsTarget
 	CodexAgentsTarget     = devritespaths.CodexAgentsTarget
 	OmpAgentsTarget       = devritespaths.OmpAgentsTarget
+	PiAgentsTarget        = devritespaths.PiAgentsTarget
+	PiPromptsTarget       = devritespaths.PiPromptsTarget
 	ClaudeWorkflowsTarget = devritespaths.ClaudeWorkflowsTarget
 )
 
@@ -87,6 +90,15 @@ var ClaudeSettingsMerge = JSONMerge{
 	DryRunText: ".claude/settings.json (DevRites permissions)",
 }
 
+var PiAgentsMerge = MarkerMerge{
+	TargetRel:  "AGENTS.md",
+	PayloadRel: "pi/AGENTS.md",
+	Begin:      "<!-- BEGIN DEVRITES PI -->",
+	End:        "<!-- END DEVRITES PI -->",
+	MarkerRel:  ".claude/devrites.pi-agents-merge",
+	MarkerText: "AGENTS.md contains a DevRites managed block between BEGIN/END DEVRITES PI markers.",
+}
+
 var CodexConfigMerge = MarkerMerge{
 	TargetRel:  ".codex/config.toml",
 	PayloadRel: "codex/config.toml",
@@ -108,7 +120,14 @@ var managedMerges = []ManagedMerge{
 		TargetRel: CodexAgentsMerge.TargetRel,
 		Begin:     CodexAgentsMerge.Begin,
 		End:       CodexAgentsMerge.End,
-		DryRun:    "AGENTS.md DevRites block",
+		DryRun:    "AGENTS.md DevRites Codex block",
+	},
+	{
+		MarkerRel: PiAgentsMerge.MarkerRel,
+		TargetRel: PiAgentsMerge.TargetRel,
+		Begin:     PiAgentsMerge.Begin,
+		End:       PiAgentsMerge.End,
+		DryRun:    "AGENTS.md DevRites pi block",
 	},
 	{
 		MarkerRel: CodexConfigMerge.MarkerRel,
@@ -125,7 +144,7 @@ var managedMerges = []ManagedMerge{
 	LegacyCodexHooksMerge,
 }
 
-func RequiredPayload(withCodex, withOmp bool) []string {
+func RequiredPayload(withCodex, withOmp, withPi bool) []string {
 	required := []string{
 		"claude/skills",
 		"claude/agents",
@@ -147,11 +166,19 @@ func RequiredPayload(withCodex, withOmp bool) []string {
 			"omp/.omp-plugin/plugin.json",
 		)
 	}
+	if withPi {
+		required = append(required,
+			"pi/skills",
+			"pi/agents",
+			"pi/prompts",
+			"pi/AGENTS.md",
+		)
+	}
 	return required
 }
 
-func ValidatePayload(payload fs.FS, withCodex, withOmp bool) error {
-	for _, rel := range RequiredPayload(withCodex, withOmp) {
+func ValidatePayload(payload fs.FS, withCodex, withOmp, withPi bool) error {
+	for _, rel := range RequiredPayload(withCodex, withOmp, withPi) {
 		if _, err := fs.Stat(payload, rel); err != nil {
 			return fmt.Errorf("missing %s", rel)
 		}
@@ -159,7 +186,7 @@ func ValidatePayload(payload fs.FS, withCodex, withOmp bool) error {
 	return nil
 }
 
-func InstallTrees(withSkills, withAgents, withCodex, withOmp bool) []Tree {
+func InstallTrees(withSkills, withAgents, withCodex, withOmp, withPi bool) []Tree {
 	var trees []Tree
 	if withSkills {
 		trees = append(trees, Tree{PayloadPrefix: "claude/skills", TargetPrefix: ClaudeSkillsTarget})
@@ -169,6 +196,12 @@ func InstallTrees(withSkills, withAgents, withCodex, withOmp bool) []Tree {
 		if withOmp {
 			trees = append(trees, Tree{PayloadPrefix: "omp/skills", TargetPrefix: OmpSkillsTarget})
 		}
+		if withPi {
+			trees = append(trees,
+				Tree{PayloadPrefix: "pi/skills", TargetPrefix: PiSkillsTarget},
+				Tree{PayloadPrefix: "pi/prompts", TargetPrefix: PiPromptsTarget},
+			)
+		}
 	}
 	if withAgents {
 		trees = append(trees, Tree{PayloadPrefix: "claude/agents", TargetPrefix: ClaudeAgentsTarget})
@@ -178,6 +211,9 @@ func InstallTrees(withSkills, withAgents, withCodex, withOmp bool) []Tree {
 		if withOmp {
 			trees = append(trees, Tree{PayloadPrefix: "omp/agents", TargetPrefix: OmpAgentsTarget})
 		}
+		if withPi {
+			trees = append(trees, Tree{PayloadPrefix: "pi/agents", TargetPrefix: PiAgentsTarget})
+		}
 	}
 	if withSkills && withAgents {
 		trees = append(trees, Tree{PayloadPrefix: "claude/workflows", TargetPrefix: ClaudeWorkflowsTarget})
@@ -185,7 +221,7 @@ func InstallTrees(withSkills, withAgents, withCodex, withOmp bool) []Tree {
 	return trees
 }
 
-func AliasTargets(alias Alias, withCodex, withOmp bool) []string {
+func AliasTargets(alias Alias, withCodex, withOmp, withPi bool) []string {
 	targets := []string{filepath.ToSlash(filepath.Join(ClaudeSkillsTarget, alias.Name, "SKILL.md"))}
 	if withCodex {
 		targets = append(targets, filepath.ToSlash(filepath.Join(CodexSkillsTarget, alias.Name, "SKILL.md")))
@@ -193,6 +229,9 @@ func AliasTargets(alias Alias, withCodex, withOmp bool) []string {
 	if withOmp {
 		targets = append(targets, filepath.ToSlash(filepath.Join(OmpSkillsTarget, alias.Name, "SKILL.md")))
 	}
+	if withPi {
+		targets = append(targets, filepath.ToSlash(filepath.Join(PiSkillsTarget, alias.Name, "SKILL.md")))
+	}
 	return targets
 }
 

package/engine/internal/hostpack/hostpack_test.go

@@ -21,70 +21,86 @@ func TestValidatePayloadRequiresClaudeAndCodexFiles(t *testing.T) {
 		"omp/skills/rite/SKILL.md":                     {},
 		"omp/agents/devrites-code-reviewer.md":         {},
 		"omp/.omp-plugin/plugin.json":                  {},
+		"pi/skills/rite/SKILL.md":                      {},
+		"pi/agents/devrites-code-reviewer.md":          {},
+		"pi/prompts/rite.md":                           {},
+		"pi/AGENTS.md":                                 {},
 	}
-	if err := ValidatePayload(payload, true, true); err != nil {
+	if err := ValidatePayload(payload, true, true, true); err != nil {
 		t.Fatal(err)
 	}
 	delete(payload, "codex/config.toml")
-	err := ValidatePayload(payload, true, true)
+	err := ValidatePayload(payload, true, true, true)
 	if err == nil || !strings.Contains(err.Error(), "missing codex/config.toml") {
 		t.Fatalf("ValidatePayload error = %v, want missing codex/config.toml", err)
 	}
-	if err := ValidatePayload(payload, false, true); err != nil {
+	if err := ValidatePayload(payload, false, true, true); err != nil {
 		t.Fatalf("claude-only payload should not require codex files: %v", err)
 	}
 	delete(payload, "omp/.omp-plugin/plugin.json")
-	err = ValidatePayload(payload, false, true)
+	err = ValidatePayload(payload, false, true, true)
 	if err == nil || !strings.Contains(err.Error(), "missing omp/.omp-plugin/plugin.json") {
 		t.Fatalf("ValidatePayload error = %v, want missing omp/.omp-plugin/plugin.json", err)
 	}
-	if err := ValidatePayload(payload, false, false); err != nil {
-		t.Fatalf("claude-only payload should not require omp files: %v", err)
+	delete(payload, "pi/prompts/rite.md")
+	err = ValidatePayload(payload, false, false, true)
+	if err == nil || !strings.Contains(err.Error(), "missing pi/prompts") {
+		t.Fatalf("ValidatePayload error = %v, want missing pi/prompts", err)
+	}
+	if err := ValidatePayload(payload, false, false, false); err != nil {
+		t.Fatalf("claude-only payload should not require omp or pi files: %v", err)
 	}
 }
 
 func TestInstallTreesMapPayloadsToTargets(t *testing.T) {
-	got := InstallTrees(true, true, true, true)
+	got := InstallTrees(true, true, true, true, true)
 	want := []Tree{
 		{PayloadPrefix: "claude/skills", TargetPrefix: ".claude/skills"},
 		{PayloadPrefix: "codex/skills", TargetPrefix: ".agents/skills"},
 		{PayloadPrefix: "omp/skills", TargetPrefix: ".omp/skills"},
+		{PayloadPrefix: "pi/skills", TargetPrefix: ".pi/skills"},
+		{PayloadPrefix: "pi/prompts", TargetPrefix: ".pi/prompts"},
 		{PayloadPrefix: "claude/agents", TargetPrefix: ".claude/agents"},
 		{PayloadPrefix: "codex/agents", TargetPrefix: ".codex/agents"},
 		{PayloadPrefix: "omp/agents", TargetPrefix: ".omp/agents"},
+		{PayloadPrefix: "pi/agents", TargetPrefix: ".pi/agents"},
 		{PayloadPrefix: "claude/workflows", TargetPrefix: ".claude/workflows"},
 	}
 	if !reflect.DeepEqual(got, want) {
 		t.Fatalf("InstallTrees() = %#v, want %#v", got, want)
 	}
-	for _, trees := range [][]Tree{InstallTrees(true, false, true, true), InstallTrees(false, true, true, true)} {
+	for _, trees := range [][]Tree{InstallTrees(true, false, true, true, true), InstallTrees(false, true, true, true, true)} {
 		for _, tree := range trees {
 			if tree.PayloadPrefix == "claude/workflows" {
 				t.Fatal("Claude workflow installed without both skills and agents")
 			}
 		}
 	}
-	for _, tree := range InstallTrees(true, true, true, false) {
+	for _, tree := range InstallTrees(true, true, true, false, false) {
 		if strings.HasPrefix(tree.TargetPrefix, ".omp/") {
 			t.Fatalf("omp tree installed with withOmp=false: %#v", tree)
 		}
+		if strings.HasPrefix(tree.TargetPrefix, ".pi/") {
+			t.Fatalf("pi tree installed with withPi=false: %#v", tree)
+		}
 	}
 }
 
 func TestAliasTargetsIncludeOmpWhenEnabled(t *testing.T) {
-	got := AliasTargets(Alias{Name: "define"}, true, true)
+	got := AliasTargets(Alias{Name: "define"}, true, true, true)
 	want := []string{
 		".claude/skills/define/SKILL.md",
 		".agents/skills/define/SKILL.md",
 		".omp/skills/define/SKILL.md",
+		".pi/skills/define/SKILL.md",
 	}
 	if !reflect.DeepEqual(got, want) {
 		t.Fatalf("AliasTargets() = %#v, want %#v", got, want)
 	}
-	got = AliasTargets(Alias{Name: "define"}, true, false)
+	got = AliasTargets(Alias{Name: "define"}, true, false, false)
 	for _, rel := range got {
-		if strings.HasPrefix(rel, ".omp/") {
-			t.Fatalf("omp alias installed with withOmp=false: %s", rel)
+		if strings.HasPrefix(rel, ".omp/") || strings.HasPrefix(rel, ".pi/") {
+			t.Fatalf("disabled-host alias installed: %s", rel)
 		}
 	}
 }

package/engine/internal/install/apply.go

@@ -24,6 +24,7 @@ func (r *runner) install() error {
 	fmt.Fprintf(r.opts.Stdout, "  agents : %s\n", yesno(r.opts.WithAgents))
 	fmt.Fprintf(r.opts.Stdout, "  codex  : %s\n", yesno(r.opts.WithCodex))
 	fmt.Fprintf(r.opts.Stdout, "  omp    : %s\n", yesno(r.opts.WithOmp))
+	fmt.Fprintf(r.opts.Stdout, "  pi     : %s\n", yesno(r.opts.WithPi))
 	fmt.Fprintf(r.opts.Stdout, "  aliases: %s\n", r.opts.AliasMode)
 	if r.opts.DryRun {
 		fmt.Fprintln(r.opts.Stdout, "  (dry run - no changes will be made)")
@@ -38,7 +39,7 @@ func (r *runner) install() error {
 		return err
 	}
 
-	for _, tree := range hostpack.InstallTrees(r.opts.WithSkills, r.opts.WithAgents, r.opts.WithCodex, r.opts.WithOmp) {
+	for _, tree := range hostpack.InstallTrees(r.opts.WithSkills, r.opts.WithAgents, r.opts.WithCodex, r.opts.WithOmp, r.opts.WithPi) {
 		if err := r.installTree(tree.PayloadPrefix, tree.TargetPrefix); err != nil {
 			return fmt.Errorf("install tree %s: %w", tree.TargetPrefix, err)
 		}
@@ -49,7 +50,7 @@ func (r *runner) install() error {
 			if err != nil {
 				return fmt.Errorf("render alias skill %s: %w", alias.Name, err)
 			}
-			for _, rel := range hostpack.AliasTargets(alias, r.opts.WithCodex, r.opts.WithOmp) {
+			for _, rel := range hostpack.AliasTargets(alias, r.opts.WithCodex, r.opts.WithOmp, r.opts.WithPi) {
 				if err := r.installData(data, rel); err != nil {
 					return fmt.Errorf("install alias: %w", err)
 				}
@@ -64,6 +65,11 @@ func (r *runner) install() error {
 			return fmt.Errorf("merge %s: %w", hostpack.CodexConfigMerge.TargetRel, err)
 		}
 	}
+	if r.opts.WithSkills && r.opts.WithPi {
+		if err := r.mergeMarkerFile(hostpack.PiAgentsMerge); err != nil {
+			return fmt.Errorf("merge %s: %w", hostpack.PiAgentsMerge.TargetRel, err)
+		}
+	}
 	if r.opts.WithSkills {
 		if err := r.seedClaudeSettings(); err != nil {
 			return fmt.Errorf("seed claude settings: %w", err)
@@ -93,11 +99,11 @@ func (r *runner) install() error {
 	fmt.Fprintf(r.opts.Stdout, "  installed: %d   overwritten: %d   skipped(conflict): %d   pruned: %d\n", r.stats.installed, r.stats.overwrote, r.stats.skipped, r.stats.pruned)
 	if !r.opts.DryRun && r.opts.WithSkills {
 		switch {
-		case r.opts.WithCodex && r.opts.WithOmp:
-			fmt.Fprintln(r.opts.Stdout, "Next: reopen the project, then run /rite (Claude) or $rite (Codex) or /skill:rite.")
+		case r.opts.WithCodex && (r.opts.WithOmp || r.opts.WithPi):
+			fmt.Fprintln(r.opts.Stdout, "Next: reopen the project, then run /rite (Claude) or $rite (Codex) or /skill:rite (omp/pi).")
 		case r.opts.WithCodex:
 			fmt.Fprintln(r.opts.Stdout, "Next: reopen the project, then run /rite (Claude) or $rite (Codex).")
-		case r.opts.WithOmp:
+		case r.opts.WithOmp || r.opts.WithPi:
 			fmt.Fprintln(r.opts.Stdout, "Next: reopen the project, then run /rite or /skill:rite.")
 		default:
 			fmt.Fprintln(r.opts.Stdout, "Next: reopen the project, then run /rite.")
@@ -311,6 +317,9 @@ func (r *runner) flagsString() string {
 	if !r.opts.WithOmp {
 		flags = append(flags, "--no-omp")
 	}
+	if !r.opts.WithPi {
+		flags = append(flags, "--no-pi")
+	}
 	if !r.opts.WithBinary {
 		flags = append(flags, "--no-binary")
 	}

package/engine/internal/install/install.go

@@ -35,6 +35,7 @@ type Options struct {
 	WithAgents  bool
 	WithCodex   bool
 	WithOmp     bool
+	WithPi      bool
 	WithBinary  bool
 	KeepBinary  bool
 	AliasMode   string
@@ -84,6 +85,7 @@ func DefaultOptions(mode Mode) Options {
 		WithAgents: true,
 		WithCodex:  true,
 		WithOmp:    true,
+		WithPi:     true,
 		WithBinary: true,
 		AliasMode:  "safe",
 		Stdout:     io.Discard,
@@ -135,6 +137,7 @@ func parseArgs(args []string, opts *Options) error {
 	force := flags.Bool("force", opts.Force, "")
 	noCodex := flags.Bool("no-codex", !opts.WithCodex, "")
 	noOmp := flags.Bool("no-omp", !opts.WithOmp, "")
+	noPi := flags.Bool("no-pi", !opts.WithPi, "")
 	noAgents := flags.Bool("no-agents", !opts.WithAgents, "")
 	noSkills := flags.Bool("no-skills", !opts.WithSkills, "")
 	noBinary := flags.Bool("no-binary", !opts.WithBinary, "")
@@ -162,6 +165,7 @@ func parseArgs(args []string, opts *Options) error {
 	opts.Force = *force
 	opts.WithCodex = !*noCodex
 	opts.WithOmp = !*noOmp
+	opts.WithPi = !*noPi
 	opts.WithAgents = !*noAgents
 	opts.WithSkills = !*noSkills
 	opts.WithBinary = !*noBinary
@@ -208,7 +212,7 @@ func usage(mode Mode) string {
 	case ModeUpdate:
 		return "usage: devrites-engine update [--target DIR] [--dry-run] [--force] [--check] [install flags] [--source-dir DIR --payload-dir DIR]\n"
 	default:
-		return "usage: devrites-engine install [--target DIR] [--dry-run] [--force] [--no-codex] [--no-omp] [--no-agents] [--no-skills] [--no-binary] [--short-aliases=all]\n"
+		return "usage: devrites-engine install [--target DIR] [--dry-run] [--force] [--no-codex] [--no-omp] [--no-pi] [--no-agents] [--no-skills] [--no-binary] [--short-aliases=all]\n"
 	}
 }
 
@@ -333,7 +337,7 @@ func (r *runner) validatePayload() error {
 	if r.payload == "" {
 		return fmt.Errorf("generated install payload not found; pass --payload-dir or run scripts/build-host-artifacts.sh")
 	}
-	if err := hostpack.ValidatePayload(r.payloadFS, r.opts.WithCodex, r.opts.WithOmp); err != nil {
+	if err := hostpack.ValidatePayload(r.payloadFS, r.opts.WithCodex, r.opts.WithOmp, r.opts.WithPi); err != nil {
 		return fmt.Errorf("generated install payload under %s: %w", r.payload, err)
 	}
 	return nil
@@ -349,6 +353,8 @@ func isGlobalTarget(target string) bool {
 		filepath.Join(home, ".codex"),
 		filepath.Join(home, ".omp"),
 		filepath.Join(home, ".omp", "agent"),
+		filepath.Join(home, ".pi"),
+		filepath.Join(home, ".pi", "agent"),
 	} {
 		if target == global || strings.HasPrefix(target, global+string(os.PathSeparator)) {
 			return true

package/engine/internal/install/install_test.go

@@ -53,12 +53,14 @@ func TestInstallPrintsFirstMoveForInstalledHosts(t *testing.T) {
 		name      string
 		withCodex bool
 		withOmp   bool
+		withPi    bool
 		want      string
 	}{
-		{name: "Claude, Codex, and OMP", withCodex: true, withOmp: true, want: "Next: reopen the project, then run /rite (Claude) or $rite (Codex) or /skill:rite."},
-		{name: "Claude and Codex", withCodex: true, withOmp: false, want: "Next: reopen the project, then run /rite (Claude) or $rite (Codex)."},
-		{name: "Claude and OMP", withCodex: false, withOmp: true, want: "Next: reopen the project, then run /rite or /skill:rite."},
-		{name: "Claude only", withCodex: false, withOmp: false, want: "Next: reopen the project, then run /rite."},
+		{name: "Claude, Codex, and OMP", withCodex: true, withOmp: true, want: "Next: reopen the project, then run /rite (Claude) or $rite (Codex) or /skill:rite (omp/pi)."},
+		{name: "Claude and Codex", withCodex: true, withOmp: false, withPi: false, want: "Next: reopen the project, then run /rite (Claude) or $rite (Codex)."},
+		{name: "Claude and OMP", withCodex: false, withOmp: true, withPi: false, want: "Next: reopen the project, then run /rite or /skill:rite."},
+		{name: "Claude and pi", withCodex: false, withOmp: false, withPi: true, want: "Next: reopen the project, then run /rite or /skill:rite."},
+		{name: "Claude only", withCodex: false, withOmp: false, withPi: false, want: "Next: reopen the project, then run /rite."},
 	} {
 		t.Run(tc.name, func(t *testing.T) {
 			var out bytes.Buffer
@@ -67,6 +69,7 @@ func TestInstallPrintsFirstMoveForInstalledHosts(t *testing.T) {
 			opts.PayloadDir = testPayload(t)
 			opts.WithCodex = tc.withCodex
 			opts.WithOmp = tc.withOmp
+			opts.WithPi = tc.withPi
 			opts.Stdout = &out
 			opts.Stderr = &bytes.Buffer{}
 
@@ -758,7 +761,7 @@ func TestLegacyCodexHooksMergeIsCleanupOnly(t *testing.T) {
 	if !ok || merge != legacy {
 		t.Fatalf("legacy marker lookup = %#v, %t", merge, ok)
 	}
-	if slices.Contains(hostpack.RequiredPayload(true, true), "codex/hooks.json") {
+	if slices.Contains(hostpack.RequiredPayload(true, true, true), "codex/hooks.json") {
 		t.Fatal("legacy Codex hooks entered the required payload")
 	}
 	r := runner{opts: DefaultOptions(ModeInstall), payloadFS: os.DirFS(testPayload(t))}
@@ -1247,6 +1250,10 @@ extends = ":workspace"
 	testutil.WriteFile(t, filepath.Join(root, "omp", "skills", "rite", "SKILL.md"), "omp rite\n")
 	testutil.WriteFile(t, filepath.Join(root, "omp", "agents", "devrites-code-reviewer.md"), "omp agent\n")
 	testutil.WriteFile(t, filepath.Join(root, "omp", ".omp-plugin", "plugin.json"), "{}\n")
+	testutil.WriteFile(t, filepath.Join(root, "pi", "skills", "rite", "SKILL.md"), "pi rite\n")
+	testutil.WriteFile(t, filepath.Join(root, "pi", "agents", "devrites-code-reviewer.md"), "pi agent\n")
+	testutil.WriteFile(t, filepath.Join(root, "pi", "prompts", "rite.md"), "pi prompt\n")
+	testutil.WriteFile(t, filepath.Join(root, "pi", "AGENTS.md"), "<!-- BEGIN DEVRITES PI -->\nDevRites\n<!-- END DEVRITES PI -->\n")
 }
 
 func testSource(t *testing.T, version string) string {

package/engine/internal/install/merge.go

@@ -63,6 +63,11 @@ func (r *runner) mergeMarkerFile(merge hostpack.MarkerMerge) error {
 		if err := fsutil.WriteFileAtomic(dest, next, 0o644); err != nil {
 			return fmt.Errorf("cannot write %s: %w", merge.TargetRel, err)
 		}
+		// Multiple marker blocks can share one target (AGENTS.md carries both
+		// the Codex and pi blocks).
+		if err := r.refreshPreflight(merge.TargetRel); err != nil {
+			return err
+		}
 	}
 	return r.installMarker(merge.MarkerRel, merge.MarkerText)
 }

package/engine/internal/install/preflight.go

@@ -93,7 +93,7 @@ func (r *runner) preflightUninstall(entries []string) error {
 
 func (r *runner) desiredInstallPaths() (map[string]bool, error) {
 	out := map[string]bool{".devrites/README.md": true}
-	for _, tree := range hostpack.InstallTrees(r.opts.WithSkills, r.opts.WithAgents, r.opts.WithCodex, r.opts.WithOmp) {
+	for _, tree := range hostpack.InstallTrees(r.opts.WithSkills, r.opts.WithAgents, r.opts.WithCodex, r.opts.WithOmp, r.opts.WithPi) {
 		err := fs.WalkDir(r.payloadFS, tree.PayloadPrefix, func(path string, d fs.DirEntry, err error) error {
 			if err != nil {
 				return err
@@ -114,7 +114,7 @@ func (r *runner) desiredInstallPaths() (map[string]bool, error) {
 	}
 	if r.opts.WithSkills && r.opts.AliasMode == "all" {
 		for _, alias := range hostpack.Aliases {
-			for _, rel := range hostpack.AliasTargets(alias, r.opts.WithCodex, r.opts.WithOmp) {
+			for _, rel := range hostpack.AliasTargets(alias, r.opts.WithCodex, r.opts.WithOmp, r.opts.WithPi) {
 				out[rel] = true
 			}
 		}
@@ -123,6 +123,9 @@ func (r *runner) desiredInstallPaths() (map[string]bool, error) {
 		out[hostpack.CodexAgentsMerge.MarkerRel] = true
 		out[hostpack.CodexConfigMerge.MarkerRel] = true
 	}
+	if r.opts.WithSkills && r.opts.WithPi {
+		out[hostpack.PiAgentsMerge.MarkerRel] = true
+	}
 	if r.opts.WithSkills {
 		out[hostpack.ClaudeSettingsMerge.MarkerRel] = true
 	}
@@ -136,6 +139,9 @@ func (r *runner) installMergeTargets() []string {
 		if r.opts.WithCodex {
 			out = append(out, hostpack.CodexAgentsMerge.TargetRel, hostpack.CodexConfigMerge.TargetRel)
 		}
+		if r.opts.WithPi {
+			out = append(out, hostpack.PiAgentsMerge.TargetRel)
+		}
 	}
 	return out
 }
@@ -153,6 +159,18 @@ func (r *runner) rememberPath(rel string) (pathSnapshot, error) {
 	return snapshot, nil
 }
 
+// refreshPreflight replaces a recorded snapshot after the runner's own
+// verified write (marker merge, strip). Needed when several managed merges
+// share one target such as AGENTS.md.
+func (r *runner) refreshPreflight(rel string) error {
+	snap, err := inspectManagedPath(r.target, rel)
+	if err != nil {
+		return err
+	}
+	r.preflight[filepath.ToSlash(rel)] = snap
+	return nil
+}
+
 func (r *runner) recheckPath(rel string) error {
 	rel = filepath.ToSlash(rel)
 	before, ok := r.preflight[rel]

package/engine/internal/install/uninstall.go

@@ -58,6 +58,11 @@ func (r *runner) uninstall() error {
 		if err := stripMarkerPath(filepath.Join(r.target, filepath.FromSlash(merge.TargetRel)), merge.Begin, merge.End); err != nil {
 			return fmt.Errorf("strip marker block from %s: %w", merge.TargetRel, err)
 		}
+		// The Codex and pi AGENTS.md blocks share one target; record the strip
+		// so the next merge's recheckPath sees our own write, not a race.
+		if err := r.refreshPreflight(merge.TargetRel); err != nil {
+			return err
+		}
 	}
 
 	var dirs []string

package/engine/internal/install/update.go

@@ -65,7 +65,7 @@ func runUpdate(opts Options) error {
 	if err != nil {
 		return fmt.Errorf("resolve payload %s: %w", opts.PayloadDir, err)
 	}
-	if err := hostpack.ValidatePayload(os.DirFS(payload), true, true); err != nil {
+	if err := hostpack.ValidatePayload(os.DirFS(payload), true, true, true); err != nil {
 		return fmt.Errorf("local update payload under %s is invalid: %w", payload, err)
 	}
 	installFlags := manifestHeader(mf, "devrites-flags")