ultracontext 1.4.12 → 1.5.0

package/dist/cli/entry.mjs

@@ -308,18 +308,18 @@ async function checkForUpdate() {
 	if (latest && isNewer(latest, current)) printUpdateNotice(current, latest);
 }
 async function launchSyncDaemon() {
-	const { launchDaemon } = await import("../launcher-BMMjzr5k.mjs");
+	const { launchDaemon } = await import("../launcher-374b809z.mjs");
 	await launchDaemon({
 		entryPath: fileURLToPath(new URL("./sdk-sync.mjs", import.meta.url)),
 		diagnosticsHint: "DAEMON_VERBOSE=1 ultracontext sync"
 	});
 }
 async function runCtlSDK() {
-	const { runCtl } = await import("../ctl-CXfNEPN8.mjs");
+	const { runCtl } = await import("../ctl-_C5oTsoT.mjs");
 	await runCtl();
 }
 async function launchTui() {
-	const { tuiBoot } = await import("../tui-C04sD2eJ.mjs");
+	const { tuiBoot } = await import("../tui-zO1IZH_S.mjs");
 	await tuiBoot({ assetsRoot: path.resolve(__dirname, "..", "..") });
 }
 async function run() {

package/dist/cli/sdk-sync.mjs

@@ -1,6 +1,6 @@
-import { a as asIso, c as extractSessionIdFromPath, d as normalizeWhitespace, f as preserveText, h as truncateString, i as toInt, l as firstMessageTimestamp, m as toMessage, n as extractProjectPathFromFile, o as coerceMessageText, p as safeJsonParse, r as sha256, s as expandHome, t as boolFromEnv, u as normalizeRole } from "../utils-CmuIYHtm.mjs";
+import { a as asIso, c as extractSessionIdFromPath, d as normalizeWhitespace, f as preserveText, g as truncateString, h as toMessage, i as toInt, l as firstMessageTimestamp, m as stripIDEContextTags, n as extractProjectPathFromFile, o as coerceMessageText, p as safeJsonParse, r as sha256, s as expandHome, t as boolFromEnv, u as normalizeRole } from "../utils-BiZUI99i.mjs";
 import { n as normalizeBootstrapMode, t as createBootstrapStateKey } from "../protocol-BI9ficcl.mjs";
-import { n as resolveLockPath, t as acquireFileLock } from "../lock-5aJnda81.mjs";
+import { n as resolveLockPath, t as acquireFileLock } from "../lock-DtnsoNoW.mjs";
 import process$1 from "node:process";
 import path from "node:path";
 import fs from "node:fs";
@@ -785,6 +785,124 @@ function parseOpenClawLine({ line, filePath }) {
 	return null;
 }
 
+//#endregion
+//#region ../../packages/parsers/src/agents/cursor.mjs
+function parseCursorLine({ line, filePath }) {
+	const parsed = safeJsonParse(line);
+	if (!parsed || typeof parsed !== "object") return null;
+	if (!parsed.type && parsed.role) parsed.type = parsed.role;
+	const result = parseClaudeCodeLine({
+		line: JSON.stringify(parsed),
+		filePath
+	});
+	if (!result) return null;
+	result.eventType = result.eventType.replace(/^claude\./, "cursor.");
+	if (result.kind === "user" && result.message) result.message = stripIDEContextTags(result.message);
+	return result;
+}
+
+//#endregion
+//#region ../../packages/parsers/src/agents/gemini.mjs
+const FILE_MOD_TOOLS = [
+	"write_file",
+	"edit_file",
+	"save_file",
+	"replace"
+];
+const FILE_PATH_KEYS = [
+	"file_path",
+	"path",
+	"filePath",
+	"filename"
+];
+function extractGeminiTextContent(content) {
+	if (!content) return "";
+	if (typeof content === "string") return preserveText(content);
+	if (Array.isArray(content)) {
+		const parts = [];
+		for (const item of content) {
+			if (!item || typeof item !== "object") continue;
+			if (typeof item.text === "string") {
+				const chunk = preserveText(item.text);
+				if (chunk) parts.push(chunk);
+			}
+		}
+		return parts.join("\n");
+	}
+	if (typeof content === "object" && typeof content.text === "string") return preserveText(content.text);
+	return "";
+}
+function formatToolCall(tc) {
+	const name = tc.name ?? "unknown";
+	const args = tc.args ?? {};
+	let filePath = "";
+	for (const key of FILE_PATH_KEYS) if (typeof args[key] === "string" && args[key]) {
+		filePath = args[key];
+		break;
+	}
+	if (FILE_MOD_TOOLS.includes(name)) {
+		const content = preserveText(args.content ?? args.file_text ?? args.new_content ?? "");
+		if (content) return `[${name}] ${filePath}\n${truncateString(content, 500)}`;
+		return `[${name}] ${filePath}`;
+	}
+	const compact = JSON.stringify(args);
+	const detail = compact.length > 500 ? compact.slice(0, 500) + "..." : compact;
+	return `[${name}]${filePath ? ` ${filePath}` : ""} ${detail}`;
+}
+function extractGeminiSessionId(filePath) {
+	const base = path.basename(filePath, ".json");
+	const match = base.match(/session-[\d-]+-(.+)$/);
+	if (match) return match[1];
+	return base || "unknown-session";
+}
+function extractGeminiTimestamp(filePath) {
+	const match = path.basename(filePath, ".json").match(/session-(\d{4})(\d{2})(\d{2})/);
+	if (match) return `${match[1]}-${match[2]}-${match[3]}T00:00:00.000Z`;
+	return (/* @__PURE__ */ new Date()).toISOString();
+}
+function parseGeminiFile({ fileContents, filePath }) {
+	const parsed = safeJsonParse(fileContents);
+	if (!parsed || typeof parsed !== "object") return [];
+	const messages = parsed.messages;
+	if (!Array.isArray(messages) || messages.length === 0) return [];
+	const sessionId = extractGeminiSessionId(filePath);
+	const fileTimestamp = extractGeminiTimestamp(filePath);
+	const events = [];
+	for (let i = 0; i < messages.length; i++) {
+		const msg = messages[i];
+		if (!msg || typeof msg !== "object") continue;
+		const type = String(msg.type ?? "").toLowerCase();
+		const isUser = type === "user";
+		if (!isUser && !(type === "gemini")) continue;
+		const text = extractGeminiTextContent(msg.content);
+		const toolCallTexts = [];
+		if (Array.isArray(msg.toolCalls)) for (const tc of msg.toolCalls) {
+			if (!tc || typeof tc !== "object") continue;
+			toolCallTexts.push(formatToolCall(tc));
+		}
+		const parts = [];
+		if (text) parts.push(text);
+		if (toolCallTexts.length) parts.push(toolCallTexts.join("\n\n"));
+		const message = parts.join("\n\n");
+		if (!message) continue;
+		events.push({
+			sessionId,
+			eventType: isUser ? "gemini.user" : "gemini.assistant",
+			kind: isUser ? "user" : "assistant",
+			timestamp: msg.timestamp ?? fileTimestamp,
+			message: toMessage(message),
+			raw: {
+				type: msg.type,
+				id: msg.id,
+				index: i,
+				hasToolCalls: toolCallTexts.length > 0,
+				toolCallCount: toolCallTexts.length
+			}
+		});
+	}
+	return events;
+}
+
 //#endregion
 //#region ../../packages/parsers/src/gstack.mjs
 function extractGstackProjectSlug(filePath) {
@@ -896,6 +1014,9 @@ async function hasLocalClaudeSession(sessionId, cwd = "", baseDir) {
 		followSymbolicLinks: false
 	})).some((filePath) => path.basename(filePath, ".jsonl") === id);
 }
+function isNativeClaudeEntry(raw) {
+	return raw && typeof raw === "object" && "type" in raw && ("sessionId" in raw || "uuid" in raw);
+}
 async function writeClaudeSession({ sessionId, cwd, messages, baseDir }) {
 	const runCwd = String(cwd || process.cwd());
 	const resolvedSessionId = normalizeSessionUuid(sessionId);
@@ -913,11 +1034,21 @@ async function writeClaudeSession({ sessionId, cwd, messages, baseDir }) {
 		let parentUuid = null;
 		for (let i = 0; i < (messages?.length ?? 0); i += 1) {
 			const message = messages[i];
+			const raw = message?.content?.raw;
+			if (isNativeClaudeEntry(raw)) {
+				const entryUuid = raw.uuid || randomUUID();
+				lines.push(JSON.stringify({
+					...raw,
+					parentUuid,
+					sessionId: resolvedSessionId
+				}));
+				parentUuid = entryUuid;
+				continue;
+			}
 			const normalizedRole = normalizeRole(message?.role);
 			const role = normalizedRole === "assistant" ? "assistant" : normalizedRole === "user" ? "user" : "assistant";
-			const rawText = coerceMessageText(message).trim();
-			if (!rawText) continue;
-			const text = normalizedRole === "system" ? `[system] ${rawText}` : rawText;
+			const text = extractMessageText(message, normalizedRole);
+			if (!text) continue;
 			const ts = asIso(message?.content?.timestamp ?? message?.metadata?.timestamp ?? new Date(new Date(firstTs).getTime() + i * 1e3).toISOString());
 			const entryUuid = randomUUID();
 			lines.push(JSON.stringify({
@@ -931,32 +1062,35 @@ async function writeClaudeSession({ sessionId, cwd, messages, baseDir }) {
 				type: role,
 				message: {
 					role,
-					content: text
+					content: [{
+						type: "text",
+						text
+					}]
 				},
 				timestamp: ts,
 				uuid: entryUuid
 			}));
 			parentUuid = entryUuid;
 		}
-		if (lines.length === 0) {
-			const entryUuid = randomUUID();
-			lines.push(JSON.stringify({
-				parentUuid: null,
-				isSidechain: false,
-				userType: "external",
-				cwd: runCwd,
-				sessionId: resolvedSessionId,
-				version: "adapter",
-				gitBranch: "",
-				type: "assistant",
-				message: {
-					role: "assistant",
-					content: "[system] Session restored from UltraContext with no user/assistant messages."
-				},
-				timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-				uuid: entryUuid
-			}));
-		}
+		if (lines.length === 0) lines.push(JSON.stringify({
+			parentUuid: null,
+			isSidechain: false,
+			userType: "external",
+			cwd: runCwd,
+			sessionId: resolvedSessionId,
+			version: "adapter",
+			gitBranch: "",
+			type: "assistant",
+			message: {
+				role: "assistant",
+				content: [{
+					type: "text",
+					text: "[system] Session restored from UltraContext with no user/assistant messages."
+				}]
+			},
+			timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+			uuid: randomUUID()
+		}));
 		await fs$1.writeFile(filePath, `${lines.join("\n")}\n`, "utf8");
 		return {
 			written: true,
@@ -974,6 +1108,17 @@ async function writeClaudeSession({ sessionId, cwd, messages, baseDir }) {
 		};
 	}
 }
+function extractMessageText(message, normalizedRole) {
+	const raw = message?.content?.raw;
+	if (raw?.type === "response_item" && raw?.payload?.type === "message") {
+		const text = (raw.payload.content ?? []).map((c) => c.text ?? "").filter(Boolean).join("\n");
+		if (text) return normalizedRole === "system" ? `[system] ${text}` : text;
+	}
+	if (raw?.type === "event_msg" && raw?.payload?.type === "user_message") return raw.payload.message ?? "";
+	const msg = message?.content?.message ?? "";
+	if (!msg) return "";
+	return normalizedRole === "system" ? `[system] ${msg}` : msg;
+}
 
 //#endregion
 //#region ../../packages/parsers/src/writers/codex.mjs
@@ -1350,7 +1495,7 @@ async function daemonBoot({ createStore, resolveDbPath }) {
 		return "";
 	}
 	function pushRecentLog(level, message, data) {
-		let line = String(message ?? "");
+		let line = String(message ?? "").replace(/[\r\n\t\v\f\x00-\x1f]+/g, " ").replace(/\s{2,}/g, " ");
 		if (line.startsWith("Appended event to session context")) line = "context append";
 		if (line.startsWith("Context created")) line = "Context created";
 		if (line.startsWith("Context created without metadata fallback")) line = "Context created (fallback)";
@@ -1561,6 +1706,20 @@ async function daemonBoot({ createStore, resolveDbPath }) {
 			globs: [openclawGlob],
 			parseLine: parseOpenClawLine
 		});
+		const cursorGlob = expandHome(process$1.env.CURSOR_GLOB ?? "~/.cursor/projects/**/*.jsonl");
+		if (boolFromEnv(process$1.env.INGEST_CURSOR, true)) sources.push({
+			name: "cursor",
+			enabled: true,
+			globs: [cursorGlob],
+			parseLine: parseCursorLine
+		});
+		const geminiGlob = expandHome(process$1.env.GEMINI_GLOB ?? "~/.gemini/tmp/*/chats/session-*.json");
+		if (boolFromEnv(process$1.env.INGEST_GEMINI, true)) sources.push({
+			name: "gemini",
+			enabled: true,
+			globs: [geminiGlob],
+			parseFile: parseGeminiFile
+		});
 		const gstackGlob = expandHome(process$1.env.GSTACK_GLOB ?? "~/.gstack/projects/**/*.jsonl");
 		if (boolFromEnv(process$1.env.INGEST_GSTACK, true)) sources.push({
 			name: "gstack",
@@ -1612,7 +1771,11 @@ async function daemonBoot({ createStore, resolveDbPath }) {
 			if (shouldStop()) break;
 			try {
 				const stat = await fs$1.stat(filePath);
-				store.setOffset(offsetStoreKey(source.name, `${stat.dev}:${stat.ino}`), stat.size);
+				const fileId = `${stat.dev}:${stat.ino}`;
+				if (source.parseFile) {
+					const contents = await fs$1.readFile(filePath, "utf8");
+					store.setOffset(offsetStoreKey(source.name, fileId), sha256(contents));
+				} else store.setOffset(offsetStoreKey(source.name, fileId), stat.size);
 			} catch {}
 		}
 	}
@@ -1783,6 +1946,18 @@ async function daemonBoot({ createStore, resolveDbPath }) {
 				started_at: sessionEvents[0].normalized.timestamp
 			};
 			if (projectPath) contextMeta.project_path = projectPath;
+			const isRealUserEvent = (ev) => {
+				if (ev.normalized.kind !== "user") return false;
+				const et = ev.normalized.eventType ?? "";
+				const msg = ev.normalized.message ?? "";
+				if (et === "response_item.message") return false;
+				if (msg.startsWith("A new session was started")) return false;
+				if (msg.startsWith("[result]")) return false;
+				if (msg.startsWith("<")) return false;
+				return true;
+			};
+			const firstUserEvent = sessionEvents.find(isRealUserEvent) ?? sessionEvents.find((ev) => ev.normalized.kind === "user");
+			if (firstUserEvent?.normalized?.message) contextMeta.title = firstUserEvent.normalized.message.replace(/[\r\n\t\v\f\x00-\x1f]+/g, " ").replace(/\s{2,}/g, " ").trim().slice(0, 120);
 			const ctxId = await getOrCreateContext(store, uc, sessionContextStoreKey(sourceName, sessionId), contextMeta, sourceName);
 			contextIds.set(sessionId, ctxId);
 		}
@@ -1821,12 +1996,13 @@ async function daemonBoot({ createStore, resolveDbPath }) {
 				lastSessionId: sessionId,
 				lastAt: Date.now()
 			});
-			if (cfg.logAppends) log("info", "Bulk appended events to session context", {
-				source: sourceName,
-				session_id: sessionId,
-				context_id: sessionContextId,
-				count: sessionEvents.length
-			});
+			if (cfg.logAppends) for (const { normalized } of sessionEvents) {
+				const msg = (normalized.message ?? "").replace(/[\r\n\t\v\f\x00-\x1f]+/g, " ").replace(/\s{2,}/g, " ").trim().slice(0, 80);
+				log("info", `[${normalized.eventType}] ${msg}`, {
+					source: sourceName,
+					session_id: sessionId
+				});
+			}
 		});
 	}
 	async function readNewLines(filePath, offset) {
@@ -1881,6 +2057,56 @@ async function daemonBoot({ createStore, resolveDbPath }) {
 			bumpSourceStat(source.name, "filesScanned");
 			const fileId = `${stat.dev}:${stat.ino}`;
 			const offsetKey = offsetStoreKey(source.name, fileId);
+			if (source.parseFile) {
+				const fileContents = await fs$1.readFile(filePath, "utf8");
+				const contentHash = sha256(fileContents);
+				if (store.getOffset(offsetKey) === contentHash) return;
+				noteSourceActivity(source.name, {
+					lastFile: filePath,
+					lastAt: Date.now()
+				});
+				const allEvents = source.parseFile({
+					fileContents,
+					filePath
+				});
+				if (!Array.isArray(allEvents) || allEvents.length === 0) return;
+				bumpStat("linesRead", allEvents.length);
+				bumpSourceStat(source.name, "linesRead", allEvents.length);
+				const pendingEvents = [];
+				for (let i = 0; i < allEvents.length; i++) {
+					if (shouldStop()) break;
+					const normalized = allEvents[i];
+					if (!normalized || !normalized.sessionId) continue;
+					if (ingestMode === "last_24h" && !isWithinLast24h(normalized.timestamp)) continue;
+					bumpStat("parsedEvents");
+					bumpSourceStat(source.name, "parsedEvents");
+					noteSourceActivity(source.name, {
+						lastEventType: normalized.eventType,
+						lastSessionId: normalized.sessionId,
+						lastAt: Date.now()
+					});
+					const eventId = sha256(`${source.name}|${cfg.host}|${cfg.userId}|${normalized.sessionId}|${fileId}|${i}`);
+					if (!markEventSeen(store, source.name, eventId)) {
+						bumpStat("deduped");
+						bumpSourceStat(source.name, "deduped");
+						continue;
+					}
+					pendingEvents.push({
+						normalized,
+						eventId,
+						lineOffset: i
+					});
+				}
+				if (pendingEvents.length > 0) await appendBulkToUltraContext({
+					store,
+					uc,
+					sourceName: source.name,
+					events: pendingEvents,
+					filePath
+				});
+				store.setOffset(offsetKey, contentHash);
+				return;
+			}
 			const { lines, nextOffset } = await readNewLines(filePath, toInt(store.getOffset(offsetKey), 0));
 			bumpStat("linesRead", lines.length);
 			bumpSourceStat(source.name, "linesRead", lines.length);