gsd-pi 2.34.0-dev.bbb5216 → 2.34.0-dev.e6d9bed

package/packages/pi-coding-agent/dist/core/settings-manager.js

@@ -28,7 +28,7 @@ function deepMergeSettings(base, overrides) {
     }
     return result;
 }
-export class FileSettingsStorage {
+class FileSettingsStorage {
     constructor(cwd = process.cwd(), agentDir = getAgentDir()) {
         this.globalSettingsPath = join(agentDir, "settings.json");
         this.projectSettingsPath = join(cwd, CONFIG_DIR_NAME, "settings.json");
@@ -87,7 +87,7 @@ export class FileSettingsStorage {
         }
     }
 }
-export class InMemorySettingsStorage {
+class InMemorySettingsStorage {
     withLock(scope, fn) {
         const current = scope === "global" ? this.global : this.project;
         const next = fn(current);
@@ -349,13 +349,46 @@ export class SettingsManager {
         this.errors = [];
         return drained;
     }
+    // ── Generic setter helpers ──────────────────────────────────────────
+    /** Set a top-level global setting field, mark modified, and save. */
+    setGlobalSetting(key, value) {
+        this.globalSettings[key] = value;
+        this.markModified(key);
+        this.save();
+    }
+    /** Set a top-level setting, scoped to project when project settings are active. */
+    setScopedSetting(key, value) {
+        if (this.hasProjectSettings()) {
+            this.projectSettings[key] = value;
+            this.markProjectModified(key);
+            this.saveProjectSettings(this.projectSettings);
+        }
+        else {
+            this.setGlobalSetting(key, value);
+        }
+    }
+    /** Set a nested field within a global settings object (e.g. compaction.enabled). */
+    setNestedGlobalSetting(key, nestedKey, value) {
+        if (!this.globalSettings[key]) {
+            this.globalSettings[key] = {};
+        }
+        this.globalSettings[key][nestedKey] = value;
+        this.markModified(key, nestedKey);
+        this.save();
+    }
+    /** Set a field on project settings (clone, set, mark modified, save). */
+    setProjectSetting(key, value) {
+        const projectSettings = structuredClone(this.projectSettings);
+        projectSettings[key] = value;
+        this.markProjectModified(key);
+        this.saveProjectSettings(projectSettings);
+    }
+    // ── Public getters and setters ──────────────────────────────────────
     getLastChangelogVersion() {
         return this.settings.lastChangelogVersion;
     }
     setLastChangelogVersion(version) {
-        this.globalSettings.lastChangelogVersion = version;
-        this.markModified("lastChangelogVersion");
-        this.save();
+        this.setGlobalSetting("lastChangelogVersion", version);
     }
     getDefaultProvider() {
         return this.settings.defaultProvider;
@@ -364,28 +397,10 @@ export class SettingsManager {
         return this.settings.defaultModel;
     }
     setDefaultProvider(provider) {
-        if (this.hasProjectSettings()) {
-            this.projectSettings.defaultProvider = provider;
-            this.markProjectModified("defaultProvider");
-            this.saveProjectSettings(this.projectSettings);
-        }
-        else {
-            this.globalSettings.defaultProvider = provider;
-            this.markModified("defaultProvider");
-            this.save();
-        }
+        this.setScopedSetting("defaultProvider", provider);
     }
     setDefaultModel(modelId) {
-        if (this.hasProjectSettings()) {
-            this.projectSettings.defaultModel = modelId;
-            this.markProjectModified("defaultModel");
-            this.saveProjectSettings(this.projectSettings);
-        }
-        else {
-            this.globalSettings.defaultModel = modelId;
-            this.markModified("defaultModel");
-            this.save();
-        }
+        this.setScopedSetting("defaultModel", modelId);
     }
     setDefaultModelAndProvider(provider, modelId) {
         if (this.hasProjectSettings()) {
@@ -407,52 +422,37 @@ export class SettingsManager {
         return this.settings.steeringMode || "one-at-a-time";
     }
     setSteeringMode(mode) {
-        this.globalSettings.steeringMode = mode;
-        this.markModified("steeringMode");
-        this.save();
+        this.setGlobalSetting("steeringMode", mode);
     }
     getFollowUpMode() {
         return this.settings.followUpMode || "one-at-a-time";
     }
     setFollowUpMode(mode) {
-        this.globalSettings.followUpMode = mode;
-        this.markModified("followUpMode");
-        this.save();
+        this.setGlobalSetting("followUpMode", mode);
     }
     getTheme() {
         return this.settings.theme;
     }
     setTheme(theme) {
-        this.globalSettings.theme = theme;
-        this.markModified("theme");
-        this.save();
+        this.setGlobalSetting("theme", theme);
     }
     getDefaultThinkingLevel() {
         return this.settings.defaultThinkingLevel;
     }
     setDefaultThinkingLevel(level) {
-        this.globalSettings.defaultThinkingLevel = level;
-        this.markModified("defaultThinkingLevel");
-        this.save();
+        this.setGlobalSetting("defaultThinkingLevel", level);
     }
     getTransport() {
         return this.settings.transport ?? "sse";
     }
     setTransport(transport) {
-        this.globalSettings.transport = transport;
-        this.markModified("transport");
-        this.save();
+        this.setGlobalSetting("transport", transport);
     }
     getCompactionEnabled() {
         return this.settings.compaction?.enabled ?? true;
     }
     setCompactionEnabled(enabled) {
-        if (!this.globalSettings.compaction) {
-            this.globalSettings.compaction = {};
-        }
-        this.globalSettings.compaction.enabled = enabled;
-        this.markModified("compaction", "enabled");
-        this.save();
+        this.setNestedGlobalSetting("compaction", "enabled", enabled);
     }
     getCompactionReserveTokens() {
         return this.settings.compaction?.reserveTokens ?? COMPACTION_RESERVE_TOKENS;
@@ -480,12 +480,7 @@ export class SettingsManager {
         return this.settings.retry?.enabled ?? true;
     }
     setRetryEnabled(enabled) {
-        if (!this.globalSettings.retry) {
-            this.globalSettings.retry = {};
-        }
-        this.globalSettings.retry.enabled = enabled;
-        this.markModified("retry", "enabled");
-        this.save();
+        this.setNestedGlobalSetting("retry", "enabled", enabled);
     }
     getRetrySettings() {
         return {
@@ -499,119 +494,82 @@ export class SettingsManager {
         return this.settings.hideThinkingBlock ?? false;
     }
     setHideThinkingBlock(hide) {
-        this.globalSettings.hideThinkingBlock = hide;
-        this.markModified("hideThinkingBlock");
-        this.save();
+        this.setGlobalSetting("hideThinkingBlock", hide);
     }
     getShellPath() {
         return this.settings.shellPath;
     }
     setShellPath(path) {
-        this.globalSettings.shellPath = path;
-        this.markModified("shellPath");
-        this.save();
+        this.setGlobalSetting("shellPath", path);
     }
     getQuietStartup() {
         return this.settings.quietStartup ?? false;
     }
     setQuietStartup(quiet) {
-        this.globalSettings.quietStartup = quiet;
-        this.markModified("quietStartup");
-        this.save();
+        this.setGlobalSetting("quietStartup", quiet);
     }
     getShellCommandPrefix() {
         return this.settings.shellCommandPrefix;
     }
     setShellCommandPrefix(prefix) {
-        this.globalSettings.shellCommandPrefix = prefix;
-        this.markModified("shellCommandPrefix");
-        this.save();
+        this.setGlobalSetting("shellCommandPrefix", prefix);
     }
     getCollapseChangelog() {
         return this.settings.collapseChangelog ?? false;
     }
     setCollapseChangelog(collapse) {
-        this.globalSettings.collapseChangelog = collapse;
-        this.markModified("collapseChangelog");
-        this.save();
+        this.setGlobalSetting("collapseChangelog", collapse);
     }
     getPackages() {
         return [...(this.settings.packages ?? [])];
     }
     setPackages(packages) {
-        this.globalSettings.packages = packages;
-        this.markModified("packages");
-        this.save();
+        this.setGlobalSetting("packages", packages);
     }
     setProjectPackages(packages) {
-        const projectSettings = structuredClone(this.projectSettings);
-        projectSettings.packages = packages;
-        this.markProjectModified("packages");
-        this.saveProjectSettings(projectSettings);
+        this.setProjectSetting("packages", packages);
     }
     getExtensionPaths() {
         return [...(this.settings.extensions ?? [])];
     }
     setExtensionPaths(paths) {
-        this.globalSettings.extensions = paths;
-        this.markModified("extensions");
-        this.save();
+        this.setGlobalSetting("extensions", paths);
     }
     setProjectExtensionPaths(paths) {
-        const projectSettings = structuredClone(this.projectSettings);
-        projectSettings.extensions = paths;
-        this.markProjectModified("extensions");
-        this.saveProjectSettings(projectSettings);
+        this.setProjectSetting("extensions", paths);
     }
     getSkillPaths() {
         return [...(this.settings.skills ?? [])];
     }
     setSkillPaths(paths) {
-        this.globalSettings.skills = paths;
-        this.markModified("skills");
-        this.save();
+        this.setGlobalSetting("skills", paths);
     }
     setProjectSkillPaths(paths) {
-        const projectSettings = structuredClone(this.projectSettings);
-        projectSettings.skills = paths;
-        this.markProjectModified("skills");
-        this.saveProjectSettings(projectSettings);
+        this.setProjectSetting("skills", paths);
     }
     getPromptTemplatePaths() {
         return [...(this.settings.prompts ?? [])];
     }
     setPromptTemplatePaths(paths) {
-        this.globalSettings.prompts = paths;
-        this.markModified("prompts");
-        this.save();
+        this.setGlobalSetting("prompts", paths);
     }
     setProjectPromptTemplatePaths(paths) {
-        const projectSettings = structuredClone(this.projectSettings);
-        projectSettings.prompts = paths;
-        this.markProjectModified("prompts");
-        this.saveProjectSettings(projectSettings);
+        this.setProjectSetting("prompts", paths);
     }
     getThemePaths() {
         return [...(this.settings.themes ?? [])];
     }
     setThemePaths(paths) {
-        this.globalSettings.themes = paths;
-        this.markModified("themes");
-        this.save();
+        this.setGlobalSetting("themes", paths);
     }
     setProjectThemePaths(paths) {
-        const projectSettings = structuredClone(this.projectSettings);
-        projectSettings.themes = paths;
-        this.markProjectModified("themes");
-        this.saveProjectSettings(projectSettings);
+        this.setProjectSetting("themes", paths);
     }
     getEnableSkillCommands() {
         return this.settings.enableSkillCommands ?? true;
     }
     setEnableSkillCommands(enabled) {
-        this.globalSettings.enableSkillCommands = enabled;
-        this.markModified("enableSkillCommands");
-        this.save();
+        this.setGlobalSetting("enableSkillCommands", enabled);
     }
     getThinkingBudgets() {
         return this.settings.thinkingBudgets;
@@ -620,12 +578,7 @@ export class SettingsManager {
         return this.settings.terminal?.showImages ?? true;
     }
     setShowImages(show) {
-        if (!this.globalSettings.terminal) {
-            this.globalSettings.terminal = {};
-        }
-        this.globalSettings.terminal.showImages = show;
-        this.markModified("terminal", "showImages");
-        this.save();
+        this.setNestedGlobalSetting("terminal", "showImages", show);
     }
     getClearOnShrink() {
         // Settings takes precedence, then env var, then default false
@@ -635,50 +588,31 @@ export class SettingsManager {
         return process.env.PI_CLEAR_ON_SHRINK === "1";
     }
     setClearOnShrink(enabled) {
-        if (!this.globalSettings.terminal) {
-            this.globalSettings.terminal = {};
-        }
-        this.globalSettings.terminal.clearOnShrink = enabled;
-        this.markModified("terminal", "clearOnShrink");
-        this.save();
+        this.setNestedGlobalSetting("terminal", "clearOnShrink", enabled);
     }
     getImageAutoResize() {
         return this.settings.images?.autoResize ?? true;
     }
     setImageAutoResize(enabled) {
-        if (!this.globalSettings.images) {
-            this.globalSettings.images = {};
-        }
-        this.globalSettings.images.autoResize = enabled;
-        this.markModified("images", "autoResize");
-        this.save();
+        this.setNestedGlobalSetting("images", "autoResize", enabled);
     }
     getBlockImages() {
         return this.settings.images?.blockImages ?? false;
     }
     setBlockImages(blocked) {
-        if (!this.globalSettings.images) {
-            this.globalSettings.images = {};
-        }
-        this.globalSettings.images.blockImages = blocked;
-        this.markModified("images", "blockImages");
-        this.save();
+        this.setNestedGlobalSetting("images", "blockImages", blocked);
     }
     getEnabledModels() {
         return this.settings.enabledModels;
     }
     setEnabledModels(patterns) {
-        this.globalSettings.enabledModels = patterns;
-        this.markModified("enabledModels");
-        this.save();
+        this.setGlobalSetting("enabledModels", patterns);
     }
     getDoubleEscapeAction() {
         return this.settings.doubleEscapeAction ?? "tree";
     }
     setDoubleEscapeAction(action) {
-        this.globalSettings.doubleEscapeAction = action;
-        this.markModified("doubleEscapeAction");
-        this.save();
+        this.setGlobalSetting("doubleEscapeAction", action);
     }
     getTreeFilterMode() {
         const mode = this.settings.treeFilterMode;
@@ -686,49 +620,37 @@ export class SettingsManager {
         return mode && valid.includes(mode) ? mode : "default";
     }
     setTreeFilterMode(mode) {
-        this.globalSettings.treeFilterMode = mode;
-        this.markModified("treeFilterMode");
-        this.save();
+        this.setGlobalSetting("treeFilterMode", mode);
     }
     getShowHardwareCursor() {
         return this.settings.showHardwareCursor ?? process.env.PI_HARDWARE_CURSOR === "1";
     }
     setShowHardwareCursor(enabled) {
-        this.globalSettings.showHardwareCursor = enabled;
-        this.markModified("showHardwareCursor");
-        this.save();
+        this.setGlobalSetting("showHardwareCursor", enabled);
     }
     getEditorPaddingX() {
         return this.settings.editorPaddingX ?? 0;
     }
     setEditorPaddingX(padding) {
-        this.globalSettings.editorPaddingX = Math.max(0, Math.min(3, Math.floor(padding)));
-        this.markModified("editorPaddingX");
-        this.save();
+        this.setGlobalSetting("editorPaddingX", Math.max(0, Math.min(3, Math.floor(padding))));
     }
     getAutocompleteMaxVisible() {
         return this.settings.autocompleteMaxVisible ?? 5;
     }
     setAutocompleteMaxVisible(maxVisible) {
-        this.globalSettings.autocompleteMaxVisible = Math.max(3, Math.min(20, Math.floor(maxVisible)));
-        this.markModified("autocompleteMaxVisible");
-        this.save();
+        this.setGlobalSetting("autocompleteMaxVisible", Math.max(3, Math.min(20, Math.floor(maxVisible))));
     }
     getRespectGitignoreInPicker() {
         return this.settings.respectGitignoreInPicker ?? true;
     }
     setRespectGitignoreInPicker(value) {
-        this.globalSettings.respectGitignoreInPicker = value;
-        this.markModified("respectGitignoreInPicker");
-        this.save();
+        this.setGlobalSetting("respectGitignoreInPicker", value);
     }
     getSearchExcludeDirs() {
         return this.settings.searchExcludeDirs ?? [];
     }
     setSearchExcludeDirs(dirs) {
-        this.globalSettings.searchExcludeDirs = dirs.filter(Boolean);
-        this.markModified("searchExcludeDirs");
-        this.save();
+        this.setGlobalSetting("searchExcludeDirs", dirs.filter(Boolean));
     }
     getCodeBlockIndent() {
         return this.settings.markdown?.codeBlockIndent ?? "  ";
@@ -759,12 +681,7 @@ export class SettingsManager {
         return this.settings.fallback?.enabled ?? false;
     }
     setFallbackEnabled(enabled) {
-        if (!this.globalSettings.fallback) {
-            this.globalSettings.fallback = {};
-        }
-        this.globalSettings.fallback.enabled = enabled;
-        this.markModified("fallback", "enabled");
-        this.save();
+        this.setNestedGlobalSetting("fallback", "enabled", enabled);
     }
     getFallbackChains() {
         return this.settings.fallback?.chains ?? {};
@@ -806,20 +723,13 @@ export class SettingsManager {
         return this.settings.modelDiscovery ?? {};
     }
     setModelDiscoveryEnabled(enabled) {
-        if (!this.globalSettings.modelDiscovery) {
-            this.globalSettings.modelDiscovery = {};
-        }
-        this.globalSettings.modelDiscovery.enabled = enabled;
-        this.markModified("modelDiscovery", "enabled");
-        this.save();
+        this.setNestedGlobalSetting("modelDiscovery", "enabled", enabled);
     }
     getEditMode() {
         return this.settings.editMode ?? "standard";
     }
     setEditMode(mode) {
-        this.globalSettings.editMode = mode;
-        this.markModified("editMode");
-        this.save();
+        this.setGlobalSetting("editMode", mode);
     }
 }
 //# sourceMappingURL=settings-manager.js.map