@sellable/install 0.1.38 → 0.1.40

package/bin/sellable-install.mjs

@@ -3,6 +3,7 @@ import { spawnSync } from "node:child_process";
 import {
   existsSync,
   mkdirSync,
+  readdirSync,
   readFileSync,
   rmSync,
   symlinkSync,
@@ -20,7 +21,9 @@ const DEFAULT_SERVER_PACKAGE =
 function getInstallVersion() {
   try {
     const here = dirname(fileURLToPath(import.meta.url));
-    const pkg = JSON.parse(readFileSync(join(here, "..", "package.json"), "utf8"));
+    const pkg = JSON.parse(
+      readFileSync(join(here, "..", "package.json"), "utf8")
+    );
     return pkg.version || "unknown";
   } catch {
     return "unknown";
@@ -1380,14 +1383,48 @@ function verify(opts) {
   }
 }
 
-function printNextSteps(installedHosts) {
-  console.log("");
-  printDivider();
-  console.log(`  ${C.bold}Done.${C.reset}`);
-  printDivider();
+function visibleLen(s) {
+  // Strip ANSI escape sequences for visible-width calculation.
+  return s.replace(/\x1b\[[0-9;]*m/g, "").length;
+}
+
+function printAgentBox(title, terminalCmd, agentCmd) {
+  // Inner width between │ ... │ — i.e. the printable area excluding the borders.
+  const W = 58;
+  const agentName = title.replace("Using ", "").replace("?", "");
+
+  const line = (text) => {
+    const pad = Math.max(0, W - visibleLen(text));
+    return `    │ ${text}${" ".repeat(pad)} │`;
+  };
+  const blank = () => `    │${" ".repeat(W + 2)}│`;
+
+  const titleColored = `${C.bold}${title}${C.reset}`;
+  const titleVis = visibleLen(titleColored);
+  const top = `    ┌─ ${titleColored} ${"─".repeat(Math.max(0, W - titleVis - 1))}┐`;
+  const bot = `    └${"─".repeat(W + 2)}┘`;
+
+  console.log(top);
+  console.log(blank());
+  console.log(line(` ${C.bold}STEP 1${C.reset}   In your terminal, run:`));
+  console.log(blank());
+  console.log(line(`           ${C.cyan}${terminalCmd}${C.reset}`));
+  console.log(blank());
+  console.log(line(` ${C.bold}STEP 2${C.reset}   Then in ${agentName}, run:`));
+  console.log(blank());
+  console.log(line(`           ${C.cyan}${agentCmd}${C.reset}`));
+  console.log(blank());
+  console.log(bot);
+}
+
+function printNextSteps(installedHosts, authReused) {
   console.log("");
 
   if (installedHosts.length === 0) {
+    printDivider();
+    console.log(`  ${C.bold}Installed.${C.reset}`);
+    printDivider();
+    console.log("");
     console.log(
       `  ${C.yellow}!${C.reset} Neither Claude Code nor Codex was found on this machine.`
     );
@@ -1408,52 +1445,255 @@ function printNextSteps(installedHosts) {
   const hasClaude = installedHosts.includes("Claude Code");
   const hasCodex = installedHosts.includes("Codex");
 
-  if (hasClaude && hasCodex) {
-    console.log(`  ${C.bold}Open Claude Code or Codex and run:${C.reset}`);
-    console.log("");
-    console.log(
-      `     ${C.cyan}/sellable:create-campaign${C.reset}   ${C.grey}(Claude Code)${C.reset}`
-    );
+  // Header
+  if (authReused) {
+    console.log(`      ${C.bold}Installed. Welcome back!${C.reset}`);
+  } else {
+    console.log(`      ${C.bold}Installed.${C.reset}`);
+  }
+  console.log(
+    `        ${C.green}✓${C.reset} MCP servers registered (${installedHosts.join(" + ")})`
+  );
+  if (hasCodex) {
+    console.log(`        ${C.green}✓${C.reset} Codex Desktop plugin installed`);
+    console.log(`        ${C.green}✓${C.reset} Skills installed`);
+  }
+  if (authReused) {
     console.log(
-      `     ${C.cyan}$sellable:create-campaign${C.reset}   ${C.grey}(Codex)${C.reset}`
+      `        ${C.green}✓${C.reset} Existing session detected — no need to sign in again`
     );
-  } else if (hasClaude) {
-    console.log(`  ${C.bold}Open Claude Code and run:${C.reset}`);
+  }
+  console.log("");
+  console.log("");
+  console.log(`   ${"═".repeat(63)}`);
+  console.log(`    ${C.bold}To launch your first campaign:${C.reset}`);
+  console.log(`   ${"═".repeat(63)}`);
+  console.log("");
+  console.log("");
+
+  if (hasClaude) {
+    printAgentBox("Using Claude Code?", "claude", "/sellable:create-campaign");
     console.log("");
-    console.log(`     ${C.cyan}/sellable:create-campaign${C.reset}`);
-  } else {
-    console.log(`  ${C.bold}Open Codex and run:${C.reset}`);
     console.log("");
-    console.log(`     ${C.cyan}$sellable:create-campaign${C.reset}`);
+  }
+  if (hasCodex) {
+    printAgentBox("Using Codex?", "codex", "$sellable:create-campaign");
+    console.log("");
   }
 
   console.log("");
+  console.log(`   ${"─".repeat(63)}`);
+  console.log(`    ${C.grey}Need help?${C.reset}`);
   console.log(
-    `  ${C.grey}First time? The agent will sign you up — just answer in chat.${C.reset}`
-  );
-
-  console.log("");
-  printDivider();
-  console.log("");
-  console.log(`  ${C.grey}Need help?${C.reset}`);
-  console.log(
-    `    Slack:     ${C.cyan}https://join.slack.com/t/ditttoai/shared_invite/zt-3wvs86yau-csKZGP3iGXO3oEiAUmtH9A${C.reset}`
+    `      Slack     ${C.cyan}https://join.slack.com/t/ditttoai/shared_invite/zt-3wvs86yau-csKZGP3iGXO3oEiAUmtH9A${C.reset}`
   );
-  console.log(`    Email:     ${C.cyan}admin@dittto.ai${C.reset}`);
+  console.log(`      Email     ${C.cyan}admin@dittto.ai${C.reset}`);
   console.log(
-    `    LinkedIn:  ${C.cyan}https://www.linkedin.com/in/csreyes92/${C.reset}  ${C.grey}(DM Christian directly)${C.reset}`
+    `      LinkedIn  ${C.cyan}https://www.linkedin.com/in/csreyes92/${C.reset}  ${C.grey}(DM Christian)${C.reset}`
   );
   console.log("");
   const installV = getInstallVersion();
   const mcpV = getMcpVersion();
   console.log(
-    `  ${C.grey}@sellable/install v${installV}  ·  @sellable/mcp v${mcpV}  ·  Codex plugin v${CODEX_PLUGIN_VERSION}${C.reset}`
+    `    ${C.grey}@sellable/install v${installV}  ·  @sellable/mcp v${mcpV}  ·  Codex plugin v${CODEX_PLUGIN_VERSION}${C.reset}`
   );
   console.log("");
 }
 
+function removeTomlSection(content, header) {
+  // Removes a [section] header and its body, up to (but not including) the next [...] header or EOF.
+  // header is the literal string in brackets, e.g. `mcp_servers.sellable` or `plugins."sellable@sellable"`.
+  const pattern = new RegExp(
+    `\\n*\\[${escapeRegExp(header)}\\][^\\n]*\\n[\\s\\S]*?(?=\\n\\[[^\\n]+\\]|$)`
+  );
+  return content.replace(pattern, "");
+}
+
+function runUninstall() {
+  console.log("");
+  console.log(`  ${C.bold}Uninstalling Sellable…${C.reset}`);
+  console.log("");
+
+  const removed = [];
+  const preserved = [];
+  const skipped = [];
+
+  // 1) Surgical removal from Codex config.toml
+  const codexConfigPath = join(codexHome(), "config.toml");
+  if (existsSync(codexConfigPath)) {
+    try {
+      const before = readFileSync(codexConfigPath, "utf8");
+      const ts = new Date()
+        .toISOString()
+        .replace(/[-:]/g, "")
+        .replace(/\..+/, "");
+      const backupPath = `${codexConfigPath}.bak-sellable-uninstall-${ts}`;
+      writeFileSync(backupPath, before, { mode: 0o600 });
+
+      let after = before;
+      after = removeTomlSection(after, "mcp_servers.sellable");
+      after = removeTomlSection(after, "marketplaces.sellable");
+      after = removeTomlSection(after, 'plugins."sellable@sellable"');
+      after = removeTomlSection(after, 'plugins."sellable@sellable-local"');
+      // Collapse 3+ blank lines that the removals may leave behind.
+      after = after.replace(/\n{3,}/g, "\n\n");
+      if (after !== before) {
+        writeFileSync(codexConfigPath, after, { mode: 0o600 });
+        removed.push(
+          `Codex config (sellable sections removed in ${codexConfigPath})`
+        );
+        removed.push(`  backup: ${backupPath}`);
+      } else {
+        skipped.push(`Codex config had no sellable sections`);
+      }
+    } catch (err) {
+      console.log(
+        `  ${C.yellow}!${C.reset} Could not edit Codex config: ${err instanceof Error ? err.message : String(err)}`
+      );
+    }
+  } else {
+    skipped.push(`Codex config not found at ${codexConfigPath}`);
+  }
+
+  // 2) Claude Code MCP removal
+  if (commandExists("claude")) {
+    const r = spawnSync("claude", ["mcp", "remove", "sellable"], {
+      encoding: "utf8",
+    });
+    if (r.status === 0) {
+      removed.push(`Claude Code MCP (sellable)`);
+    } else {
+      skipped.push(`Claude Code MCP (none registered or already removed)`);
+    }
+  } else {
+    skipped.push(`Claude Code CLI not found`);
+  }
+
+  // 3) Surgical removal of Sellable-installed artifacts inside ~/.sellable/
+  const sellableDir = join(homedir(), ".sellable");
+  if (existsSync(sellableDir)) {
+    const tracked = [
+      "config.json",
+      "update-check.json",
+      "codex-marketplace",
+      "create-campaign-v2",
+    ];
+    for (const name of tracked) {
+      const p = join(sellableDir, name);
+      if (existsSync(p)) {
+        try {
+          rmSync(p, { recursive: true, force: true });
+          removed.push(`${p}`);
+        } catch (err) {
+          console.log(
+            `  ${C.yellow}!${C.reset} Could not remove ${p}: ${err instanceof Error ? err.message : String(err)}`
+          );
+        }
+      }
+    }
+    // Inventory anything left — these are user-authored and we leave them.
+    let leftovers = [];
+    try {
+      leftovers = readdirSync(sellableDir);
+    } catch {
+      // ignore
+    }
+    if (leftovers.length > 0) {
+      for (const name of leftovers) {
+        preserved.push(`${join(sellableDir, name)}`);
+      }
+    } else {
+      try {
+        rmSync(sellableDir, { recursive: false, force: false });
+        removed.push(`${sellableDir} (empty)`);
+      } catch {
+        // ignore
+      }
+    }
+  } else {
+    skipped.push(`~/.sellable not present`);
+  }
+
+  // 4) Self-shim
+  const shimPath = join(homedir(), ".local", "bin", "sellable");
+  if (existsSync(shimPath)) {
+    try {
+      rmSync(shimPath, { force: true });
+      removed.push(`${shimPath}`);
+    } catch {
+      // ignore
+    }
+  }
+
+  // Print receipt
+  for (const r of removed) {
+    console.log(`    ${C.green}✓${C.reset} Removed  ${r}`);
+  }
+  for (const p of preserved) {
+    console.log(
+      `    ${C.cyan}•${C.reset} Preserved  ${p}  ${C.grey}(user-authored)${C.reset}`
+    );
+  }
+  for (const s of skipped) {
+    console.log(`    ${C.grey}·${C.reset} Skipped  ${s}`);
+  }
+
+  console.log("");
+  console.log(`  ${C.bold}Uninstalled.${C.reset}`);
+  console.log("");
+  console.log(`  Reinstall anytime:`);
+  console.log(`     ${C.cyan}npx -y @sellable/install@latest${C.reset}`);
+  console.log("");
+}
+
 async function main() {
   try {
+    // Phase 116: auth set <token> subcommand — manual-paste fallback when CLI poll fails.
+    // MUST be parsed BEFORE parseArgs() since parseArgs throws on non-flag args like "auth".
+    const rawArgs = process.argv.slice(2);
+    if (rawArgs[0] === "auth") {
+      if (rawArgs[1] !== "set") {
+        console.error(
+          `Unknown auth subcommand: ${rawArgs[1] ?? "(none)"}\nKnown: set <token>`
+        );
+        process.exit(2);
+      }
+      const token = rawArgs[2];
+      if (!token) {
+        console.error(
+          "Usage: sellable auth set <token>\n" +
+            "Get the token from the Sellable browser confirm page (after clicking the magic link)."
+        );
+        process.exit(2);
+      }
+      // Verification iter 1 broadening: accept skt_(live|test|dev)_ prefixes so
+      // non-prod tokens (existing in some environments) are not rejected.
+      if (!/^skt_(live|test|dev)_[A-Za-z0-9_-]{20,}$/.test(token)) {
+        console.error(
+          `That doesn't look like a Sellable token (expected skt_live_, skt_test_, or skt_dev_ prefix). Got: ${token.slice(0, 16)}…`
+        );
+        process.exit(2);
+      }
+      // Bypass writeAuth() — its workspaceId guard early-returns on missing
+      // workspaceId, but on the auth-set path we don't have one yet (next MCP
+      // call hydrates it). Write the same shape directly.
+      // Skip installSelfShim() — by definition the user has the shim already
+      // (they invoked `sellable auth set` from it).
+      const apiUrl = process.env.SELLABLE_API_URL || DEFAULT_API_URL;
+      writeJson(
+        authPath(),
+        { token, activeWorkspaceId: null, apiUrl },
+        { dryRun: false }
+      );
+      console.log(`✓ Token saved to ${authPath()}`);
+      console.log(`  apiUrl: ${apiUrl}`);
+      console.log(`  Run /sellable:create-campaign in your agent to continue.`);
+      process.exit(0);
+    }
+    if (rawArgs[0] === "uninstall") {
+      runUninstall();
+      process.exit(0);
+    }
     const opts = parseArgs(process.argv.slice(2));
     if (opts.help) {
       console.log(usage());
@@ -1483,19 +1723,12 @@ async function main() {
     }
 
     const installedHosts = [];
+    let authReused = false;
     if (!opts.verifyOnly) {
       await loadAuthIfPresent(opts);
       const authResult = writeAuth(opts);
+      authReused = Boolean(authResult.reused);
       installSelfShim(opts);
-      if (authResult.reused) {
-        logMilestone("Auth ready");
-      } else if (authResult.written) {
-        logMilestone(`Authenticated (workspace: ${opts.workspaceId})`);
-      } else {
-        logMilestone(
-          "Sellable infrastructure ready — sign in happens on first /sellable:create-campaign"
-        );
-      }
 
       if (opts.host === "claude" || opts.host === "all") {
         if (installClaude(opts)) {
@@ -1508,16 +1741,6 @@ async function main() {
           installedHosts.push("Codex");
         }
       }
-
-      if (installedHosts.length > 0) {
-        logMilestone(
-          `MCP servers registered (${installedHosts.join(" + ")})`
-        );
-        if (installedHosts.includes("Codex")) {
-          logMilestone("Codex Desktop plugin installed");
-          logMilestone("Skills installed");
-        }
-      }
     }
 
     if (opts.dryRun) {
@@ -1528,7 +1751,7 @@ async function main() {
     }
 
     if (!opts.verifyOnly) {
-      printNextSteps(installedHosts);
+      printNextSteps(installedHosts, authReused);
     }
   } catch (error) {
     console.error(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sellable/install",
-  "version": "0.1.38",
+  "version": "0.1.40",
   "type": "module",
   "description": "One-command installer for Sellable MCP in Claude Code and Codex",
   "bin": {