@sakupa/mcp 0.7.33 → 0.7.34

package/dist/bin.js

@@ -2,8 +2,7 @@
 
 // src/bin.ts
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
-import { createInterface } from "node:readline/promises";
-import { stdin, stdout } from "node:process";
+import { stdout } from "node:process";
 
 // src/project-root.ts
 import { randomUUID } from "node:crypto";
@@ -20,11 +19,9 @@ import {
   writeFileSync
 } from "node:fs";
 import { homedir } from "node:os";
-import { dirname, isAbsolute, join, parse, relative, resolve, sep } from "node:path";
+import { isAbsolute, join, parse, relative, resolve, sep } from "node:path";
 var SAKUPA_DIR = ".sakupa";
 var PROJECT_FILE = "project.json";
-var SITE_FILE = "site.json";
-var RECOVERY_FILE = "recovery.json";
 var PROJECT_SCHEMA_VERSION = 1;
 var ProjectRootError = class extends Error {
   code;
@@ -109,65 +106,27 @@ function initializeProject(projectDir) {
     marker
   };
 }
-function resolveProjectRoot(requestedPath) {
-  if (!isAbsolute(requestedPath)) {
+function resolveLockedProjectRoot(projectDir) {
+  const canonical = canonicalProjectDirectory(projectDir);
+  assertSafeProjectRoot(canonical);
+  const markerState = loadProjectMarker(canonical);
+  if (markerState.kind === "corrupted") {
     throw new ProjectRootError(
-      "invalid_path",
-      `Project path must be absolute (got "${requestedPath}").`
+      "corrupted_marker",
+      `Sakupa project marker ${projectMarkerPath(canonical)} is damaged: ${markerState.problem}.`
     );
   }
-  const canonicalRequested = canonicalExistingPath(requestedPath);
-  const requestedStat = statSync(canonicalRequested);
-  let cursor = requestedStat.isDirectory() ? canonicalRequested : dirname(canonicalRequested);
-  const startDevice = statSync(cursor).dev;
-  const candidates = [];
-  while (true) {
-    if (statSync(cursor).dev !== startDevice) break;
-    const markerState = loadProjectMarker(cursor);
-    const hasSite = existsSync(join(cursor, SAKUPA_DIR, SITE_FILE));
-    const hasRecovery = existsSync(join(cursor, SAKUPA_DIR, RECOVERY_FILE));
-    if (markerState.kind !== "absent" || hasSite || hasRecovery) {
-      candidates.push({ dir: cursor, markerState, hasSite, hasRecovery });
-    }
-    const parent = dirname(cursor);
-    if (parent === cursor) break;
-    cursor = parent;
-  }
-  if (candidates.length === 0) {
+  if (markerState.kind === "absent") {
     throw new ProjectRootError(
       "not_initialized",
-      `No Sakupa project marker was found at or above ${canonicalRequested}. Run \`npx -y @sakupa/mcp@latest init\` once from the intended project root; no site was changed.`
-    );
-  }
-  const nearest = candidates[0];
-  if (nearest.markerState.kind === "corrupted") {
-    throw new ProjectRootError(
-      "corrupted_marker",
-      `Sakupa project marker ${projectMarkerPath(nearest.dir)} is damaged: ${nearest.markerState.problem}.`
+      `The MCP working directory ${canonical} is not initialized. Run \`npx -y @sakupa/mcp@latest init\` in that directory; do not pass a path argument.`
     );
   }
-  if (nearest.markerState.kind === "absent") {
-    const explicitAncestor = candidates.find((candidate) => candidate.markerState.kind === "ok");
-    if (explicitAncestor) {
-      throw new ProjectRootError(
-        "ambiguous_binding",
-        `A legacy .sakupa binding exists at ${nearest.dir}, below the initialized Sakupa project ${explicitAncestor.dir}. Start the operation from ${explicitAncestor.dir}; deploy can then validate and relocate the same credential without creating a site.`
-      );
-    }
-  }
-  assertSafeProjectRoot(nearest.dir);
-  if (nearest.markerState.kind === "ok") {
-    return {
-      projectDir: nearest.dir,
-      requestedPath: canonicalRequested,
-      markerKind: "project",
-      marker: nearest.markerState.marker
-    };
-  }
   return {
-    projectDir: nearest.dir,
-    requestedPath: canonicalRequested,
-    markerKind: nearest.hasSite ? "legacy_site" : "legacy_recovery"
+    projectDir: canonical,
+    requestedPath: canonical,
+    markerKind: "project",
+    marker: markerState.marker
   };
 }
 function updateProjectOutputDir(projectDir, outputDir) {
@@ -258,13 +217,13 @@ function writeMarkerAtomically(projectDir, marker) {
 }
 
 // src/cli-init.ts
-async function runInitCommand(args, io) {
-  if (args.length > 1) {
-    io.write("Usage: sakupa-mcp init [project-directory]");
+async function runInitCommand(args, io, cwd = process.cwd()) {
+  if (args.length > 0) {
+    io.write("Usage: sakupa-mcp init");
     return { exitCode: 2, initialized: false };
   }
   try {
-    const projectDir = canonicalProjectDirectory(args[0] ?? process.cwd());
+    const projectDir = canonicalProjectDirectory(cwd);
     const current = loadProjectMarker(projectDir);
     if (current.kind === "corrupted") {
       io.write(`Refusing to replace damaged Sakupa marker in ${projectDir}: ${current.problem}.`);
@@ -274,17 +233,9 @@ async function runInitCommand(args, io) {
       io.write(`Sakupa project is already initialized: ${projectDir}`);
       return { exitCode: 0, projectDir, initialized: false };
     }
-    io.write(`Sakupa project directory: ${projectDir}`);
-    const confirmed = await io.confirm(
-      "Initialize exactly this directory as one Sakupa project? [y/N] "
-    );
-    if (!confirmed) {
-      io.write("Initialization cancelled; no files were changed.");
-      return { exitCode: 0, projectDir, initialized: false };
-    }
     initializeProject(projectDir);
     io.write(
-      `Initialized ${projectDir}. The .sakupa directory stays here; publish output may be any child directory.`
+      `Initialized the current directory ${projectDir}. Created .sakupa/project.json here; site credentials and recovery state will stay in this .sakupa directory.`
     );
     return { exitCode: 0, projectDir, initialized: true };
   } catch (error) {
@@ -419,7 +370,7 @@ var FORBIDDEN_PATH_SEGMENTS = [
 var ALLOWED_HIDDEN_PATHS = [".well-known/"];
 
 // ../core/dist/domain/version.js
-var SAKUPA_MCP_VERSION = "0.7.33";
+var SAKUPA_MCP_VERSION = "0.7.34";
 
 // ../core/dist/domain/errors.js
 var HTTP_STATUS = {
@@ -981,7 +932,7 @@ var HttpApiClient = class {
 import { randomUUID as randomUUID2 } from "node:crypto";
 import { promises as fs2 } from "node:fs";
 import { join as join6, resolve as resolve4 } from "node:path";
-import { z as z3 } from "zod";
+import { z as z2 } from "zod";
 
 // src/analyze/analyzer.ts
 import { promises as fs } from "node:fs";
@@ -1422,15 +1373,15 @@ import {
   rmSync,
   writeFileSync as writeFileSync2
 } from "node:fs";
-import { dirname as dirname2, join as join3 } from "node:path";
+import { dirname, join as join3 } from "node:path";
 var SITE_DIR = ".sakupa";
-var SITE_FILE2 = "site.json";
-var RECOVERY_FILE2 = "recovery.json";
+var SITE_FILE = "site.json";
+var RECOVERY_FILE = "recovery.json";
 function siteFilePath(projectDir) {
-  return join3(projectDir, SITE_DIR, SITE_FILE2);
+  return join3(projectDir, SITE_DIR, SITE_FILE);
 }
 function recoveryFilePath(projectDir) {
-  return join3(projectDir, SITE_DIR, RECOVERY_FILE2);
+  return join3(projectDir, SITE_DIR, RECOVERY_FILE);
 }
 function loadSiteFile(projectDir) {
   const path = siteFilePath(projectDir);
@@ -1500,7 +1451,7 @@ function loadRecoveryFile(projectDir) {
 function writeRecoveryFile(projectDir, file) {
   const dir = join3(projectDir, SITE_DIR);
   mkdirSync2(dir, { recursive: true });
-  const path = join3(dir, RECOVERY_FILE2);
+  const path = join3(dir, RECOVERY_FILE);
   writeFileSync2(path, `${JSON.stringify(file, null, 2)}
 `, "utf8");
   try {
@@ -1531,7 +1482,7 @@ function writeSiteFile(projectDir, file, opts = {}) {
   }
   const dir = join3(projectDir, SITE_DIR);
   mkdirSync2(dir, { recursive: true });
-  const path = join3(dir, SITE_FILE2);
+  const path = join3(dir, SITE_FILE);
   writeFileSync2(path, `${JSON.stringify(file, null, 2)}
 `, "utf8");
   try {
@@ -1552,7 +1503,7 @@ function deleteSiteFile(projectDir) {
 function findAncestor(startDir, predicate, maxLevels = Number.POSITIVE_INFINITY) {
   let cursor = startDir;
   for (let i = 0; i < maxLevels; i += 1) {
-    const parent = dirname2(cursor);
+    const parent = dirname(cursor);
     if (parent === cursor) return null;
     if (predicate(parent)) return parent;
     cursor = parent;
@@ -1570,7 +1521,7 @@ function credentialGitReminder(projectDir) {
 // src/recovery-archive.ts
 import { existsSync as existsSync3, realpathSync as realpathSync2 } from "node:fs";
 import { mkdtemp, mkdir, readFile, readdir, rename, rm, stat, writeFile } from "node:fs/promises";
-import { dirname as dirname3, isAbsolute as isAbsolute2, join as join4, relative as relative2, resolve as resolve3, sep as sep3 } from "node:path";
+import { dirname as dirname2, isAbsolute as isAbsolute2, join as join4, relative as relative2, resolve as resolve3, sep as sep3 } from "node:path";
 
 // ../../node_modules/fflate/esm/index.mjs
 import { createRequire } from "module";
@@ -1989,15 +1940,15 @@ function strFromU8(dat, latin1) {
 var slzh = function(d, b) {
   return b + 30 + b2(d, b + 26) + b2(d, b + 28);
 };
-var zh = function(d, b, z6) {
+var zh = function(d, b, z5) {
   var fnl = b2(d, b + 28), efl = b2(d, b + 30), fn = strFromU8(d.subarray(b + 46, b + 46 + fnl), !(b2(d, b + 8) & 2048)), es = b + 46 + fnl;
-  var _a2 = z64hs(d, es, efl, z6, b4(d, b + 20), b4(d, b + 24), b4(d, b + 42)), sc = _a2[0], su = _a2[1], off = _a2[2];
+  var _a2 = z64hs(d, es, efl, z5, b4(d, b + 20), b4(d, b + 24), b4(d, b + 42)), sc = _a2[0], su = _a2[1], off = _a2[2];
   return [b2(d, b + 10), sc, su, fn, es + efl + b2(d, b + 32), off];
 };
-var z64hs = function(d, b, l, z6, sc, su, off) {
+var z64hs = function(d, b, l, z5, sc, su, off) {
   var nsc = sc == 4294967295, nsu = su == 4294967295, noff = off == 4294967295, e = b + l;
   var nf = nsc + nsu + noff;
-  if (z6 && nf) {
+  if (z5 && nf) {
     for (; b + 4 < e; b += 4 + b2(d, b + 2)) {
       if (b2(d, b) == 1) {
         return [
@@ -2008,7 +1959,7 @@ var z64hs = function(d, b, l, z6, sc, su, off) {
         ];
       }
     }
-    if (z6 < 2)
+    if (z5 < 2)
       err(13);
   }
   return [sc, su, off, 0];
@@ -2025,18 +1976,18 @@ function unzipSync(data, opts) {
   if (!c)
     return {};
   var o = b4(data, e + 16);
-  var z6 = b4(data, e - 20) == 117853008;
-  if (z6) {
+  var z5 = b4(data, e - 20) == 117853008;
+  if (z5) {
     var ze = b4(data, e - 12);
-    z6 = b4(data, ze) == 101075792;
-    if (z6) {
+    z5 = b4(data, ze) == 101075792;
+    if (z5) {
       c = b4(data, ze + 32);
       o = b4(data, ze + 48);
     }
   }
   var fltr = opts && opts.filter;
   for (var i = 0; i < c; ++i) {
-    var _a2 = zh(data, o, z6), c_2 = _a2[0], sc = _a2[1], su = _a2[2], fn = _a2[3], no = _a2[4], off = _a2[5], b = slzh(data, off);
+    var _a2 = zh(data, o, z5), c_2 = _a2[0], sc = _a2[1], su = _a2[2], fn = _a2[3], no = _a2[4], off = _a2[5], b = slzh(data, off);
     o = no;
     if (!fltr || fltr({
       name: fn,
@@ -2071,7 +2022,7 @@ function safeOutputPath(projectDir, outputDir) {
   }
   let existingAncestor = target;
   while (!existsSync3(existingAncestor)) {
-    const parent = dirname3(existingAncestor);
+    const parent = dirname2(existingAncestor);
     if (parent === existingAncestor) break;
     existingAncestor = parent;
   }
@@ -2188,7 +2139,7 @@ async function extractRecoveryArchive(input) {
     for (const [rawName, data] of entries) {
       const name = safeEntryName(rawName);
       const destination = join4(tempDir, ...name.split("/"));
-      await mkdir(dirname3(destination), { recursive: true });
+      await mkdir(dirname2(destination), { recursive: true });
       await writeFile(destination, data, { flag: "wx" });
       writtenBytes += data.byteLength;
     }
@@ -2198,7 +2149,7 @@ async function extractRecoveryArchive(input) {
         "Extracted recovery data does not match site metadata"
       );
     }
-    await mkdir(dirname3(outputDir), { recursive: true });
+    await mkdir(dirname2(outputDir), { recursive: true });
     await rename(tempDir, outputDir);
     return {
       outputDir,
@@ -2215,7 +2166,7 @@ async function extractRecoveryArchive(input) {
 // src/creation-registry.ts
 import { existsSync as existsSync4, mkdirSync as mkdirSync3, readFileSync as readFileSync3, writeFileSync as writeFileSync3 } from "node:fs";
 import { homedir as homedir2 } from "node:os";
-import { dirname as dirname4, join as join5 } from "node:path";
+import { dirname as dirname3, join as join5 } from "node:path";
 var RECENT_WINDOW_MS = FREE_SITE_TTL_HOURS * 60 * 60 * 1e3;
 function creationRegistryPath() {
   const base = process.env["SAKUPA_STATE_DIR"] ?? homedir2();
@@ -2236,7 +2187,7 @@ function readAll() {
 }
 function writeAll(records) {
   const path = creationRegistryPath();
-  mkdirSync3(dirname4(path), { recursive: true });
+  mkdirSync3(dirname3(path), { recursive: true });
   writeFileSync3(path, `${JSON.stringify(records, null, 2)}
 `, "utf-8");
 }
@@ -2393,9 +2344,6 @@ ${diag.layers}
 var MCP_VERSION = SAKUPA_MCP_VERSION;
 var CLIENT_TYPE = "sakupa-mcp";
 
-// src/tools/context.ts
-import { z as z2 } from "zod";
-
 // src/tools/result.ts
 import { z } from "zod";
 var STRUCTURED_TOOL_OUTPUT_SCHEMA = {
@@ -2443,24 +2391,15 @@ var LocalGuidanceError = class extends SakupaError {
     super(code, message);
   }
 };
-var projectDirInput = z2.string().describe(
-  "REQUIRED: an absolute existing path anywhere inside the user's initialized Sakupa project (the root itself or a child such as dist/html/src). Sakupa resolves upward to its own .sakupa marker and never trusts this argument as the root. If no marker exists, run `npx -y @sakupa/mcp@latest init` once from the intended project root."
-);
-function withProjectDir(ctx, projectDirArg) {
-  if (projectDirArg === void 0) {
-    throw new LocalGuidanceError(
-      "invalid_request",
-      "projectDir is REQUIRED as a path locator: pass an absolute existing path anywhere inside the current Sakupa project. The server resolves its own .sakupa marker and never treats the supplied path as an authoritative root."
-    );
-  }
+function withProjectDir(ctx) {
   try {
-    const resolved = resolveProjectRoot(projectDirArg);
+    const resolved = resolveLockedProjectRoot(ctx.projectDir);
     return {
       ...ctx,
       projectDir: resolved.projectDir,
       requestedPath: resolved.requestedPath,
       markerKind: resolved.markerKind,
-      ...resolved.marker !== void 0 ? { projectMarker: resolved.marker } : {}
+      projectMarker: resolved.marker
     };
   } catch (error) {
     if (error instanceof ProjectRootError) {
@@ -2483,7 +2422,7 @@ function requireSiteFile(ctx) {
   if (state.kind === "absent") {
     throw new LocalGuidanceError(
       "not_found",
-      `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.`
+      `No .sakupa/site.json found in ${ctx.projectDir} \u2014 this directory has no Sakupa site binding. If you meant to manage a different existing site, open that project as the AI tool workspace and start its Sakupa MCP process there. 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;
@@ -2549,12 +2488,12 @@ ${JSON.stringify(obj, null, 2)}`;
     nextActions: []
   });
 }
-var planEnum = z3.enum(["water", "personal", "share", "business"]);
-var severityEnum = z3.enum(["low", "medium", "high", "critical"]);
+var planEnum = z2.enum(["water", "personal", "share", "business"]);
+var severityEnum = z2.enum(["low", "medium", "high", "critical"]);
 function planCatalog() {
   return TIER_ORDER.map((p) => `${p} JPY ${tierPriceJpy(p)}/month`).join(", ");
 }
-var ticketCategoryEnum = z3.enum([
+var ticketCategoryEnum = z2.enum([
   "billing",
   "payment",
   "refund_review",
@@ -2674,7 +2613,7 @@ function freeSiteCreationBarrier(apiBaseUrl) {
 
 ` + recent.map((r) => `- ${r.url} (project: ${r.projectDir}, created: ${r.createdAt})`).join("\n") + `
 
-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.
+How a slot frees up: (1) delete one of the sites above \u2014 run delete with that site opened as the AI tool's current project; 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 },
@@ -2690,13 +2629,12 @@ function registerTools(server, baseCtx) {
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: true, destructiveHint: false, openWorldHint: false },
       inputSchema: {
-        projectDir: projectDirInput,
-        outputDir: z3.string().optional().describe("Output directory relative to the project root (overrides detection).")
+        outputDir: z2.string().optional().describe("Output directory relative to the project root (overrides detection).")
       }
     },
     async (args) => {
       try {
-        const ctx = withProjectDir(baseCtx, args.projectDir);
+        const ctx = withProjectDir(baseCtx);
         const analysis = await analyzeProject(ctx.projectDir, {
           ...args.outputDir !== void 0 ? { outputDir: args.outputDir } : {}
         });
@@ -2714,32 +2652,31 @@ Next action: ${analysis.suggestedNextAction}`,
   server.registerTool(
     "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 first and refuses to upload source projects, secrets, .env files, archives, media or server code. projectDir may point anywhere inside a project already initialized with \`npx -y @sakupa/mcp@latest init\`; Sakupa resolves its own marker upward and stores credentials only at that root. outputDir is a separate REQUIRED relative path supplied from the current project inspection. Never uploads anything when 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. The MCP process is locked to the current directory initialized by \`npx -y @sakupa/mcp@latest init\`; no tool argument can change that root. outputDir is a separate REQUIRED relative path supplied from the current project inspection. Never uploads anything when analysis says the project is not deployable.`,
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
       inputSchema: {
-        projectDir: projectDirInput,
-        outputDir: z3.string().min(1).describe(
-          'REQUIRED: exact publish directory relative to the initialized project root, supplied by the AI after inspecting this project (for example ".", "dist", "html", or any custom build directory). Sakupa resolves projectDir upward before applying this path.'
+        outputDir: z2.string().min(1).describe(
+          'REQUIRED: exact publish directory relative to the initialized project root, supplied by the AI after inspecting this project (for example ".", "dist", "html", or any custom build directory). Sakupa applies it only inside the cwd-locked project.'
         ),
-        outputDirChangeConfirmed: z3.boolean().optional().describe(
+        outputDirChangeConfirmed: z2.boolean().optional().describe(
           "Required only when changing the previously successful publish directory. Confirm only after showing the old and new directories to the user."
         ),
-        spaFallback: z3.boolean().optional().describe(
+        spaFallback: z2.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: z3.boolean().optional().describe(
+        publicConfirmed: z2.boolean().optional().describe(
           "Required only for the first deployment: user explicitly confirmed creation of a public 24-hour URL."
         ),
-        subprojectConfirmed: z3.boolean().optional().describe(
+        subprojectConfirmed: z2.boolean().optional().describe(
           "Deprecated compatibility field. Project independence is established only by `sakupa-mcp init`, never inferred from package.json or folder names."
         ),
-        lang: z3.string().optional().describe("Site language override (en | ja | zh-CN); defaults to the html lang.")
+        lang: z2.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 ctx = withProjectDir(baseCtx);
         const analysis = await analyzeProject(ctx.projectDir, { outputDir: args.outputDir });
         if (!analysis.deployable || !analysis.files) {
           return notDeployableResult(analysis);
@@ -2791,7 +2728,7 @@ Next action: ${analysis.suggestedNextAction}`,
           if (outputSiteState.kind === "corrupted") {
             return text(
               "output_site_file_corrupted",
-              `A misplaced .sakupa/site.json exists in output directory ${outputAbs}, but it is damaged: ${outputSiteState.problem}. Repair that file before retrying with projectDir: ${ctx.projectDir}. Nothing was deployed and no site was created.`,
+              `A misplaced .sakupa/site.json exists in output directory ${outputAbs}, but it is damaged: ${outputSiteState.problem}. Repair that file before retrying with the MCP still opened at ${ctx.projectDir}. Nothing was deployed and no site was created.`,
               { projectRoot: ctx.projectDir, outputDir: analysis.recommendedOutputDir },
               "blocked"
             );
@@ -2911,7 +2848,6 @@ ${JSON.stringify(finalized2.warnings, null, 2)}` : ""),
         const { uploaded, finalized } = update;
         writeSiteFile(ctx.projectDir, { ...existing, url: finalized.url });
         if (credentialRelocatedFrom !== null) deleteSiteFile(credentialRelocatedFrom);
-        if (ctx.projectMarker === void 0) initializeProject(ctx.projectDir);
         updateProjectOutputDir(ctx.projectDir, effectiveOutputDir);
         noteSiteMode(existing.siteId, finalized.mode);
         return text(
@@ -2951,11 +2887,11 @@ ${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: { projectDir: projectDirInput }
+      inputSchema: {}
     },
-    async (args) => {
+    async () => {
       try {
-        const ctx = withProjectDir(baseCtx, args.projectDir);
+        const ctx = withProjectDir(baseCtx);
         const site = requireSiteFile(ctx);
         const res = await ctx.client.refreshSite(site.siteId, site.credential);
         return text(
@@ -2975,11 +2911,11 @@ 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, custom domains, size, last deployment and warnings. For a paid site this tool also automatically returns the complete authoritative billing snapshot; users never need to know or name a separate billing tool to get accurate subscription information.",
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: true, destructiveHint: false, openWorldHint: true },
-      inputSchema: { projectDir: projectDirInput }
+      inputSchema: {}
     },
-    async (args) => {
+    async () => {
       try {
-        const ctx = withProjectDir(baseCtx, args.projectDir);
+        const ctx = withProjectDir(baseCtx);
         const site = requireSiteFile(ctx);
         const res = await ctx.client.getSiteStatus(site.siteId, site.credential);
         noteSiteMode(res.siteId, res.mode);
@@ -3007,7 +2943,6 @@ 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)."
         )
@@ -3015,7 +2950,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 ctx = withProjectDir(baseCtx);
         const site = requireSiteFile(ctx);
         const res = await ctx.client.createPlanCheckout(
           {
@@ -3054,17 +2989,16 @@ 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: {
-        projectDir: projectDirInput,
-        action: z3.enum(["start", "status"]),
-        hostname: z3.string().optional().describe("Required for start."),
-        verificationId: z3.string().optional().describe(
+        action: z2.enum(["start", "status"]),
+        hostname: z2.string().optional().describe("Required for start."),
+        verificationId: z2.string().optional().describe(
           "Optional for status: when omitted, the server finds this site's latest binding verification \u2014 a NEW session can resume without it."
         )
       }
     },
     async (args) => {
       try {
-        const ctx = withProjectDir(baseCtx, args.projectDir);
+        const ctx = withProjectDir(baseCtx);
         const site = requireSiteFile(ctx);
         if (args.action === "status") {
           const res2 = args.verificationId ? await ctx.client.checkVerification(args.verificationId, site.credential) : await ctx.client.checkVerification("latest", site.credential, site.siteId);
@@ -3169,11 +3103,11 @@ When the user says the TXT is set, run bind "status". It verifies ownership and
       description: "Return the sole authoritative source for this site's hosting subscription: current plan, next renewal plan or cancellation, effective time, payment state, current paid entitlement, 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: { projectDir: projectDirInput }
+      inputSchema: {}
     },
-    async (args) => {
+    async () => {
       try {
-        const ctx = withProjectDir(baseCtx, args.projectDir);
+        const ctx = withProjectDir(baseCtx);
         const site = requireSiteFile(ctx);
         const res = await ctx.client.getBillingStatus(site.siteId, site.credential);
         noteSiteMode(res.siteId, res.mode);
@@ -3211,14 +3145,13 @@ Full status:`, res);
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
       inputSchema: {
-        projectDir: projectDirInput.optional(),
-        scope: z3.enum(["site", "public_recovery"])
+        scope: z2.enum(["site", "public_recovery"])
       }
     },
     async (args) => {
       try {
         if (args.scope === "site") {
-          const ctx = withProjectDir(baseCtx, args.projectDir);
+          const ctx = withProjectDir(baseCtx);
           const site = requireSiteFile(ctx);
           const res2 = await ctx.client.createBillingPortal(site.siteId, site.credential);
           return structuredToolResult({
@@ -3268,19 +3201,18 @@ Full status:`, res);
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: false, destructiveHint: true, openWorldHint: true },
       inputSchema: {
-        projectDir: projectDirInput,
-        action: z3.enum(["start", "status", "complete", "download"]),
-        hostname: z3.string().optional().describe("Required for start."),
-        verificationId: z3.string().optional().describe("For status or complete; inferred from local recovery state when omitted."),
-        outputDir: z3.string().optional().describe(
+        action: z2.enum(["start", "status", "complete", "download"]),
+        hostname: z2.string().optional().describe("Required for start."),
+        verificationId: z2.string().optional().describe("For status or complete; inferred from local recovery state when omitted."),
+        outputDir: z2.string().optional().describe(
           "REQUIRED for complete/download: exact extraction directory relative to the initialized project root. Inspect the current project; Sakupa never guesses a name."
         ),
-        preserveExistingCredentials: z3.boolean().optional().describe("Explicitly keep old local credentials working (default: revoke them all).")
+        preserveExistingCredentials: z2.boolean().optional().describe("Explicitly keep old local credentials working (default: revoke them all).")
       }
     },
     async (args) => {
       try {
-        const ctx = withProjectDir(baseCtx, args.projectDir);
+        const ctx = withProjectDir(baseCtx);
         if ((args.action === "complete" || args.action === "download") && args.outputDir === void 0) {
           throw new LocalGuidanceError(
             "invalid_request",
@@ -3353,7 +3285,6 @@ No DNS verification was started or repeated.`,
                 {
                   tool: "recover",
                   arguments: {
-                    projectDir: ctx.projectDir,
                     action: "download",
                     ...args.outputDir !== void 0 ? { outputDir: args.outputDir } : {}
                   },
@@ -3380,7 +3311,6 @@ No DNS verification was started or repeated.`,
                 {
                   tool: "recover",
                   arguments: {
-                    projectDir: ctx.projectDir,
                     action: "status",
                     verificationId: pending2.verificationId
                   },
@@ -3453,7 +3383,6 @@ After the DNS record resolves, re-run recover with verificationId: "${res2.verif
               {
                 tool: "recover",
                 arguments: {
-                  projectDir: ctx.projectDir,
                   action: "download",
                   ...args.outputDir !== void 0 ? { outputDir: args.outputDir } : {}
                 },
@@ -3488,7 +3417,6 @@ After the DNS record resolves, re-run recover with verificationId: "${res2.verif
               {
                 tool: "recover",
                 arguments: {
-                  projectDir: ctx.projectDir,
                   action: "complete",
                   verificationId,
                   ...args.outputDir !== void 0 ? { outputDir: args.outputDir } : {}
@@ -3565,7 +3493,6 @@ Files: ${extracted.fileCount}; bytes: ${extracted.totalBytes}
               {
                 tool: "recover",
                 arguments: {
-                  projectDir: ctx.projectDir,
                   action: "download",
                   ...args.outputDir !== void 0 ? { outputDir: args.outputDir } : {}
                 },
@@ -3586,16 +3513,15 @@ Files: ${extracted.fileCount}; bytes: ${extracted.totalBytes}
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
       annotations: { readOnlyHint: false, destructiveHint: false, openWorldHint: true },
       inputSchema: {
-        projectDir: projectDirInput,
         category: ticketCategoryEnum,
-        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.")
+        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.")
       }
     },
     async (args) => {
       try {
-        const ctx = withProjectDir(baseCtx, args.projectDir);
+        const ctx = withProjectDir(baseCtx);
         const site = requireSiteFile(ctx);
         const res = await ctx.client.createTicket(site.credential, {
           siteId: site.siteId,
@@ -3621,26 +3547,25 @@ Files: ${extracted.fileCount}; bytes: ${extracted.totalBytes}
       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".'),
-        errorCode: z3.string().optional(),
-        errorMessage: z3.string().optional().describe("Sanitized error message (no secrets)."),
-        requestId: z3.string().optional(),
-        deploymentId: z3.string().optional(),
+        toolName: z2.string().describe('The Sakupa tool that failed, e.g. "deploy".'),
+        errorCode: z2.string().optional(),
+        errorMessage: z2.string().optional().describe("Sanitized error message (no secrets)."),
+        requestId: z2.string().optional(),
+        deploymentId: z2.string().optional(),
         severity: severityEnum.optional(),
-        description: z3.string().optional().describe("What happened, in the user's words (no secrets)."),
-        agentContext: z3.string().optional().describe(
+        description: z2.string().optional().describe("What happened, in the user's words (no secrets)."),
+        agentContext: z2.string().optional().describe(
           "YOUR OWN factual account of the session as the AI: which tools you called, what they returned, expected vs actual. Write it yourself from your observations \u2014 never ask the user to compose it, and do not read it back to them; it travels alongside the user's description as a second witness. No secrets, no file contents."
         ),
-        contactEmail: z3.string().optional().describe(
+        contactEmail: z2.string().optional().describe(
           "OPTIONAL. Before submitting, ask the user ONCE whether they want to leave a contact for follow-up. Omit entirely if they decline \u2014 never require it."
         ),
-        confirmSubmit: z3.boolean().optional().describe("User reviewed the report payload and approved submission.")
+        confirmSubmit: z2.boolean().optional().describe("User reviewed the report payload and approved submission.")
       }
     },
     async (args) => {
       try {
-        const ctx = withProjectDir(baseCtx, args.projectDir);
+        const ctx = withProjectDir(baseCtx);
         const siteState = loadSiteFile(ctx.projectDir);
         const site = siteState.kind === "ok" ? siteState.file : null;
         const diagnostics = {
@@ -3687,7 +3612,7 @@ Summary: ${res.sanitizedSummary}`,
 }
 
 // src/tools/billing.ts
-import { z as z4 } from "zod";
+import { z as z3 } from "zod";
 function registerBillingTools(server, baseCtx) {
   server.registerTool(
     "plans",
@@ -3718,15 +3643,14 @@ function registerBillingTools(server, baseCtx) {
     {
       description: "Create one Stripe-hosted subscription-management link. The user chooses the plan or period-end cancellation on Stripe; Sakupa never infers intent from the conversation. Creating the link does not change billing.",
       inputSchema: {
-        projectDir: projectDirInput,
-        operationId: z4.string().min(1)
+        operationId: z3.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 ctx = withProjectDir(baseCtx);
         const site = requireSiteFile(ctx);
         const result = await ctx.client.changeSubscriptionPlan(site.credential, {
           siteId: site.siteId,
@@ -3756,21 +3680,21 @@ function registerBillingTools(server, baseCtx) {
 
 // src/tools/lifecycle.ts
 import { randomUUID as randomUUID3 } from "node:crypto";
-import { z as z5 } from "zod";
-var deleteConfirmation = z5.object({
-  siteId: z5.string().min(1),
-  expectedSiteUpdatedAt: z5.string().datetime(),
-  expectedStatus: z5.enum(["active", "expired", "deleted"]),
-  expectedMode: z5.enum(["free", "paid"]),
-  expectedServingMode: z5.enum(["normal", "over_limit_notice", "risk_notice", "stopped"]),
-  expectedShortId: z5.string().optional(),
-  expectedSubscriptionStatus: z5.enum(["incomplete", "active", "past_due", "canceled"]).optional(),
-  expectedPlan: z5.enum(["water", "personal", "share", "business"]).optional(),
-  expectedCancelAtPeriodEnd: z5.boolean().optional(),
-  expectedCurrentPeriodEnd: z5.string().datetime().optional(),
-  expectedLastDeploymentId: z5.string().optional(),
-  expectedBoundHostnames: z5.array(z5.string()),
-  acknowledge: z5.literal("delete_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_and_cancel_renewal")
 });
 function registerLifecycleTools(server, baseCtx) {
   server.registerTool(
@@ -3778,9 +3702,8 @@ function registerLifecycleTools(server, baseCtx) {
     {
       description: "Preview or execute deletion of this Sakupa site. Execution requires an exact server-validated confirmation bound to the current site state. Paid sites must first cancel renewal through portal and return to free mode. For a temporary pause, publish a pause notice as index.html with deploy instead of deleting the site.",
       inputSchema: {
-        projectDir: projectDirInput,
-        action: z5.enum(["preview", "confirm"]),
-        operationId: z5.string().min(1).optional(),
+        action: z4.enum(["preview", "confirm"]),
+        operationId: z4.string().min(1).optional(),
         confirmation: deleteConfirmation.optional()
       },
       outputSchema: STRUCTURED_TOOL_OUTPUT_SCHEMA,
@@ -3788,7 +3711,7 @@ function registerLifecycleTools(server, baseCtx) {
     },
     async (args) => {
       try {
-        const ctx = withProjectDir(baseCtx, args.projectDir);
+        const ctx = withProjectDir(baseCtx);
         const site = requireSiteFile(ctx);
         const operationId = args.operationId ?? randomUUID3();
         if (args.action === "preview") {
@@ -3986,21 +3909,21 @@ Workflow:
    sanitized diagnostic report after the user explicitly confirms it.
 
 Project directory contract: before the first deploy or a new recovery, initialize the intended
-project root once with "npx -y @sakupa/mcp@latest init"; this creates a non-secret
-.sakupa/project.json marker after the user confirms the canonical path. ONE initialized root =
-ONE site. Project-bound tools require projectDir, but it is only a path locator: it may point to
-the root or any existing child directory. The site-independent plans tool and public_recovery
-portal do not require a local project. Sakupa resolves upward to its own marker and stores
-.sakupa/site.json only at that authoritative root; it never uses package.json, .git, framework
-names or output-directory names to guess. For deploy, ALWAYS pass outputDir separately as the
-exact path RELATIVE to the resolved root (use "." when publishing the root); outputDir is
+project once by running "npx -y @sakupa/mcp@latest init" with NO path argument from the AI
+tool's current project directory. This immediately creates the non-secret .sakupa/project.json
+there. ONE MCP process = ONE cwd-locked project = ONE site. Site tools do not accept projectDir
+and cannot select another root; plans and public_recovery portal remain project-independent.
+Sakupa stores .sakupa/site.json and recovery state only in the locked directory; it never uses
+package.json, .git, framework names or output-directory names to guess. For deploy, ALWAYS pass
+outputDir separately as the exact path RELATIVE to the locked directory (use "." when publishing
+the root); outputDir is
 required and may have ANY name, so inspect the current project. If it differs from the last
 successful publish directory, show the old and new paths and obtain explicit confirmation
 before retrying with outputDirChangeConfirmed: true.
 After every deploy, TELL the user which environment it went to (deploy results carry an
 Explicit Environment line: TEST vs PRODUCTION). analyze, deploy, status,
 refresh and delete echo
-the directory they acted on \u2014 verify it matches the user's active project.
+the cwd-locked directory they acted on.
 
 When the same operation fails twice in a row, or the user is clearly stuck or
 frustrated, proactively offer report: it files the problem into Sakupa's ticket and
@@ -4038,7 +3961,11 @@ function createSakupaMcpServer(opts) {
     { name: "sakupa", version: MCP_VERSION },
     { instructions: instructionsFor(previewHostPatternFor(opts.apiBaseUrl)) }
   );
-  const ctx = { client, apiBaseUrl: opts.apiBaseUrl };
+  const ctx = {
+    client,
+    apiBaseUrl: opts.apiBaseUrl,
+    projectDir: canonicalProjectDirectory(opts.projectDir ?? process.cwd())
+  };
   registerTools(server, ctx);
   registerBillingTools(server, ctx);
   registerLifecycleTools(server, ctx);
@@ -4049,28 +3976,22 @@ function createSakupaMcpServer(opts) {
 async function main() {
   const argv = process.argv.slice(2);
   if (argv[0] === "init") {
-    const readline = createInterface({ input: stdin, output: stdout });
-    try {
-      const result = await runInitCommand(argv.slice(1), {
-        write: (message) => stdout.write(`${message}
-`),
-        confirm: async (question) => /^(?:y|yes)$/i.test((await readline.question(question)).trim())
-      });
-      process.exitCode = result.exitCode;
-      return;
-    } finally {
-      readline.close();
-    }
+    const result = await runInitCommand(argv.slice(1), {
+      write: (message) => stdout.write(`${message}
+`)
+    });
+    process.exitCode = result.exitCode;
+    return;
   }
   if (argv.length > 0) {
-    throw new Error("Usage: sakupa-mcp [init [project-directory]]");
+    throw new Error("Usage: sakupa-mcp [init]");
   }
   const config = loadMcpRuntimeConfig();
   const server = createSakupaMcpServer(config);
   const transport = new StdioServerTransport();
   await server.connect(transport);
   console.error(
-    `[sakupa-mcp] v${MCP_VERSION} connected (api: ${config.apiBaseUrl}; projectDir resolves through Sakupa markers)`
+    `[sakupa-mcp] v${MCP_VERSION} connected (api: ${config.apiBaseUrl}; project: ${process.cwd()})`
   );
 }
 main().catch((err2) => {