devrites 6.0.3 → 6.1.0

package/engine/help.go

@@ -5,6 +5,7 @@ import (
 	"io"
 	"strings"
 
+	"github.com/devrites/devrites/internal/lib"
 	"github.com/devrites/devrites/internal/notes"
 	"github.com/devrites/devrites/internal/overhaul"
 	"github.com/devrites/devrites/internal/parallel"
@@ -20,12 +21,12 @@ const (
   check path-disjoint [--root <dir>] [<json-file>|-]
   check task-graph <slug>
   check slice <slug> <SLICE-ID>
-  check diff-scope <slug> --allow <csv> | --allow-file <path> [--worktree|--staged|--base <ref>]
+  check diff-scope <slug> --allow <csv> | --allow-file <path> [--worktree|--staged|--base <ref>] [--allow-empty] [--cwd <dir>]
   check skill-trust <path>
   check indexes [--root <dir>]
   check regression <slug> [--update]
   check drift <slug> [--record]
-  check windows <slug> [--worktree|--staged|--base <ref>]
+  check windows <slug> [--worktree|--staged|--base <ref>] [--cwd <dir>]
   check dup [slug] [--all|--worktree|--staged|--base <ref>]
 `
 
@@ -50,13 +51,13 @@ const (
 	orientUsage  = "usage: devrites-engine orient [slug]"
 	nextUsage    = "usage: devrites-engine next [slug]"
 	handoffUsage = "usage: devrites-engine handoff [slug]"
-	contextUsage = `usage: devrites-engine context [slug] (--phase <p> | --skill <name>) [--role <r>] [--trigger a,b] [--skills-root <dir>] [--out <path>]`
+	contextUsage = `usage: devrites-engine context [slug] (--phase <p> | --skill <name>) [--role <r>] [--slice <SLICE-###>] [--trigger a,b] [--skills-root <dir>] [--out <path>]`
 	metricsUsage = `usage: devrites-engine metrics <record|summary> ...
 
   metrics record <slug> --phase <p> --event <e> [--role r] [--bytes n] [--note s]
-  metrics summary [slug]
+  metrics summary [slug] [--by-slice]
 `
-	dispatchUsage  = `usage: devrites-engine dispatch <slug> <open|start|seal|return|status|abandon> [--phase p] [--wave w] [--role r] [--handle h] [--reason s]`
+	dispatchUsage  = `usage: devrites-engine dispatch <slug> <open|start|seal|return|status|abandon> [--phase p] [--wave w] [--role r] [--handle h] [--reason s] [--slice SLICE-###] [--reslice-review <DRIFT-ID>]`
 	claimUsageText = `usage: devrites-engine claim <add|release|list|check> ...
 
   claim add --session <id> [--ttl <minutes>] [--reason <s>] <path>...
@@ -131,6 +132,7 @@ func takesSubcommand(command string) bool {
 var valueFlags = map[string]map[string]bool{
 	"claim":    {"--session": true, "--reason": true, "--ttl": true, "--id": true},
 	"dispatch": {"--phase": true, "--wave": true, "--role": true, "--handle": true, "--reason": true},
+	"recall":   {"--paths": true, "--limit": true},
 }
 
 // hasHelpFlag reports whether args (the arguments after the command word) are a
@@ -168,7 +170,7 @@ func shouldPrintHelp(args []string) bool {
 		return true
 	}
 	switch args[0] {
-	case "check", "state", "observe", "parallel", "gates", "claim", "detect", "note", "metrics", "handoff", "context", "orient", "migrate", "overhaul", "next", "dispatch", "secret-scan", "open-visual":
+	case "check", "state", "observe", "parallel", "gates", "claim", "detect", "note", "metrics", "handoff", "context", "orient", "migrate", "overhaul", "next", "dispatch", "secret-scan", "open-visual", "recall":
 		return len(args) >= 2 && args[1] == "help"
 	default:
 		return false
@@ -212,6 +214,8 @@ func commandHelp(args []string) (string, bool) {
 		return nextUsage, true
 	case "handoff":
 		return handoffUsage, true
+	case "recall":
+		return lib.RecallUsage, true
 	case "context":
 		return contextUsage, true
 	case "metrics":

package/engine/internal/acceptance/cli.go

@@ -90,7 +90,10 @@ func loadTestPlan(testPlanPath string) []ApprovedCommand {
 }
 
 func parseSlug(args []string) (string, bool) {
-	return args[0], len(args) == 1 && args[0] != "" && !strings.HasPrefix(args[0], "-")
+	if len(args) != 1 {
+		return "", false
+	}
+	return args[0], args[0] != "" && !strings.HasPrefix(args[0], "-")
 }
 
 // oneLine flattens an argument to a single ledger line so a pasted newline

package/engine/internal/acceptance/exec.go

@@ -18,6 +18,10 @@ const MaxOutputBytes = 1 << 20
 // DefaultTimeout bounds one check execution.
 const DefaultTimeout = 120 * time.Second
 
+// waitDelay bounds how long Execute waits for output pipes to close once the
+// check timed out or exited; a descendant outside the process group may hold them.
+const waitDelay = 5 * time.Second
+
 // RunOutcome is one executed oracle: the process result plus the canonical
 // output string used for EXPECT matching and the evidence fingerprint.
 type RunOutcome struct {
@@ -83,6 +87,13 @@ func Execute(ctx context.Context, check, cwd string, timeout time.Duration) RunO
 
 	cmd := shellCommand(ctx, check, cwd)
 	configureProcessGroup(cmd)
+	// The default cancel kills only the shell; a forked child holding stdout
+	// would keep Wait blocked past the timeout.
+	cmd.Cancel = func() error {
+		killGroup(cmd)
+		return nil
+	}
+	cmd.WaitDelay = waitDelay
 	stdout := &limitedBuffer{}
 	stderr := &limitedBuffer{}
 	cmd.Stdout = stdout
@@ -94,7 +105,6 @@ func Execute(ctx context.Context, check, cwd string, timeout time.Duration) RunO
 	}
 	waitErr := cmd.Wait()
 	if ctx.Err() == context.DeadlineExceeded {
-		terminateProcessTree(cmd)
 		return RunOutcome{Err: fmt.Errorf("check timed out after %s", timeout), TimedOut: true}
 	}
 	if stdout.overflow || stderr.overflow {
@@ -119,13 +129,3 @@ func Execute(ctx context.Context, check, cwd string, timeout time.Duration) RunO
 	}
 	return RunOutcome{ExitCode: exit, Output: canonical, OutputBytes: len(canonical)}
 }
-
-// terminateProcessTree kills the whole process group on unix; on other
-// platforms it kills only the immediate child (CommandContext already requests
-// it). Implemented in the platform files as killGroup.
-func terminateProcessTree(cmd *exec.Cmd) {
-	if cmd.Process == nil {
-		return
-	}
-	killGroup(cmd)
-}

package/engine/internal/devritespaths/paths.go

@@ -105,6 +105,11 @@ func ExistingFeatureDirChecked(root, slug string) (string, error) {
 	if ws, err := WorkspaceOverrideChecked(root, slug); err != nil {
 		return "", err
 	} else if ws != "" {
+		// The override names a workspace; it never creates one. Without its
+		// state.md ledger a mutating caller would conjure a ghost workspace.
+		if info, err := os.Lstat(filepath.Join(ws, "state.md")); err != nil || !info.Mode().IsRegular() {
+			return "", fmt.Errorf("no workspace for feature %q at %s (DEVRITES_WORKSPACE; state.md missing): %w", slug, ws, os.ErrNotExist)
+		}
 		return ws, nil
 	}
 	candidate := filepath.Join(root, "work", slug)

package/engine/internal/hostpack/hostpack.go

@@ -120,6 +120,45 @@ var CodexConfigMerge = MarkerMerge{
 	MarkerText: ".codex/config.toml contains the DevRites read-only-root permission profile.",
 }
 
+// HostConfig is a host project config DevRites creates only when absent; an
+// existing user file is never edited, the installer prints Advice instead.
+type HostConfig struct {
+	Host    string
+	Rel     string
+	Content string
+	Advice  string
+	// Applied is a substring showing the user already added the advice.
+	Applied string
+}
+
+// OmpConfig hides the .claude/skills and .agents/skills DevRites copies that
+// omp also lists as claude/<name> and agents/<name>; the user's own skills
+// stay visible. omp ignores dotted keys, so the YAML must be nested.
+var OmpConfig = HostConfig{
+	Host: "omp",
+	Rel:  ".omp/config.yml",
+	Content: `skills:
+  ignoredSkills: ["claude/rite*", "claude/devrites-*", "claude/overhaul", "agents/rite*", "agents/devrites-*", "agents/overhaul"]
+`,
+	Advice:  `skills: {ignoredSkills: ["claude/rite*", "claude/devrites-*", "claude/overhaul", "agents/rite*", "agents/devrites-*", "agents/overhaul"]}`,
+	Applied: `claude/rite*`,
+}
+
+// PiSettings stops pi from also loading the Codex .agents/skills copies of
+// DevRites skills (one name-collision warning each; the .pi copy wins). The
+// patterns match only below .agents, so .pi/skills and the user's own
+// .agents skills still load.
+var PiSettings = HostConfig{
+	Host: "pi",
+	Rel:  ".pi/settings.json",
+	Content: `{
+  "skills": ["!**/.agents/skills/rite", "!**/.agents/skills/rite-*", "!**/.agents/skills/devrites-*", "!**/.agents/skills/overhaul"]
+}
+`,
+	Advice:  `"skills": ["!**/.agents/skills/rite", "!**/.agents/skills/rite-*", "!**/.agents/skills/devrites-*", "!**/.agents/skills/overhaul"]`,
+	Applied: `!**/.agents/skills/rite-*`,
+}
+
 var LegacyCodexHooksMerge = ManagedMerge{
 	MarkerRel: ".claude/devrites.codex-hooks-merge",
 	TargetRel: ".codex/hooks.json",
@@ -357,14 +396,20 @@ func MergeMarkerBlock(current, block []byte, begin, end string) ([]byte, error)
 	return []byte(out.String()), nil
 }
 
+// StripMarkerBlock removes the begin/end block and the one blank separator
+// line MergeMarkerBlock puts before an appended block, so install/uninstall
+// cycles do not accumulate blank lines.
 func StripMarkerBlock(data []byte, begin, end string) ([]byte, error) {
-	var out strings.Builder
+	var kept []string
 	inBlock := false
 	for _, line := range strings.SplitAfter(string(data), "\n") {
 		trim := strings.TrimSuffix(line, "\n")
 		trim = strings.TrimSuffix(trim, "\r")
 		switch trim {
 		case begin:
+			if n := len(kept); n > 0 && strings.TrimSpace(kept[n-1]) == "" {
+				kept = kept[:n-1]
+			}
 			inBlock = true
 			continue
 		case end:
@@ -372,13 +417,13 @@ func StripMarkerBlock(data []byte, begin, end string) ([]byte, error) {
 			continue
 		}
 		if !inBlock {
-			out.WriteString(line)
+			kept = append(kept, line)
 		}
 	}
 	if inBlock {
 		return nil, fmt.Errorf("unterminated %s marker", begin)
 	}
-	return []byte(out.String()), nil
+	return []byte(strings.Join(kept, "")), nil
 }
 
 func ValidateMarkerBlocks(current []byte, merges ...MarkerMerge) error {

package/engine/internal/install/apply.go

@@ -36,6 +36,9 @@ func (r *runner) install() error {
 			return fmt.Errorf("verify staged engine binary %s: %w", r.preparedBinary, err)
 		}
 	}
+	if _, err := r.relinquishEditedHostConfigs(); err != nil {
+		return err
+	}
 	if err := r.preflightInstall(); err != nil {
 		return err
 	}
@@ -81,6 +84,11 @@ func (r *runner) install() error {
 			return fmt.Errorf("seed claude settings: %w", err)
 		}
 	}
+	for _, config := range r.hostConfigs() {
+		if err := r.seedHostConfig(config); err != nil {
+			return fmt.Errorf("seed %s config: %w", config.Host, err)
+		}
+	}
 	if err := r.seedDevrites(); err != nil {
 		return fmt.Errorf("seed .devrites: %w", err)
 	}
@@ -277,6 +285,60 @@ func (r *runner) seedDevrites() error {
 	return f.Close()
 }
 
+// hostConfigs lists the host configs this install manages: omp's skill
+// filter, and pi's .agents/skills filter when Codex skills are installed.
+func (r *runner) hostConfigs() []hostpack.HostConfig {
+	var out []hostpack.HostConfig
+	if r.opts.WithSkills && r.opts.WithOmp {
+		out = append(out, hostpack.OmpConfig)
+	}
+	if r.opts.WithSkills && r.opts.WithPi && r.opts.WithCodex {
+		out = append(out, hostpack.PiSettings)
+	}
+	return out
+}
+
+// relinquishEditedHostConfigs hands every installer-created host config the
+// user has since edited over to the user: it leaves the manifest, so no later
+// update, host drop or uninstall rewrites or removes it, even with --force.
+func (r *runner) relinquishEditedHostConfigs() (map[string]bool, error) {
+	out := map[string]bool{}
+	for _, config := range []hostpack.HostConfig{hostpack.OmpConfig, hostpack.PiSettings} {
+		record, managed := r.prev[config.Rel]
+		if !managed {
+			continue
+		}
+		snapshot, err := r.rememberPath(config.Rel)
+		if err != nil {
+			return nil, err
+		}
+		if snapshot.missing || managedConflict(record, snapshot) == "" {
+			continue
+		}
+		delete(r.prev, config.Rel)
+		out[config.Rel] = true
+		fmt.Fprintf(r.opts.Stdout, "  [keep] %s (edited by you; no longer DevRites-managed)\n", config.Rel)
+	}
+	return out, nil
+}
+
+// seedHostConfig installs config as a managed file unless the user already
+// has their own file there (or edited ours); that one is never edited, even
+// with --force.
+func (r *runner) seedHostConfig(config hostpack.HostConfig) error {
+	if _, managed := r.prev[config.Rel]; !managed {
+		// #nosec G304 -- fixed host config path under the operator target
+		data, err := os.ReadFile(filepath.Join(r.target, filepath.FromSlash(config.Rel)))
+		if err == nil && string(data) != config.Content {
+			if !strings.Contains(string(data), config.Applied) {
+				fmt.Fprintf(r.opts.Stderr, "warning: %s exists and was not changed; to hide duplicate DevRites skills in %s, add: %s\n", config.Rel, config.Host, config.Advice)
+			}
+			return nil
+		}
+	}
+	return r.installData([]byte(config.Content), config.Rel)
+}
+
 func (r *runner) pruneDropped() error {
 	if len(r.prev) == 0 {
 		return nil
@@ -317,12 +379,17 @@ func (r *runner) pruneDropped() error {
 						return fmt.Errorf("strip hooks from %s: %w", merge.TargetRel, err)
 					}
 				} else if merge.TargetRel == hostpack.ClaudeSettingsMerge.TargetRel {
-					if err := r.stripClaudeSettings(filepath.Join(r.target, filepath.FromSlash(merge.TargetRel)), true); err != nil {
+					if err := r.stripClaudeSettings(filepath.Join(r.target, filepath.FromSlash(merge.TargetRel))); err != nil {
 						return fmt.Errorf("strip DevRites settings from %s: %w", merge.TargetRel, err)
 					}
 				} else if err := r.stripMarkerConfined(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)
 				}
+				// Dropped hosts can share one target (AGENTS.md); record our own
+				// strip so the next one's recheckPath does not see a race.
+				if err := r.refreshPreflight(merge.TargetRel); err != nil {
+					return err
+				}
 			}
 			if err := r.removeConfined(dead); err != nil && !os.IsNotExist(err) {
 				return fmt.Errorf("remove %s: %w", rel, err)

package/engine/internal/install/binary.go

@@ -178,6 +178,10 @@ func (r *runner) removeBinary() error {
 		fmt.Fprintln(r.opts.Stdout, "  kept the global devrites-engine binary (--keep-binary).")
 		return nil
 	}
+	if !r.opts.WithBinary {
+		fmt.Fprintln(r.opts.Stdout, "  kept the global devrites-engine binary (--no-binary).")
+		return nil
+	}
 	if os.Getenv("DEVRITES_NO_BINARY") == "1" {
 		fmt.Fprintln(r.opts.Stdout, "  kept the global devrites-engine binary (DEVRITES_NO_BINARY=1).")
 		return nil

package/engine/internal/install/install.go

@@ -43,6 +43,9 @@ type Options struct {
 	UpdateCheck bool
 	Stdout      io.Writer
 	Stderr      io.Writer
+	// args are the raw CLI flags; update re-applies them over the manifest's
+	// recorded install flags so explicit flags win.
+	args []string
 }
 
 type stats struct {
@@ -99,6 +102,7 @@ func Run(args []string, stdout, stderr io.Writer, mode Mode) int {
 	opts := DefaultOptions(mode)
 	opts.Stdout = stdout
 	opts.Stderr = stderr
+	opts.args = args
 	if err := parseArgs(args, &opts); err != nil {
 		if errors.Is(err, errHelp) {
 			fmt.Fprint(stdout, usage(mode))
@@ -353,25 +357,31 @@ func (r *runner) validatePayload() error {
 	return nil
 }
 
+// isGlobalTarget compares the symlink-resolved target with $HOME and each
+// global agent home, both as spelled and symlink-resolved, so a symlinked
+// $HOME (or ~/.claude) cannot bypass the guard.
 func isGlobalTarget(target string) bool {
 	home, _ := os.UserHomeDir()
-	if target == home {
-		return true
-	}
-	for _, global := range []string{
-		filepath.Join(home, ".claude"),
-		filepath.Join(home, ".codex"),
-		filepath.Join(home, ".omp"),
-		filepath.Join(home, ".omp", "agent"),
-		filepath.Join(home, ".pi"),
-		filepath.Join(home, ".pi", "agent"),
-		filepath.Join(home, ".devin"),
-		filepath.Join(home, ".config", "devin"),
-		filepath.Join(home, ".agents"),
-	} {
-		if target == global || strings.HasPrefix(target, global+string(os.PathSeparator)) {
+	homes := []string{home}
+	if resolved, err := filepath.EvalSymlinks(home); err == nil {
+		homes = append(homes, resolved)
+	}
+	for _, h := range homes {
+		if target == h {
 			return true
 		}
+		for _, rel := range []string{".claude", ".codex", ".omp", ".pi", ".devin", filepath.Join(".config", "devin"), ".agents"} {
+			global := filepath.Join(h, rel)
+			globals := []string{global}
+			if resolved, err := filepath.EvalSymlinks(global); err == nil {
+				globals = append(globals, resolved)
+			}
+			for _, g := range globals {
+				if target == g || strings.HasPrefix(target, g+string(os.PathSeparator)) {
+					return true
+				}
+			}
+		}
 	}
 	return false
 }