zidane 6.2.30 → 6.2.32

package/dist/tui.js

@@ -1,30 +1,30 @@
-import { $ as McpAuthProvider, $t as filterChainFallbacks, A as runOAuthLogin, At as useSettings, B as mcpToolsCachePath, Bn as pruneTodosByRun, Ct as DEFAULT_SETTINGS, D as formatPathForCwd, Dn as accentColor, Dt as SETTINGS_TOGGLES, Et as SETTINGS_INPUTS, F as parseJsonTolerant, G as useMcpToolToggleMap, Gt as useDiscoveryOptional, Ht as createDiscoverySlot, I as parseMcpsFile, J as indexOfServerRow, Jt as resolveConfig, Kt as ConfigProvider, L as parseClaudeState, M as buildMcpServers, N as defaultMcpsConfigPaths, Nn as TODO_STATUS_GLYPHS, Nt as resolveChipColor, O as fetchOAuthRedirect, Ot as SettingsProvider, P as discoverProjectMcps, Pt as resolveTheme, Qt as chainsEqual, Sr as usageByModel, St as useEnabledToggleSet, T as suggestSafelistEntries, Tt as SETTINGS_CHOICES, U as subscribeMcpToolsCache, Un as useActiveTodos, Ut as DiscoveryProvider, V as refreshMcpToolsCatalog, Wt as useDiscovery, X as createFileMcpCredentialStore, Xt as buildRunModel, Y as parentServerName, Yt as resolveStoragePaths, Zt as chainPositionOf, _ as useSafeModeQueue, _r as sumRunCosts, _t as hintsLength, a as useSurfaces, an as tryOpenBrowser, at as InteractionsProvider, b as getSafelist, br as toolResultText, c as useStreamBuffer, cn as buildUpdateHint, cr as deriveSessionTitle, ct as createInteractionTools, d as discoverProjectSkills, dr as listSessionMeta, dt as pendingInteractionsFromTurns, en as providerKeySetChanged, er as buildBuildSystem, et as useMcpAuthDispatch, fr as loadState, g as useSafeModeActions, gr as stripSpawnTokensLine, gt as clipHintsToWidth, h as SafeModeProvider, hr as serverToolResultSummary, ht as EMPTY_HINTS, i as useSelectStyle, in as useCompletion, ir as createChatTurnsReadTool, it as ASK_USER_TOOL, j as supportsOAuth, k as oauthUsesManualCodePaste, kt as clampFps, l as buildSkillsConfig, ln as useUpdateCheck, lr as eventsFromTurns, m as writeSessionExport, mt as useInteractionsQueue, n as ThemeProvider, nr as envSection, nt as getMcpAuthStatus, or as compactSummaryEvent, ot as PRESENT_PLAN_TOOL, pr as marginTopFor, pt as useInteractionsActions, q as buildVisibleMcpRows, qt as useConfig, r as useColors, rn as toggleChainEntry, rr as chatReferenceTokensForPrompt, s as useTheme, sn as bootTick, st as buildResumedToolResultsTurn, t as computeTurnAnchors, tn as restoreChainFallbacks, tr as buildPlanSystem, tt as useMcpAuthState, u as defaultSkillScanPaths, ur as lastContextSizeFromTurns, ut as makeRequestInteraction, vn as chatAutoCompactBehavior, vt as truncateTrailing, wt as SETTINGS_CATEGORIES, x as isOnSafelist, xr as updateToolEventOutcomes, xt as listProjectFiles, y as addToSafelist, yn as discoverAgentsMd, yr as toolCallPreview, yt as buildHints, z as loadMcpToolsCache } from "./transcript-anchors-0PpFmWrD.js";
-import { B as createExtensionPromptBridge, Bt as KEYBINDING_KEY_COL_WIDTH, Ct as tailTruncate, Dt as createModelSearchTool, F as summaryToTurn, Gt as matchesBinding, Ht as formatBindingForDisplay, J as updateInstalledExtension, S as compactConversation, Tt as looksBinary, U as installExtensionFromSpec, Ut as groupBindings, V as ExtensionInstallError, Vt as ensureKeybindingsFile, Wt as keybindingsPath, X as registerExtensionHostModules, Xt as resolveExtensionKeybindings, Y as createExtensionHud, Z as discoverAndBuildExtensionRegistry, _ as resolveTasksDir, at as createExtensionHostRuntimeBridge, b as selectFilesFromSession, c as applyCompactSummaryCutoff, dn as resolveExtensionConfigValue, et as composeExtensionPreset, f as cleanupPersistedSession, fn as sanitizeExtensionConfigActionPatch, g as resolvePersistDir, gn as effectiveContextWindow, gt as isSpawnTool, h as resolveMcpWarningsDir, hn as OUTPUT_RESERVE_TOKENS, in as scanExtensionDirectories, it as partitionExtensionCatalog, m as rehomePersistedStubs, nt as filterExtensionRegistry, q as removeInstalledExtension, rn as parseExtensionScanPathEnv, sn as coerceExtensionConfigInput, t as createAgent, tn as inlineLoadedExtension, tt as disposeExtensionRegistry, ut as basic_default, v as buildPostCompactAttachments } from "./agent-C--jBbuk.js";
+import { $ as InteractionsProvider, $t as countClaudeSessionFiles, A as runOAuthLogin, Bt as ConfigProvider, Cn as discoverAgentsMd, Cr as toolCallPreview, Ct as clampFps, D as formatPathForCwd, Dt as resolveChipColor, Er as usageByModel, F as refreshMcpToolsCatalog, Gt as chainPositionOf, H as indexOfServerRow, Ht as resolveConfig, It as createDiscoverySlot, J as useMcpAuthDispatch, Jt as providerKeySetChanged, Kt as chainsEqual, L as subscribeMcpToolsCache, Ln as TODO_STATUS_GLYPHS, Lt as DiscoveryProvider, N as loadMcpToolsCache, O as fetchOAuthRedirect, Ot as resolveTheme, P as mcpToolsCachePath, Q as ASK_USER_TOOL, Qt as useCompletion, Rt as useDiscovery, Sn as chatAutoCompactBehavior, St as SettingsProvider, T as suggestSafelistEntries, Tr as updateToolEventOutcomes, U as parentServerName, Ut as resolveStoragePaths, V as buildVisibleMcpRows, Vt as useConfig, W as createFileMcpCredentialStore, Wn as pruneTodosByRun, Wt as buildRunModel, X as getMcpAuthStatus, Y as useMcpAuthState, Yt as restoreChainFallbacks, Zt as toggleChainEntry, _ as useSafeModeQueue, _r as marginTopFor, _t as DEFAULT_SETTINGS, a as useSurfaces, an as buildMcpServers, ar as buildPlanSystem, at as pendingInteractionsFromTurns, b as getSafelist, br as stripSpawnTokensLine, bt as SETTINGS_INPUTS, c as useStreamBuffer, cr as createChatTurnsReadTool, ct as useInteractionsQueue, d as discoverProjectSkills, dn as bootTick, dt as hintsLength, en as hasClaudeCodeSetup, et as PRESENT_PLAN_TOOL, fn as buildUpdateHint, fr as deriveSessionTitle, ft as truncateTrailing, g as useSafeModeActions, gr as loadState, gt as useEnabledToggleSet, h as SafeModeProvider, hr as listSessionMeta, ht as listProjectFiles, i as useSelectStyle, in as upsertMcpServer, ir as buildBuildSystem, it as makeRequestInteraction, j as supportsOAuth, jn as accentColor, k as oauthUsesManualCodePaste, l as buildSkillsConfig, ln as tryOpenBrowser, lt as EMPTY_HINTS, m as writeSessionExport, mr as lastContextSizeFromTurns, n as ThemeProvider, nn as mcpsWritePath, nt as createInteractionTools, or as envSection, pn as useUpdateCheck, pr as eventsFromTurns, pt as buildHints, q as McpAuthProvider, qn as useActiveTodos, qt as filterChainFallbacks, r as useColors, rn as removeMcpServer, s as useTheme, sn as discoverProjectMcps, sr as chatReferenceTokensForPrompt, st as useInteractionsActions, t as computeTurnAnchors, tn as importFromClaudeCode, tt as buildResumedToolResultsTurn, u as defaultSkillScanPaths, ur as compactSummaryEvent, ut as clipHintsToWidth, vt as SETTINGS_CATEGORIES, wr as toolResultText, wt as useSettings, x as isOnSafelist, xr as sumRunCosts, xt as SETTINGS_TOGGLES, y as addToSafelist, yr as serverToolResultSummary, yt as SETTINGS_CHOICES, z as useMcpToolToggleMap, zt as useDiscoveryOptional } from "./transcript-anchors-vVG3xyD0.js";
+import { B as createExtensionPromptBridge, Bt as KEYBINDING_KEY_COL_WIDTH, Ct as tailTruncate, Dt as createModelSearchTool, F as summaryToTurn, Gt as matchesBinding, Ht as formatBindingForDisplay, J as updateInstalledExtension, S as compactConversation, Tt as looksBinary, U as installExtensionFromSpec, Ut as groupBindings, V as ExtensionInstallError, Vt as ensureKeybindingsFile, Wt as keybindingsPath, X as registerExtensionHostModules, Xt as resolveExtensionKeybindings, Y as createExtensionHud, Z as discoverAndBuildExtensionRegistry, _ as resolveTasksDir, at as createExtensionHostRuntimeBridge, b as selectFilesFromSession, c as applyCompactSummaryCutoff, dn as resolveExtensionConfigValue, et as composeExtensionPreset, f as cleanupPersistedSession, fn as sanitizeExtensionConfigActionPatch, g as resolvePersistDir, gn as effectiveContextWindow, gt as isSpawnTool, h as resolveMcpWarningsDir, hn as OUTPUT_RESERVE_TOKENS, in as scanExtensionDirectories, it as partitionExtensionCatalog, m as rehomePersistedStubs, nt as filterExtensionRegistry, q as removeInstalledExtension, rn as parseExtensionScanPathEnv, sn as coerceExtensionConfigInput, t as createAgent, tn as inlineLoadedExtension, tt as disposeExtensionRegistry, ut as basic_default, v as buildPostCompactAttachments } from "./agent-CHtfwiSc.js";
 import { a as formatDuration, c as previewLine, i as fmtTokens, l as shortId, n as compactPath, o as formatTaskStatus, r as fmtCost, s as formatTaskSummary, t as ageString } from "./format-BF745pLL.js";
 import { n as appendCapped } from "./output-cap-C9zukcCj.js";
 import { i as killProcessGroup, n as SUPPORTS_PROCESS_GROUPS, r as createProcessContext } from "./contexts-o8y5B3Tm.js";
 import { l as errorMessage } from "./errors-DJUxZg9b.js";
-import { M as findGitRoot, j as projectUserPaths } from "./resolve-BPTA1RpX.js";
+import { M as findGitRoot } from "./resolve-BPTA1RpX.js";
 import { a as createRingBufferSink, i as createLoggingHooks, l as logFileTimestamp, n as createFileSink, o as fanoutSink, r as createLogger, s as formatLogLine, t as consoleSink } from "./logger-DBX9uYOw.js";
 import { i as sniffImageMediaType } from "./media-sniff-Bn76JxAu.js";
 import { h as hasAuthorizationHeader, n as connectMcpServers, o as nonOwningMcpView, p as McpOAuthProvider } from "./mcp-Ct5tF4oj.js";
 import { replaceDynamicSection } from "./prompt.js";
-import { a as getExtensionSessionState, c as setExtensionSessionState, i as demoteStaleRunningStatus, o as loadSession, t as createSession } from "./session-DkVnYGm9.js";
+import { a as getExtensionSessionState, c as setExtensionSessionState, i as demoteStaleRunningStatus, o as loadSession, t as createSession } from "./session-DtRtNDBz.js";
 import { n as flattenTurns, r as formatTokenUsage, t as effectiveInputFromTurn } from "./stats-DAKBEKjc.js";
 import { o as withTimeout } from "./timeout-BDetbuN6.js";
 import { a as generateStructuredData, c as shouldAutoGenerateTitle, f as commandBlockToEvent, g as parseCommandInvocation, h as executeCommand, n as patchInlineGhost, p as commandBlocksToContent, r as resolveInlineSuggestion, s as generateSessionTitle, t as createPathAutocompleteProvider } from "./inline-autocomplete-CbcdZpfC.js";
 import { s as resolveCompletionSubmit } from "./completion-core-BRo86R_L.js";
 import { i as installSkillFromSpec, r as SkillInstallError } from "./skills-C7eIjWYm.js";
-import { i as ZIDANE_EXTENSION_SKILL_NAME, l as withZidaneExtensionSkill, o as extensionDirForCwd, r as EXTENSION_EDIT_METADATA_KEY, s as extensionScaffold, t as loginMcpServer } from "./login-CEOlp1r6.js";
-import { C as restoreModelOptions, S as piIdOf, _ as modelOptionsFor, m as getContextWindow, p as enabledModelOptions, s as setProviderCredential, t as detectAuth, v as modelSupportsReasoning, w as renderDefaultCallbackPage } from "./auth-C4YPRDN4.js";
+import { a as ZIDANE_EXTENSION_SKILL_NAME, d as extensionScaffold, f as readSkillEditMarker, h as withZidaneSkillEditSkill, i as SKILL_EDIT_METADATA_KEY, l as editSessionMetadata, m as withZidaneExtensionSkill, o as ZIDANE_SKILL_EDIT_SKILL_NAME, t as loginMcpServer, u as extensionDirForCwd } from "./login-CWwu9Sex.js";
+import { C as restoreModelOptions, S as piIdOf, _ as modelOptionsFor, m as getContextWindow, p as enabledModelOptions, s as setProviderCredential, t as detectAuth, v as modelSupportsReasoning, w as renderDefaultCallbackPage } from "./auth-up7hgE9H.js";
 import { createDockerContext } from "./contexts/docker.js";
 import { createTuiStore } from "./session/sqlite.js";
-import { $ as extractEditPayload, B as isVisible, C as chunkMarkdownForRender, E as stripHtmlCommentsOutsideCode, F as BASH_CALL_ID_PREFIX, G as streamEventSearchText, H as promptHistoryFromEvents, I as EDIT_TOOL_NAMES, J as buildContextualDiff, K as turnSelectionOwnership, L as isEditErrorResult, N as blendHsl, O as createSkillsCompletionProvider, P as buildLinearRamp, R as isTurnHighlighted, T as splitMarkdownCodeBlocks, U as selectableTurnIds, V as isVisibleDuringSearch, W as selectionAfterTurnRemoval, X as clipDiffForRender, Y as buildUnifiedDiff, _ as turnContextSize, a as TOOL_DISPLAY, at as buildEditOutcomesAnnotation, b as filterModelCatalog, ct as parseEditOutcomesFromResult, d as finalizeStreamingMarkdown, dt as stripEditOutcomesAnnotation, et as filetypeFromPath, f as finalizeStreamingMarkdownForOwner, ft as summarizeOutcomes, g as revealEarlierTranscriptEvents, h as replaceTranscriptTurnEvents, ht as createChatsCompletionProvider, i as turnAsText, j as createFilesCompletionProvider, k as uniqueSkillNamesFromReferences, lt as resolveApprovalForPayload, n as deleteTurnSafely, o as displayNameFor, p as hiddenEarlierTranscriptCount, r as truncateTurnsAt, rt as summarizeEditPayload, s as formatToolCall, st as mergeApprovalAndBodyOutcomes, tt as previewEditPayload, u as capTranscriptEvents, ut as rewriteMultiEditHeader, v as splitPromptSegments, w as normalizeMarkdownCodeFences, y as buildModelCatalog, z as isUserBashEvent } from "./turn-operations-4tnvKwfJ.js";
+import { B as isTurnHighlighted, C as chunkMarkdownForRender, E as stripHtmlCommentsOutsideCode, F as blendHsl, G as selectableTurnIds, H as isVisible, I as buildLinearRamp, J as turnSelectionOwnership, K as selectionAfterTurnRemoval, L as BASH_CALL_ID_PREFIX, O as createSkillsCompletionProvider, P as createCommandsCompletionProvider, Q as clipDiffForRender, R as EDIT_TOOL_NAMES, T as splitMarkdownCodeBlocks, U as isVisibleDuringSearch, V as isUserBashEvent, W as promptHistoryFromEvents, X as buildContextualDiff, Z as buildUnifiedDiff, _ as turnContextSize, _t as createChatsCompletionProvider, a as TOOL_DISPLAY, at as summarizeEditPayload, b as filterModelCatalog, d as finalizeStreamingMarkdown, dt as resolveApprovalForPayload, f as finalizeStreamingMarkdownForOwner, ft as rewriteMultiEditHeader, g as revealEarlierTranscriptEvents, h as replaceTranscriptTurnEvents, i as turnAsText, j as createFilesCompletionProvider, k as uniqueSkillNamesFromReferences, lt as mergeApprovalAndBodyOutcomes, mt as summarizeOutcomes, n as deleteTurnSafely, nt as filetypeFromPath, o as displayNameFor, p as hiddenEarlierTranscriptCount, pt as stripEditOutcomesAnnotation, q as streamEventSearchText, r as truncateTurnsAt, rt as previewEditPayload, s as formatToolCall, st as buildEditOutcomesAnnotation, tt as extractEditPayload, u as capTranscriptEvents, ut as parseEditOutcomesFromResult, v as splitPromptSegments, w as normalizeMarkdownCodeFences, y as buildModelCatalog, z as isEditErrorResult } from "./turn-operations-CtEpeB_s.js";
 import { a as searchHighlightRanges, c as searchSessionHistoryIndexAsync, i as highlightSegments, n as buildSessionSearchIndexAsync, r as filterSessionSearchCatalog, u as searchSessionIndexAsync } from "./history-search-C4bk1Wz_.js";
 import { basename, dirname, join, relative, resolve } from "node:path";
 import { Buffer } from "node:buffer";
 import * as fs from "node:fs";
-import { closeSync, cpSync, createWriteStream, existsSync, mkdirSync, mkdtempSync, openSync, readFileSync, readSync, readdirSync, realpathSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { createWriteStream, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, statSync, writeFileSync } from "node:fs";
 import { readFile, unlink } from "node:fs/promises";
 import { spawn, spawnSync } from "node:child_process";
 import { homedir, tmpdir } from "node:os";
@@ -41,780 +41,6 @@ import * as OpenTuiReactJsxDevRuntime from "@opentui/react/jsx-dev-runtime";
 import * as OpenTuiReactJsxRuntime from "@opentui/react/jsx-runtime";
 import { Fragment, jsx as jsx$1, jsxs } from "@opentui/react/jsx-runtime";
 import * as ReactJsxDevRuntime from "react/jsx-dev-runtime";
-//#region src/chat/mcps-write.ts
-/**
-* Resolve the CANONICAL write target for a scope — always the
-* `.{prefix}/mcps.json` flavor, never `.agents` (we don't own that
-* convention) and never `mcp.json` (Cursor's spelling is read-compat
-* only).
-*/
-function mcpsWritePath(scope, opts) {
-	const prefix = (opts?.prefix ?? ".zidane").replace(/^\./, "");
-	const target = projectUserPaths({
-		subPath: "mcps.json",
-		...opts?.cwd ? { cwd: opts.cwd } : {},
-		...opts?.home ? { home: opts.home } : {},
-		...opts?.prefix ? { prefix: opts.prefix } : {}
-	}).find((c) => c.source === scope && c.path.includes(`.${prefix}`));
-	if (!target) throw new Error(`No ${scope} mcps.json path resolved.`);
-	return target.path;
-}
-/**
-* Upsert `entry` (matched by `name`) into the mcps config at `filePath`.
-* Preserves the existing file's shape and every field the writer doesn't
-* own; creates a canonical flat-array file when none exists. Throws on
-* malformed JSON — silently rewriting a broken file the user is mid-edit
-* on would destroy their work.
-*/
-function upsertMcpServer(filePath, entry) {
-	if (!existsSync(filePath)) {
-		mkdirSync(dirname(filePath), { recursive: true });
-		writeFileSync(filePath, `${JSON.stringify([entry], null, 2)}\n`);
-		return {
-			path: filePath,
-			action: "added"
-		};
-	}
-	const raw = parseJsonTolerant(readFileSync(filePath, "utf8"));
-	if (Array.isArray(raw)) {
-		const idx = raw.findIndex((e) => isRecord(e) && e.name === entry.name);
-		const next = [...raw];
-		const action = idx >= 0 ? "updated" : "added";
-		if (idx >= 0) next[idx] = entry;
-		else next.push(entry);
-		writeFileSync(filePath, `${JSON.stringify(next, null, 2)}\n`);
-		return {
-			path: filePath,
-			action
-		};
-	}
-	if (isRecord(raw)) {
-		if (isRecord(raw.mcpServers)) {
-			const map = raw.mcpServers;
-			const action = entry.name in map ? "updated" : "added";
-			const next = {
-				...raw,
-				mcpServers: {
-					...map,
-					[entry.name]: stripName(entry)
-				}
-			};
-			writeFileSync(filePath, `${JSON.stringify(next, null, 2)}\n`);
-			return {
-				path: filePath,
-				action
-			};
-		}
-		const action = entry.name in raw ? "updated" : "added";
-		const next = {
-			...raw,
-			[entry.name]: stripName(entry)
-		};
-		writeFileSync(filePath, `${JSON.stringify(next, null, 2)}\n`);
-		return {
-			path: filePath,
-			action
-		};
-	}
-	throw new Error(`${filePath} is not a recognized mcps.json shape (array, map, or {"mcpServers": …}).`);
-}
-/**
-* Remove the entry named `name` from the mcps config at `filePath`,
-* preserving the file's shape and everything else in it — the removal
-* counterpart of {@link upsertMcpServer}. Throws when the file is
-* missing, malformed, an unrecognized shape, or has no entry of that
-* name (the caller shows the message on the settings op line; silently
-* "succeeding" on a no-op would lie about what happened).
-*/
-function removeMcpServer(filePath, name) {
-	if (!existsSync(filePath)) throw new Error(`${filePath} does not exist.`);
-	const raw = parseJsonTolerant(readFileSync(filePath, "utf8"));
-	if (Array.isArray(raw)) {
-		const next = raw.filter((e) => !(isRecord(e) && e.name === name));
-		if (next.length === raw.length) throw new Error(`no entry named "${name}" in ${filePath}.`);
-		writeFileSync(filePath, `${JSON.stringify(next, null, 2)}\n`);
-		return { path: filePath };
-	}
-	if (isRecord(raw)) {
-		if (isRecord(raw.mcpServers)) {
-			if (!(name in raw.mcpServers)) throw new Error(`no entry named "${name}" in ${filePath}.`);
-			const { [name]: _dropped, ...rest } = raw.mcpServers;
-			const next = {
-				...raw,
-				mcpServers: rest
-			};
-			writeFileSync(filePath, `${JSON.stringify(next, null, 2)}\n`);
-			return { path: filePath };
-		}
-		if (!(name in raw)) throw new Error(`no entry named "${name}" in ${filePath}.`);
-		const { [name]: _dropped, ...next } = raw;
-		writeFileSync(filePath, `${JSON.stringify(next, null, 2)}\n`);
-		return { path: filePath };
-	}
-	throw new Error(`${filePath} is not a recognized mcps.json shape (array, map, or {"mcpServers": …}).`);
-}
-/** Map-shaped files key entries by name — the inner object must not repeat it. */
-function stripName(entry) {
-	const { name: _name, ...rest } = entry;
-	return rest;
-}
-function isRecord(value) {
-	return typeof value === "object" && value !== null && !Array.isArray(value);
-}
-//#endregion
-//#region src/chat/claude-import.ts
-function roots(opts) {
-	const cwd = opts.cwd ?? process.cwd();
-	return {
-		projectRoot: findGitRoot(cwd) ?? cwd,
-		home: opts.home ?? homedir()
-	};
-}
-/** `~/.claude` — presence gates the settings action row. */
-function hasClaudeCodeSetup(opts = {}) {
-	return existsSync(resolve(roots(opts).home, ".claude"));
-}
-/**
-* Claude Code names each `~/.claude/projects/` subdirectory after the
-* project path with every non-alphanumeric character flattened to `-`
-* (`/Users/me/.claude/wt` → `-Users-me--claude-wt`). Lossy, so matching
-* goes slug → slug rather than trying to reverse it.
-*/
-function claudeProjectSlug(path) {
-	return path.replace(/[^a-z0-9]/gi, "-");
-}
-/**
-* Session transcripts for the current project, or every project when
-* `allProjects` is set.
-*
-* Claude Code slugs by LAUNCH directory, so a session started in a
-* monorepo subdir (`repo/packages/foo`) lands in a different dir than
-* one started at the repo root. Scoped listing therefore accepts both
-* the exact slug of the resolved git root (realpath variants included)
-* AND any dir whose slug extends it — but because slugs are lossy
-* (`repo/foo` and a sibling `repo-foo` collide), prefix-matched dirs
-* are confirmed per-file against the transcript's recorded `cwd`
-* (resolved to its git root), mirroring how the converted session's
-* `projectRoot` is derived.
-*/
-function listClaudeSessionFiles(opts = {}) {
-	const out = [];
-	walkClaudeSessionFiles(opts, opts.allProjects ? (file) => out.push(file) : (file, scoped) => {
-		if (scoped()) out.push(file);
-	});
-	return out;
-}
-/**
-* Detection-preview counts — scoped and all-projects figures from ONE
-* directory walk (the naive two-listing approach reads every project dir
-* twice). The scoped classification (with its per-file cwd peek for
-* candidate dirs) runs at most once per file via the lazy `scoped()`
-* thunk.
-*/
-function countClaudeSessionFiles(opts = {}) {
-	let project = 0;
-	let all = 0;
-	walkClaudeSessionFiles({
-		...opts,
-		allProjects: false
-	}, (_file, scoped) => {
-		all++;
-		if (scoped()) project++;
-	}, true);
-	return {
-		project,
-		all
-	};
-}
-/**
-* Shared walk under `~/.claude/projects`. `visit` receives every
-* transcript of every CANDIDATE dir (scoped mode) or every dir
-* (`allProjects` / `visitAllDirs`), plus a lazy `scoped()` thunk that
-* answers "does this file belong to the current project?" — lazy because
-* the answer can cost a `transcriptProjectRoot` peek (up to the whole
-* file), which pure all-projects listings never need.
-*/
-function walkClaudeSessionFiles(opts, visit, visitAllDirs = false) {
-	const { projectRoot, home } = roots(opts);
-	const projectsDir = resolve(home, ".claude/projects");
-	if (!existsSync(projectsDir)) return;
-	const slugs = [claudeProjectSlug(projectRoot), claudeProjectSlug(realpathOr(projectRoot))];
-	const exact = new Set(slugs);
-	const prefixes = [...new Set(slugs.map((s) => `${s}-`))];
-	const wantedRoots = /* @__PURE__ */ new Set([projectRoot, realpathOr(projectRoot)]);
-	for (const entry of readdirSync(projectsDir, { withFileTypes: true })) {
-		if (!entry.isDirectory()) continue;
-		const exactMatch = exact.has(entry.name);
-		const candidate = exactMatch || prefixes.some((p) => entry.name.startsWith(p));
-		if (!opts.allProjects && !visitAllDirs && !candidate) continue;
-		const projectDir = join(projectsDir, entry.name);
-		for (const file of readdirSync(projectDir)) {
-			if (!file.endsWith(".jsonl")) continue;
-			const path = join(projectDir, file);
-			const scoped = () => {
-				if (!candidate) return false;
-				const root = transcriptProjectRoot(path);
-				return root === null ? exactMatch : wantedRoots.has(root) || wantedRoots.has(realpathOr(root));
-			};
-			visit({
-				path,
-				projectDir
-			}, scoped);
-		}
-	}
-}
-/**
-* Peek a transcript's project root: scan the first chunk for the first
-* record carrying a `cwd` and resolve it the same way
-* `convertClaudeSession` does. When the chunk was truncated (giant first
-* records — e.g. pasted base64 images) and held no cwd, fall back to the
-* full file: the import reads it in full anyway, so correctness beats the
-* shortcut. Null when no cwd exists at all (empty/torn file) or the file
-* is unreadable.
-*/
-function transcriptProjectRoot(path) {
-	let text;
-	let truncated = false;
-	try {
-		const fd = openSync(path, "r");
-		try {
-			const buf = Buffer.alloc(256 * 1024);
-			const n = readSync(fd, buf, 0, buf.length, 0);
-			text = buf.subarray(0, n).toString("utf8");
-			truncated = n === buf.length;
-		} finally {
-			closeSync(fd);
-		}
-	} catch {
-		return null;
-	}
-	const fromChunk = scanForCwd(text);
-	if (fromChunk !== null || !truncated) return fromChunk;
-	try {
-		return scanForCwd(readFileSync(path, "utf8"));
-	} catch {
-		return null;
-	}
-}
-function scanForCwd(text) {
-	for (const line of text.split("\n")) {
-		if (!line.trim()) continue;
-		try {
-			const record = JSON.parse(line);
-			if (typeof record.cwd === "string") return findGitRoot(record.cwd) ?? record.cwd;
-		} catch {
-			continue;
-		}
-	}
-	return null;
-}
-function realpathOr(path) {
-	try {
-		return realpathSync(path);
-	} catch {
-		return path;
-	}
-}
-/**
-* Convert one Claude Code session transcript (JSONL text) to a zidane
-* `SessionData`. Returns null when no conversational turns survive the
-* filter (hook noise, sidechains, queue bookkeeping).
-*
-* Kept-vs-dropped:
-*   - `user` / `assistant` records with a `message` → turns. Consecutive
-*     assistant records sharing a `message.id` merge into ONE turn (Claude
-*     writes text and tool_use as separate records of the same API message).
-*   - Consecutive tool_result-only user records merge into ONE user turn:
-*     Claude writes one record per result of a parallel tool batch, but
-*     zidane persists a batch as a single user turn and
-*     `ensureToolResultPairing` enforces strict adjacency — split turns
-*     would be "repaired" into orphan markers + error placeholders on resume.
-*   - `custom-title` / `summary` records → `metadata.title`.
-*   - Sidechains (subagent transcripts), `isMeta` records, `attachment`,
-*     `system`, `queue-operation`, `last-prompt` → dropped.
-*   - Thinking blocks → dropped (provider-bound signatures, not replayable).
-*/
-function convertClaudeSession(jsonl, opts = {}) {
-	const turns = [];
-	let title;
-	let claudeSessionId;
-	let cwd;
-	let lastAssistantMessageId;
-	for (const line of jsonl.split("\n")) {
-		if (!line.trim()) continue;
-		let record;
-		try {
-			record = JSON.parse(line);
-		} catch {
-			continue;
-		}
-		if (record.type === "custom-title" && typeof record.customTitle === "string") {
-			title = record.customTitle;
-			continue;
-		}
-		if (record.type === "summary" && typeof record.summary === "string") {
-			title ??= record.summary;
-			continue;
-		}
-		if (record.type !== "user" && record.type !== "assistant") continue;
-		if (record.isSidechain || record.isMeta || !record.message) continue;
-		claudeSessionId ??= record.sessionId;
-		cwd ??= record.cwd;
-		const parsedTs = record.timestamp ? Date.parse(record.timestamp) : NaN;
-		const createdAt = Number.isNaN(parsedTs) ? Date.now() : parsedTs;
-		if (record.type === "assistant") {
-			const content = claudeBlocksToContent(record.message.content);
-			if (content.length === 0) continue;
-			const messageId = record.message.id;
-			const previous = turns[turns.length - 1];
-			if (messageId && messageId === lastAssistantMessageId && previous?.role === "assistant") {
-				previous.content.push(...content);
-				const usage = claudeUsage(record.message.usage, record.message.model);
-				if (usage) previous.usage = usage;
-				continue;
-			}
-			lastAssistantMessageId = messageId;
-			const usage = claudeUsage(record.message.usage, record.message.model);
-			turns.push({
-				id: record.uuid ?? crypto.randomUUID(),
-				role: "assistant",
-				content,
-				createdAt,
-				...usage ? { usage } : {}
-			});
-			continue;
-		}
-		lastAssistantMessageId = void 0;
-		const content = claudeBlocksToContent(record.message.content);
-		if (content.length === 0) continue;
-		const previous = turns[turns.length - 1];
-		if (previous?.role === "user" && isToolResultOnly(content) && isToolResultOnly(previous.content)) {
-			previous.content.push(...content);
-			continue;
-		}
-		turns.push({
-			id: record.uuid ?? crypto.randomUUID(),
-			role: "user",
-			content,
-			createdAt
-		});
-	}
-	if (turns.length === 0) return null;
-	const id = opts.fallbackId ?? claudeSessionId ?? crypto.randomUUID();
-	const projectRoot = cwd ? findGitRoot(cwd) ?? cwd : void 0;
-	return {
-		session: {
-			id,
-			...projectRoot ? { projectRoot } : {},
-			turns,
-			runs: [],
-			status: "idle",
-			metadata: {
-				...title ? { title } : {},
-				importedFrom: "claude-code",
-				claudeSessionId: id,
-				...claudeSessionId && claudeSessionId !== id ? { claudeLineageId: claudeSessionId } : {}
-			},
-			createdAt: turns[0].createdAt,
-			updatedAt: turns[turns.length - 1].createdAt
-		},
-		claudeSessionId: id
-	};
-}
-/** Map Claude/Anthropic content blocks to zidane `SessionContentBlock`s. */
-function claudeBlocksToContent(content) {
-	if (typeof content === "string") return content.trim() ? [{
-		type: "text",
-		text: content
-	}] : [];
-	if (!Array.isArray(content)) return [];
-	const out = [];
-	for (const raw of content) {
-		if (!raw || typeof raw !== "object") continue;
-		const block = raw;
-		switch (block.type) {
-			case "text":
-				if (typeof block.text === "string" && block.text.trim()) out.push({
-					type: "text",
-					text: block.text
-				});
-				break;
-			case "tool_use":
-				if (typeof block.id === "string" && typeof block.name === "string") {
-					const input = block.input && typeof block.input === "object" && !Array.isArray(block.input) ? block.input : {};
-					out.push({
-						type: "tool_call",
-						id: block.id,
-						name: block.name,
-						input
-					});
-				}
-				break;
-			case "tool_result":
-				if (typeof block.tool_use_id === "string") out.push({
-					type: "tool_result",
-					callId: block.tool_use_id,
-					output: claudeToolResultOutput(block.content),
-					...block.is_error === true ? { isError: true } : {}
-				});
-				break;
-			case "image": {
-				const image = claudeImage(block);
-				if (image) out.push(image);
-				break;
-			}
-		}
-	}
-	return out;
-}
-function claudeImage(block) {
-	const source = block.source;
-	if (!source || source.type !== "base64" || typeof source.media_type !== "string" || typeof source.data !== "string") return null;
-	return {
-		type: "image",
-		mediaType: source.media_type,
-		data: source.data
-	};
-}
-function claudeToolResultOutput(content) {
-	if (typeof content === "string") return content;
-	if (!Array.isArray(content)) return "";
-	const parts = [];
-	for (const raw of content) {
-		if (!raw || typeof raw !== "object") continue;
-		const block = raw;
-		if (block.type === "text" && typeof block.text === "string") parts.push({
-			type: "text",
-			text: block.text
-		});
-		else if (block.type === "image") {
-			const image = claudeImage(block);
-			if (image?.type === "image" && image.data) parts.push({
-				type: "image",
-				mediaType: image.mediaType,
-				data: image.data
-			});
-		}
-	}
-	if (parts.every((p) => p.type === "text")) return parts.map((p) => p.text).join("\n");
-	return parts;
-}
-function claudeUsage(usage, model) {
-	if (!usage || typeof usage !== "object") return void 0;
-	return {
-		input: usage.input_tokens ?? 0,
-		output: usage.output_tokens ?? 0,
-		...usage.cache_creation_input_tokens ? { cacheCreation: usage.cache_creation_input_tokens } : {},
-		...usage.cache_read_input_tokens ? { cacheRead: usage.cache_read_input_tokens } : {},
-		...model ? { modelId: model } : {}
-	};
-}
-function isToolResultOnly(blocks) {
-	return blocks.length > 0 && blocks.every((b) => b.type === "tool_result");
-}
-/** Import Claude Code session transcripts into `store`. */
-async function importClaudeSessions(store, opts = {}) {
-	const result = {
-		imported: 0,
-		skipped: 0,
-		empty: 0,
-		failed: []
-	};
-	for (const file of listClaudeSessionFiles(opts)) try {
-		const fallbackId = basename(file.path, ".jsonl");
-		if (await store.load(fallbackId)) {
-			result.skipped++;
-			continue;
-		}
-		const converted = convertClaudeSession(readFileSync(file.path, "utf8"), { fallbackId });
-		if (!converted) {
-			result.empty++;
-			continue;
-		}
-		await store.save(converted.session);
-		result.imported++;
-	} catch (err) {
-		result.failed.push({
-			path: file.path,
-			error: err instanceof Error ? err.message : String(err)
-		});
-	}
-	return result;
-}
-/**
-* Copy Claude Code's MCP servers into zidane-owned `mcps.json` files.
-* The repo-shared `.mcp.json` writes to `<root>/.{prefix}/mcps.json`;
-* BOTH `~/.claude.json` scopes write to `~/.{prefix}/mcps.json` —
-* Claude's "local" scope (the per-project map inside the user state
-* file) is private-by-design and routinely carries tokens in
-* `env`/`headers`, so materializing it into a committable project file
-* would leak credentials. User scope loses the per-project activation
-* (zidane has no user-private per-project config), which is the safer
-* direction to err. Collisions with names in ANY native config path are
-* skipped.
-*/
-function importClaudeMcps(opts = {}) {
-	const { projectRoot, home } = roots(opts);
-	const result = {
-		copied: [],
-		skipped: [],
-		failed: [],
-		duplicates: []
-	};
-	const nativeNames = /* @__PURE__ */ new Set();
-	for (const candidate of defaultMcpsConfigPaths({
-		...opts.cwd ? { cwd: opts.cwd } : {},
-		home,
-		...opts.prefix ? { prefix: opts.prefix } : {}
-	})) {
-		if (!existsSync(candidate.path)) continue;
-		for (const name of rawMcpNames(readFileSync(candidate.path, "utf8"))) nativeNames.add(name);
-	}
-	const sources = [];
-	const mcpJson = resolve(projectRoot, ".mcp.json");
-	if (existsSync(mcpJson)) try {
-		sources.push({
-			servers: parseMcpsFile(readFileSync(mcpJson, "utf8")),
-			scope: "project"
-		});
-	} catch (err) {
-		result.failed.push({
-			name: mcpJson,
-			error: err instanceof Error ? err.message : String(err)
-		});
-	}
-	const claudeState = resolve(home, ".claude.json");
-	if (existsSync(claudeState)) try {
-		const state = JSON.parse(readFileSync(claudeState, "utf8"));
-		sources.push({
-			servers: parseClaudeState(state, "claude-project-state", projectRoot),
-			scope: "user"
-		});
-		sources.push({
-			servers: parseClaudeState(state, "claude-user-state"),
-			scope: "user"
-		});
-	} catch (err) {
-		result.failed.push({
-			name: claudeState,
-			error: err instanceof Error ? err.message : String(err)
-		});
-	}
-	const seen = /* @__PURE__ */ new Set();
-	for (const { servers, scope } of sources) for (const server of servers) {
-		if (seen.has(server.name)) {
-			result.duplicates.push(server.name);
-			continue;
-		}
-		seen.add(server.name);
-		if (nativeNames.has(server.name)) {
-			result.skipped.push(server.name);
-			continue;
-		}
-		try {
-			const target = mcpsWritePath(scope, {
-				...opts.cwd ? { cwd: opts.cwd } : {},
-				home,
-				...opts.prefix ? { prefix: opts.prefix } : {}
-			});
-			const { action } = upsertMcpServer(target, server);
-			if (action === "updated") {
-				result.failed.push({
-					name: server.name,
-					error: `overwrote an existing entry in ${target} — restore it from version control if unintended`
-				});
-				continue;
-			}
-			result.copied.push(server.name);
-		} catch (err) {
-			result.failed.push({
-				name: server.name,
-				error: err instanceof Error ? err.message : String(err)
-			});
-		}
-	}
-	return result;
-}
-/**
-* Names physically present in an mcps config file, from the raw parsed
-* shape — mirrors `upsertMcpServer`'s walk (flat array `name`s, wrapper
-* `mcpServers` keys, bare-map keys) with none of discovery's filtering.
-* Unreadable/malformed files yield no names; `upsertMcpServer` throws on
-* those before writing, so they still can't be overwritten.
-*/
-function rawMcpNames(text) {
-	let raw;
-	try {
-		raw = parseJsonTolerant(text);
-	} catch {
-		return [];
-	}
-	if (Array.isArray(raw)) return raw.flatMap((entry) => entry && typeof entry === "object" && typeof entry.name === "string" ? [entry.name] : []);
-	if (raw && typeof raw === "object") {
-		const record = raw;
-		const map = record.mcpServers && typeof record.mcpServers === "object" && !Array.isArray(record.mcpServers) ? record.mcpServers : record;
-		return Object.keys(map);
-	}
-	return [];
-}
-/**
-* Copy `.claude/skills/<name>` directories (project + user) into the
-* corresponding `.{prefix}/skills`. A skill "exists natively" when a
-* directory of the same name sits in any native scan path — those are
-* skipped, not overwritten.
-*/
-function importClaudeSkills(opts = {}) {
-	const { projectRoot, home } = roots(opts);
-	const prefix = (opts.prefix ?? ".zidane").replace(/^\./, "");
-	const result = {
-		copied: [],
-		skipped: [],
-		failed: []
-	};
-	const nativeNames = /* @__PURE__ */ new Set();
-	for (const scan of projectUserPaths({
-		subPath: "skills",
-		...opts.cwd ? { cwd: opts.cwd } : {},
-		home,
-		...opts.prefix ? { prefix: opts.prefix } : {}
-	})) {
-		if (!existsSync(scan.path)) continue;
-		for (const entry of readdirSync(scan.path, { withFileTypes: true })) if (entry.isDirectory()) nativeNames.add(entry.name);
-	}
-	const pairs = [{
-		from: resolve(projectRoot, ".claude/skills"),
-		to: resolve(projectRoot, `.${prefix}/skills`)
-	}, {
-		from: resolve(home, ".claude/skills"),
-		to: resolve(home, `.${prefix}/skills`)
-	}];
-	for (const { from, to } of pairs) {
-		if (!existsSync(from)) continue;
-		for (const entry of readdirSync(from, { withFileTypes: true })) {
-			if (!entry.isDirectory()) continue;
-			if (!existsSync(join(from, entry.name, "SKILL.md"))) continue;
-			if (nativeNames.has(entry.name)) {
-				result.skipped.push(entry.name);
-				continue;
-			}
-			try {
-				cpSync(join(from, entry.name), join(to, entry.name), {
-					recursive: true,
-					errorOnExist: true,
-					force: false
-				});
-				nativeNames.add(entry.name);
-				result.copied.push(entry.name);
-			} catch (err) {
-				result.failed.push({
-					name: entry.name,
-					error: err instanceof Error ? err.message : String(err)
-				});
-			}
-		}
-	}
-	return result;
-}
-async function importFromClaudeCode(store, opts = {}) {
-	const summary = { notes: ["CLAUDE.md is already read natively — nothing to import.", "Claude permissions/hooks/plugins have no zidane equivalent — not imported."] };
-	if (opts.sessions !== false) summary.sessions = await importClaudeSessions(store, opts);
-	if (opts.mcps !== false) summary.mcps = importClaudeMcps(opts);
-	if (opts.skills !== false) summary.skills = importClaudeSkills(opts);
-	return summary;
-}
-/**
-* Per-catalog fzf instance, keyed on catalog reference identity —
-* `suggest()` runs per keystroke and `new Fzf(...)` walks the whole
-* command list to build its match structures. The getter returns a
-* stable array until a registry rebuild swaps it.
-*/
-const fzfByCatalog = /* @__PURE__ */ new WeakMap();
-function fzfFor(catalog) {
-	let fzf = fzfByCatalog.get(catalog);
-	if (!fzf) {
-		fzf = new Fzf(catalog, {
-			selector: (c) => c.name,
-			casing: "case-insensitive"
-		});
-		fzfByCatalog.set(catalog, fzf);
-	}
-	return fzf;
-}
-/** Filter + rank commands against a query (name-priority, then description, then fuzzy on name). */
-function scoreCommands(catalog, query) {
-	const q = query.trim().toLowerCase();
-	const fuzzyHits = q.length > 0 ? new Set(fzfFor(catalog).find(q).map((r) => r.item)) : null;
-	const scored = [];
-	for (const command of catalog) {
-		const name = command.name.toLowerCase();
-		const aliases = (command.aliases ?? []).map((a) => a.toLowerCase());
-		const group = command.group?.toLowerCase();
-		const desc = command.description.toLowerCase();
-		if (q.length === 0) scored.push({
-			command,
-			rank: 4
-		});
-		else if (name.startsWith(q) || aliases.some((a) => a.startsWith(q))) scored.push({
-			command,
-			rank: 0
-		});
-		else if (name.includes(q) || aliases.some((a) => a.includes(q)) || group !== void 0 && q.length >= 2 && group.startsWith(q)) scored.push({
-			command,
-			rank: 1
-		});
-		else if (desc.includes(q)) scored.push({
-			command,
-			rank: 2
-		});
-		else if (fuzzyHits?.has(command)) scored.push({
-			command,
-			rank: 3
-		});
-	}
-	scored.sort((a, b) => a.rank !== b.rank ? a.rank - b.rank : a.command.name.localeCompare(b.command.name));
-	return scored.map(({ command }) => ({
-		id: command.name,
-		label: command.name,
-		description: command.aliases?.length ? `${command.description} (alias: ${command.aliases.map((a) => `/${a}`).join(", ")})` : command.description,
-		insertText: `/${command.name} `,
-		data: command
-	}));
-}
-/**
-* Build a commands completion provider against a *live* command list. The
-* getter is re-evaluated per `suggest` so registry toggles / cwd rebuilds
-* take effect without re-instantiating the provider.
-*/
-function createCommandsCompletionProvider(opts) {
-	return {
-		id: "commands",
-		trigger: "/",
-		label: "Commands",
-		allowSpacesInQuery: true,
-		suggest(query, ctx) {
-			const spaceIdx = query.search(/\s/);
-			if (spaceIdx !== -1) {
-				if (ctx.text.trimStart()[0] !== "/") return [];
-				const typed = query.slice(0, spaceIdx).toLowerCase();
-				const command = opts.getCommands().find((c) => c.name.toLowerCase() === typed || c.aliases?.some((a) => a.toLowerCase() === typed));
-				if (!command?.completeArgs) return [];
-				const argsPrefix = query.slice(spaceIdx + 1).replace(/^\s+/, "");
-				return Promise.resolve(command.completeArgs(argsPrefix)).then((suggestions) => (suggestions ?? []).map((s) => ({
-					id: `${command.name}:${s.value}`,
-					label: s.label ?? s.value,
-					...s.description !== void 0 ? { description: s.description } : {},
-					insertText: `/${command.name} ${s.value} `,
-					data: command
-				})));
-			}
-			return scoreCommands(opts.getCommands(), query);
-		},
-		parseReferences() {
-			return [];
-		}
-	};
-}
-//#endregion
 //#region src/mcp/warn-log.ts
 /**
 * Subscribe to `mcp:warn`
@@ -3108,6 +2334,69 @@ function sameElements(a, b) {
 	if (!a || !b || a.length !== b.length) return false;
 	return a.every((value, i) => value === b[i]);
 }
+/**
+* Single collapsible row for ALL parent-owned tool calls of one exchange
+* (`Settings.groupToolCalls`). Collapsed, it shows the summary line
+* (`↳ ▸ 12 tool calls · 3 files edited · 2 commands`) with an `[expand]`
+* affordance; expanded, the individual tool rows render exactly as the
+* ungrouped transcript would, under a `[collapse]` header. Clicking the
+* header toggles — same mouse affordance as the fenced-code `[copy]`
+* button (keyboard users still reach the calls via the turn-details
+* modal, which never groups).
+*
+* Memoized with {@link SubagentBlock}'s element-wise comparator —
+* `partitionTranscript` rebuilds the `events` array per drain tick, but
+* the inner event references stay stable until their content changes.
+*/
+const ToolGroupBlock = memo(({ groupKey, events, previous, expanded, onToggle, selectedTurnId = null, ownership, anchorIds }) => {
+	const COLOR = useColors();
+	const SURFACE = useSurfaces();
+	const [hovered, setHovered] = useState(false);
+	const summary = summarizeToolGroup(events);
+	const gap = marginTopFor(events[0], previous);
+	const isRowSelected = (evt) => selectedTurnId !== null && ownership !== void 0 && isTurnHighlighted(evt, selectedTurnId, ownership);
+	const highlighted = events.some((evt) => isRowSelected(evt));
+	const firstAnchorId = anchorIds?.find((id) => id !== void 0);
+	return /* @__PURE__ */ jsxs("box", {
+		id: expanded ? void 0 : firstAnchorId,
+		style: {
+			paddingTop: gap,
+			backgroundColor: !expanded && highlighted ? SURFACE.selection : SURFACE.background,
+			alignSelf: "stretch",
+			flexShrink: 0,
+			flexDirection: "column"
+		},
+		children: [/* @__PURE__ */ jsxs("text", {
+			selectable: false,
+			onMouseDown: (event) => {
+				event.stopPropagation();
+				event.preventDefault();
+				onToggle(groupKey);
+			},
+			onMouseOver: () => setHovered(true),
+			onMouseOut: () => setHovered(false),
+			children: [
+				/* @__PURE__ */ jsx$1("span", {
+					fg: COLOR.mute,
+					children: expanded ? "↳ ▾ " : "↳ ▸ "
+				}),
+				/* @__PURE__ */ jsx$1("span", {
+					fg: hovered ? COLOR.accent : COLOR.mute,
+					children: summary
+				}),
+				/* @__PURE__ */ jsx$1("span", {
+					fg: hovered ? COLOR.accent : COLOR.mute,
+					children: expanded ? "  [collapse]" : "  [expand]"
+				})
+			]
+		}), expanded && events.map((evt, i) => /* @__PURE__ */ jsx$1(EventLine, {
+			event: evt,
+			previous: i === 0 ? events[0] : events[i - 1],
+			selected: isRowSelected(evt),
+			anchorId: anchorIds?.[i]
+		}, i))]
+	});
+}, (prev, next) => sameElements(prev.events, next.events) && sameElements(prev.anchorIds, next.anchorIds) && prev.groupKey === next.groupKey && prev.previous === next.previous && prev.expanded === next.expanded && prev.onToggle === next.onToggle && prev.selectedTurnId === next.selectedTurnId && prev.ownership === next.ownership);
 const NO_SEARCH_MATCHES = {
 	direct: /* @__PURE__ */ new Set(),
 	callIds: /* @__PURE__ */ new Set(),
@@ -3169,6 +2458,15 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false, sea
 		searchQuery,
 		searchMatches
 	]);
+	const [expandedGroups, setExpandedGroups] = useState(() => /* @__PURE__ */ new Set());
+	const toggleGroup = useCallback((key) => {
+		setExpandedGroups((prev) => {
+			const next = new Set(prev);
+			if (next.has(key)) next.delete(key);
+			else next.add(key);
+			return next;
+		});
+	}, []);
 	const scrollboxRef = useRef(null);
 	const mouseSelectionRef = useRef(false);
 	const pressedTurnRef = useRef(null);
@@ -3242,7 +2540,7 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false, sea
 		for (let i = items.length - 1; i >= 0 && open.size > 0; i--) {
 			const item = items[i];
 			const here = [];
-			for (const [id, child] of open) if (item.kind === "child-run" ? item.events.some((e) => e.childId === id) : item.event.kind === "spawn-start" && item.event.childId === id) {
+			for (const [id, child] of open) if (item.kind === "child-run" ? item.events.some((e) => e.childId === id) : item.kind === "event" && item.event.kind === "spawn-start" && item.event.childId === id) {
 				here.push({
 					id,
 					activity: spawnActivity(child.events),
@@ -3359,6 +2657,16 @@ function Transcript({ events, settings, selectedTurnId = null, busy = false, sea
 						children: line
 					}, i);
 				}
+				if (item.kind === "tool-group") return /* @__PURE__ */ jsx$1(ToolGroupBlock, {
+					groupKey: item.key,
+					events: item.events,
+					previous: item.previous,
+					expanded: expandedGroups.has(item.key),
+					onToggle: toggleGroup,
+					selectedTurnId,
+					ownership,
+					anchorIds: anchors.ids[i]
+				}, i);
 				return /* @__PURE__ */ jsx$1(SubagentBlock, {
 					events: item.events,
 					previous: item.previous,
@@ -3464,14 +2772,85 @@ function collapseCompletedSpawnStarts(events) {
 	}
 	return events.filter((_, i) => keep[i]);
 }
+/** Row kinds that end an exchange-wide tool group (`Settings.groupToolCalls`). */
+const TOOL_GROUP_BOUNDARIES = /* @__PURE__ */ new Set([
+	"user-prompt",
+	"separator",
+	"compact-summary"
+]);
+/**
+* Is this a parent-owned tool row eligible for exchange-wide grouping?
+* Subagent-owned rows (childId / depth) stay inside their subagent
+* cluster, and user-initiated `!` bash rows stay standalone — the user
+* ran the command to SEE it; folding it into a group would hide it.
+*/
+function isGroupableToolRow(event) {
+	if ((event.depth ?? 0) > 0 || event.childId) return false;
+	if (event.kind !== "tool" && event.kind !== "tool-result") return false;
+	return !isUserBashEvent(event);
+}
+/**
+* Per-event group keys for `Settings.groupToolCalls`: walk `visible` once,
+* split it into exchanges at {@link TOOL_GROUP_BOUNDARIES} rows, and — for
+* every exchange with ≥2 tool CALLS (single calls pass through, mirroring
+* the GUI's adjacency batching) — tag each groupable tool/tool-result row
+* with a shared key. The key derives from the first grouped event so it is
+* stable while a live stream appends more calls to the same exchange
+* (expand state keys off it).
+*/
+function computeToolGroupKeys(visible) {
+	const keys = Array.from({ length: visible.length }).fill(null);
+	let exchange = [];
+	let ordinal = 0;
+	const flush = () => {
+		if (exchange.reduce((sum, i) => sum + (visible[i].kind === "tool" ? 1 : 0), 0) >= 2) {
+			const first = visible[exchange[0]];
+			const key = `tool-group-${first.callId ?? first.turnId ?? ordinal}`;
+			for (const i of exchange) keys[i] = key;
+		}
+		exchange = [];
+		ordinal += 1;
+	};
+	for (let i = 0; i < visible.length; i++) {
+		const event = visible[i];
+		if (TOOL_GROUP_BOUNDARIES.has(event.kind)) {
+			flush();
+			continue;
+		}
+		if (isGroupableToolRow(event)) exchange.push(i);
+	}
+	flush();
+	return keys;
+}
+/**
+* Collapsed-group summary line — `12 tool calls · 3 files edited ·
+* 2 commands`. Files count distinct edit-tool paths; commands count
+* `shell` calls. Sections with a zero count are dropped (the leading
+* call count always shows).
+*/
+function summarizeToolGroup(events) {
+	let calls = 0;
+	let commands = 0;
+	const edited = /* @__PURE__ */ new Set();
+	for (const event of events) {
+		if (event.kind !== "tool") continue;
+		calls += 1;
+		if (event.tool === "shell") commands += 1;
+		if (event.tool && EDIT_TOOL_NAMES.has(event.tool)) {
+			const path = typeof event.input?.path === "string" ? event.input.path : event.edit?.path;
+			edited.add(path ?? `call-${calls}`);
+		}
+	}
+	const parts = [`${calls} tool call${calls === 1 ? "" : "s"}`];
+	if (edited.size > 0) parts.push(`${edited.size} file${edited.size === 1 ? "" : "s"} edited`);
+	if (commands > 0) parts.push(`${commands} command${commands === 1 ? "" : "s"}`);
+	return parts.join(" · ");
+}
 function partitionTranscript(events, settings, searchReveal) {
 	const visible = collapseCompletedSpawnStarts(events).filter((event) => isVisible(event, settings) || searchReveal !== void 0 && (event.depth ?? 0) === 0 && searchReveal(event));
 	if (visible.length === 0) return [];
-	if (settings.hideSubagentOutput) return visible.map((event, i) => ({
-		kind: "event",
-		event,
-		previous: visible[i - 1]
-	}));
+	const groupKeys = settings.groupToolCalls && searchReveal === void 0 ? computeToolGroupKeys(visible) : null;
+	const groups = /* @__PURE__ */ new Map();
 	const items = [];
 	let run = [];
 	let runPrevious;
@@ -3488,7 +2867,24 @@ function partitionTranscript(events, settings, searchReveal) {
 	};
 	for (let i = 0; i < visible.length; i++) {
 		const event = visible[i];
-		if (isChild(event)) {
+		const groupKey = groupKeys?.[i] ?? null;
+		if (groupKey !== null) {
+			flush();
+			const group = groups.get(groupKey);
+			if (group) group.events.push(event);
+			else {
+				const created = {
+					kind: "tool-group",
+					key: groupKey,
+					events: [event],
+					previous: visible[i - 1]
+				};
+				groups.set(groupKey, created);
+				items.push(created);
+			}
+			continue;
+		}
+		if (!settings.hideSubagentOutput && isChild(event)) {
 			if (run.length === 0) runPrevious = visible[i - 1];
 			run.push(event);
 		} else {
@@ -15456,6 +14852,17 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			setSkillInstallOpen(true);
 			return;
 		}
+		if (key.ctrl && key.name === "e" && activeTab === "skills" && actions?.onEditSkill) {
+			key.preventDefault();
+			const skill = focusedSkill;
+			if (!skill || skillOp?.kind === "busy") return;
+			if (skill.baseDir) actions.onEditSkill(skill);
+			else setSkillOp({
+				kind: "notice",
+				text: `"${skill.name}" is ${skill.source ?? "inline"} — no directory to edit.`
+			});
+			return;
+		}
 		if (key.ctrl && key.name === "x" && activeTab === "skills" && actions?.onRemoveSkill) {
 			key.preventDefault();
 			const skill = focusedSkill;
@@ -15794,6 +15201,7 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 					canRemoveExtension: !!actions?.onRemoveExtension,
 					canInstallExtension: !!actions?.onInstallExtension,
 					canInstallSkill: !!actions?.onInstallSkill,
+					canEditSkill: !!actions?.onEditSkill,
 					canAddMcp: !!actions?.onAddMcp,
 					canRemoveSkill: !!actions?.onRemoveSkill,
 					canRemoveMcp: !!actions?.onRemoveMcp,
@@ -17223,7 +16631,7 @@ function renderMcpErrors(errors, home, warnColor, dimColor) {
 		}, err.path))
 	});
 }
-function Hints({ activeTab, authorizing = false, focusedMcp, focusedMcpRow, focusedMcpStatus, canRefreshSkills, canRefreshMcps, canEditExtension, canCreateExtension, canUpdateExtension, canRemoveExtension, canInstallExtension, canInstallSkill, canAddMcp, canRemoveSkill, canRemoveMcp, focusedExtensionExpandable }) {
+function Hints({ activeTab, authorizing = false, focusedMcp, focusedMcpRow, focusedMcpStatus, canRefreshSkills, canRefreshMcps, canEditExtension, canCreateExtension, canUpdateExtension, canRemoveExtension, canInstallExtension, canInstallSkill, canEditSkill, canAddMcp, canRemoveSkill, canRemoveMcp, focusedExtensionExpandable }) {
 	const COLOR = useColors();
 	const onServerRow = focusedMcpRow?.kind === "server";
 	const showLogin = activeTab === "mcps" && onServerRow && !!focusedMcp && !!focusedMcpStatus && canLogin$1(focusedMcp, focusedMcpStatus);
@@ -17277,6 +16685,10 @@ function Hints({ activeTab, authorizing = false, focusedMcp, focusedMcpRow, focu
 			key: "ctrl+g",
 			label: "install"
 		}] : [],
+		...activeTab === "skills" && canEditSkill ? [{
+			key: "ctrl+e",
+			label: "edit"
+		}] : [],
 		...activeTab === "skills" && canInstallSkill ? [{
 			key: "ctrl+g",
 			label: "install"
@@ -19634,7 +19046,9 @@ function AppShell() {
 			...skillsConfig,
 			...composedPreset.skills ?? {}
 		};
-		const skills = !!session.metadata["zidane.extensionEdit"] || extensionDirForCwd(actualCwd) !== null ? withZidaneExtensionSkill(mergedSkills, { cwd: actualCwd }) : mergedSkills;
+		const withExtensionSkill = !!session.metadata["zidane.extensionEdit"] || extensionDirForCwd(actualCwd) !== null ? withZidaneExtensionSkill(mergedSkills, { cwd: actualCwd }) : mergedSkills;
+		const skillEditMarker = readSkillEditMarker(session.metadata[SKILL_EDIT_METADATA_KEY]);
+		const skills = skillEditMarker ? withZidaneSkillEditSkill(withExtensionSkill, skillEditMarker, { cwd: actualCwd }) : withExtensionSkill;
 		const mergedMcpServers = dedupMcpServers([
 			...projectMcps,
 			...launch?.mcp ?? [],
@@ -20735,32 +20149,53 @@ function AppShell() {
 		await refreshSessions();
 		setScreen("sessions");
 	}, [refreshSessions]);
-	const pendingExtSessionRef = useRef(null);
-	const [extEditNonce, setExtEditNonce] = useState(0);
-	const onEditExtension = useCallback((dir) => {
+	const pendingEditSessionRef = useRef(null);
+	const [editSessionNonce, setEditSessionNonce] = useState(0);
+	const openEditSession = useCallback((dir, metadata) => {
 		modal.close();
-		pendingExtSessionRef.current = { dir };
-		setExtEditNonce((n) => n + 1);
+		pendingEditSessionRef.current = {
+			dir,
+			metadata
+		};
+		setEditSessionNonce((n) => n + 1);
 		try {
 			setCwd(dir);
 		} catch (err) {
-			pendingExtSessionRef.current = null;
-			debugLog("edit extension: chdir failed", err);
+			pendingEditSessionRef.current = null;
+			debugLog("edit session: chdir failed", err);
 		}
 	}, [modal, setCwd]);
+	const onEditExtension = useCallback((dir) => {
+		openEditSession(dir, {
+			...editSessionMetadata({
+				kind: "extension",
+				name: basename(dir),
+				dir
+			}),
+			[ACTIVE_SKILLS_META_KEY]: [ZIDANE_EXTENSION_SKILL_NAME]
+		});
+	}, [openEditSession]);
+	const onEditSkill = useCallback((skill) => {
+		if (!skill.baseDir) return;
+		openEditSession(skill.baseDir, {
+			...editSessionMetadata({
+				kind: "skill",
+				name: skill.name,
+				dir: skill.baseDir
+			}),
+			[ACTIVE_SKILLS_META_KEY]: [ZIDANE_SKILL_EDIT_SKILL_NAME]
+		});
+	}, [openEditSession]);
 	useEffect(() => {
-		const pending = pendingExtSessionRef.current;
+		const pending = pendingEditSessionRef.current;
 		if (!pending || cwd !== pending.dir || !picked || busy) return;
-		pendingExtSessionRef.current = null;
-		activateSession(null, picked.provider.key, { metadata: {
-			[EXTENSION_EDIT_METADATA_KEY]: { dir: pending.dir },
-			[ACTIVE_SKILLS_META_KEY]: [ZIDANE_EXTENSION_SKILL_NAME]
-		} }).catch((err) => debugLog("edit extension: activate session failed", err));
+		pendingEditSessionRef.current = null;
+		activateSession(null, picked.provider.key, { metadata: pending.metadata }).catch((err) => debugLog("edit session: activate session failed", err));
 	}, [
 		cwd,
 		picked,
 		busy,
-		extEditNonce,
+		editSessionNonce,
 		activateSession
 	]);
 	const onCreateExtension = useCallback(() => {
@@ -23020,6 +22455,7 @@ function AppShell() {
 					onRefreshMcps,
 					onRefreshMcpTools,
 					onEditExtension,
+					onEditSkill,
 					onCreateExtension,
 					onUpdateExtension,
 					onRemoveExtension,