deepspace 0.30.0 → 0.30.2

package/dist/cli.js

@@ -706,6 +706,9 @@ var INVALID_URLS = {
 function appDomainForEnv(env) {
   return env === "production" ? "app.space" : env === "staging" ? "spacestest.com" : null;
 }
+function platformDomainForEnv(env) {
+  return env === "production" ? "deep.space" : env === "staging" ? "deepspacesites.com" : null;
+}
 var PLATFORM_URLS = DEEPSPACE_ENV === "production" ? PROD_URLS : DEEPSPACE_ENV === "staging" ? STAGING_URLS : INVALID_URLS;
 var PLANE_URLS = {
   production: PROD_URLS,
@@ -11230,10 +11233,13 @@ function normalizeAgentTargetOrigin(value, policy) {
     return policy.allowLoopback && ["http:", "https:"].includes(url.protocol) ? url.origin : null;
   }
   if (url.protocol !== "https:" || url.port) return null;
-  if (policy.appDomain.toLowerCase() === PRODUCTION_APP_DOMAIN && PRODUCTION_OFFICIAL_AGENT_ORIGINS.includes(url.origin)) {
+  const appDomain = policy.appDomain.toLowerCase();
+  const platformDomain = policy.platformDomain?.toLowerCase();
+  const officialAdminOrigin = platformDomain ? `https://admin.${platformDomain}` : appDomain === PRODUCTION_APP_DOMAIN ? PRODUCTION_OFFICIAL_AGENT_ORIGINS[0] : null;
+  if (url.origin === officialAdminOrigin) {
     return url.origin;
   }
-  const suffix = `.${policy.appDomain.toLowerCase()}`;
+  const suffix = `.${appDomain}`;
   if (!hostname.endsWith(suffix)) return null;
   const label = hostname.slice(0, -suffix.length);
   return !label.includes(".") && validateAppName(label).valid ? url.origin : null;
@@ -11297,7 +11303,8 @@ function resolveAgentTarget(app2, plane = DEEPSPACE_ENV) {
   if (typeof app2 !== "string" || !app2)
     badApp("App must be a canonical app name or canonical app URL.");
   const appDomain = appDomainForEnv(plane);
-  if (!appDomain) badApp("The selected DeepSpace environment is invalid.");
+  const platformDomain = platformDomainForEnv(plane);
+  if (!appDomain || !platformDomain) badApp("The selected DeepSpace environment is invalid.");
   if (app2.toLowerCase() === "localhost") {
     badApp("Pass an explicit loopback URL for local development (e.g. 'http://localhost:8787').");
   }
@@ -11306,6 +11313,7 @@ function resolveAgentTarget(app2, plane = DEEPSPACE_ENV) {
   }
   const url = normalizeAgentTargetOrigin(app2, {
     appDomain,
+    platformDomain,
     allowLoopback: true
   });
   if (!url) {
@@ -13904,24 +13912,6 @@ async function loadWorkspaceLines(appDir, token, api4, trunkOid) {
     return /* @__PURE__ */ new Map();
   }
 }
-async function listOverlaps(appId, token, api4, views) {
-  const appDir = findAppDir();
-  if (!appDir || readAppId(appDir) !== appId) return /* @__PURE__ */ new Map();
-  try {
-    assertSyncableRepo(appDir);
-    ensureSpaceRemote(appDir, appId);
-    const refs = await api4.getRefs().catch(() => null);
-    try {
-      fetchTrunk(appDir, token, refs?.head ?? null);
-    } catch {
-    }
-    fetchPeerWorkspaceRefs(appDir, token);
-    const lines = changedPathsByWorkspace(appDir, views, localTrunkOid(appDir, refs));
-    return new Map([...lines].map(([id, line]) => [id, overlapsWith(line.paths, lines, id)]));
-  } catch {
-    return /* @__PURE__ */ new Map();
-  }
-}
 function printOverlaps(overlaps, json) {
   if (json) return;
   for (const overlap of overlaps) {
@@ -14869,12 +14859,6 @@ var syncWorkspaceCommand = defineDeepspaceCommand({
 
 // src/cli/commands/workspace/list.ts
 import * as p28 from "@clack/prompts";
-function withWorkspaceOverlaps(views, overlapsById) {
-  return views.map((view) => ({
-    ...view,
-    overlaps: overlapsById.get(view.workspace.id) ?? []
-  }));
-}
 var listWorkspacesCommand = defineDeepspaceCommand({
   meta: { name: "list", description: "List workspaces on the cloud repo" },
   args: {
@@ -14901,31 +14885,17 @@ var listWorkspacesCommand = defineDeepspaceCommand({
       }
       return { data: { workspaces: views, truncated: truncated === true } };
     }
-    spinner2?.message("Checking workspace overlaps\u2026");
-    const overlapsPromise = listOverlaps(appId, token, api4, views);
     if (args.json) {
-      return {
-        data: {
-          workspaces: withWorkspaceOverlaps(views, await overlapsPromise),
-          truncated: truncated === true
-        }
-      };
+      return { data: { workspaces: views, truncated: truncated === true } };
     }
-    const [actors, overlapsById] = await Promise.all([actorLabels(token, appId), overlapsPromise]);
-    const workspaces = withWorkspaceOverlaps(views, overlapsById);
+    const actors = await actorLabels(token, appId);
     spinner2?.stop(`Loaded ${views.length} ${views.length === 1 ? "workspace" : "workspaces"}.`);
-    for (const view of workspaces) {
+    for (const view of views) {
       const workspace = view.workspace;
-      const overlaps = view.overlaps;
-      const marker = workspace.status === "active" ? overlaps.length > 0 ? "\u26A0" : " " : workspace.status === "landed" ? "\u2713" : "\u2717";
+      const marker = workspace.status === "active" ? " " : workspace.status === "landed" ? "\u2713" : "\u2717";
       console.log(
         `${marker} ${workspace.id}  ${workspace.status}  \u2191${formatCount(view.aheadOfBase)} \u2193${formatCount(view.behindTrunk)}  ${actors.get(workspace.createdBy) ?? workspace.createdBy}  ${workspace.updatedAt}  ${workspace.task}`
       );
-      for (const overlap of overlaps) {
-        console.log(
-          `    overlaps ${overlap.workspaceId}: ${overlap.paths.slice(0, 3).join(", ")}${overlap.paths.length + overlap.morePaths > 3 ? ` (+${overlap.paths.length + overlap.morePaths - 3} more)` : ""}`
-        );
-      }
     }
     if (truncated) {
       p28.log.warn(
@@ -14933,7 +14903,7 @@ var listWorkspacesCommand = defineDeepspaceCommand({
       );
     }
     p28.log.info("\u2191 commits ahead of base \xB7 \u2193 trunk commits since base (staleness)");
-    return { data: { workspaces, truncated: truncated === true } };
+    return { data: { workspaces: views, truncated: truncated === true } };
   }
 });
 
@@ -16021,7 +15991,7 @@ import { join as join28, resolve as resolve22 } from "path";
 // package.json
 var package_default = {
   name: "deepspace",
-  version: "0.30.0",
+  version: "0.30.2",
   engines: {
     node: ">=22.15.0 <23 || >=24 <25 || >=26 <27"
   },