@sakupa/mcp 0.7.44 → 0.7.45

package/dist/bin.js

@@ -380,7 +380,7 @@ var FORBIDDEN_PATH_SEGMENTS = [
 var ALLOWED_HIDDEN_PATHS = [".well-known/"];
 
 // ../core/dist/domain/version.js
-var SAKUPA_MCP_VERSION = "0.7.44";
+var SAKUPA_MCP_VERSION = "0.7.45";
 
 // ../core/dist/domain/errors.js
 var HTTP_STATUS = {
@@ -810,8 +810,8 @@ var HttpApiClient = class {
       body: body?.slice(0, 200)
     });
   }
-  async registerDevice() {
-    return this.call("POST", "/v1/devices");
+  async registerDevice(req) {
+    return this.call("POST", "/v1/devices", { body: req });
   }
   async listDeviceFreeSites(deviceId, credential) {
     return this.call("GET", "/v1/devices/free-sites", {
@@ -984,7 +984,7 @@ var HttpApiClient = class {
 };
 
 // src/tools/definitions.ts
-import { randomUUID as randomUUID5 } from "node:crypto";
+import { randomUUID as randomUUID6 } from "node:crypto";
 import { promises as fs2 } from "node:fs";
 import { join as join9, relative as relative3, resolve as resolve5, sep as sep4 } from "node:path";
 import { z as z2 } from "zod";
@@ -2318,6 +2318,7 @@ import {
   unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync4
 } from "node:fs";
+import { randomUUID as randomUUID3 } from "node:crypto";
 import { homedir as homedir3 } from "node:os";
 import { dirname as dirname4, join as join6 } from "node:path";
 var DEVICE_LOCK_STALE_MS = 3e4;
@@ -2327,10 +2328,22 @@ function deviceRegistryPath() {
   return join6(base, ".sakupa", "devices.json");
 }
 var deviceLockPath = () => join6(dirname4(deviceRegistryPath()), "devices.lock");
-function releaseDeviceLock(fd2) {
+function lockTokenAt(path) {
+  try {
+    const parsed = JSON.parse(readFileSync4(path, "utf8"));
+    return typeof parsed.token === "string" ? parsed.token : null;
+  } catch {
+    return null;
+  }
+}
+function ownsDeviceLock(lock) {
+  return lockTokenAt(deviceLockPath()) === lock.token;
+}
+function releaseDeviceLock(lock) {
   try {
-    closeSync(fd2);
+    closeSync(lock.fd);
   } finally {
+    if (!ownsDeviceLock(lock)) return;
     try {
       unlinkSync2(deviceLockPath());
     } catch {
@@ -2345,9 +2358,13 @@ async function acquireDeviceLock(apiBaseUrl) {
     const existing = loadDeviceBinding(apiBaseUrl);
     if (existing) return existing;
     try {
+      const token = randomUUID3();
       const fd2 = openSync(path, "wx", 384);
-      writeFileSync4(fd2, JSON.stringify({ pid: process.pid, createdAt: (/* @__PURE__ */ new Date()).toISOString() }));
-      return fd2;
+      writeFileSync4(
+        fd2,
+        JSON.stringify({ token, pid: process.pid, createdAt: (/* @__PURE__ */ new Date()).toISOString() })
+      );
+      return { fd: fd2, token };
     } catch {
       try {
         if (Date.now() - statSync2(path).mtimeMs >= DEVICE_LOCK_STALE_MS) {
@@ -2368,13 +2385,16 @@ async function acquireDeviceLock(apiBaseUrl) {
 }
 function readRegistry() {
   const path = deviceRegistryPath();
-  if (!existsSync5(path)) return { schemaVersion: 1, environments: {} };
+  if (!existsSync5(path)) {
+    return { schemaVersion: 1, environments: {}, pendingRegistrations: {} };
+  }
   try {
     const parsed = JSON.parse(readFileSync4(path, "utf8"));
     if (parsed.schemaVersion !== 1 || !parsed.environments || typeof parsed.environments !== "object") {
       throw new Error("unsupported device registry schema");
     }
-    return { schemaVersion: 1, environments: parsed.environments };
+    const pendingRegistrations = "pendingRegistrations" in parsed && parsed.pendingRegistrations && typeof parsed.pendingRegistrations === "object" ? parsed.pendingRegistrations : {};
+    return { schemaVersion: 1, environments: parsed.environments, pendingRegistrations };
   } catch (error) {
     throw new Error(
       `Sakupa device registry is unreadable at ${path}: ${error instanceof Error ? error.message : String(error)}. Run help; do not search old project directories.`
@@ -2403,19 +2423,38 @@ async function ensureDeviceBinding(client, apiBaseUrl) {
   const existing = loadDeviceBinding(apiBaseUrl);
   if (existing) return existing;
   const lock = await acquireDeviceLock(apiBaseUrl);
-  if (typeof lock !== "number") return lock;
+  if (!("fd" in lock)) return lock;
   try {
     const afterLock = loadDeviceBinding(apiBaseUrl);
     if (afterLock) return afterLock;
-    const created = await client.registerDevice();
-    const registry = readRegistry();
+    let registry = readRegistry();
+    let pending = registry.pendingRegistrations[apiBaseUrl];
+    if (!pending) {
+      pending = {
+        operationId: randomUUID3(),
+        deviceId: randomUUID3(),
+        credential: generateCredential(),
+        createdAt: (/* @__PURE__ */ new Date()).toISOString()
+      };
+      registry.pendingRegistrations[apiBaseUrl] = pending;
+      writeRegistry(registry);
+    }
+    const created = await client.registerDevice({
+      operationId: pending.operationId,
+      deviceId: pending.deviceId,
+      credential: pending.credential
+    });
     const binding = {
       deviceId: created.deviceId,
       credential: created.credential,
       createdAt: created.createdAt
     };
-    registry.environments[apiBaseUrl] = binding;
-    writeRegistry(registry);
+    if (ownsDeviceLock(lock)) {
+      registry = readRegistry();
+      registry.environments[apiBaseUrl] = binding;
+      delete registry.pendingRegistrations[apiBaseUrl];
+      writeRegistry(registry);
+    }
     return binding;
   } finally {
     releaseDeviceLock(lock);
@@ -2733,7 +2772,7 @@ import {
   rmSync as rmSync2,
   writeFileSync as writeFileSync6
 } from "node:fs";
-import { randomUUID as randomUUID3 } from "node:crypto";
+import { randomUUID as randomUUID4 } from "node:crypto";
 import { join as join8 } from "node:path";
 var ROTATION_FILE = "rotation.json";
 function credentialRotationPath(projectDir) {
@@ -2794,7 +2833,7 @@ function writeCredentialRotation(projectDir, file) {
   const directory = join8(projectDir, ".sakupa");
   mkdirSync6(directory, { recursive: true, mode: 448 });
   const target = credentialRotationPath(projectDir);
-  const temporary = join8(directory, `.rotation-${randomUUID3()}.tmp`);
+  const temporary = join8(directory, `.rotation-${randomUUID4()}.tmp`);
   writeFileSync6(temporary, `${JSON.stringify(file, null, 2)}
 `, {
     encoding: "utf8",
@@ -3193,7 +3232,7 @@ function structuredToolResult(envelope) {
 }
 
 // src/tools/context.ts
-import { randomUUID as randomUUID4 } from "node:crypto";
+import { randomUUID as randomUUID5 } from "node:crypto";
 var LocalGuidanceError = class extends SakupaError {
   constructor(code, message) {
     super(code, message);
@@ -3272,7 +3311,7 @@ function reportAuthorizationStore(ctx) {
   return store;
 }
 function issueReportAuthorization(ctx, failedTool) {
-  const token = randomUUID4();
+  const token = randomUUID5();
   reportAuthorizationStore(ctx).set(token, {
     failedTool,
     expiresAt: Date.now() + 10 * 60 * 1e3
@@ -3542,9 +3581,15 @@ function freeSiteCreationBarrier(sites, deployArguments) {
   });
 }
 async function discoverDeviceFreeSites(client, apiBaseUrl, device) {
+  let cloudSites = (await client.listDeviceFreeSites(device.deviceId, device.credential)).sites;
+  const alreadyOwned = new Set(cloudSites.map((site) => site.siteId));
+  let claimedAny = false;
   for (const record of listRecentCreations(Date.now(), apiBaseUrl)) {
     const state = loadSiteFile(record.projectDir);
     if (state.kind !== "ok" || state.file.siteId !== record.siteId) continue;
+    if (state.file.apiBaseUrl !== "" && state.file.apiBaseUrl !== apiBaseUrl) continue;
+    if (alreadyOwned.has(record.siteId)) continue;
+    const environmentIsKnown = record.apiBaseUrl === apiBaseUrl || state.file.apiBaseUrl === apiBaseUrl;
     try {
       await client.claimDeviceFreeSite(
         record.siteId,
@@ -3552,9 +3597,11 @@ async function discoverDeviceFreeSites(client, apiBaseUrl, device) {
         device.deviceId,
         device.credential
       );
+      claimedAny = true;
+      alreadyOwned.add(record.siteId);
     } catch (error) {
       if (isSakupaError(error) && ["not_found", "state_conflict"].includes(error.code)) {
-        removeCreation(record.siteId);
+        if (environmentIsKnown) removeCreation(record.siteId);
         continue;
       }
       if (!isSakupaError(error) || error.code !== "unauthorized") {
@@ -3562,7 +3609,10 @@ async function discoverDeviceFreeSites(client, apiBaseUrl, device) {
       }
     }
   }
-  return (await client.listDeviceFreeSites(device.deviceId, device.credential)).sites;
+  if (claimedAny) {
+    cloudSites = (await client.listDeviceFreeSites(device.deviceId, device.credential)).sites;
+  }
+  return cloudSites;
 }
 function outputDirectoryChain(projectRoot, outputAbs) {
   const rel = relative3(projectRoot, outputAbs);
@@ -4279,7 +4329,7 @@ NO content was uploaded or changed by this call \u2014 to publish new or edited
           {
             siteId: site.siteId,
             plan: args.plan,
-            idempotencyKey: randomUUID5()
+            idempotencyKey: randomUUID6()
           },
           site.credential
         );

package/dist/index.js

@@ -125,7 +125,7 @@ var FORBIDDEN_PATH_SEGMENTS = [
 var ALLOWED_HIDDEN_PATHS = [".well-known/"];
 
 // ../core/dist/domain/version.js
-var SAKUPA_MCP_VERSION = "0.7.44";
+var SAKUPA_MCP_VERSION = "0.7.45";
 
 // ../core/dist/domain/errors.js
 var HTTP_STATUS = {
@@ -736,8 +736,8 @@ var HttpApiClient = class {
       body: body?.slice(0, 200)
     });
   }
-  async registerDevice() {
-    return this.call("POST", "/v1/devices");
+  async registerDevice(req) {
+    return this.call("POST", "/v1/devices", { body: req });
   }
   async listDeviceFreeSites(deviceId, credential) {
     return this.call("GET", "/v1/devices/free-sites", {
@@ -2211,7 +2211,7 @@ function toolError(e) {
 }
 
 // src/tools/definitions.ts
-import { randomUUID as randomUUID5 } from "node:crypto";
+import { randomUUID as randomUUID6 } from "node:crypto";
 import { promises as fs2 } from "node:fs";
 import { join as join9, relative as relative3, resolve as resolve5, sep as sep4 } from "node:path";
 import { z as z2 } from "zod";
@@ -2939,6 +2939,7 @@ import {
   unlinkSync as unlinkSync2,
   writeFileSync as writeFileSync4
 } from "node:fs";
+import { randomUUID as randomUUID4 } from "node:crypto";
 import { homedir as homedir3 } from "node:os";
 import { dirname as dirname4, join as join6 } from "node:path";
 var DEVICE_LOCK_STALE_MS = 3e4;
@@ -2948,10 +2949,22 @@ function deviceRegistryPath() {
   return join6(base, ".sakupa", "devices.json");
 }
 var deviceLockPath = () => join6(dirname4(deviceRegistryPath()), "devices.lock");
-function releaseDeviceLock(fd2) {
+function lockTokenAt(path) {
+  try {
+    const parsed = JSON.parse(readFileSync4(path, "utf8"));
+    return typeof parsed.token === "string" ? parsed.token : null;
+  } catch {
+    return null;
+  }
+}
+function ownsDeviceLock(lock) {
+  return lockTokenAt(deviceLockPath()) === lock.token;
+}
+function releaseDeviceLock(lock) {
   try {
-    closeSync(fd2);
+    closeSync(lock.fd);
   } finally {
+    if (!ownsDeviceLock(lock)) return;
     try {
       unlinkSync2(deviceLockPath());
     } catch {
@@ -2966,9 +2979,13 @@ async function acquireDeviceLock(apiBaseUrl) {
     const existing = loadDeviceBinding(apiBaseUrl);
     if (existing) return existing;
     try {
+      const token = randomUUID4();
       const fd2 = openSync(path, "wx", 384);
-      writeFileSync4(fd2, JSON.stringify({ pid: process.pid, createdAt: (/* @__PURE__ */ new Date()).toISOString() }));
-      return fd2;
+      writeFileSync4(
+        fd2,
+        JSON.stringify({ token, pid: process.pid, createdAt: (/* @__PURE__ */ new Date()).toISOString() })
+      );
+      return { fd: fd2, token };
     } catch {
       try {
         if (Date.now() - statSync2(path).mtimeMs >= DEVICE_LOCK_STALE_MS) {
@@ -2989,13 +3006,16 @@ async function acquireDeviceLock(apiBaseUrl) {
 }
 function readRegistry() {
   const path = deviceRegistryPath();
-  if (!existsSync5(path)) return { schemaVersion: 1, environments: {} };
+  if (!existsSync5(path)) {
+    return { schemaVersion: 1, environments: {}, pendingRegistrations: {} };
+  }
   try {
     const parsed = JSON.parse(readFileSync4(path, "utf8"));
     if (parsed.schemaVersion !== 1 || !parsed.environments || typeof parsed.environments !== "object") {
       throw new Error("unsupported device registry schema");
     }
-    return { schemaVersion: 1, environments: parsed.environments };
+    const pendingRegistrations = "pendingRegistrations" in parsed && parsed.pendingRegistrations && typeof parsed.pendingRegistrations === "object" ? parsed.pendingRegistrations : {};
+    return { schemaVersion: 1, environments: parsed.environments, pendingRegistrations };
   } catch (error) {
     throw new Error(
       `Sakupa device registry is unreadable at ${path}: ${error instanceof Error ? error.message : String(error)}. Run help; do not search old project directories.`
@@ -3024,19 +3044,38 @@ async function ensureDeviceBinding(client, apiBaseUrl) {
   const existing = loadDeviceBinding(apiBaseUrl);
   if (existing) return existing;
   const lock = await acquireDeviceLock(apiBaseUrl);
-  if (typeof lock !== "number") return lock;
+  if (!("fd" in lock)) return lock;
   try {
     const afterLock = loadDeviceBinding(apiBaseUrl);
     if (afterLock) return afterLock;
-    const created = await client.registerDevice();
-    const registry = readRegistry();
+    let registry = readRegistry();
+    let pending = registry.pendingRegistrations[apiBaseUrl];
+    if (!pending) {
+      pending = {
+        operationId: randomUUID4(),
+        deviceId: randomUUID4(),
+        credential: generateCredential(),
+        createdAt: (/* @__PURE__ */ new Date()).toISOString()
+      };
+      registry.pendingRegistrations[apiBaseUrl] = pending;
+      writeRegistry(registry);
+    }
+    const created = await client.registerDevice({
+      operationId: pending.operationId,
+      deviceId: pending.deviceId,
+      credential: pending.credential
+    });
     const binding = {
       deviceId: created.deviceId,
       credential: created.credential,
       createdAt: created.createdAt
     };
-    registry.environments[apiBaseUrl] = binding;
-    writeRegistry(registry);
+    if (ownsDeviceLock(lock)) {
+      registry = readRegistry();
+      registry.environments[apiBaseUrl] = binding;
+      delete registry.pendingRegistrations[apiBaseUrl];
+      writeRegistry(registry);
+    }
     return binding;
   } finally {
     releaseDeviceLock(lock);
@@ -3321,7 +3360,7 @@ import {
   rmSync as rmSync2,
   writeFileSync as writeFileSync6
 } from "node:fs";
-import { randomUUID as randomUUID4 } from "node:crypto";
+import { randomUUID as randomUUID5 } from "node:crypto";
 import { join as join8 } from "node:path";
 var ROTATION_FILE = "rotation.json";
 function credentialRotationPath(projectDir) {
@@ -3382,7 +3421,7 @@ function writeCredentialRotation(projectDir, file) {
   const directory = join8(projectDir, ".sakupa");
   mkdirSync6(directory, { recursive: true, mode: 448 });
   const target = credentialRotationPath(projectDir);
-  const temporary = join8(directory, `.rotation-${randomUUID4()}.tmp`);
+  const temporary = join8(directory, `.rotation-${randomUUID5()}.tmp`);
   writeFileSync6(temporary, `${JSON.stringify(file, null, 2)}
 `, {
     encoding: "utf8",
@@ -3658,9 +3697,15 @@ function freeSiteCreationBarrier(sites, deployArguments) {
   });
 }
 async function discoverDeviceFreeSites(client, apiBaseUrl, device) {
+  let cloudSites = (await client.listDeviceFreeSites(device.deviceId, device.credential)).sites;
+  const alreadyOwned = new Set(cloudSites.map((site) => site.siteId));
+  let claimedAny = false;
   for (const record of listRecentCreations(Date.now(), apiBaseUrl)) {
     const state = loadSiteFile(record.projectDir);
     if (state.kind !== "ok" || state.file.siteId !== record.siteId) continue;
+    if (state.file.apiBaseUrl !== "" && state.file.apiBaseUrl !== apiBaseUrl) continue;
+    if (alreadyOwned.has(record.siteId)) continue;
+    const environmentIsKnown = record.apiBaseUrl === apiBaseUrl || state.file.apiBaseUrl === apiBaseUrl;
     try {
       await client.claimDeviceFreeSite(
         record.siteId,
@@ -3668,9 +3713,11 @@ async function discoverDeviceFreeSites(client, apiBaseUrl, device) {
         device.deviceId,
         device.credential
       );
+      claimedAny = true;
+      alreadyOwned.add(record.siteId);
     } catch (error) {
       if (isSakupaError(error) && ["not_found", "state_conflict"].includes(error.code)) {
-        removeCreation(record.siteId);
+        if (environmentIsKnown) removeCreation(record.siteId);
         continue;
       }
       if (!isSakupaError(error) || error.code !== "unauthorized") {
@@ -3678,7 +3725,10 @@ async function discoverDeviceFreeSites(client, apiBaseUrl, device) {
       }
     }
   }
-  return (await client.listDeviceFreeSites(device.deviceId, device.credential)).sites;
+  if (claimedAny) {
+    cloudSites = (await client.listDeviceFreeSites(device.deviceId, device.credential)).sites;
+  }
+  return cloudSites;
 }
 function outputDirectoryChain(projectRoot, outputAbs) {
   const rel = relative3(projectRoot, outputAbs);
@@ -4395,7 +4445,7 @@ NO content was uploaded or changed by this call \u2014 to publish new or edited
           {
             siteId: site.siteId,
             plan: args.plan,
-            idempotencyKey: randomUUID5()
+            idempotencyKey: randomUUID6()
           },
           site.credential
         );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sakupa/mcp",
-  "version": "0.7.44",
+  "version": "0.7.45",
   "description": "Sakupa MCP server: publish AI-made static sites from your AI tool. AI-made pages, live in seconds.",
   "type": "module",
   "main": "dist/index.js",