@caupulican/pi-adaptative 0.81.42 → 0.84.1

package/dist/core/settings-manager.js

@@ -1,8 +1,8 @@
+import { DEFAULT_COMPACTION_SETTINGS } from "@caupulican/pi-agent-core/node";
 import { createHash } from "crypto";
 import { existsSync, mkdirSync, readFileSync, realpathSync, rmdirSync, rmSync, statSync, writeFileSync } from "fs";
 import { homedir } from "os";
 import { basename, dirname, join, relative, resolve, sep } from "path";
-import lockfile from "proper-lockfile";
 import { CONFIG_DIR_NAME, getAgentDir, getProfilesDir } from "../config.js";
 import { normalizePath, resolvePath } from "../utils/paths.js";
 import { configFile, directoryProfilesDir } from "./agent-paths.js";
@@ -10,9 +10,10 @@ import { DEFAULT_CONTEXT_GC_SETTINGS } from "./context-gc.js";
 import { DEFAULT_GOAL_AUTO_CONTINUE, DEFAULT_GOAL_AUTO_CONTINUE_DELAY_MS, DEFAULT_GOAL_CONTINUE_MAX_STALL_TURNS, DEFAULT_GOAL_CONTINUE_MAX_TURNS, DEFAULT_GOAL_CONTINUE_MAX_WALL_CLOCK_MINUTES, MAX_GOAL_AUTO_CONTINUE_DELAY_MS, MAX_GOAL_CONTINUE_MAX_STALL_TURNS, MAX_GOAL_CONTINUE_MAX_TURNS, MAX_GOAL_CONTINUE_MAX_WALL_CLOCK_MINUTES, } from "./goals/goal-continuation-defaults.js";
 import { DEFAULT_HTTP_IDLE_TIMEOUT_MS, parseHttpIdleTimeoutMs } from "./http-dispatcher.js";
 import { ProfileRegistry } from "./profile-registry.js";
-import { mergeResourceProfileMap, mergeResourceProfileSettings } from "./resource-profile-blocks.js";
+import { mergeResourceProfileMap, mergeResourceProfileSettings, normalizeResourceProfileFilter, } from "./resource-profile-blocks.js";
 import { isWorkerSession } from "./session-role.js";
 import { validateSkillName } from "./skills.js";
+import { acquireFileLockSync, LOW_LATENCY_FILE_LOCK_OPTIONS, writeFileAtomicSync } from "./util/atomic-file.js";
 import { matchesCompiledPattern } from "./util/minimatch-cache.js";
 export const MEMORY_RETRIEVAL_MAX_RESULTS_MIN = 1;
 export const MEMORY_RETRIEVAL_MAX_RESULTS_MAX = 20;
@@ -226,21 +227,11 @@ const VALID_THINKING_LEVELS = ["off", "minimal", "low", "medium", "high", "xhigh
 function isThinkingLevel(value) {
     return typeof value === "string" && VALID_THINKING_LEVELS.includes(value);
 }
-function asStringArrayWithPattern(value) {
-    if (!Array.isArray(value))
-        return undefined;
-    const values = value.filter((item) => typeof item === "string" && item.trim().length > 0);
-    return values.length > 0 ? values : undefined;
-}
 function normalizeProfileFilterResource(value) {
     if (!value || typeof value !== "object" || Array.isArray(value)) {
         throw new Error("resource profile filter must be an object");
     }
-    const filter = value;
-    return {
-        allow: asStringArrayWithPattern(filter.allow),
-        block: asStringArrayWithPattern(filter.block),
-    };
+    return normalizeResourceProfileFilter(value);
 }
 function normalizeProfileResources(value) {
     if (!value || typeof value !== "object" || Array.isArray(value)) {
@@ -313,12 +304,6 @@ function parseProfileFileDefinition(content, fallbackName) {
     };
 }
 export class FileSettingsStorage {
-    profileResolutionBaseDir;
-    globalSettingsPath;
-    projectSettingsPath;
-    directoryProfileInfo;
-    legacyDirectoryProfilePath;
-    profilesDir;
     constructor(cwd, agentDir) {
         const resolvedCwd = resolvePath(cwd);
         const resolvedAgentDir = resolvePath(agentDir);
@@ -365,30 +350,6 @@ export class FileSettingsStorage {
             catch { }
         }
     }
-    acquireLockSyncWithRetry(path) {
-        const maxAttempts = 10;
-        const delayMs = 20;
-        let lastError;
-        for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-            try {
-                return lockfile.lockSync(path, { realpath: false });
-            }
-            catch (error) {
-                const code = typeof error === "object" && error !== null && "code" in error
-                    ? String(error.code)
-                    : undefined;
-                if (code !== "ELOCKED" || attempt === maxAttempts) {
-                    throw error;
-                }
-                lastError = error;
-                const start = Date.now();
-                while (Date.now() - start < delayMs) {
-                    // Sleep synchronously to avoid changing callers to async.
-                }
-            }
-        }
-        throw lastError ?? new Error("Failed to acquire settings lock");
-    }
     withLock(scope, fn) {
         const path = scope === "global"
             ? this.globalSettingsPath
@@ -406,16 +367,17 @@ export class FileSettingsStorage {
             const fileExists = canonicalExists || legacyExists;
             // Directory-profile locks always follow legacy -> canonical order, including a partial migration
             // where both files exist. This keeps old and new SDK clients from deadlocking each other.
-            if (legacyPath && legacyExists)
-                releases.push(this.acquireLockSyncWithRetry(legacyPath));
+            if (legacyPath && legacyExists) {
+                releases.push(acquireFileLockSync(legacyPath, LOW_LATENCY_FILE_LOCK_OPTIONS));
+            }
             if (canonicalExists)
-                releases.push(this.acquireLockSyncWithRetry(path));
+                releases.push(acquireFileLockSync(path, LOW_LATENCY_FILE_LOCK_OPTIONS));
             // A legacy directory overlay can race another process that already knows the canonical path.
             // Hold the legacy lock, then bind to the canonical lock before deriving the update.
             if (legacyExists && !canonicalExists) {
                 if (!existsSync(dir))
                     mkdirSync(dir, { recursive: true });
-                releases.push(this.acquireLockSyncWithRetry(path));
+                releases.push(acquireFileLockSync(path, LOW_LATENCY_FILE_LOCK_OPTIONS));
                 if (existsSync(path))
                     currentPath = path;
             }
@@ -426,9 +388,10 @@ export class FileSettingsStorage {
                 if (!existsSync(dir)) {
                     mkdirSync(dir, { recursive: true });
                 }
-                if (releases.length === 0)
-                    releases.push(this.acquireLockSyncWithRetry(path));
-                writeFileSync(path, next, "utf-8");
+                if (releases.length === 0) {
+                    releases.push(acquireFileLockSync(path, LOW_LATENCY_FILE_LOCK_OPTIONS));
+                }
+                writeFileAtomicSync(path, next);
                 migratedLegacy = legacyExists;
             }
         }
@@ -441,9 +404,6 @@ export class FileSettingsStorage {
     }
 }
 export class InMemorySettingsStorage {
-    global;
-    project;
-    directoryProfile;
     withLock(scope, fn) {
         const current = scope === "global" ? this.global : scope === "project" ? this.project : this.directoryProfile;
         const next = fn(current);
@@ -462,26 +422,18 @@ export class InMemorySettingsStorage {
     }
 }
 export class SettingsManager {
-    storage;
-    globalSettings;
-    projectSettings;
-    directoryProfileSettings;
-    runtimeResourceProfiles;
-    inlineResourceProfileDefinitions = {};
-    discoveredResourceProfileDefinitions = {};
-    settings;
-    projectTrusted;
-    modifiedFields = new Set(); // Track global fields modified during session
-    modifiedNestedFields = new Map(); // Track global nested field modifications
-    modifiedProjectFields = new Set(); // Track project fields modified during session
-    modifiedProjectNestedFields = new Map(); // Track project nested field modifications
-    globalSettingsLoadError = null; // Track if global settings file had parse errors
-    projectSettingsLoadError = null; // Track if project settings file had parse errors
-    directoryProfileInfo = null;
-    profileRegistry;
-    writeQueue = Promise.resolve();
-    errors;
     constructor(storage, initialGlobal, initialProject, initialDirectoryProfile = {}, globalLoadError = null, projectLoadError = null, initialErrors = [], projectTrusted = true, directoryProfileInfo = null) {
+        this.inlineResourceProfileDefinitions = {};
+        this.discoveredResourceProfileDefinitions = {};
+        this.modifiedFields = new Set(); // Track global fields modified during session
+        this.modifiedNestedFields = new Map(); // Track global nested field modifications
+        this.modifiedProjectFields = new Set(); // Track project fields modified during session
+        this.modifiedProjectNestedFields = new Map(); // Track project nested field modifications
+        this.globalSettingsLoadError = null; // Track if global settings file had parse errors
+        this.projectSettingsLoadError = null; // Track if project settings file had parse errors
+        this.directoryProfileInfo = null;
+        this.writeQueue = Promise.resolve();
+        this.profileDiagnosticKeys = new Set();
         this.storage = storage;
         this.globalSettings = initialGlobal;
         this.projectSettings = initialProject;
@@ -505,7 +457,6 @@ export class SettingsManager {
             externalResourceRoots: this.getEffectiveExternalResourceRoots(),
         });
     }
-    profileDiagnosticKeys = new Set();
     reportProfileDiagnostic(scope, message) {
         const key = `${scope}:${message}`;
         if (this.profileDiagnosticKeys.has(key)) {
@@ -1047,6 +998,33 @@ export class SettingsManager {
             return definition;
         return Object.keys(definition.resources).length > 0 ? definition.resources : undefined;
     }
+    updateStoredProfileDefinition(settings, name, definition, resources) {
+        const definitions = { ...(settings.resourceProfiles ?? {}) };
+        const stored = this.encodeStoredProfileDefinition(this.mergeProfileDefinition(name, definition, resources, definitions[name]));
+        if (stored)
+            definitions[name] = stored;
+        else
+            delete definitions[name];
+        if (Object.keys(definitions).length > 0)
+            settings.resourceProfiles = definitions;
+        else
+            delete settings.resourceProfiles;
+    }
+    renameStoredProfileDefinition(settings, oldName, newName) {
+        const definitions = { ...(settings.resourceProfiles ?? {}) };
+        if (!definitions[oldName])
+            throw new Error(`Profile not found: ${oldName}`);
+        if (definitions[newName])
+            throw new Error(`Profile already exists: ${newName}`);
+        definitions[newName] = definitions[oldName];
+        delete definitions[oldName];
+        settings.resourceProfiles = definitions;
+        if (settings.activeResourceProfile === oldName)
+            settings.activeResourceProfile = newName;
+        if (settings.activeResourceProfiles) {
+            settings.activeResourceProfiles = settings.activeResourceProfiles.map((name) => name === oldName ? newName : name);
+        }
+    }
     setActiveProfileInSettings(settings, profileName) {
         if (profileName) {
             settings.activeResourceProfile = profileName;
@@ -1166,17 +1144,7 @@ export class SettingsManager {
         }
         if (scope === "global") {
             const next = structuredClone(this.globalSettings);
-            next.resourceProfiles = { ...(next.resourceProfiles ?? {}) };
-            const stored = this.encodeStoredProfileDefinition(this.mergeProfileDefinition(name, definition, resources, next.resourceProfiles[name]));
-            if (stored) {
-                next.resourceProfiles[name] = stored;
-            }
-            else {
-                delete next.resourceProfiles[name];
-            }
-            if (Object.keys(next.resourceProfiles).length === 0) {
-                delete next.resourceProfiles;
-            }
+            this.updateStoredProfileDefinition(next, name, definition, resources);
             this.globalSettings = next;
             this.markModified("resourceProfiles");
             this.save();
@@ -1184,39 +1152,13 @@ export class SettingsManager {
         }
         if (scope === "project") {
             this.updateProjectSettings("resourceProfiles", (settings) => {
-                const next = structuredClone(settings.resourceProfiles ?? {});
-                const stored = this.encodeStoredProfileDefinition(this.mergeProfileDefinition(name, definition, resources, next[name]));
-                if (stored) {
-                    next[name] = stored;
-                }
-                else {
-                    delete next[name];
-                }
-                if (Object.keys(next).length > 0) {
-                    settings.resourceProfiles = next;
-                }
-                else {
-                    delete settings.resourceProfiles;
-                }
+                this.updateStoredProfileDefinition(settings, name, definition, resources);
             });
             return;
         }
         if (scope === "directory") {
             this.persistDirectoryProfiles((current) => {
-                const next = { ...(current.resourceProfiles ?? {}) };
-                const stored = this.encodeStoredProfileDefinition(this.mergeProfileDefinition(name, definition, resources, next[name]));
-                if (stored) {
-                    next[name] = stored;
-                }
-                else {
-                    delete next[name];
-                }
-                if (Object.keys(next).length > 0) {
-                    current.resourceProfiles = next;
-                }
-                else {
-                    delete current.resourceProfiles;
-                }
+                this.updateStoredProfileDefinition(current, name, definition, resources);
             });
             return;
         }
@@ -1338,20 +1280,7 @@ export class SettingsManager {
         }
         if (scope === "global") {
             const next = structuredClone(this.globalSettings);
-            if (!next.resourceProfiles?.[oldName]) {
-                throw new Error(`Profile not found: ${oldName}`);
-            }
-            if (next.resourceProfiles[newName]) {
-                throw new Error(`Profile already exists: ${newName}`);
-            }
-            next.resourceProfiles[newName] = next.resourceProfiles[oldName];
-            delete next.resourceProfiles[oldName];
-            if (next.activeResourceProfile === oldName) {
-                next.activeResourceProfile = newName;
-            }
-            if (next.activeResourceProfiles) {
-                next.activeResourceProfiles = next.activeResourceProfiles.map((name) => name === oldName ? newName : name);
-            }
+            this.renameStoredProfileDefinition(next, oldName, newName);
             this.globalSettings = next;
             this.markModified("resourceProfiles");
             this.markModified("activeResourceProfile");
@@ -1361,43 +1290,13 @@ export class SettingsManager {
         }
         if (scope === "project") {
             this.updateProjectSettings("resourceProfiles", (settings) => {
-                const next = structuredClone(settings.resourceProfiles ?? {});
-                if (!next[oldName]) {
-                    throw new Error(`Profile not found: ${oldName}`);
-                }
-                if (next[newName]) {
-                    throw new Error(`Profile already exists: ${newName}`);
-                }
-                next[newName] = next[oldName];
-                delete next[oldName];
-                settings.resourceProfiles = next;
-                if (settings.activeResourceProfile === oldName) {
-                    settings.activeResourceProfile = newName;
-                }
-                if (settings.activeResourceProfiles) {
-                    settings.activeResourceProfiles = settings.activeResourceProfiles.map((name) => name === oldName ? newName : name);
-                }
+                this.renameStoredProfileDefinition(settings, oldName, newName);
             });
             return;
         }
         if (scope === "directory") {
-            const next = structuredClone(this.directoryProfileSettings.resourceProfiles ?? {});
-            if (!next[oldName]) {
-                throw new Error(`Profile not found: ${oldName}`);
-            }
-            if (next[newName]) {
-                throw new Error(`Profile already exists: ${newName}`);
-            }
-            next[newName] = next[oldName];
-            delete next[oldName];
             this.persistDirectoryProfiles((current) => {
-                current.resourceProfiles = next;
-                if (current.activeResourceProfile === oldName) {
-                    current.activeResourceProfile = newName;
-                }
-                if (current.activeResourceProfiles) {
-                    current.activeResourceProfiles = current.activeResourceProfiles.map((name) => name === oldName ? newName : name);
-                }
+                this.renameStoredProfileDefinition(current, oldName, newName);
             });
             return;
         }
@@ -1734,7 +1633,7 @@ export class SettingsManager {
         this.save();
     }
     getCompactionEnabled() {
-        return this.settings.compaction?.enabled ?? true;
+        return this.settings.compaction?.enabled ?? DEFAULT_COMPACTION_SETTINGS.enabled;
     }
     setCompactionEnabled(enabled) {
         if (!this.globalSettings.compaction) {
@@ -1745,13 +1644,16 @@ export class SettingsManager {
         this.save();
     }
     getCompactionReserveTokens() {
-        return this.settings.compaction?.reserveTokens ?? 16384;
+        return this.settings.compaction?.reserveTokens ?? DEFAULT_COMPACTION_SETTINGS.reserveTokens;
     }
     getCompactionKeepRecentTokens() {
-        return this.settings.compaction?.keepRecentTokens ?? 20000;
+        return this.settings.compaction?.keepRecentTokens ?? DEFAULT_COMPACTION_SETTINGS.keepRecentTokens;
     }
     getCompactionTriggerPercent() {
-        return this.settings.compaction?.triggerPercent ?? 0.7;
+        const triggerPercent = this.settings.compaction?.triggerPercent ?? DEFAULT_COMPACTION_SETTINGS.triggerPercent;
+        if (triggerPercent === undefined)
+            throw new Error("default compaction triggerPercent is not configured");
+        return triggerPercent;
     }
     /**
      * Skill curator (#32). Auto-archive of stale reflection-promoted skills is ON by default (restorable,