@sakupa/mcp 0.7.7 → 0.7.8

package/dist/index.js

@@ -5,6 +5,7 @@ var FREE_SITE_URL_SUFFIX = `.${SERVICE_DOMAIN}`;
 var TEST_ACCESS_HEADER = "x-sakupa-test-token";
 var FREE_SITE_TTL_HOURS = 24;
 var FREE_SITE_MAX_TOTAL_BYTES = 10 * 1024 * 1024;
+var FREE_ACTIVE_SITES_PER_IP = 3;
 var PAID_SITE_MAX_TOTAL_BYTES = 2 * 1024 * 1024 * 1024;
 var MAX_FILE_COUNT = 5e3;
 var MAX_SINGLE_FILE_BYTES = 25 * 1024 * 1024;
@@ -123,7 +124,7 @@ var FORBIDDEN_PATH_SEGMENTS = [
 var ALLOWED_HIDDEN_PATHS = [".well-known/"];
 
 // ../core/dist/domain/version.js
-var SAKUPA_MCP_VERSION = "0.7.7";
+var SAKUPA_MCP_VERSION = "0.7.8";
 
 // ../core/dist/domain/errors.js
 var HTTP_STATUS = {
@@ -1265,6 +1266,12 @@ async function analyzeProject(projectDir, opts = {}) {
   };
 }
 
+// src/tools/context.ts
+import { z as z2 } from "zod";
+import { statSync } from "node:fs";
+import { homedir } from "node:os";
+import { isAbsolute, parse, resolve as resolve2 } from "node:path";
+
 // src/tools/result.ts
 import { z } from "zod";
 var STRUCTURED_TOOL_OUTPUT_SCHEMA = {
@@ -1307,22 +1314,64 @@ function structuredToolResult(envelope) {
 }
 
 // src/tools/context.ts
+var LocalGuidanceError = class extends SakupaError {
+  constructor(code, message) {
+    super(code, message);
+  }
+};
+var projectDirInput = z2.string().optional().describe(
+  "Absolute path of the project directory the user is CURRENTLY working in (the folder holding the site files and .sakupa). Always pass it explicitly; 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 (!isAbsolute(projectDirArg)) {
+    throw new LocalGuidanceError(
+      "invalid_request",
+      `projectDir must be an ABSOLUTE path (got "${projectDirArg}"). Pass the full path of the directory the user is currently working in.`
+    );
+  }
+  const dir = resolve2(projectDirArg);
+  if (parse(dir).root === dir || dir === homedir()) {
+    throw new LocalGuidanceError(
+      "invalid_request",
+      `projectDir "${dir}" is a filesystem root or the home directory. Pass the specific project folder that holds the site's files, not a top-level directory.`
+    );
+  }
+  const stat = statSync(dir, { throwIfNoEntry: false });
+  if (!stat?.isDirectory()) {
+    throw new LocalGuidanceError(
+      "invalid_request",
+      `projectDir "${dir}" does not exist or is not a directory. Pass the absolute path of the directory the user is currently working in.`
+    );
+  }
+  return { ...ctx, projectDir: dir };
+}
 function requireSiteFile(ctx) {
   const state = loadSiteFile(ctx.projectDir);
   if (state.kind === "corrupted") {
-    throw new SakupaError(
+    throw new LocalGuidanceError(
       "invalid_request",
       `.sakupa/site.json in ${ctx.projectDir} is damaged: ${state.problem}. ` + siteFileRecoveryGuidance(ctx.projectDir)
     );
   }
   if (state.kind === "absent") {
-    throw new SakupaError(
+    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.`
     );
   }
   return state.file;
 }
+var STATIC_SUMMARY = {
+  not_found: "The required local project binding or resource is unavailable; if this project has no .sakupa/site.json yet, run deploy_site first.",
+  unauthorized: "The server rejected the site credential: the one in .sakupa/site.json no longer matches the server-side verifier. The site itself is intact on the server \u2014 only the local binding file is the problem. Repair the file (restore a backup or undo the local edit). Do NOT delete the .sakupa directory to work around this: the credential is unrecoverable by design, so abandoning it permanently orphans the existing site.",
+  invalid_request: "The request arguments or local project checks did not pass.",
+  validation_failed: "The request arguments or local project checks did not pass.",
+  state_conflict: "The resource state has changed; re-query the current status before deciding the next step.",
+  confirmation_required: "The site or billing state changed, so the previous confirmation is stale; run the preview again and confirm against the fresh snapshot.",
+  payment_required: "This operation requires an active subscription; check billing_status first.",
+  rate_limited: "The server rate limit was reached; retry after the returned wait time."
+};
 function toolError(e) {
   const errorCode = isSakupaError(e) ? e.code : "internal";
   const retryable = errorCode === "rate_limited" || errorCode === "internal";
@@ -1341,7 +1390,7 @@ function toolError(e) {
     )
   ) : void 0;
   const minimumVersion = rawDetails && typeof rawDetails["minimumVersion"] === "string" ? rawDetails["minimumVersion"] : void 0;
-  const safeSummary = errorCode === "upgrade_required" ? `This Sakupa MCP client is v${MCP_VERSION}, older than the server's minimum supported version${minimumVersion !== void 0 ? ` (v${minimumVersion})` : ""}, so the server refused the call. To fix it: ask the user to fully restart their MCP client session \u2014 "npx -y @sakupa/mcp@latest" setups fetch the current version on restart (run "npx clear-npx-cache" first if the old version persists); global installs need "npm install -g @sakupa/mcp@latest". After the restart, retry this exact tool call.` : errorCode === "not_found" ? "The required local project binding or resource is unavailable; if this project has no .sakupa/site.json yet, run deploy_site first." : errorCode === "unauthorized" ? "The server rejected the site credential: the one in .sakupa/site.json no longer matches the server-side verifier. The site itself is intact on the server \u2014 only the local binding file is the problem. Repair the file (restore a backup or undo the local edit). Do NOT delete the .sakupa directory to work around this: the credential is unrecoverable by design, so abandoning it permanently orphans the existing site." : errorCode === "invalid_request" || errorCode === "validation_failed" ? "The request arguments or local project checks did not pass." : errorCode === "state_conflict" ? "The resource state has changed; re-query the current status before deciding the next step." : errorCode === "confirmation_required" ? "The site or billing state changed, so the previous confirmation is stale; run the preview again and confirm against the fresh snapshot." : errorCode === "payment_required" ? "This operation requires an active subscription; check billing_status first." : errorCode === "rate_limited" ? "The server rate limit was reached; retry after the returned wait time." : retryable ? "An upstream service is temporarily unavailable or busy; retry shortly." : "The operation failed; no server-internal details are exposed.";
+  const safeSummary = e instanceof LocalGuidanceError ? e.message : errorCode === "upgrade_required" ? `This Sakupa MCP client is v${MCP_VERSION}, older than the server's minimum supported version${minimumVersion !== void 0 ? ` (v${minimumVersion})` : ""}, so the server refused the call. To fix it: ask the user to fully restart their MCP client session \u2014 "npx -y @sakupa/mcp@latest" setups fetch the current version on restart (run "npx clear-npx-cache" first if the old version persists); global installs need "npm install -g @sakupa/mcp@latest". After the restart, retry this exact tool call.` : STATIC_SUMMARY[errorCode] ?? (retryable ? "An upstream service is temporarily unavailable or busy; retry shortly." : "The operation failed; no server-internal details are exposed.");
   const result = structuredToolResult({
     schemaVersion: 1,
     outcome: "failed",
@@ -1360,8 +1409,54 @@ function toolError(e) {
 // src/tools/definitions.ts
 import { randomUUID } from "node:crypto";
 import { promises as fs2 } from "node:fs";
-import { join as join3, resolve as resolve2 } from "node:path";
-import { z as z2 } from "zod";
+import { join as join4, resolve as resolve3 } from "node:path";
+import { z as z3 } from "zod";
+
+// src/creation-registry.ts
+import { existsSync as existsSync2, mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "node:fs";
+import { homedir as homedir2 } from "node:os";
+import { dirname as dirname2, join as join3 } from "node:path";
+var RECENT_WINDOW_MS = FREE_SITE_TTL_HOURS * 60 * 60 * 1e3;
+function creationRegistryPath() {
+  const base = process.env["SAKUPA_STATE_DIR"] ?? homedir2();
+  return join3(base, ".sakupa", "created-sites.json");
+}
+function readAll() {
+  const path = creationRegistryPath();
+  if (!existsSync2(path)) return [];
+  try {
+    const parsed = JSON.parse(readFileSync2(path, "utf-8"));
+    if (!Array.isArray(parsed)) return [];
+    return parsed.filter(
+      (e) => typeof e === "object" && e !== null && typeof e.siteId === "string" && typeof e.createdAt === "string"
+    );
+  } catch {
+    return [];
+  }
+}
+function writeAll(records) {
+  const path = creationRegistryPath();
+  mkdirSync2(dirname2(path), { recursive: true });
+  writeFileSync2(path, `${JSON.stringify(records, null, 2)}
+`, "utf-8");
+}
+function listRecentCreations(nowMs) {
+  return readAll().filter((e) => {
+    const t = Date.parse(e.createdAt);
+    return Number.isFinite(t) && nowMs - t < RECENT_WINDOW_MS;
+  });
+}
+function recordCreation(record) {
+  const rest = readAll().filter((e) => e.siteId !== record.siteId);
+  writeAll([...rest, record]);
+}
+function removeCreation(siteId) {
+  const all = readAll();
+  const rest = all.filter((e) => e.siteId !== siteId);
+  if (rest.length !== all.length) writeAll(rest);
+}
+
+// src/tools/definitions.ts
 function text(resultCode, t, data = {}, outcome = "completed") {
   return structuredToolResult({
     schemaVersion: 1,
@@ -1384,12 +1479,12 @@ ${JSON.stringify(obj, null, 2)}`;
     nextActions: []
   });
 }
-var planEnum = z2.enum(["water", "personal", "share", "business"]);
-var severityEnum = z2.enum(["low", "medium", "high", "critical"]);
+var planEnum = z3.enum(["water", "personal", "share", "business"]);
+var severityEnum = z3.enum(["low", "medium", "high", "critical"]);
 function planCatalog() {
   return TIER_ORDER.map((p) => `${p} JPY ${tierPriceJpy(p)}/month`).join(", ");
 }
-var ticketCategoryEnum = z2.enum([
+var ticketCategoryEnum = z3.enum([
   "billing",
   "payment",
   "refund_review",
@@ -1437,7 +1532,7 @@ function ensureUploadSizeWithinLimits(manifest, isFirstFreeDeploy) {
 async function buildHashedManifest(files, outputAbs) {
   const manifest = [];
   for (const file of files) {
-    const bytes = new Uint8Array(await fs2.readFile(join3(outputAbs, file.path)));
+    const bytes = new Uint8Array(await fs2.readFile(join4(outputAbs, file.path)));
     manifest.push({ path: file.path, size: file.size, contentHash: await sha256Hex(bytes) });
   }
   return manifest;
@@ -1456,7 +1551,7 @@ async function uploadAll(ctx, targets, files, outputAbs) {
         `No local file matches upload target "${target.path}"; aborting upload.`
       );
     }
-    const bytes = new Uint8Array(await fs2.readFile(join3(outputAbs, match.path)));
+    const bytes = new Uint8Array(await fs2.readFile(join4(outputAbs, match.path)));
     if (bytes.byteLength !== match.size) {
       throw new SakupaError(
         "validation_failed",
@@ -1467,8 +1562,23 @@ async function uploadAll(ctx, targets, files, outputAbs) {
   }
   return targets.length;
 }
-function registerTools(server, ctx) {
-  const previewHostPattern = previewHostPatternFor(ctx.apiBaseUrl);
+function freeSiteCreationBarrier() {
+  const recent = listRecentCreations(Date.now());
+  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.
+
+` + 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.`,
+    { recentCreations: recent, limit: FREE_ACTIVE_SITES_PER_IP, registryPath },
+    "blocked"
+  );
+}
+function registerTools(server, baseCtx) {
+  const previewHostPattern = previewHostPatternFor(baseCtx.apiBaseUrl);
   server.registerTool(
     "analyze_site",
     {
@@ -1476,11 +1586,13 @@ function registerTools(server, ctx) {
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: true, destructiveHint: false, openWorldHint: false },
       inputSchema: {
-        outputDir: z2.string().optional().describe("Output directory relative to the project root (overrides detection).")
+        projectDir: projectDirInput,
+        outputDir: z3.string().optional().describe("Output directory relative to the project root (overrides detection).")
       }
     },
     async (args) => {
       try {
+        const ctx = withProjectDir(baseCtx, args.projectDir);
         const analysis = await analyzeProject(ctx.projectDir, {
           ...args.outputDir !== void 0 ? { outputDir: args.outputDir } : {}
         });
@@ -1502,18 +1614,20 @@ Next action: ${analysis.suggestedNextAction}`,
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
       inputSchema: {
-        outputDir: z2.string().optional().describe("Output directory relative to the project root (overrides detection)."),
-        spaFallback: z2.boolean().optional().describe(
+        projectDir: projectDirInput,
+        outputDir: z3.string().optional().describe("Output directory relative to the project root (overrides detection)."),
+        spaFallback: z3.boolean().optional().describe(
           "Override automatic SPA-fallback detection (single index.html + JS auto-enables rewriting unknown paths to index.html; multiple HTML pages auto-disable it). Pass only to force the behavior against the detected structure."
         ),
-        publicConfirmed: z2.boolean().optional().describe(
+        publicConfirmed: z3.boolean().optional().describe(
           "Required only for the first deployment: user explicitly confirmed creation of a public 24-hour URL."
         ),
-        lang: z2.string().optional().describe("Site language override (en | ja | zh-CN); defaults to the html lang.")
+        lang: z3.string().optional().describe("Site language override (en | ja | zh-CN); defaults to the html lang.")
       }
     },
     async (args) => {
       try {
+        const ctx = withProjectDir(baseCtx, args.projectDir);
         const analysis = await analyzeProject(ctx.projectDir, {
           ...args.outputDir !== void 0 ? { outputDir: args.outputDir } : {}
         });
@@ -1521,7 +1635,7 @@ Next action: ${analysis.suggestedNextAction}`,
           return notDeployableResult(analysis);
         }
         const files = analysis.files;
-        const outputAbs = resolve2(ctx.projectDir, analysis.recommendedOutputDir ?? ".");
+        const outputAbs = resolve3(ctx.projectDir, analysis.recommendedOutputDir ?? ".");
         const manifest = await buildHashedManifest(files, outputAbs);
         const siteFileState = loadSiteFile(ctx.projectDir);
         if (siteFileState.kind === "corrupted") {
@@ -1535,6 +1649,10 @@ Next action: ${analysis.suggestedNextAction}`,
           );
         }
         const existing = siteFileState.kind === "ok" ? siteFileState.file : null;
+        if (!existing) {
+          const barrier = freeSiteCreationBarrier();
+          if (barrier) return barrier;
+        }
         if (!existing && args.publicConfirmed !== true) {
           return text(
             "public_deployment_confirmation_required",
@@ -1556,17 +1674,25 @@ Next action: ${analysis.suggestedNextAction}`,
             created.siteId,
             created.credential
           );
+          const createdAt = (/* @__PURE__ */ new Date()).toISOString();
           writeSiteFile(ctx.projectDir, {
             siteId: created.siteId,
             shortId: created.shortId,
             url: finalized2.url,
             credential: created.credential,
-            createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+            createdAt,
             apiBaseUrl: ctx.apiBaseUrl
           });
+          recordCreation({
+            siteId: created.siteId,
+            projectDir: ctx.projectDir,
+            url: finalized2.url,
+            createdAt
+          });
           return text(
             "site_published",
             `Site published: ${finalized2.url}
+Project directory: ${ctx.projectDir}
 Files uploaded: ${uploaded2} (${finalized2.totalBytes} bytes)
 ` + (finalized2.expiresAt ? `Expires at: ${finalized2.expiresAt}
 ` : "") + `
@@ -1584,7 +1710,8 @@ ${JSON.stringify(finalized2.warnings, null, 2)}` : ""),
               filesUploaded: uploaded2,
               totalBytes: finalized2.totalBytes,
               warnings: finalized2.warnings,
-              credentialStoredLocally: true
+              credentialStoredLocally: true,
+              projectDir: ctx.projectDir
             }
           );
         }
@@ -1630,6 +1757,7 @@ ${JSON.stringify(finalized2.warnings, null, 2)}` : ""),
         return text(
           "site_updated",
           `Site updated: ${finalized.url}
+Project directory: ${ctx.projectDir}
 Files uploaded: ${uploaded} (${finalized.totalBytes} bytes)
 ` + (finalized.expiresAt ? `Validity refreshed \u2014 expires at: ${finalized.expiresAt}
 ` : "") + (finalized.mode === "free" ? `
@@ -1641,6 +1769,7 @@ ${JSON.stringify(finalized.warnings, null, 2)}` : ""),
             siteId: existing.siteId,
             url: finalized.url,
             mode: finalized.mode,
+            projectDir: ctx.projectDir,
             expiresAt: finalized.expiresAt,
             filesUploaded: uploaded,
             totalBytes: finalized.totalBytes,
@@ -1658,17 +1787,18 @@ ${JSON.stringify(finalized.warnings, null, 2)}` : ""),
       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,
       annotations: { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
-      inputSchema: {}
+      inputSchema: { projectDir: projectDirInput }
     },
-    async () => {
+    async (args) => {
       try {
+        const ctx = withProjectDir(baseCtx, args.projectDir);
         const site = requireSiteFile(ctx);
         const res = await ctx.client.refreshSite(site.siteId, site.credential);
         return text(
           "site_refreshed",
-          `Site validity refreshed. New expiry: ${res.expiresAt}
+          `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.`,
-          { siteId: site.siteId, expiresAt: res.expiresAt }
+          { siteId: site.siteId, expiresAt: res.expiresAt, projectDir: ctx.projectDir }
         );
       } catch (e) {
         return toolError(e);
@@ -1681,13 +1811,17 @@ NO content was uploaded or changed by this call \u2014 to publish new or edited
       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,
       annotations: { readOnlyHint: true, destructiveHint: false, openWorldHint: true },
-      inputSchema: {}
+      inputSchema: { projectDir: projectDirInput }
     },
-    async () => {
+    async (args) => {
       try {
+        const ctx = withProjectDir(baseCtx, args.projectDir);
         const site = requireSiteFile(ctx);
         const res = await ctx.client.getSiteStatus(site.siteId, site.credential);
-        return textJson("site_status_returned", "Site status:", res);
+        return textJson("site_status_returned", "Site status:", {
+          ...res,
+          projectDir: ctx.projectDir
+        });
       } catch (e) {
         return toolError(e);
       }
@@ -1700,6 +1834,7 @@ NO content was uploaded or changed by this call \u2014 to publish new or edited
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
       inputSchema: {
+        projectDir: projectDirInput,
         plan: planEnum.describe(
           "Monthly plan: water (very light personal pages), personal (personal brand / small shop), share (small-business site), business (steadier traffic, more headroom)."
         )
@@ -1707,6 +1842,7 @@ NO content was uploaded or changed by this call \u2014 to publish new or edited
     },
     async (args) => {
       try {
+        const ctx = withProjectDir(baseCtx, args.projectDir);
         const site = requireSiteFile(ctx);
         const res = await ctx.client.createPlanCheckout(
           {
@@ -1745,13 +1881,15 @@ Once payment confirms, the site becomes permanent on its current URL. Binding a
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
       inputSchema: {
-        action: z2.enum(["start", "status"]),
-        hostname: z2.string().optional().describe("Required for start."),
-        verificationId: z2.string().optional().describe("Required for status.")
+        projectDir: projectDirInput,
+        action: z3.enum(["start", "status"]),
+        hostname: z3.string().optional().describe("Required for start."),
+        verificationId: z3.string().optional().describe("Required for status.")
       }
     },
     async (args) => {
       try {
+        const ctx = withProjectDir(baseCtx, args.projectDir);
         const site = requireSiteFile(ctx);
         if (args.action === "status") {
           if (!args.verificationId) {
@@ -1821,10 +1959,11 @@ Then run bind_domain again with verificationId: "${res.verificationId}" to check
       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,
       annotations: { readOnlyHint: true, destructiveHint: false, openWorldHint: true },
-      inputSchema: {}
+      inputSchema: { projectDir: projectDirInput }
     },
-    async () => {
+    async (args) => {
       try {
+        const ctx = withProjectDir(baseCtx, args.projectDir);
         const site = requireSiteFile(ctx);
         const res = await ctx.client.getBillingStatus(site.siteId, site.credential);
         const lines = [
@@ -1854,11 +1993,13 @@ Full status:`, res);
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
       inputSchema: {
-        scope: z2.enum(["site", "public_recovery"])
+        projectDir: projectDirInput,
+        scope: z3.enum(["site", "public_recovery"])
       }
     },
     async (args) => {
       try {
+        const ctx = withProjectDir(baseCtx, args.projectDir);
         if (args.scope === "site") {
           const site = requireSiteFile(ctx);
           const res2 = await ctx.client.createBillingPortal(site.siteId, site.credential);
@@ -1909,14 +2050,16 @@ Full status:`, res);
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
       inputSchema: {
-        action: z2.enum(["start", "status", "complete"]),
-        hostname: z2.string().optional().describe("Required for start."),
-        verificationId: z2.string().optional().describe("Required for status or complete."),
-        preserveExistingCredentials: z2.boolean().optional().describe("Explicitly keep old local credentials working (default: revoke them all).")
+        projectDir: projectDirInput,
+        action: z3.enum(["start", "status", "complete"]),
+        hostname: z3.string().optional().describe("Required for start."),
+        verificationId: z3.string().optional().describe("Required for status or complete."),
+        preserveExistingCredentials: z3.boolean().optional().describe("Explicitly keep old local credentials working (default: revoke them all).")
       }
     },
     async (args) => {
       try {
+        const ctx = withProjectDir(baseCtx, args.projectDir);
         if (args.action === "start") {
           if (!args.hostname) {
             throw new SakupaError("invalid_request", "hostname is required for start");
@@ -2014,14 +2157,16 @@ ${res.archiveUrl}`,
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
       inputSchema: {
+        projectDir: projectDirInput,
         category: ticketCategoryEnum,
-        subject: z2.string().describe("Short subject line."),
-        description: z2.string().describe("Problem description (no secrets, no card data)."),
-        contactEmail: z2.string().optional().describe("Optional contact email for follow-up.")
+        subject: z3.string().describe("Short subject line."),
+        description: z3.string().describe("Problem description (no secrets, no card data)."),
+        contactEmail: z3.string().optional().describe("Optional contact email for follow-up.")
       }
     },
     async (args) => {
       try {
+        const ctx = withProjectDir(baseCtx, args.projectDir);
         const site = requireSiteFile(ctx);
         const res = await ctx.client.createTicket(site.credential, {
           siteId: site.siteId,
@@ -2047,18 +2192,20 @@ ${res.archiveUrl}`,
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
       inputSchema: {
-        toolName: z2.string().describe('The Sakupa tool that failed, e.g. "deploy_site".'),
-        errorCode: z2.string().optional(),
-        errorMessage: z2.string().optional().describe("Sanitized error message (no secrets)."),
-        requestId: z2.string().optional(),
-        deploymentId: z2.string().optional(),
+        projectDir: projectDirInput,
+        toolName: z3.string().describe('The Sakupa tool that failed, e.g. "deploy_site".'),
+        errorCode: z3.string().optional(),
+        errorMessage: z3.string().optional().describe("Sanitized error message (no secrets)."),
+        requestId: z3.string().optional(),
+        deploymentId: z3.string().optional(),
         severity: severityEnum.optional(),
-        description: z2.string().optional().describe("What happened, in the user's words (no secrets)."),
-        confirmSubmit: z2.boolean().optional().describe("User reviewed the report payload and approved submission.")
+        description: z3.string().optional().describe("What happened, in the user's words (no secrets)."),
+        confirmSubmit: z3.boolean().optional().describe("User reviewed the report payload and approved submission.")
       }
     },
     async (args) => {
       try {
+        const ctx = withProjectDir(baseCtx, args.projectDir);
         const siteState = loadSiteFile(ctx.projectDir);
         const site = siteState.kind === "ok" ? siteState.file : null;
         const diagnostics = {
@@ -2102,39 +2249,40 @@ Summary: ${res.sanitizedSummary}`,
 }
 
 // src/tools/lifecycle.ts
-import { z as z3 } from "zod";
-var deleteConfirmation = z3.object({
-  siteId: z3.string().min(1),
-  expectedSiteUpdatedAt: z3.string().datetime(),
-  expectedStatus: z3.enum(["active", "expired", "deleted"]),
-  expectedMode: z3.enum(["free", "paid"]),
-  expectedServingMode: z3.enum(["normal", "over_limit_notice", "risk_notice", "stopped"]),
-  expectedShortId: z3.string().optional(),
-  expectedSubscriptionStatus: z3.enum(["incomplete", "active", "past_due", "canceled"]).optional(),
-  expectedPlan: z3.enum(["water", "personal", "share", "business"]).optional(),
-  expectedCancelAtPeriodEnd: z3.boolean().optional(),
-  expectedCurrentPeriodEnd: z3.string().datetime().optional(),
-  expectedLastDeploymentId: z3.string().optional(),
-  expectedBoundHostnames: z3.array(z3.string()),
-  acknowledge: z3.literal("delete_site_and_cancel_renewal")
+import { z as z4 } from "zod";
+var deleteConfirmation = z4.object({
+  siteId: z4.string().min(1),
+  expectedSiteUpdatedAt: z4.string().datetime(),
+  expectedStatus: z4.enum(["active", "expired", "deleted"]),
+  expectedMode: z4.enum(["free", "paid"]),
+  expectedServingMode: z4.enum(["normal", "over_limit_notice", "risk_notice", "stopped"]),
+  expectedShortId: z4.string().optional(),
+  expectedSubscriptionStatus: z4.enum(["incomplete", "active", "past_due", "canceled"]).optional(),
+  expectedPlan: z4.enum(["water", "personal", "share", "business"]).optional(),
+  expectedCancelAtPeriodEnd: z4.boolean().optional(),
+  expectedCurrentPeriodEnd: z4.string().datetime().optional(),
+  expectedLastDeploymentId: z4.string().optional(),
+  expectedBoundHostnames: z4.array(z4.string()),
+  acknowledge: z4.literal("delete_site_and_cancel_renewal")
 });
-var unbindConfirmation = z3.object({
-  siteId: z3.string().min(1),
-  bindingId: z3.string().min(1),
-  expectedBindingUpdatedAt: z3.string().datetime(),
-  expectedBindingStatus: z3.enum(["provisioning", "active"]),
-  apexDomain: z3.string().min(1),
-  expectedBoundHostnames: z3.array(z3.string()),
-  acknowledge: z3.literal("unbind_domain_and_remove_custom_hostnames")
+var unbindConfirmation = z4.object({
+  siteId: z4.string().min(1),
+  bindingId: z4.string().min(1),
+  expectedBindingUpdatedAt: z4.string().datetime(),
+  expectedBindingStatus: z4.enum(["provisioning", "active"]),
+  apexDomain: z4.string().min(1),
+  expectedBoundHostnames: z4.array(z4.string()),
+  acknowledge: z4.literal("unbind_domain_and_remove_custom_hostnames")
 });
-function registerLifecycleTools(server, ctx) {
+function registerLifecycleTools(server, baseCtx) {
   server.registerTool(
     "delete_site",
     {
       description: "Preview or execute deletion of this Sakupa site. Execution requires an exact server-validated confirmation bound to the current site state.",
       inputSchema: {
-        action: z3.enum(["preview", "confirm"]),
-        operationId: z3.string().min(1).optional(),
+        projectDir: projectDirInput,
+        action: z4.enum(["preview", "confirm"]),
+        operationId: z4.string().min(1).optional(),
         confirmation: deleteConfirmation.optional()
       },
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
@@ -2142,6 +2290,7 @@ function registerLifecycleTools(server, ctx) {
     },
     async (args) => {
       try {
+        const ctx = withProjectDir(baseCtx, args.projectDir);
         const site = requireSiteFile(ctx);
         if (!args.operationId) {
           throw new Error("operationId is required for delete_site");
@@ -2168,13 +2317,14 @@ function registerLifecycleTools(server, ctx) {
           confirmation: args.confirmation
         });
         deleteSiteFile(ctx.projectDir);
+        removeCreation(site.siteId);
         return structuredToolResult({
           schemaVersion: 1,
           outcome: result.servingDeletionPending ? "pending_provider" : "completed",
           resultCode: "site_deleted",
           operationId: args.operationId,
-          summary: "Site deleted; the local management credential file was removed.",
-          data: { result },
+          summary: `Site deleted; the local management credential file was removed from ${ctx.projectDir}.`,
+          data: { result, projectDir: ctx.projectDir },
           nextActions: []
         });
       } catch (error) {
@@ -2187,8 +2337,9 @@ function registerLifecycleTools(server, ctx) {
     {
       description: "Preview or execute removal of the custom apex/www serving surface while preserving the subscription and permanent Sakupa URL.",
       inputSchema: {
-        action: z3.enum(["preview", "confirm"]),
-        operationId: z3.string().min(1).optional(),
+        projectDir: projectDirInput,
+        action: z4.enum(["preview", "confirm"]),
+        operationId: z4.string().min(1).optional(),
         confirmation: unbindConfirmation.optional()
       },
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
@@ -2196,6 +2347,7 @@ function registerLifecycleTools(server, ctx) {
     },
     async (args) => {
       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.action === "preview") {
@@ -2226,7 +2378,7 @@ function registerLifecycleTools(server, ctx) {
           outcome: result.servingDeletionPending ? "pending_provider" : "completed",
           resultCode: "domain_unbound",
           operationId: args.operationId,
-          summary: "Custom domain unbound; the subscription, deployed content, and permanent Sakupa URL are unchanged.",
+          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 }]
         });
@@ -2241,19 +2393,20 @@ function registerLifecycleTools(server, ctx) {
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 
 // src/tools/billing.ts
-import { z as z4 } from "zod";
-var plan = z4.enum(["water", "personal", "share", "business"]);
-function registerBillingTools(server, ctx) {
+import { z as z5 } from "zod";
+var plan = z5.enum(["water", "personal", "share", "business"]);
+function registerBillingTools(server, baseCtx) {
   server.registerTool(
     "list_billing_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: {},
+      inputSchema: { projectDir: projectDirInput },
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: true, destructiveHint: false, openWorldHint: true }
     },
-    async () => {
+    async (args) => {
       try {
+        const ctx = withProjectDir(baseCtx, args.projectDir);
         const catalog = await ctx.client.getBillingPlanCatalog();
         return structuredToolResult({
           schemaVersion: 1,
@@ -2273,14 +2426,16 @@ function registerBillingTools(server, ctx) {
     {
       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: {
+        projectDir: projectDirInput,
         targetPlan: plan,
-        operationId: z4.string().min(1)
+        operationId: z5.string().min(1)
       },
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: false, destructiveHint: false, openWorldHint: true }
     },
     async (args) => {
       try {
+        const ctx = withProjectDir(baseCtx, args.projectDir);
         const site = requireSiteFile(ctx);
         const result = await ctx.client.changeSubscriptionPlan(site.credential, {
           siteId: site.siteId,
@@ -2339,6 +2494,13 @@ Workflow:
 5. create_support_ticket (subscribed sites) opens a support ticket; report_bug sends a
    sanitized diagnostic report after the user explicitly confirms it.
 
+Project directory contract: ONE directory = ONE site (its .sakupa/site.json holds the
+binding). Every project-scoped tool accepts projectDir \u2014 ALWAYS pass the absolute path of
+the directory the user is currently working in, on every call. Without it the server falls
+back to its startup directory, which may be a different project than the one the user is
+looking at. analyze_site, deploy_site, site_status, refresh_site, delete_site and unbind_domain echo
+the directory they acted on \u2014 verify it matches the user's active project.
+
 Safety boundaries:
 - Static output only: no SSR, API routes, middleware, server actions, databases or online builds.
 - Never upload source projects, secrets, .env files, private keys, archives, videos or audio.