attio 0.0.1-experimental.20250325 → 0.0.1-experimental.20250326

package/lib/api/fetch-workspaces.js

@@ -1,24 +1,22 @@
 import { z } from "zod";
-import { APP } from "../env.js";
+import { API } from "../env.js";
 import { handleError } from "./handle-error.js";
 import { makeHeaders } from "./make-headers.js";
-const workspacesResponseSchema = z.array(z.object({
-    workspace: z.object({
-        id: z.string(),
-        name: z.string(),
-        slug: z.string(),
-    }),
-    membership: z.object({
-        access_level: z.enum(["admin", "member", "suspended"]),
-    }),
-}));
+const workspaceResponseSchema = z.object({
+    workspace_id: z.string().uuid(),
+    slug: z.string(),
+    name: z.string(),
+    logo_url: z.string().nullable(),
+});
+const listDevWorkspacesResponseSchema = z.object({
+    workspaces: z.array(workspaceResponseSchema),
+    accurate_at: z.string().datetime(),
+});
 export async function fetchWorkspaces({ token }) {
-    const response = await fetch(`${APP}/api/common/workspaces`, {
+    const response = await fetch(`${API}/dev-workspaces`, {
         method: "GET",
         headers: makeHeaders(token),
     });
     await handleError(response);
-    return workspacesResponseSchema
-        .parse(await response.json())
-        .map(({ workspace, membership }) => ({ ...workspace, ...membership }));
+    return listDevWorkspacesResponseSchema.parse(await response.json()).workspaces;
 }

package/lib/machines/actors.js

@@ -77,7 +77,7 @@ export const askWithTypedChoices = () => fromPromise(async ({ input, }) => await
 export const confirm = fromPromise(async ({ input }) => await confirmPrompt(input));
 export const fromCallbackWithErrorHandling = (callback) => fromCallback((...args) => {
     try {
-        callback(...args);
+        return callback(...args);
     }
     catch (error) {
         args[0].sendBack({
@@ -97,8 +97,7 @@ export const determineWorkspace = fromPromise(async ({ input: { token, workspace
             spinner.success(`Using workspace: ${workspace.name}`);
             return workspace;
         }
-        const hasAdmin = workspaces.some((workspace) => workspace.access_level === "admin");
-        if (!hasAdmin) {
+        if (workspaces.length === 0) {
             throw new Error(`You are not the admin of any workspaces. Either request permission from an existing workspace or create your own.
 
 ${APP}/welcome/workspace-details

package/lib/machines/dev-machine.js

@@ -100,7 +100,7 @@ export const devMachine = setup({
             const devVersion = await createDevVersion({
                 token: await ensureAuthed(),
                 appId: appInfo.app_id,
-                targetWorkspaceId: workspace.id,
+                targetWorkspaceId: workspace.workspace_id,
                 environmentVariables,
                 cliVersion: packageJson.version,
             });
@@ -178,7 +178,7 @@ export const devMachine = setup({
             fetchInstallation({
                 token,
                 appId: appInfo.app_id,
-                workspaceId: workspace.id,
+                workspaceId: workspace.workspace_id,
             }).then((installation) => {
                 if (installation) {
                     sendBack({ type: "Found Installation" });
@@ -193,7 +193,7 @@ export const devMachine = setup({
                 fetchInstallation({
                     token,
                     appId: appInfo.app_id,
-                    workspaceId: workspace.id,
+                    workspaceId: workspace.workspace_id,
                 }).then((installation) => {
                     if (installation) {
                         sendBack({ type: "Found Installation" });
@@ -354,7 +354,6 @@ export const devMachine = setup({
                                         },
                                         "clearJavaScriptErrors",
                                     ],
-                                    reenter: true,
                                 },
                                 "JavaScript Error": {
                                     target: "Watching",
@@ -396,7 +395,6 @@ export const devMachine = setup({
                             always: {
                                 target: "Uploading",
                                 guard: ({ context }) => Boolean(context.devVersion),
-                                reenter: true,
                             },
                         },
                     },
@@ -426,7 +424,6 @@ export const devMachine = setup({
                                 { type: "setDevVersion", params: ({ event }) => event },
                                 { type: "setTerminalTitle", params: ({ event }) => event },
                             ],
-                            reenter: true,
                         },
                         onError: {
                             target: "#Dev Machine.Error",
@@ -536,13 +533,8 @@ export const devMachine = setup({
                                 "60000": "Prompt to Install",
                             },
                         },
-                        "Waiting for App ID": {
-                            on: {
-                                "Upload Prepared": "Looking for Installations",
-                            },
-                        },
                     },
-                    initial: "Waiting for App ID",
+                    initial: "Looking for Installations",
                     on: {
                         "Install Opened": {
                             target: ".Poll For Installation",
@@ -559,7 +551,6 @@ export const devMachine = setup({
                 src: "authenticate",
                 onDone: {
                     target: "Loading App Slug",
-                    reenter: true,
                     actions: { type: "setToken", params: ({ event }) => event },
                 },
                 onError: {
@@ -581,7 +572,6 @@ export const devMachine = setup({
                 onDone: {
                     target: "Determine Workspace",
                     actions: { type: "setAppInfo", params: ({ event }) => event },
-                    reenter: true,
                 },
                 onError: {
                     target: "Error",

package/lib/util/find-available-port.js

@@ -1,8 +1,14 @@
 import net from "net";
 async function isPortAvailable(port) {
     return new Promise((resolve) => {
-        const tester = net.createConnection(port, "127.0.0.1");
-        tester.once("error", (err) => {
+        const portTester = net.createConnection(port, "127.0.0.1");
+        portTester.setTimeout(1000);
+        const cleanup = () => {
+            portTester.removeAllListeners();
+            portTester.destroy();
+        };
+        portTester.once("error", (err) => {
+            cleanup();
             if (err.code === "ECONNREFUSED") {
                 resolve(true);
             }
@@ -10,8 +16,12 @@ async function isPortAvailable(port) {
                 resolve(false);
             }
         });
-        tester.once("connect", () => {
-            tester.end();
+        portTester.once("connect", () => {
+            cleanup();
+            resolve(false);
+        });
+        portTester.once("timeout", () => {
+            cleanup();
             resolve(false);
         });
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "attio",
-  "version": "0.0.1-experimental.20250325",
+  "version": "0.0.1-experimental.20250326",
   "bin": "lib/attio.js",
   "type": "module",
   "files": [