zidane 5.6.5 → 5.6.7

package/dist/{turn-operations-b2ICQ1Y5.js → turn-operations-D-OQYUgS.js}

@@ -1,10 +1,10 @@
-import { H as previewLine, R as fmtTokens, U as shortId, a as multiEdit, c as grep, d as resolveOldString, f as styleReplacementForVia, i as readFile$1, l as glob, n as createSpawnTool, o as listFiles, t as writeFile$1, u as edit, y as shell } from "./tools-Bgx8OBqK.js";
+import { H as previewLine, R as fmtTokens, U as shortId, a as multiEdit, c as grep, d as resolveOldString, f as styleReplacementForVia, i as readFile$1, l as glob, n as createSpawnTool, o as listFiles, t as writeFile$1, u as edit, y as shell } from "./tools-FerA0zSl.js";
 import { c as errorMessage } from "./errors-DdZXnyXE.js";
 import { r as toolResultToText } from "./types-oKPBdCmL.js";
 import { r as normalizeMcpServers } from "./mcp-ngMS0S6N.js";
 import { a as discoverSkills } from "./interpolate-DM1UcKeQ.js";
 import { n as formatTokenUsage } from "./stats-Lc3zL3RM.js";
-import { n as definePreset, t as composePresets } from "./presets-ZT3TJDEb.js";
+import { n as definePreset, t as composePresets } from "./presets-BXmWG3kd.js";
 import { a as writeFileAtomic, i as anthropic, n as openai, r as cerebras, t as openrouter } from "./providers-CaJE2ToS.js";
 import { createRequire } from "node:module";
 import { dirname, isAbsolute, join, posix, relative, resolve, sep } from "node:path";
@@ -7957,15 +7957,44 @@ function projectUserPaths(opts) {
 //#endregion
 //#region src/chat/mcps-discovery.ts
 /**
-* Search order for `mcps.json` — see {@link projectUserPaths}. Project
-* beats user; the first file found for each (name) wins. Non-existent
-* files are skipped without error.
+* File names searched in each of the four project/user roots. Order
+* matters within a single directory — `mcps.json` (zidane's canonical
+* name) beats `mcp.json` (Cursor / common ecosystem alias) when both
+* exist side-by-side. Across files we merge per-name with first-found
+* winning, so co-existing `mcp.json` entries are folded in for names
+* not declared in the canonical file.
+*/
+const MCP_CONFIG_FILE_NAMES = ["mcps.json", "mcp.json"];
+/**
+* Search order for MCP config files — see {@link projectUserPaths}.
+*
+* Both `mcps.json` (zidane's canonical name) and `mcp.json` (Cursor /
+* common ecosystem alias) are picked up from every search root. The
+* canonical name wins within the same directory; across files the
+* usual first-found-by-name dedup applies, so `mcp.json` effectively
+* merges its non-overlapping entries on top of `mcps.json`.
+*
+* Order per scope (project beats user):
+*   1. `{project}/.agents/mcps.json`
+*   2. `{project}/.agents/mcp.json`
+*   3. `{project}/.{prefix}/mcps.json`
+*   4. `{project}/.{prefix}/mcp.json`
+*   5. `~/.agents/mcps.json`
+*   6. `~/.agents/mcp.json`
+*   7. `~/.{prefix}/mcps.json`
+*   8. `~/.{prefix}/mcp.json`
+*
+* Non-existent files are skipped without error.
 */
 function defaultMcpsConfigPaths(opts = {}) {
-	return projectUserPaths({
-		subPath: "mcps.json",
+	const perName = MCP_CONFIG_FILE_NAMES.map((name) => projectUserPaths({
+		subPath: name,
 		...opts
-	});
+	}));
+	const rootCount = perName[0].length;
+	const out = [];
+	for (let i = 0; i < rootCount; i++) for (const list of perName) out.push(list[i]);
+	return out;
 }
 /**
 * Parse one `mcps.json` file. Canonical zidane shape is a flat array; the
@@ -10161,4 +10190,4 @@ function countNeighbors(turnIds, turnId) {
 //#endregion
 export { patchMcpCredential as $, FILES_TRIGGER as $n, PLAN_AGENT as $r, createStateStore as $t, getSafelist as A, maskToOutcomeKinds as An, setProviderCredential as Ar, SETTINGS_TOGGLES as At, oauthUsesManualCodePaste as B, KEYBINDING_KEY_COL_WIDTH as Bn, modelSupportsReasoning as Br, CATPPUCCIN_LATTE as Bt, resolveSessionExportTarget as C, PLAN_MODE_DOCTRINE as Ci, extractEditPayload as Cn, shouldAutoCompact as Cr, buildHints as Ct, useSafeModeQueue as D, buildBuildSystem as Di, summarizeEditPayload as Dn, readCredentials as Dr, DEFAULT_SETTINGS as Dt, useSafeModeActions as E, TOKEN_DISCIPLINE_DOCTRINE as Ei, splitLines as En, credentialsPath as Er, useEnabledToggleSet as Et, suggestSafelistEntry as F, stripEditOutcomesAnnotation as Fn, cerebrasDescriptor as Fr, DEFAULT_THEME as Ft, indexOfEntry as G, matchesBinding as Gn, discoverAgentsMd as Gr, useDiscovery as Gt, supportsOAuth as H, formatBindingForDisplay as Hn, openaiDescriptor as Hr, CATPPUCCIN_MOCHA as Ht, writeProjects as I, summarizeOutcomes as In, credKeyOf as Ir, resolveChipColor as It, discoverProjectMcps as J, readKeybindings as Jn, BUILD_AGENT as Jr, useConfig as Jt, buildMcpServers as K, mergeKeybindings as Kn, renderAgentsMdBlock as Kr, useDiscoveryOptional as Kt, splitPromptSegments as L, DEFAULT_KEYBINDINGS as Ln, effectiveContextWindow as Lr, resolveTheme as Lt, matchesSafelistEntry as M, parseEditOutcomesFromResult as Mn, BUILTIN_PROVIDERS as Mr, clampFps as Mt, projectsFilePath as N, resolveApprovalForPayload as Nn, OUTPUT_RESERVE_TOKENS as Nr, useSettings as Nt, IMPLICITLY_SAFE_TOOLS as O, buildPlanSystem as Oi, tokenize as On, readProviderCredential as Or, SETTINGS_CATEGORIES as Ot, readProjects as P, rewriteMultiEditHeader as Pn, anthropicDescriptor as Pr, BUILTIN_THEMES as Pt, mcpCredentialsPath as Q, uniqueSkillNamesFromReferences as Qn, DEFAULT_PERSIST_EXCLUDE_TOOLS as Qr, EDIT_TOOL_NAMES as Qt, formatPathForCwd as R, KEYBINDING_DEFS as Rn, getContextWindow as Rr, VAPORWAVE_THEME as Rt, renderSession as S, INTERACTION_GUIDANCE_NO_PROMPTS as Si, computeLineDiff as Sn, AUTO_COMPACT_MIN_GROWTH_FRACTION as Sr, generateSessionTitle as St, SafeModeProvider as T, SUBAGENT_GUIDANCE as Ti, previewEditPayload as Tn, applyApiKeyEnv as Tr, listProjectFiles as Tt, buildModelCatalog as U, groupBindings as Un, openrouterDescriptor as Ur, createDiscoverySlot as Ut, runOAuthLogin as V, ensureKeybindingsFile as Vn, modelsForDescriptor as Vr, CATPPUCCIN_MACCHIATO as Vt, filterModelCatalog as W, keybindingsPath as Wn, piIdOf as Wr, DiscoveryProvider as Wt, projectUserPaths as X, SKILLS_TRIGGER as Xn, DEFAULT_AGENT_ID as Xr, resolveStoragePaths as Xt, parseMcpsFile as Y, stripJsonComments as Yn, BUILTIN_AGENTS as Yr, resolveConfig as Yt, createFileMcpCredentialStore as Z, createSkillsCompletionProvider as Zn, DEFAULT_BUDGET_EXCLUDE_TOOLS as Zr, resolveStorageDirs as Zt, turnContextSize as _, ACTIONS_WITH_CARE_DOCTRINE as _i, updateToolEventOutcomes as _n, detectPackageManager as _r, EMPTY_HINTS as _t, computeTurnAnchors as a, TODOWRITE_TOOL as ai, lastContextSizeFromTurns as an, mergeReferences as ar, splitMarkdownCodeBlocks as at, defaultSkillScanPaths as b, IDENTITY_PREFIX as bi, buildUnifiedDiff as bn, performSelfUpdate as br, truncateTrailing as bt, formatToolCall as c, createTodoTools as ci, marginTopFor as cn, buildLinearRamp as cr, PRESENT_PLAN_TOOL as ct, useSelectStyle as d, isTodoTool as di, stripSpawnTokensLine as dn, bootTick as dr, isInteractionTool as dt, accentColor as ei, deriveSessionTitle as en, createFilesCompletionProvider as er, McpAuthProvider as et, useSurfaces as f, pickActiveRunId as fi, sumRunCosts as fn, buildUpdateHint as fr, makeRequestInteraction as ft, finalizeStreamingMarkdownForOwner as g, useActiveTodos as gi, turnSelectionOwnership as gn, detectLibc as gr, useInteractionsQueue as gt, finalizeStreamingMarkdown as h, setTodosForRun as hi, toolResultText as hn, compareSemver as hr, useInteractionsActions as ht, turnAsText as i, TODOS_METADATA_KEY as ii, isVisible as in, findActiveTrigger as ir, reduceMcpAuth as it, isOnSafelist as j, mergeApprovalAndBodyOutcomes as jn, writeCredentials as jr, SettingsProvider as jt, addToSafelist as k, envSection as ki, buildEditOutcomesAnnotation as kn, removeProviderCredential as kr, SETTINGS_CHOICES as kt, ThemeProvider as l, getArchivedTodosForRun as li, saveState as ln, tryOpenBrowser as lr, buildResumedToolResultsTurn as lt, useTheme as m, selectActiveTodos as mi, toolCallPreview as mn, checkForUpdate as mr, serializeInteractionResponse as mt, deleteTurnSafely as n, singleAgentRegistry as ni, isEditErrorResult as nn, applyInsert as nr, useMcpAuthState as nt, TOOL_DISPLAY as o, TODO_STATUS_GLYPHS as oi, listSessionMeta as on, useCompletion as or, ASK_USER_TOOL as ot, useSyntaxStyles as p, pruneTodosByRun as pi, titleFromTurns as pn, useUpdateCheck as pr, pendingInteractionsFromTurns as pt, defaultMcpsConfigPaths as q, parseBindingSpec as qn, findGitRoot$1 as qr, ConfigProvider as qt, truncateTurnsAt as r, TODOREAD_TOOL as ri, isTurnHighlighted as rn, collectReferences as rr, getMcpAuthStatus as rt, displayNameFor as s, TODO_WRITE_COUNTS_METADATA_KEY as si, loadState as sn, blendHsl as sr, InteractionsProvider as st, countNeighbors as t, resolveAgentId as ti, eventsFromTurns as tn, uniqueFilesFromReferences as tr, useMcpAuthDispatch as tt, useColors as u, getTodosForRun as ui, selectableTurnIds as un, bootProfileEnabled as ur, createInteractionTools as ut, useStreamBuffer as v, COMMUNICATION_DOCTRINE as vi, applyEditPayload as vn, parseSemver as vr, clipHintsToWidth as vt, writeSessionExport as w, PLAN_MODE_DOCTRINE_NO_PROMPTS as wi, filetypeFromPath as wn, detectAuth as wr, shortChord as wt, discoverProjectSkills as x, INTERACTION_GUIDANCE as xi, computeInlineDiff as xn, resolvePlatformPackage as xr, cleanTitle as xt, buildSkillsConfig as y, DOING_TASKS_DOCTRINE as yi, buildContextualDiff as yn, performInPlaceSelfUpdate as yr, hintsLength as yt, fetchOAuthRedirect as z, KEYBINDING_DEF_BY_ACTION as zn, getModelInfo as zr, CATPPUCCIN_FRAPPE as zt };
 
-//# sourceMappingURL=turn-operations-b2ICQ1Y5.js.map
+//# sourceMappingURL=turn-operations-D-OQYUgS.js.map