@lasso-ai/cli 1.2.2 → 1.2.4

package/dist/cli/project.d.ts

@@ -5,6 +5,7 @@ export interface CollabConfig {
     version?: string;
     realtimeUrl: string;
     apiUrl: string;
+    serverUrl: string;
     registered: boolean;
     registeredAt?: string;
     claimed: boolean;
@@ -48,7 +49,7 @@ export declare function readProjectConfig(cwd: string): {
  * running). Only `{ "id": "proj_…", "domain": "….lasso" }` is stored — the API key
  * never touches this file.
  */
-export declare function initProject(cwd: string, fileEnv: Record<string, string>): Promise<InitResult>;
+export declare function initProject(cwd: string, fileEnv: Record<string, string>, forcedDomain?: string): Promise<InitResult>;
 /**
  * `lasso dev` — consumes `lasso.config.json`: authenticates with the API key, lets the
  * server resolve the key's workspace, validates the project belongs to it, and

package/dist/cli/project.js

@@ -187,11 +187,21 @@ function promptForApiKey() {
  * running). Only `{ "id": "proj_…", "domain": "….lasso" }` is stored — the API key
  * never touches this file.
  */
-async function initProject(cwd, fileEnv) {
+async function initProject(cwd, fileEnv, forcedDomain) {
     const realtimeUrl = realtimeUrlFrom(fileEnv).replace(/\/$/, "");
-    const apiUrl = `${realtimeUrl}/api/v1`;
+    const serverUrl = (0, auth_1.serverUrlFrom)(fileEnv).replace(/\/$/, "");
+    const collabApi = `${realtimeUrl}/api/v1`;
     const framework = (0, framework_1.detectFramework)(cwd);
     const { name, payload } = await buildProjectMetadata(cwd, framework);
+    const existingConfig = readProjectConfig(cwd);
+    if (existingConfig?.id) {
+        payload.id = existingConfig.id;
+        payload.projectId = existingConfig.id;
+    }
+    const registry = (0, registry_1.loadRegistry)();
+    const existingHost = (0, registry_1.findByDirectory)(registry, cwd);
+    const domain = forcedDomain || (existingConfig?.domain ? existingConfig.domain : (existingHost ? existingHost.domain : (0, registry_1.generateUniqueDomain)(cwd, registry)));
+    payload.domain = domain;
     let apiKey = resolveLassoApiKey(fileEnv);
     if (!apiKey)
         apiKey = (await promptForApiKey()) || "";
@@ -199,14 +209,28 @@ async function initProject(cwd, fileEnv) {
         return { ok: false, error: "No Lasso API key found. Set LASSO_API_KEY in your environment or paste it when prompted." };
     }
     try {
-        const response = await (0, auth_1.fetchWithTimeout)(`${apiUrl}/collab/projects/register`, {
-            method: "POST",
-            headers: {
-                "content-type": "application/json",
-                authorization: `Bearer ${apiKey}`,
-            },
-            body: JSON.stringify(payload),
-        });
+        let response;
+        try {
+            response = await (0, auth_1.fetchWithTimeout)(`${collabApi}/collab/projects/register`, {
+                method: "POST",
+                headers: {
+                    "content-type": "application/json",
+                    authorization: `Bearer ${apiKey}`,
+                },
+                body: JSON.stringify(payload),
+            });
+        }
+        catch {
+            // Fall back to main server if collab server unreachable
+            response = await (0, auth_1.fetchWithTimeout)(`${serverUrl}/api/v1/collab/projects/register`, {
+                method: "POST",
+                headers: {
+                    "content-type": "application/json",
+                    authorization: `Bearer ${apiKey}`,
+                },
+                body: JSON.stringify(payload),
+            });
+        }
         const body = (await response.json().catch(() => ({})));
         if (!response.ok) {
             if (response.status === 401) {
@@ -217,13 +241,10 @@ async function initProject(cwd, fileEnv) {
             }
             return { ok: false, error: body.message || `Project registration failed (${response.status}).` };
         }
-        const projectId = body.project?.id;
+        const projectId = body.project?.id || existingConfig?.id;
         if (!projectId) {
             return { ok: false, error: "The server did not return a project id." };
         }
-        const registry = (0, registry_1.loadRegistry)();
-        const existing = (0, registry_1.findByDirectory)(registry, cwd);
-        const domain = existing ? existing.domain : (0, registry_1.generateUniqueDomain)(cwd, registry);
         await (0, client_1.registerWithHost)(domain, cwd, projectId, (0, paths_1.hostProxyPort)(fileEnv));
         if (framework === "next") {
             const injected = (0, next_config_1.ensureNextAllowedDevOrigin)(cwd, domain);
@@ -254,12 +275,15 @@ async function initProject(cwd, fileEnv) {
  */
 async function resolveCollabSession(cwd, fileEnv, projectId) {
     const realtimeUrl = realtimeUrlFrom(fileEnv).replace(/\/$/, "");
-    const apiUrl = `${realtimeUrl}/api/v1`;
+    const serverUrl = (0, auth_1.serverUrlFrom)(fileEnv).replace(/\/$/, "");
+    const collabApi = `${realtimeUrl}/api/v1`;
+    const apiUrl = `${serverUrl}/api/v1`;
     const config = {
         projectId,
         name: "",
         version: "",
         realtimeUrl,
+        serverUrl,
         apiUrl,
         registered: false,
         claimed: false,
@@ -270,16 +294,34 @@ async function resolveCollabSession(cwd, fileEnv, projectId) {
         return config;
     }
     try {
-        const response = await (0, auth_1.fetchWithTimeout)(`${apiUrl}/collab/projects/${encodeURIComponent(projectId)}/session`, {
-            method: "POST",
-            headers: { authorization: `Bearer ${apiKey}` },
-        });
-        if (!response.ok) {
-            const reason = response.status === 401
+        let response = null;
+        try {
+            response = await (0, auth_1.fetchWithTimeout)(`${collabApi}/collab/projects/${encodeURIComponent(projectId)}/session`, {
+                method: "POST",
+                headers: { authorization: `Bearer ${apiKey}` },
+            });
+        }
+        catch {
+            // Collab server unreachable, will fall back below
+        }
+        if (!response || (!response.ok && (response.status === 502 || response.status === 503 || response.status === 504 || response.status === 404))) {
+            try {
+                response = await (0, auth_1.fetchWithTimeout)(`${serverUrl}/api/v1/collab/projects/${encodeURIComponent(projectId)}/session`, {
+                    method: "POST",
+                    headers: { authorization: `Bearer ${apiKey}` },
+                });
+            }
+            catch {
+                // Both unreachable
+            }
+        }
+        if (!response || !response.ok) {
+            const status = response?.status;
+            const reason = status === 401
                 ? "Your Lasso API key is invalid or inactive."
-                : response.status === 403
+                : status === 403
                     ? "This project belongs to another workspace."
-                    : `The server rejected the project session (${response.status}).`;
+                    : `The server rejected the project session (${status || "unreachable"}).`;
             console.warn(chalk_1.default.yellow("!") + ` Realtime collaboration unavailable: ${reason}`);
             return config;
         }
@@ -302,7 +344,7 @@ async function resolveCollabSession(cwd, fileEnv, projectId) {
     }
     catch (error) {
         const reason = error instanceof Error ? error.message : "request failed";
-        console.warn(chalk_1.default.yellow("!") + ` Realtime collaboration unavailable: cannot reach ${realtimeUrl} (${reason}).`);
+        console.warn(chalk_1.default.yellow("!") + ` Realtime collaboration unavailable: cannot reach server (${reason}).`);
         return config;
     }
 }