From 80a5128ff5fa0d9964c9fe2175b5b6f681edc804 Mon Sep 17 00:00:00 2001
From: Jeppe Lillevang Salling <jeppe.lillevang@gmail.com>
Date: Sun, 21 Jun 2026 10:03:52 +0000
Subject: [PATCH 1/3] feat(cli): add read-only `agent-init status` subcommand
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`status [target]` reports the scaffold's current visibility (shared / local
/ hidden / shadowed-by-global), the absolute path of the file carrying the
agent-init ignore block, and the exact sed undo command. When the scaffold
is committed locally but a global-default ignore exists, the report
includes the force-add hint explaining why files may still be tracked.

Detection follows git's ignore precedence (.gitignore > .git/info/exclude
> core.excludesfile) and reports the most-local carrier. The subcommand is
strictly read-only — no files and no git config are mutated. `gitignore`
gains `HasBlock` and exports `MarkerStart` / `MarkerEnd` so the detector
and the undo hint reuse the same markers the writers do.

Closes #60

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .agent/CODEBASE.md                   |  42 ++--
 README.md                            |   1 +
 docs/cli.md                          |  39 +++-
 internal/cli/cli.go                  |  11 +
 internal/cli/cli_test.go             |   4 +-
 internal/cli/status.go               | 174 ++++++++++++++
 internal/cli/status_test.go          | 326 +++++++++++++++++++++++++++
 internal/gitignore/gitignore.go      |  17 ++
 internal/gitignore/gitignore_test.go |  44 ++++
 9 files changed, 635 insertions(+), 23 deletions(-)
 create mode 100644 internal/cli/status.go
 create mode 100644 internal/cli/status_test.go

diff --git a/.agent/CODEBASE.md b/.agent/CODEBASE.md
index d85108d..cb85af4 100644
--- a/.agent/CODEBASE.md
+++ b/.agent/CODEBASE.md
@@ -35,7 +35,9 @@ _Generated by `gen-codemap.sh`. Re-run after structural changes._
 |-- internal
 |   |-- cli
 |   |   |-- cli.go
-|   |   `-- cli_test.go
+|   |   |-- cli_test.go
+|   |   |-- status.go
+|   |   `-- status_test.go
 |   |-- flavors
 |   |   |-- claudecowork
 |   |   |-- common
@@ -90,8 +92,8 @@ _Generated by `gen-codemap.sh`. Re-run after structural changes._
 
 ### Go
 internal/cli/cli.go:66:type Version struct {
-internal/cli/cli.go:152:type App struct {
-internal/cli/cli.go:160:func New(out, errOut io.Writer, version Version) App {
+internal/cli/cli.go:161:type App struct {
+internal/cli/cli.go:169:func New(out, errOut io.Writer, version Version) App {
 internal/cli/cli_test.go:15:func TestListFlavors(t *testing.T) {
 internal/cli/cli_test.go:28:func TestInitLegacyTargetArgument(t *testing.T) {
 internal/cli/cli_test.go:47:func TestInitLegacyTargetArgumentWithoutFlag(t *testing.T) {
@@ -133,6 +135,16 @@ internal/cli/cli_test.go:799:func TestUnknownFlavorErrorPointsAtHelp(t *testing.
 internal/cli/cli_test.go:815:func TestHelpFlagsMatchDocs(t *testing.T) {
 internal/cli/cli_test.go:842:func TestVersion(t *testing.T) {
 internal/cli/cli_test.go:855:func TestVersionDefaultsToDev(t *testing.T) {
+internal/cli/status_test.go:52:func TestStatusSharedWhenNoBlockAnywhere(t *testing.T) {
+internal/cli/status_test.go:75:func TestStatusLocalWhenBlockInGitignore(t *testing.T) {
+internal/cli/status_test.go:109:func TestStatusHiddenWhenBlockInGitInfoExclude(t *testing.T) {
+internal/cli/status_test.go:146:func TestStatusShadowedByGlobalWhenOnlyGlobalCarriesBlock(t *testing.T) {
+internal/cli/status_test.go:189:func TestStatusPrefersLocalOverHiddenOverGlobal(t *testing.T) {
+internal/cli/status_test.go:226:func TestStatusDefaultTargetIsCwd(t *testing.T) {
+internal/cli/status_test.go:256:func TestStatusExplicitTargetIsResolvedToAbsolutePath(t *testing.T) {
+internal/cli/status_test.go:273:func TestStatusRejectsExtraPositionalArgs(t *testing.T) {
+internal/cli/status_test.go:285:func TestStatusHelp(t *testing.T) {
+internal/cli/status_test.go:308:func TestStatusIgnoresGlobalLookupErrors(t *testing.T) {
 internal/flavors/claudecowork/flavor.go:11:func Templates() embed.FS {
 internal/flavors/claudecowork/flavor.go:18:func ExecutablePaths() []string {
 internal/flavors/claudecowork/flavor.go:25:func NextSteps(target string) string {
@@ -172,23 +184,13 @@ internal/gitconfig/gitconfig_test.go:162:func TestEnsureGlobalExpandsTildeInConf
 internal/gitconfig/gitconfig_test.go:176:func TestEnsureGlobalAppendsToExistingFileWithoutOurBlock(t *testing.T) {
 internal/gitconfig/gitconfig_test.go:198:func TestEnsureGlobalIsIdempotent(t *testing.T) {
 internal/gitconfig/gitconfig_test.go:223:func TestGlobalPathDoesNotWriteOrSet(t *testing.T) {
-internal/gitignore/gitignore.go:48:func Block() string {
-internal/gitignore/gitignore.go:63:func LocalPath(target string) (string, error) {
-internal/gitignore/gitignore.go:75:func EnsureLocal(target string) (string, error) {
-internal/gitignore/gitignore.go:94:func HiddenPath(target string) (string, error) {
-internal/gitignore/gitignore.go:115:func EnsureHidden(target string) (string, error) {
-internal/gitignore/gitignore.go:139:func Upsert(content string) string {
-internal/gitignore/gitignore_test.go:10:func TestBlockHasMarkersAndEnvelope(t *testing.T) {
-internal/gitignore/gitignore_test.go:27:func TestEnsureLocalCreatesAndAppends(t *testing.T) {
-internal/gitignore/gitignore_test.go:70:func TestEnsureLocalIsIdempotent(t *testing.T) {
-internal/gitignore/gitignore_test.go:95:func TestEnsureLocalReplacesStaleBlockInPlace(t *testing.T) {
-internal/gitignore/gitignore_test.go:128:func TestEnsureHiddenCreatesAndAppends(t *testing.T) {
-internal/gitignore/gitignore_test.go:174:func TestEnsureHiddenIsIdempotent(t *testing.T) {
-internal/gitignore/gitignore_test.go:196:func TestEnsureHiddenReplacesStaleBlockInPlace(t *testing.T) {
-internal/gitignore/gitignore_test.go:234:func TestEnsureHiddenWritesNoGitignore(t *testing.T) {
-internal/scaffold/color_test.go:9:func TestColorDisabledForNonTTYOutputs(t *testing.T) {
-internal/scaffold/color_test.go:26:func TestColorDisabledByEnvironment(t *testing.T) {
-internal/scaffold/color_test.go:50:func TestColorEnabledForTerminalFile(t *testing.T) {
+internal/gitignore/gitignore.go:56:func Block() string {
+internal/gitignore/gitignore.go:71:func LocalPath(target string) (string, error) {
+internal/gitignore/gitignore.go:83:func EnsureLocal(target string) (string, error) {
+internal/gitignore/gitignore.go:102:func HiddenPath(target string) (string, error) {
+internal/gitignore/gitignore.go:123:func EnsureHidden(target string) (string, error) {
+internal/gitignore/gitignore.go:147:func Upsert(content string) string {
+internal/gitignore/gitignore.go:155:func HasBlock(content string) bool {
 
 ## Stats
 
diff --git a/README.md b/README.md
index 8d0cb1b..56379b9 100644
--- a/README.md
+++ b/README.md
@@ -76,6 +76,7 @@ go build \
 ```bash
 agent-init init [flavor] [target-dir]
 agent-init add-tracker <tracker> <target-dir>
+agent-init status [target]
 agent-init list-flavors
 agent-init list-trackers
 agent-init version
diff --git a/docs/cli.md b/docs/cli.md
index 93f5c2f..c211361 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -1,10 +1,11 @@
 # CLI
 
-`agent-init` is a small CLI with five subcommands. Source: [internal/cli/cli.go](../internal/cli/cli.go).
+`agent-init` is a small CLI with six subcommands. Source: [internal/cli/cli.go](../internal/cli/cli.go).
 
 ```
 agent-init init [flavor] [target-dir]
 agent-init add-tracker <tracker> <target-dir>
+agent-init status [target]
 agent-init list-flavors
 agent-init list-trackers
 agent-init version
@@ -88,6 +89,42 @@ There is no `remove-tracker` subcommand yet. Manual cleanup:
 2. Remove the entry from `.mcp.json` under `mcpServers`.
 3. Remove the tracker name from `AGENTS.md`'s "Active trackers" line.
 
+## `status`
+
+Reports how the scaffold's agentic envelope is currently tracked by git. Read-only — `status` writes no files and touches no git configuration.
+
+```bash
+agent-init status            # report status of the current directory
+agent-init status ./my-tool  # report status of ./my-tool
+```
+
+The optional positional argument defaults to `.`. The target is resolved to an absolute path before reporting, so the printed paths are unambiguous.
+
+### Output
+
+Each line is `<label>: <value>`. The fields:
+
+| Field | Meaning |
+|-------|---------|
+| `mode` | One of `shared` (no agent-init ignore block found), `local` (block in the committed `.gitignore`), `hidden` (block in `.git/info/exclude`), or `shadowed-by-global` (no repo-local block, but a block exists in your machine-wide git excludes file). |
+| `target` | Absolute path of the directory `status` was run against. |
+| `ignore` | Absolute path of the file carrying the agent-init ignore block. Omitted in `shared` mode. Annotated `(machine-wide)` for `shadowed-by-global`. |
+| `undo` | A portable `sed` invocation that deletes the fenced block from the carrier, plus a fallback instruction for users who would rather edit by hand. The markers come from [internal/gitignore](../internal/gitignore/gitignore.go) (`MarkerStart` / `MarkerEnd`) so they cannot drift from what is on disk. |
+| `note` | Only printed for `shadowed-by-global`. Explains that already-tracked files stay tracked (a global ignore does not retroactively untrack files in the index) and prints the same force-add line `init --visibility=global-default` shows, for repos where the scaffold is being newly added but should be committed openly. |
+
+### Detection precedence
+
+Git's ignore precedence is `.gitignore` > `.git/info/exclude` > `core.excludesfile`, so the block can in principle exist in more than one file at once. `status` reports the most-local (highest-precedence) carrier it finds. `shadowed-by-global` is reported only when neither `.gitignore` nor `.git/info/exclude` carries the block but the machine-wide excludes file does — that is the state where the scaffold is committed openly here yet ignored everywhere else.
+
+The carrier-path helpers come from [internal/gitignore](../internal/gitignore/gitignore.go) (`LocalPath`, `HiddenPath`) and the global-excludes path from [internal/gitconfig](../internal/gitconfig/gitconfig.go) (`GlobalPath`, which is read-only — it never sets `core.excludesfile`). The presence check uses the same managed-block markers the writers do, exposed via `gitignore.HasBlock`.
+
+### Behavior
+
+- Reads at most three files: the target's `.gitignore`, its `.git/info/exclude`, and the machine-wide excludes file. A missing file is not an error — it is the normal `shared` case.
+- Writes nothing. Touches no git configuration. Safe to run in CI or against a repo you do not own.
+- No flags. `--help` and `-h` print the usage as on every subcommand.
+- Source: [internal/cli/status.go](../internal/cli/status.go) (`runStatus`, `detectStatus`, `writeStatusReport`).
+
 ## `list-flavors`
 
 Prints registered flavors with one-line descriptions, sorted by name.
diff --git a/internal/cli/cli.go b/internal/cli/cli.go
index 3c69edc..07ecee5 100644
--- a/internal/cli/cli.go
+++ b/internal/cli/cli.go
@@ -123,6 +123,15 @@ var commands = []commandHelp{
 			"agent-init add-tracker jira ~/work/pm",
 		},
 	},
+	{
+		name:    "status",
+		summary: "report how the scaffold is tracked (read-only)",
+		usage:   "agent-init status [target]",
+		examples: []string{
+			"agent-init status            # report status of the current directory",
+			"agent-init status ./my-tool  # report status of ./my-tool",
+		},
+	},
 	{
 		name:    "list-flavors",
 		summary: "print available flavors with descriptions",
@@ -188,6 +197,8 @@ func (a App) Run(ctx context.Context, args []string) error {
 		return a.runAddTracker(ctx, args[1:])
 	case "version":
 		return a.runVersion(args[1:])
+	case "status":
+		return a.runStatus(args[1:])
 	case "help":
 		// `help <subcommand>` prints that subcommand's help; bare help is
 		// the top-level overview. (`-h` / `--help` are caught earlier.)
diff --git a/internal/cli/cli_test.go b/internal/cli/cli_test.go
index 11865ed..7c759e0 100644
--- a/internal/cli/cli_test.go
+++ b/internal/cli/cli_test.go
@@ -710,7 +710,7 @@ func TestTopLevelHelpListsAllSubcommands(t *testing.T) {
 				t.Fatalf("Run(%v) error = %v; help must exit 0", trigger, err)
 			}
 			got := out.String()
-			for _, sub := range []string{"init", "add-tracker", "list-flavors", "list-trackers", "version"} {
+			for _, sub := range []string{"init", "add-tracker", "status", "list-flavors", "list-trackers", "version"} {
 				if !strings.Contains(got, sub) {
 					t.Errorf("top-level help missing subcommand %q:\n%s", sub, got)
 				}
@@ -768,7 +768,7 @@ func TestSubcommandHelpPrintsFlagsAndExamples(t *testing.T) {
 
 func TestFlaglessSubcommandHelp(t *testing.T) {
 	t.Parallel()
-	for _, name := range []string{"list-flavors", "list-trackers", "version"} {
+	for _, name := range []string{"status", "list-flavors", "list-trackers", "version"} {
 		name := name
 		t.Run(name, func(t *testing.T) {
 			t.Parallel()
diff --git a/internal/cli/status.go b/internal/cli/status.go
new file mode 100644
index 0000000..2a4a310
--- /dev/null
+++ b/internal/cli/status.go
@@ -0,0 +1,174 @@
+package cli
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"os"
+	"path/filepath"
+
+	"github.com/Lillevang/agent-init/internal/gitconfig"
+	"github.com/Lillevang/agent-init/internal/gitignore"
+)
+
+// runStatus reports how the scaffold's agentic envelope is being tracked (or
+// ignored) for the target repository. It is strictly read-only: no file on
+// disk and no git config is mutated. The acceptance criteria come from
+// issue #60: print the current visibility mode, the absolute path of the file
+// carrying the agent-init ignore block, the exact undo command, and — when the
+// scaffold is committed locally but a global-default ignore exists — the
+// force-add hint explaining why files are still tracked.
+func (a App) runStatus(args []string) error {
+	if wantsHelp(args) {
+		cmd, _ := lookupCommand("status")
+		a.printCommandHelp(cmd)
+		return nil
+	}
+	if len(args) > 1 {
+		return fmt.Errorf("usage: agent-init status [target]\nRun 'agent-init status --help' for usage")
+	}
+	target := "."
+	if len(args) == 1 {
+		target = args[0]
+	}
+	absTarget, err := filepath.Abs(target)
+	if err != nil {
+		return fmt.Errorf("resolving target path: %w", err)
+	}
+	return a.reportStatus(absTarget, gitconfig.NewExecRunner(), gitconfig.OSEnv{})
+}
+
+// statusMode names the four visibility states `status` reports. Kept separate
+// from the writer-side `visibility` type because the reader has one extra
+// observable state (`shadowed-by-global`) that no `--visibility` flag value
+// maps to: it is the combination of "no repo-local block here" plus "a global
+// block does exist".
+type statusMode string
+
+const (
+	statusModeShared   statusMode = "shared"
+	statusModeLocal    statusMode = "local"
+	statusModeHidden   statusMode = "hidden"
+	statusModeShadowed statusMode = "shadowed-by-global"
+)
+
+// statusFinding bundles what `status` discovered about the target repo so the
+// reporter is a pure formatter — easy to test, easy to extend with new fields.
+type statusFinding struct {
+	mode    statusMode
+	target  string // absolute path of the target directory
+	carrier string // absolute path of the file holding the ignore block, "" if none
+	// machineWide is true when the carrier is the global excludes file, so the
+	// printed path is annotated accordingly and the force-add hint is shown.
+	machineWide bool
+}
+
+// reportStatus runs the read-only detection and writes the human-readable
+// report to a.out. The runner/env seam matches applyGlobalVisibility so the
+// global-excludes path resolution is testable via GIT_CONFIG_GLOBAL plus a
+// fake HOME (see internal/cli/cli_test.go:isolateGlobalGitConfig).
+func (a App) reportStatus(absTarget string, runner gitconfig.Runner, env gitconfig.Env) error {
+	finding, err := detectStatus(absTarget, runner, env)
+	if err != nil {
+		return err
+	}
+	writeStatusReport(a.out, finding)
+	return nil
+}
+
+// detectStatus probes the three carrier files in git's precedence order — the
+// committed .gitignore beats .git/info/exclude beats the global excludes file —
+// and returns the most-local hit. When no repo-local block is found but a
+// block sits in the machine-wide excludes, the finding is `shadowed-by-global`
+// rather than `shared`, matching the issue-60 spec.
+func detectStatus(absTarget string, runner gitconfig.Runner, env gitconfig.Env) (statusFinding, error) {
+	finding := statusFinding{target: absTarget, mode: statusModeShared}
+
+	localPath, err := gitignore.LocalPath(absTarget)
+	if err != nil {
+		return statusFinding{}, fmt.Errorf("resolving .gitignore path: %w", err)
+	}
+	if has, err := fileHasBlock(localPath); err != nil {
+		return statusFinding{}, err
+	} else if has {
+		finding.mode = statusModeLocal
+		finding.carrier = localPath
+		return finding, nil
+	}
+
+	hiddenPath, err := gitignore.HiddenPath(absTarget)
+	if err != nil {
+		return statusFinding{}, fmt.Errorf("resolving .git/info/exclude path: %w", err)
+	}
+	if has, err := fileHasBlock(hiddenPath); err != nil {
+		return statusFinding{}, err
+	} else if has {
+		finding.mode = statusModeHidden
+		finding.carrier = hiddenPath
+		return finding, nil
+	}
+
+	// Only consult the global excludes file when no repo-local block carries
+	// the scaffold. status is read-only, so unlike applyGlobalVisibility it
+	// must not write or set core.excludesfile — GlobalPath does neither.
+	globalPath, err := gitconfig.GlobalPath(runner, env)
+	if err != nil {
+		// A failure to resolve the global path (e.g. no HOME) is not fatal
+		// for status — we still want to report the local state. Treat it as
+		// "no global carrier" so the user sees `shared` rather than an error.
+		return finding, nil
+	}
+	if has, err := fileHasBlock(globalPath); err != nil {
+		return statusFinding{}, err
+	} else if has {
+		finding.mode = statusModeShadowed
+		finding.carrier = globalPath
+		finding.machineWide = true
+	}
+	return finding, nil
+}
+
+// fileHasBlock reads path and returns whether the managed agent-init block is
+// present. A missing file is not an error (it is the normal `shared` case);
+// any other read error is propagated so the user sees why detection failed.
+func fileHasBlock(path string) (bool, error) {
+	content, err := os.ReadFile(path)
+	if err != nil {
+		if errors.Is(err, os.ErrNotExist) {
+			return false, nil
+		}
+		return false, fmt.Errorf("reading %s: %w", path, err)
+	}
+	return gitignore.HasBlock(string(content)), nil
+}
+
+// writeStatusReport prints the finding in a short, scannable layout matching
+// the style of `init`'s output: labeled lines, no decorative borders, no
+// emojis. The exact undo command uses a portable sed invocation that works on
+// both GNU and BSD sed; the marker strings come from the gitignore package so
+// they cannot drift from what is on disk.
+func writeStatusReport(w io.Writer, f statusFinding) {
+	_, _ = fmt.Fprintf(w, "mode:   %s\n", f.mode)
+	_, _ = fmt.Fprintf(w, "target: %s\n", f.target)
+	if f.carrier == "" {
+		_, _ = fmt.Fprintln(w, "no agent-init ignore block found")
+		return
+	}
+	if f.machineWide {
+		_, _ = fmt.Fprintf(w, "ignore: %s (machine-wide)\n", f.carrier)
+	} else {
+		_, _ = fmt.Fprintf(w, "ignore: %s\n", f.carrier)
+	}
+	_, _ = fmt.Fprintf(w, "undo:   sed -i.bak '/%s/,/%s/d' %s\n",
+		gitignore.MarkerStart, gitignore.MarkerEnd, f.carrier)
+	_, _ = fmt.Fprintf(w, "        (or open %s and delete the lines from\n", f.carrier)
+	_, _ = fmt.Fprintf(w, "        '%s' through '%s' inclusive)\n",
+		gitignore.MarkerStart, gitignore.MarkerEnd)
+	if f.mode == statusModeShadowed {
+		_, _ = fmt.Fprintln(w, "note:   The scaffold may still be tracked in this repo: git ignores rules")
+		_, _ = fmt.Fprintln(w, "        for files that are already in the index. To stop tracking the scaffold")
+		_, _ = fmt.Fprintln(w, "        in this repo, remove it from the index (git rm --cached ...). To commit")
+		_, _ = fmt.Fprintln(w, "        the scaffold openly in a repo where it is newly being added, force-add it:")
+		_, _ = fmt.Fprintln(w, "          git add -f .agent AGENTS.md CLAUDE.md .devcontainer Justfile .pre-commit-config.yaml")
+	}
+}
diff --git a/internal/cli/status_test.go b/internal/cli/status_test.go
new file mode 100644
index 0000000..0c565d5
--- /dev/null
+++ b/internal/cli/status_test.go
@@ -0,0 +1,326 @@
+package cli_test
+
+import (
+	"bytes"
+	"context"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	"github.com/Lillevang/agent-init/internal/cli"
+	"github.com/Lillevang/agent-init/internal/gitignore"
+)
+
+// statusSnapshot records the on-disk state of every file `status` could
+// possibly examine, so tests can prove the subcommand is read-only by diffing
+// the snapshot before and after the run. A missing file is represented by
+// (exists: false), distinct from an empty file (exists: true, content: "").
+type statusSnapshot struct {
+	localExists, hiddenExists, globalExists bool
+	local, hidden, global                   string
+}
+
+func snapshotStatusFiles(t *testing.T, target, global string) statusSnapshot {
+	t.Helper()
+	read := func(path string) (bool, string) {
+		b, err := os.ReadFile(path)
+		if err != nil {
+			if os.IsNotExist(err) {
+				return false, ""
+			}
+			t.Fatalf("snapshot read %s: %v", path, err)
+		}
+		return true, string(b)
+	}
+	localPath, _ := gitignore.LocalPath(target)
+	hiddenPath, _ := gitignore.HiddenPath(target)
+	var s statusSnapshot
+	s.localExists, s.local = read(localPath)
+	s.hiddenExists, s.hidden = read(hiddenPath)
+	s.globalExists, s.global = read(global)
+	return s
+}
+
+func assertStatusReadOnly(t *testing.T, before, after statusSnapshot) {
+	t.Helper()
+	if before != after {
+		t.Errorf("status mutated files (must be read-only)\nbefore: %+v\nafter:  %+v", before, after)
+	}
+}
+
+func TestStatusSharedWhenNoBlockAnywhere(t *testing.T) {
+	t.Parallel()
+	target := t.TempDir()
+	var out, errOut bytes.Buffer
+	app := cli.New(&out, &errOut, cli.Version{})
+
+	if err := app.Run(context.Background(), []string{"status", target}); err != nil {
+		t.Fatalf("Run(status) error = %v", err)
+	}
+	got := out.String()
+	for _, want := range []string{"mode:   shared", "target: " + target, "no agent-init ignore block found"} {
+		if !strings.Contains(got, want) {
+			t.Errorf("status output missing %q:\n%s", want, got)
+		}
+	}
+	if strings.Contains(got, "ignore:") {
+		t.Errorf("shared mode should not print an ignore: line:\n%s", got)
+	}
+	if errOut.Len() != 0 {
+		t.Errorf("status wrote to stderr; want stdout only:\n%s", errOut.String())
+	}
+}
+
+func TestStatusLocalWhenBlockInGitignore(t *testing.T) {
+	t.Parallel()
+	target := t.TempDir()
+	gitignorePath := filepath.Join(target, ".gitignore")
+	// Seed an existing .gitignore that already has the managed block, so the
+	// scenario looks exactly like an `init --visibility=local` run.
+	if err := os.WriteFile(gitignorePath, []byte("node_modules/\n\n"+gitignore.Block()), 0o644); err != nil {
+		t.Fatalf("seed .gitignore: %v", err)
+	}
+
+	before := snapshotStatusFiles(t, target, "")
+
+	var out bytes.Buffer
+	app := cli.New(&out, &bytes.Buffer{}, cli.Version{})
+	if err := app.Run(context.Background(), []string{"status", target}); err != nil {
+		t.Fatalf("Run(status) error = %v", err)
+	}
+	got := out.String()
+	for _, want := range []string{
+		"mode:   local",
+		"ignore: " + gitignorePath,
+		"undo:",
+		gitignore.MarkerStart,
+		gitignore.MarkerEnd,
+	} {
+		if !strings.Contains(got, want) {
+			t.Errorf("status output missing %q:\n%s", want, got)
+		}
+	}
+
+	after := snapshotStatusFiles(t, target, "")
+	assertStatusReadOnly(t, before, after)
+}
+
+func TestStatusHiddenWhenBlockInGitInfoExclude(t *testing.T) {
+	t.Parallel()
+	target := t.TempDir()
+	hiddenPath := filepath.Join(target, ".git", "info", "exclude")
+	if err := os.MkdirAll(filepath.Dir(hiddenPath), 0o755); err != nil {
+		t.Fatalf("mkdir .git/info: %v", err)
+	}
+	if err := os.WriteFile(hiddenPath, []byte(gitignore.Block()), 0o644); err != nil {
+		t.Fatalf("seed exclude: %v", err)
+	}
+
+	before := snapshotStatusFiles(t, target, "")
+
+	var out bytes.Buffer
+	app := cli.New(&out, &bytes.Buffer{}, cli.Version{})
+	if err := app.Run(context.Background(), []string{"status", target}); err != nil {
+		t.Fatalf("Run(status) error = %v", err)
+	}
+	got := out.String()
+	for _, want := range []string{
+		"mode:   hidden",
+		"ignore: " + hiddenPath,
+	} {
+		if !strings.Contains(got, want) {
+			t.Errorf("status output missing %q:\n%s", want, got)
+		}
+	}
+
+	after := snapshotStatusFiles(t, target, "")
+	assertStatusReadOnly(t, before, after)
+}
+
+// TestStatusShadowedByGlobalWhenOnlyGlobalCarriesBlock seeds a managed block in
+// the machine-wide excludes file and verifies status reports shadowed-by-global
+// plus the force-add hint. The fake HOME pattern (HOME + GIT_CONFIG_GLOBAL +
+// XDG_CONFIG_HOME) mirrors isolateGlobalGitConfig so the developer's real
+// global config is never read or written.
+func TestStatusShadowedByGlobalWhenOnlyGlobalCarriesBlock(t *testing.T) {
+	home := isolateGlobalGitConfig(t)
+	globalPath := filepath.Join(home, ".config", "git", "ignore")
+	if err := os.MkdirAll(filepath.Dir(globalPath), 0o755); err != nil {
+		t.Fatalf("mkdir global excludes dir: %v", err)
+	}
+	if err := os.WriteFile(globalPath, []byte(gitignore.Block()), 0o644); err != nil {
+		t.Fatalf("seed global excludes: %v", err)
+	}
+
+	target := filepath.Join(t.TempDir(), "proj")
+	if err := os.MkdirAll(target, 0o755); err != nil {
+		t.Fatalf("mkdir target: %v", err)
+	}
+
+	before := snapshotStatusFiles(t, target, globalPath)
+
+	var out bytes.Buffer
+	app := cli.New(&out, &bytes.Buffer{}, cli.Version{})
+	if err := app.Run(context.Background(), []string{"status", target}); err != nil {
+		t.Fatalf("Run(status) error = %v", err)
+	}
+	got := out.String()
+	for _, want := range []string{
+		"mode:   shadowed-by-global",
+		"ignore: " + globalPath,
+		"(machine-wide)",
+		"note:",
+		"git add -f",
+	} {
+		if !strings.Contains(got, want) {
+			t.Errorf("status output missing %q:\n%s", want, got)
+		}
+	}
+
+	after := snapshotStatusFiles(t, target, globalPath)
+	assertStatusReadOnly(t, before, after)
+}
+
+// TestStatusPrefersLocalOverHiddenOverGlobal locks down the precedence rule:
+// when blocks exist in multiple carriers simultaneously, status reports the
+// most-local (highest-precedence) one. Git's precedence is .gitignore >
+// .git/info/exclude > core.excludesfile, and the reported mode follows that.
+func TestStatusPrefersLocalOverHiddenOverGlobal(t *testing.T) {
+	home := isolateGlobalGitConfig(t)
+	globalPath := filepath.Join(home, ".config", "git", "ignore")
+	if err := os.MkdirAll(filepath.Dir(globalPath), 0o755); err != nil {
+		t.Fatalf("mkdir global excludes dir: %v", err)
+	}
+	if err := os.WriteFile(globalPath, []byte(gitignore.Block()), 0o644); err != nil {
+		t.Fatalf("seed global excludes: %v", err)
+	}
+
+	target := filepath.Join(t.TempDir(), "proj")
+	hiddenPath := filepath.Join(target, ".git", "info", "exclude")
+	if err := os.MkdirAll(filepath.Dir(hiddenPath), 0o755); err != nil {
+		t.Fatalf("mkdir .git/info: %v", err)
+	}
+	if err := os.WriteFile(hiddenPath, []byte(gitignore.Block()), 0o644); err != nil {
+		t.Fatalf("seed exclude: %v", err)
+	}
+	localPath := filepath.Join(target, ".gitignore")
+	if err := os.WriteFile(localPath, []byte(gitignore.Block()), 0o644); err != nil {
+		t.Fatalf("seed .gitignore: %v", err)
+	}
+
+	var out bytes.Buffer
+	app := cli.New(&out, &bytes.Buffer{}, cli.Version{})
+	if err := app.Run(context.Background(), []string{"status", target}); err != nil {
+		t.Fatalf("Run(status) error = %v", err)
+	}
+	got := out.String()
+	if !strings.Contains(got, "mode:   local") {
+		t.Errorf("status should pick most-local carrier (local), got:\n%s", got)
+	}
+	if strings.Contains(got, "shadowed-by-global") || strings.Contains(got, "mode:   hidden") {
+		t.Errorf("status leaked lower-precedence mode in output:\n%s", got)
+	}
+}
+
+func TestStatusDefaultTargetIsCwd(t *testing.T) {
+	// t.Chdir would be cleaner but isn't available across all Go versions we
+	// support; the explicit save/restore is equivalent.
+	target := t.TempDir()
+	prev, err := os.Getwd()
+	if err != nil {
+		t.Fatalf("getwd: %v", err)
+	}
+	if err := os.Chdir(target); err != nil {
+		t.Fatalf("chdir target: %v", err)
+	}
+	t.Cleanup(func() { _ = os.Chdir(prev) })
+
+	var out bytes.Buffer
+	app := cli.New(&out, &bytes.Buffer{}, cli.Version{})
+	if err := app.Run(context.Background(), []string{"status"}); err != nil {
+		t.Fatalf("Run(status) error = %v", err)
+	}
+	// The target line must contain the resolved cwd. Some platforms canonicalize
+	// the path differently (macOS /var/folders -> /private/var/folders), so we
+	// check via the same resolution status uses internally: filepath.Abs(".").
+	absCwd, err := filepath.Abs(".")
+	if err != nil {
+		t.Fatalf("abs(.): %v", err)
+	}
+	if !strings.Contains(out.String(), "target: "+absCwd) {
+		t.Errorf("default target should be cwd %q:\n%s", absCwd, out.String())
+	}
+}
+
+func TestStatusExplicitTargetIsResolvedToAbsolutePath(t *testing.T) {
+	t.Parallel()
+	target := t.TempDir()
+	// Pass a non-clean relative-looking form (the trailing slash and parent
+	// hop) to confirm status canonicalizes before printing.
+	noisy := target + string(filepath.Separator) + "."
+
+	var out bytes.Buffer
+	app := cli.New(&out, &bytes.Buffer{}, cli.Version{})
+	if err := app.Run(context.Background(), []string{"status", noisy}); err != nil {
+		t.Fatalf("Run(status) error = %v", err)
+	}
+	if !strings.Contains(out.String(), "target: "+target) {
+		t.Errorf("explicit target not canonicalized to %q:\n%s", target, out.String())
+	}
+}
+
+func TestStatusRejectsExtraPositionalArgs(t *testing.T) {
+	t.Parallel()
+	app := cli.New(&bytes.Buffer{}, &bytes.Buffer{}, cli.Version{})
+	err := app.Run(context.Background(), []string{"status", t.TempDir(), "extra"})
+	if err == nil {
+		t.Fatal("Run(status target extra) = nil, want usage error")
+	}
+	if !strings.Contains(err.Error(), "--help") {
+		t.Errorf("usage error should reference --help; got: %v", err)
+	}
+}
+
+func TestStatusHelp(t *testing.T) {
+	t.Parallel()
+	for _, args := range [][]string{{"status", "--help"}, {"status", "-h"}, {"help", "status"}} {
+		args := args
+		t.Run(strings.Join(args, " "), func(t *testing.T) {
+			t.Parallel()
+			var out bytes.Buffer
+			app := cli.New(&out, &bytes.Buffer{}, cli.Version{})
+			if err := app.Run(context.Background(), args); err != nil {
+				t.Fatalf("Run(%v) error = %v", args, err)
+			}
+			for _, want := range []string{"status", "Usage", "read-only"} {
+				if !strings.Contains(out.String(), want) {
+					t.Errorf("help (%v) missing %q:\n%s", args, want, out.String())
+				}
+			}
+		})
+	}
+}
+
+// TestStatusIgnoresGlobalLookupErrors verifies status does not crash when the
+// global-excludes resolver can't locate a HOME — the user still gets the
+// repo-local detection result, which is the part they care about.
+func TestStatusIgnoresGlobalLookupErrors(t *testing.T) {
+	// Force os.UserHomeDir to fail by clearing the env vars it reads. On Linux
+	// HOME is consulted; on darwin HOME or USER. Both cleared, plus XDG_CONFIG_HOME
+	// to make sure the XDG fallback path is also unreachable.
+	t.Setenv("HOME", "")
+	t.Setenv("USER", "")
+	t.Setenv("XDG_CONFIG_HOME", "")
+	t.Setenv("GIT_CONFIG_GLOBAL", filepath.Join(t.TempDir(), "no-such-gitconfig"))
+
+	target := t.TempDir()
+	var out bytes.Buffer
+	app := cli.New(&out, &bytes.Buffer{}, cli.Version{})
+	if err := app.Run(context.Background(), []string{"status", target}); err != nil {
+		t.Fatalf("Run(status) with broken HOME error = %v; status should degrade gracefully", err)
+	}
+	if !strings.Contains(out.String(), "mode:   shared") {
+		t.Errorf("status fell off the rails when HOME was unreadable:\n%s", out.String())
+	}
+}
diff --git a/internal/gitignore/gitignore.go b/internal/gitignore/gitignore.go
index 98db2ba..30208fa 100644
--- a/internal/gitignore/gitignore.go
+++ b/internal/gitignore/gitignore.go
@@ -24,6 +24,14 @@ const (
 	// it in place. The "(private)" tag is part of the agreed block content.
 	blockStart = "# >>> agent-init (private) >>>"
 	blockEnd   = "# <<< agent-init <<<"
+
+	// MarkerStart and MarkerEnd are the exported names of the same markers,
+	// surfaced for callers that need to display them (e.g. the `status`
+	// subcommand prints them in the undo hint) without duplicating the literal
+	// strings. They alias the package-private constants intentionally — the
+	// markers are part of the file format and must not drift.
+	MarkerStart = blockStart
+	MarkerEnd   = blockEnd
 )
 
 // envelope is the set of scaffold paths the ignore block covers: the agentic
@@ -140,6 +148,15 @@ func Upsert(content string) string {
 	return upsertBlock(content)
 }
 
+// HasBlock reports whether content contains the fenced managed block, matched
+// by the start and end markers (start before end). It is a read-only detector
+// used by the `status` subcommand, which must reuse the marker constants
+// rather than open-coding them.
+func HasBlock(content string) bool {
+	_, _, ok := findBlock(content)
+	return ok
+}
+
 // upsertBlock returns content with the managed block present exactly once. An
 // existing block (matched by markers) is replaced in place; otherwise the block
 // is appended, separated from prior content by a blank line.
diff --git a/internal/gitignore/gitignore_test.go b/internal/gitignore/gitignore_test.go
index ff93b65..48cceb9 100644
--- a/internal/gitignore/gitignore_test.go
+++ b/internal/gitignore/gitignore_test.go
@@ -242,6 +242,50 @@ func TestEnsureHiddenWritesNoGitignore(t *testing.T) {
 	}
 }
 
+// TestHasBlockDetectsManagedBlock covers the read-only detector used by the
+// `status` subcommand. The detector must reuse the same marker constants the
+// writers use, so a file produced by EnsureLocal/EnsureHidden is recognized
+// and unrelated content is not.
+func TestHasBlockDetectsManagedBlock(t *testing.T) {
+	t.Parallel()
+	tests := []struct {
+		name    string
+		content string
+		want    bool
+	}{
+		{"empty file", "", false},
+		{"no block at all", "node_modules/\ndist/\n", false},
+		{"only start marker (truncated block)", blockStart + "\n.agent/\n", false},
+		{"only end marker (no start)", "stuff\n" + blockEnd + "\n", false},
+		{"full block alone", Block(), true},
+		{"block surrounded by content", "before\n" + Block() + "after\n", true},
+		{"end-before-start is not a block", blockEnd + "\nstuff\n" + blockStart + "\n", false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			t.Parallel()
+			if got := HasBlock(tt.content); got != tt.want {
+				t.Errorf("HasBlock() = %v, want %v\n--- content ---\n%s", got, tt.want, tt.content)
+			}
+		})
+	}
+}
+
+// TestExportedMarkersMatchInternal guards against accidental drift between the
+// exported MarkerStart/MarkerEnd and the package-private constants the writers
+// use. They must alias the same literals: a downstream caller that prints the
+// markers (the `status` undo hint) needs them byte-for-byte identical to what
+// is on disk.
+func TestExportedMarkersMatchInternal(t *testing.T) {
+	t.Parallel()
+	if MarkerStart != blockStart {
+		t.Errorf("MarkerStart = %q, want %q", MarkerStart, blockStart)
+	}
+	if MarkerEnd != blockEnd {
+		t.Errorf("MarkerEnd = %q, want %q", MarkerEnd, blockEnd)
+	}
+}
+
 func readFile(t *testing.T, path string) string {
 	t.Helper()
 	b, err := os.ReadFile(path)

From a4fbe7c87a2b571241cab784670731af786dea1f Mon Sep 17 00:00:00 2001
From: Jeppe Lillevang Salling <jeppe.lillevang@gmail.com>
Date: Sun, 21 Jun 2026 10:10:15 +0000
Subject: [PATCH 2/3] refactor(cli): address review findings on status
 subcommand

- Reject unknown flags loudly: `status --no-such-flag` now errors instead
  of silently resolving the flag string to an absolute target path.
- Documented that detection is marker-based (not effective-behavior),
  and that `git config --global --get core.excludesfile` is invoked to
  locate the machine-wide excludes file.
- Print a note that `sed -i.bak` leaves a one-shot backup file.
- Rephrase the shadowed-by-global note so "git ignores rules" no longer
  garden-paths as "git ignores-the-rules".
- Switch the default-target test to `t.Chdir` (Go 1.24+); it auto-restores
  and refuses `t.Parallel`, removing a latent race.
- Justify detectStatus's slight overrun of the ~40-line guideline inline.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .agent/CODEBASE.md          | 12 ++++++------
 docs/cli.md                 |  5 +++--
 internal/cli/status.go      | 23 +++++++++++++++++++----
 internal/cli/status_test.go | 29 +++++++++++++++++++----------
 4 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/.agent/CODEBASE.md b/.agent/CODEBASE.md
index cb85af4..61d287a 100644
--- a/.agent/CODEBASE.md
+++ b/.agent/CODEBASE.md
@@ -141,10 +141,11 @@ internal/cli/status_test.go:109:func TestStatusHiddenWhenBlockInGitInfoExclude(t
 internal/cli/status_test.go:146:func TestStatusShadowedByGlobalWhenOnlyGlobalCarriesBlock(t *testing.T) {
 internal/cli/status_test.go:189:func TestStatusPrefersLocalOverHiddenOverGlobal(t *testing.T) {
 internal/cli/status_test.go:226:func TestStatusDefaultTargetIsCwd(t *testing.T) {
-internal/cli/status_test.go:256:func TestStatusExplicitTargetIsResolvedToAbsolutePath(t *testing.T) {
-internal/cli/status_test.go:273:func TestStatusRejectsExtraPositionalArgs(t *testing.T) {
-internal/cli/status_test.go:285:func TestStatusHelp(t *testing.T) {
-internal/cli/status_test.go:308:func TestStatusIgnoresGlobalLookupErrors(t *testing.T) {
+internal/cli/status_test.go:250:func TestStatusExplicitTargetIsResolvedToAbsolutePath(t *testing.T) {
+internal/cli/status_test.go:267:func TestStatusRejectsExtraPositionalArgs(t *testing.T) {
+internal/cli/status_test.go:282:func TestStatusRejectsUnknownFlag(t *testing.T) {
+internal/cli/status_test.go:294:func TestStatusHelp(t *testing.T) {
+internal/cli/status_test.go:317:func TestStatusIgnoresGlobalLookupErrors(t *testing.T) {
 internal/flavors/claudecowork/flavor.go:11:func Templates() embed.FS {
 internal/flavors/claudecowork/flavor.go:18:func ExecutablePaths() []string {
 internal/flavors/claudecowork/flavor.go:25:func NextSteps(target string) string {
@@ -190,12 +191,11 @@ internal/gitignore/gitignore.go:83:func EnsureLocal(target string) (string, erro
 internal/gitignore/gitignore.go:102:func HiddenPath(target string) (string, error) {
 internal/gitignore/gitignore.go:123:func EnsureHidden(target string) (string, error) {
 internal/gitignore/gitignore.go:147:func Upsert(content string) string {
-internal/gitignore/gitignore.go:155:func HasBlock(content string) bool {
 
 ## Stats
 
 ```
-Total tracked files: 350
+Total tracked files: 352
 ```
 
 <!-- HAND-WRITTEN BELOW — EDIT FREELY -->
diff --git a/docs/cli.md b/docs/cli.md
index c211361..b78c6f4 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -120,8 +120,9 @@ The carrier-path helpers come from [internal/gitignore](../internal/gitignore/gi
 
 ### Behavior
 
-- Reads at most three files: the target's `.gitignore`, its `.git/info/exclude`, and the machine-wide excludes file. A missing file is not an error — it is the normal `shared` case.
-- Writes nothing. Touches no git configuration. Safe to run in CI or against a repo you do not own.
+- Reads at most three files: the target's `.gitignore`, its `.git/info/exclude`, and the machine-wide excludes file. May invoke `git config --global --get core.excludesfile` to locate the machine-wide file. A missing file is not an error — it is the normal `shared` case.
+- Writes nothing. Never sets a git config key. Safe to run in CI or against a repo you do not own.
+- Detection is marker-based, not effective-behavior. `status` looks for the managed fenced block; it does not evaluate the surrounding `.gitignore`. A user who adds a manual `!.agent/` rule below the block to opt back in still gets `mode: local`/`hidden`/`shadowed-by-global`.
 - No flags. `--help` and `-h` print the usage as on every subcommand.
 - Source: [internal/cli/status.go](../internal/cli/status.go) (`runStatus`, `detectStatus`, `writeStatusReport`).
 
diff --git a/internal/cli/status.go b/internal/cli/status.go
index 2a4a310..31fc6ed 100644
--- a/internal/cli/status.go
+++ b/internal/cli/status.go
@@ -6,6 +6,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/Lillevang/agent-init/internal/gitconfig"
 	"github.com/Lillevang/agent-init/internal/gitignore"
@@ -29,7 +30,15 @@ func (a App) runStatus(args []string) error {
 	}
 	target := "."
 	if len(args) == 1 {
-		target = args[0]
+		arg := args[0]
+		// Reject unknown flags loudly. Without this, `status --no-such-flag`
+		// would silently resolve to an absolute path and report `shared`,
+		// hiding the user's typo. The `-` prefix check is sufficient because
+		// status has no positional that could legitimately start with `-`.
+		if strings.HasPrefix(arg, "-") {
+			return fmt.Errorf("unknown flag %q\nUsage: agent-init status [target]\nRun 'agent-init status --help' for usage", arg)
+		}
+		target = arg
 	}
 	absTarget, err := filepath.Abs(target)
 	if err != nil {
@@ -81,6 +90,11 @@ func (a App) reportStatus(absTarget string, runner gitconfig.Runner, env gitconf
 // and returns the most-local hit. When no repo-local block is found but a
 // block sits in the machine-wide excludes, the finding is `shadowed-by-global`
 // rather than `shared`, matching the issue-60 spec.
+//
+// Length: slightly over the ~40-line house guideline because it is a linear
+// three-step pipeline (local → hidden → global) with identical structure per
+// step; factoring it would scatter the precedence rule across helpers, making
+// the order harder to audit. Kept inline deliberately.
 func detectStatus(absTarget string, runner gitconfig.Runner, env gitconfig.Env) (statusFinding, error) {
 	finding := statusFinding{target: absTarget, mode: statusModeShared}
 
@@ -161,13 +175,14 @@ func writeStatusReport(w io.Writer, f statusFinding) {
 	}
 	_, _ = fmt.Fprintf(w, "undo:   sed -i.bak '/%s/,/%s/d' %s\n",
 		gitignore.MarkerStart, gitignore.MarkerEnd, f.carrier)
+	_, _ = fmt.Fprintf(w, "        (-i.bak leaves %s.bak as a one-shot backup; delete it after verifying)\n", f.carrier)
 	_, _ = fmt.Fprintf(w, "        (or open %s and delete the lines from\n", f.carrier)
 	_, _ = fmt.Fprintf(w, "        '%s' through '%s' inclusive)\n",
 		gitignore.MarkerStart, gitignore.MarkerEnd)
 	if f.mode == statusModeShadowed {
-		_, _ = fmt.Fprintln(w, "note:   The scaffold may still be tracked in this repo: git ignores rules")
-		_, _ = fmt.Fprintln(w, "        for files that are already in the index. To stop tracking the scaffold")
-		_, _ = fmt.Fprintln(w, "        in this repo, remove it from the index (git rm --cached ...). To commit")
+		_, _ = fmt.Fprintln(w, "note:   git does not apply ignore rules to files that are already in the")
+		_, _ = fmt.Fprintln(w, "        index, so the scaffold may still be tracked in this repo. To stop")
+		_, _ = fmt.Fprintln(w, "        tracking it, remove it from the index (git rm --cached ...). To commit")
 		_, _ = fmt.Fprintln(w, "        the scaffold openly in a repo where it is newly being added, force-add it:")
 		_, _ = fmt.Fprintln(w, "          git add -f .agent AGENTS.md CLAUDE.md .devcontainer Justfile .pre-commit-config.yaml")
 	}
diff --git a/internal/cli/status_test.go b/internal/cli/status_test.go
index 0c565d5..c9fe268 100644
--- a/internal/cli/status_test.go
+++ b/internal/cli/status_test.go
@@ -224,17 +224,11 @@ func TestStatusPrefersLocalOverHiddenOverGlobal(t *testing.T) {
 }
 
 func TestStatusDefaultTargetIsCwd(t *testing.T) {
-	// t.Chdir would be cleaner but isn't available across all Go versions we
-	// support; the explicit save/restore is equivalent.
+	// t.Chdir (Go 1.24+) restores cwd on cleanup and refuses t.Parallel, which
+	// is exactly what we want here: many sibling tests resolve filepath.Abs(".")
+	// and would race if this one ran in parallel.
 	target := t.TempDir()
-	prev, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("getwd: %v", err)
-	}
-	if err := os.Chdir(target); err != nil {
-		t.Fatalf("chdir target: %v", err)
-	}
-	t.Cleanup(func() { _ = os.Chdir(prev) })
+	t.Chdir(target)
 
 	var out bytes.Buffer
 	app := cli.New(&out, &bytes.Buffer{}, cli.Version{})
@@ -282,6 +276,21 @@ func TestStatusRejectsExtraPositionalArgs(t *testing.T) {
 	}
 }
 
+// TestStatusRejectsUnknownFlag locks down the review-suggested behavior:
+// `status --no-such-flag` must error, not silently resolve --no-such-flag to
+// an absolute path and report `shared`.
+func TestStatusRejectsUnknownFlag(t *testing.T) {
+	t.Parallel()
+	app := cli.New(&bytes.Buffer{}, &bytes.Buffer{}, cli.Version{})
+	err := app.Run(context.Background(), []string{"status", "--no-such-flag"})
+	if err == nil {
+		t.Fatal("Run(status --no-such-flag) = nil, want unknown-flag error")
+	}
+	if !strings.Contains(err.Error(), "--no-such-flag") || !strings.Contains(err.Error(), "--help") {
+		t.Errorf("unknown-flag error should name the flag and point at --help; got: %v", err)
+	}
+}
+
 func TestStatusHelp(t *testing.T) {
 	t.Parallel()
 	for _, args := range [][]string{{"status", "--help"}, {"status", "-h"}, {"help", "status"}} {

From 33a1ec7aeb17906cdb754146a4ce6264f701e6c0 Mon Sep 17 00:00:00 2001
From: Jeppe Lillevang Salling <jeppe.lillevang@gmail.com>
Date: Sun, 21 Jun 2026 11:27:46 +0000
Subject: [PATCH 3/3] refactor(cli): use newFlagSet for status unknown-flag
 rejection
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace the hand-rolled strings.HasPrefix check with a.newFlagSet, matching
how init and add-tracker handle unknown flags. Drops the dedicated
TestStatusRejectsUnknownFlag test — unknown-flag rejection is a property of
the shared FlagSet, not of status specifically.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 internal/cli/status.go      | 20 ++++++++------------
 internal/cli/status_test.go | 15 ---------------
 2 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/internal/cli/status.go b/internal/cli/status.go
index 31fc6ed..a54b5f8 100644
--- a/internal/cli/status.go
+++ b/internal/cli/status.go
@@ -6,7 +6,6 @@ import (
 	"io"
 	"os"
 	"path/filepath"
-	"strings"
 
 	"github.com/Lillevang/agent-init/internal/gitconfig"
 	"github.com/Lillevang/agent-init/internal/gitignore"
@@ -25,20 +24,17 @@ func (a App) runStatus(args []string) error {
 		a.printCommandHelp(cmd)
 		return nil
 	}
-	if len(args) > 1 {
+	flags := a.newFlagSet("status")
+	if err := flags.Parse(args); err != nil {
+		return err
+	}
+	rest := flags.Args()
+	if len(rest) > 1 {
 		return fmt.Errorf("usage: agent-init status [target]\nRun 'agent-init status --help' for usage")
 	}
 	target := "."
-	if len(args) == 1 {
-		arg := args[0]
-		// Reject unknown flags loudly. Without this, `status --no-such-flag`
-		// would silently resolve to an absolute path and report `shared`,
-		// hiding the user's typo. The `-` prefix check is sufficient because
-		// status has no positional that could legitimately start with `-`.
-		if strings.HasPrefix(arg, "-") {
-			return fmt.Errorf("unknown flag %q\nUsage: agent-init status [target]\nRun 'agent-init status --help' for usage", arg)
-		}
-		target = arg
+	if len(rest) == 1 {
+		target = rest[0]
 	}
 	absTarget, err := filepath.Abs(target)
 	if err != nil {
diff --git a/internal/cli/status_test.go b/internal/cli/status_test.go
index c9fe268..41102d8 100644
--- a/internal/cli/status_test.go
+++ b/internal/cli/status_test.go
@@ -276,21 +276,6 @@ func TestStatusRejectsExtraPositionalArgs(t *testing.T) {
 	}
 }
 
-// TestStatusRejectsUnknownFlag locks down the review-suggested behavior:
-// `status --no-such-flag` must error, not silently resolve --no-such-flag to
-// an absolute path and report `shared`.
-func TestStatusRejectsUnknownFlag(t *testing.T) {
-	t.Parallel()
-	app := cli.New(&bytes.Buffer{}, &bytes.Buffer{}, cli.Version{})
-	err := app.Run(context.Background(), []string{"status", "--no-such-flag"})
-	if err == nil {
-		t.Fatal("Run(status --no-such-flag) = nil, want unknown-flag error")
-	}
-	if !strings.Contains(err.Error(), "--no-such-flag") || !strings.Contains(err.Error(), "--help") {
-		t.Errorf("unknown-flag error should name the flag and point at --help; got: %v", err)
-	}
-}
-
 func TestStatusHelp(t *testing.T) {
 	t.Parallel()
 	for _, args := range [][]string{{"status", "--help"}, {"status", "-h"}, {"help", "status"}} {