pi-usereq 0.48.0 → 0.50.0

package/pi.dev-src/pi-mono/coding-agent/test/settings-manager-bug.test.ts

@@ -1,147 +0,0 @@
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "fs";
-import { join } from "path";
-import { afterEach, beforeEach, describe, expect, it } from "vitest";
-import { SettingsManager } from "../src/core/settings-manager.js";
-
-/**
- * Tests for the fix to a bug where external file changes to arrays were overwritten.
- *
- * The bug scenario was:
- * 1. Pi starts with settings.json containing packages: ["npm:some-pkg"]
- * 2. User externally edits file to packages: []
- * 3. User changes an unrelated setting (e.g., theme) via UI
- * 4. save() would overwrite packages back to ["npm:some-pkg"] from stale in-memory state
- *
- * The fix tracks which fields were explicitly modified during the session, and only
- * those fields override file values during save().
- */
-describe("SettingsManager - External Edit Preservation", () => {
-	const testDir = join(process.cwd(), "test-settings-bug-tmp");
-	const agentDir = join(testDir, "agent");
-	const projectDir = join(testDir, "project");
-
-	beforeEach(() => {
-		if (existsSync(testDir)) {
-			rmSync(testDir, { recursive: true });
-		}
-		mkdirSync(agentDir, { recursive: true });
-		mkdirSync(join(projectDir, ".pi"), { recursive: true });
-	});
-
-	afterEach(() => {
-		if (existsSync(testDir)) {
-			rmSync(testDir, { recursive: true });
-		}
-	});
-
-	it("should preserve file changes to packages array when changing unrelated setting", async () => {
-		const settingsPath = join(agentDir, "settings.json");
-
-		// Initial state: packages has one item
-		writeFileSync(
-			settingsPath,
-			JSON.stringify({
-				theme: "dark",
-				packages: ["npm:pi-mcp-adapter"],
-			}),
-		);
-
-		// Pi starts up, loads settings into memory
-		const manager = SettingsManager.create(projectDir, agentDir);
-
-		// At this point, globalSettings.packages = ["npm:pi-mcp-adapter"]
-		expect(manager.getPackages()).toEqual(["npm:pi-mcp-adapter"]);
-
-		// User externally edits settings.json to remove the package
-		const currentSettings = JSON.parse(readFileSync(settingsPath, "utf-8"));
-		currentSettings.packages = []; // User wants to remove this!
-		writeFileSync(settingsPath, JSON.stringify(currentSettings, null, 2));
-
-		// Verify file was changed
-		expect(JSON.parse(readFileSync(settingsPath, "utf-8")).packages).toEqual([]);
-
-		// User changes an UNRELATED setting via UI (this triggers save)
-		manager.setTheme("light");
-		await manager.flush();
-
-		// With the fix, packages should be preserved as [] (not reverted to startup value)
-		const savedSettings = JSON.parse(readFileSync(settingsPath, "utf-8"));
-
-		expect(savedSettings.packages).toEqual([]);
-		expect(savedSettings.theme).toBe("light");
-	});
-
-	it("should preserve file changes to extensions array when changing unrelated setting", async () => {
-		const settingsPath = join(agentDir, "settings.json");
-
-		writeFileSync(
-			settingsPath,
-			JSON.stringify({
-				theme: "dark",
-				extensions: ["/old/extension.ts"],
-			}),
-		);
-
-		const manager = SettingsManager.create(projectDir, agentDir);
-
-		// User externally updates extensions
-		const currentSettings = JSON.parse(readFileSync(settingsPath, "utf-8"));
-		currentSettings.extensions = ["/new/extension.ts"];
-		writeFileSync(settingsPath, JSON.stringify(currentSettings, null, 2));
-
-		// Change unrelated setting
-		manager.setDefaultThinkingLevel("high");
-		await manager.flush();
-
-		const savedSettings = JSON.parse(readFileSync(settingsPath, "utf-8"));
-
-		// With the fix, extensions should be preserved (not reverted to startup value)
-		expect(savedSettings.extensions).toEqual(["/new/extension.ts"]);
-	});
-
-	it("should preserve external project settings changes when updating unrelated project field", async () => {
-		const projectSettingsPath = join(projectDir, ".pi", "settings.json");
-		writeFileSync(
-			projectSettingsPath,
-			JSON.stringify({
-				extensions: ["./old-extension.ts"],
-				prompts: ["./old-prompt.md"],
-			}),
-		);
-
-		const manager = SettingsManager.create(projectDir, agentDir);
-
-		const currentProjectSettings = JSON.parse(readFileSync(projectSettingsPath, "utf-8"));
-		currentProjectSettings.prompts = ["./new-prompt.md"];
-		writeFileSync(projectSettingsPath, JSON.stringify(currentProjectSettings, null, 2));
-
-		manager.setProjectExtensionPaths(["./updated-extension.ts"]);
-		await manager.flush();
-
-		const savedProjectSettings = JSON.parse(readFileSync(projectSettingsPath, "utf-8"));
-		expect(savedProjectSettings.prompts).toEqual(["./new-prompt.md"]);
-		expect(savedProjectSettings.extensions).toEqual(["./updated-extension.ts"]);
-	});
-
-	it("should let in-memory project changes override external changes for the same project field", async () => {
-		const projectSettingsPath = join(projectDir, ".pi", "settings.json");
-		writeFileSync(
-			projectSettingsPath,
-			JSON.stringify({
-				extensions: ["./initial-extension.ts"],
-			}),
-		);
-
-		const manager = SettingsManager.create(projectDir, agentDir);
-
-		const currentProjectSettings = JSON.parse(readFileSync(projectSettingsPath, "utf-8"));
-		currentProjectSettings.extensions = ["./external-extension.ts"];
-		writeFileSync(projectSettingsPath, JSON.stringify(currentProjectSettings, null, 2));
-
-		manager.setProjectExtensionPaths(["./in-memory-extension.ts"]);
-		await manager.flush();
-
-		const savedProjectSettings = JSON.parse(readFileSync(projectSettingsPath, "utf-8"));
-		expect(savedProjectSettings.extensions).toEqual(["./in-memory-extension.ts"]);
-	});
-});

package/pi.dev-src/pi-mono/coding-agent/test/settings-manager.test.ts

@@ -1,319 +0,0 @@
-import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "fs";
-import { homedir } from "os";
-import { join } from "path";
-import { afterEach, beforeEach, describe, expect, it } from "vitest";
-import { SettingsManager } from "../src/core/settings-manager.js";
-
-describe("SettingsManager", () => {
-	const testDir = join(process.cwd(), "test-settings-tmp");
-	const agentDir = join(testDir, "agent");
-	const projectDir = join(testDir, "project");
-
-	beforeEach(() => {
-		// Clean up and create fresh directories
-		if (existsSync(testDir)) {
-			rmSync(testDir, { recursive: true });
-		}
-		mkdirSync(agentDir, { recursive: true });
-		mkdirSync(join(projectDir, ".pi"), { recursive: true });
-	});
-
-	afterEach(() => {
-		if (existsSync(testDir)) {
-			rmSync(testDir, { recursive: true });
-		}
-	});
-
-	describe("preserves externally added settings", () => {
-		it("should preserve enabledModels when changing thinking level", async () => {
-			// Create initial settings file
-			const settingsPath = join(agentDir, "settings.json");
-			writeFileSync(
-				settingsPath,
-				JSON.stringify({
-					theme: "dark",
-					defaultModel: "claude-sonnet",
-				}),
-			);
-
-			// Create SettingsManager (simulates pi starting up)
-			const manager = SettingsManager.create(projectDir, agentDir);
-
-			// Simulate user editing settings.json externally to add enabledModels
-			const currentSettings = JSON.parse(readFileSync(settingsPath, "utf-8"));
-			currentSettings.enabledModels = ["claude-opus-4-5", "gpt-5.2-codex"];
-			writeFileSync(settingsPath, JSON.stringify(currentSettings, null, 2));
-
-			// User changes thinking level via Shift+Tab
-			manager.setDefaultThinkingLevel("high");
-			await manager.flush();
-
-			// Verify enabledModels is preserved
-			const savedSettings = JSON.parse(readFileSync(settingsPath, "utf-8"));
-			expect(savedSettings.enabledModels).toEqual(["claude-opus-4-5", "gpt-5.2-codex"]);
-			expect(savedSettings.defaultThinkingLevel).toBe("high");
-			expect(savedSettings.theme).toBe("dark");
-			expect(savedSettings.defaultModel).toBe("claude-sonnet");
-		});
-
-		it("should preserve custom settings when changing theme", async () => {
-			const settingsPath = join(agentDir, "settings.json");
-			writeFileSync(
-				settingsPath,
-				JSON.stringify({
-					defaultModel: "claude-sonnet",
-				}),
-			);
-
-			const manager = SettingsManager.create(projectDir, agentDir);
-
-			// User adds custom settings externally
-			const currentSettings = JSON.parse(readFileSync(settingsPath, "utf-8"));
-			currentSettings.shellPath = "/bin/zsh";
-			currentSettings.extensions = ["/path/to/extension.ts"];
-			writeFileSync(settingsPath, JSON.stringify(currentSettings, null, 2));
-
-			// User changes theme
-			manager.setTheme("light");
-			await manager.flush();
-
-			// Verify all settings preserved
-			const savedSettings = JSON.parse(readFileSync(settingsPath, "utf-8"));
-			expect(savedSettings.shellPath).toBe("/bin/zsh");
-			expect(savedSettings.extensions).toEqual(["/path/to/extension.ts"]);
-			expect(savedSettings.theme).toBe("light");
-		});
-
-		it("should let in-memory changes override file changes for same key", async () => {
-			const settingsPath = join(agentDir, "settings.json");
-			writeFileSync(
-				settingsPath,
-				JSON.stringify({
-					theme: "dark",
-				}),
-			);
-
-			const manager = SettingsManager.create(projectDir, agentDir);
-
-			// User externally sets thinking level to "low"
-			const currentSettings = JSON.parse(readFileSync(settingsPath, "utf-8"));
-			currentSettings.defaultThinkingLevel = "low";
-			writeFileSync(settingsPath, JSON.stringify(currentSettings, null, 2));
-
-			// But then changes it via UI to "high"
-			manager.setDefaultThinkingLevel("high");
-			await manager.flush();
-
-			// In-memory change should win
-			const savedSettings = JSON.parse(readFileSync(settingsPath, "utf-8"));
-			expect(savedSettings.defaultThinkingLevel).toBe("high");
-		});
-	});
-
-	describe("packages migration", () => {
-		it("should keep local-only extensions in extensions array", () => {
-			const settingsPath = join(agentDir, "settings.json");
-			writeFileSync(
-				settingsPath,
-				JSON.stringify({
-					extensions: ["/local/ext.ts", "./relative/ext.ts"],
-				}),
-			);
-
-			const manager = SettingsManager.create(projectDir, agentDir);
-
-			expect(manager.getPackages()).toEqual([]);
-			expect(manager.getExtensionPaths()).toEqual(["/local/ext.ts", "./relative/ext.ts"]);
-		});
-
-		it("should handle packages with filtering objects", () => {
-			const settingsPath = join(agentDir, "settings.json");
-			writeFileSync(
-				settingsPath,
-				JSON.stringify({
-					packages: [
-						"npm:simple-pkg",
-						{
-							source: "npm:shitty-extensions",
-							extensions: ["extensions/oracle.ts"],
-							skills: [],
-						},
-					],
-				}),
-			);
-
-			const manager = SettingsManager.create(projectDir, agentDir);
-
-			const packages = manager.getPackages();
-			expect(packages).toHaveLength(2);
-			expect(packages[0]).toBe("npm:simple-pkg");
-			expect(packages[1]).toEqual({
-				source: "npm:shitty-extensions",
-				extensions: ["extensions/oracle.ts"],
-				skills: [],
-			});
-		});
-	});
-
-	describe("reload", () => {
-		it("should reload global settings from disk", async () => {
-			const settingsPath = join(agentDir, "settings.json");
-			writeFileSync(
-				settingsPath,
-				JSON.stringify({
-					theme: "dark",
-					extensions: ["/before.ts"],
-				}),
-			);
-
-			const manager = SettingsManager.create(projectDir, agentDir);
-
-			writeFileSync(
-				settingsPath,
-				JSON.stringify({
-					theme: "light",
-					extensions: ["/after.ts"],
-					defaultModel: "claude-sonnet",
-				}),
-			);
-
-			await manager.reload();
-
-			expect(manager.getTheme()).toBe("light");
-			expect(manager.getExtensionPaths()).toEqual(["/after.ts"]);
-			expect(manager.getDefaultModel()).toBe("claude-sonnet");
-		});
-
-		it("should keep previous settings when file is invalid", async () => {
-			const settingsPath = join(agentDir, "settings.json");
-			writeFileSync(settingsPath, JSON.stringify({ theme: "dark" }));
-
-			const manager = SettingsManager.create(projectDir, agentDir);
-
-			writeFileSync(settingsPath, "{ invalid json");
-			await manager.reload();
-
-			expect(manager.getTheme()).toBe("dark");
-		});
-	});
-
-	describe("error tracking", () => {
-		it("should collect and clear load errors via drainErrors", () => {
-			const globalSettingsPath = join(agentDir, "settings.json");
-			const projectSettingsPath = join(projectDir, ".pi", "settings.json");
-			writeFileSync(globalSettingsPath, "{ invalid global json");
-			writeFileSync(projectSettingsPath, "{ invalid project json");
-
-			const manager = SettingsManager.create(projectDir, agentDir);
-			const errors = manager.drainErrors();
-
-			expect(errors).toHaveLength(2);
-			expect(errors.map((e) => e.scope).sort()).toEqual(["global", "project"]);
-			expect(manager.drainErrors()).toEqual([]);
-		});
-	});
-
-	describe("project settings directory creation", () => {
-		it("should not create .pi folder when only reading project settings", () => {
-			// Create agent dir with global settings, but NO .pi folder in project
-			const settingsPath = join(agentDir, "settings.json");
-			writeFileSync(settingsPath, JSON.stringify({ theme: "dark" }));
-
-			// Delete the .pi folder that beforeEach created
-			rmSync(join(projectDir, ".pi"), { recursive: true });
-
-			// Create SettingsManager (reads both global and project settings)
-			const manager = SettingsManager.create(projectDir, agentDir);
-
-			// .pi folder should NOT have been created just from reading
-			expect(existsSync(join(projectDir, ".pi"))).toBe(false);
-
-			// Settings should still be loaded from global
-			expect(manager.getTheme()).toBe("dark");
-		});
-
-		it("should create .pi folder when writing project settings", async () => {
-			// Create agent dir with global settings, but NO .pi folder in project
-			const settingsPath = join(agentDir, "settings.json");
-			writeFileSync(settingsPath, JSON.stringify({ theme: "dark" }));
-
-			// Delete the .pi folder that beforeEach created
-			rmSync(join(projectDir, ".pi"), { recursive: true });
-
-			const manager = SettingsManager.create(projectDir, agentDir);
-
-			// .pi folder should NOT exist yet
-			expect(existsSync(join(projectDir, ".pi"))).toBe(false);
-
-			// Write a project-specific setting
-			manager.setProjectPackages([{ source: "npm:test-pkg" }]);
-			await manager.flush();
-
-			// Now .pi folder should exist
-			expect(existsSync(join(projectDir, ".pi"))).toBe(true);
-
-			// And settings file should be created
-			expect(existsSync(join(projectDir, ".pi", "settings.json"))).toBe(true);
-		});
-	});
-
-	describe("shellCommandPrefix", () => {
-		it("should load shellCommandPrefix from settings", () => {
-			const settingsPath = join(agentDir, "settings.json");
-			writeFileSync(settingsPath, JSON.stringify({ shellCommandPrefix: "shopt -s expand_aliases" }));
-
-			const manager = SettingsManager.create(projectDir, agentDir);
-
-			expect(manager.getShellCommandPrefix()).toBe("shopt -s expand_aliases");
-		});
-
-		it("should return undefined when shellCommandPrefix is not set", () => {
-			const settingsPath = join(agentDir, "settings.json");
-			writeFileSync(settingsPath, JSON.stringify({ theme: "dark" }));
-
-			const manager = SettingsManager.create(projectDir, agentDir);
-
-			expect(manager.getShellCommandPrefix()).toBeUndefined();
-		});
-
-		it("should preserve shellCommandPrefix when saving unrelated settings", async () => {
-			const settingsPath = join(agentDir, "settings.json");
-			writeFileSync(settingsPath, JSON.stringify({ shellCommandPrefix: "shopt -s expand_aliases" }));
-
-			const manager = SettingsManager.create(projectDir, agentDir);
-			manager.setTheme("light");
-			await manager.flush();
-
-			const savedSettings = JSON.parse(readFileSync(settingsPath, "utf-8"));
-			expect(savedSettings.shellCommandPrefix).toBe("shopt -s expand_aliases");
-			expect(savedSettings.theme).toBe("light");
-		});
-	});
-
-	describe("getSessionDir", () => {
-		it("should return undefined when not set", () => {
-			writeFileSync(join(agentDir, "settings.json"), JSON.stringify({ theme: "dark" }));
-			const manager = SettingsManager.create(projectDir, agentDir);
-			expect(manager.getSessionDir()).toBeUndefined();
-		});
-
-		it("should return global sessionDir", () => {
-			writeFileSync(join(agentDir, "settings.json"), JSON.stringify({ sessionDir: "/tmp/sessions" }));
-			const manager = SettingsManager.create(projectDir, agentDir);
-			expect(manager.getSessionDir()).toBe("/tmp/sessions");
-		});
-
-		it("should return project sessionDir, overriding global", () => {
-			writeFileSync(join(agentDir, "settings.json"), JSON.stringify({ sessionDir: "/global/sessions" }));
-			writeFileSync(join(projectDir, ".pi", "settings.json"), JSON.stringify({ sessionDir: "./sessions" }));
-			const manager = SettingsManager.create(projectDir, agentDir);
-			expect(manager.getSessionDir()).toBe("./sessions");
-		});
-
-		it("should expand ~ in sessionDir", () => {
-			writeFileSync(join(agentDir, "settings.json"), JSON.stringify({ sessionDir: "~/sessions" }));
-			const manager = SettingsManager.create(projectDir, agentDir);
-			expect(manager.getSessionDir()).toBe(join(homedir(), "sessions"));
-		});
-	});
-});