Every agent's model. One place. Codex on DeepSeek, Claude Code on Kimi, from the menu bar.
plugins: a package.json with bytes after its object is mended around each bun command (plugins#405)
yetonea9242eb68bc9
diff --git a/internal/plugin/package_json_mend_test.go b/internal/plugin/package_json_mend_test.gonew file mode 100644index 000000000..7729299a7--- /dev/null+++ b/internal/plugin/package_json_mend_test.go@@ -0,0 +1,57 @@+package plugin++import (+ "encoding/json"+ "os"+ "path/filepath"+ "testing"+)++// TestPackageJSONTailIsCut: plugins#405's package.json, byte for byte (a+// bun remove on Windows wrote a shorter one over the old without+// truncating it), parses again after a bun command, keeps every+// dependency, and the file as it was stays beside it. A file whose start+// isn't an object, and one that parses, are left as they are.+func TestPackageJSONTailIsCut(t *testing.T) {+ const kept = "{\n \"name\": \"magpie-plugins\",\n \"private\": true,\n \"dependencies\": {\n \"@magpie-community/opencode-qoder-auth\": \"0.2.33\",\n \"@magpie-community/opencode-workbuddy-auth\": \"0.1.29\"\n }\n}\n"+ const reported = kept + "@magpie-community/opencode-zcode-auth\": \"^0.1.27\"\n }\n}\n"+ for _, tc := range []struct{ name, body, want string }{+ {"a tail after the object", reported, kept},+ {"whole", kept, kept},+ {"no object to keep", "@magpie\": 1\n}\n", "@magpie\": 1\n}\n"},+ {"cut short", "{\n \"name\": \"magpie-plugins\",\n", "{\n \"name\": \"magpie-plugins\",\n"},+ } {+ t.Run(tc.name, func(t *testing.T) {+ storeSandbox(t)+ if err := os.MkdirAll(Dir(), 0o755); err != nil {+ t.Fatal(err)+ }+ pj := filepath.Join(Dir(), "package.json")+ if err := os.WriteFile(pj, []byte(tc.body), 0o644); err != nil {+ t.Fatal(err)+ }+ mendPackageJSON()+ got, err := os.ReadFile(pj)+ if err != nil {+ t.Fatal(err)+ }+ if string(got) != tc.want {+ t.Fatalf("package.json is\n%s\nwant\n%s", got, tc.want)+ }+ broken, err := os.ReadFile(pj + ".broken")+ if tc.body == tc.want {+ if err == nil {+ t.Fatalf("a file left alone was copied to package.json.broken")+ }+ return+ }+ if string(broken) != tc.body {+ t.Fatalf("package.json.broken is\n%s\nwant the file as it was", broken)+ }+ var pkg struct{ Dependencies map[string]string }+ if err := json.Unmarshal(got, &pkg); err != nil || len(pkg.Dependencies) != 2 {+ t.Fatalf("mended file gave %v, %v", pkg.Dependencies, err)+ }+ })+ }+}diff --git a/internal/plugin/store.go b/internal/plugin/store.goindex 0c4f0b261..0e665d78e 100644--- a/internal/plugin/store.go+++ b/internal/plugin/store.go@@ -34,6 +34,7 @@ import ("sync/atomic""time"+ "github.com/yetone/magpie/internal/edit""github.com/yetone/magpie/internal/filememo""github.com/yetone/magpie/internal/lastgood""github.com/yetone/magpie/internal/netproxy"@@ -84,9 +85,38 @@ var installMu sync.Mutexfunc runBun(ctx context.Context, bun string, args ...string) ([]byte, error) {installMu.Lock()defer installMu.Unlock()+ mendPackageJSON()+ defer mendPackageJSON()return bunCommand(ctx, bun, Dir(), args...).CombinedOutput()}+// mendPackageJSON cuts what follows plugins/package.json's object off. Bun+// on Windows can write a shorter package.json over a longer one without+// truncating it (klmno1993, plugins#405: a bun remove left the old file's+// last 56 bytes after the closing brace), and every bun add after it+// fails on bun's "failed to read/parse package.json", whatever+// the plugin. The object is kept as written; the whole file is kept as+// package.json.broken. A file whose start isn't an object is left alone.+// installMu held.+func mendPackageJSON() {+ pj := filepath.Join(Dir(), "package.json")+ b, err := os.ReadFile(pj)+ if err != nil || json.Valid(b) {+ return+ }+ d := json.NewDecoder(bytes.NewReader(b))+ var obj map[string]any+ if d.Decode(&obj) != nil || obj == nil {+ return+ }+ head := append(bytes.Clone(bytes.TrimRight(b[:d.InputOffset()], " \t\r\n")), '\n')+ if !json.Valid(head) {+ return+ }+ _ = os.WriteFile(pj+".broken", b, 0o644)+ _ = edit.WriteAtomic(pj, head)+}+// Dir is the folder magpie installs npm plugins into.func Dir() string { return filepath.Join(settings.Dir(), "plugins") }@@ -721,6 +751,8 @@ func install(ctx context.Context, spec string) error {}}defer installMu.Unlock()+ mendPackageJSON()+ defer mendPackageJSON()err = bunAdd(ctx, bun, spec)// a @magpie-community package or version npm doesn't have (a new// one waits for an owner to publish it there) comes from the