@formstr/mcp 0.3.0 → 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).",
@@ -32161,14 +32174,22 @@ function buildSpecRows(formId, name, fields, settings) {
   for (const field of fields) rows.push(buildFieldTag(field));
   return rows;
 }
-function buildEncryptedOuterTags(formId, name, relays, settings) {
-  const tags = [["d", formId], ["name", name], ...relays.map((r) => ["relay", r])];
+function buildParticipantTags(settings) {
+  const tags = [];
   const allowed = settings?.allowedResponders ?? [];
   const pTags = /* @__PURE__ */ new Set([...allowed, ...settings?.collaborators ?? []]);
   for (const pk of allowed) tags.push(["allowed", pk]);
   for (const pk of pTags) tags.push(["p", pk]);
   return tags;
 }
+function buildEncryptedOuterTags(formId, name, relays, settings) {
+  return [
+    ["d", formId],
+    ["name", name],
+    ...relays.map((r) => ["relay", r]),
+    ...buildParticipantTags(settings)
+  ];
+}
 async function createForm(params) {
   await signerManager.getSigner();
   const formId = crypto.randomUUID().slice(0, 8);
@@ -32194,7 +32215,12 @@ async function createForm(params) {
     await appendToMyFormsList(signingPubkey, formId, relays[0] ?? "", signingKeyHex, viewKeyHex);
     return { formId, pubkey: signingPubkey, signingKey: signingKeyHex, viewKey: viewKeyHex };
   }
-  const tags = [...specRows, ["t", "public"], ...relays.map((r) => ["relay", r])];
+  const tags = [
+    ...specRows,
+    ["t", "public"],
+    ...relays.map((r) => ["relay", r]),
+    ...buildParticipantTags(params.settings)
+  ];
   const event = {
     kind: FORM_KINDS.template,
     created_at: Math.floor(Date.now() / 1e3),
@@ -32514,7 +32540,12 @@ async function updateForm(params) {
     await nostrRuntime.publish(relays, finalizeEvent(event2, signingKeyBytes));
     return;
   }
-  const tags = [...specRows, ["t", "public"], ...relays.map((r) => ["relay", r])];
+  const tags = [
+    ...specRows,
+    ["t", "public"],
+    ...relays.map((r) => ["relay", r]),
+    ...buildParticipantTags(settings)
+  ];
   const event = {
     kind: FORM_KINDS.template,
     created_at: Math.floor(Date.now() / 1e3),
@@ -32646,6 +32677,7 @@ function parseResponseEvent(event) {
 var service_exports2 = {};
 __export(service_exports2, {
   addEventToCalendarList: () => addEventToCalendarList,
+  createCalendarEvent: () => createCalendarEvent,
   createCalendarList: () => createCalendarList,
   deleteCalendarEvent: () => deleteCalendarEvent,
   deleteCalendarList: () => deleteCalendarList,
@@ -33076,6 +33108,33 @@ async function publishPrivateCalendarEvent(draft, calendarId) {
     event: signed
   };
 }
+async function createCalendarEvent(draft, opts = {}) {
+  let calendars = opts.calendars ?? null;
+  const loadCalendars = async () => calendars ?? (calendars = await fetchCalendarLists());
+  let targetCalendarId = draft.calendarId;
+  let targetCalendar;
+  if (targetCalendarId) {
+    targetCalendar = (await loadCalendars()).find((c) => c.id === targetCalendarId);
+  } else if (draft.isPrivate) {
+    targetCalendar = (await loadCalendars())[0];
+    if (!targetCalendar) targetCalendar = await createCalendarList("My Calendar", "#334155");
+    targetCalendarId = targetCalendar.id;
+  }
+  const event = draft.isPrivate ? await publishPrivateCalendarEvent(
+    { ...draft, calendarId: targetCalendarId },
+    targetCalendarId ?? "default"
+  ) : await publishPublicCalendarEvent(draft);
+  let calendar;
+  if (targetCalendar) {
+    const ref = [
+      `${event.kind}:${event.user}:${event.id}`,
+      event.relayHint ?? "",
+      event.viewKey ?? ""
+    ];
+    calendar = await addEventToCalendarList(targetCalendar, ref);
+  }
+  return { event, calendar };
+}
 async function fetchRelayListsForPubkeys(pubkeys) {
   const result = /* @__PURE__ */ new Map();
   if (pubkeys.length === 0) return result;
@@ -34202,6 +34261,7 @@ async function fetchDocMetadata(address) {
 async function saveDocMetadata(address, patch) {
   const existing = await fetchDocMetadata(address) ?? {};
   const merged = { ...existing, ...patch };
+  if (!Array.isArray(merged.tags)) merged.tags = [];
   const signer = await signerManager.getSigner();
   const content = await nip44SelfEncrypt(signer, JSON.stringify(merged));
   const signed = await signer.signEvent({
@@ -34386,7 +34446,9 @@ async function uploadFile(params) {
     name: params.file.name,
     hash: result.sha256,
     size: params.file.size,
-    type: params.file.type,
+    // Browsers report "" for unknown MIME types; coalesce exactly as upstream
+    // formstr-drive's uploadPreparedFile does so the on-wire metadata matches.
+    type: params.file.type || "application/octet-stream",
     folder: params.folder ?? "/",
     uploadedAt: Date.now(),
     server,
@@ -34602,8 +34664,9 @@ async function createPoll(draft) {
   for (const tag of draft.hashtags ?? []) {
     tags.push(["t", tag]);
   }
-  if (draft.endsAt) {
-    tags.push(["endsAt", String(Math.floor(draft.endsAt.getTime() / 1e3))]);
+  const endsAtSec = draft.endsAt && Number.isFinite(draft.endsAt.getTime()) ? Math.floor(draft.endsAt.getTime() / 1e3) : void 0;
+  if (endsAtSec !== void 0) {
+    tags.push(["endsAt", String(endsAtSec)]);
   }
   const event = {
     kind: POLLS_KINDS.poll,
@@ -34620,7 +34683,7 @@ async function createPoll(draft) {
     pollType: draft.pollType,
     pubkey,
     createdAt: signed.created_at,
-    endsAt: draft.endsAt ? Math.floor(draft.endsAt.getTime() / 1e3) : void 0,
+    endsAt: endsAtSec,
     relays,
     hashtags: draft.hashtags ?? [],
     event: signed
@@ -34815,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() {
@@ -34854,7 +34936,7 @@ function buildCalendarTools() {
   server.registerTool(
     "create_calendar_event",
     {
-      description: "Schedule a calendar event. start/end are ISO 8601. Set isPrivate:true for an encrypted event; 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(),
@@ -34862,6 +34944,7 @@ function buildCalendarTools() {
         end: external_exports.string().optional(),
         location: external_exports.string().optional(),
         isPrivate: external_exports.boolean().optional(),
+        calendarId: external_exports.string().optional(),
         participants: external_exports.array(external_exports.string()).optional(),
         rrule: external_exports.string().optional(),
         startTzid: external_exports.string().optional(),
@@ -34869,6 +34952,22 @@ function buildCalendarTools() {
       }
     },
     async (args) => {
+      const isPrivate = args.isPrivate ?? true;
+      const calendars = await service_exports2.fetchCalendarLists();
+      if (isPrivate && !args.calendarId && calendars.length > 0) {
+        const choices = calendars.map((c) => `${c.title} (${c.id})`).join("; ");
+        return fail(
+          `Which calendar should "${args.title}" go in? Re-run create_calendar_event with calendarId set to one of: ${choices}.`,
+          "CALENDAR_REQUIRED"
+        );
+      }
+      if (args.calendarId && !calendars.some((c) => c.id === args.calendarId)) {
+        const available = calendars.map((c) => c.id).join(", ") || "(none)";
+        return fail(
+          `No calendar found for id ${args.calendarId}. Available: ${available}.`,
+          "NOT_FOUND"
+        );
+      }
       const begin = new Date(args.start);
       const end = args.end ? new Date(args.end) : new Date(begin.getTime() + 36e5);
       const draft = {
@@ -34877,19 +34976,26 @@ function buildCalendarTools() {
         begin,
         end,
         location: args.location,
-        participants: args.participants,
-        isPrivate: Boolean(args.isPrivate),
+        // 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,
         startTzid: args.startTzid,
         registrationFormRef: args.registrationFormRef
       };
-      const event = args.isPrivate ? await service_exports2.publishPrivateCalendarEvent(draft, "default") : await service_exports2.publishPublicCalendarEvent(draft);
+      const { event, calendar: list } = await service_exports2.createCalendarEvent(draft, { calendars });
       const coordinate = `${event.kind}:${event.user}:${event.id}`;
-      return ok(`Created ${args.isPrivate ? "private" : "public"} event "${args.title}".`, {
-        id: event.id,
-        eventId: event.eventId,
-        coordinate
-      });
+      return ok(
+        `Created ${isPrivate ? "private" : "public"} event "${args.title}"${list ? ` in calendar "${list.title}"` : ""}.`,
+        {
+          id: event.id,
+          eventId: event.eventId,
+          coordinate,
+          calendarId: list?.id
+        }
+      );
     }
   );
   server.registerTool(
@@ -34899,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: {
@@ -35150,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,
@@ -35192,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,
@@ -35471,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 */
@@ -46521,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": {