zidane 6.2.7 → 6.2.11

package/dist/{transcript-anchors-DtOaKu4d.js → transcript-anchors-B_kUHJ16.js}

@@ -1,16 +1,16 @@
 import { l as toolResultToText } from "./types-BIarq1qE.js";
-import { Ct as readFile$1, Ft as resolveStorageDirs, Gt as mergeKeybindings, Jt as readKeybindingsRaw, Mt as glob, Nt as edit, R as EMPTY_EXTENSION_REGISTRY, Tt as multiEdit, Yt as resolveExtensionKeybindings, Z as buildExtensionPreset, ft as waitTask, jt as grep, kt as listFiles, mt as createSpawnTool, ot as composePresets, st as definePreset, ut as writeFile$1, xt as shell, yt as shellKill } from "./agent-DPO6GKX5.js";
-import { c as previewLine, i as fmtTokens, l as shortId } from "./format-BF745pLL.js";
+import { Ct as readFile$1, Ft as resolveStorageDirs, Gt as mergeKeybindings, Jt as readKeybindingsRaw, Mt as glob, Nt as edit, R as EMPTY_EXTENSION_REGISTRY, Tt as multiEdit, Yt as resolveExtensionKeybindings, Z as buildExtensionPreset, ft as waitTask, jt as grep, kt as listFiles, mt as createSpawnTool, ot as composePresets, st as definePreset, ut as writeFile$1, xt as shell, yt as shellKill } from "./agent-6iGNP46b.js";
+import { a as formatDuration, c as previewLine, i as fmtTokens, l as shortId } from "./format-BF745pLL.js";
 import { l as errorMessage } from "./errors-DJUxZg9b.js";
 import { M as findGitRoot$1, i as discoverSkills, j as projectUserPaths } from "./resolve-HtxmBWs9.js";
 import { t as writeFileAtomic } from "./atomic-write-B7zr1ddF.js";
 import { r as formatTokenUsage } from "./stats-DAKBEKjc.js";
 import { joinSystemPrompt } from "./prompt.js";
-import { a as normalizeMcpServers, n as connectMcpServers } from "./mcp-CkHUripi.js";
+import { a as normalizeMcpServers, n as connectMcpServers } from "./mcp-BCaN_Gyg.js";
 import { i as findActiveTriggers, n as collectReferences, o as mergeSuggestions, t as applyInsert } from "./completion-core-BRo86R_L.js";
 import { r as fetchUrl } from "./fetch-url-_5WKWpbQ.js";
 import { webSearch } from "./tools/web-search.js";
-import { C as restoreModelOptions, l as BUILTIN_PROVIDERS, n as applyApiKeyEnv, r as credentialsPath, t as detectAuth, v as modelSupportsReasoning, y as modelsForDescriptor } from "./auth-Cexpxjfa.js";
+import { C as restoreModelOptions, l as BUILTIN_PROVIDERS, n as applyApiKeyEnv, r as credentialsPath, t as detectAuth, v as modelSupportsReasoning, y as modelsForDescriptor } from "./auth-BH6G59RL.js";
 import { ct as chatReferenceTokensFromText, nt as parseEditOutcomesFromResult, p as ownerOf, q as extractEditPayload, u as capTranscriptEvents } from "./turn-operations-CXjRaltC.js";
 import { createRequire } from "node:module";
 import { dirname, isAbsolute, join, posix, relative, resolve, sep } from "node:path";
@@ -246,6 +246,26 @@ function eventsFromTurns(turns, runs = []) {
 		}
 		return chain;
 	};
+	const childRunsOf = /* @__PURE__ */ new Map();
+	for (const run of runById.values()) {
+		if (!run.parentRunId) continue;
+		const siblings = childRunsOf.get(run.parentRunId) ?? [];
+		siblings.push(run);
+		childRunsOf.set(run.parentRunId, siblings);
+	}
+	const subtreeCost = (root) => {
+		let total = 0;
+		const queue = [root];
+		const seen = /* @__PURE__ */ new Set();
+		while (queue.length > 0) {
+			const run = queue.pop();
+			if (seen.has(run.id)) continue;
+			seen.add(run.id);
+			total += run.cost ?? run.turnUsage?.reduce((sum, u) => sum + (u.cost ?? 0), 0) ?? 0;
+			queue.push(...childRunsOf.get(run.id) ?? []);
+		}
+		return total;
+	};
 	const events = [];
 	/** Currently-open child runs, root-of-tree first, innermost last. */
 	const openStack = [];
@@ -259,9 +279,12 @@ function eventsFromTurns(turns, runs = []) {
 			totalCacheRead: run.totalUsage?.cacheRead ?? 0,
 			totalCacheCreation: run.totalUsage?.cacheCreation ?? 0
 		});
+		const elapsed = run.endedAt !== void 0 ? ` · ${formatDuration(run.endedAt - run.startedAt)}` : "";
+		const cost = subtreeCost(run);
+		const segments = `${elapsed}${cost > 0 ? ` · $${cost.toFixed(cost < .01 ? 4 : 2)}` : ""}`;
 		events.push({
 			kind: "spawn-end",
-			text: `${tag} ${usage}`,
+			text: segments ? `${tag}${segments} · ${usage}` : `${tag} ${usage}`,
 			childId: labelFor(run.id),
 			depth: run.depth ?? 1
 		});
@@ -5036,6 +5059,7 @@ const DEFAULT_SETTINGS = {
 	showFullShellOutput: false,
 	safeMode: true,
 	loadProjectExtensions: false,
+	importForeignConfigs: false,
 	hideSubagentOutput: true,
 	subagentModels: true,
 	theme: DEFAULT_THEME.id,
@@ -5175,6 +5199,12 @@ const SETTINGS_TOGGLES = [
 		label: "Load project extensions",
 		description: "run extensions under <project>/.zidane/extensions — off by default (they execute arbitrary local code)"
 	},
+	{
+		category: "agent",
+		key: "importForeignConfigs",
+		label: "Import configurations from other agents",
+		description: "discover MCP servers + skills from Claude Code, Codex, and Pi configs (project + user) — imported stdio servers execute commands from files zidane does not own"
+	},
 	{
 		category: "agent",
 		key: "attachmentsEnabled",
@@ -7082,6 +7112,174 @@ function isCachedEntry(value) {
 	return true;
 }
 //#endregion
+//#region src/chat/foreign-configs.ts
+function roots(opts) {
+	const cwd = opts.cwd ?? process.cwd();
+	return {
+		projectRoot: findGitRoot$1(cwd) ?? cwd,
+		home: opts.home ?? homedir()
+	};
+}
+/**
+* MCP config files other agents maintain, project entries first.
+* Returned regardless of existence — callers `existsSync`-filter, same
+* contract as `defaultMcpsConfigPaths`.
+*/
+function foreignMcpConfigFiles(opts = {}) {
+	const { projectRoot, home } = roots(opts);
+	return [
+		{
+			path: resolve(projectRoot, ".mcp.json"),
+			source: "project",
+			format: "json"
+		},
+		{
+			path: resolve(home, ".claude.json"),
+			source: "project",
+			format: "claude-project-state"
+		},
+		{
+			path: resolve(projectRoot, ".pi/mcps.json"),
+			source: "project",
+			format: "json"
+		},
+		{
+			path: resolve(projectRoot, ".pi/mcp.json"),
+			source: "project",
+			format: "json"
+		},
+		{
+			path: resolve(home, ".claude.json"),
+			source: "user",
+			format: "claude-user-state"
+		},
+		{
+			path: resolve(home, ".codex/config.toml"),
+			source: "user",
+			format: "codex-toml"
+		},
+		{
+			path: resolve(home, ".pi/agent/mcps.json"),
+			source: "user",
+			format: "json"
+		},
+		{
+			path: resolve(home, ".pi/agent/mcp.json"),
+			source: "user",
+			format: "json"
+		}
+	];
+}
+/**
+* Skill directories other agents maintain, project entries first. Feed
+* directly into `discoverSkills` — the SKILL.md format is shared across
+* the ecosystem, so foreign skills parse with the same lenient loader.
+*/
+function foreignSkillScanPaths(opts = {}) {
+	const { projectRoot, home } = roots(opts);
+	return [
+		{
+			path: resolve(projectRoot, ".claude/skills"),
+			source: "project"
+		},
+		{
+			path: resolve(projectRoot, ".codex/skills"),
+			source: "project"
+		},
+		{
+			path: resolve(projectRoot, ".pi/skills"),
+			source: "project"
+		},
+		{
+			path: resolve(home, ".claude/skills"),
+			source: "user"
+		},
+		{
+			path: resolve(home, ".codex/skills"),
+			source: "user"
+		},
+		{
+			path: resolve(home, ".pi/agent/skills"),
+			source: "user"
+		}
+	];
+}
+/**
+* Parse the two foreign-only formats. The `json` format is NOT handled
+* here — callers route it through the shared `parseMcpsFile` (keeping
+* whitespace sanitizing + error hints in one place, and avoiding an
+* import cycle with `mcps-discovery`).
+*/
+function parseForeignMcpConfig(text, format, opts = {}) {
+	if (format === "codex-toml") return parseCodexToml(text);
+	if (format === "claude-project-state") return parseClaudeProjectState(text, opts.projectRoot);
+	return parseClaudeUserState(text);
+}
+/**
+* `~/.claude.json` → `projects["<abs project root>"].mcpServers` — the
+* per-project servers `claude mcp add` writes in its default "local"
+* scope. Exact-match on the resolved project root: Claude keys by the
+* directory it was launched from, which for repo work is the git root
+* we resolve to.
+*/
+function parseClaudeProjectState(text, projectRoot) {
+	if (!projectRoot) return [];
+	const raw = JSON.parse(text);
+	const projects = raw && typeof raw === "object" ? raw.projects : void 0;
+	if (!projects || typeof projects !== "object") return [];
+	return normalizeForeignEntries(projects[projectRoot]?.mcpServers);
+}
+/**
+* `~/.claude.json` — Claude Code's user-state file. Import ONLY the
+* `mcpServers` map; absent/malformed key means "nothing to import"
+* rather than an error, since the file legitimately exists without it.
+*/
+function parseClaudeUserState(text) {
+	const raw = JSON.parse(text);
+	return normalizeForeignEntries(raw && typeof raw === "object" ? raw.mcpServers : void 0);
+}
+/**
+* Normalize a name-keyed server map ENTRY BY ENTRY, skipping the ones
+* `normalizeMcpServers` rejects (no inferrable transport, exotic shapes).
+* Whole-file normalization would let one bad entry drop every server in
+* a file the user doesn't own — and can't fix from zidane.
+*/
+function normalizeForeignEntries(servers) {
+	if (!servers || typeof servers !== "object" || Array.isArray(servers)) return [];
+	const out = [];
+	for (const [name, entry] of Object.entries(servers)) try {
+		out.push(...normalizeMcpServers({ [name]: entry }));
+	} catch {}
+	return out;
+}
+/**
+* `~/.codex/config.toml` — `[mcp_servers.<name>]` tables. TOML parsing
+* rides Bun's built-in parser; on a non-Bun host the Codex import is
+* silently unavailable (returns `[]`) rather than pulling in a TOML
+* dependency for one optional file. Only the fields our config
+* understands are forwarded — Codex-specific extras
+* (`startup_timeout_ms`, …) are dropped before normalization.
+*/
+function parseCodexToml(text) {
+	const toml = globalThis.Bun?.TOML;
+	if (!toml) return [];
+	const parsed = toml.parse(text);
+	const tables = parsed && typeof parsed === "object" ? parsed.mcp_servers : void 0;
+	if (!tables || typeof tables !== "object" || Array.isArray(tables)) return [];
+	const map = {};
+	for (const [name, entry] of Object.entries(tables)) {
+		if (!entry || typeof entry !== "object") continue;
+		const raw = entry;
+		map[name] = {
+			...raw.command !== void 0 ? { command: raw.command } : {},
+			...raw.args !== void 0 ? { args: raw.args } : {},
+			...raw.env !== void 0 ? { env: raw.env } : {},
+			...raw.url !== void 0 ? { url: raw.url } : {}
+		};
+	}
+	return normalizeForeignEntries(map);
+}
+//#endregion
 //#region src/chat/mcps-discovery.ts
 /**
 * File names searched in each of the four project/user roots. Order
@@ -7259,14 +7457,16 @@ function isEntryDisabled(entry) {
 * log line is also emitted for ops visibility.
 */
 function discoverProjectMcps(opts = {}) {
-	const paths = defaultMcpsConfigPaths(opts).filter((p) => existsSync(p.path));
+	const paths = mcpsDiscoveryPaths(opts).filter((p) => existsSync(p.path));
+	const projectRoot = findGitRoot$1(opts.cwd ?? process.cwd()) ?? opts.cwd ?? process.cwd();
 	const seen = /* @__PURE__ */ new Set();
 	const servers = [];
 	const errors = [];
-	for (const { path, source } of paths) {
+	for (const { path, source, format } of paths) {
 		let configs;
 		try {
-			configs = parseMcpsFile(readFileSync(path, "utf8"));
+			const text = readFileSync(path, "utf8");
+			configs = format === "json" ? parseMcpsFile(text) : parseForeignMcpConfig(text, format, { projectRoot });
 		} catch (err) {
 			const message = errorMessage(err);
 			errors.push({
@@ -7293,6 +7493,19 @@ function discoverProjectMcps(opts = {}) {
 	};
 }
 /**
+* Full path list a discovery pass reads, formats attached — native
+* `mcp(s).json` locations first (they win name collisions), then the
+* foreign-agent files when enabled.
+*/
+function mcpsDiscoveryPaths(opts = {}) {
+	const native = defaultMcpsConfigPaths(opts).map((p) => ({
+		...p,
+		format: "json"
+	}));
+	if (!opts.foreignAgents) return native;
+	return [...native, ...foreignMcpConfigFiles(opts)];
+}
+/**
 * Map a user-toggled enable list onto the `mcpServers` array the agent
 * receives. Conventions match `buildSkillsConfig`:
 *
@@ -8340,10 +8553,12 @@ function aggregateUsage(runs) {
 * `discoverSkills` itself skips missing dirs without error.
 */
 function defaultSkillScanPaths(opts = {}) {
-	return projectUserPaths({
+	const native = projectUserPaths({
 		subPath: "skills",
 		...opts
 	});
+	if (!opts.foreignAgents) return native;
+	return [...native, ...foreignSkillScanPaths(opts)];
 }
 /**
 * Discover every skill reachable from the default scan paths. Returns
@@ -8823,4 +9038,4 @@ function computeTurnAnchors(items) {
 //#endregion
 export { useMcpAuthState as $, buildPlanSystem as $n, restoreChainFallbacks as $t, runOAuthLogin as A, TODOWRITE_TOOL as An, DEFAULT_THEME as At, saveMcpToolsCache as B, setTodosForRun as Bn, createDiscoverySlot as Bt, projectsFilePath as C, DEFAULT_PERSIST_EXCLUDE_TOOLS as Cn, SETTINGS_CHOICES as Ct, formatPathForCwd as D, singleAgentRegistry as Dn, clampFps as Dt, writeProjects as E, resolveAgentId as En, SettingsProvider as Et, parseMcpsFile as F, getTodosForRun as Fn, GRUVBOX_LIGHT as Ft, buildVisibleMcpRows as G, IDENTITY_PREFIX as Gn, useConfig as Gt, buildToolToggle as H, ACTIONS_WITH_CARE_DOCTRINE as Hn, useDiscovery as Ht, clearMcpToolsCache as I, isTodoTool as In, CATPPUCCIN_FRAPPE as It, createFileMcpCredentialStore as J, PLAN_MODE_DOCTRINE as Jn, buildRunModel as Jt, indexOfServerRow as K, INTERACTION_GUIDANCE as Kn, resolveConfig as Kt, loadMcpToolsCache as L, pickActiveRunId as Ln, CATPPUCCIN_LATTE as Lt, buildMcpServers as M, TODO_WRITE_COUNTS_METADATA_KEY as Mn, resolveTheme as Mt, defaultMcpsConfigPaths as N, createTodoTools as Nn, VAPORWAVE_THEME as Nt, fetchOAuthRedirect as O, TODOREAD_TOOL as On, useSettings as Ot, discoverProjectMcps as P, getArchivedTodosForRun as Pn, GRUVBOX_DARK as Pt, useMcpAuthDispatch as Q, buildBuildSystem as Qn, providerKeySetChanged as Qt, mcpToolsCachePath as R, pruneTodosByRun as Rn, CATPPUCCIN_MACCHIATO as Rt, matchesSafelistEntry as S, DEFAULT_BUDGET_EXCLUDE_TOOLS as Sn, SETTINGS_CATEGORIES as St, suggestSafelistEntries as T, accentColor as Tn, SETTINGS_TOGGLES as Tt, useMcpToolToggleMap as U, COMMUNICATION_DOCTRINE as Un, useDiscoveryOptional as Ut, subscribeMcpToolsCache as V, useActiveTodos as Vn, DiscoveryProvider as Vt, useMcpToolToggleSet as W, DOING_TASKS_DOCTRINE as Wn, ConfigProvider as Wt, patchMcpCredential as X, SUBAGENT_GUIDANCE as Xn, chainsEqual as Xt, mcpCredentialsPath as Y, PLAN_MODE_DOCTRINE_NO_PROMPTS as Yn, chainPositionOf as Yt, McpAuthProvider as Z, TOKEN_DISCIPLINE_DOCTRINE as Zn, filterChainFallbacks as Zt, useSafeModeQueue as _, discoverAgentsMd as _n, toolCallPreview as _r, buildHints as _t, useSurfaces as a, bootTick as an, createStateStore as ar, buildResumedToolResultsTurn as at, getSafelist as b, BUILTIN_AGENTS as bn, usageByModel as br, useEnabledToggleSet as bt, useStreamBuffer as c, checkForUpdate as cn, lastContextSizeFromTurns as cr, makeRequestInteraction as ct, discoverProjectSkills as d, detectPackageManager as dn, marginTopFor as dr, useInteractionsActions as dt, sanitizeModelChain as en, envSection as er, getMcpAuthStatus as et, renderSession as f, parseSemver as fn, saveState as fr, useInteractionsQueue as ft, useSafeModeActions as g, chatAutoCompactBehavior as gn, titleFromTurns as gr, truncateTrailing as gt, SafeModeProvider as h, resolvePlatformPackage as hn, sumRunCosts as hr, hintsLength as ht, useSelectStyle as i, bootProfileEnabled as in, compactSummaryEvent as ir, PRESENT_PLAN_TOOL as it, supportsOAuth as j, TODO_STATUS_GLYPHS as jn, resolveChipColor as jt, oauthUsesManualCodePaste as k, TODOS_METADATA_KEY as kn, BUILTIN_THEMES as kt, buildSkillsConfig as l, compareSemver as ln, listSessionMeta as lr, pendingInteractionsFromTurns as lt, writeSessionExport as m, performSelfUpdate as mn, stripSpawnTokensLine as mr, clipHintsToWidth as mt, ThemeProvider as n, useCompletion as nn, createChatTurnsReadTool as nr, ASK_USER_TOOL as nt, useSyntaxStyles as o, buildUpdateHint as on, deriveSessionTitle as or, createInteractionTools as ot, resolveSessionExportTarget as p, performInPlaceSelfUpdate as pn, serverToolResultSummary as pr, EMPTY_HINTS as pt, parentServerName as q, INTERACTION_GUIDANCE_NO_PROMPTS as qn, resolveStoragePaths as qt, useColors as r, tryOpenBrowser as rn, DEFAULT_SESSION_TITLE as rr, InteractionsProvider as rt, useTheme as s, useUpdateCheck as sn, eventsFromTurns as sr, isInteractionTool as st, computeTurnAnchors as t, toggleChainEntry as tn, chatReferenceTokensForPrompt as tr, reduceMcpAuth as tt, defaultSkillScanPaths as u, detectLibc as un, loadState as ur, serializeInteractionResponse as ut, IMPLICITLY_SAFE_TOOLS as v, renderAgentsMdBlock as vn, toolResultText as vr, shortChord as vt, readProjects as w, PLAN_AGENT as wn, SETTINGS_INPUTS as wt, isOnSafelist as x, DEFAULT_AGENT_ID as xn, DEFAULT_SETTINGS as xt, addToSafelist as y, BUILD_AGENT as yn, updateToolEventOutcomes as yr, listProjectFiles as yt, refreshMcpToolsCatalog as z, selectActiveTodos as zn, CATPPUCCIN_MOCHA as zt };
 
-//# sourceMappingURL=transcript-anchors-DtOaKu4d.js.map
+//# sourceMappingURL=transcript-anchors-B_kUHJ16.js.map