@askthew/mcp-plugin 0.4.0 → 0.4.3

package/dist/cli.js

@@ -1,14 +1,21 @@
 #!/usr/bin/env node
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import fs from "node:fs";
+import path from "node:path";
+import { execFileSync } from "node:child_process";
+import { fileURLToPath } from "node:url";
 import { createAskTheWMcpServer } from "./index.js";
-import { requestMagicLinkCode, verifyMagicLinkCode } from "./lib/auth-magic-link.js";
+import { clearPendingAuth, pendingAuth, pendingAuthForEmail } from "./lib/auth-pending.js";
+import { verifyMagicLinkCode as verifyMagicLinkCodeDefault, } from "./lib/auth-magic-link.js";
 import { credentialsPath, ensureAskTheWDataDir } from "./lib/paths.js";
 import { loadCliCredentials } from "./lib/free-tier-policy.js";
+import { describeFreeIdentity, tryRegisterFreeInstall } from "./lib/free-install-registration.js";
+import { ensureLocalIdentity, loadLocalIdentity, publicIdentity } from "./lib/local-identity.js";
 import { LocalStore } from "./lib/local-store.js";
 import { buildTelemetryPayload } from "./lib/telemetry.js";
 import { syncDryRun, uploadLocalStore } from "./lib/upgrade-sync.js";
-import { createHostConfigSnippet, formatInstallCommand, installBehaviorInstructions, installHostConfig, sendInstallHeartbeat, } from "./install.js";
+import { installPreCommitHook, localScopeKey, preCommitDecisionGap, stagedFiles, writeWeeklyDigest, } from "./lib/cli-actions.js";
+import { createHostConfigSnippet, formatInstallCommand, installBehaviorInstructions, installHostConfig, sendInstallHeartbeat, uninstallBehaviorInstructions, uninstallHostConfig, } from "./install.js";
 function usage() {
     return [
         "Ask The W Coding Agent Connector",
@@ -16,11 +23,17 @@ function usage() {
         "Usage:",
         "  askthew-mcp",
         "  askthew-mcp install --host <claude_code|codex|cursor> --token <install-token> --api-url <url> --server-name <name> [--client-id <id>] [--client-label <label>] [--dry-run] [--no-agent-instructions]",
-        "  askthew-mcp install --host <claude_code|codex|cursor> --free [--api-url <url>] [--server-name <name>]",
-        "  askthew-mcp auth login --email <email> [--code <code>] [--no-telemetry]",
+        "  askthew-mcp install --host <claude_code|codex|cursor> --free [--email <email>] [--api-url <url>] [--server-name <name>]",
+        "  askthew-mcp uninstall --host <claude_code|codex|cursor> [--server-name <name>] [--dry-run] [--keep-local-data] [--keep-auth] [--keep-agent-instructions]",
+        "  askthew-mcp identify --email <email> [--no-telemetry]",
+        "  askthew-mcp identity status",
+        "  askthew-mcp auth login --email <email> [--no-telemetry]",
+        "  askthew-mcp auth verify --code <code> [--email <email>]",
         "  askthew-mcp auth logout | status",
         "  askthew-mcp telemetry status | opt-out | opt-in | preview",
         "  askthew-mcp local stats | reset --hard",
+        "  askthew-mcp install-hook --pre-commit",
+        "  askthew-mcp digest --weekly",
         "  askthew-mcp sync upload [--dry-run]",
         "  askthew-mcp print-config --host <claude_code|codex|cursor> --token <install-token> --api-url <url> --server-name <name> [--client-id <id>] [--client-label <label>]",
     ].join("\n");
@@ -35,6 +48,7 @@ function parseInstallArgs(argv) {
     let dryRun = false;
     let installAgentInstructions = true;
     let free = false;
+    let email = process.env.ASKTHEW_EMAIL?.trim() || "";
     for (let index = 0; index < argv.length; index += 1) {
         const argument = argv[index];
         if (argument === "--dry-run") {
@@ -86,6 +100,11 @@ function parseInstallArgs(argv) {
             index += 1;
             continue;
         }
+        if (argument === "--email") {
+            email = next;
+            index += 1;
+            continue;
+        }
         throw new Error(`Unknown argument: ${argument}`);
     }
     if (!hostType) {
@@ -110,11 +129,45 @@ function parseInstallArgs(argv) {
         dryRun,
         installAgentInstructions,
         free,
+        email: email || undefined,
     };
 }
 function normalizeInstallToken(token) {
     return String(token ?? "").trim().replace(/^['"]/, "").replace(/['"]$/, "");
 }
+function detectLoginEmail() {
+    for (const value of [
+        process.env.ASKTHEW_EMAIL,
+        process.env.GIT_AUTHOR_EMAIL,
+        process.env.GIT_COMMITTER_EMAIL,
+        process.env.EMAIL,
+    ]) {
+        const email = String(value ?? "").trim();
+        if (/^[^@\s]+@[^@\s]+\.[^@\s]+$/.test(email))
+            return email;
+    }
+    try {
+        const email = execFileSync("git", ["config", "user.email"], {
+            encoding: "utf8",
+            stdio: ["ignore", "pipe", "ignore"],
+        }).trim();
+        if (/^[^@\s]+@[^@\s]+\.[^@\s]+$/.test(email))
+            return email;
+    }
+    catch {
+        return "";
+    }
+    return "";
+}
+function loginCommandHint() {
+    const email = detectLoginEmail();
+    return email
+        ? `askthew-mcp identify --email ${email}`
+        : "askthew-mcp identify --email <your-email>";
+}
+function installIdentityEmail(optionsEmail) {
+    return optionsEmail?.trim() || detectLoginEmail() || undefined;
+}
 async function main() {
     const [command, ...argv] = process.argv.slice(2);
     if (command === "--help" || command === "-h" || command === "help") {
@@ -129,6 +182,13 @@ async function main() {
     }
     if (command === "install") {
         const options = parseInstallArgs(argv);
+        let freeIdentity = null;
+        if (options.free && !options.dryRun) {
+            freeIdentity = ensureLocalIdentity({
+                emailClaim: installIdentityEmail(options.email),
+                apiUrl: options.apiUrl,
+            });
+        }
         const result = installHostConfig(options);
         const instructions = options.installAgentInstructions
             ? installBehaviorInstructions({
@@ -142,12 +202,25 @@ async function main() {
         console.log(result.wroteFile ? "Ask The W plugin install complete." : "Ask The W plugin dry run complete.");
         console.log(`Settings path: ${result.settingsPath}`);
         if (instructions) {
-            console.log(`Agent instructions: ${instructions.path}`);
+            console.log(`Agent instructions: ${instructions.paths?.join(", ") ?? instructions.path}`);
         }
         console.log(`Install command: ${formatInstallCommand(options)}`);
         if (result.wroteFile) {
+            if (freeIdentity) {
+                const registration = await tryRegisterFreeInstall({
+                    identity: freeIdentity,
+                    deviceLabel: options.clientLabel ?? `${options.hostType} free install`,
+                    repo: {
+                        repoName: process.env.ASKTHEW_REPO_NAME,
+                        repoRoot: process.env.ASKTHEW_REPO_ROOT,
+                        hostType: options.hostType,
+                    },
+                    options: { apiUrl: options.apiUrl },
+                });
+                console.log(registration.ok ? "Free install identity registered with Ask The W." : "Free install identity saved locally; cloud registration will retry later.");
+            }
             console.log(options.free
-                ? "Free local mode installed. Next step: run `askthew-mcp auth login --email you@example.com`."
+                ? "Free local mode installed. Restart or reload your coding app; captures and decisions will write to ~/.askthew/store.sqlite."
                 : heartbeatSent
                     ? "Ask The W install heartbeat sent. Refresh the app to confirm the plugin shows Installed."
                     : "Ask The W install heartbeat could not be sent yet. Restart or reload your coding app, then refresh Ask The W.");
@@ -159,6 +232,18 @@ async function main() {
         }
         return;
     }
+    if (command === "identify") {
+        await runIdentifyCommand(argv);
+        return;
+    }
+    if (command === "identity") {
+        await runIdentityCommand(argv);
+        return;
+    }
+    if (command === "uninstall") {
+        await runUninstallCommand(argv);
+        return;
+    }
     if (command === "auth") {
         await runAuthCommand(argv);
         return;
@@ -171,6 +256,18 @@ async function main() {
         await runLocalCommand(argv);
         return;
     }
+    if (command === "install-hook") {
+        await runInstallHookCommand(argv);
+        return;
+    }
+    if (command === "hook-check") {
+        await runHookCheckCommand(argv);
+        return;
+    }
+    if (command === "digest") {
+        await runDigestCommand(argv);
+        return;
+    }
     if (command === "sync") {
         await runSyncCommand(argv);
         return;
@@ -189,59 +286,189 @@ async function main() {
     const transport = new StdioServerTransport();
     await server.connect(transport);
 }
+async function runUninstallCommand(argv) {
+    let hostType;
+    let serverName = process.env.ASKTHEW_SERVER_NAME?.trim() || "askthew";
+    let dryRun = false;
+    let keepLocalData = false;
+    let keepAuth = false;
+    let keepAgentInstructions = false;
+    for (let index = 0; index < argv.length; index += 1) {
+        const argument = argv[index];
+        if (argument === "--dry-run") {
+            dryRun = true;
+            continue;
+        }
+        if (argument === "--keep-local-data") {
+            keepLocalData = true;
+            continue;
+        }
+        if (argument === "--keep-auth") {
+            keepAuth = true;
+            continue;
+        }
+        if (argument === "--keep-agent-instructions") {
+            keepAgentInstructions = true;
+            continue;
+        }
+        const next = argv[index + 1];
+        if (!next)
+            throw new Error(`Missing value for ${argument}.`);
+        if (argument === "--host") {
+            if (next !== "claude_code" && next !== "codex" && next !== "cursor") {
+                throw new Error(`Unsupported host "${next}". Expected claude_code, codex, or cursor.`);
+            }
+            hostType = next;
+            index += 1;
+            continue;
+        }
+        if (argument === "--server-name") {
+            serverName = next;
+            index += 1;
+            continue;
+        }
+        throw new Error(`Unknown argument: ${argument}`);
+    }
+    if (!hostType) {
+        throw new Error("Usage: askthew-mcp uninstall --host <claude_code|codex|cursor> [--server-name <name>]");
+    }
+    const config = uninstallHostConfig({ hostType, serverName, dryRun });
+    const instructions = keepAgentInstructions
+        ? null
+        : uninstallBehaviorInstructions({ hostType, dryRun });
+    if (!keepLocalData && !dryRun) {
+        fs.rmSync(ensureAskTheWDataDir(), { recursive: true, force: true });
+    }
+    if (!keepAuth && !dryRun) {
+        const file = credentialsPath();
+        if (fs.existsSync(file))
+            fs.rmSync(file, { force: true });
+    }
+    console.log(dryRun ? "Ask The W plugin uninstall dry run complete." : "Ask The W plugin uninstall complete.");
+    console.log(`Settings path: ${config.settingsPath}`);
+    if (instructions) {
+        console.log(`Agent instructions removed: ${instructions.paths.join(", ") || "none"}`);
+    }
+    console.log(keepLocalData ? "Local data kept." : "Local data removed.");
+    console.log(keepAuth ? "Auth tokens kept." : "Auth tokens removed.");
+    if (dryRun) {
+        console.log("");
+        console.log(config.json);
+    }
+}
 function argValue(argv, name) {
     const index = argv.indexOf(name);
     return index >= 0 ? argv[index + 1] : undefined;
 }
-async function runAuthCommand(argv) {
+export async function runAuthCommand(argv, deps = {}) {
+    const log = deps.log ?? console.log;
+    const verifyCode = deps.verifyMagicLinkCode ?? verifyMagicLinkCodeDefault;
+    const registerInstall = deps.registerFreeInstall ?? tryRegisterFreeInstall;
     const [subcommand] = argv;
     if (subcommand === "status") {
+        const identity = loadLocalIdentity();
         const credentials = loadCliCredentials();
-        console.log(credentials
-            ? `Logged in as ${credentials.email ?? credentials.userId}. Telemetry: ${credentials.telemetryOptOut ? "off" : "on"}`
-            : "Not logged in. Run `askthew-mcp auth login --email you@example.com`.");
+        log(identity
+            ? `Identified local free install ${identity.installId}${identity.emailClaim ? ` with email claim ${identity.emailClaim}` : ""}. Email claim is unverified until upgrade.`
+            : credentials
+                ? `Logged in as ${credentials.email ?? credentials.userId}. Telemetry: ${credentials.telemetryOptOut ? "off" : "on"}`
+                : pendingAuth()
+                    ? `Not logged in. Pending code for ${pendingAuth()?.email}. Run \`askthew-mcp auth verify --code <6-digit-code>\`.`
+                    : `No local identity yet. Run \`askthew-mcp identify --email <your-email>\`, or install with \`--free --email <your-email>\`.`);
         return;
     }
     if (subcommand === "logout") {
         const file = credentialsPath();
         if (fs.existsSync(file))
             fs.rmSync(file);
-        console.log("Logged out of Ask The W local free tier.");
+        log("Logged out of Ask The W local free tier.");
         return;
     }
-    if (subcommand !== "login") {
-        throw new Error("Usage: askthew-mcp auth login --email <email> [--code <code>] [--no-telemetry]");
+    if (subcommand !== "login" && subcommand !== "verify") {
+        throw new Error("Usage: askthew-mcp auth login --email <email> [--no-telemetry] | askthew-mcp auth verify --code <code> [--email <email>]");
     }
     ensureAskTheWDataDir();
     const email = argValue(argv, "--email")?.trim();
+    const code = argValue(argv, "--code")?.trim();
+    if (subcommand === "verify" || code) {
+        if (!code)
+            throw new Error("Missing --code.");
+        const pending = email ? pendingAuthForEmail(email) : pendingAuth();
+        if (!pending) {
+            throw new Error(email
+                ? `No pending Ask The W login request for ${email}. Run \`askthew-mcp auth login --email ${email}\` first.`
+                : "No pending Ask The W login request. Run `askthew-mcp auth login --email <email>` first.");
+        }
+        if (subcommand === "login") {
+            log("Using the pending Ask The W login request. Next time, run `askthew-mcp auth verify --code <6-digit-code>`.");
+        }
+        const credentials = await verifyCode({
+            requestId: pending.requestId,
+            code,
+            telemetryOptOut: pending.telemetryOptOut,
+        });
+        clearPendingAuth();
+        log(`Logged in. Account status: ${credentials.accountStatus}. Credentials stored with mode 0600.`);
+        return;
+    }
     if (!email)
         throw new Error("Missing --email.");
     const noTelemetry = argv.includes("--no-telemetry");
-    const requested = await requestMagicLinkCode({ email, deviceLabel: "askthew-mcp" });
-    console.log(`Code sent to ${email}. It expires at ${requested.expiresAt}.`);
-    if (requested.devCode)
-        console.log(`Dev code: ${requested.devCode}`);
-    const code = argValue(argv, "--code")?.trim() ?? requested.devCode;
-    if (!code) {
-        throw new Error("Re-run with --code <6-digit-code> after checking your email.");
-    }
-    const credentials = await verifyMagicLinkCode({
-        requestId: requested.requestId,
-        code,
-        telemetryOptOut: noTelemetry,
+    const identity = ensureLocalIdentity({ emailClaim: email, telemetryOptOut: noTelemetry });
+    const registration = await registerInstall({
+        identity,
+        deviceLabel: "askthew-mcp",
+    });
+    log(`Local free install identified as ${identity.installId}.`);
+    log(`Email claim: ${identity.emailClaim ?? "none"} (unverified until upgrade).`);
+    log(`Claim code: ${identity.claimCode}`);
+    log(registration.ok ? "Registered install with Ask The W." : "Saved locally; cloud registration will retry later.");
+    log("No email code is required for free local capture.");
+    return;
+}
+async function runIdentifyCommand(argv) {
+    const email = argValue(argv, "--email")?.trim() || detectLoginEmail();
+    const noTelemetry = argv.includes("--no-telemetry");
+    if (!email)
+        throw new Error("Missing --email.");
+    const identity = ensureLocalIdentity({ emailClaim: email, telemetryOptOut: noTelemetry });
+    const registration = await tryRegisterFreeInstall({
+        identity,
+        deviceLabel: "askthew-mcp",
     });
-    console.log(`Logged in. Account status: ${credentials.accountStatus}. Credentials stored with mode 0600.`);
+    console.log(`Local free install identified as ${identity.installId}.`);
+    console.log(`Email claim: ${identity.emailClaim ?? "none"} (unverified until upgrade).`);
+    console.log(`Claim code: ${identity.claimCode}`);
+    console.log(registration.ok ? "Registered install with Ask The W." : "Saved locally; cloud registration will retry later.");
+}
+async function runIdentityCommand(argv) {
+    const [subcommand] = argv;
+    if (subcommand !== "status") {
+        throw new Error("Usage: askthew-mcp identity status");
+    }
+    const identity = loadLocalIdentity();
+    if (!identity) {
+        console.log("No local free install identity yet.");
+        return;
+    }
+    console.log(describeFreeIdentity(publicIdentity(identity)));
+    console.log("Email claims are attribution only; upgrade/import requires local possession proof.");
 }
 async function runTelemetryCommand(argv) {
     const [subcommand] = argv;
     const credentials = loadCliCredentials();
     if (!credentials)
-        throw new Error("Not logged in. Run `askthew-mcp auth login` first.");
+        throw new Error("No local identity. Run `askthew-mcp identify --email <your-email>` first.");
     if (subcommand === "status") {
         console.log(`Telemetry: ${credentials.telemetryOptOut ? "off" : "on"}`);
         return;
     }
     if (subcommand === "opt-out" || subcommand === "opt-in") {
+        if (credentials.identityKind === "local_install" && credentials.localIdentity) {
+            ensureLocalIdentity({ telemetryOptOut: subcommand === "opt-out" });
+            console.log(`Telemetry: ${subcommand === "opt-out" ? "off" : "on"}`);
+            return;
+        }
         const next = { ...credentials, telemetryOptOut: subcommand === "opt-out" };
         fs.writeFileSync(credentialsPath(), `${JSON.stringify(next, null, 2)}\n`, { encoding: "utf8", mode: 0o600 });
         fs.chmodSync(credentialsPath(), 0o600);
@@ -270,12 +497,38 @@ async function runLocalCommand(argv) {
     }
     throw new Error("Usage: askthew-mcp local stats | reset --hard");
 }
+async function runInstallHookCommand(argv) {
+    if (!argv.includes("--pre-commit")) {
+        throw new Error("Usage: askthew-mcp install-hook --pre-commit");
+    }
+    const hookPath = installPreCommitHook();
+    console.log(`Ask The W pre-commit hook installed: ${hookPath}`);
+}
+async function runHookCheckCommand(argv) {
+    if (!argv.includes("--pre-commit")) {
+        throw new Error("Usage: askthew-mcp hook-check --pre-commit");
+    }
+    const store = LocalStore.open();
+    const gap = preCommitDecisionGap({ store, stagedFiles: stagedFiles(), scopeKey: localScopeKey() });
+    if (gap.missing) {
+        console.log('Ask The W: this change has no decision attached, draft one?');
+        console.log("Run: npx @askthew/mcp-plugin digest --weekly or ask your agent to call promote_signal_to_decision.");
+    }
+}
+async function runDigestCommand(argv) {
+    if (!argv.includes("--weekly")) {
+        throw new Error("Usage: askthew-mcp digest --weekly");
+    }
+    const store = LocalStore.open();
+    const filePath = writeWeeklyDigest({ store });
+    console.log(`Weekly decision digest written: ${filePath}`);
+}
 async function runSyncCommand(argv) {
     if (argv[0] !== "upload")
         throw new Error("Usage: askthew-mcp sync upload [--dry-run]");
     const credentials = loadCliCredentials();
     if (!credentials)
-        throw new Error("Not logged in. Run `askthew-mcp auth login` first.");
+        throw new Error("No local identity. Run `askthew-mcp identify --email <your-email>` first.");
     const store = LocalStore.open();
     if (argv.includes("--dry-run")) {
         console.log(JSON.stringify(syncDryRun(store), null, 2));
@@ -283,12 +536,15 @@ async function runSyncCommand(argv) {
     }
     console.log(JSON.stringify(await uploadLocalStore({ store, credentials }), null, 2));
 }
-main().catch((error) => {
-    if (error instanceof Error) {
-        console.error(error.message);
-    }
-    else {
-        console.error("Ask The W plugin failed to start.", error);
-    }
-    process.exit(1);
-});
+const isDirectCliExecution = Boolean(process.argv[1]) && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url);
+if (isDirectCliExecution) {
+    main().catch((error) => {
+        if (error instanceof Error) {
+            console.error(error.message);
+        }
+        else {
+            console.error("Ask The W plugin failed to start.", error);
+        }
+        process.exit(1);
+    });
+}

package/dist/cli.test.d.ts

@@ -0,0 +1 @@
+export {};