@drop2run/mcp 0.4.3 → 0.5.1

package/README.md

@@ -71,6 +71,12 @@ lose it.
 Both publish tools take an optional `site` — a subdomain or site id to publish over. Leave it out and a
 new site is created.
 
+Both also take an optional `subdomain`, which names the new site instead of letting the server generate
+one. It is for a person who asked for a particular address: the name becomes the URL, cannot be changed
+afterwards, and a site made under a guessed one has to be deleted by hand. `site` and `subdomain` are
+opposites — one publishes over a site that exists, the other creates one that does not — so passing both
+is refused rather than resolved.
+
 Both sign-in tools answer "not approved yet" rather than failing while they wait, and calling them
 again keeps waiting on the same sign-in. Neither replaces a token that is already stored unless asked
 to with `replace`.
@@ -78,7 +84,9 @@ to with `replace`.
 ## Behaviour worth knowing
 
 **Publishing without a `site` creates a new one.** It never replaces your most recent site by default:
-"put this online" is not "and overwrite what I published last time".
+"put this online" is not "and overwrite what I published last time". Say what address you want and pass
+it as `subdomain`; say nothing and the name is generated, which is the right default for something
+nobody is going to link to.
 
 **A site can be documents instead of a built site.** A publish needs an `index.html` at the top level,
 or at least one `.md`, `.markdown` or `.pdf` file — those are served through the reader. So a single

package/dist/index.js

@@ -47,11 +47,17 @@ async function listSites(credentials) {
   const body = await call(credentials, "sites");
   return body.sites;
 }
-async function createSite(credentials) {
+async function createSite(credentials, subdomain) {
   const created = await call(
     credentials,
     "sites",
-    { method: "POST", body: JSON.stringify({}) }
+    {
+      method: "POST",
+      // An absent field rather than a null one, because the API reads null, empty and missing the
+      // same way and a body carrying only what was asked for is the one that reads correctly in a
+      // log.
+      body: JSON.stringify(subdomain === void 0 ? {} : { subdomain })
+    }
   );
   return { ...created, name: null };
 }
@@ -304,6 +310,7 @@ const ClientErrorCode = {
   /** An upload kept failing after every retry. */
   UploadFailed: "upload_failed"
 };
+const ACCOUNT_HEADER = "X-Drop2Run-Account";
 const CLAIM_TOKEN_HEADER = "X-Claim-Token";
 async function prepareDeploy(siteId, files, options, signal) {
   const manifest = files.map((file) => ({
@@ -340,6 +347,7 @@ async function request(path, body, options, signal) {
   if (body !== void 0) headers["Content-Type"] = "application/json";
   if (options.claimToken) headers[CLAIM_TOKEN_HEADER] = options.claimToken;
   if (options.token) headers.Authorization = `Bearer ${options.token}`;
+  if (options.accountId) headers[ACCOUNT_HEADER] = options.accountId;
   const response = await doFetch(`${base}/${path}`, {
     method: "POST",
     headers,
@@ -633,7 +641,7 @@ async function uploadAll(targets, uploadUrl, files, onProgress, signal, deps = {
       });
       done += 1;
       uploadedBytes += file.bytes.length;
-      onProgress?.(done, targets.length, uploadedBytes);
+      onProgress?.(done, targets.length, uploadedBytes, file.path);
     }
   };
   const workers = Array.from(
@@ -728,12 +736,13 @@ async function deploy(source, siteId, onProgress, signal, options = {}) {
       prepared.upload,
       prepared.uploadUrl,
       hashed,
-      (done, _total, bytes) => onProgress({
+      (done, _total, bytes, path) => onProgress({
         type: "uploading",
         done: prepared.reused + done,
         total: prepared.total,
         bytes,
-        reused: prepared.reused
+        reused: prepared.reused,
+        path
       }),
       signal,
       options.upload
@@ -799,7 +808,15 @@ function escapesRoot(root, candidate) {
   const inside = relative(root, candidate);
   return inside === "" || inside.startsWith("..");
 }
-async function resolveSite(credentials, site) {
+async function resolveSite(credentials, site, subdomain) {
+  if (subdomain !== void 0) {
+    if (site !== void 0) {
+      throw new Error(
+        "Give either an existing site or a subdomain for a new one, not both: publishing over a site and creating one are different requests."
+      );
+    }
+    return await createSite(credentials, subdomain);
+  }
   if (site === void 0) return await createSite(credentials);
   const wanted = site.trim().toLowerCase();
   const found = (await listSites(credentials)).find(
@@ -807,13 +824,13 @@ async function resolveSite(credentials, site) {
   );
   if (found === void 0) {
     throw new Error(
-      `No site of yours is called "${site}". Leave the site out to publish to a new one, or use list_sites to see what exists.`
+      `No site of yours is called "${site}". Leave the site out to publish to a new one, or list your sites to see what exists.`
     );
   }
   return found;
 }
-async function publish(credentials, source, site) {
-  const target = await resolveSite(credentials, site);
+async function publish(credentials, source, site, onProgress, subdomain) {
+  const target = await resolveSite(credentials, site, subdomain);
   let files = 0;
   let url = target.url;
   let unchanged = false;
@@ -843,8 +860,11 @@ async function publish(credentials, source, site) {
   });
   return { url, siteId: target.siteId, subdomain: target.subdomain, files, unchanged };
 }
-function publishDirectory(credentials, directory, site) {
-  return publish(credentials, directorySource(directory), site);
+async function publishDirectory(credentials, directory, site, onProgress, subdomain) {
+  const found = await stat(directory).catch(() => null);
+  if (found === null) throw new Error(`There is no folder at ${directory}.`);
+  if (!found.isDirectory()) throw new Error(`${directory} is a file, not a folder to publish.`);
+  return await publish(credentials, directorySource(directory), site, onProgress, subdomain);
 }
 function cleanPath(path) {
   const cleaned = path.trim().replaceAll("\\", "/").replace(/^\.?\//, "");
@@ -858,7 +878,7 @@ function cleanPath(path) {
   }
   return cleaned;
 }
-async function publishFiles(credentials, files, site) {
+async function publishFiles(credentials, files, site, subdomain) {
   const encoder = new TextEncoder();
   const collected = files.map((file) => ({
     path: cleanPath(file.path),
@@ -869,7 +889,7 @@ async function publishFiles(credentials, files, site) {
     if (seen.has(file.path)) throw new Error(`Two files were given the same path: ${file.path}`);
     seen.add(file.path);
   }
-  return publish(credentials, async () => collected, site);
+  return publish(credentials, async () => collected, site, void 0, subdomain);
 }
 const DEFAULT_WAIT_SECONDS = 120;
 const MAX_WAIT_SECONDS = 240;
@@ -1047,7 +1067,7 @@ async function signInWithCode(waitSeconds, replace = false) {
     "Call this tool again to keep waiting. Nothing has been changed yet."
   ].join("\n");
 }
-const SERVER_VERSION = "0.4.3";
+const SERVER_VERSION = "0.5.1";
 const CREDENTIAL_WRITE = {
   readOnlyHint: false,
   destructiveHint: false,
@@ -1126,6 +1146,12 @@ function createServer() {
         "publish to a brand-new site; pass a subdomain to publish over an existing one. list_sites",
         "shows what already exists.",
         "",
+        "A new site gets a generated name unless `subdomain` asks for one. Pass it when the person",
+        "named the address they want, and otherwise leave it out — a name is what somebody will be",
+        "given as a URL, it cannot be changed later, and a site created under a guessed one has to",
+        "be deleted by hand. `site` and `subdomain` are opposites: one publishes over a site that",
+        "exists, the other creates one that does not. Never pass both.",
+        "",
         "A site needs an index.html at its top level, or at least one .md, .markdown or .pdf file,",
         "which publishes as a documents site and is read through a viewer. So one page goes at",
         "index.html, and a single note is a whole publish that needs no wrapping in HTML.",
@@ -1183,13 +1209,16 @@ function createServer() {
             content: z.string().describe("The file's contents.")
           })
         ).min(1).describe("The files to publish."),
-        site: z.string().optional().describe("Subdomain or site id to publish over. Omit to create a new site.")
+        site: z.string().optional().describe("Subdomain or site id to publish over. Omit to create a new site."),
+        subdomain: z.string().optional().describe(
+          "Subdomain to create the new site under, when the person asked for a particular address. Only for a new site: leave it out to publish over an existing one, and do not pass it together with `site`. Ask rather than inventing one — the name is the URL somebody will be given, it cannot be changed afterwards, and an unused site made under a guessed name has to be deleted by hand."
+        )
       },
       outputSchema: PUBLISH_OUTPUT,
       annotations: REPLACES_A_SITE
     },
-    ({ files, site }) => withCredentials(async (credentials) => {
-      const result = await publishFiles(credentials, files, site);
+    ({ files, site, subdomain }) => withCredentials(async (credentials) => {
+      const result = await publishFiles(credentials, files, site, subdomain);
       return report(describe(result), { ...result });
     })
   );
@@ -1200,13 +1229,16 @@ function createServer() {
       description: "Publishes a folder of static files and returns its URL. The folder needs an index.html at its root, or .md and .pdf files, which are served through the reader.",
       inputSchema: {
         path: z.string().min(1).describe("Absolute path of the folder to publish."),
-        site: z.string().optional().describe("Subdomain or site id to publish over. Omit to create a new site.")
+        site: z.string().optional().describe("Subdomain or site id to publish over. Omit to create a new site."),
+        subdomain: z.string().optional().describe(
+          "Subdomain to create the new site under, when the person asked for a particular address. Only for a new site: leave it out to publish over an existing one, and do not pass it together with `site`. Ask rather than inventing one — the name is the URL somebody will be given, it cannot be changed afterwards, and an unused site made under a guessed name has to be deleted by hand."
+        )
       },
       outputSchema: PUBLISH_OUTPUT,
       annotations: REPLACES_A_SITE
     },
-    ({ path, site }) => withCredentials(async (credentials) => {
-      const result = await publishDirectory(credentials, path, site);
+    ({ path, site, subdomain }) => withCredentials(async (credentials) => {
+      const result = await publishDirectory(credentials, path, site, void 0, subdomain);
       return report(describe(result), { ...result });
     })
   );

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@drop2run/mcp",
-	"version": "0.4.3",
+	"version": "0.5.1",
 	"description": "MCP server that publishes a folder or an HTML page to Drop2Run and returns a live URL.",
 	"mcpName": "run.dropto/drop2run",
 	"license": "MIT",