482a51c Merge branch 'main' into fix/editproperly · zut

M README.md +11 -4


@@ -3,6 +3,12 @@
3	3		<img src="packages/provider/auth/assets/zot-logo.png" alt="zot coding agent harness" width="130" height="130" />
4	4		</a>
5	5		</div>
	6	+	<br>
	7	+	<p align="center">
	8	+	<a href="LICENSE"><img alt="license" src="https://img.shields.io/badge/license-MIT-blue"></a>
	9	+	<img alt="Go 1.25+" src="https://img.shields.io/badge/Go-1.25+-00ADD8?logo=go&logoColor=white">
	10	+	<img alt="30+ providers" src="https://img.shields.io/badge/providers-30+-34E2EA">
	11	+	</p>
6	12		<p align="center">
7	13		<a href="https://www.zot.sh">zot.sh</a>
8	14		</p>

@@ -73,9 +79,10 @@ The easiest way is to just run `zot` and type `/login`. The TUI opens even witho
73	79		3. `$ZOT_HOME/auth.json` (API key or OAuth token; mode 0600)
74	80
75	81		`$ZOT_HOME` defaults to:
76		-	- macOS: `~/Library/Application Support/zot`
77		-	- Linux: `$XDG_STATE_HOME/zot` or `~/.local/state/zot`
78		-	- Windows: `%LOCALAPPDATA%\zot`
	82	+	- All platforms: `$XDG_STATE_HOME/zot` when `XDG_STATE_HOME` is set
	83	+	- macOS fallback: `~/Library/Application Support/zot`
	84	+	- Linux fallback: `~/.local/state/zot`
	85	+	- Windows fallback: `%LOCALAPPDATA%\zot`
79	86
80	87		### `/login` flow
81	88

@@ -392,7 +399,7 @@ No configuration is required — the candidate list is built dynamically from yo
392	399
393	400		### Custom models
394	401
395		-	Place a `models.json` in `$ZOT_HOME` (macOS: `~/Library/Application Support/zot/`, Linux: `~/.local/state/zot/`) to add models that aren't in the baked-in catalog or to override existing entries:
	402	+	Place a `models.json` in `$ZOT_HOME` (`$XDG_STATE_HOME/zot/` when set, otherwise the platform default above) to add models that aren't in the baked-in catalog or to override existing entries:
396	403
397	404		```json
398	405		{

     <img src="packages/provider/auth/assets/zot-logo.png" alt="zot coding agent harness" width="130" height="130" />
   </a>
 </div>
+<br>
+<p align="center">
+  <a href="LICENSE"><img alt="license" src="https://img.shields.io/badge/license-MIT-blue"></a>
+  <img alt="Go 1.25+" src="https://img.shields.io/badge/Go-1.25+-00ADD8?logo=go&logoColor=white">
+  <img alt="30+ providers" src="https://img.shields.io/badge/providers-30+-34E2EA">
+</p>
 <p align="center">
   <a href="https://www.zot.sh">zot.sh</a>
 </p>
 3. `$ZOT_HOME/auth.json` (API key or OAuth token; mode 0600)
 `$ZOT_HOME` defaults to:
-- macOS: `~/Library/Application Support/zot`
+- All platforms: `$XDG_STATE_HOME/zot` when `XDG_STATE_HOME` is set
-- Linux: `$XDG_STATE_HOME/zot` or `~/.local/state/zot`
+- macOS fallback: `~/Library/Application Support/zot`
-- Windows: `%LOCALAPPDATA%\zot`
+- Linux fallback: `~/.local/state/zot`
+- Windows fallback: `%LOCALAPPDATA%\zot`
 ### `/login` flow
 ### Custom models
-Place a `models.json` in `$ZOT_HOME` (macOS: `~/Library/Application Support/zot/`, Linux: `~/.local/state/zot/`) to add models that aren't in the baked-in catalog or to override existing entries:
+Place a `models.json` in `$ZOT_HOME` (`$XDG_STATE_HOME/zot/` when set, otherwise the platform default above) to add models that aren't in the baked-in catalog or to override existing entries:
 ```json
 {

M docs/extensions.md +3 -2


@@ -97,8 +97,9 @@ zot scans two directories on startup, in this order:
97	97		2. Global: `$ZOT_HOME/extensions/<name>/extension.json`
98	98
99	99		A project-local extension with the same name wins over a global one.
100		-	On macOS `$ZOT_HOME` defaults to `~/Library/Application Support/zot/`;
101		-	on Linux it's `$XDG_STATE_HOME/zot` or `~/.local/state/zot`.
	100	+	When `XDG_STATE_HOME` is set on any platform, `$ZOT_HOME` defaults to
	101	+	`$XDG_STATE_HOME/zot`. Otherwise it defaults to `~/Library/Application Support/zot/`
	102	+	on macOS, `~/.local/state/zot` on Linux, or `%LOCALAPPDATA%\zot` on Windows.
102	103
103	104		Because each extension owns its own directory, the recommended place
104	105		for extension state is inside that directory itself (for example


@@ -97,8 +97,9 @@ zot scans two directories on startup, in this order:
97		2. Global: `$ZOT_HOME/extensions/<name>/extension.json`	97		2. Global: `$ZOT_HOME/extensions/<name>/extension.json`
98			98
99		A project-local extension with the same name wins over a global one.	99		A project-local extension with the same name wins over a global one.
100	-	On macOS `$ZOT_HOME` defaults to `~/Library/Application Support/zot/`;	100	+	When `XDG_STATE_HOME` is set on any platform, `$ZOT_HOME` defaults to
101	-	on Linux it's `$XDG_STATE_HOME/zot` or `~/.local/state/zot`.	101	+	`$XDG_STATE_HOME/zot`. Otherwise it defaults to `~/Library/Application Support/zot/`
			102	+	on macOS, `~/.local/state/zot` on Linux, or `%LOCALAPPDATA%\zot` on Windows.
102			103
103		Because each extension owns its own directory, the recommended place	104		Because each extension owns its own directory, the recommended place
104		for extension state is inside that directory itself (for example	105		for extension state is inside that directory itself (for example

M docs/skills.md +3 -2


@@ -64,8 +64,9 @@ skill ecosystem works in zot unchanged. Drop your existing
64	64		`.claude/skills/` or `.agents/skills/` directories into a project and
65	65		zot will pick them up.
66	66
67		-	`$ZOT_HOME` defaults to `~/Library/Application Support/zot/` on macOS,
68		-	`$XDG_STATE_HOME/zot` on Linux, `%LOCALAPPDATA%\zot` on Windows.
	67	+	When `XDG_STATE_HOME` is set on any platform, `$ZOT_HOME` defaults to
	68	+	`$XDG_STATE_HOME/zot`. Otherwise it defaults to `~/Library/Application Support/zot/`
	69	+	on macOS, `~/.local/state/zot` on Linux, or `%LOCALAPPDATA%\zot` on Windows.
69	70
70	71		## Inspecting installed skills
71	72


@@ -64,8 +64,9 @@ skill ecosystem works in zot unchanged. Drop your existing
64		`.claude/skills/` or `.agents/skills/` directories into a project and	64		`.claude/skills/` or `.agents/skills/` directories into a project and
65		zot will pick them up.	65		zot will pick them up.
66			66
67	-	`$ZOT_HOME` defaults to `~/Library/Application Support/zot/` on macOS,	67	+	When `XDG_STATE_HOME` is set on any platform, `$ZOT_HOME` defaults to
68	-	`$XDG_STATE_HOME/zot` on Linux, `%LOCALAPPDATA%\zot` on Windows.	68	+	`$XDG_STATE_HOME/zot`. Otherwise it defaults to `~/Library/Application Support/zot/`
			69	+	on macOS, `~/.local/state/zot` on Linux, or `%LOCALAPPDATA%\zot` on Windows.
69			70
70		## Inspecting installed skills	71		## Inspecting installed skills
71			72

M examples/extensions/mcp-bridge/Makefile +3 -3


@@ -4,10 +4,10 @@ BIN := $(notdir $(CURDIR))
4	4		# Must match "name" in extension.json (slash command/logical extension name).
5	5		EXT := mcp
6	6		ZOT_HOME ?= $(shell \
7		-	if [ "$$(uname -s)" = "Darwin" ]; then \
8		-	printf '%s/Library/Application Support/zot' "$$HOME"; \
9		-	elif [ -n "$$XDG_STATE_HOME" ]; then \
	7	+	if [ -n "$$XDG_STATE_HOME" ]; then \
10	8		printf '%s/zot' "$$XDG_STATE_HOME"; \
	9	+	elif [ "$$(uname -s)" = "Darwin" ]; then \
	10	+	printf '%s/Library/Application Support/zot' "$$HOME"; \
11	11		else \
12	12		printf '%s/.local/state/zot' "$$HOME"; \
13	13		fi)

 # Must match "name" in extension.json (slash command/logical extension name).
 EXT := mcp
 ZOT_HOME ?= $(shell \
-	if [ "$$(uname -s)" = "Darwin" ]; then \
+	if [ -n "$$XDG_STATE_HOME" ]; then \
-		printf '%s/Library/Application Support/zot' "$$HOME"; \
-	elif [ -n "$$XDG_STATE_HOME" ]; then \
 		printf '%s/zot' "$$XDG_STATE_HOME"; \
+	elif [ "$$(uname -s)" = "Darwin" ]; then \
+		printf '%s/Library/Application Support/zot' "$$HOME"; \
 	else \
 		printf '%s/.local/state/zot' "$$HOME"; \
 	fi)

M examples/extensions/mcp-bridge/README.md +1 -1


@@ -61,7 +61,7 @@ Config files are loaded from two locations (project overrides global per-server)
61	61
62	62		\| Location \| Scope \|
63	63		\|---\|---\|
64		-	\| `$ZOT_HOME/mcp.json` \| Global (macOS: `~/Library/Application Support/zot/mcp.json`) \|
	64	+	\| `$ZOT_HOME/mcp.json` \| Global (`$XDG_STATE_HOME/zot/mcp.json` when `XDG_STATE_HOME` is set) \|
65	65		\| `.zot/mcp.json` \| Project-level (in your project root) \|
66	66
67	67		### Config Format


@@ -61,7 +61,7 @@ Config files are loaded from two locations (project overrides global per-server)
61			61
62		\| Location \| Scope \|	62		\| Location \| Scope \|
63		\|---\|---\|	63		\|---\|---\|
64	-	\| `$ZOT_HOME/mcp.json` \| Global (macOS: `~/Library/Application Support/zot/mcp.json`) \|	64	+	\| `$ZOT_HOME/mcp.json` \| Global (`$XDG_STATE_HOME/zot/mcp.json` when `XDG_STATE_HOME` is set) \|
65		\| `.zot/mcp.json` \| Project-level (in your project root) \|	65		\| `.zot/mcp.json` \| Project-level (in your project root) \|
66			66
67		### Config Format	67		### Config Format

M examples/extensions/mcp-bridge/config.go +4 -4


@@ -3,7 +3,7 @@
3	3		// Reads standard MCP config files (same format as Claude Desktop, Cursor, etc.)
4	4		// from two locations:
5	5		//
6		-	// 1. Global: $ZOT_HOME/mcp.json (macOS: ~/Library/Application Support/zot/mcp.json)
	6	+	// 1. Global: $ZOT_HOME/mcp.json
7	7		// 2. Project: .zot/mcp.json (in the current working directory)
8	8		//
9	9		// Project config overrides global config per-server (shallow merge).

@@ -47,6 +47,9 @@ func zotHome() string {
47	47		if h := os.Getenv("ZOT_HOME"); h != "" {
48	48		return h
49	49		}
	50	+	if xdg := os.Getenv("XDG_STATE_HOME"); xdg != "" {
	51	+	return filepath.Join(xdg, "zot")
	52	+	}
50	53		switch runtime.GOOS {
51	54		case "darwin":
52	55		home, _ := os.UserHomeDir()

@@ -54,9 +57,6 @@ func zotHome() string {
54	57		case "windows":
55	58		return filepath.Join(os.Getenv("APPDATA"), "zot")
56	59		default: // linux, freebsd, etc.
57		-	if xdg := os.Getenv("XDG_STATE_HOME"); xdg != "" {
58		-	return filepath.Join(xdg, "zot")
59		-	}
60	60		home, _ := os.UserHomeDir()
61	61		return filepath.Join(home, ".local", "state", "zot")
62	62		}

 // Reads standard MCP config files (same format as Claude Desktop, Cursor, etc.)
 // from two locations:
 //
-//  1. Global:  $ZOT_HOME/mcp.json  (macOS: ~/Library/Application Support/zot/mcp.json)
+//  1. Global:  $ZOT_HOME/mcp.json
 //  2. Project: .zot/mcp.json       (in the current working directory)
 //
 // Project config overrides global config per-server (shallow merge).
 	if h := os.Getenv("ZOT_HOME"); h != "" {
 		return h
 	}
+	if xdg := os.Getenv("XDG_STATE_HOME"); xdg != "" {
+		return filepath.Join(xdg, "zot")
+	}
 	switch runtime.GOOS {
 	case "darwin":
 		home, _ := os.UserHomeDir()
 	case "windows":
 		return filepath.Join(os.Getenv("APPDATA"), "zot")
 	default: // linux, freebsd, etc.
-		if xdg := os.Getenv("XDG_STATE_HOME"); xdg != "" {
-			return filepath.Join(xdg, "zot")
-		}
 		home, _ := os.UserHomeDir()
 		return filepath.Join(home, ".local", "state", "zot")
 	}

M packages/agent/config.go +3 -3


@@ -108,6 +108,9 @@ func ZotHome() string {
108	108		if v := os.Getenv("ZOT_HOME"); v != "" {
109	109		return v
110	110		}
	111	+	if v := os.Getenv("XDG_STATE_HOME"); v != "" {
	112	+	return filepath.Join(v, "zot")
	113	+	}
111	114		switch runtime.GOOS {
112	115		case "darwin":
113	116		if home, err := os.UserHomeDir(); err == nil {

@@ -118,9 +121,6 @@ func ZotHome() string {
118	121		return filepath.Join(v, "zot")
119	122		}
120	123		}
121		-	if v := os.Getenv("XDG_STATE_HOME"); v != "" {
122		-	return filepath.Join(v, "zot")
123		-	}
124	124		if home, err := os.UserHomeDir(); err == nil {
125	125		return filepath.Join(home, ".local", "state", "zot")
126	126		}

 	if v := os.Getenv("ZOT_HOME"); v != "" {
 		return v
 	}
+	if v := os.Getenv("XDG_STATE_HOME"); v != "" {
+		return filepath.Join(v, "zot")
+	}
 	switch runtime.GOOS {
 	case "darwin":
 		if home, err := os.UserHomeDir(); err == nil {
 			return filepath.Join(v, "zot")
 		}
 	}
-	if v := os.Getenv("XDG_STATE_HOME"); v != "" {
-		return filepath.Join(v, "zot")
-	}
 	if home, err := os.UserHomeDir(); err == nil {
 		return filepath.Join(home, ".local", "state", "zot")
 	}

A packages/agent/config_home_test.go +24 -0

@@ -0,0 +1,24 @@
	1	+	package agent
	2	+
	3	+	import (
	4	+	"path/filepath"
	5	+	"testing"
	6	+	)
	7	+
	8	+	func TestZotHomePrefersExplicitHomeOverXDGStateHome(t *testing.T) {
	9	+	t.Setenv("ZOT_HOME", filepath.Join("explicit", "zot"))
	10	+	t.Setenv("XDG_STATE_HOME", filepath.Join("xdg", "state"))
	11	+
	12	+	if got, want := ZotHome(), filepath.Join("explicit", "zot"); got != want {
	13	+	t.Fatalf("ZotHome() = %q, want %q", got, want)
	14	+	}
	15	+	}
	16	+
	17	+	func TestZotHomeUsesXDGStateHome(t *testing.T) {
	18	+	t.Setenv("ZOT_HOME", "")
	19	+	t.Setenv("XDG_STATE_HOME", filepath.Join("xdg", "state"))
	20	+
	21	+	if got, want := ZotHome(), filepath.Join("xdg", "state", "zot"); got != want {
	22	+	t.Fatalf("ZotHome() = %q, want %q", got, want)
	23	+	}
	24	+	}

@@ -0,0 +1,24 @@
	1	+	package agent
	2	+
	3	+	import (
	4	+	"path/filepath"
	5	+	"testing"
	6	+	)
	7	+
	8	+	func TestZotHomePrefersExplicitHomeOverXDGStateHome(t *testing.T) {
	9	+	t.Setenv("ZOT_HOME", filepath.Join("explicit", "zot"))
	10	+	t.Setenv("XDG_STATE_HOME", filepath.Join("xdg", "state"))
	11	+
	12	+	if got, want := ZotHome(), filepath.Join("explicit", "zot"); got != want {
	13	+	t.Fatalf("ZotHome() = %q, want %q", got, want)
	14	+	}
	15	+	}
	16	+
	17	+	func TestZotHomeUsesXDGStateHome(t *testing.T) {
	18	+	t.Setenv("ZOT_HOME", "")
	19	+	t.Setenv("XDG_STATE_HOME", filepath.Join("xdg", "state"))
	20	+
	21	+	if got, want := ZotHome(), filepath.Join("xdg", "state", "zot"); got != want {
	22	+	t.Fatalf("ZotHome() = %q, want %q", got, want)
	23	+	}
	24	+	}