@rewind-ai/cli 0.6.3 → 0.6.4

package/dist/src/clients/mcp-json.d.ts

@@ -0,0 +1,59 @@
+/**
+ * Safe Cursor MCP JSON editing.
+ * Preserves unrelated servers; never overwrites malformed config.
+ */
+export interface McpServerEntry {
+    command?: string;
+    args?: string[];
+    env?: Record<string, string>;
+    url?: string;
+    [key: string]: unknown;
+}
+export interface McpConfig {
+    mcpServers?: Record<string, McpServerEntry>;
+    [key: string]: unknown;
+}
+export declare class McpConfigError extends Error {
+    readonly name = "McpConfigError";
+    constructor(message: string);
+}
+/** Cursor user config directory (~/.cursor), overridable for tests. */
+export declare function getCursorUserDir(override?: string | undefined): string;
+export declare function getUserMcpConfigPath(cursorDir?: string): string;
+export declare function projectMcpConfigPath(projectRoot: string): string;
+export declare function writeJsonAtomic(file: string, data: unknown): Promise<void>;
+export declare function backupFile(file: string): Promise<string | null>;
+/**
+ * Read MCP config. Missing file → empty config.
+ * Malformed JSON → throws McpConfigError (caller must not overwrite).
+ */
+export declare function readMcpConfig(file: string): Promise<{
+    config: McpConfig;
+    existed: boolean;
+    raw: string | null;
+}>;
+export interface MutateMcpResult {
+    path: string;
+    changed: boolean;
+    backupPath: string | null;
+    removedKeys: string[];
+    upsertedKeys: string[];
+}
+/**
+ * Atomically mutate mcpServers. Backs up before write.
+ * Never truncates on failure; malformed input throws before any write.
+ */
+export declare function mutateMcpConfig(file: string, mutate: (servers: Record<string, McpServerEntry>) => {
+    changed: boolean;
+    removedKeys?: string[];
+    upsertedKeys?: string[];
+}): Promise<MutateMcpResult>;
+/** True if MCP entry still points at source-repo-only tooling. */
+export declare function isLegacySourceMcpEntry(entry: {
+    command?: string;
+    args?: string[];
+}): boolean;
+/** Detect REWIND-managed MCP server keys. */
+export declare function isRewindServerKey(key: string): boolean;
+export declare function entryProjectRoot(entry: McpServerEntry | undefined): string | null;
+export declare function looksLikeRewindEntry(key: string, entry: McpServerEntry): boolean;

package/dist/src/clients/mcp-json.js

@@ -0,0 +1,162 @@
+/**
+ * Safe Cursor MCP JSON editing.
+ * Preserves unrelated servers; never overwrites malformed config.
+ */
+import path from "node:path";
+import os from "node:os";
+import { access, mkdir, readFile, writeFile, rename, copyFile, } from "node:fs/promises";
+import { constants as fsConstants } from "node:fs";
+export class McpConfigError extends Error {
+    name = "McpConfigError";
+    constructor(message) {
+        super(message);
+    }
+}
+async function exists(p) {
+    try {
+        await access(p, fsConstants.F_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/** Cursor user config directory (~/.cursor), overridable for tests. */
+export function getCursorUserDir(override = process.env.REWIND_CURSOR_DIR) {
+    if (override)
+        return path.resolve(override);
+    return path.join(os.homedir(), ".cursor");
+}
+export function getUserMcpConfigPath(cursorDir = getCursorUserDir()) {
+    return path.join(cursorDir, "mcp.json");
+}
+export function projectMcpConfigPath(projectRoot) {
+    return path.join(projectRoot, ".cursor", "mcp.json");
+}
+export async function writeJsonAtomic(file, data) {
+    await mkdir(path.dirname(file), { recursive: true });
+    const tmp = `${file}.tmp-${process.pid}-${Date.now()}`;
+    const body = JSON.stringify(data, null, 2) + "\n";
+    await writeFile(tmp, body, "utf8");
+    // Validate temp before rename
+    JSON.parse(await readFile(tmp, "utf8"));
+    await rename(tmp, file);
+}
+export async function backupFile(file) {
+    if (!(await exists(file)))
+        return null;
+    const stamp = new Date().toISOString().replace(/[:.]/g, "-");
+    const backup = `${file}.rewind-backup-${stamp}`;
+    await copyFile(file, backup);
+    // Also keep a stable latest pointer for recovery docs
+    await copyFile(file, `${file}.rewind-backup`);
+    return backup;
+}
+/**
+ * Read MCP config. Missing file → empty config.
+ * Malformed JSON → throws McpConfigError (caller must not overwrite).
+ */
+export async function readMcpConfig(file) {
+    if (!(await exists(file))) {
+        return { config: { mcpServers: {} }, existed: false, raw: null };
+    }
+    const raw = await readFile(file, "utf8");
+    try {
+        const parsed = JSON.parse(raw);
+        if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+            throw new McpConfigError(`MCP config is not a JSON object: ${file}. Fix or remove it, then re-run rewind setup.`);
+        }
+        const config = parsed;
+        if (config.mcpServers != null && typeof config.mcpServers !== "object") {
+            throw new McpConfigError(`MCP config mcpServers is not an object: ${file}. Fix or remove it, then re-run rewind setup.`);
+        }
+        if (!config.mcpServers)
+            config.mcpServers = {};
+        return { config, existed: true, raw };
+    }
+    catch (err) {
+        if (err instanceof McpConfigError)
+            throw err;
+        throw new McpConfigError(`MCP config is malformed JSON at ${file}. ` +
+            `REWIND will not overwrite it. Fix the file manually, then re-run rewind setup. ` +
+            `(${err instanceof Error ? err.message : String(err)})`);
+    }
+}
+/**
+ * Atomically mutate mcpServers. Backs up before write.
+ * Never truncates on failure; malformed input throws before any write.
+ */
+export async function mutateMcpConfig(file, mutate) {
+    const { config, existed } = await readMcpConfig(file);
+    const servers = {
+        ...(config.mcpServers ?? {}),
+    };
+    const result = mutate(servers);
+    if (!result.changed) {
+        return {
+            path: file,
+            changed: false,
+            backupPath: null,
+            removedKeys: [],
+            upsertedKeys: [],
+        };
+    }
+    let backupPath = null;
+    if (existed) {
+        backupPath = await backupFile(file);
+    }
+    const next = { ...config, mcpServers: servers };
+    await writeJsonAtomic(file, next);
+    // Post-write validation
+    const verify = await readMcpConfig(file);
+    if (!verify.config.mcpServers) {
+        throw new McpConfigError(`Post-write validation failed for ${file}`);
+    }
+    return {
+        path: file,
+        changed: true,
+        backupPath,
+        removedKeys: result.removedKeys ?? [],
+        upsertedKeys: result.upsertedKeys ?? [],
+    };
+}
+/** True if MCP entry still points at source-repo-only tooling. */
+export function isLegacySourceMcpEntry(entry) {
+    const cmd = entry.command ?? "";
+    const joined = [cmd, ...(entry.args ?? [])].join(" ");
+    if (/tsx/i.test(joined) && /src[/\\]cli\.ts/i.test(joined))
+        return true;
+    if (/node_modules[/\\]\.bin[/\\]tsx/i.test(cmd))
+        return true;
+    if (/src[/\\]cli\.ts/i.test(joined) &&
+        !/dist[/\\]src[/\\]cli\.js/i.test(joined)) {
+        return true;
+    }
+    return false;
+}
+/** Detect REWIND-managed MCP server keys. */
+export function isRewindServerKey(key) {
+    return key === "rewind" || key.startsWith("rewind-");
+}
+export function entryProjectRoot(entry) {
+    const root = entry?.env?.REWIND_PROJECT_ROOT;
+    if (root == null || String(root).trim() === "")
+        return null;
+    return path.resolve(String(root).trim());
+}
+export function looksLikeRewindEntry(key, entry) {
+    if (isRewindServerKey(key))
+        return true;
+    if (entry.env?.REWIND_PROJECT_ROOT)
+        return true;
+    const joined = [entry.command ?? "", ...(entry.args ?? [])].join(" ");
+    if (/@rewind-ai[/\\]cli/i.test(joined))
+        return true;
+    if (/[/\\]cli\.(js|ts)\b/i.test(joined) && /\bmcp\b/.test(joined)) {
+        // Heuristic only when clearly REWIND-ish
+        if (/rewind/i.test(joined))
+            return true;
+    }
+    return false;
+}
+//# sourceMappingURL=mcp-json.js.map

package/dist/src/clients/mcp-json.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mcp-json.js","sourceRoot":"","sources":["../../../src/clients/mcp-json.ts"],"names":[],"mappings":"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"}

package/dist/src/clients/project-registry.d.ts

@@ -0,0 +1,36 @@
+/**
+ * Global REWIND project registry (~/.rewind/projects.json).
+ * Installation / routing / discovery only — not the transaction ledger.
+ */
+export type CursorIntegrationState = "configured" | "needs_reload" | "connected" | "removed" | "failed";
+export interface RegisteredProject {
+    id: string;
+    path: string;
+    displayName: string;
+    serverName: string;
+    createdAt: string;
+    updatedAt: string;
+    cursorIntegration: CursorIntegrationState;
+}
+export interface ProjectRegistry {
+    version: 1;
+    updatedAt: string;
+    projects: RegisteredProject[];
+}
+export declare function getProjectsRegistryPath(userDir?: string): string;
+export declare function slugifyProjectName(name: string): string;
+/**
+ * Stable readable MCP server name for a project.
+ * Collisions with a different path get a short path suffix.
+ */
+export declare function allocateServerName(projectRoot: string, existing: RegisteredProject[]): string;
+export declare function loadProjectRegistry(userDir?: string): Promise<ProjectRegistry>;
+export declare function saveProjectRegistry(registry: ProjectRegistry, userDir?: string): Promise<void>;
+export declare function upsertRegisteredProject(projectRoot: string, opts?: {
+    serverName?: string;
+    cursorIntegration?: CursorIntegrationState;
+    displayName?: string;
+}, userDir?: string): Promise<RegisteredProject>;
+export declare function findRegisteredProject(projectRoot: string, userDir?: string): Promise<RegisteredProject | null>;
+export declare function removeRegisteredProject(projectRoot: string, userDir?: string): Promise<RegisteredProject | null>;
+export declare function markProjectIntegration(projectRoot: string, state: CursorIntegrationState, userDir?: string): Promise<void>;

package/dist/src/clients/project-registry.js

@@ -0,0 +1,136 @@
+/**
+ * Global REWIND project registry (~/.rewind/projects.json).
+ * Installation / routing / discovery only — not the transaction ledger.
+ */
+import path from "node:path";
+import { createHash } from "node:crypto";
+import { mkdir, readFile, writeFile, rename, access } from "node:fs/promises";
+import { constants as fsConstants } from "node:fs";
+import { getUserRewindDir } from "../paths.js";
+async function exists(p) {
+    try {
+        await access(p, fsConstants.F_OK);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+export function getProjectsRegistryPath(userDir = getUserRewindDir()) {
+    return path.join(userDir, "projects.json");
+}
+function stableProjectId(projectRoot) {
+    const abs = path.resolve(projectRoot);
+    const hash = createHash("sha256").update(abs).digest("hex").slice(0, 12);
+    return `proj_${hash}`;
+}
+export function slugifyProjectName(name) {
+    const slug = name
+        .toLowerCase()
+        .replace(/[^a-z0-9]+/g, "-")
+        .replace(/^-+|-+$/g, "")
+        .slice(0, 40);
+    return slug || "project";
+}
+/**
+ * Stable readable MCP server name for a project.
+ * Collisions with a different path get a short path suffix.
+ */
+export function allocateServerName(projectRoot, existing) {
+    const abs = path.resolve(projectRoot);
+    const prior = existing.find((p) => path.resolve(p.path) === abs);
+    if (prior)
+        return prior.serverName;
+    const base = `rewind-${slugifyProjectName(path.basename(abs))}`;
+    const taken = new Set(existing
+        .filter((p) => path.resolve(p.path) !== abs)
+        .map((p) => p.serverName));
+    if (!taken.has(base) && base !== "rewind")
+        return base;
+    const suffix = createHash("sha256").update(abs).digest("hex").slice(0, 6);
+    let candidate = `${base}-${suffix}`;
+    let n = 2;
+    while (taken.has(candidate)) {
+        candidate = `${base}-${suffix}-${n}`;
+        n += 1;
+    }
+    return candidate;
+}
+async function writeRegistryAtomic(file, data) {
+    await mkdir(path.dirname(file), { recursive: true });
+    const tmp = `${file}.tmp-${process.pid}`;
+    await writeFile(tmp, JSON.stringify(data, null, 2) + "\n", "utf8");
+    await rename(tmp, file);
+}
+export async function loadProjectRegistry(userDir = getUserRewindDir()) {
+    const file = getProjectsRegistryPath(userDir);
+    if (!(await exists(file))) {
+        return { version: 1, updatedAt: new Date().toISOString(), projects: [] };
+    }
+    try {
+        const raw = JSON.parse(await readFile(file, "utf8"));
+        if (!raw || !Array.isArray(raw.projects)) {
+            return { version: 1, updatedAt: new Date().toISOString(), projects: [] };
+        }
+        return {
+            version: 1,
+            updatedAt: raw.updatedAt ?? new Date().toISOString(),
+            projects: raw.projects,
+        };
+    }
+    catch {
+        return { version: 1, updatedAt: new Date().toISOString(), projects: [] };
+    }
+}
+export async function saveProjectRegistry(registry, userDir = getUserRewindDir()) {
+    registry.updatedAt = new Date().toISOString();
+    await writeRegistryAtomic(getProjectsRegistryPath(userDir), registry);
+}
+export async function upsertRegisteredProject(projectRoot, opts = {}, userDir = getUserRewindDir()) {
+    const abs = path.resolve(projectRoot);
+    const registry = await loadProjectRegistry(userDir);
+    const now = new Date().toISOString();
+    const idx = registry.projects.findIndex((p) => path.resolve(p.path) === abs);
+    const serverName = opts.serverName ??
+        (idx >= 0
+            ? registry.projects[idx].serverName
+            : allocateServerName(abs, registry.projects));
+    const entry = {
+        id: idx >= 0 ? registry.projects[idx].id : stableProjectId(abs),
+        path: abs,
+        displayName: opts.displayName ??
+            (idx >= 0
+                ? registry.projects[idx].displayName
+                : path.basename(abs)),
+        serverName,
+        createdAt: idx >= 0 ? registry.projects[idx].createdAt : now,
+        updatedAt: now,
+        cursorIntegration: opts.cursorIntegration ??
+            (idx >= 0 ? registry.projects[idx].cursorIntegration : "configured"),
+    };
+    if (idx >= 0)
+        registry.projects[idx] = entry;
+    else
+        registry.projects.push(entry);
+    await saveProjectRegistry(registry, userDir);
+    return entry;
+}
+export async function findRegisteredProject(projectRoot, userDir = getUserRewindDir()) {
+    const abs = path.resolve(projectRoot);
+    const registry = await loadProjectRegistry(userDir);
+    return (registry.projects.find((p) => path.resolve(p.path) === abs) ?? null);
+}
+export async function removeRegisteredProject(projectRoot, userDir = getUserRewindDir()) {
+    const abs = path.resolve(projectRoot);
+    const registry = await loadProjectRegistry(userDir);
+    const idx = registry.projects.findIndex((p) => path.resolve(p.path) === abs);
+    if (idx < 0)
+        return null;
+    const [removed] = registry.projects.splice(idx, 1);
+    await saveProjectRegistry(registry, userDir);
+    return removed ?? null;
+}
+export async function markProjectIntegration(projectRoot, state, userDir = getUserRewindDir()) {
+    await upsertRegisteredProject(projectRoot, { cursorIntegration: state }, userDir);
+}
+//# sourceMappingURL=project-registry.js.map

package/dist/src/clients/project-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"project-registry.js","sourceRoot":"","sources":["../../../src/clients/project-registry.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC9E,OAAO,EAAE,SAAS,IAAI,WAAW,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAyB/C,KAAK,UAAU,MAAM,CAAC,CAAS;IAC7B,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,UAAU,uBAAuB,CACrC,OAAO,GAAG,gBAAgB,EAAE;IAE5B,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;AAC7C,CAAC;AAED,SAAS,eAAe,CAAC,WAAmB;IAC1C,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACtC,MAAM,IAAI,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACzE,OAAO,QAAQ,IAAI,EAAE,CAAC;AACxB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAY;IAC7C,MAAM,IAAI,GAAG,IAAI;SACd,WAAW,EAAE;SACb,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;SACvB,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAChB,OAAO,IAAI,IAAI,SAAS,CAAC;AAC3B,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,kBAAkB,CAChC,WAAmB,EACnB,QAA6B;IAE7B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACtC,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;IACjE,IAAI,KAAK;QAAE,OAAO,KAAK,CAAC,UAAU,CAAC;IAEnC,MAAM,IAAI,GAAG,UAAU,kBAAkB,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;IAChE,MAAM,KAAK,GAAG,IAAI,GAAG,CACnB,QAAQ;SACL,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC;SAC3C,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAC5B,CAAC;IACF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAEvD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1E,IAAI,SAAS,GAAG,GAAG,IAAI,IAAI,MAAM,EAAE,CAAC;IACpC,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,OAAO,KAAK,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QAC5B,SAAS,GAAG,GAAG,IAAI,IAAI,MAAM,IAAI,CAAC,EAAE,CAAC;QACrC,CAAC,IAAI,CAAC,CAAC;IACT,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,KAAK,UAAU,mBAAmB,CAChC,IAAY,EACZ,IAAqB;IAErB,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACrD,MAAM,GAAG,GAAG,GAAG,IAAI,QAAQ,OAAO,CAAC,GAAG,EAAE,CAAC;IACzC,MAAM,SAAS,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC;IACnE,MAAM,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AAC1B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAO,GAAG,gBAAgB,EAAE;IAE5B,MAAM,IAAI,GAAG,uBAAuB,CAAC,OAAO,CAAC,CAAC;IAC9C,IAAI,CAAC,CAAC,MAAM,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAC1B,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC3E,CAAC;IACD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAoB,CAAC;QACxE,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzC,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;QAC3E,CAAC;QACD,OAAO;YACL,OAAO,EAAE,CAAC;YACV,SAAS,EAAE,GAAG,CAAC,SAAS,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACpD,QAAQ,EAAE,GAAG,CAAC,QAAQ;SACvB,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;IAC3E,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,QAAyB,EACzB,OAAO,GAAG,gBAAgB,EAAE;IAE5B,QAAQ,CAAC,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC9C,MAAM,mBAAmB,CAAC,uBAAuB,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC;AACxE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,WAAmB,EACnB,OAII,EAAE,EACN,OAAO,GAAG,gBAAgB,EAAE;IAE5B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACrC,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAAC,SAAS,CACrC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,CACpC,CAAC;IACF,MAAM,UAAU,GACd,IAAI,CAAC,UAAU;QACf,CAAC,GAAG,IAAI,CAAC;YACP,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAE,CAAC,UAAU;YACpC,CAAC,CAAC,kBAAkB,CAAC,GAAG,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAElD,MAAM,KAAK,GAAsB;QAC/B,EAAE,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAE,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC;QAChE,IAAI,EAAE,GAAG;QACT,WAAW,EACT,IAAI,CAAC,WAAW;YAChB,CAAC,GAAG,IAAI,CAAC;gBACP,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAE,CAAC,WAAW;gBACrC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QACzB,UAAU;QACV,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG;QAC7D,SAAS,EAAE,GAAG;QACd,iBAAiB,EACf,IAAI,CAAC,iBAAiB;YACtB,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,YAAY,CAAC;KACxE,CAAC;IAEF,IAAI,GAAG,IAAI,CAAC;QAAE,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;;QACxC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAEnC,MAAM,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7C,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,WAAmB,EACnB,OAAO,GAAG,gBAAgB,EAAE;IAE5B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACpD,OAAO,CACL,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,IAAI,CACpE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,WAAmB,EACnB,OAAO,GAAG,gBAAgB,EAAE;IAE5B,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,MAAM,mBAAmB,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,GAAG,GAAG,QAAQ,CAAC,QAAQ,CAAC,SAAS,CACrC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,CACpC,CAAC;IACF,IAAI,GAAG,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IACzB,MAAM,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;IACnD,MAAM,mBAAmB,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7C,OAAO,OAAO,IAAI,IAAI,CAAC;AACzB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,WAAmB,EACnB,KAA6B,EAC7B,OAAO,GAAG,gBAAgB,EAAE;IAE5B,MAAM,uBAAuB,CAC3B,WAAW,EACX,EAAE,iBAAiB,EAAE,KAAK,EAAE,EAC5B,OAAO,CACR,CAAC;AACJ,CAAC"}

package/dist/src/clients/types.d.ts

@@ -1,8 +1,17 @@
 /**
  * Agent client integration layer.
  * Cursor is the first proven integration. Do not advertise untested clients.
+ *
+ * Strategy (observed Cursor behaviour):
+ * Project-level `.cursor/mcp.json` may be discovered but remain disconnected.
+ * User-level `~/.cursor/mcp.json` connects reliably.
+ * Therefore: one user-level MCP server entry per REWIND project
+ * (`rewind-<slug>`) with absolute REWIND_PROJECT_ROOT — never overwrite
+ * a single global entry when setting up another project.
  */
-export type ClientConnectionStatus = "not_detected" | "detected" | "configured" | "connected" | "invalid";
+import { type CursorIntegrationState } from "./project-registry.js";
+import { isLegacySourceMcpEntry, type McpServerEntry } from "./mcp-json.js";
+export type ClientConnectionStatus = "not_detected" | "detected" | "configured" | "connected" | "needs_reload" | "invalid";
 export interface ClientStatus {
     id: string;
     displayName: string;
@@ -11,6 +20,9 @@ export interface ClientStatus {
     configPath: string | null;
     message: string;
     supported: boolean;
+    /** Honest integration state for setup/doctor */
+    integrationState?: CursorIntegrationState | "not_configured";
+    serverName?: string | null;
 }
 export interface AgentClientIntegration {
     readonly id: string;
@@ -19,10 +31,7 @@ export interface AgentClientIntegration {
     detect(): Promise<boolean>;
     getConfigPath(): Promise<string | null>;
     readConfig(): Promise<unknown | null>;
-    install(projectRoot: string): Promise<{
-        path: string;
-        changed: boolean;
-    }>;
+    install(projectRoot: string): Promise<CursorInstallResult>;
     validate(projectRoot: string): Promise<{
         ok: boolean;
         message: string;
@@ -33,32 +42,47 @@ export interface AgentClientIntegration {
     }>;
     status(projectRoot: string): Promise<ClientStatus>;
 }
+export interface CursorInstallResult {
+    path: string;
+    changed: boolean;
+    serverName: string;
+    backupPath: string | null;
+    removedKeys: string[];
+    legacyCleaned: string[];
+    projectMcpCleaned: boolean;
+    state: CursorIntegrationState;
+    notes: string[];
+}
 /** Portable MCP entry — installed CLI only (never tsx + src/cli.ts). */
-export declare function rewindMcpEntry(projectRoot: string): Record<string, unknown>;
-/** True if MCP entry still points at source-repo-only tooling. */
-export declare function isLegacySourceMcpEntry(entry: {
-    command?: string;
-    args?: string[];
-}): boolean;
+export declare function rewindMcpEntry(projectRoot: string): McpServerEntry;
+export { isLegacySourceMcpEntry };
+/**
+ * Evidence that Cursor has actually loaded/used REWIND MCP for this project.
+ * Config presence alone is NOT connection.
+ */
+export declare function observeCursorMcpConnection(projectRoot: string): Promise<{
+    connected: boolean;
+    detail: string;
+}>;
 export declare class CursorIntegration implements AgentClientIntegration {
     readonly id = "cursor";
     readonly displayName = "Cursor";
     readonly supported = true;
     detect(): Promise<boolean>;
     getConfigPath(): Promise<string | null>;
+    /** @deprecated Prefer user-level config; kept for cleanup of old installs */
     projectMcpPath(projectRoot: string): string;
     readConfig(): Promise<unknown | null>;
-    install(projectRoot: string): Promise<{
-        path: string;
-        changed: boolean;
-    }>;
+    install(projectRoot: string): Promise<CursorInstallResult>;
     validate(projectRoot: string): Promise<{
         ok: boolean;
         message: string;
     }>;
+    private findServerNameForProject;
     remove(projectRoot: string): Promise<{
         removed: boolean;
         path: string | null;
+        serverName?: string;
     }>;
     status(projectRoot: string): Promise<ClientStatus>;
 }
@@ -71,10 +95,7 @@ export declare class UnsupportedClientStub implements AgentClientIntegration {
     detect(): Promise<boolean>;
     getConfigPath(): Promise<string | null>;
     readConfig(): Promise<unknown | null>;
-    install(): Promise<{
-        path: string;
-        changed: boolean;
-    }>;
+    install(): Promise<CursorInstallResult>;
     validate(): Promise<{
         ok: boolean;
         message: string;