@sakupa/mcp 0.7.13 → 0.7.14

package/dist/bin.js

@@ -129,7 +129,7 @@ var FORBIDDEN_PATH_SEGMENTS = [
 var ALLOWED_HIDDEN_PATHS = [".well-known/"];
 
 // ../core/dist/domain/version.js
-var SAKUPA_MCP_VERSION = "0.7.13";
+var SAKUPA_MCP_VERSION = "0.7.14";
 
 // ../core/dist/domain/errors.js
 var HTTP_STATUS = {
@@ -1029,13 +1029,13 @@ async function analyzeProject(projectDir, opts = {}) {
     const sourceWithoutBuild = pkg !== null && buildRequired && (await isDirectory(join(root, "src")) || await isDirectory(join(root, "pages")));
     let suggestedNextAction2;
     if (opts.outputDir !== void 0) {
-      suggestedNextAction2 = `The requested output directory "${opts.outputDir}" does not exist. Build the project locally first (${buildCommandHint ?? "npm run build"}) or pass the correct directory, then re-run analyze_site.`;
+      suggestedNextAction2 = `The requested output directory "${opts.outputDir}" does not exist. Build the project locally first (${buildCommandHint ?? "npm run build"}) or pass the correct directory, then re-run analyze.`;
     } else if (ssrRisks.length > 0 && detection) {
-      suggestedNextAction2 = `This ${detection.framework} project appears to require a server runtime (see ssrRisks) and no static output directory was found. Convert it to static output (e.g. Next.js output: 'export', Nuxt generate, Astro static, SvelteKit adapter-static), run the build locally (${buildCommandHint ?? "npm run build"}), then re-run analyze_site.`;
+      suggestedNextAction2 = `This ${detection.framework} project appears to require a server runtime (see ssrRisks) and no static output directory was found. Convert it to static output (e.g. Next.js output: 'export', Nuxt generate, Astro static, SvelteKit adapter-static), run the build locally (${buildCommandHint ?? "npm run build"}), then re-run analyze.`;
     } else if (sourceWithoutBuild || detection && !outputDirExists) {
-      suggestedNextAction2 = `This looks like a source project, not built static output. Run the build locally (${buildCommandHint ?? "npm run build"}) then re-run analyze_site.`;
+      suggestedNextAction2 = `This looks like a source project, not built static output. Run the build locally (${buildCommandHint ?? "npm run build"}) then re-run analyze.`;
     } else {
-      suggestedNextAction2 = "No deployable static output was found. Create an index.html (or build the project locally so a static output directory exists), then re-run analyze_site.";
+      suggestedNextAction2 = "No deployable static output was found. Create an index.html (or build the project locally so a static output directory exists), then re-run analyze.";
     }
     return {
       projectType,
@@ -1080,14 +1080,14 @@ async function analyzeProject(projectDir, opts = {}) {
   if (!deployable) {
     const firstError = validation.issues.find((i) => i.severity === "error");
     if (firstError?.code === "missing_index_html") {
-      suggestedNextAction = `No index.html at the root of "${outputDirRel}". Deploy the built static output (the directory whose root contains index.html), not the source project. Build locally first if needed (${buildCommandHint ?? "npm run build"}), then re-run analyze_site.`;
+      suggestedNextAction = `No index.html at the root of "${outputDirRel}". Deploy the built static output (the directory whose root contains index.html), not the source project. Build locally first if needed (${buildCommandHint ?? "npm run build"}), then re-run analyze.`;
     } else {
-      suggestedNextAction = "Fix the listed issues (remove forbidden/secret files, reduce size, add missing entry HTML), then re-run analyze_site.";
+      suggestedNextAction = "Fix the listed issues (remove forbidden/secret files, reduce size, add missing entry HTML), then re-run analyze.";
     }
   } else if (spa.looksLikeSpa) {
-    suggestedNextAction = `Run deploy_site to publish the static output in "${outputDirRel}". It looks like a single-page app, so SPA fallback (unknown paths rewrite to index.html) will be enabled automatically; pass spaFallback: false to opt out.`;
+    suggestedNextAction = `Run deploy to publish the static output in "${outputDirRel}". It looks like a single-page app, so SPA fallback (unknown paths rewrite to index.html) will be enabled automatically; pass spaFallback: false to opt out.`;
   } else {
-    suggestedNextAction = `Run deploy_site to publish the static output in "${outputDirRel}".`;
+    suggestedNextAction = `Run deploy to publish the static output in "${outputDirRel}".`;
   }
   return {
     projectType,
@@ -1242,13 +1242,15 @@ function writeAll(records) {
   writeFileSync2(path, `${JSON.stringify(records, null, 2)}
 `, "utf-8");
 }
-function listRecentCreations(nowMs) {
+function listRecentCreations(nowMs, apiBaseUrl) {
   return readAll().filter((e) => {
     const t = Date.parse(e.createdAt);
-    return Number.isFinite(t) && nowMs - t < RECENT_WINDOW_MS;
+    if (!Number.isFinite(t) || nowMs - t >= RECENT_WINDOW_MS) return false;
+    return e.apiBaseUrl === void 0 || e.apiBaseUrl === apiBaseUrl;
   });
 }
 function recordCreation(record) {
+  knownQuotaFree.delete(record.siteId);
   const rest = readAll().filter((e) => e.siteId !== record.siteId);
   writeAll([...rest, record]);
 }
@@ -1257,6 +1259,12 @@ function removeCreation(siteId) {
   const rest = all.filter((e) => e.siteId !== siteId);
   if (rest.length !== all.length) writeAll(rest);
 }
+var knownQuotaFree = /* @__PURE__ */ new Set();
+function noteSiteMode(siteId, mode) {
+  if (mode !== "paid" || knownQuotaFree.has(siteId)) return;
+  removeCreation(siteId);
+  knownQuotaFree.add(siteId);
+}
 
 // src/dns-doh.ts
 var dohFetch = (input, init) => fetch(input, init);
@@ -1444,7 +1452,10 @@ var projectDirInput = z2.string().optional().describe(
   "Absolute path of the user's PROJECT ROOT \u2014 the folder the user opened/works in (for framework projects: where package.json lives, NEVER the build-output subfolder like dist/out; the analyzer locates the output automatically). .sakupa/site.json lives here, so PASS THE SAME DIRECTORY EVERY TIME for the same project. When omitted the server falls back to its startup directory, which may not be where the user is working now."
 );
 function withProjectDir(ctx, projectDirArg) {
-  if (projectDirArg === void 0) return ctx;
+  if (projectDirArg === void 0) {
+    const sticky = ctx.session.projectDir;
+    return sticky !== null ? { ...ctx, projectDir: sticky } : ctx;
+  }
   if (!isAbsolute(projectDirArg)) {
     throw new LocalGuidanceError(
       "invalid_request",
@@ -1465,6 +1476,7 @@ function withProjectDir(ctx, projectDirArg) {
       `projectDir "${dir}" does not exist or is not a directory. Pass the absolute path of the directory the user is currently working in.`
     );
   }
+  ctx.session.projectDir = dir;
   return { ...ctx, projectDir: dir };
 }
 function requireSiteFile(ctx) {
@@ -1478,7 +1490,7 @@ function requireSiteFile(ctx) {
   if (state.kind === "absent") {
     throw new LocalGuidanceError(
       "not_found",
-      `No .sakupa/site.json found in ${ctx.projectDir}. This project has no Sakupa site binding yet \u2014 run deploy_site first to publish it (the management credential will be stored locally in .sakupa/site.json). If this was a paid custom-domain site whose project file was lost, use recover_domain_site instead.`
+      `No .sakupa/site.json found in ${ctx.projectDir} \u2014 this directory has no Sakupa site binding. If you meant to manage (delete/status/bind) an EXISTING site, re-run this tool with projectDir set to THAT site's own directory (each site's binding lives in its own folder). To publish THIS directory as a new site, run deploy. If this was a paid custom-domain site whose project file was lost, use recover.`
     );
   }
   return state.file;
@@ -1618,7 +1630,7 @@ async function uploadAll(ctx, targets, files, outputAbs) {
     if (bytes.byteLength !== match.size) {
       throw new SakupaError(
         "validation_failed",
-        `"${match.path}" changed since analysis (${match.size} -> ${bytes.byteLength} bytes). Re-run deploy_site so Sakupa re-checks the current files before uploading.`
+        `"${match.path}" changed since analysis (${match.size} -> ${bytes.byteLength} bytes). Re-run deploy so Sakupa re-checks the current files before uploading.`
       );
     }
     await ctx.client.uploadFile(target, bytes);
@@ -1633,7 +1645,7 @@ Domain binding IN PROGRESS: ${pb.apexDomain} \u2014 ` + (pb.phase === "provision
     check = await client.checkVerification(pb.verificationId, credential);
   } catch {
     return {
-      note: framing + "\n(Couldn't refresh binding progress from the server just now \u2014 try site_status again shortly.)"
+      note: framing + "\n(Couldn't refresh binding progress from the server just now \u2014 try status again shortly.)"
     };
   }
   try {
@@ -1653,7 +1665,7 @@ Domain binding IN PROGRESS: ${pb.apexDomain} \u2014 ` + (pb.phase === "provision
 ${block}`, checklist: toDnsChecklist(diag.checks) };
   } catch {
     return {
-      note: framing + '\n(Live DNS lookups are unavailable right now \u2014 run bind_domain with action "status" for the per-record checklist.)'
+      note: framing + '\n(Live DNS lookups are unavailable right now \u2014 run bind with action "status" for the per-record checklist.)'
     };
   }
 }
@@ -1671,17 +1683,19 @@ function findNeighborBinding(projectDir, outputRel) {
   }
   return null;
 }
-function freeSiteCreationBarrier() {
-  const recent = listRecentCreations(Date.now());
+function freeSiteCreationBarrier(apiBaseUrl) {
+  const recent = listRecentCreations(Date.now(), apiBaseUrl);
   if (recent.length < FREE_ACTIVE_SITES_PER_IP) return null;
   const registryPath = creationRegistryPath();
   return text(
     "local_site_limit_reached",
-    `This machine already created ${recent.length} free sites in the last 24 hours (the server also enforces ${FREE_ACTIVE_SITES_PER_IP} active free sites per IP). No new site was created.
+    `LOCAL PRECHECK by this MCP client (its own creation registry \u2014 the server was NOT contacted): this machine already created ${recent.length} sites in this environment in the last 24 hours, matching the server's limit of ${FREE_ACTIVE_SITES_PER_IP} active free sites per IP. No new site was created.
 
 ` + recent.map((r) => `- ${r.url} (project: ${r.projectDir}, created: ${r.createdAt})`).join("\n") + `
 
-Options: delete one of these sites (run delete_site with its projectDir), wait for a free site to expire, or \u2014 if this list is stale because sites were deleted or subscribed elsewhere \u2014 remove the local registry file at ${registryPath} and retry.`,
+How a slot frees up: (1) delete one of the sites above \u2014 run delete with that site's projectDir; its slot frees immediately; (2) every record expires on its own 24 hours after creation; (3) a site that upgrades to a paid plan stops counting the next time any tool sees it. Deleting a project's .sakupa folder does NOT free a slot: this registry lives in the home directory and the server still counts the live site.
+
+If this list is stale (sites deleted or subscribed from another machine), remove the local registry file at ${registryPath} and retry \u2014 that only skips this local precheck; the server still enforces the same per-IP limit and is the final authority.`,
     { recentCreations: recent, limit: FREE_ACTIVE_SITES_PER_IP, registryPath },
     "blocked"
   );
@@ -1689,9 +1703,9 @@ Options: delete one of these sites (run delete_site with its projectDir), wait f
 function registerTools(server, baseCtx) {
   const previewHostPattern = previewHostPatternFor(baseCtx.apiBaseUrl);
   server.registerTool(
-    "analyze_site",
+    "analyze",
     {
-      description: "Analyze the local project and decide whether it can be deployed as a static site. Detects the framework, the built static output directory (dist/build/out/...), missing index.html, SSR/API-route/database-runtime risks, SPA fallback needs, forbidden files (secrets, .env, archives, media) and size limits. Sakupa deploys ONLY prebuilt static output \u2014 never source, secrets or server code. Run this before deploy_site.",
+      description: "Analyze the local project and decide whether it can be deployed as a static site. Detects the framework, the built static output directory (dist/build/out/...), missing index.html, SSR/API-route/database-runtime risks, SPA fallback needs, forbidden files (secrets, .env, archives, media) and size limits. Sakupa deploys ONLY prebuilt static output \u2014 never source, secrets or server code. Run this before deploy.",
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: true, destructiveHint: false, openWorldHint: false },
       inputSchema: {
@@ -1717,9 +1731,9 @@ Next action: ${analysis.suggestedNextAction}`,
     }
   );
   server.registerTool(
-    "deploy_site",
+    "deploy",
     {
-      description: `Deploy the local static output to Sakupa. First deploy creates a free temporary site (valid ${FREE_SITE_TTL_HOURS}h, public URL like https://${previewHostPattern}) and stores the management credential in .sakupa/site.json. Later runs update the existing site (free sites also refresh their validity; subscribed sites are permanent). Runs analyze_site first and refuses to upload source projects, secrets, .env files, archives, media or server code. Never uploads anything when the analysis says the project is not deployable.`,
+      description: `Deploy the local static output to Sakupa. First deploy creates a free temporary site (valid ${FREE_SITE_TTL_HOURS}h, public URL like https://${previewHostPattern}) and stores the management credential in .sakupa/site.json. Later runs update the existing site (free sites also refresh their validity; subscribed sites are permanent). Runs analyze first and refuses to upload source projects, secrets, .env files, archives, media or server code. Never uploads anything when the analysis says the project is not deployable.`,
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
       inputSchema: {
@@ -1766,7 +1780,7 @@ Next action: ${analysis.suggestedNextAction}`,
           if (rootAbove) {
             return text(
               "not_project_root",
-              `${ctx.projectDir} has no package.json but ${rootAbove} does \u2014 this directory is a SUBFOLDER of that project (typically its build output), and .sakupa must live at the project ROOT. Re-run deploy_site with projectDir: ${rootAbove}. Only if the user explicitly says this subfolder is an INDEPENDENT site (e.g. a docs/ site inside a repo), re-run with subprojectConfirmed: true. Nothing was deployed and no site was created.`,
+              `${ctx.projectDir} has no package.json but ${rootAbove} does \u2014 this directory is a SUBFOLDER of that project (typically its build output), and .sakupa must live at the project ROOT. Re-run deploy with projectDir: ${rootAbove}. Only if the user explicitly says this subfolder is an INDEPENDENT site (e.g. a docs/ site inside a repo), re-run with subprojectConfirmed: true. Nothing was deployed and no site was created.`,
               { projectRoot: rootAbove, confirmationField: "subprojectConfirmed" },
               "blocked"
             );
@@ -1775,17 +1789,17 @@ Next action: ${analysis.suggestedNextAction}`,
           if (neighbor) {
             return text(
               "neighbor_binding_found",
-              `No .sakupa binding in ${ctx.projectDir}, but one EXISTS at ${neighbor} \u2014 this looks like the same project addressed at a different directory level. To update that existing site, re-run deploy_site with projectDir: ${neighbor}. Only if the user explicitly wants a SEPARATE new site, move this deploy to a directory outside that project. Nothing was deployed and no site was created.`,
+              `No .sakupa binding in ${ctx.projectDir}, but one EXISTS at ${neighbor} \u2014 this looks like the same project addressed at a different directory level. To update that existing site, re-run deploy with projectDir: ${neighbor}. Only if the user explicitly wants a SEPARATE new site, move this deploy to a directory outside that project. Nothing was deployed and no site was created.`,
               { neighborProjectDir: neighbor },
               "blocked"
             );
           }
-          const barrier = freeSiteCreationBarrier();
+          const barrier = freeSiteCreationBarrier(ctx.apiBaseUrl);
           if (barrier) return barrier;
           if (args.publicConfirmed !== true) {
             return text(
               "public_deployment_confirmation_required",
-              `First deployment creates a public URL that anyone with the link can open. The free preview stays live for ${FREE_SITE_TTL_HOURS} hours. Explain this to the user and obtain explicit confirmation before retrying deploy_site with publicConfirmed: true.`,
+              `First deployment creates a public URL that anyone with the link can open. The free preview stays live for ${FREE_SITE_TTL_HOURS} hours. Explain this to the user and obtain explicit confirmation before retrying deploy with publicConfirmed: true.`,
               { publicUrlLifetimeHours: FREE_SITE_TTL_HOURS, confirmationField: "publicConfirmed" },
               "waiting_user"
             );
@@ -1817,7 +1831,8 @@ Next action: ${analysis.suggestedNextAction}`,
             siteId: created.siteId,
             projectDir: ctx.projectDir,
             url: finalized2.url,
-            createdAt
+            createdAt,
+            apiBaseUrl: ctx.apiBaseUrl
           });
           return text(
             "site_published",
@@ -1827,7 +1842,7 @@ Project directory: ${ctx.projectDir}
 Files uploaded: ${uploaded2} (${finalized2.totalBytes} bytes)
 ` + (finalized2.expiresAt ? `Expires at: ${finalized2.expiresAt}
 ` : "") + `
-This is a FREE temporary preview: it stays live for ${FREE_SITE_TTL_HOURS} hours. Deploying again or calling refresh_site extends the validity; subscribing the site (subscribe_site) makes this URL permanent. The management credential was saved to .sakupa/site.json \u2014 keep that file: it is the only way to manage this site.
+This is a FREE temporary preview: it stays live for ${FREE_SITE_TTL_HOURS} hours. Deploying again or calling refresh extends the validity; subscribing the site (subscribe) makes this URL permanent. The management credential was saved to .sakupa/site.json \u2014 keep that file: it is the only way to manage this site.
 ` + credentialGitReminder(ctx.projectDir) + (finalized2.warnings.length > 0 ? `
 Warnings:
 ${JSON.stringify(finalized2.warnings, null, 2)}` : ""),
@@ -1886,6 +1901,7 @@ ${JSON.stringify(finalized2.warnings, null, 2)}` : ""),
         }
         const { uploaded, finalized } = update;
         writeSiteFile(ctx.projectDir, { ...existing, url: finalized.url });
+        noteSiteMode(existing.siteId, finalized.mode);
         return text(
           "site_updated",
           `Site updated: ${finalized.url}
@@ -1894,7 +1910,7 @@ Project directory: ${ctx.projectDir}
 Files uploaded: ${uploaded} (${finalized.totalBytes} bytes)
 ` + (finalized.expiresAt ? `Validity refreshed \u2014 expires at: ${finalized.expiresAt}
 ` : "") + (finalized.mode === "free" ? `
-Reminder: free sites stay live for ${FREE_SITE_TTL_HOURS} hours after the last deploy or refresh_site call. Subscribing (subscribe_site) makes the site permanent.
+Reminder: free sites stay live for ${FREE_SITE_TTL_HOURS} hours after the last deploy or refresh call. Subscribing (subscribe) makes the site permanent.
 ` : "\nThis site is subscribed and permanent \u2014 no expiry.\n") + (finalized.warnings.length > 0 ? `
 Warnings:
 ${JSON.stringify(finalized.warnings, null, 2)}` : ""),
@@ -1916,7 +1932,7 @@ ${JSON.stringify(finalized.warnings, null, 2)}` : ""),
     }
   );
   server.registerTool(
-    "refresh_site",
+    "refresh",
     {
       description: "Refresh the validity of the free temporary site WITHOUT uploading content. Uses the local credential in .sakupa/site.json. Subscribed sites are permanent and need no refresh.",
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
@@ -1931,7 +1947,7 @@ ${JSON.stringify(finalized.warnings, null, 2)}` : ""),
         return text(
           "site_refreshed",
           `Site validity refreshed (project: ${ctx.projectDir}). New expiry: ${res.expiresAt}
-NO content was uploaded or changed by this call \u2014 to publish new or edited files, run deploy_site. Free sites stay live for ${FREE_SITE_TTL_HOURS} hours after each deploy or refresh.`,
+NO content was uploaded or changed by this call \u2014 to publish new or edited files, run deploy. Free sites stay live for ${FREE_SITE_TTL_HOURS} hours after each deploy or refresh.`,
           { siteId: site.siteId, expiresAt: res.expiresAt, projectDir: ctx.projectDir }
         );
       } catch (e) {
@@ -1940,7 +1956,7 @@ NO content was uploaded or changed by this call \u2014 to publish new or edited
     }
   );
   server.registerTool(
-    "site_status",
+    "status",
     {
       description: "Show the current status of this project's Sakupa site: URL, mode (free/paid), expiry, subscription state, custom domains, size, last deployment and warnings.",
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
@@ -1952,8 +1968,9 @@ NO content was uploaded or changed by this call \u2014 to publish new or edited
         const ctx = withProjectDir(baseCtx, args.projectDir);
         const site = requireSiteFile(ctx);
         const res = await ctx.client.getSiteStatus(site.siteId, site.credential);
+        noteSiteMode(res.siteId, res.mode);
         const binding = res.pendingDomainBinding ? await describePendingBinding(ctx.client, site.credential, res.pendingDomainBinding) : void 0;
-        return textJson("site_status_returned", `Site status:${binding?.note ?? ""}`, {
+        return textJson("status_returned", `Site status:${binding?.note ?? ""}`, {
           ...res,
           projectDir: ctx.projectDir,
           ...binding?.checklist ? { dnsChecklist: binding.checklist } : {}
@@ -1964,9 +1981,9 @@ NO content was uploaded or changed by this call \u2014 to publish new or edited
     }
   );
   server.registerTool(
-    "subscribe_site",
+    "subscribe",
     {
-      description: `Create a Stripe Checkout link that subscribes THIS site to a Sakupa Hosting monthly plan (${planCatalog()}). Paying makes the site PERMANENT on its ${previewHostPattern} URL \u2014 no more 24h expiry; that is the core value of paying. Binding a custom domain afterwards (bind_domain) is an optional included extra and requires DNS control of that domain. Owner-only: requires this project's site credential (.sakupa/site.json) \u2014 deploy_site first. If the site outgrows its plan, Sakupa shows an over-limit notice and never changes billing automatically. The owner can explicitly choose another plan through Stripe Customer Portal. Card details are entered only on the Stripe-hosted page \u2014 never through the AI tool. Opening and completing Stripe Checkout is the final subscription confirmation.`,
+      description: `Create a Stripe Checkout link that subscribes THIS site to a Sakupa Hosting monthly plan (${planCatalog()}). Paying makes the site PERMANENT on its ${previewHostPattern} URL \u2014 no more 24h expiry; that is the core value of paying. Binding a custom domain afterwards (bind) is an optional included extra and requires DNS control of that domain. Owner-only: requires this project's site credential (.sakupa/site.json) \u2014 deploy first. If the site outgrows its plan, Sakupa shows an over-limit notice and never changes billing automatically. The owner can explicitly choose another plan through Stripe Customer Portal. Card details are entered only on the Stripe-hosted page \u2014 never through the AI tool. Opening and completing Stripe Checkout is the final subscription confirmation.`,
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
       inputSchema: {
@@ -1994,7 +2011,7 @@ NO content was uploaded or changed by this call \u2014 to publish new or edited
 ${res.checkoutUrl}
 
 Open this link in a browser to subscribe. Card data is entered only on the Stripe-hosted page \u2014 never give card numbers, passwords or security codes to the AI tool.
-Once payment confirms, the site becomes permanent on its current URL. Binding a custom domain (bind_domain) is optional and still requires DNS verification.`,
+Once payment confirms, the site becomes permanent on its current URL. Binding a custom domain (bind) is optional and still requires DNS verification.`,
           {
             siteId: res.siteId,
             plan: res.plan,
@@ -2011,9 +2028,9 @@ Once payment confirms, the site becomes permanent on its current URL. Binding a
     }
   );
   server.registerTool(
-    "bind_domain",
+    "bind",
     {
-      description: `Bind a custom domain to this subscribed site \u2014 an OPTIONAL extra serving surface; the permanent ${previewHostPattern} URL keeps working alongside it. The binding unit is the APEX domain: binding example.com automatically includes www.example.com (both serve the same content, one apex TXT verification covers both), and one site binds at most ONE apex domain \u2014 a second domain needs a second subscribed site. Requires an ACTIVE subscription (subscribe_site). Ownership is proven ONLY by DNS control of the apex \u2014 payment never grants ownership, and bindings are ALWAYS challengeable: whoever proves CURRENT DNS control takes the domain, even from an existing binding (the displaced site keeps its subscription, content and permanent URL). Unverified requests expire after 72 hours. Call again with action "status" to check progress.`,
+      description: `Bind a custom domain to this subscribed site \u2014 an OPTIONAL extra serving surface; the permanent ${previewHostPattern} URL keeps working alongside it. The binding unit is the APEX domain: binding example.com automatically includes www.example.com (both serve the same content, one apex TXT verification covers both), and one site binds at most ONE apex domain \u2014 a second domain needs a second subscribed site. Requires an ACTIVE subscription (subscribe). Ownership is proven ONLY by DNS control of the apex \u2014 payment never grants ownership, and bindings are ALWAYS challengeable: whoever proves CURRENT DNS control takes the domain, even from an existing binding (the displaced site keeps its subscription, content and permanent URL). Unverified requests expire after 72 hours. Call again with action "status" to check progress.`,
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
       inputSchema: {
@@ -2051,7 +2068,7 @@ ${res2.message}
 
 ` + renderChecklistBlock(
               diag,
-              "Fix any [MISSING]/[FIX] lines above, then re-run bind_domain status; if still failing after the attempts below, show the user this checklist."
+              "Fix any [MISSING]/[FIX] lines above, then re-run bind status; if still failing after the attempts below, show the user this checklist."
             ),
             {
               verificationId: res2.verificationId,
@@ -2092,9 +2109,9 @@ Host fields above are the SHORT form: most DNS panels append the domain automati
 
 Ownership comes ONLY from DNS control; paying never grants it. The first verified request wins and this challenge expires after 72 hours.
 
-STEP 2 (after ownership verifies): Cloudflare issues certificate-validation TXT records \u2014 the verification result and bind_domain "status" list them the moment they exist; relay each to the user and add them too. Everything then completes automatically.
+STEP 2 (after ownership verifies): Cloudflare issues certificate-validation TXT records \u2014 the verification result and bind "status" list them the moment they exist; relay each to the user and add them too. Everything then completes automatically.
 
-Drive the whole flow with bind_domain "status": it live-checks every record and names the exact fix for anything wrong. Re-check every 5 minutes (up to 10 times). Any later session can resume with action "status" alone; the verificationId is optional.`,
+Drive the whole flow with bind "status": it live-checks every record and names the exact fix for anything wrong. Re-check every 5 minutes (up to 10 times). Any later session can resume with action "status" alone; the verificationId is optional.`,
           {
             verificationId: res.verificationId,
             apexDomain: apex,
@@ -2123,7 +2140,7 @@ Drive the whole flow with bind_domain "status": it live-checks every record and
     }
   );
   server.registerTool(
-    "billing_status",
+    "billing",
     {
       description: "Show this site's hosting subscription: plan, payment state, current paid period, reconciled usage, estimated usage tier, bound custom domains and risks. Owner-only (uses the credential in .sakupa/site.json).",
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
@@ -2135,6 +2152,7 @@ Drive the whole flow with bind_domain "status": it live-checks every record and
         const ctx = withProjectDir(baseCtx, args.projectDir);
         const site = requireSiteFile(ctx);
         const res = await ctx.client.getBillingStatus(site.siteId, site.credential);
+        noteSiteMode(res.siteId, res.mode);
         const lines = [
           `Billing status for site ${res.siteId} (mode: ${res.mode})`,
           res.permanentUrl ? `Permanent URL: ${res.permanentUrl}` : void 0,
@@ -2145,9 +2163,9 @@ Drive the whole flow with bind_domain "status": it live-checks every record and
           res.estimatedUsageTier ? `Estimated usage tier: ${res.estimatedUsageTier}` : void 0,
           res.lastReconciledAt ? `Last usage reconciliation: ${res.lastReconciledAt}` : void 0,
           res.boundHostnames.length > 0 ? `Bound custom domains: ${res.boundHostnames.join(", ")}` : void 0,
-          res.risks.pastDue ? "ATTENTION: renewal payment failing \u2014 update the payment method (manage_billing). Serving continues while Stripe retries; if Stripe gives up, the site reverts to free." : void 0
+          res.risks.pastDue ? "ATTENTION: renewal payment failing \u2014 update the payment method (portal). Serving continues while Stripe retries; if Stripe gives up, the site reverts to free." : void 0
         ].filter((l) => l !== void 0);
-        return textJson("billing_status_returned", `${lines.join("\n")}
+        return textJson("billing_returned", `${lines.join("\n")}
 
 Full status:`, res);
       } catch (e) {
@@ -2156,7 +2174,7 @@ Full status:`, res);
     }
   );
   server.registerTool(
-    "manage_billing",
+    "portal",
     {
       description: "Open the Stripe-hosted billing portal for this site: update the payment method, view invoices, or cancel the subscription. All billing operations happen on the Stripe-hosted page \u2014 never inside the AI tool. With .sakupa/site.json, this opens the site-specific portal. Without the local credential, this returns Stripe's public no-code Customer Portal login page. The customer enters the checkout email and confirms a one-time passcode sent by Stripe. This never restores Sakupa site authority.",
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
@@ -2184,7 +2202,7 @@ Full status:`, res);
               url: res2.portalUrl,
               expectedOutcome: "The user manages payment methods, invoices, or cancels renewal on the Stripe-hosted page"
             },
-            nextActions: [{ tool: "billing_status", allowed: true }]
+            nextActions: [{ tool: "billing", allowed: true }]
           });
         }
         const res = await ctx.client.getPublicBillingPortal();
@@ -2213,7 +2231,7 @@ Full status:`, res);
     }
   );
   server.registerTool(
-    "recover_domain_site",
+    "recover",
     {
       description: "Recover management control of a subscribed site WITH A BOUND CUSTOM DOMAIN after losing the local project, by proving DNS control of the apex domain. Sites without a bound domain are identified solely by their local credential and cannot be recovered. By default, completing recovery REVOKES all previous local credentials. Call first with the hostname to get the DNS record, then again with verificationId to complete recovery (writes a new .sakupa/site.json and returns a download link for the current site content).",
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
@@ -2247,7 +2265,7 @@ ${res2.message}
 
 IMPORTANT: completing recovery revokes ALL previous local authorizations for this site by default (this protects you if the old project or its credential leaked). If you want to keep the old credentials working, pass preserveExistingCredentials: true when completing.
 
-After the DNS record resolves, re-run recover_domain_site with verificationId: "${res2.verificationId}".`,
+After the DNS record resolves, re-run recover with verificationId: "${res2.verificationId}".`,
             {
               verificationId: res2.verificationId,
               apexDomain: res2.apexDomain,
@@ -2273,7 +2291,7 @@ After the DNS record resolves, re-run recover_domain_site with verificationId: "
             data: { recovery: res2 },
             nextActions: [
               {
-                tool: "recover_domain_site",
+                tool: "recover",
                 arguments: { action: "complete", verificationId: args.verificationId },
                 allowed: res2.readyToComplete,
                 ...res2.readyToComplete ? {} : { reasonCode: res2.status }
@@ -2320,7 +2338,7 @@ ${res.archiveUrl}`,
     }
   );
   server.registerTool(
-    "create_support_ticket",
+    "support",
     {
       description: "Create a Sakupa support ticket for billing, payment, refund review, domain verification, deployment, serving or other issues the MCP cannot solve automatically. Do not include secrets, credentials or card data in the description.",
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
@@ -2355,14 +2373,14 @@ ${res.archiveUrl}`,
     }
   );
   server.registerTool(
-    "report_bug",
+    "report",
     {
       description: "Prepare and submit a sanitized bug report when a Sakupa tool failed and the issue looks like a product bug. Only whitelisted structured diagnostics are sent (tool name, error code/message, site id, bound domain, deployment id, timestamps, client/MCP version, request id) \u2014 NEVER file contents, source code, secrets, .env values or credentials. Without confirmSubmit: true the exact payload is shown for user review and nothing is submitted.",
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
       inputSchema: {
         projectDir: projectDirInput,
-        toolName: z3.string().describe('The Sakupa tool that failed, e.g. "deploy_site".'),
+        toolName: z3.string().describe('The Sakupa tool that failed, e.g. "deploy".'),
         errorCode: z3.string().optional(),
         errorMessage: z3.string().optional().describe("Sanitized error message (no secrets)."),
         requestId: z3.string().optional(),
@@ -2407,7 +2425,7 @@ ${res.archiveUrl}`,
           const contactNote = args.contactEmail !== void 0 ? "note that their contact email is attached for follow-up. " : "ASK THEM ONCE whether they want to attach a contact email for follow-up (optional \u2014 omit if declined; include it as contactEmail when they do). ";
           return textJson(
             "bug_report_preview_ready",
-            `Bug report prepared but NOT submitted. This is the exact payload that would be sent (structured diagnostics only \u2014 no file contents, source code or secrets). Show it to the user, and ${contactNote}Then re-run report_bug with confirmSubmit: true to submit.`,
+            `Bug report prepared but NOT submitted. This is the exact payload that would be sent (structured diagnostics only \u2014 no file contents, source code or secrets). Show it to the user, and ${contactNote}Then re-run report with confirmSubmit: true to submit.`,
             payload,
             "preview"
           );
@@ -2431,7 +2449,7 @@ import { z as z4 } from "zod";
 var plan = z4.enum(["water", "personal", "share", "business"]);
 function registerBillingTools(server, baseCtx) {
   server.registerTool(
-    "list_billing_plans",
+    "plans",
     {
       description: "Return the authoritative Sakupa monthly plan catalog, exact limits, prices, catalog version and plan-change billing rules. This is read-only and does not require a site.",
       inputSchema: { projectDir: projectDirInput },
@@ -2448,7 +2466,7 @@ function registerBillingTools(server, baseCtx) {
           resultCode: "billing_catalog_returned",
           summary: `Returned ${catalog.plans.length} monthly plans; the Stripe-hosted page is the final confirmation surface for payment and plan changes.`,
           data: { catalog },
-          nextActions: [{ tool: "subscribe_site", allowed: true }]
+          nextActions: [{ tool: "subscribe", allowed: true }]
         });
       } catch (error) {
         return toolError(error);
@@ -2456,7 +2474,7 @@ function registerBillingTools(server, baseCtx) {
     }
   );
   server.registerTool(
-    "change_subscription_plan",
+    "upgrade",
     {
       description: "Create a Stripe-hosted confirmation link for a manually selected subscription plan. Creating the link does not change billing; only the user can confirm on Stripe.",
       inputSchema: {
@@ -2489,7 +2507,7 @@ function registerBillingTools(server, baseCtx) {
             url: result.portalUrl,
             expectedOutcome: "After the user confirms on the Stripe-hosted page, the webhook updates the Sakupa subscription state"
           },
-          nextActions: [{ tool: "billing_status", allowed: true }]
+          nextActions: [{ tool: "billing", allowed: true }]
         });
       } catch (error) {
         return toolError(error);
@@ -2513,7 +2531,7 @@ var deleteConfirmation = z5.object({
   expectedCurrentPeriodEnd: z5.string().datetime().optional(),
   expectedLastDeploymentId: z5.string().optional(),
   expectedBoundHostnames: z5.array(z5.string()),
-  acknowledge: z5.literal("delete_site_and_cancel_renewal")
+  acknowledge: z5.literal("delete_and_cancel_renewal")
 });
 var unbindConfirmation = z5.object({
   siteId: z5.string().min(1),
@@ -2522,11 +2540,11 @@ var unbindConfirmation = z5.object({
   expectedBindingStatus: z5.enum(["provisioning", "active"]),
   apexDomain: z5.string().min(1),
   expectedBoundHostnames: z5.array(z5.string()),
-  acknowledge: z5.literal("unbind_domain_and_remove_custom_hostnames")
+  acknowledge: z5.literal("unbind_and_remove_custom_hostnames")
 });
 function registerLifecycleTools(server, baseCtx) {
   server.registerTool(
-    "delete_site",
+    "delete",
     {
       description: "Preview or execute deletion of this Sakupa site. Execution requires an exact server-validated confirmation bound to the current site state.",
       inputSchema: {
@@ -2543,7 +2561,7 @@ function registerLifecycleTools(server, baseCtx) {
         const ctx = withProjectDir(baseCtx, args.projectDir);
         const site = requireSiteFile(ctx);
         if (!args.operationId) {
-          throw new Error("operationId is required for delete_site");
+          throw new Error("operationId is required for delete");
         }
         if (args.action === "preview") {
           const preview = await ctx.client.previewDeleteSite(site.siteId, site.credential, {
@@ -2552,12 +2570,12 @@ function registerLifecycleTools(server, baseCtx) {
           return structuredToolResult({
             schemaVersion: 1,
             outcome: "waiting_user",
-            resultCode: "delete_site_confirmation_required",
+            resultCode: "delete_confirmation_required",
             operationId: args.operationId,
             summary: "Deletion consequences returned, bound to the current site and billing state; after confirmation the content and the permanent URL are unrecoverable.",
             data: { preview },
             nextActions: [
-              { tool: "delete_site", allowed: true, reasonCode: "exact_confirmation_required" }
+              { tool: "delete", allowed: true, reasonCode: "exact_confirmation_required" }
             ]
           });
         }
@@ -2583,7 +2601,7 @@ function registerLifecycleTools(server, baseCtx) {
     }
   );
   server.registerTool(
-    "unbind_domain",
+    "unbind",
     {
       description: "Preview or execute removal of the custom apex/www serving surface while preserving the subscription and permanent Sakupa URL.",
       inputSchema: {
@@ -2599,7 +2617,7 @@ function registerLifecycleTools(server, baseCtx) {
       try {
         const ctx = withProjectDir(baseCtx, args.projectDir);
         const site = requireSiteFile(ctx);
-        if (!args.operationId) throw new Error("operationId is required for unbind_domain");
+        if (!args.operationId) throw new Error("operationId is required for unbind");
         if (args.action === "preview") {
           const preview = await ctx.client.previewUnbindDomain(site.siteId, site.credential, {
             operationId: args.operationId
@@ -2607,12 +2625,12 @@ function registerLifecycleTools(server, baseCtx) {
           return structuredToolResult({
             schemaVersion: 1,
             outcome: "waiting_user",
-            resultCode: "unbind_domain_confirmation_required",
+            resultCode: "unbind_confirmation_required",
             operationId: args.operationId,
             summary: "Exact binding snapshot returned; unbinding removes ONLY the custom domain \u2014 the subscription, content, and permanent URL stay unchanged.",
             data: { preview },
             nextActions: [
-              { tool: "unbind_domain", allowed: true, reasonCode: "exact_confirmation_required" }
+              { tool: "unbind", allowed: true, reasonCode: "exact_confirmation_required" }
             ]
           });
         }
@@ -2630,7 +2648,7 @@ function registerLifecycleTools(server, baseCtx) {
           operationId: args.operationId,
           summary: `Custom domain unbound; the subscription, deployed content, and permanent Sakupa URL are unchanged. (project: ${ctx.projectDir})`,
           data: { result },
-          nextActions: [{ tool: "site_status", allowed: true }]
+          nextActions: [{ tool: "status", allowed: true }]
         });
       } catch (error) {
         return toolError(error);
@@ -2715,30 +2733,30 @@ var FetchTransport = class {
 var instructionsFor = (hostPattern) => `Sakupa publishes AI-made static websites. AI-made pages, live in seconds.
 
 Workflow:
-1. analyze_site \u2014 check whether this project has deployable static output. If a build is needed
+1. analyze \u2014 check whether this project has deployable static output. If a build is needed
    (Vite/Vue/React/Svelte/Astro/Next static export/Nuxt generate), run the build LOCALLY first,
-   then re-run analyze_site.
-2. deploy_site \u2014 uploads ONLY the built static output. The first deploy creates a free temporary
+   then re-run analyze.
+2. deploy \u2014 uploads ONLY the built static output. The first deploy creates a free temporary
    site (public URL ${hostPattern}, valid 24 hours, free banner shown) and stores the
    management credential in .sakupa/site.json. Deploying again updates the site and refreshes
-   its validity; refresh_site extends validity without uploading; site_status shows the
+   its validity; refresh extends validity without uploading; status shows the
    current deployment and serving state at any time.
-3. To make the site PERMANENT, subscribe it to a monthly hosting plan (list_billing_plans
-   shows the catalog; subscribe_site -> Stripe-hosted checkout;
+3. To make the site PERMANENT, subscribe it to a monthly hosting plan (plans
+   shows the catalog; subscribe -> Stripe-hosted checkout;
    water/personal/share/business). Paying makes the
    ${hostPattern} URL permanent \u2014 that is what payment buys. Usage over the chosen plan
    shows an over-limit notice by default. An external AI may periodically query usage and
    recommend a plan, but Sakupa never changes a subscription automatically.
-4. Optionally bind a custom domain to the subscribed site (bind_domain): an included extra
+4. Optionally bind a custom domain to the subscribed site (bind): an included extra
    serving surface alongside the permanent URL. Ownership is proven only by DNS control; the
-   first verified request wins; unverified requests expire after 72 hours. billing_status,
-   change_subscription_plan, manage_billing and recover_domain_site manage the paid
-   lifecycle; unbind_domain removes the custom domain (the permanent URL keeps serving) and
-   delete_site tears the whole site down after explicit confirmation.
+   first verified request wins; unverified requests expire after 72 hours. billing,
+   upgrade, portal and recover manage the paid
+   lifecycle; unbind removes the custom domain (the permanent URL keeps serving) and
+   delete tears the whole site down after explicit confirmation.
    Plan changes are confirmed only on Stripe and synchronized by Stripe webhook.
    A cancellation keeps the site paid through the current period. Sakupa reverts it to a free
    24h site and removes paid data after Stripe sends the signed final-cancellation webhook.
-5. create_support_ticket (subscribed sites) opens a support ticket; report_bug sends a
+5. support (subscribed sites) opens a support ticket; report sends a
    sanitized diagnostic report after the user explicitly confirms it.
 
 Project directory contract: ONE directory = ONE site (its .sakupa/site.json holds the
@@ -2747,12 +2765,12 @@ the user's PROJECT ROOT, the SAME directory every time for the same project: the
 the user opened (for framework projects, where package.json lives \u2014 never the dist/out
 build folder; output is auto-detected). Without it the server falls back to its startup
 directory, which may be a different project than the one the user is looking at. After every deploy, TELL the user which environment it went to (deploy results carry an
-Explicit Environment line: TEST vs PRODUCTION). analyze_site, deploy_site, site_status,
-refresh_site, delete_site and unbind_domain echo
+Explicit Environment line: TEST vs PRODUCTION). analyze, deploy, status,
+refresh, delete and unbind echo
 the directory they acted on \u2014 verify it matches the user's active project.
 
 When the same operation fails twice in a row, or the user is clearly stuck or
-frustrated, proactively offer report_bug: it files the problem into Sakupa's ticket and
+frustrated, proactively offer report: it files the problem into Sakupa's ticket and
 alert stream, and you should attach your own factual account via agentContext.
 
 Safety boundaries:
@@ -2771,7 +2789,7 @@ Safety boundaries:
   price next to the JPY amount, clearly marked as an estimate \u2014 Stripe always settles the
   real charge in JPY. Never show a bare Yen sign.
 - The management credential lives only in .sakupa/site.json; never share or upload it. Without
-  a bound custom domain, a lost credential is unrecoverable by design. manage_billing then opens
+  a bound custom domain, a lost credential is unrecoverable by design. portal then opens
   Stripe's public no-code portal login, where the customer verifies the checkout email with a
   Stripe one-time passcode; it never restores site authority.`;
 function createSakupaMcpServer(opts) {
@@ -2782,21 +2800,15 @@ function createSakupaMcpServer(opts) {
     { name: "sakupa", version: MCP_VERSION },
     { instructions: instructionsFor(previewHostPatternFor(opts.apiBaseUrl)) }
   );
-  registerTools(server, {
+  const ctx = {
     client,
     projectDir: opts.projectDir,
-    apiBaseUrl: opts.apiBaseUrl
-  });
-  registerBillingTools(server, {
-    client,
-    projectDir: opts.projectDir,
-    apiBaseUrl: opts.apiBaseUrl
-  });
-  registerLifecycleTools(server, {
-    client,
-    projectDir: opts.projectDir,
-    apiBaseUrl: opts.apiBaseUrl
-  });
+    apiBaseUrl: opts.apiBaseUrl,
+    session: { projectDir: null }
+  };
+  registerTools(server, ctx);
+  registerBillingTools(server, ctx);
+  registerLifecycleTools(server, ctx);
   return server;
 }