@askthew/mcp-plugin 0.4.10 → 0.4.12

package/dist/install.js

@@ -2,17 +2,12 @@ import fs from "node:fs";
 import { createRequire } from "node:module";
 import os from "node:os";
 import path from "node:path";
-import { askTheWDataDir, installReceiptsPath, readJsonFile, writePrivateJson } from "./lib/paths.js";
+import { askTheWDataDir, installMetadataPath, writePrivateJson } from "./lib/paths.js";
 import { resolvePluginScope } from "./scope.js";
-export const DEFAULT_FREE_SERVER_NAME = "askthew-free";
-export const DEFAULT_WORKSPACE_SERVER_NAME = "askthew-workspace";
-const LEGACY_DEFAULT_SERVER_NAME = "askthew";
-const ASKTHEW_INSTRUCTIONS_START = "<!-- @askthew/mcp-plugin v1 - managed block, do not hand-edit -->";
-const ASKTHEW_INSTRUCTIONS_END = "<!-- /@askthew/mcp-plugin v1 -->";
-const LEGACY_ASKTHEW_INSTRUCTIONS_START = "<!-- ASKTHEW_PLUGIN_INSTRUCTIONS_START -->";
-const LEGACY_ASKTHEW_INSTRUCTIONS_END = "<!-- ASKTHEW_PLUGIN_INSTRUCTIONS_END -->";
-const INSTALL_RECEIPTS_SCHEMA_VERSION = 1;
 const requirePackageJson = createRequire(import.meta.url);
+const INSTRUCTIONS_START = "<!-- ASKTHEW BEGIN -->";
+const INSTRUCTIONS_END = "<!-- ASKTHEW END -->";
+export const DEFAULT_SERVER_NAME = "askthew";
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -25,12 +20,6 @@ export function packageVersion() {
         return "unknown";
     }
 }
-export function defaultServerNameForTier(free) {
-    return free ? DEFAULT_FREE_SERVER_NAME : DEFAULT_WORKSPACE_SERVER_NAME;
-}
-function defaultServerNamesToRemove() {
-    return [DEFAULT_FREE_SERVER_NAME, DEFAULT_WORKSPACE_SERVER_NAME, LEGACY_DEFAULT_SERVER_NAME];
-}
 function packageSpecFromPin(env = process.env) {
     const pin = env.ASKTHEW_PIN?.trim() || packageVersion();
     if (!pin || pin === "unknown")
@@ -41,59 +30,35 @@ function packageSpecFromPin(env = process.env) {
 }
 export function resolveSettingsPath(input) {
     const homeDirectory = input.homeDirectory ?? os.homedir();
-    if (input.hostType === "codex") {
+    if (input.hostType === "codex")
         return path.join(homeDirectory, ".codex", "config.toml");
-    }
-    if (input.hostType === "cursor") {
+    if (input.hostType === "cursor")
         return path.join(homeDirectory, ".cursor", "mcp.json");
-    }
     return path.join(homeDirectory, ".claude.json");
 }
 export function createServerEntry(input) {
     const scope = resolvePluginScope(input.cwd ?? process.cwd());
-    const env = {
-        ASKTHEW_API_URL: input.apiUrl,
-        ...(input.free ? { ASKTHEW_FREE_MODE: "1" } : { ASKTHEW_INSTALL_TOKEN: input.token ?? "" }),
-        ...(input.clientId ? { ASKTHEW_CLIENT_ID: input.clientId } : {}),
-        ...(input.clientLabel ? { ASKTHEW_CLIENT_LABEL: input.clientLabel } : {}),
-        ASKTHEW_HOST_TYPE: input.hostType,
-        ASKTHEW_SERVER_NAME: input.serverName,
-        ASKTHEW_REPO_NAME: scope.repoName,
-        ...(scope.repoRoot ? { ASKTHEW_REPO_ROOT: scope.repoRoot } : {}),
-        ...(scope.appPath ? { ASKTHEW_APP_PATH: scope.appPath } : {}),
-        ...(scope.serviceName ? { ASKTHEW_SERVICE_NAME: scope.serviceName } : {}),
-    };
     if (input.serverEntrypoint) {
         return {
             command: "node",
             args: [path.resolve(input.serverEntrypoint)],
-            env,
+            env: serverEnvironment(input, scope),
         };
     }
     return {
         command: "npx",
         args: ["-y", "--package", packageSpecFromPin(), "askthew-mcp"],
-        env,
+        env: serverEnvironment(input, scope),
     };
 }
-export function createHostConfigSnippet(input) {
-    if (input.hostType === "codex") {
-        const toml = createCodexTomlSection(input);
-        return {
-            settingsPath: resolveSettingsPath({ hostType: input.hostType }),
-            snippet: toml,
-            json: toml,
-        };
-    }
-    const snippet = {
-        mcpServers: {
-            [input.serverName]: createServerEntry(input),
-        },
-    };
+function serverEnvironment(input, scope) {
     return {
-        settingsPath: resolveSettingsPath({ hostType: input.hostType }),
-        snippet,
-        json: JSON.stringify(snippet, null, 2),
+        ASKTHEW_API_URL: (input.apiUrl ?? "https://app.askthew.com").replace(/\/+$/, ""),
+        ASKTHEW_HOST_TYPE: input.hostType,
+        ASKTHEW_REPO_NAME: scope.repoName,
+        ...(scope.repoRoot ? { ASKTHEW_REPO_ROOT: scope.repoRoot } : {}),
+        ...(scope.appPath ? { ASKTHEW_APP_PATH: scope.appPath } : {}),
+        ...(scope.serviceName ? { ASKTHEW_SERVICE_NAME: scope.serviceName } : {}),
     };
 }
 function escapeTomlString(value) {
@@ -102,104 +67,37 @@ function escapeTomlString(value) {
 function tomlKey(value) {
     return /^[A-Za-z0-9_-]+$/.test(value) ? value : escapeTomlString(value);
 }
-function createCodexTomlSection(input) {
+function codexTomlSection(input) {
     const entry = createServerEntry(input);
     const args = entry.args.map(escapeTomlString).join(", ");
     const env = Object.entries(entry.env)
         .map(([key, value]) => `${key} = ${escapeTomlString(String(value))}`)
         .join(", ");
     return [
-        `[mcp_servers.${tomlKey(input.serverName)}]`,
+        `[mcp_servers.${tomlKey(input.serverName ?? DEFAULT_SERVER_NAME)}]`,
         `command = ${escapeTomlString(entry.command)}`,
         `args = [${args}]`,
         `env = { ${env} }`,
     ].join("\n");
 }
 function removeCodexTomlServer(content, serverName) {
-    const escapedServerName = serverName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const quotedServerName = escapeTomlString(serverName).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const sectionPattern = new RegExp(`\\n?\\[mcp_servers\\.(?:${escapedServerName}|${quotedServerName})\\]\\n[\\s\\S]*?(?=\\n\\[[^\\]]+\\]|$)`, "g");
-    return content.replace(sectionPattern, "").trimEnd();
-}
-function serverNamesForRemoval(serverName) {
-    const trimmed = serverName?.trim();
-    if (!trimmed)
-        return defaultServerNamesToRemove();
-    return trimmed === LEGACY_DEFAULT_SERVER_NAME
-        ? [LEGACY_DEFAULT_SERVER_NAME]
-        : [trimmed, LEGACY_DEFAULT_SERVER_NAME];
+    const escaped = serverName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const quoted = escapeTomlString(serverName).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+    const pattern = new RegExp(`\\n?\\[mcp_servers\\.(?:${escaped}|${quoted})\\]\\n[\\s\\S]*?(?=\\n\\[[^\\]]+\\]|$)`, "g");
+    return content.replace(pattern, "").trimEnd();
 }
 function mergeCodexSettings(input) {
-    let next = input.existingSettings.trimEnd();
-    if (input.serverName !== LEGACY_DEFAULT_SERVER_NAME) {
-        next = removeCodexTomlServer(next, LEGACY_DEFAULT_SERVER_NAME);
-    }
-    next = removeCodexTomlServer(next, input.serverName);
-    return `${next}${next ? "\n\n" : ""}${createCodexTomlSection(input)}\n`;
-}
-function expandHome(inputPath, homeDirectory = os.homedir()) {
-    if (inputPath === "~")
-        return homeDirectory;
-    if (inputPath.startsWith("~/"))
-        return path.join(homeDirectory, inputPath.slice(2));
-    return inputPath;
-}
-function pathAliases(inputPath, homeDirectory = os.homedir()) {
-    const aliases = new Set();
-    const expanded = expandHome(inputPath, homeDirectory);
-    const resolved = path.resolve(expanded);
-    aliases.add(resolved);
-    if (resolved.startsWith("/private/tmp/"))
-        aliases.add(`/tmp/${resolved.slice("/private/tmp/".length)}`);
-    if (resolved.startsWith("/tmp/"))
-        aliases.add(`/private/tmp/${resolved.slice("/tmp/".length)}`);
-    try {
-        aliases.add(fs.realpathSync.native(resolved));
-    }
-    catch {
-        try {
-            aliases.add(fs.realpathSync(resolved));
-        }
-        catch {
-            // The project may have been deleted; lexical aliases are still useful.
-        }
-    }
-    return aliases;
-}
-function equivalentProjectPath(left, right, homeDirectory = os.homedir()) {
-    const leftAliases = pathAliases(left, homeDirectory);
-    const rightAliases = pathAliases(right, homeDirectory);
-    for (const alias of leftAliases) {
-        if (rightAliases.has(alias))
-            return true;
-    }
-    return false;
-}
-function claudeProjectKeys(input) {
-    const homeDirectory = input.homeDirectory ?? os.homedir();
-    const cwdAliases = new Set();
-    for (const cwd of input.cwds) {
-        for (const alias of pathAliases(cwd, homeDirectory)) {
-            cwdAliases.add(alias);
-        }
-    }
-    for (const projectKey of Object.keys(input.existingProjects)) {
-        if (input.cwds.some((cwd) => equivalentProjectPath(projectKey, cwd, homeDirectory))) {
-            cwdAliases.add(projectKey);
-        }
-    }
-    return Array.from(cwdAliases);
+    const serverName = input.serverName ?? DEFAULT_SERVER_NAME;
+    const existing = removeCodexTomlServer(input.existingSettings.trimEnd(), serverName);
+    return `${existing}${existing ? "\n\n" : ""}${codexTomlSection(input)}\n`;
 }
 function mergeClaudeCodeSettings(input) {
     const cwd = path.resolve(input.cwd ?? process.cwd());
+    const serverName = input.serverName ?? DEFAULT_SERVER_NAME;
     const existingSettings = isRecord(input.existingSettings) ? input.existingSettings : {};
     const existingProjects = isRecord(existingSettings.projects) ? existingSettings.projects : {};
     const existingProject = isRecord(existingProjects[cwd]) ? existingProjects[cwd] : {};
     const existingMcpServers = isRecord(existingProject.mcpServers) ? existingProject.mcpServers : {};
-    const nextMcpServers = { ...existingMcpServers };
-    if (input.serverName !== LEGACY_DEFAULT_SERVER_NAME && LEGACY_DEFAULT_SERVER_NAME in nextMcpServers) {
-        delete nextMcpServers[LEGACY_DEFAULT_SERVER_NAME];
-    }
     return {
         ...existingSettings,
         projects: {
@@ -207,58 +105,46 @@ function mergeClaudeCodeSettings(input) {
             [cwd]: {
                 ...existingProject,
                 mcpServers: {
-                    ...nextMcpServers,
-                    [input.serverName]: createServerEntry(input),
+                    ...existingMcpServers,
+                    [serverName]: createServerEntry(input),
                 },
             },
         },
     };
 }
-export function mergeHostSettings(input) {
+function mergeCursorSettings(input) {
+    const serverName = input.serverName ?? DEFAULT_SERVER_NAME;
     const existingSettings = isRecord(input.existingSettings) ? input.existingSettings : {};
     const existingMcpServers = isRecord(existingSettings.mcpServers) ? existingSettings.mcpServers : {};
-    const nextMcpServers = { ...existingMcpServers };
-    if (input.serverName !== LEGACY_DEFAULT_SERVER_NAME && LEGACY_DEFAULT_SERVER_NAME in nextMcpServers) {
-        delete nextMcpServers[LEGACY_DEFAULT_SERVER_NAME];
-    }
     return {
         ...existingSettings,
         mcpServers: {
-            ...nextMcpServers,
-            [input.serverName]: createServerEntry(input),
+            ...existingMcpServers,
+            [serverName]: createServerEntry(input),
         },
     };
 }
-export function formatInstallCommand(input) {
-    const parts = [
-        "npx",
-        "-y",
-        "--prefer-online",
-        "--package",
-        "@askthew/mcp-plugin@latest",
-        "askthew-mcp",
-        "install",
-        "--host",
-        input.hostType,
-        ...(input.free ? ["--free"] : ["--token", JSON.stringify(input.token ?? "")]),
-        "--api-url",
-        JSON.stringify(input.apiUrl),
-        "--server-name",
-        JSON.stringify(input.serverName),
-    ];
-    if (input.free) {
-        if (input.email) {
-            parts.push("--email", JSON.stringify(input.email));
-        }
-    }
-    if (input.serverEntrypoint) {
-        parts.push("--server-entrypoint", JSON.stringify(input.serverEntrypoint));
+export function createHostConfigSnippet(input) {
+    if (input.hostType === "codex") {
+        const snippet = codexTomlSection(input);
+        return {
+            settingsPath: resolveSettingsPath({ hostType: input.hostType }),
+            snippet,
+            json: snippet,
+            language: "toml",
+        };
     }
-    return parts.join(" ");
-}
-export function verificationNextStep(hostType) {
-    const hostLabel = hostType === "claude_code" ? "Claude Code" : hostType === "cursor" ? "Cursor" : "Codex";
-    return `Refresh Ask The W to confirm the plugin shows Installed. Restart or reload ${hostLabel} if it is already open. At the start of every new ${hostLabel} session in this repo, the installed project instructions tell the coding agent to send a setup_complete update before plan mode or exploration. Choose Always allow if ${hostLabel} asks for Ask The W tool permission. list_mcp_resources/list_mcp_resource_templates may be empty for this tool-driven connector and are not failure signals.`;
+    const snippet = {
+        mcpServers: {
+            [input.serverName ?? DEFAULT_SERVER_NAME]: createServerEntry(input),
+        },
+    };
+    return {
+        settingsPath: resolveSettingsPath({ hostType: input.hostType }),
+        snippet,
+        json: JSON.stringify(snippet, null, 2),
+        language: "json",
+    };
 }
 export function installHostConfig(input) {
     const settingsPath = resolveSettingsPath({
@@ -270,11 +156,9 @@ export function installHostConfig(input) {
     if (fs.existsSync(settingsPath)) {
         const raw = fs.readFileSync(settingsPath, "utf8");
         existingText = raw;
-        if (raw.trim().length > 0) {
+        if (raw.trim().length > 0 && input.hostType !== "codex") {
             try {
-                if (input.hostType !== "codex") {
-                    existingSettings = JSON.parse(raw);
-                }
+                existingSettings = JSON.parse(raw);
             }
             catch (error) {
                 const detail = error instanceof Error ? error.message : "Unknown parse failure.";
@@ -283,28 +167,17 @@ export function installHostConfig(input) {
         }
     }
     const hostInput = {
-        existingSettings,
         hostType: input.hostType,
-        token: input.token,
         apiUrl: input.apiUrl,
-        serverName: input.serverName,
-        clientId: input.clientId,
-        clientLabel: input.clientLabel,
-        free: input.free,
+        serverName: input.serverName ?? DEFAULT_SERVER_NAME,
         cwd: input.cwd,
         serverEntrypoint: input.serverEntrypoint,
     };
     const json = input.hostType === "codex"
-        ? mergeCodexSettings({
-            ...hostInput,
-            existingSettings: existingText,
-        })
+        ? mergeCodexSettings({ ...hostInput, existingSettings: existingText })
         : JSON.stringify(input.hostType === "claude_code"
-            ? mergeClaudeCodeSettings({
-                ...hostInput,
-                cwd: input.cwd,
-            })
-            : mergeHostSettings(hostInput), null, 2);
+            ? mergeClaudeCodeSettings({ ...hostInput, existingSettings, cwd: input.cwd })
+            : mergeCursorSettings({ ...hostInput, existingSettings }), null, 2);
     if (!input.dryRun) {
         fs.mkdirSync(path.dirname(settingsPath), { recursive: true });
         fs.writeFileSync(settingsPath, json.endsWith("\n") ? json : `${json}\n`, "utf8");
@@ -313,461 +186,114 @@ export function installHostConfig(input) {
         settingsPath,
         json,
         wroteFile: !input.dryRun,
-        nextStep: verificationNextStep(input.hostType),
-    };
-}
-function normalizeInstructionPaths(paths) {
-    return Array.from(new Set(paths.map((entry) => path.resolve(entry))));
-}
-function normalizeReceipt(receipt) {
-    return {
-        ...receipt,
-        settingsPath: path.resolve(receipt.settingsPath),
-        cwd: path.resolve(receipt.cwd),
-        instructionPaths: normalizeInstructionPaths(receipt.instructionPaths ?? []),
-        dataDir: path.resolve(receipt.dataDir || askTheWDataDir()),
-        serverEntrypoint: receipt.serverEntrypoint ? path.resolve(receipt.serverEntrypoint) : undefined,
     };
 }
-function receiptKey(receipt) {
-    return `${receipt.hostType}\u0000${receipt.serverName}\u0000${path.resolve(receipt.cwd)}`;
-}
-export function readInstallReceipts(env = process.env) {
-    const parsed = readJsonFile(installReceiptsPath(env));
-    if (!parsed || parsed.schemaVersion !== INSTALL_RECEIPTS_SCHEMA_VERSION || !Array.isArray(parsed.installs)) {
-        return [];
-    }
-    return parsed.installs
-        .filter((receipt) => Boolean(receipt?.hostType && receipt.serverName && receipt.settingsPath && receipt.cwd))
-        .map(normalizeReceipt);
-}
-export function writeInstallReceipt(receipt, env = process.env) {
-    const nextReceipt = normalizeReceipt({
-        ...receipt,
-        dataDir: receipt.dataDir ?? askTheWDataDir(env),
-        installedAt: receipt.installedAt ?? new Date().toISOString(),
-    });
-    const receipts = readInstallReceipts(env).filter((entry) => receiptKey(entry) !== receiptKey(nextReceipt));
-    receipts.push(nextReceipt);
-    receipts.sort((left, right) => left.installedAt.localeCompare(right.installedAt));
-    writePrivateJson(installReceiptsPath(env), {
-        schemaVersion: INSTALL_RECEIPTS_SCHEMA_VERSION,
-        installs: receipts,
-    });
-    return nextReceipt;
-}
-export function findInstallReceipts(input, env = process.env) {
-    return readInstallReceipts(env).filter((receipt) => receipt.hostType === input.hostType &&
-        (!input.serverName || receipt.serverName === input.serverName));
-}
-export function removeInstallReceipts(input, env = process.env) {
-    const cwd = input.cwd ? path.resolve(input.cwd) : undefined;
-    const receipts = readInstallReceipts(env);
-    const next = receipts.filter((receipt) => {
-        if (receipt.hostType !== input.hostType)
-            return true;
-        if (input.serverName && receipt.serverName !== input.serverName)
-            return true;
-        if (cwd && receipt.cwd !== cwd)
-            return true;
-        return false;
-    });
-    writePrivateJson(installReceiptsPath(env), {
-        schemaVersion: INSTALL_RECEIPTS_SCHEMA_VERSION,
-        installs: next,
-    });
-    return receipts.length - next.length;
-}
 export function uninstallHostConfig(input) {
     const settingsPath = resolveSettingsPath({
         hostType: input.hostType,
         homeDirectory: input.homeDirectory,
     });
-    const serverNames = serverNamesForRemoval(input.serverName);
-    let json = "";
-    let foundConfigFile = false;
-    let removedServer = false;
-    if (fs.existsSync(settingsPath)) {
-        foundConfigFile = true;
-        const raw = fs.readFileSync(settingsPath, "utf8");
-        if (input.hostType === "codex") {
-            json = raw;
-            for (const serverName of serverNames) {
-                const before = json;
-                json = removeCodexTomlServer(json, serverName);
-                removedServer = removedServer || before !== json;
-            }
-            json = json ? `${json}\n` : "";
-        }
-        else {
-            const parsed = raw.trim() ? JSON.parse(raw) : {};
-            if (input.hostType === "claude_code") {
-                const cwdInputs = input.cwds && input.cwds.length > 0 ? input.cwds : [input.cwd ?? process.cwd()];
-                const existingProjects = isRecord(parsed.projects) ? parsed.projects : {};
-                const nextProjects = { ...existingProjects };
-                const projectKeys = claudeProjectKeys({
-                    existingProjects,
-                    cwds: cwdInputs,
-                    homeDirectory: input.homeDirectory,
-                });
-                for (const cwd of projectKeys) {
-                    const existingProject = isRecord(existingProjects[cwd]) ? existingProjects[cwd] : {};
-                    const existingMcpServers = isRecord(existingProject.mcpServers) ? existingProject.mcpServers : {};
-                    const nextServers = { ...existingMcpServers };
-                    const beforeCount = Object.keys(nextServers).length;
-                    for (const serverName of serverNames) {
-                        delete nextServers[serverName];
-                    }
-                    const removedHere = Object.keys(nextServers).length !== beforeCount;
-                    removedServer = removedServer || removedHere;
-                    if (removedHere || isRecord(existingProjects[cwd])) {
-                        nextProjects[cwd] = {
-                            ...existingProject,
-                            mcpServers: nextServers,
-                        };
-                    }
-                }
-                json = JSON.stringify({
-                    ...parsed,
-                    projects: nextProjects,
-                }, null, 2);
-            }
-            else {
-                const existingMcpServers = isRecord(parsed.mcpServers) ? parsed.mcpServers : {};
-                const nextServers = { ...existingMcpServers };
-                const beforeCount = Object.keys(nextServers).length;
-                for (const serverName of serverNames) {
-                    delete nextServers[serverName];
-                }
-                removedServer = Object.keys(nextServers).length !== beforeCount;
-                json = JSON.stringify({ ...parsed, mcpServers: nextServers }, null, 2);
-            }
-            json = `${json}\n`;
-        }
-        if (!input.dryRun) {
-            fs.writeFileSync(settingsPath, json, "utf8");
-        }
-    }
-    return {
-        settingsPath,
-        json,
-        removedServerName: serverNames.join(", "),
-        removedServerNames: serverNames,
-        foundConfigFile,
-        removedServer,
-        wroteFile: !input.dryRun && foundConfigFile,
-    };
-}
-function updateNpxPackageArgs(args, packageSpec) {
-    let changed = false;
-    const nextArgs = args.map((arg, index) => {
-        if (typeof arg !== "string")
-            return arg;
-        if (arg === "--package" && typeof args[index + 1] === "string")
-            return arg;
-        if (index > 0 && args[index - 1] === "--package" && arg.startsWith("@askthew/mcp-plugin@")) {
-            changed = changed || arg !== packageSpec;
-            return packageSpec;
-        }
-        if (arg.startsWith("@askthew/mcp-plugin@")) {
-            changed = changed || arg !== packageSpec;
-            return packageSpec;
-        }
-        return arg;
-    });
-    return { args: nextArgs, changed };
-}
-function updateServerEntryPackage(entry, packageSpec) {
-    if (!isRecord(entry) || !Array.isArray(entry.args))
-        return { entry, changed: false };
-    const updated = updateNpxPackageArgs(entry.args, packageSpec);
-    if (!updated.changed)
-        return { entry, changed: false };
-    return {
-        entry: {
-            ...entry,
-            args: updated.args,
-        },
-        changed: true,
-    };
-}
-function updateCodexPackageSpec(input) {
-    let changed = false;
-    let next = input.content;
-    for (const serverName of input.serverNames) {
-        const escapedServerName = serverName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-        const quotedServerName = escapeTomlString(serverName).replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-        const sectionPattern = new RegExp(`(\\n?\\[mcp_servers\\.(?:${escapedServerName}|${quotedServerName})\\]\\n[\\s\\S]*?)(?=\\n\\[[^\\]]+\\]|$)`, "g");
-        next = next.replace(sectionPattern, (section) => {
-            const updated = section.replace(/@askthew\/mcp-plugin@[^"',\]\s]+/g, input.packageSpec);
-            changed = changed || updated !== section;
-            return updated;
-        });
+    const serverName = input.serverName ?? DEFAULT_SERVER_NAME;
+    if (!fs.existsSync(settingsPath)) {
+        return { settingsPath, removed: false, wroteFile: false };
     }
-    return { json: next, changed };
-}
-export function upgradePinnedHostConfig(input) {
-    const settingsPath = resolveSettingsPath({
-        hostType: input.hostType,
-        homeDirectory: input.homeDirectory,
-    });
-    const packageSpec = input.packageSpec?.trim() || packageSpecFromPin();
-    const serverNames = serverNamesForRemoval(input.serverName);
-    let json = "";
-    let foundConfigFile = false;
-    let upgradedServer = false;
-    const upgradedServerNames = new Set();
-    if (fs.existsSync(settingsPath)) {
-        foundConfigFile = true;
-        const raw = fs.readFileSync(settingsPath, "utf8");
-        if (input.hostType === "codex") {
-            const updated = updateCodexPackageSpec({ content: raw, serverNames, packageSpec });
-            json = updated.json;
-            upgradedServer = updated.changed;
-            if (updated.changed) {
-                for (const serverName of serverNames)
-                    upgradedServerNames.add(serverName);
-            }
+    const raw = fs.readFileSync(settingsPath, "utf8");
+    let next = raw;
+    let removed = false;
+    if (input.hostType === "codex") {
+        next = `${removeCodexTomlServer(raw, serverName)}\n`;
+        removed = next !== raw;
+    }
+    else {
+        const parsed = raw.trim() ? JSON.parse(raw) : {};
+        if (input.hostType === "claude_code") {
+            const cwd = path.resolve(input.cwd ?? process.cwd());
+            const projects = isRecord(parsed.projects) ? { ...parsed.projects } : {};
+            const project = isRecord(projects[cwd]) ? { ...projects[cwd] } : {};
+            const servers = isRecord(project.mcpServers) ? { ...project.mcpServers } : {};
+            removed = serverName in servers;
+            delete servers[serverName];
+            project.mcpServers = servers;
+            projects[cwd] = project;
+            next = `${JSON.stringify({ ...parsed, projects }, null, 2)}\n`;
         }
         else {
-            const parsed = raw.trim() ? JSON.parse(raw) : {};
-            if (input.hostType === "claude_code") {
-                const existingProjects = isRecord(parsed.projects) ? parsed.projects : {};
-                const cwdInputs = input.cwds && input.cwds.length > 0 ? input.cwds : [input.cwd ?? process.cwd()];
-                const projectKeys = claudeProjectKeys({
-                    existingProjects,
-                    cwds: cwdInputs,
-                    homeDirectory: input.homeDirectory,
-                });
-                const nextProjects = { ...existingProjects };
-                for (const cwd of projectKeys) {
-                    const existingProject = isRecord(existingProjects[cwd]) ? existingProjects[cwd] : {};
-                    const existingMcpServers = isRecord(existingProject.mcpServers) ? existingProject.mcpServers : {};
-                    const nextServers = { ...existingMcpServers };
-                    let touchedProject = false;
-                    for (const serverName of serverNames) {
-                        const updated = updateServerEntryPackage(nextServers[serverName], packageSpec);
-                        if (updated.changed) {
-                            nextServers[serverName] = updated.entry;
-                            upgradedServer = true;
-                            touchedProject = true;
-                            upgradedServerNames.add(serverName);
-                        }
-                    }
-                    if (touchedProject) {
-                        nextProjects[cwd] = {
-                            ...existingProject,
-                            mcpServers: nextServers,
-                        };
-                    }
-                }
-                json = JSON.stringify({ ...parsed, projects: nextProjects }, null, 2);
-            }
-            else {
-                const existingMcpServers = isRecord(parsed.mcpServers) ? parsed.mcpServers : {};
-                const nextServers = { ...existingMcpServers };
-                for (const serverName of serverNames) {
-                    const updated = updateServerEntryPackage(nextServers[serverName], packageSpec);
-                    if (updated.changed) {
-                        nextServers[serverName] = updated.entry;
-                        upgradedServer = true;
-                        upgradedServerNames.add(serverName);
-                    }
-                }
-                json = JSON.stringify({ ...parsed, mcpServers: nextServers }, null, 2);
-            }
-            json = `${json}\n`;
-        }
-        if (!input.dryRun && upgradedServer) {
-            fs.writeFileSync(settingsPath, json.endsWith("\n") ? json : `${json}\n`, "utf8");
+            const servers = isRecord(parsed.mcpServers) ? { ...parsed.mcpServers } : {};
+            removed = serverName in servers;
+            delete servers[serverName];
+            next = `${JSON.stringify({ ...parsed, mcpServers: servers }, null, 2)}\n`;
         }
     }
-    return {
-        settingsPath,
-        json,
-        packageSpec,
-        foundConfigFile,
-        upgradedServer,
-        upgradedServerNames: Array.from(upgradedServerNames),
-        wroteFile: !input.dryRun && foundConfigFile && upgradedServer,
-    };
+    if (!input.dryRun)
+        fs.writeFileSync(settingsPath, next, "utf8");
+    return { settingsPath, removed, wroteFile: !input.dryRun };
 }
-export async function sendInstallHeartbeat(input) {
-    const fetcher = input.fetchImpl ?? fetch;
-    const scope = resolvePluginScope(input.cwd ?? process.cwd());
-    const apiUrl = input.apiUrl.replace(/\/$/, "");
-    const response = await fetcher(`${apiUrl}/api/connectors/mcp/heartbeat`, {
-        method: "POST",
-        headers: {
-            "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-            installToken: input.token,
-            clientId: input.clientId || input.hostType,
-            clientLabel: input.clientLabel,
-            hostType: input.hostType,
-            serverName: input.serverName,
-            repoName: scope.repoName,
-            ...(scope.repoRoot ? { repoRoot: scope.repoRoot } : {}),
-            ...(scope.appPath ? { appPath: scope.appPath } : {}),
-            ...(scope.serviceName ? { serviceName: scope.serviceName } : {}),
-        }),
-    });
-    return response.ok;
-}
-function detectStackGuidance(cwd) {
-    const packagePath = path.join(cwd, "package.json");
-    if (!fs.existsSync(packagePath)) {
-        return [];
-    }
-    let manifest = {};
-    try {
-        manifest = JSON.parse(fs.readFileSync(packagePath, "utf8"));
-    }
-    catch {
-        return [];
-    }
-    const deps = {
-        ...(manifest.dependencies ?? {}),
-        ...(manifest.devDependencies ?? {}),
-    };
-    const names = new Set(Object.keys(deps));
-    const guidance = [];
-    if (names.has("next")) {
-        guidance.push("- Next.js detected: after changing route handlers, server actions, middleware, or cache behavior, capture `verification_result` with the command/result.");
-    }
-    if (names.has("express") || names.has("@types/express")) {
-        guidance.push("- Express detected: after changing middleware, request validation, or response envelopes, capture `verification_result` with the command/result.");
-    }
-    if (names.has("vite") || names.has("@vitejs/plugin-react")) {
-        guidance.push("- Vite detected: after changing client entrypoints, env handling, or build config, capture `verification_result` with the command/result.");
-    }
-    if (names.has("openai") || names.has("@openai/agents") || names.has("@ai-sdk/openai")) {
-        guidance.push("- OpenAI SDK detected: after editing prompts, model calls, streaming/SSE, or schema-validated responses, capture `direction_change` for prompt choices and `verification_result` for checked outputs.");
-    }
-    return guidance.slice(0, 4);
+export function instructionFileForHost(hostType, cwd = process.cwd()) {
+    return path.join(path.resolve(cwd), hostType === "claude_code" ? "CLAUDE.md" : "AGENTS.md");
 }
-function behaviorInstructions(hostType, cwd = process.cwd()) {
-    const hostLabel = hostType === "claude_code" ? "Claude Code" : hostType === "cursor" ? "Cursor" : "Codex";
-    const stackGuidance = detectStackGuidance(cwd);
+export function installBehaviorInstructions(input) {
+    const hostLabel = input.hostType === "claude_code" ? "Claude Code" : input.hostType === "codex" ? "Codex" : "Cursor";
     return [
-        ASKTHEW_INSTRUCTIONS_START,
-        "",
-        "## Ask The W Plugin",
+        INSTRUCTIONS_START,
+        `Ask The W is installed for ${hostLabel}.`,
         "",
-        `This workspace uses the Ask The W Plugin. When working in this repo with ${hostLabel}, send compact Ask The W updates automatically with the MCP tool \`capture_session_signal\`.`,
-        "",
-        "Startup update:",
-        `- At the start of every new ${hostLabel} session in this repo, before plan mode, exploration, or any normal reply, call \`capture_session_signal\` with \`kind: "setup_complete"\` if the tool is available.`,
-        `- If the tool is unavailable, tell the user to restart or reload ${hostLabel}; do not use \`list_mcp_resources\` or \`list_mcp_resource_templates\` as pass/fail checks.`,
-        "- If you realize later in the conversation that the startup call was missed, send it immediately with `metadata.recovered_missed_startup=true`.",
-        "",
-        "Schema:",
-        "- `sessionId` (string, required): stable across one session. Derive as `<repo-name>-<YYYYMMDD>-<git-HEAD-short>`. Reuse for every call in the session.",
-        "- `sequence` (integer >= 0, required): start at 0, increment by 1 per call within the same `sessionId`.",
-        "- `kind` (enum, required): one of `setup_complete`, `session_checkpoint`, `direction_change`, `implementation_update`, `verification_result`, `final_summary`.",
-        "- `summary` (string <= 2000, required).",
-        "- `evidence`, `filesTouched`, `commandsRun`, `metadata`: optional.",
-        "",
-        "Example:",
-        '{ "sessionId": "thesisengine-20260508-a1b2c3d", "sequence": 0, "kind": "setup_complete", "summary": "..." }',
-        "",
-        "Send an update:",
-        "- after the user accepts or rejects product, architecture, or implementation direction",
-        "- before using tools that write files, after meaningful implementation changes",
-        "- after tests, builds, lint, or other verification",
-        "- at the final summary",
-        ...(stackGuidance.length > 0 ? ["", "Stack-specific nudges:", ...stackGuidance] : []),
-        "",
-        "Keep updates compact: short summary, minimal evidence excerpts, files touched, commands run, and useful metadata. Do not send full transcripts. Redact obvious secrets in evidence excerpts (commands, file paths, log lines). Server-side redaction (AWS, Stripe, GitHub, JWT, PEM, OpenAI/Anthropic, DSNs, emails, SSN) runs as a safety net, but agent-side redaction is still preferred.",
-        "",
-        ASKTHEW_INSTRUCTIONS_END,
+        "- After meaningful work, call `capture_session_signal` with a concise summary, bare evidence, `scopeKey`, and a ULID `idempotencyKey`.",
+        "- Capture direction changes, implementation checkpoints, verification results, and final summaries. Aim for 5-15 useful signals per session.",
+        "- When the user asks what happened or what changed, call `recap`. When they ask for a next-step nudge, call `coach`.",
+        "- When the user makes a durable architecture, API, deployment, or product decision, call `create_decision`.",
+        "- Do not send full transcripts. Redact obvious secrets before capture.",
+        INSTRUCTIONS_END,
         "",
     ].join("\n");
 }
-function cursorBehaviorInstructions(cwd = process.cwd()) {
-    return [
-        "---",
-        "description: Ask The W Plugin capture rules",
-        "alwaysApply: true",
-        "---",
-        "",
-        behaviorInstructions("cursor", cwd),
-    ].join("\n");
-}
-function upsertMarkedBlock(existing, block) {
-    for (const [startMarker, endMarker] of [
-        [ASKTHEW_INSTRUCTIONS_START, ASKTHEW_INSTRUCTIONS_END],
-        [LEGACY_ASKTHEW_INSTRUCTIONS_START, LEGACY_ASKTHEW_INSTRUCTIONS_END],
-    ]) {
-        const startIndex = existing.indexOf(startMarker);
-        const endIndex = existing.indexOf(endMarker);
-        if (startIndex === -1 || endIndex === -1 || endIndex <= startIndex)
-            continue;
-        const afterEnd = endIndex + endMarker.length;
-        return `${existing.slice(0, startIndex).trimEnd()}\n\n${block.trimEnd()}\n${existing.slice(afterEnd).trimStart()}`.trimEnd() + "\n";
+function replaceMarkedBlock(existing, block) {
+    const start = existing.indexOf(INSTRUCTIONS_START);
+    const end = existing.indexOf(INSTRUCTIONS_END);
+    if (start >= 0 && end >= start) {
+        const after = end + INSTRUCTIONS_END.length;
+        return `${existing.slice(0, start).trimEnd()}\n\n${block}${existing.slice(after).trimStart()}`.trimEnd() + "\n";
     }
-    return `${existing.trimEnd()}${existing.trim() ? "\n\n" : ""}${block.trimEnd()}\n`;
+    return `${existing.trimEnd()}${existing.trim() ? "\n\n" : ""}${block}`.trimEnd() + "\n";
 }
-export function installBehaviorInstructions(input) {
-    const cwd = path.resolve(input.cwd ?? process.cwd());
-    const markdownBlock = behaviorInstructions(input.hostType, cwd);
-    const markdownTargets = [path.join(cwd, "CLAUDE.md"), path.join(cwd, "AGENTS.md")];
-    const writtenPaths = [];
-    let primaryPath = input.hostType === "claude_code" ? markdownTargets[0] : markdownTargets[1];
-    for (const instructionsPath of markdownTargets) {
-        const existing = fs.existsSync(instructionsPath) ? fs.readFileSync(instructionsPath, "utf8") : "";
-        const next = upsertMarkedBlock(existing, markdownBlock);
-        if (!input.dryRun) {
-            fs.mkdirSync(path.dirname(instructionsPath), { recursive: true });
-            fs.writeFileSync(instructionsPath, next, "utf8");
-        }
-        writtenPaths.push(instructionsPath);
-    }
-    if (input.hostType === "cursor") {
-        const cursorPath = path.join(cwd, ".cursor", "rules", "askthew.mdc");
-        if (!input.dryRun) {
-            fs.mkdirSync(path.dirname(cursorPath), { recursive: true });
-            fs.writeFileSync(cursorPath, cursorBehaviorInstructions(cwd), "utf8");
-        }
-        writtenPaths.push(cursorPath);
-        primaryPath = cursorPath;
+export function writeBehaviorInstructions(input) {
+    const filePath = instructionFileForHost(input.hostType, input.cwd);
+    const block = installBehaviorInstructions(input);
+    const existing = fs.existsSync(filePath) ? fs.readFileSync(filePath, "utf8") : "";
+    const next = replaceMarkedBlock(existing, block);
+    if (!input.dryRun) {
+        fs.writeFileSync(filePath, next, "utf8");
     }
     return {
-        path: primaryPath,
-        paths: writtenPaths,
+        filePath,
+        text: next,
         wroteFile: !input.dryRun,
-        content: markdownBlock,
     };
 }
-export function uninstallBehaviorInstructions(input) {
-    const cwd = path.resolve(input.cwd ?? process.cwd());
-    const markdownTargets = [path.join(cwd, "CLAUDE.md"), path.join(cwd, "AGENTS.md")];
-    const touchedPaths = [];
-    for (const instructionsPath of markdownTargets) {
-        if (!fs.existsSync(instructionsPath))
-            continue;
-        const existing = fs.readFileSync(instructionsPath, "utf8");
-        let next = existing;
-        for (const [startMarker, endMarker] of [
-            [ASKTHEW_INSTRUCTIONS_START, ASKTHEW_INSTRUCTIONS_END],
-            [LEGACY_ASKTHEW_INSTRUCTIONS_START, LEGACY_ASKTHEW_INSTRUCTIONS_END],
-        ]) {
-            next = next.replace(new RegExp(`\\n?${startMarker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}[\\s\\S]*?${endMarker.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\n?`, "g"), "\n");
-        }
-        next = next.trimEnd() + "\n";
-        if (!input.dryRun)
-            fs.writeFileSync(instructionsPath, next, "utf8");
-        touchedPaths.push(instructionsPath);
-    }
-    const cursorPath = path.join(cwd, ".cursor", "rules", "askthew.mdc");
-    if (input.hostType === "cursor" && fs.existsSync(cursorPath)) {
-        if (!input.dryRun)
-            fs.rmSync(cursorPath, { force: true });
-        touchedPaths.push(cursorPath);
-    }
-    return {
-        paths: touchedPaths,
-        wroteFile: !input.dryRun,
+export function writeInstallMetadata(input) {
+    const metadata = {
+        host: input.hostType,
+        version: packageVersion(),
+        api_url: input.apiUrl ?? "https://app.askthew.com",
+        tier: input.tier ?? "free",
+        workspace_id: input.workspaceId ?? null,
+        last_sync: new Date().toISOString(),
     };
+    writePrivateJson(installMetadataPath(input.env), metadata);
+    return metadata;
+}
+export function formatInstallCommand(input) {
+    return [
+        "npx",
+        "-y",
+        "--package",
+        "@askthew/mcp-plugin",
+        "askthew-mcp",
+        "install",
+        "--host",
+        input.hostType,
+        ...(input.bindToken ? ["--bind", input.bindToken] : []),
+    ].join(" ");
+}
+export function dataDirSummary(env = process.env) {
+    return askTheWDataDir(env);
 }