@base44-preview/cli 0.1.6-pr.583.b06bd3d → 0.1.7-pr.568.c08ba20

package/dist/cli/index.js

@@ -244912,14 +244912,15 @@ async function setAppVisibility(visibility) {
     throw await ApiError.fromHttpError(error48, "updating app visibility");
   }
 }
-async function listProjects() {
+async function listProjects(options = {}) {
   let response;
   try {
     response = await base44Client.get("api/apps", {
       searchParams: {
         sort: "-updated_date",
         fields: "id,name,user_description,is_managed_source_code",
-        limit: 50
+        limit: 50,
+        ...options.workspaceId ? { workspace_id: options.workspaceId } : {}
       }
     });
   } catch (error48) {
@@ -247215,7 +247216,7 @@ import { join as join12 } from "node:path";
 // package.json
 var package_default = {
   name: "base44",
-  version: "0.1.6",
+  version: "0.1.7",
   description: "Base44 CLI - Unified interface for managing Base44 applications",
   type: "module",
   bin: {
@@ -256750,7 +256751,7 @@ function workspaceLabel(workspace2) {
   const suffix = workspace2.isPersonal ? "personal" : workspace2.userRole ?? "member";
   return `${workspace2.name} (${suffix})`;
 }
-async function resolveWorkspaceId(ctx, flagWorkspaceId, isInteractive) {
+async function resolveWorkspaceId(ctx, flagWorkspaceId, isInteractive, options = {}) {
   if (flagWorkspaceId) {
     return flagWorkspaceId;
   }
@@ -256761,13 +256762,13 @@ async function resolveWorkspaceId(ctx, flagWorkspaceId, isInteractive) {
   if (workspaces.length <= 1) {
     return;
   }
-  const options = workspaces.map((w) => ({
+  const promptOptions = workspaces.map((w) => ({
     value: w.id,
     label: workspaceLabel(w)
   }));
   const selected = await Je({
-    message: "Which workspace should this app belong to?",
-    options,
+    message: options.promptMessage ?? "Which workspace should this app belong to?",
+    options: promptOptions,
     initialValue: workspaces[0].id
   });
   if (Ct(selected)) {
@@ -257100,6 +257101,36 @@ async function promptForExistingProject(projects) {
   }
   return selectedProject;
 }
+async function resolveExplicitAppId(ctx, appId) {
+  await ctx.runTask("Validating app...", () => getApp(appId), {
+    errorMessage: "Could not validate app"
+  }).catch((error48) => {
+    if (error48 instanceof ApiError && (error48.statusCode === 404 || error48.statusCode === 403)) {
+      throw new InvalidInputError(`App "${appId}" not found, or you don't have access to it.`, {
+        hints: [
+          { message: "Check the app ID is correct" },
+          {
+            message: "Run 'base44 link' without --app-id to browse apps by workspace"
+          }
+        ]
+      });
+    }
+    throw error48;
+  });
+  return appId;
+}
+async function chooseProjectInteractively(ctx, options) {
+  const workspaceId = await resolveWorkspaceId(ctx, options.workspace ?? options.org, !ctx.isNonInteractive, { promptMessage: "Which workspace is the app in?" });
+  const projects = await ctx.runTask("Fetching projects...", () => listProjects({ workspaceId }), {
+    successMessage: "Projects fetched",
+    errorMessage: "Failed to fetch projects"
+  });
+  if (!projects.length) {
+    return;
+  }
+  const selectedProject = await promptForExistingProject(projects);
+  return selectedProject.id;
+}
 async function link(ctx, options, command2) {
   const { log, runTask: runTask2, isNonInteractive } = ctx;
   const appId = readExplicitAppId(command2).value;
@@ -257123,31 +257154,10 @@ async function link(ctx, options, command2) {
   let finalAppId;
   const action = appId ? "choose" : options.create ? "create" : await promptForLinkAction();
   if (action === "choose") {
-    const projects = await runTask2("Fetching projects...", async () => listProjects(), {
-      successMessage: "Projects fetched",
-      errorMessage: "Failed to fetch projects"
-    });
-    if (!projects.length) {
+    const linkedAppId = appId ? await resolveExplicitAppId(ctx, appId) : await chooseProjectInteractively(ctx, options);
+    if (!linkedAppId) {
       return { outroMessage: "No projects available for linking" };
     }
-    let linkedAppId;
-    if (appId) {
-      const project2 = projects.find((p) => p.id === appId);
-      if (!project2) {
-        throw new InvalidInputError(`App with ID "${appId}" not found.`, {
-          hints: [
-            { message: "Check the app ID is correct" },
-            {
-              message: "Use 'base44 link' without --app-id to see available projects"
-            }
-          ]
-        });
-      }
-      linkedAppId = appId;
-    } else {
-      const selectedProject = await promptForExistingProject(projects);
-      linkedAppId = selectedProject.id;
-    }
     await runTask2("Linking project...", async () => {
       await writeAppConfig(projectRoot.root, linkedAppId);
       setAppContext({ id: linkedAppId, projectRoot: projectRoot.root });
@@ -257176,7 +257186,7 @@ async function link(ctx, options, command2) {
 function getLinkCommand() {
   return new Base44Command("link", {
     requireAppContext: false
-  }).description("Link a local project to a Base44 project (create new or link existing)").configureHelp({ showGlobalOptions: true }).option("-c, --create", "Create a new project (skip selection prompt)").option("-n, --name <name>", "Project name (required when --create is used)").option("-d, --description <description>", "Project description").option("-w, --workspace <id>", "Workspace (organization) ID to create the app in when using --create (defaults to your personal workspace)").addOption(new Option("--org <id>", "Alias for --workspace").hideHelp()).addOption(new Option("-p, --project-id <id>", "Project ID to link to an existing project").hideHelp()).addOption(new Option("--projectId <id>", "Project ID to link to an existing project").hideHelp()).hook("preAction", validateNonInteractiveFlags).action(link);
+  }).description("Link a local project to a Base44 project (create new or link existing)").configureHelp({ showGlobalOptions: true }).option("-c, --create", "Create a new project (skip selection prompt)").option("-n, --name <name>", "Project name (required when --create is used)").option("-d, --description <description>", "Project description").option("-w, --workspace <id>", "Workspace (organization) ID to scope the app picker to (or create the app in, with --create). Defaults to your personal workspace").addOption(new Option("--org <id>", "Alias for --workspace").hideHelp()).addOption(new Option("-p, --project-id <id>", "Project ID to link to an existing project").hideHelp()).addOption(new Option("--projectId <id>", "Project ID to link to an existing project").hideHelp()).hook("preAction", validateNonInteractiveFlags).action(link);
 }
 
 // src/cli/commands/project/logs.ts
@@ -266671,4 +266681,4 @@ export {
   CLIExitError
 };
 
-//# debugId=741C52053719673B64756E2164756E21
+//# debugId=14B1FDDCC926290964756E2164756E21