@formstr/mcp 0.3.1 → 0.3.2

package/dist/index.js

@@ -24436,8 +24436,21 @@ async function loginNostrConnect(deps, log) {
     perms: NIP46_PERMS
   });
 }
-async function doLogout(signer, pubkey) {
-  await signer.logout(pubkey);
+async function doLogout(signer, target) {
+  if (target) {
+    const match = findAccount(listAccounts(signer), target);
+    if (!match) {
+      throw new Error(
+        `No stored account matching "${target}". Run \`formstr-mcp accounts\` to list them.`
+      );
+    }
+    await signer.logout(match.pubkey);
+    return match;
+  }
+  const active = signer.getActiveAccount();
+  if (!active) return null;
+  await signer.logout(active.pubkey);
+  return active;
 }
 function whoami(signer) {
   return signer.getActiveAccount();
@@ -27521,7 +27534,7 @@ function helpText() {
     "Commands:",
     "  run               Run the stdio MCP server (default when no command is given).",
     "  login             Sign in (create / import / bunker URI / QR) and store the key.",
-    "  logout [npub]     Remove a stored account (defaults to the active one).",
+    "  logout [npub|hex] Permanently remove a stored account from the keystore (defaults to active).",
     "  whoami            Print the active account.",
     "  accounts          List stored accounts ('*' marks the active one).",
     "  switch <npub>     Set the active account (accepts an npub or hex pubkey).",
@@ -34865,6 +34878,25 @@ function computeResults(responses) {
   return { results, totalVotes: totalVoters };
 }
 
+// ../agent/src/tools/pubkey.ts
+function normalizePubkey(value) {
+  const trimmed = value.trim();
+  if (!trimmed) return null;
+  if (/^[0-9a-f]{64}$/i.test(trimmed)) return trimmed.toLowerCase();
+  if (trimmed.startsWith("npub1")) {
+    try {
+      const decoded = nip19_exports.decode(trimmed);
+      if (decoded.type === "npub") return decoded.data;
+    } catch {
+    }
+  }
+  return null;
+}
+function normalizePubkeyList(values) {
+  if (!Array.isArray(values)) return [];
+  return values.map((v) => typeof v === "string" ? normalizePubkey(v) : null).filter((p) => !!p);
+}
+
 // ../agent/src/tools/calendar.ts
 var calendarTools = buildCalendarTools();
 function buildCalendarTools() {
@@ -34904,7 +34936,7 @@ function buildCalendarTools() {
   server.registerTool(
     "create_calendar_event",
     {
-      description: "Schedule a calendar event. start/end are ISO 8601. Events default to PRIVATE (encrypted) and are linked into a calendar list \u2014 that is the only way they show on calendar.formstr.app, which renders only events referenced in a calendar list. Pass calendarId to choose which calendar; if omitted and the user already has calendars, this tool returns the list so you can ASK the user which one (then re-run with calendarId). Set isPrivate:false for a public, unencrypted event \u2014 note public events do NOT sync to calendar.formstr.app. participants receive NIP-59 invitations.",
+      description: "Schedule a calendar event. start/end are ISO 8601. Events default to PRIVATE (encrypted) and are linked into a calendar list \u2014 that is the only way they show on calendar.formstr.app, which renders only events referenced in a calendar list. Pass calendarId to choose which calendar; if omitted and the user already has calendars, this tool returns the list so you can ASK the user which one (then re-run with calendarId). Set isPrivate:false for a public, unencrypted event \u2014 note public events do NOT sync to calendar.formstr.app. participants (npub or hex) receive NIP-59 invitations.",
       inputSchema: {
         title: external_exports.string(),
         description: external_exports.string().optional(),
@@ -34944,7 +34976,9 @@ function buildCalendarTools() {
         begin,
         end,
         location: args.location,
-        participants: args.participants,
+        // Accept npub OR hex for each participant — the wire (["p"] tags, NIP-59
+        // invitation wraps, relay-list query) needs hex, so convert here.
+        participants: normalizePubkeyList(args.participants),
         isPrivate,
         calendarId: args.calendarId,
         rrule: args.rrule,
@@ -34971,7 +35005,8 @@ function buildCalendarTools() {
       inputSchema: { coordinate: external_exports.string() }
     },
     async ({ coordinate }) => {
-      const event = await service_exports2.fetchCalendarEventByCoordinate(coordinate);
+      const viewKey = await service_exports2.lookupEventViewKey(coordinate);
+      const event = await service_exports2.fetchCalendarEventByCoordinate(coordinate, viewKey);
       if (!event) return fail(`No event found for ${coordinate}.`, "NOT_FOUND");
       return ok(`Event "${event.title}".`, {
         event: {
@@ -35222,7 +35257,8 @@ function buildCalendarTools() {
         `updates event ${args.coordinate}`
       );
       if (blocked) return blocked;
-      const existing = await service_exports2.fetchCalendarEventByCoordinate(args.coordinate);
+      const viewKey = await service_exports2.lookupEventViewKey(args.coordinate);
+      const existing = await service_exports2.fetchCalendarEventByCoordinate(args.coordinate, viewKey);
       if (!existing) return fail(`No event found for ${args.coordinate}.`, "NOT_FOUND");
       const draft = {
         title: args.title ?? existing.title,
@@ -35264,7 +35300,8 @@ function buildCalendarTools() {
         `attaches a form to ${coordinate}`
       );
       if (blocked) return blocked;
-      const existing = await service_exports2.fetchCalendarEventByCoordinate(coordinate);
+      const viewKey = await service_exports2.lookupEventViewKey(coordinate);
+      const existing = await service_exports2.fetchCalendarEventByCoordinate(coordinate, viewKey);
       if (!existing) return fail(`No event found for ${coordinate}.`, "NOT_FOUND");
       const draft = {
         title: existing.title,
@@ -35543,23 +35580,6 @@ function buildDriveTools() {
 }
 
 // ../agent/src/tools/shared.ts
-function normalizePubkey(value) {
-  const trimmed = value.trim();
-  if (!trimmed) return null;
-  if (/^[0-9a-f]{64}$/i.test(trimmed)) return trimmed.toLowerCase();
-  if (trimmed.startsWith("npub1")) {
-    try {
-      const decoded = nip19_exports.decode(trimmed);
-      if (decoded.type === "npub") return decoded.data;
-    } catch {
-    }
-  }
-  return null;
-}
-function normalizePubkeyList(values) {
-  if (!Array.isArray(values)) return [];
-  return values.map((v) => typeof v === "string" ? normalizePubkey(v) : null).filter((p) => !!p);
-}
 var ANSWER_TYPES = new Set(Object.values(AnswerType));
 var LEGACY_TYPE_ALIASES = {
   multiChoiceGrid: "multipleChoiceGrid" /* multipleChoiceGrid */
@@ -46593,8 +46613,10 @@ async function main() {
       await runLogin(cli);
       return cli.command;
     case "logout": {
-      await doLogout(await buildMcpSigner(), cli.account);
-      console.error("formstr-mcp: signed out.");
+      const removed = await doLogout(await buildMcpSigner(), cli.target ?? cli.account);
+      console.error(
+        removed ? `formstr-mcp: removed ${removed.npub} (${removed.method}).` : "formstr-mcp: no account to remove."
+      );
       return cli.command;
     }
     case "whoami": {