Skip to content

feat: take the project from the working directory and the repo from config #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
llbbl merged 2 commits into from
Oct 20, 2026
Merged

feat: take the project from the working directory and the repo from config #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4053fc0
feat: take the project from the working directory and the repo from c…
llbbl Oct 20, 2026
cc1c41f
test: accept the Linux refusal for a deleted working directory
llbbl Oct 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ repo = "~/src/my-agents" # your canonical agents repo
root = "~/src" # the tree holding your projects
```

`--repo` and `--root`, or `$AGENTSYNC_REPO` and `$AGENTSYNC_ROOT`, work too and
take precedence; see [configuration](docs/configuration.md) and [init](docs/init.md).
`$AGENTSYNC_REPO` and `$AGENTSYNC_ROOT` work too and take precedence; see
[configuration](docs/configuration.md) and [init](docs/init.md). Every command
but `init` and `inventory` works on the project you run it in, so `cd` into a
project first.

```bash
cd ~/src/api
Expand Down
81 changes: 48 additions & 33 deletions cmd/agentsync/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"testing"
)

// TestMain points HOME and XDG_CONFIG_HOME at empty temp dirs, so no test can
// read the developer's real config file and pass or fail because of it. It
// also clears the OpenRouter key, so no test can spend money, and the Claude
// TestMain points HOME and XDG_CONFIG_HOME at empty temp dirs and clears both
// AGENTSYNC_* variables, so no test can reach the developer's real repo or tree.
// It also clears the OpenRouter key, so no test can spend money, and the Claude
// overrides optimize reports.
func TestMain(m *testing.M) {
dir, err := os.MkdirTemp("", "agentsync-test-")
Expand All @@ -25,6 +25,8 @@ func TestMain(m *testing.M) {
os.Setenv("HOME", home),
os.Setenv("XDG_CONFIG_HOME", filepath.Join(dir, "xdg")),
os.Unsetenv(envOpenRouterKey),
os.Unsetenv(envRepo),
os.Unsetenv(envRoot),
os.Unsetenv("CLAUDE_CODE_SUBAGENT_MODEL"),
os.Unsetenv("CLAUDE_CODE_EFFORT_LEVEL"),
} {
Expand Down Expand Up @@ -56,17 +58,14 @@ func useConfig(t *testing.T, content string) string {
}

func TestOpenRepo_Precedence(t *testing.T) {
flagDir, envDir, fileDir := t.TempDir(), t.TempDir(), t.TempDir()
envDir, fileDir := t.TempDir(), t.TempDir()
tests := []struct {
name, flag, env, file, want, wantFrom string
name, env, file, want, wantFrom string
}{
{"file alone", "", "", fileDir, fileDir, "config file"},
{"env alone", "", envDir, "", envDir, "$" + envRepo},
{"flag alone", flagDir, "", "", flagDir, "--repo"},
{"env beats file", "", envDir, fileDir, envDir, "$" + envRepo},
{"flag beats env and file", flagDir, envDir, fileDir, flagDir, "--repo"},
{"blank flag counts as unset", " ", envDir, "", envDir, "$" + envRepo},
{"blank env counts as unset", "", " ", fileDir, fileDir, "config file"},
{"file alone", "", fileDir, fileDir, "config file"},
{"env alone", envDir, "", envDir, "$" + envRepo},
{"env beats file", envDir, fileDir, envDir, "$" + envRepo},
{"blank env counts as unset", " ", fileDir, fileDir, "config file"},
}
for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
Expand All @@ -77,7 +76,7 @@ func TestOpenRepo_Precedence(t *testing.T) {
path := useConfig(t, content)
t.Setenv(envRepo, tc.env)

repo, from, err := openRepo(tc.flag)
repo, from, err := openRepo()
if err != nil {
t.Fatalf("openRepo: %v", err)
}
Expand All @@ -95,6 +94,17 @@ func TestOpenRepo_Precedence(t *testing.T) {
}
}

// TestOpenRepo_RelativeEnvRefuses: a relative $AGENTSYNC_REPO would name a
// different repo from every directory, so it refuses before the file is read.
func TestOpenRepo_RelativeEnvRefuses(t *testing.T) {
useConfig(t, "this is = = not toml\n")
t.Setenv(envRepo, "agents-repo")
_, _, err := openRepo()
if want := `$AGENTSYNC_REPO must be an absolute path, got "agents-repo"`; err == nil || err.Error() != want {
t.Errorf("err = %v, want %q", err, want)
}
}

// configFixture is projectScopeFixture with the default tree's resolved path
// returned and both env vars left for each test to set.
func configFixture(t *testing.T) (repoRoot, wide string) {
Expand Down Expand Up @@ -212,10 +222,17 @@ func TestRun_BrokenConfigRefuses(t *testing.T) {
if tc.setup != nil {
tc.setup(t, path)
}
for _, args := range [][]string{
{"scan", "--root", wide}, // repo from the file
{"inventory", "--repo", repoRoot}, // root from the file
for _, c := range []struct {
args []string
env, val string
}{
{[]string{"scan", "--all"}, envRoot, wide}, // repo from the file
{[]string{"inventory"}, envRepo, repoRoot}, // root from the file
} {
args := c.args
t.Setenv(envRepo, "")
t.Setenv(envRoot, "")
t.Setenv(c.env, c.val)
code, stdout, stderr := runCLI(t, args...)
if code != exitFailure {
t.Errorf("%v: exit = %d, want %d", args, code, exitFailure)
Expand All @@ -239,19 +256,15 @@ func TestRun_BrokenConfigUnreadWhenSettled(t *testing.T) {
repoRoot, wide := configFixture(t)
for _, tc := range []struct {
name string
env bool
args []string
}{
{"both flags", false, []string{"scan", "--repo", repoRoot, "--root", wide}},
{"inventory, both flags", false, []string{"inventory", "--stdout", "--repo", repoRoot, "--root", wide}},
{"both env vars", true, []string{"scan", "--all"}},
{"scan", []string{"scan", "--all"}},
{"inventory", []string{"inventory", "--stdout"}},
} {
t.Run(tc.name, func(t *testing.T) {
useConfig(t, "this is = = not toml\n")
if tc.env {
t.Setenv(envRepo, repoRoot)
t.Setenv(envRoot, wide)
}
t.Setenv(envRepo, repoRoot)
t.Setenv(envRoot, wide)
if code, _, stderr := runCLI(t, tc.args...); code != exitOK {
t.Errorf("exit = %d, want %d: the broken file was read\n%s", code, exitOK, stderr)
}
Expand All @@ -260,30 +273,32 @@ func TestRun_BrokenConfigUnreadWhenSettled(t *testing.T) {
}

func TestRun_NothingConfiguredRefuses(t *testing.T) {
repoRoot, wide := configFixture(t)
repoRoot, _ := configFixture(t)
path := useConfig(t, "")

tests := []struct {
args []string
repo string
want string
}{
{[]string{"scan", "--root", wide},
{[]string{"scan"}, "",
"agentsync: no canonical agent repo configured.\n" +
" Create a config file: agentsync init\n" +
" Pass it each run: --repo PATH (or set $AGENTSYNC_REPO)\n" +
" Or set $AGENTSYNC_REPO\n" +
" Or set repo in " + path + "\n"},
{[]string{"inventory", "--repo", repoRoot},
{[]string{"inventory"}, repoRoot,
"agentsync: no default tree of projects configured.\n" +
" Create a config file: agentsync init\n" +
" Pass it each run: --root PATH (or set $AGENTSYNC_ROOT)\n" +
" Or set $AGENTSYNC_ROOT\n" +
" Or set root in " + path + "\n"},
{[]string{"scan", "--all", "--repo", repoRoot},
{[]string{"scan", "--all"}, repoRoot,
"agentsync: --all: no default tree of projects configured.\n" +
" Create a config file: agentsync init\n" +
" Pass it each run: --root PATH (or set $AGENTSYNC_ROOT)\n" +
" Or set $AGENTSYNC_ROOT\n" +
" Or set root in " + path + "\n"},
}
for _, tc := range tests {
t.Setenv(envRepo, tc.repo)
code, stdout, stderr := runCLI(t, tc.args...)
if code != exitFailure {
t.Errorf("%v: exit = %d, want %d", tc.args, code, exitFailure)
Expand All @@ -302,7 +317,7 @@ func TestRun_NothingConfiguredRefuses(t *testing.T) {
func TestOpenRepo_BadPathNamesItsSource(t *testing.T) {
missing := filepath.Join(t.TempDir(), "nope")
path := useConfig(t, fmt.Sprintf("repo = %q\n", missing))
_, _, err := openRepo("")
_, _, err := openRepo()
if want := "repo from config file " + path + ": "; err == nil || !strings.HasPrefix(err.Error(), want) {
t.Errorf("err = %v, want it to start %q", err, want)
}
Expand All @@ -314,7 +329,7 @@ func TestRun_UnlocatableConfigRefuses(t *testing.T) {
useConfig(t, "")
t.Setenv("XDG_CONFIG_HOME", "")
t.Setenv("HOME", "")
code, _, stderr := runCLI(t, "scan", "--root", t.TempDir())
code, _, stderr := runCLI(t, "scan")
if code != exitFailure || !strings.Contains(stderr, "cannot locate the config file") {
t.Errorf("exit = %d, stderr = %q; want %d naming the config file", code, stderr, exitFailure)
}
Expand Down
11 changes: 7 additions & 4 deletions cmd/agentsync/doctor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ func runDoctor(args []string, stdout, stderr io.Writer) int {
fs.SetOutput(stderr)
fs.Usage = func() { fmt.Fprint(stderr, usage) }

rootF := registerRoot(fs)
repoPath := fs.String("repo", "", "canonical agent repo")
all := registerAll(fs)
asJSON := fs.Bool("json", false, "emit JSON")
allowOutsideHome := fs.Bool(scan.AllowOutsideHomeFlag, false,
"projects legitimately live outside $HOME; suppress the home warning")
Expand All @@ -42,14 +41,18 @@ func runDoctor(args []string, stdout, stderr io.Writer) int {
// block to stderr.
return exitFailure
}
if fs.NArg() > 0 {
fmt.Fprintf(stderr, "agentsync: %s\n", strayArg("doctor", fs.Arg(0), nil))
return exitFailure
}

repo, repoFrom, err := openRepo(*repoPath)
repo, repoFrom, err := openRepo()
if err != nil {
fmt.Fprintf(stderr, "agentsync: %v\n", err)
return exitFailure
}

root, err := rootF.resolve(repo.Home)
root, err := resolveRoot(repo.Home, *all)
if err != nil {
fmt.Fprintf(stderr, "agentsync: %v\n", err)
return exitFailure
Expand Down
Loading
Loading