pi-subagents 0.75.0 → 0.76.1

package/src/agents/agents.js

@@ -8,6 +8,7 @@ import * as os from "node:os";
 import * as path from "node:path";
 import { fileURLToPath } from "node:url";
 import { createAtomicJsonWriter } from "../shared/atomic-json.js";
+import { resolveSettingsWriteTarget, withSettingsFileLease } from "../shared/settings-file-lease.js";
 import { CODE_OWNED_EXTERNAL_CLI_ADAPTER_LABEL, isCodeOwnedExternalCliAdapterId, parseExternalCliCapabilityNarrowing, validateCodeOwnedProfileRunner } from "../runs/shared/external-cli-contract.js";
 import { isClaudeCodeAdapterId } from "../runs/shared/claude-code-adapter.js";
 import { getAgentDir, getProjectConfigDir } from "../shared/utils.js";
@@ -688,35 +689,6 @@ function writeSettingsFile(filePath, settings) {
     });
     writeAtomicSettings(targetPath, settings);
 }
-function resolveSettingsWriteTarget(filePath) {
-    let targetPath = filePath;
-    for (;;) {
-        try {
-            return fs.realpathSync.native(targetPath);
-        }
-        catch (error) {
-            if (!(error instanceof Error && "code" in error && error.code === "ENOENT"))
-                throw error;
-            // A trailing separator requires a directory; it cannot name a new settings file.
-            if (targetPath.endsWith("/") || targetPath.endsWith(path.sep))
-                throw error;
-        }
-        // A missing target is allowed only when its physical parent already exists.
-        const parentPath = fs.realpathSync.native(path.dirname(targetPath));
-        const unresolvedPath = path.join(parentPath, path.basename(targetPath));
-        let linkText;
-        try {
-            linkText = fs.readlinkSync(unresolvedPath);
-        }
-        catch (error) {
-            if (!(error instanceof Error && "code" in error && error.code === "ENOENT"))
-                throw error;
-            return unresolvedPath;
-        }
-        // Keep link text intact so the filesystem follows directory links before "..".
-        targetPath = path.isAbsolute(linkText) ? linkText : `${parentPath}${path.sep}${linkText}`;
-    }
-}
 function parseOverrideStringArrayOrFalse(value, meta) {
     if (value === undefined)
         return undefined;
@@ -1487,18 +1459,20 @@ export function saveBuiltinAgentOverride(cwd, name, scope, override) {
     const filePath = scope === "project" ? getProjectAgentSettingsPath(cwd) : getUserAgentSettingsPath();
     if (!filePath)
         throw new Error("Project override is not available here. No project config root was found.");
-    const settings = readSettingsFileStrict(filePath);
-    const subagents = settings.subagents && typeof settings.subagents === "object" && !Array.isArray(settings.subagents)
-        ? { ...settings.subagents }
-        : {};
-    const agentOverrides = subagents.agentOverrides && typeof subagents.agentOverrides === "object" && !Array.isArray(subagents.agentOverrides)
-        ? { ...subagents.agentOverrides }
-        : {};
-    agentOverrides[name] = cloneOverrideValue(override);
-    subagents.agentOverrides = agentOverrides;
-    settings.subagents = subagents;
-    writeSettingsFile(filePath, settings);
-    return filePath;
+    return withSettingsFileLease(filePath, () => {
+        const settings = readSettingsFileStrict(filePath);
+        const subagents = settings.subagents && typeof settings.subagents === "object" && !Array.isArray(settings.subagents)
+            ? { ...settings.subagents }
+            : {};
+        const agentOverrides = subagents.agentOverrides && typeof subagents.agentOverrides === "object" && !Array.isArray(subagents.agentOverrides)
+            ? { ...subagents.agentOverrides }
+            : {};
+        agentOverrides[name] = cloneOverrideValue(override);
+        subagents.agentOverrides = agentOverrides;
+        settings.subagents = subagents;
+        writeSettingsFile(filePath, settings);
+        return filePath;
+    });
 }
 export function removeBuiltinAgentOverride(cwd, name, scope, options) {
     const filePath = scope === "project" ? getProjectAgentSettingsPath(cwd) : getUserAgentSettingsPath();
@@ -1506,55 +1480,59 @@ export function removeBuiltinAgentOverride(cwd, name, scope, options) {
         throw new Error("Project override is not available here. No project config root was found.");
     if (!fs.existsSync(filePath))
         return { path: filePath, removed: false, machinePreserved: false };
-    const settings = readSettingsFileStrict(filePath);
-    const subagents = settings.subagents;
-    if (!subagents || typeof subagents !== "object" || Array.isArray(subagents))
-        return { path: filePath, removed: false, machinePreserved: false };
-    const nextSubagents = { ...subagents };
-    const agentOverrides = nextSubagents.agentOverrides;
-    if (!agentOverrides || typeof agentOverrides !== "object" || Array.isArray(agentOverrides))
-        return { path: filePath, removed: false, machinePreserved: false };
-    const nextOverrides = { ...agentOverrides };
-    const current = nextOverrides[name];
-    if (!Object.prototype.hasOwnProperty.call(nextOverrides, name))
-        return { path: filePath, removed: false, machinePreserved: false };
-    const configuredMachine = current && typeof current === "object" && !Array.isArray(current) ? current.machine : undefined;
-    const machine = configuredMachine === false || (typeof configuredMachine === "string" && configuredMachine.trim()) ? configuredMachine : undefined;
-    if (options?.preserveMachine && machine !== undefined)
-        nextOverrides[name] = { machine };
-    else
-        delete nextOverrides[name];
-    if (Object.keys(nextOverrides).length > 0)
-        nextSubagents.agentOverrides = nextOverrides;
-    else
-        delete nextSubagents.agentOverrides;
-    if (Object.keys(nextSubagents).length > 0)
-        settings.subagents = nextSubagents;
-    else
-        delete settings.subagents;
-    writeSettingsFile(filePath, settings);
-    return { path: filePath, removed: true, machinePreserved: options?.preserveMachine === true && machine !== undefined };
+    return withSettingsFileLease(filePath, () => {
+        const settings = readSettingsFileStrict(filePath);
+        const subagents = settings.subagents;
+        if (!subagents || typeof subagents !== "object" || Array.isArray(subagents))
+            return { path: filePath, removed: false, machinePreserved: false };
+        const nextSubagents = { ...subagents };
+        const agentOverrides = nextSubagents.agentOverrides;
+        if (!agentOverrides || typeof agentOverrides !== "object" || Array.isArray(agentOverrides))
+            return { path: filePath, removed: false, machinePreserved: false };
+        const nextOverrides = { ...agentOverrides };
+        const current = nextOverrides[name];
+        if (!Object.prototype.hasOwnProperty.call(nextOverrides, name))
+            return { path: filePath, removed: false, machinePreserved: false };
+        const configuredMachine = current && typeof current === "object" && !Array.isArray(current) ? current.machine : undefined;
+        const machine = configuredMachine === false || (typeof configuredMachine === "string" && configuredMachine.trim()) ? configuredMachine : undefined;
+        if (options?.preserveMachine && machine !== undefined)
+            nextOverrides[name] = { machine };
+        else
+            delete nextOverrides[name];
+        if (Object.keys(nextOverrides).length > 0)
+            nextSubagents.agentOverrides = nextOverrides;
+        else
+            delete nextSubagents.agentOverrides;
+        if (Object.keys(nextSubagents).length > 0)
+            settings.subagents = nextSubagents;
+        else
+            delete settings.subagents;
+        writeSettingsFile(filePath, settings);
+        return { path: filePath, removed: true, machinePreserved: options?.preserveMachine === true && machine !== undefined };
+    });
 }
 export function mergeBuiltinAgentOverride(cwd, name, scope, fields) {
     const filePath = scope === "project" ? getProjectAgentSettingsPath(cwd) : getUserAgentSettingsPath();
     if (!filePath)
         throw new Error("Project override is not available here. No project config root was found.");
-    const settings = readSettingsFileStrict(filePath);
-    const subagents = settings.subagents && typeof settings.subagents === "object" && !Array.isArray(settings.subagents)
-        ? { ...settings.subagents }
-        : {};
-    const agentOverrides = subagents.agentOverrides && typeof subagents.agentOverrides === "object" && !Array.isArray(subagents.agentOverrides)
-        ? { ...subagents.agentOverrides }
-        : {};
-    const existing = agentOverrides[name];
-    const base = existing && typeof existing === "object" && !Array.isArray(existing)
-        ? existing
-        : {};
-    agentOverrides[name] = { ...base, ...cloneOverrideValue(fields) };
-    subagents.agentOverrides = agentOverrides;
-    settings.subagents = subagents;
-    writeSettingsFile(filePath, settings);
-    return filePath;
+    return withSettingsFileLease(filePath, () => {
+        const settings = readSettingsFileStrict(filePath);
+        const subagents = settings.subagents && typeof settings.subagents === "object" && !Array.isArray(settings.subagents)
+            ? { ...settings.subagents }
+            : {};
+        const agentOverrides = subagents.agentOverrides && typeof subagents.agentOverrides === "object" && !Array.isArray(subagents.agentOverrides)
+            ? { ...subagents.agentOverrides }
+            : {};
+        const existing = agentOverrides[name];
+        const base = existing && typeof existing === "object" && !Array.isArray(existing)
+            ? existing
+            : {};
+        agentOverrides[name] = { ...base, ...cloneOverrideValue(fields) };
+        subagents.agentOverrides = agentOverrides;
+        settings.subagents = subagents;
+        writeSettingsFile(filePath, settings);
+        return filePath;
+    });
 }
 export function removeBuiltinAgentOverrideFields(cwd, name, scope, fields) {
     const filePath = scope === "project" ? getProjectAgentSettingsPath(cwd) : getUserAgentSettingsPath();
@@ -1562,44 +1540,46 @@ export function removeBuiltinAgentOverrideFields(cwd, name, scope, fields) {
         throw new Error("Project override is not available here. No project config root was found.");
     if (!fs.existsSync(filePath))
         return { path: filePath, removed: false };
-    const settings = readSettingsFileStrict(filePath);
-    const subagents = settings.subagents;
-    if (!subagents || typeof subagents !== "object" || Array.isArray(subagents))
-        return { path: filePath, removed: false };
-    const agentOverrides = subagents.agentOverrides;
-    if (!agentOverrides || typeof agentOverrides !== "object" || Array.isArray(agentOverrides))
-        return { path: filePath, removed: false };
-    const entry = agentOverrides[name];
-    if (!entry || typeof entry !== "object" || Array.isArray(entry))
-        return { path: filePath, removed: false };
-    const nextEntry = { ...entry };
-    let removed = false;
-    for (const field of fields) {
-        if (Object.prototype.hasOwnProperty.call(nextEntry, field)) {
-            delete nextEntry[field];
-            removed = true;
+    return withSettingsFileLease(filePath, () => {
+        const settings = readSettingsFileStrict(filePath);
+        const subagents = settings.subagents;
+        if (!subagents || typeof subagents !== "object" || Array.isArray(subagents))
+            return { path: filePath, removed: false };
+        const agentOverrides = subagents.agentOverrides;
+        if (!agentOverrides || typeof agentOverrides !== "object" || Array.isArray(agentOverrides))
+            return { path: filePath, removed: false };
+        const entry = agentOverrides[name];
+        if (!entry || typeof entry !== "object" || Array.isArray(entry))
+            return { path: filePath, removed: false };
+        const nextEntry = { ...entry };
+        let removed = false;
+        for (const field of fields) {
+            if (Object.prototype.hasOwnProperty.call(nextEntry, field)) {
+                delete nextEntry[field];
+                removed = true;
+            }
         }
-    }
-    if (!removed)
-        return { path: filePath, removed: false };
-    const nextSubagents = { ...subagents };
-    if (Object.keys(nextEntry).length > 0) {
-        nextSubagents.agentOverrides[name] = nextEntry;
-    }
-    else {
-        const nextOverrides = { ...agentOverrides };
-        delete nextOverrides[name];
-        if (Object.keys(nextOverrides).length > 0)
-            nextSubagents.agentOverrides = nextOverrides;
+        if (!removed)
+            return { path: filePath, removed: false };
+        const nextSubagents = { ...subagents };
+        if (Object.keys(nextEntry).length > 0) {
+            nextSubagents.agentOverrides[name] = nextEntry;
+        }
+        else {
+            const nextOverrides = { ...agentOverrides };
+            delete nextOverrides[name];
+            if (Object.keys(nextOverrides).length > 0)
+                nextSubagents.agentOverrides = nextOverrides;
+            else
+                delete nextSubagents.agentOverrides;
+        }
+        if (Object.keys(nextSubagents).length > 0)
+            settings.subagents = nextSubagents;
         else
-            delete nextSubagents.agentOverrides;
-    }
-    if (Object.keys(nextSubagents).length > 0)
-        settings.subagents = nextSubagents;
-    else
-        delete settings.subagents;
-    writeSettingsFile(filePath, settings);
-    return { path: filePath, removed: true };
+            delete settings.subagents;
+        writeSettingsFile(filePath, settings);
+        return { path: filePath, removed: true };
+    });
 }
 const DISCOVERY_PRUNED_DIR_NAMES = new Set([".git", "node_modules", ".pi", "sync-backups"]);
 function isDiscoveryNestedProjectRoot(dir) {