@caupulican/pi-adaptative 0.81.39 → 0.81.40

package/dist/core/settings-manager.js

@@ -1,11 +1,11 @@
 import { createHash } from "crypto";
-import { existsSync, mkdirSync, readFileSync, realpathSync, rmSync, statSync, writeFileSync } from "fs";
+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 } from "./agent-paths.js";
+import { configFile, directoryProfilesDir } from "./agent-paths.js";
 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";
@@ -104,14 +104,10 @@ function findDirectoryProfileRoot(cwd) {
 export function getDirectoryResourceProfileInfo(cwd, agentDir = getAgentDir()) {
     const root = findDirectoryProfileRoot(cwd);
     const hash = createHash("sha256").update(root).digest("hex").slice(0, 16);
-    // resource-profiles/ stays at the agentDir root (not state/): moving it needs the two user-visible
-    // scope descriptions in profile-menu-controller.ts updated in the same change, which has not
-    // happened yet. Still routed through the SSOT root accessor so the eventual move is a one-line
-    // change here.
     return {
         root,
         hash,
-        path: join(configFile(resolvePath(agentDir), "resource-profiles"), hash, "settings.json"),
+        path: join(directoryProfilesDir(resolvePath(agentDir)), hash, "settings.json"),
     };
 }
 export function matchesResourceProfilePattern(resourcePath, patterns, baseDir = "") {
@@ -321,14 +317,16 @@ export class FileSettingsStorage {
     globalSettingsPath;
     projectSettingsPath;
     directoryProfileInfo;
+    legacyDirectoryProfilePath;
     profilesDir;
     constructor(cwd, agentDir) {
         const resolvedCwd = resolvePath(cwd);
         const resolvedAgentDir = resolvePath(agentDir);
         this.profileResolutionBaseDir = resolvedCwd;
-        this.globalSettingsPath = join(resolvedAgentDir, "settings.json");
+        this.globalSettingsPath = configFile(resolvedAgentDir, "settings.json");
         this.projectSettingsPath = join(resolvedCwd, CONFIG_DIR_NAME, "settings.json");
         this.directoryProfileInfo = getDirectoryResourceProfileInfo(resolvedCwd, resolvedAgentDir);
+        this.legacyDirectoryProfilePath = join(resolvedAgentDir, "resource-profiles", this.directoryProfileInfo.hash, "settings.json");
         this.profilesDir = getProfilesDir(resolvedAgentDir);
     }
     getDirectoryResourceProfileInfo() {
@@ -342,7 +340,30 @@ export class FileSettingsStorage {
     }
     readDirectoryResourceProfile() {
         const path = this.directoryProfileInfo.path;
-        return existsSync(path) ? readFileSync(path, "utf-8") : undefined;
+        if (existsSync(path))
+            return readFileSync(path, "utf-8");
+        return existsSync(this.legacyDirectoryProfilePath)
+            ? readFileSync(this.legacyDirectoryProfilePath, "utf-8")
+            : undefined;
+    }
+    removeMigratedDirectoryProfile() {
+        if (!existsSync(this.legacyDirectoryProfilePath))
+            return;
+        try {
+            rmSync(this.legacyDirectoryProfilePath, { force: true });
+        }
+        catch {
+            return;
+        }
+        for (const directory of [
+            dirname(this.legacyDirectoryProfilePath),
+            dirname(dirname(this.legacyDirectoryProfilePath)),
+        ]) {
+            try {
+                rmdirSync(directory);
+            }
+            catch { }
+        }
     }
     acquireLockSyncWithRetry(path) {
         const maxAttempts = 10;
@@ -375,30 +396,47 @@ export class FileSettingsStorage {
                 ? this.projectSettingsPath
                 : this.directoryProfileInfo.path;
         const dir = dirname(path);
-        let release;
+        const legacyPath = scope === "directoryProfile" ? this.legacyDirectoryProfilePath : undefined;
+        const releases = [];
+        let migratedLegacy = false;
         try {
-            // Only create directory and lock if file exists or we need to write
-            const fileExists = existsSync(path);
-            if (fileExists) {
-                release = this.acquireLockSyncWithRetry(path);
+            const legacyExists = legacyPath !== undefined && existsSync(legacyPath);
+            const canonicalExists = existsSync(path);
+            let currentPath = canonicalExists ? path : legacyExists ? (legacyPath ?? path) : path;
+            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 (canonicalExists)
+                releases.push(this.acquireLockSyncWithRetry(path));
+            // 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));
+                if (existsSync(path))
+                    currentPath = path;
             }
-            const current = fileExists ? readFileSync(path, "utf-8") : undefined;
+            const current = fileExists ? readFileSync(currentPath, "utf-8") : undefined;
             const next = fn(current);
             if (next !== undefined) {
                 // Only create directory when we actually need to write
                 if (!existsSync(dir)) {
                     mkdirSync(dir, { recursive: true });
                 }
-                if (!release) {
-                    release = this.acquireLockSyncWithRetry(path);
-                }
+                if (releases.length === 0)
+                    releases.push(this.acquireLockSyncWithRetry(path));
                 writeFileSync(path, next, "utf-8");
+                migratedLegacy = legacyExists;
             }
         }
         finally {
-            if (release) {
+            for (const release of releases.reverse())
                 release();
-            }
+            if (migratedLegacy)
+                this.removeMigratedDirectoryProfile();
         }
     }
 }
@@ -2246,6 +2284,22 @@ export class SettingsManager {
         this.markModified("images", "blockImages");
         this.save();
     }
+    getClipboardImageDirectory() {
+        return this.settings.images?.clipboardDirectory?.trim() || undefined;
+    }
+    setClipboardImageDirectory(directory) {
+        if (!this.globalSettings.images) {
+            this.globalSettings.images = {};
+        }
+        if (directory?.trim()) {
+            this.globalSettings.images.clipboardDirectory = directory.trim();
+        }
+        else {
+            delete this.globalSettings.images.clipboardDirectory;
+        }
+        this.markModified("images", "clipboardDirectory");
+        this.save();
+    }
     getEnabledModels() {
         return this.settings.enabledModels;
     }
@@ -2454,17 +2508,15 @@ export class SettingsManager {
                 : [],
             maxConcurrent: sanitizeIntegerSetting(configured.maxConcurrent, 1, 1, 3),
         };
-        if (typeof configured.model === "string" && configured.model.trim().length > 0) {
-            resolved.model = configured.model;
-        }
-        if (typeof configured.profile === "string" && configured.profile.trim().length > 0) {
-            resolved.profile = configured.profile;
-        }
-        if (typeof configured.systemPrompt === "string" && configured.systemPrompt.trim().length > 0) {
-            resolved.systemPrompt = configured.systemPrompt;
+        if (typeof configured.orchestrationProfile === "string" && configured.orchestrationProfile.trim().length > 0) {
+            resolved.orchestrationProfile = configured.orchestrationProfile.trim();
         }
         return resolved;
     }
+    getActiveOrchestrationProfile() {
+        const profileId = this.settings.activeOrchestrationProfile;
+        return typeof profileId === "string" && profileId.trim().length > 0 ? profileId.trim() : undefined;
+    }
     setWorkerDelegationSettings(settings, scope = "global") {
         if (scope === "project") {
             const projectSettings = structuredClone(this.projectSettings);