zidane 6.2.20 → 6.2.22

package/dist/tui.js

@@ -1,10 +1,10 @@
-import { $ as useMcpAuthDispatch, $n as buildBuildSystem, $t as providerKeySetChanged, A as runOAuthLogin, B as refreshMcpToolsCatalog, Ct as SETTINGS_CATEGORIES, D as formatPathForCwd, Dt as SettingsProvider, En as accentColor, Et as SETTINGS_TOGGLES, F as parseJsonTolerant, Gt as ConfigProvider, H as subscribeMcpToolsCache, Hn as useActiveTodos, Ht as DiscoveryProvider, J as parentServerName, Jt as resolveStoragePaths, K as buildVisibleMcpRows, Kt as useConfig, M as buildMcpServers, Mn as TODO_STATUS_GLYPHS, Mt as resolveChipColor, Nt as resolveTheme, O as fetchOAuthRedirect, Ot as clampFps, P as discoverProjectMcps, Q as McpAuthProvider, Qt as filterChainFallbacks, R as loadMcpToolsCache, St as DEFAULT_SETTINGS, T as suggestSafelistEntries, Tt as SETTINGS_INPUTS, Ut as useDiscovery, Vt as createDiscoverySlot, W as useMcpToolToggleMap, Wt as useDiscoveryOptional, Xt as chainPositionOf, Y as createFileMcpCredentialStore, Yt as buildRunModel, Zt as chainsEqual, _ as useSafeModeQueue, _n as chatAutoCompactBehavior, _t as truncateTrailing, a as useSurfaces, ar as compactSummaryEvent, at as PRESENT_PLAN_TOOL, b as getSafelist, br as updateToolEventOutcomes, bt as listProjectFiles, c as useStreamBuffer, cn as useUpdateCheck, cr as eventsFromTurns, d as discoverProjectSkills, dr as loadState, en as restoreChainFallbacks, er as buildPlanSystem, et as useMcpAuthState, fr as marginTopFor, ft as useInteractionsActions, g as useSafeModeActions, gr as sumRunCosts, gt as hintsLength, h as SafeModeProvider, hr as stripSpawnTokensLine, ht as clipHintsToWidth, i as useSelectStyle, in as tryOpenBrowser, it as InteractionsProvider, j as supportsOAuth, k as oauthUsesManualCodePaste, kt as useSettings, l as buildSkillsConfig, lr as lastContextSizeFromTurns, lt as makeRequestInteraction, m as writeSessionExport, mr as serverToolResultSummary, mt as EMPTY_HINTS, n as ThemeProvider, nn as toggleChainEntry, nr as chatReferenceTokensForPrompt, on as bootTick, ot as buildResumedToolResultsTurn, pt as useInteractionsQueue, q as indexOfServerRow, qt as resolveConfig, r as useColors, rn as useCompletion, rr as createChatTurnsReadTool, rt as ASK_USER_TOOL, s as useTheme, sn as buildUpdateHint, sr as deriveSessionTitle, st as createInteractionTools, t as computeTurnAnchors, tr as envSection, tt as getMcpAuthStatus, u as defaultSkillScanPaths, ur as listSessionMeta, ut as pendingInteractionsFromTurns, vn as discoverAgentsMd, vr as toolCallPreview, vt as buildHints, wt as SETTINGS_CHOICES, x as isOnSafelist, xr as usageByModel, xt as useEnabledToggleSet, y as addToSafelist, yr as toolResultText, z as mcpToolsCachePath } from "./transcript-anchors-Bm3bYmOD.js";
-import { $ as composeExtensionPreset, B as ExtensionInstallError, Bt as ensureKeybindingsFile, Et as createModelSearchTool, H as installExtensionFromSpec, Ht as groupBindings, J as createExtensionHud, K as removeInstalledExtension, P as summaryToTurn, St as tailTruncate, Ut as keybindingsPath, Vt as formatBindingForDisplay, Wt as matchesBinding, X as discoverAndBuildExtensionRegistry, Y as registerExtensionHostModules, Yt as resolveExtensionKeybindings, _ as buildPostCompactAttachments, c as applyCompactSummaryCutoff, dn as sanitizeExtensionConfigActionPatch, en as inlineLoadedExtension, et as disposeExtensionRegistry, f as cleanupPersistedSession, g as resolveTasksDir, h as resolvePersistDir, hn as effectiveContextWindow, ht as isSpawnTool, it as createExtensionHostRuntimeBridge, lt as basic_default, m as resolveMcpWarningsDir, mn as OUTPUT_RESERVE_TOKENS, nn as parseExtensionScanPathEnv, on as coerceExtensionConfigInput, q as updateInstalledExtension, rn as scanExtensionDirectories, rt as partitionExtensionCatalog, t as createAgent, tt as filterExtensionRegistry, un as resolveExtensionConfigValue, wt as looksBinary, x as compactConversation, y as selectFilesFromSession, z as createExtensionPromptBridge, zt as KEYBINDING_KEY_COL_WIDTH } from "./agent-CBK6ZUXs.js";
+import { $ as McpAuthProvider, $t as filterChainFallbacks, A as runOAuthLogin, At as useSettings, B as mcpToolsCachePath, 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-DvLIRYLz.js";
+import { $ as composeExtensionPreset, B as ExtensionInstallError, Bt as ensureKeybindingsFile, Et as createModelSearchTool, H as installExtensionFromSpec, Ht as groupBindings, J as createExtensionHud, K as removeInstalledExtension, P as summaryToTurn, St as tailTruncate, Ut as keybindingsPath, Vt as formatBindingForDisplay, Wt as matchesBinding, X as discoverAndBuildExtensionRegistry, Y as registerExtensionHostModules, Yt as resolveExtensionKeybindings, _ as buildPostCompactAttachments, c as applyCompactSummaryCutoff, dn as sanitizeExtensionConfigActionPatch, en as inlineLoadedExtension, et as disposeExtensionRegistry, f as cleanupPersistedSession, g as resolveTasksDir, h as resolvePersistDir, hn as effectiveContextWindow, ht as isSpawnTool, it as createExtensionHostRuntimeBridge, lt as basic_default, m as resolveMcpWarningsDir, mn as OUTPUT_RESERVE_TOKENS, nn as parseExtensionScanPathEnv, on as coerceExtensionConfigInput, q as updateInstalledExtension, rn as scanExtensionDirectories, rt as partitionExtensionCatalog, t as createAgent, tt as filterExtensionRegistry, un as resolveExtensionConfigValue, wt as looksBinary, x as compactConversation, y as selectFilesFromSession, z as createExtensionPromptBridge, zt as KEYBINDING_KEY_COL_WIDTH } from "./agent-IPshmLIF.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-kBUHBlnq.js";
 import { i as killProcessGroup, n as SUPPORTS_PROCESS_GROUPS, r as createProcessContext } from "./contexts-A4ep-iJs.js";
 import { l as errorMessage } from "./errors-DJUxZg9b.js";
-import { M as findGitRoot, j as projectUserPaths } from "./resolve-HtxmBWs9.js";
+import { M as findGitRoot, j as projectUserPaths } from "./resolve-x5mlFtLX.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 { d as McpOAuthProvider, i as nonOwningMcpView, n as connectMcpServers, p as hasAuthorizationHeader } from "./mcp-H6bqyM94.js";
@@ -14,8 +14,8 @@ import { a as getExtensionSessionState, i as demoteStaleRunningStatus, o as load
 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-BAwBcZtD.js";
 import { s as resolveCompletionSubmit } from "./completion-core-BRo86R_L.js";
-import { i as installSkillFromSpec, r as SkillInstallError } from "./skills-DKWqoaYH.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-DreurRAq.js";
+import { i as installSkillFromSpec, r as SkillInstallError } from "./skills-C1vGKbqv.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-BkZ_d5sT.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 } from "./auth-CpdQebUy.js";
 import { createDockerContext } from "./contexts/docker.js";
 import { createTuiStore } from "./session/sqlite.js";
@@ -24,7 +24,7 @@ import { a as searchHighlightRanges, c as searchSessionHistoryIndexAsync, i as h
 import { basename, dirname, join, relative, resolve } from "node:path";
 import { Buffer } from "node:buffer";
 import * as fs from "node:fs";
-import { createWriteStream, existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, statSync, writeFileSync } from "node:fs";
+import { closeSync, cpSync, createWriteStream, existsSync, mkdirSync, mkdtempSync, openSync, readFileSync, readSync, readdirSync, realpathSync, 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,84 +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";
-/** 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(new Fzf([...catalog], {
-		selector: (c) => c.name,
-		casing: "case-insensitive"
-	}).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/chat/mcps-write.ts
 /**
 * Resolve the CANONICAL write target for a scope — always the
@@ -240,6 +162,601 @@ 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 { 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)]);
+	const out = [];
+	for (const entry of readdirSync(projectsDir, { withFileTypes: true })) {
+		if (!entry.isDirectory()) continue;
+		const exactMatch = exact.has(entry.name);
+		if (!opts.allProjects && !exactMatch && !prefixes.some((p) => entry.name.startsWith(p))) continue;
+		const projectDir = join(projectsDir, entry.name);
+		for (const file of readdirSync(projectDir)) {
+			if (!file.endsWith(".jsonl")) continue;
+			const path = join(projectDir, file);
+			if (!opts.allProjects) {
+				const root = transcriptProjectRoot(path);
+				if (root === null ? !exactMatch : !(wantedRoots.has(root) || wantedRoots.has(realpathOr(root)))) continue;
+			}
+			out.push({
+				path,
+				projectDir
+			});
+		}
+	}
+	return out;
+}
+/**
+* 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 = claudeSessionId ?? opts.fallbackId ?? 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
+			},
+			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 converted = convertClaudeSession(readFileSync(file.path, "utf8"), { fallbackId: basename(file.path, ".jsonl") });
+		if (!converted) {
+			result.empty++;
+			continue;
+		}
+		if (await store.load(converted.session.id)) {
+			result.skipped++;
+			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: []
+	};
+	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)) 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;
+}
+/** 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(new Fzf([...catalog], {
+		selector: (c) => c.name,
+		casing: "case-insensitive"
+	}).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`
@@ -806,6 +1323,217 @@ function truncate(s, max) {
 	return `${s.slice(0, max - 1)}…`;
 }
 //#endregion
+//#region src/tui/claude-import-modal.tsx
+/**
+* "Import from Claude Code" — launched from the settings modal's Agent
+* tab. Two phases:
+*
+*   1. Pick — toggle which pieces to import (sessions / MCP servers /
+*      skills) and the session scope (this project vs every Claude
+*      project), then ↵ on the Import row runs it.
+*   2. Done — the summary of what was imported / skipped / failed, plus
+*      the standing notes about what is deliberately NOT imported
+*      (CLAUDE.md is read natively; permissions/hooks have no zidane
+*      equivalent).
+*
+* All writes go to zidane-owned locations (session store, `.{prefix}/`
+* files); the `.claude` setup itself is never touched. Idempotent — the
+* import skips whatever a previous run already brought over, so re-running
+* is always safe.
+*/
+function ClaudeImportModal({ store, cwd, prefix, onDone }) {
+	const COLOR = useColors();
+	const [options, setOptions] = useState({
+		sessions: true,
+		mcps: true,
+		skills: true,
+		allProjects: false
+	});
+	const [cursor, setCursor] = useState(0);
+	const [phase, setPhase] = useState("pick");
+	const [summary, setSummary] = useState(null);
+	const [error, setError] = useState(null);
+	const runningRef = useRef(false);
+	const counts = useMemo(() => ({
+		project: listClaudeSessionFiles({ cwd }).length,
+		all: listClaudeSessionFiles({
+			cwd,
+			allProjects: true
+		}).length
+	}), [cwd]);
+	const rows = [
+		{
+			key: "sessions",
+			label: "Conversations",
+			detail: `${options.allProjects ? counts.all : counts.project} transcript file(s) found`
+		},
+		{
+			key: "allProjects",
+			label: "… from all projects",
+			detail: `off = current project only (${counts.project} here, ${counts.all} total)`
+		},
+		{
+			key: "mcps",
+			label: "MCP servers",
+			detail: "copy into zidane-owned mcps.json (native names never overwritten)"
+		},
+		{
+			key: "skills",
+			label: "Skills",
+			detail: `copy .claude/skills into ${prefix ?? ".zidane"}/skills`
+		},
+		{
+			key: "run",
+			label: "Import",
+			detail: "run with the selection above"
+		}
+	];
+	const runImport = async () => {
+		if (runningRef.current) return;
+		runningRef.current = true;
+		setPhase("running");
+		await new Promise((resolve) => setTimeout(resolve, 0));
+		let result;
+		try {
+			result = await importFromClaudeCode(store, {
+				cwd,
+				...prefix ? { prefix } : {},
+				sessions: options.sessions,
+				mcps: options.mcps,
+				skills: options.skills,
+				allProjects: options.allProjects
+			});
+			setSummary(result);
+			setPhase("done");
+		} catch (err) {
+			setError(err instanceof Error ? err.message : String(err));
+			setPhase("done");
+		} finally {
+			runningRef.current = false;
+		}
+		if (result) try {
+			await onDone?.(result);
+		} catch {}
+	};
+	useKeyboard((key) => {
+		if (phase !== "pick") return;
+		if (key.name === "up" || key.ctrl && key.name === "p") setCursor((c) => (c - 1 + rows.length) % rows.length);
+		else if (key.name === "down" || key.ctrl && key.name === "n") setCursor((c) => (c + 1) % rows.length);
+		else if (key.name === "return" || key.name === "space") {
+			const row = rows[cursor];
+			if (row.key === "run") runImport();
+			else setOptions((prev) => ({
+				...prev,
+				[row.key]: !prev[row.key]
+			}));
+		}
+	});
+	if (phase === "running") return /* @__PURE__ */ jsx$1(Modal, {
+		title: "Import from Claude Code",
+		disableEscape: true,
+		children: /* @__PURE__ */ jsx$1("text", {
+			fg: COLOR.mute,
+			children: "importing…"
+		})
+	});
+	if (phase === "done") return /* @__PURE__ */ jsxs(Modal, {
+		title: "Import from Claude Code",
+		children: [/* @__PURE__ */ jsxs("box", {
+			style: { flexDirection: "column" },
+			children: [
+				error && /* @__PURE__ */ jsx$1("text", {
+					fg: COLOR.error,
+					children: `import failed: ${error}`
+				}),
+				summary?.sessions && /* @__PURE__ */ jsxs("text", {
+					fg: COLOR.dim,
+					children: [
+						`conversations: ${summary.sessions.imported} imported, ${summary.sessions.skipped} already present`,
+						summary.sessions.empty > 0 ? `, ${summary.sessions.empty} empty` : "",
+						summary.sessions.failed.length > 0 ? `, ${summary.sessions.failed.length} failed` : ""
+					]
+				}),
+				summary?.mcps && /* @__PURE__ */ jsx$1("text", {
+					fg: COLOR.dim,
+					children: copyLine("mcp servers", summary.mcps)
+				}),
+				summary?.skills && /* @__PURE__ */ jsx$1("text", {
+					fg: COLOR.dim,
+					children: copyLine("skills", summary.skills)
+				}),
+				summary?.notes.map((note) => /* @__PURE__ */ jsx$1("text", {
+					fg: COLOR.mute,
+					children: `· ${note}`
+				}, note))
+			]
+		}), /* @__PURE__ */ jsxs("text", {
+			fg: COLOR.mute,
+			children: [/* @__PURE__ */ jsx$1("span", {
+				fg: COLOR.warn,
+				children: "esc"
+			}), " close"]
+		})]
+	});
+	const enabledFor = (key) => key === "run" ? void 0 : options[key];
+	return /* @__PURE__ */ jsxs(Modal, {
+		title: "Import from Claude Code",
+		children: [/* @__PURE__ */ jsx$1("box", {
+			style: { flexDirection: "column" },
+			children: rows.map((row, i) => {
+				const focused = i === cursor;
+				const enabled = enabledFor(row.key);
+				return /* @__PURE__ */ jsxs("text", {
+					fg: focused ? COLOR.brand : COLOR.dim,
+					children: [
+						/* @__PURE__ */ jsx$1("span", {
+							fg: focused ? COLOR.brand : COLOR.mute,
+							children: focused ? "▶ " : "  "
+						}),
+						enabled !== void 0 && /* @__PURE__ */ jsx$1("span", {
+							fg: enabled ? COLOR.accent : COLOR.mute,
+							children: enabled ? "[✓] " : "[ ] "
+						}),
+						/* @__PURE__ */ jsx$1("span", {
+							fg: focused ? COLOR.brand : COLOR.dim,
+							children: row.label
+						}),
+						/* @__PURE__ */ jsxs("span", {
+							fg: COLOR.mute,
+							children: ["  ", row.detail]
+						})
+					]
+				}, row.key);
+			})
+		}), /* @__PURE__ */ jsxs("text", {
+			fg: COLOR.mute,
+			children: [
+				/* @__PURE__ */ jsx$1("span", {
+					fg: COLOR.warn,
+					children: "↑↓"
+				}),
+				" navigate · ",
+				/* @__PURE__ */ jsx$1("span", {
+					fg: COLOR.warn,
+					children: "↵"
+				}),
+				" toggle / run · ",
+				/* @__PURE__ */ jsx$1("span", {
+					fg: COLOR.warn,
+					children: "esc"
+				}),
+				" close"
+			]
+		})]
+	});
+}
+function copyLine(label, result) {
+	const parts = [];
+	parts.push(result.copied.length > 0 ? `${result.copied.length} copied (${result.copied.join(", ")})` : "none copied");
+	if (result.skipped.length > 0) parts.push(`${result.skipped.length} skipped as native (${result.skipped.join(", ")})`);
+	if (result.failed.length > 0) parts.push(`${result.failed.length} failed`);
+	return `${label}: ${parts.join(" · ")}`;
+}
+//#endregion
 //#region src/tui/clipboard.ts
 /**
 * Two-pronged clipboard write.
@@ -4939,6 +5667,7 @@ function DiscoveryShell({ children }) {
 	const config = useConfig();
 	const { settings } = useSettings();
 	const foreignAgents = settings.importForeignConfigs === true;
+	const rulerConfigs = settings.importRulerConfigs !== false;
 	const dispatchAuth = useMcpAuthDispatch();
 	const dispatchAuthRef = useRef(dispatchAuth);
 	dispatchAuthRef.current = dispatchAuth;
@@ -5010,7 +5739,8 @@ function DiscoveryShell({ children }) {
 			walk: () => discoverProjectSkills({
 				cwd: projectDir,
 				prefix: config.prefix,
-				foreignAgents
+				foreignAgents,
+				ruler: rulerConfigs
 			}),
 			onLoad: (items) => {
 				if (skillsSlotRef.current === skillsSlot) setSkillsCatalog(items);
@@ -5026,7 +5756,8 @@ function DiscoveryShell({ children }) {
 			const { servers, errors } = discoverProjectMcps({
 				cwd: projectDir,
 				prefix: config.prefix,
-				foreignAgents
+				foreignAgents,
+				ruler: rulerConfigs
 			});
 			mcpsFingerprintRef.current = JSON.stringify({
 				servers,
@@ -5047,7 +5778,8 @@ function DiscoveryShell({ children }) {
 		projectDir,
 		config.prefix,
 		seedMcpAuthBadges,
-		foreignAgents
+		foreignAgents,
+		rulerConfigs
 	]);
 	const ensureFiles = useCallback(() => filesSlotRef.current?.ensure() ?? Promise.resolve([]), []);
 	const ensureSkills = useCallback(() => skillsSlotRef.current?.ensure() ?? Promise.resolve([]), []);
@@ -5058,7 +5790,8 @@ function DiscoveryShell({ children }) {
 			const { servers, errors } = discoverProjectMcps({
 				cwd: projectDir,
 				prefix: config.prefix,
-				foreignAgents
+				foreignAgents,
+				ruler: rulerConfigs
 			});
 			const fingerprint = JSON.stringify({
 				servers,
@@ -5078,7 +5811,8 @@ function DiscoveryShell({ children }) {
 		projectDir,
 		config.prefix,
 		seedMcpAuthBadges,
-		foreignAgents
+		foreignAgents,
+		rulerConfigs
 	]);
 	useEffect(() => {
 		let lastSignature = cacheFileSignature(dataDir);
@@ -13606,6 +14340,14 @@ function SettingsModal({ skillsCatalog: skillsCatalogProp, mcpsCatalog: mcpsCata
 			description: `current: ${settings.compactionModel || "main model"} — pick any provider's model for compaction summaries (pick the main model to clear)`,
 			onPick: actions.onPickCompactionModel
 		});
+		if (actions?.onImportClaudeCode) acts.push({
+			kind: "action",
+			category: "agent",
+			id: "import-claude-code",
+			label: "Import from Claude Code",
+			description: "copy conversations, MCP servers, and skills from your ~/.claude setup into zidane",
+			onPick: actions.onImportClaudeCode
+		});
 		const inputs = SETTINGS_INPUTS.filter((inp) => inp.key !== "sessionIcon" && inp.key !== "attentionIcon" && inp.key !== "activeIcon" || settings.terminalTitle === "icon-session").map((inp) => ({
 			kind: "input",
 			...inp
@@ -17238,6 +17980,8 @@ function AppShell() {
 	enabledSkillsRef.current = settings.enabledSkills;
 	const importForeignConfigsRef = useRef(settings.importForeignConfigs);
 	importForeignConfigsRef.current = settings.importForeignConfigs;
+	const importRulerConfigsRef = useRef(settings.importRulerConfigs);
+	importRulerConfigsRef.current = settings.importRulerConfigs;
 	const mcpsCatalogRef = useRef(mcpsCatalog);
 	mcpsCatalogRef.current = mcpsCatalog;
 	const enabledMcpsRef = useRef(settings.enabledMcps);
@@ -18127,7 +18871,8 @@ function AppShell() {
 		const skillsScan = defaultSkillScanPaths({
 			cwd: projectDir,
 			prefix: config.prefix,
-			foreignAgents: importForeignConfigsRef.current === true
+			foreignAgents: importForeignConfigsRef.current === true,
+			ruler: importRulerConfigsRef.current !== false
 		});
 		const liveExtensionRegistry = filterExtensionRegistry(extensionRegistry, enabledExtensionsRef.current);
 		const extensionSkillNames = liveExtensionRegistry.skills.map((s) => s.name);
@@ -18147,7 +18892,8 @@ function AppShell() {
 		const agentsMd = discoverAgentsMd({
 			cwd: actualCwd,
 			prefix: config.prefix,
-			scope: userInstructionsScopeRef.current
+			scope: userInstructionsScopeRef.current,
+			ruler: importRulerConfigsRef.current !== false
 		});
 		const envOpts = {
 			cwd: actualCwd,
@@ -18254,7 +19000,6 @@ function AppShell() {
 			tools: mergedTools,
 			...composedPreset.toolAliases ? { toolAliases: composedPreset.toolAliases } : {},
 			...effectiveSystem ? { system: effectiveSystem } : {},
-			mcpServers: mergedMcpServers,
 			skills,
 			behavior: mergedBehavior,
 			spawnTool: seamCatalog.length === 0 ? seamSpawnBase : seamSpawnBase.withModels(seamCatalog)
@@ -19702,6 +20447,30 @@ function AppShell() {
 		modal,
 		setSetting
 	]);
+	/**
+	* "Import from Claude Code" — launched from the settings modal's Agent
+	* tab (row only wired when `~/.claude` exists). The import modal
+	* replaces the settings modal in the single modal slot; a successful
+	* session import refreshes the sessions list through the live ref.
+	*/
+	const onImportClaudeCode = useCallback(() => {
+		modal.open(/* @__PURE__ */ jsx$1(ClaudeImportModal, {
+			store,
+			cwd: cwdRef.current,
+			...config.prefix ? { prefix: config.prefix } : {},
+			onDone: (summary) => {
+				if ((summary.sessions?.imported ?? 0) > 0) refreshSessionsRef.current().catch((err) => debugLog("claude-import: refreshSessions failed", err));
+				if ((summary.mcps?.copied.length ?? 0) > 0) Promise.resolve(onRefreshMcps()).catch((err) => debugLog("claude-import: refreshMcps failed", err));
+				if ((summary.skills?.copied.length ?? 0) > 0) Promise.resolve(onRefreshSkills()).catch((err) => debugLog("claude-import: refreshSkills failed", err));
+			}
+		}));
+	}, [
+		modal,
+		store,
+		config.prefix,
+		onRefreshMcps,
+		onRefreshSkills
+	]);
 	const onPickEffort = useCallback((effort) => {
 		setPicked((prev) => {
 			if (!prev) return prev;
@@ -20134,11 +20903,22 @@ function AppShell() {
 				if (tasks.length === 0) return [];
 				await flushCommandTurn();
 				const handle = await agent.ensureExecution();
+				let onAbort;
 				try {
-					await agent.warmup();
+					await Promise.race([agent.warmup(), new Promise((resolveAbort) => {
+						if (controller.signal.aborted) {
+							resolveAbort();
+							return;
+						}
+						onAbort = () => resolveAbort();
+						controller.signal.addEventListener("abort", onAbort, { once: true });
+					})]);
 				} catch (err) {
 					debugLog("spawnAgents: warmup failed — children fall back to config bootstrap", err);
+				} finally {
+					if (onAbort) controller.signal.removeEventListener("abort", onAbort);
 				}
+				if (controller.signal.aborted) throw new Error("spawnAgents: command aborted");
 				const parentMcp = agent.mcpConnection;
 				const results = tasks.map((task, i) => ({
 					label: task.label ?? `task-${i + 1}`,
@@ -20169,7 +20949,7 @@ function AppShell() {
 								...seam.system !== void 0 ? { system: seam.system } : {},
 								tools: seam.tools,
 								...seam.toolAliases !== void 0 ? { toolAliases: seam.toolAliases } : {},
-								mcpServers: seam.mcpServers,
+								mcpServers: [...agent.mcpServers],
 								...parentMcp ? { mcpConnection: nonOwningMcpView(parentMcp) } : {},
 								skills: seam.skills,
 								behavior: seam.behavior,
@@ -21436,7 +22216,8 @@ function AppShell() {
 					onAddMcp,
 					onRemoveSkill,
 					onRemoveMcp,
-					onPickCompactionModel
+					onPickCompactionModel,
+					...hasClaudeCodeSetup() ? { onImportClaudeCode } : {}
 				}
 			}));
 			return;