codemem 0.43.2 → 0.44.0-alpha.1

package/dist/index.js

@@ -91,7 +91,7 @@ function emitJsonError(errorCode, message, exitCode = 1) {
 *   and empty) are treated as toggles, not paths, so the default is used.
 * - All I/O is best-effort: failures are swallowed.
 */
-var BOOLEAN_TOGGLE_VALUES = new Set([
+var BOOLEAN_TOGGLE_VALUES = /* @__PURE__ */ new Set([
 	"",
 	"0",
 	"false",
@@ -131,7 +131,7 @@ function logHookEvent(message) {
 var FILE_GATE_MIN_BYTES = 1500;
 var FETCH_LIMIT = 40;
 var DISPLAY_LIMIT = 15;
-var MTIME_FRESH_TOLERANCE_MS = 300 * 1e3;
+var MTIME_FRESH_TOLERANCE_MS = 3e5;
 var SMALL_FILE_BYPASS_PATTERNS = [
 	/\.(json|jsonc|toml|ya?ml)$/i,
 	/\.env(\.|$)/i,
@@ -286,7 +286,8 @@ function queryByFile(dbPath, relativePath, project, limit) {
 	}
 }
 function resolveProject$1(payload) {
-	return resolveHookProject(typeof payload.cwd === "string" ? payload.cwd : null, payload.project);
+	const cwd = typeof payload.cwd === "string" ? payload.cwd : null;
+	return resolveHookProject(cwd, payload.project);
 }
 function sourceSessionId(payload) {
 	const value = payload.session_id;
@@ -758,14 +759,16 @@ function createHookIngestSpool(cfg) {
 			return false;
 		}
 		const payloadText = JSON.stringify(payload);
-		const tmpPath = join(dir, `.hook-tmp-${process.pid}-${Date.now()}-${randomInt(1e3, 1e4)}.json`);
+		const tmpName = `.hook-tmp-${process.pid}-${Date.now()}-${randomInt(1e3, 1e4)}.json`;
+		const tmpPath = join(dir, tmpName);
 		try {
 			writeFileSync(tmpPath, payloadText, { encoding: "utf8" });
 		} catch {
 			logHookEvent(`${cfg.logPrefix} failed to allocate spool temp file`);
 			return false;
 		}
-		const finalPath = join(dir, `hook-${Math.floor(Date.now() / 1e3)}-${process.pid}-${randomInt(1e3, 1e4)}.json`);
+		const finalName = `hook-${Math.floor(Date.now() / 1e3)}-${process.pid}-${randomInt(1e3, 1e4)}.json`;
+		const finalPath = join(dir, finalName);
 		try {
 			renameSync(tmpPath, finalPath);
 		} catch {
@@ -809,7 +812,8 @@ function createHookIngestSpool(cfg) {
 				continue;
 			}
 			if (nowS - mtimeS <= ttlSeconds) continue;
-			const recoveredPath = join(dir, `hook-recovered-${Math.floor(nowS)}-${process.pid}-${randomInt(1e3, 1e4)}.json`);
+			const recoveredName = `hook-recovered-${Math.floor(nowS)}-${process.pid}-${randomInt(1e3, 1e4)}.json`;
+			const recoveredPath = join(dir, recoveredName);
 			try {
 				renameSync(tmpPath, recoveredPath);
 				logHookEvent(`${cfg.logPrefix} recovered stale temp spool payload: ${recoveredPath}`);
@@ -1049,7 +1053,8 @@ function nowIso() {
 	return (/* @__PURE__ */ new Date()).toISOString();
 }
 function saveSessionState(sessionId, state) {
-	mkdirSync(contextDir(), { recursive: true });
+	const dir = contextDir();
+	mkdirSync(dir, { recursive: true });
 	const path = statePathForSession(sessionId);
 	const tmpPath = `${path}.tmp`;
 	const payload = {
@@ -1571,7 +1576,8 @@ function extractInjectContext(payload) {
 	return normalizePromptText(payload.prompt) || null;
 }
 function resolveInjectProject$1(payload) {
-	return resolveHookProject(typeof payload.cwd === "string" ? payload.cwd : null, payload.project);
+	const cwd = typeof payload.cwd === "string" ? payload.cwd : null;
+	return resolveHookProject(cwd, payload.project);
 }
 async function buildLocalPack$1(context, project, dbPath, workingSetPaths = []) {
 	const store = new MemoryStore(dbPath);
@@ -2194,7 +2200,8 @@ function formatCodexAdditionalContext(packText, maxChars) {
 	return `${CODEMEM_CONTEXT_HEADER}${truncateAdditionalContext(normalized, bodyMaxChars)}`;
 }
 function resolveInjectProject(payload) {
-	return resolveHookProject(typeof payload.cwd === "string" ? payload.cwd : null, payload.project);
+	const cwd = typeof payload.cwd === "string" ? payload.cwd : null;
+	return resolveHookProject(cwd, payload.project);
 }
 function buildCodexInjectQuery(prompt, project) {
 	return [prompt, project ?? ""].filter((part) => part.trim().length > 0).join(" ").slice(0, 500) || "recent work";
@@ -3232,8 +3239,8 @@ function escapeSqlLikePattern(value) {
 }
 function formatBytes(bytes) {
 	if (bytes < 1024) return `${bytes} B`;
-	if (bytes < 1024 * 1024) return `${(bytes / 1024).toFixed(1)} KB`;
-	return `${(bytes / (1024 * 1024)).toFixed(1)} MB`;
+	if (bytes < 1048576) return `${(bytes / 1024).toFixed(1)} KB`;
+	return `${(bytes / 1048576).toFixed(1)} MB`;
 }
 function parseOptionalPositiveInt$1(value) {
 	if (!value) return void 0;
@@ -3922,8 +3929,9 @@ function resolveCandidateTarget(candidate) {
 		path: join(homedir(), ".config", "opencode", "AGENTS.md"),
 		display: "~/.config/opencode/AGENTS.md"
 	};
+	const root = resolveProjectRoot(process.cwd()) ?? process.cwd();
 	return {
-		path: join(resolveProjectRoot(process.cwd()) ?? process.cwd(), "AGENTS.md"),
+		path: join(root, "AGENTS.md"),
 		display: "AGENTS.md"
 	};
 }
@@ -4164,7 +4172,8 @@ function emitStructuredError(errorCode, message) {
 async function runEnqueueRawEvent(opts, dependencies = {}) {
 	try {
 		const payload = await (dependencies.readPayload ?? readStdinJson)();
-		const store = new MemoryStore(resolveDbPath(resolveDbOpt(opts)));
+		const dbPath = resolveDbPath(resolveDbOpt(opts));
+		const store = new MemoryStore(dbPath);
 		try {
 			ingestRawEvents(store, payload);
 		} finally {
@@ -4286,7 +4295,8 @@ var defaultLogger = {
 	error: (message) => console.error(`Error: ${message}`)
 };
 function readWorkerSyncConfig(configPath) {
-	return readCoordinatorSyncConfig(configPath ? readCodememConfigFileAtPath(configPath) : readCodememConfigFile());
+	const config = configPath ? readCodememConfigFileAtPath(configPath) : readCodememConfigFile();
+	return readCoordinatorSyncConfig(config);
 }
 function createSequentialBackfillCoordinator(store, jobPlans, options) {
 	const pollIntervalMs = 1e3;
@@ -4381,7 +4391,7 @@ function startMaintenanceWorkerRuntime(options = {}) {
 		} catch (error) {
 			logger.warn(`WAL checkpoint failed: ${error instanceof Error ? error.message : String(error)}`);
 		}
-	}, 300 * 1e3);
+	}, 3e5);
 	walCheckpointTimer.unref();
 	if (!isEmbeddingDisabled()) runners.push(new VectorModelMigrationRunner({
 		dbPath,
@@ -5125,7 +5135,7 @@ function createMemoryExtractionReplayCommand() {
 				observerReasoningEffort: opts.reasoningEffort === void 0 ? observerConfig.observerReasoningEffort : opts.reasoningEffort.trim() || null,
 				observerReasoningSummary: opts.reasoningSummary === void 0 ? observerConfig.observerReasoningSummary : opts.reasoningSummary.trim() || null,
 				observerMaxOutputTokens: maxOutputTokens ?? observerConfig.observerMaxOutputTokens ?? observerConfig.observerMaxTokens,
-				observerExplicitConfigKeys: maxOutputTokens === null ? observerConfig.observerExplicitConfigKeys : [...new Set([...observerConfig.observerExplicitConfigKeys ?? [], "observerMaxOutputTokens"])]
+				observerExplicitConfigKeys: maxOutputTokens === null ? observerConfig.observerExplicitConfigKeys : [.../* @__PURE__ */ new Set([...observerConfig.observerExplicitConfigKeys ?? [], "observerMaxOutputTokens"])]
 			};
 			const observer = new ObserverClient(observerConfigWithOverrides);
 			const result = opts.observerTierRouting === true ? await replayBatchExtractionWithTierRouting(resolveDbOpt(opts), observerConfigWithOverrides, {
@@ -5242,7 +5252,7 @@ function createMemoryExtractionBenchmarkCommand() {
 				observerReasoningEffort: opts.reasoningEffort === void 0 ? observerConfig.observerReasoningEffort : opts.reasoningEffort.trim() || null,
 				observerReasoningSummary: opts.reasoningSummary === void 0 ? observerConfig.observerReasoningSummary : opts.reasoningSummary.trim() || null,
 				observerMaxOutputTokens: maxOutputTokens ?? observerConfig.observerMaxOutputTokens ?? observerConfig.observerMaxTokens,
-				observerExplicitConfigKeys: maxOutputTokens === null ? observerConfig.observerExplicitConfigKeys : [...new Set([...observerConfig.observerExplicitConfigKeys ?? [], "observerMaxOutputTokens"])]
+				observerExplicitConfigKeys: maxOutputTokens === null ? observerConfig.observerExplicitConfigKeys : [.../* @__PURE__ */ new Set([...observerConfig.observerExplicitConfigKeys ?? [], "observerMaxOutputTokens"])]
 			};
 			const observer = new ObserverClient(observerConfigWithOverrides);
 			const runs = [];
@@ -5584,9 +5594,9 @@ memoryCommand.addCommand(createMemoryRelinkReportCommand());
 memoryCommand.addCommand(createMemoryRelinkPlanCommand());
 //#endregion
 //#region src/commands/pack.ts
-var MAX_INTERNAL_LEDGER_INPUT_BYTES = 16 * 1024;
+var MAX_INTERNAL_LEDGER_INPUT_BYTES = 16384;
 var INTERNAL_LEDGER_INPUT_TIMEOUT_MS = 1e3;
-var FORBIDDEN_INTERNAL_KEYS = new Set([
+var FORBIDDEN_INTERNAL_KEYS = /* @__PURE__ */ new Set([
 	"body",
 	"context",
 	"pack",
@@ -5598,7 +5608,7 @@ var FORBIDDEN_INTERNAL_KEYS = new Set([
 	"raw_prompt",
 	"title"
 ]);
-var INTERNAL_LEDGER_KEYS = new Set([
+var INTERNAL_LEDGER_KEYS = /* @__PURE__ */ new Set([
 	"action",
 	"attempt_id",
 	"started_at",
@@ -5613,13 +5623,13 @@ var INTERNAL_LEDGER_KEYS = new Set([
 	"failure_stage",
 	"original_attempt_id"
 ]);
-var INTERNAL_LEDGER_ACTIONS = new Set([
+var INTERNAL_LEDGER_ACTIONS = /* @__PURE__ */ new Set([
 	"record",
 	"delivery",
 	"cache_reuse"
 ]);
-var INTERNAL_RETRIEVAL_STATUSES = new Set(["skipped", "failed"]);
-var INTERNAL_DELIVERY_STATUSES = new Set([
+var INTERNAL_RETRIEVAL_STATUSES = /* @__PURE__ */ new Set(["skipped", "failed"]);
+var INTERNAL_DELIVERY_STATUSES = /* @__PURE__ */ new Set([
 	"handed_off",
 	"failed",
 	"unknown"
@@ -6530,7 +6540,8 @@ async function startForegroundViewer(invocation) {
 	const sweeper = new RawEventSweeper(store, { observer });
 	sweeper.start();
 	const syncAbort = new AbortController();
-	const syncConfig = readCoordinatorSyncConfig(invocation.configPath ? readCodememConfigFileAtPath(invocation.configPath) : readCodememConfigFile());
+	const config = invocation.configPath ? readCodememConfigFileAtPath(invocation.configPath) : readCodememConfigFile();
+	const syncConfig = readCoordinatorSyncConfig(config);
 	const syncEnabled = syncConfig.syncEnabled;
 	const dbPath = resolveDbPath(invocation.dbPath ?? void 0);
 	if (!await terminateTrustedMaintenanceWorker(dbPath, {
@@ -6826,29 +6837,39 @@ function migrateLegacyOpencodePlugin() {
 		p.log.step("Removed legacy compat lib: ~/.config/opencode/lib/compat.js");
 	} catch {}
 }
-/** Detect and upgrade legacy uvx/uv-based MCP entries in OpenCode config. */
+function isExactStringArray(value, expected) {
+	return Array.isArray(value) && value.length === expected.length && value.every((entry, index) => entry === expected[index]);
+}
+/** Detect and upgrade legacy uvx/uv or managed single-package MCP entries in OpenCode config. */
 function migrateLegacyOpencodeMcp(config) {
 	const mcpConfig = config.mcp;
 	if (!mcpConfig || typeof mcpConfig !== "object") return false;
 	const entry = mcpConfig.codemem;
 	if (!entry || typeof entry !== "object") return false;
 	const command = entry.command;
-	if (Array.isArray(command) && command.some((arg) => typeof arg === "string" && (arg === "uvx" || arg === "uv")) || typeof command === "string" && (command === "uvx" || command === "uv")) {
-		p.log.step("Upgrading legacy uvx MCP entry to npx");
+	const isLegacyUv = Array.isArray(command) && command.some((arg) => typeof arg === "string" && (arg === "uvx" || arg === "uv")) || typeof command === "string" && (command === "uvx" || command === "uv");
+	const isManagedSinglePackageNpx = isExactStringArray(command, [
+		"npx",
+		"-y",
+		"codemem",
+		"mcp"
+	]) || isExactStringArray(command, [
+		"npx",
+		"codemem",
+		"mcp"
+	]);
+	if (isLegacyUv || isManagedSinglePackageNpx) {
+		p.log.step("Upgrading managed MCP entry to the current npm launcher");
+		const launcher = codememMcpLauncher();
 		mcpConfig.codemem = {
-			type: "local",
-			command: [
-				"npx",
-				"codemem",
-				"mcp"
-			],
-			enabled: true
+			...entry,
+			command: [launcher.command, ...launcher.args]
 		};
 		return true;
 	}
 	return false;
 }
-/** Detect and upgrade legacy uvx-based MCP entries in Claude settings. */
+/** Detect and upgrade legacy uvx or managed single-package MCP entries in Claude settings. */
 function migrateLegacyClaudeMcp(settings) {
 	const mcpServers = settings.mcpServers;
 	if (!mcpServers || typeof mcpServers !== "object") return false;
@@ -6856,15 +6877,19 @@ function migrateLegacyClaudeMcp(settings) {
 	if (!entry || typeof entry !== "object") return false;
 	const command = entry.command;
 	const args = entry.args;
-	if (typeof command === "string" && (command === "uvx" || command === "uv") || Array.isArray(args) && args.some((arg) => typeof arg === "string" && (arg.startsWith("codemem==") || arg === "uvx"))) {
-		p.log.step("Upgrading legacy uvx Claude MCP entry to npx");
+	const isLegacyUv = typeof command === "string" && (command === "uvx" || command === "uv") || Array.isArray(args) && args.some((arg) => typeof arg === "string" && (arg.startsWith("codemem==") || arg === "uvx"));
+	const isManagedSinglePackageNpx = command === "npx" && isExactStringArray(args, [
+		"-y",
+		"codemem",
+		"mcp"
+	]);
+	if (isLegacyUv || isManagedSinglePackageNpx) {
+		p.log.step("Upgrading managed Claude MCP entry to the current npm launcher");
+		const launcher = codememMcpLauncher();
 		mcpServers.codemem = {
-			command: "npx",
-			args: [
-				"-y",
-				"codemem",
-				"mcp"
-			]
+			...entry,
+			command: launcher.command,
+			args: launcher.args
 		};
 		return true;
 	}
@@ -6919,13 +6944,10 @@ function installMcp(force) {
 		return true;
 	}
 	if (!migrated) {
+		const launcher = codememMcpLauncher();
 		mcpConfig.codemem = {
 			type: "local",
-			command: [
-				"npx",
-				"codemem",
-				"mcp"
-			],
+			command: [launcher.command, ...launcher.args],
 			enabled: true
 		};
 		config.mcp = mcpConfig;
@@ -6942,7 +6964,8 @@ function installMcp(force) {
 function isClaudeHooksPluginInstalled() {
 	const pluginDir = join(claudeConfigDir(), "plugins", "codemem");
 	if (existsSync(pluginDir)) return true;
-	if (existsSync(join(pluginDir, "hooks", "hooks.json"))) return true;
+	const hooksJson = join(pluginDir, "hooks", "hooks.json");
+	if (existsSync(hooksJson)) return true;
 	return false;
 }
 function installClaudeMcp(force) {
@@ -6959,13 +6982,10 @@ function installClaudeMcp(force) {
 	if ("codemem" in mcpServers && !force && !migrated) p.log.info(`Claude MCP entry already exists in ${settingsPath}`);
 	else {
 		if (!migrated) {
+			const launcher = codememMcpLauncher();
 			mcpServers.codemem = {
-				command: "npx",
-				args: [
-					"-y",
-					"codemem",
-					"mcp"
-				]
+				command: launcher.command,
+				args: launcher.args
 			};
 			settings.mcpServers = mcpServers;
 		}
@@ -6988,25 +7008,47 @@ function installClaudeMcp(force) {
 	return true;
 }
 /** The MCP server table appended to Codex config.toml. */
-var CODEX_MCP_BLOCK = [
-	"[mcp_servers.codemem]",
-	"command = \"npx\"",
-	"args = [\"-y\", \"codemem\", \"mcp\"]",
-	"startup_timeout_sec = 30",
-	"tool_timeout_sec = 60"
-].join("\n");
+function codexMcpBlock() {
+	const launcher = codememMcpLauncher();
+	const args = launcher.args.map((arg) => JSON.stringify(arg)).join(", ");
+	return [
+		"[mcp_servers.codemem]",
+		`command = ${JSON.stringify(launcher.command)}`,
+		`args = [${args}]`,
+		"startup_timeout_sec = 30",
+		"tool_timeout_sec = 60"
+	].join("\n");
+}
 var CODEX_MCP_TABLE_RE = /^[ \t]*\[[ \t]*mcp_servers[ \t]*\.[ \t]*("?)codemem\1[ \t]*\]/m;
+function migrateManagedCodexMcp(existing) {
+	const tableMatch = CODEX_MCP_TABLE_RE.exec(existing);
+	if (!tableMatch || tableMatch.index == null) return null;
+	const blockStart = tableMatch.index;
+	const nextTable = /^[ \t]*\[/gm;
+	nextTable.lastIndex = blockStart + tableMatch[0].length;
+	const blockEnd = nextTable.exec(existing)?.index ?? existing.length;
+	const block = existing.slice(blockStart, blockEnd);
+	const commandPattern = /^([ \t]*command[ \t]*=[ \t]*)"npx"([ \t]*(?:#.*)?)$/m;
+	const argsPattern = /^([ \t]*args[ \t]*=[ \t]*)\[[ \t]*"-y"[ \t]*,[ \t]*"codemem"[ \t]*,[ \t]*"mcp"[ \t]*\]([ \t]*(?:#.*)?)$/m;
+	if (!commandPattern.test(block) || !argsPattern.test(block)) return null;
+	const launcher = codememMcpLauncher();
+	const args = launcher.args.map((arg) => JSON.stringify(arg)).join(", ");
+	const migrated = block.replace(commandPattern, `$1${JSON.stringify(launcher.command)}$2`).replace(argsPattern, `$1[${args}]$2`);
+	return `${existing.slice(0, blockStart)}${migrated}${existing.slice(blockEnd)}`;
+}
 /** Marker substring identifying codemem-owned hook commands. */
 var CODEMEM_HOOK_MARKER = "codemem codex-hook-";
 /**
 * Resolve how Codex hooks should invoke codemem. Prefer a direct `codemem` call
-* when it's on PATH (fast — no per-hook resolution); fall back to `npx -y codemem`
-* only when codemem isn't installed (e.g. setup was run via `npx codemem setup`),
-* so capture/recall still work without a global install. Mirrors the plugin
-* wrapper's `codemem`-first / `npx` fallback model.
+* when it's on PATH (fast — no per-hook resolution); fall back to an `npx`
+* invocation that requests both `codemem` and `@codemem/embeddings` when codemem
+* isn't installed (e.g. setup was run via `npx codemem setup`). The paired
+* runtime keeps the local-store inject path (codex-hook-inject) able to embed
+* instead of degrading to FTS. Mirrors the MCP launcher's two-package model.
 */
 function codememCodexHookBase() {
-	return codememOnPath() ? "codemem" : "npx -y codemem";
+	if (codememOnPath(true)) return "codemem";
+	return "npx -y --package codemem --package @codemem/embeddings codemem";
 }
 /**
 * Build the codemem-owned hook groups keyed by Codex event name, given the
@@ -7048,28 +7090,127 @@ function isCodememHookGroup(group) {
 	return hooks.some((h) => h != null && typeof h === "object" && typeof h.command === "string" && h.command.includes(CODEMEM_HOOK_MARKER));
 }
 /**
-* True if a resolved bin path is a transient npx/dlx cache bin. When setup runs
-* via `npx -y codemem setup --codex-only`, npx exposes this package's bin on PATH for
-* the duration of the run, then removes it — so Codex would later fail to find a
-* bare `codemem`. Such paths must NOT count as "on PATH" for hook command baking.
+* True if a resolved bin path is a transient/project-local bin that will not be
+* on PATH for the globally-configured MCP hosts (OpenCode/Claude/Codex).
+*
+* - `_npx` / `.pnpm/dlx`: npx/dlx caches exposed only for the duration of a
+*   `npx -y codemem setup` run, then removed.
+* - `node_modules/.bin`: a project-local install exposed only while setup runs
+*   through `npm exec` / `pnpm exec` / a package script. The global hosts do not
+*   inherit that project-local PATH, so baking a bare `codemem` command would
+*   later fail to resolve.
+*
+* Such paths must NOT count as "on PATH" for launcher/hook command baking.
 */
 function isTransientNpxBinPath(resolved) {
-	return /[/\\]_npx[/\\]/.test(resolved) || /[/\\]\.pnpm[/\\]dlx[/\\]/.test(resolved);
+	return /[/\\]_npx[/\\]/.test(resolved) || /[/\\]\.pnpm[/\\]dlx[/\\]/.test(resolved) || /[/\\]node_modules[/\\]\.bin[/\\]/.test(resolved);
+}
+/** Parse a semver core (major.minor.patch) plus optional prerelease tail. */
+function parseSetupSemver(version) {
+	const match = /^(\d+)\.(\d+)\.(\d+)(?:-.+)?$/.exec(version.trim());
+	if (!match) return null;
+	return {
+		core: [
+			Number(match[1]),
+			Number(match[2]),
+			Number(match[3])
+		],
+		prerelease: version.includes("-")
+	};
+}
+/**
+* True when a durable `codemem --version` output should be trusted to launch
+* `codemem mcp` directly. Mirrors the OpenCode plugin's runner check: accept the
+* exact build version, or a clean (non-prerelease) release at least as new as
+* this build. This prevents baking a bare launcher that later resolves to an
+* older global install sitting alongside the transient npx bin.
+*/
+function isDurableCodememVersionTrusted(versionOutput) {
+	if (versionOutput === VERSION) return true;
+	const candidate = parseSetupSemver(versionOutput);
+	const current = parseSetupSemver(VERSION);
+	if (!candidate || !current || candidate.prerelease) return false;
+	for (let i = 0; i < 3; i++) {
+		const c = candidate.core[i] ?? 0;
+		const v = current.core[i] ?? 0;
+		if (c > v) return true;
+		if (c < v) return false;
+	}
+	return true;
 }
 /**
 * Detect whether a durable `codemem` resolves on PATH (excluding a transient
-* npx/dlx bin that vanishes after this process exits).
+* npx/dlx bin that vanishes after this process exits). When `requireTrustedVersion`
+* is set, the durable binary must also report a version compatible with this
+* build before it is trusted, so setup never bakes a bare launcher that resolves
+* to a stale global install.
 */
-function codememOnPath() {
+function codememOnPath(requireTrustedVersion = false) {
 	try {
-		const resolved = execFileSync(process.platform === "win32" ? "where" : "which", ["codemem"], { encoding: "utf-8" }).split(/\r?\n/).map((line) => line.trim()).find(Boolean);
-		if (!resolved) return false;
-		return !isTransientNpxBinPath(resolved);
+		const command = process.platform === "win32" ? "where" : "which";
+		const args = process.platform === "win32" ? ["codemem"] : ["-a", "codemem"];
+		const durable = execFileSync(command, args, { encoding: "utf-8" }).split(/\r?\n/).map((line) => line.trim()).filter(Boolean).filter((candidate) => !isTransientNpxBinPath(candidate));
+		if (durable.length === 0) return false;
+		if (!requireTrustedVersion) return true;
+		const [firstDurable] = durable;
+		if (firstDurable == null) return false;
+		const version = probeDurableCodememVersion(firstDurable);
+		return version != null && isDurableCodememVersionTrusted(version);
 	} catch {
 		return false;
 	}
 }
 /**
+* Run `<binary> --version`, returning trimmed stdout or null on failure. On
+* Windows a global npm install resolves to a `.cmd`/`.bat` shim that Node's
+* shell-less execFileSync cannot execute directly, so invoke it through
+* `cmd.exe /c` there; POSIX binaries run directly.
+*/
+function probeDurableCodememVersion(binaryPath) {
+	try {
+		return (process.platform === "win32" ? execFileSync("cmd.exe", [
+			"/c",
+			binaryPath,
+			"--version"
+		], {
+			encoding: "utf-8",
+			timeout: 3e3,
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			]
+		}) : execFileSync(binaryPath, ["--version"], {
+			encoding: "utf-8",
+			timeout: 3e3,
+			stdio: [
+				"ignore",
+				"pipe",
+				"ignore"
+			]
+		})).trim();
+	} catch {
+		return null;
+	}
+}
+function codememMcpLauncher(onPath = codememOnPath(true)) {
+	return onPath ? {
+		command: "codemem",
+		args: ["mcp"]
+	} : {
+		command: "npx",
+		args: [
+			"-y",
+			"--package",
+			"codemem",
+			"--package",
+			"@codemem/embeddings",
+			"codemem",
+			"mcp"
+		]
+	};
+}
+/**
 * Append the codemem MCP server table to Codex config.toml without rewriting
 * unrelated content. Returns true on success.
 */
@@ -7077,6 +7218,20 @@ function installCodexMcp(codexHome, force) {
 	const configPath = join(codexHome, "config.toml");
 	const existing = existsSync(configPath) ? readFileSync(configPath, "utf-8") : "";
 	if (CODEX_MCP_TABLE_RE.test(existing)) {
+		const migrated = migrateManagedCodexMcp(existing);
+		if (migrated != null) {
+			try {
+				copyFileSync(configPath, `${configPath}.codemem.bak`);
+			} catch {}
+			try {
+				writeFileSync(configPath, migrated, "utf-8");
+				p.log.success(`Codex MCP entry upgraded: ${configPath}`);
+				return true;
+			} catch (err) {
+				p.log.error(`Failed to write ${configPath}: ${err instanceof Error ? err.message : String(err)}`);
+				return false;
+			}
+		}
 		if (force) p.log.info(`Codex MCP entry already exists in ${configPath} — left as-is (TOML is not rewritten in place)`);
 		else p.log.info(`Codex MCP entry already exists in ${configPath}`);
 		return true;
@@ -7086,7 +7241,7 @@ function installCodexMcp(codexHome, force) {
 	} catch {}
 	let next = existing;
 	if (next.length > 0 && !next.endsWith("\n\n")) next += next.endsWith("\n") ? "\n" : "\n\n";
-	next += `${CODEX_MCP_BLOCK}\n`;
+	next += `${codexMcpBlock()}\n`;
 	try {
 		writeFileSync(configPath, next, "utf-8");
 		p.log.success(`Codex MCP entry installed: ${configPath}`);
@@ -7113,12 +7268,38 @@ function installCodexHooks(codexHome, force) {
 	let hooks = config.hooks;
 	if (hooks == null || typeof hooks !== "object" || Array.isArray(hooks)) hooks = {};
 	const ours = buildCodememCodexHookGroups(codememCodexHookBase());
+	const currentCommands = new Set(Object.values(ours).flatMap((groups) => groups.flatMap((group) => group.hooks.map((hook) => hook.command))));
+	const groupNeedsMigration = (group) => {
+		if (!isCodememHookGroup(group)) return false;
+		const hooksList = group.hooks;
+		if (!Array.isArray(hooksList)) return false;
+		return hooksList.some((hook) => {
+			if (hook == null || typeof hook !== "object") return false;
+			const command = hook.command;
+			if (typeof command !== "string") return false;
+			return command.includes(CODEMEM_HOOK_MARKER) && !currentCommands.has(command);
+		});
+	};
 	let changed = false;
+	const isCodememOwnedHook = (hook) => hook != null && typeof hook === "object" && typeof hook.command === "string" && hook.command.includes(CODEMEM_HOOK_MARKER);
+	const stripCodememHooks = (group) => {
+		if (!isCodememHookGroup(group)) return group;
+		const hooksList = group.hooks;
+		if (!Array.isArray(hooksList)) return null;
+		const preservedHooks = hooksList.filter((hook) => !isCodememOwnedHook(hook));
+		if (preservedHooks.length === 0) return null;
+		return {
+			...group,
+			hooks: preservedHooks
+		};
+	};
 	for (const [event, ourGroups] of Object.entries(ours)) {
 		const current = hooks[event];
 		const existingGroups = Array.isArray(current) ? [...current] : [];
-		if (existingGroups.some(isCodememHookGroup) && !force) continue;
-		const preserved = existingGroups.filter((g) => !isCodememHookGroup(g));
+		const hasCodemem = existingGroups.some(isCodememHookGroup);
+		const needsMigration = existingGroups.some(groupNeedsMigration);
+		if (hasCodemem && !force && !needsMigration) continue;
+		const preserved = existingGroups.map((group) => stripCodememHooks(group)).filter((group) => group != null);
 		hooks[event] = [...preserved, ...ourGroups];
 		changed = true;
 	}
@@ -7154,8 +7335,11 @@ function installCodex(force) {
 		p.log.error(`Failed to create Codex home ${codexHome}: ${err instanceof Error ? err.message : String(err)}`);
 		return false;
 	}
-	if (codememOnPath()) p.log.info("Codex hooks will call `codemem` directly (found on PATH).");
-	else p.log.info("`codemem` is not on PATH, so Codex hooks will run via `npx -y codemem` (works without a global install). For lower hook latency: npm i -g codemem");
+	if (codememOnPath(true)) p.log.info("Codex hooks will call `codemem` directly (found on PATH).");
+	else {
+		const globalInstallCommand = process.platform === "linux" ? "env ONNXRUNTIME_NODE_INSTALL=skip npm install -g codemem @codemem/embeddings" : "npm install -g codemem @codemem/embeddings";
+		p.log.info(`\`codemem\` is not on PATH, so Codex hooks will run via \`npx -y --package codemem --package @codemem/embeddings codemem\` (works without a global install). For lower hook latency: ${globalInstallCommand}`);
+	}
 	let ok = true;
 	ok = installCodexMcp(codexHome, force) && ok;
 	ok = installCodexHooks(codexHome, force) && ok;
@@ -7285,7 +7469,7 @@ var statsCommand = statsCmd.action((opts) => {
 //#region src/commands/status.ts
 var MAX_ATTENTION = 20;
 var DEFAULT_VIEWER_PORT = 38888;
-var RECENT_FAILURE_WINDOW_MS = 1440 * 60 * 1e3;
+var RECENT_FAILURE_WINDOW_MS = 864e5;
 var OBSERVER_IDENTITY_KEYS = [
 	"observer_provider",
 	"observer_model",
@@ -8432,7 +8616,8 @@ bootstrapCmd.action(async (peerArg, opts) => {
 		process.exitCode = 2;
 		return;
 	}
-	const store = new MemoryStore(resolveDbPath(resolveDbOpt(opts)));
+	const dbPath = resolveDbPath(resolveDbOpt(opts));
+	const store = new MemoryStore(dbPath);
 	try {
 		const pageSize = Math.max(1, Number.parseInt(opts.pageSize, 10) || 2e3);
 		const keysDir = opts.keysDir ?? void 0;
@@ -8603,7 +8788,7 @@ syncCoordinatorAlias.hook("preAction", (_thisCmd, actionCmd) => {
 syncCommand.addCommand(syncCoordinatorAlias, { hidden: true });
 //#endregion
 //#region src/commands/update.ts
-var INSTALL_TIMEOUT_MS = 300 * 1e3;
+var INSTALL_TIMEOUT_MS = 42e4;
 var VERIFY_TIMEOUT_MS = 3e4;
 var PUBLIC_NPM_REGISTRY = "https://registry.npmjs.org/";
 var UPDATE_LOCK_FILE = "update-install.lock";
@@ -8625,7 +8810,7 @@ async function removeStaleInstallLock(lockPath) {
 		const pid = Number.parseInt(rawPid.trim(), 10);
 		if (Number.isSafeInteger(pid) && pid > 0) {
 			if (isProcessAlive(pid)) return false;
-		} else if (Date.now() - lockStat.mtimeMs <= 33e4) return false;
+		} else if (Date.now() - lockStat.mtimeMs <= 45e4) return false;
 		await unlink(lockPath);
 		return true;
 	} catch {
@@ -8656,6 +8841,7 @@ function runCommand(command, args, timeoutMs, options = {}) {
 		const child = spawn(command, args, {
 			cwd: options.cwd,
 			detached: process.platform !== "win32",
+			env: options.env,
 			shell: false,
 			stdio: [
 				"ignore",
@@ -8789,12 +8975,13 @@ function renderHumanStatus(status) {
 }
 var checkCommand = addJsonOption(new Command("check").description("Check for a newer stable codemem release")).addOption(new Option("-r, --refresh", "bypass the six-hour release cache")).configureHelp(helpStyle).action(async (options) => {
 	try {
+		const installKind = detectInstallKind({
+			entryPath: process.argv[1] ?? "",
+			env: process.env
+		});
 		const status = await getUpdateStatus({
 			currentVersion: VERSION,
-			installKind: detectInstallKind({
-				entryPath: process.argv[1] ?? "",
-				env: process.env
-			}),
+			installKind,
 			refresh: options.refresh
 		});
 		if (status.latest_version === null) {
@@ -8820,15 +9007,29 @@ var checkCommand = addJsonOption(new Command("check").description("Check for a n
 		}
 	}
 });
-var installCommand = addJsonOption(new Command("install").description("Install an eligible stable codemem update")).configureHelp(helpStyle).action(async (options) => {
+function updateInstallArgs(npmArgs, targetVersion) {
+	const installArgs = [
+		"install",
+		"-g",
+		"--registry",
+		PUBLIC_NPM_REGISTRY,
+		`--@codemem:registry=${PUBLIC_NPM_REGISTRY}`,
+		`codemem@${targetVersion}`,
+		`@codemem/embeddings@${targetVersion}`
+	];
+	if (process.platform !== "win32") return installArgs;
+	return [...npmArgs.slice(0, 3), windowsCommandLine(npmArgs[3] ?? "", installArgs)];
+}
+async function installUpdate(options) {
 	let releaseInstallLock = null;
 	try {
+		const installKind = detectInstallKind({
+			entryPath: process.argv[1] ?? "",
+			env: process.env
+		});
 		const status = await getUpdateStatus({
 			currentVersion: VERSION,
-			installKind: detectInstallKind({
-				entryPath: process.argv[1] ?? "",
-				env: process.env
-			}),
+			installKind,
 			refresh: true
 		});
 		if (!status.auto_update_eligible || !status.latest_version) {
@@ -8842,20 +9043,12 @@ var installCommand = addJsonOption(new Command("install").description("Install a
 		}
 		releaseInstallLock = await acquireInstallLock();
 		const npm = await resolveInstallCommand();
-		const installation = await runCommand(npm.command, process.platform === "win32" ? [...npm.args.slice(0, 3), windowsCommandLine(npm.args[3] ?? "", [
-			"install",
-			"-g",
-			"--registry",
-			PUBLIC_NPM_REGISTRY,
-			`codemem@${targetVersion}`
-		])] : [
-			"install",
-			"-g",
-			"--registry",
-			PUBLIC_NPM_REGISTRY,
-			`codemem@${targetVersion}`
-		], INSTALL_TIMEOUT_MS, {
+		const installation = await runCommand(npm.command, updateInstallArgs(npm.args, targetVersion), INSTALL_TIMEOUT_MS, {
 			cwd: npm.cwd,
+			env: process.platform === "linux" ? {
+				...process.env,
+				ONNXRUNTIME_NODE_INSTALL: "skip"
+			} : void 0,
 			windowsVerbatimArguments: process.platform === "win32"
 		});
 		if (installation.exitCode !== 0) {
@@ -8882,8 +9075,9 @@ var installCommand = addJsonOption(new Command("install").description("Install a
 	} finally {
 		await releaseInstallLock?.();
 	}
-});
-var updateCommand = new Command("update").description("Inspect and manage codemem updates").configureHelp(helpStyle).addCommand(checkCommand).addCommand(installCommand);
+}
+var installCommand = addJsonOption(new Command("install").description("Install an eligible stable codemem update")).configureHelp(helpStyle).action(installUpdate);
+var updateCommand = new Command("update").description("Inspect and manage codemem updates").enablePositionalOptions().configureHelp(helpStyle).addCommand(checkCommand).addCommand(installCommand);
 //#endregion
 //#region src/commands/version.ts
 var versionCommand = new Command("version").configureHelp(helpStyle).description("Print codemem version").action(() => {