slidemind 0.1.5 → 0.1.7

package/src/installers/codex.mjs

@@ -23,6 +23,7 @@
 
 import fs from "node:fs";
 import path from "node:path";
+import { spawnSync } from "node:child_process";
 import {
   expandHome,
   installDir,
@@ -40,7 +41,10 @@ const TOML_MARK_BEGIN = "# slidemind:begin";
 const TOML_MARK_END = "# slidemind:end";
 
 function codexRoot() {
-  return expandHome("~/.codex");
+  // Codex reads everything (skills, AGENTS.md, config.toml) from $CODEX_HOME
+  // when set, defaulting to ~/.codex — mirror that so our artifacts land where
+  // it actually looks.
+  return process.env.CODEX_HOME || expandHome("~/.codex");
 }
 
 function promptsDir() {
@@ -81,38 +85,34 @@ function configTomlFile() {
   return path.join(codexRoot(), "config.toml");
 }
 
-function writeMcpServerBlock(packageRoot) {
-  const mcpServer = path.join(packageRoot, "src", "mcp", "server.mjs");
-  const block =
-    `${TOML_MARK_BEGIN}\n` +
-    `[mcp_servers.slidemind]\n` +
-    `command = "node"\n` +
-    `args = ["${mcpServer.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"]\n` +
-    `${TOML_MARK_END}\n`;
-
-  const file = configTomlFile();
-  let existing = fs.existsSync(file) ? fs.readFileSync(file, "utf8") : "";
-  const re = new RegExp(
-    `${TOML_MARK_BEGIN}[\\s\\S]*?${TOML_MARK_END}\\n?`,
-    "g",
+// slidemind is a CLI steered by the skill — there is no MCP server. We only ever
+// tear down a `[mcp_servers.slidemind]` table an older install registered.
+// Prefer Codex's own `codex mcp remove` (TOML-aware); fall back to a marker strip
+// when the binary is missing or too old.
+export function unregisterMcpServer() {
+  const viaCli = spawnSync(
+    "codex",
+    ["mcp", "remove", NAMESPACE],
+    { stdio: "ignore", shell: process.platform === "win32" },
   );
-  if (re.test(existing)) {
-    existing = existing.replace(re, "");
-  }
-  const sep = existing.length && !existing.endsWith("\n") ? "\n\n" : existing.length ? "\n" : "";
-  fs.writeFileSync(file, existing + sep + block);
+  if (!viaCli.error && viaCli.status === 0) return "unregistered via codex mcp";
+  return fallbackClearMcpServerBlock();
 }
 
-function clearMcpServerBlock() {
+// Fallback uninstall: strip a legacy marker-wrapped block if one is present;
+// otherwise point the user at `codex mcp remove` (we won't guess at the bounds
+// of a marker-less table without Codex's TOML parser).
+export function fallbackClearMcpServerBlock() {
   const file = configTomlFile();
-  if (!fs.existsSync(file)) return;
-  let existing = fs.readFileSync(file, "utf8");
-  const re = new RegExp(
-    `${TOML_MARK_BEGIN}[\\s\\S]*?${TOML_MARK_END}\\n?`,
-    "g",
-  );
-  existing = existing.replace(re, "");
-  fs.writeFileSync(file, existing);
+  if (!fs.existsSync(file)) return "unregistered";
+  const existing = fs.readFileSync(file, "utf8");
+  const re = new RegExp(`${TOML_MARK_BEGIN}[\\s\\S]*?${TOML_MARK_END}\\n?`, "g");
+  const stripped = existing.replace(re, "");
+  if (stripped !== existing) {
+    fs.writeFileSync(file, stripped);
+    return "unregistered (fallback)";
+  }
+  return "run `codex mcp remove slidemind` to remove the entry";
 }
 
 function writeAgentsBlock() {
@@ -192,12 +192,17 @@ export async function install({ packageRoot, flags }) {
   writeAgentsBlock();
   ui.step({ status: "ok", label: "AGENTS.md", value: agentsFile() });
 
-  // Register the slidemind MCP server so agents can list/push into open
-  // PowerPoint windows via slidemind_list_open_presentations / slidemind_push_deck.
-  writeMcpServerBlock(packageRoot);
-  ui.step({ status: "ok", label: "mcp server", value: configTomlFile() });
+  // slidemind is a CLI now — clean up any [mcp_servers.slidemind] table an older
+  // install registered so re-running init converges to the CLI-only setup.
+  if (
+    fs.existsSync(configTomlFile()) &&
+    fs.readFileSync(configTomlFile(), "utf8").includes(`[mcp_servers.${NAMESPACE}]`)
+  ) {
+    const mcpNote = unregisterMcpServer();
+    ui.step({ status: "remove", label: "mcp server", value: mcpNote });
+  }
 
-  ui.note("restart Codex to pick up the skill + MCP server");
+  ui.note("restart Codex to pick up the skill");
 }
 
 export async function uninstall() {
@@ -224,6 +229,6 @@ export async function uninstall() {
   }
   clearAgentsBlock();
   ui.step({ status: "remove", label: "AGENTS.md", value: agentsFile() });
-  clearMcpServerBlock();
-  ui.step({ status: "info", label: "mcp server", value: "unregistered" });
+  const mcpNote = unregisterMcpServer();
+  ui.step({ status: "info", label: "mcp server", value: mcpNote });
 }

package/src/installers/opencode.mjs

@@ -71,28 +71,20 @@ function saveOpencodeConfig(cfg) {
   fs.writeFileSync(file, JSON.stringify(cfg, null, 2) + "\n");
 }
 
+// slidemind is a CLI steered by the skill — there is no MCP server. This only
+// tears down any `mcp.slidemind` entry an older install registered, so re-running
+// `init` converges to the CLI-only setup. Returns whether it removed one.
 function unregisterMcpServer() {
   const file = opencodeConfigFile();
-  if (!fs.existsSync(file)) return;
+  if (!fs.existsSync(file)) return false;
   const cfg = loadOpencodeConfig();
   if (cfg.mcp && cfg.mcp[NAMESPACE]) {
     delete cfg.mcp[NAMESPACE];
     if (Object.keys(cfg.mcp).length === 0) delete cfg.mcp;
     saveOpencodeConfig(cfg);
+    return true;
   }
-}
-
-function registerMcpServer(packageRoot) {
-  const mcpServer = path.join(packageRoot, "src", "mcp", "server.mjs");
-  const cfg = loadOpencodeConfig();
-  if (!cfg["$schema"]) cfg["$schema"] = "https://opencode.ai/config.json";
-  cfg.mcp = cfg.mcp || {};
-  cfg.mcp[NAMESPACE] = {
-    type: "local",
-    command: ["node", mcpServer],
-    enabled: true,
-  };
-  saveOpencodeConfig(cfg);
+  return false;
 }
 
 function removeLegacyArtifacts() {
@@ -153,10 +145,10 @@ export async function install({ packageRoot, flags }) {
     );
   }
 
-  // Register the slidemind MCP server so agents can list/push into open
-  // PowerPoint windows via slidemind_list_open_presentations / slidemind_push_deck.
-  registerMcpServer(packageRoot);
-  ui.step({ status: "ok", label: "mcp server", value: opencodeConfigFile() });
+  // slidemind is a CLI now — remove any MCP registration an older install left.
+  if (unregisterMcpServer()) {
+    ui.step({ status: "remove", label: "mcp server", value: "removed legacy registration (slidemind is a CLI)" });
+  }
 }
 
 export async function uninstall() {

package/src/lib/reused-slides.mjs

@@ -1,9 +1,7 @@
 // Shared numeric-prefix + filename logic for folding reused slide-search
 // results into a deck as native one-slide .pptx (the "reuse → fold into a deck"
-// path). Both `slidemind add-slide` (bin/slidemind.mjs) and the
-// `slidemind_add_slide_to_deck` MCP tool (src/mcp/server.mjs) drive the SAME
-// math, so it lives here as one pure, tested unit — the callers keep the bridge
-// round-trip and the fs write.
+// path behind `slidemind add-slide`, bin/slidemind.mjs). Kept here as one pure,
+// tested unit — the caller keeps the bridge round-trip and the fs write.
 //
 // Play order over the CLI is filename order (see src/lib/slide-order.mjs): a
 // reused slide is named `NN-reused-<shortid>.pptx`, zero-padded to width 2, so