salesprompter-cli 0.1.33 → 0.1.34

package/dist/cli.js

@@ -42,6 +42,32 @@ const runtimeOutputOptions = {
     quiet: false
 };
 const nullableOptionalString = z.string().min(1).nullish().transform((value) => value ?? undefined);
+const CliWorkspaceSchema = z.object({
+    id: z.string().min(1),
+    name: nullableOptionalString,
+    slug: nullableOptionalString,
+    workspaceClientId: nullableOptionalString,
+    workspaceClientName: nullableOptionalString
+});
+const CliWorkspaceListResponseSchema = z.object({
+    workspaces: z.array(CliWorkspaceSchema),
+    currentOrgId: nullableOptionalString
+});
+const CliAuthUserSchema = z.object({
+    id: z.string().min(1),
+    email: z.string().email(),
+    name: nullableOptionalString,
+    orgId: nullableOptionalString,
+    orgName: nullableOptionalString,
+    orgSlug: nullableOptionalString,
+    workspaceClientId: nullableOptionalString,
+    workspaceClientName: nullableOptionalString
+});
+const CliWorkspaceSwitchResponseSchema = z.object({
+    token: z.string().min(1),
+    expiresAt: z.string().datetime().optional(),
+    user: CliAuthUserSchema
+});
 const LinkedInCompanyBackfillClientIdStateSchema = z
     .object({
     clientId: z.number().int().positive(),
@@ -2564,6 +2590,37 @@ function resolveSessionOrgId(session) {
     const orgId = session.user.orgId?.trim();
     return orgId && orgId.length > 0 ? orgId : null;
 }
+function normalizeCliApiBaseUrl(value) {
+    return value.trim().replace(/\/+$/, "");
+}
+function getWorkspaceDisplayName(workspace) {
+    return (compactOptionalText(workspace.name) ??
+        compactOptionalText(workspace.workspaceClientName) ??
+        compactOptionalText(workspace.slug) ??
+        workspace.id);
+}
+function formatCliWorkspaceLabel(workspace) {
+    const name = getWorkspaceDisplayName(workspace);
+    const details = [
+        compactOptionalText(workspace.slug),
+        compactOptionalText(workspace.workspaceClientId),
+        workspace.id
+    ].filter((value) => Boolean(value));
+    return details.length > 0 ? `${name} (${details.join(", ")})` : name;
+}
+function workspaceMatchesInput(workspace, value) {
+    const normalized = normalizeChoiceText(value);
+    return [
+        workspace.id,
+        workspace.name,
+        workspace.slug,
+        workspace.workspaceClientId,
+        workspace.workspaceClientName
+    ].some((candidate) => {
+        const compacted = compactOptionalText(candidate);
+        return compacted ? normalizeChoiceText(compacted) === normalized : false;
+    });
+}
 function writeSessionSummary(session) {
     const identity = session.user.name?.trim()
         ? `${session.user.name} (${session.user.email})`
@@ -2748,6 +2805,21 @@ async function promptChoice(rl, prompt, options, defaultValue) {
         writeWizardLine();
     }
 }
+async function withPromptReader(existingReader, run) {
+    if (existingReader) {
+        return await run(existingReader);
+    }
+    const rl = createInterface({
+        input: process.stdin,
+        output: process.stdout
+    });
+    try {
+        return await run(rl);
+    }
+    finally {
+        rl.close();
+    }
+}
 async function promptText(rl, prompt, options = {}) {
     while (true) {
         const suffix = options.defaultValue !== undefined ? ` [${options.defaultValue}]` : "";
@@ -2828,7 +2900,7 @@ async function confirmWizardWorkspace(rl, session, options) {
         ? hasNamedOrg
             ? "Current cached CLI workspace"
             : "Workspace name is not available in this cached token"
-        : "Choose another workspace in the browser if this account belongs to more than one";
+        : "Select from your Salesprompter organizations in this terminal";
     const workspaceChoice = await promptChoice(rl, "Which workspace should I use?", [
         {
             value: "current",
@@ -2838,8 +2910,8 @@ async function confirmWizardWorkspace(rl, session, options) {
         },
         {
             value: "browser",
-            label: "Choose another workspace in the browser",
-            description: "Opens Salesprompter so you can pick from your organizations",
+            label: "Choose another workspace",
+            description: "Select from your Salesprompter organizations in this terminal",
             aliases: ["browser", "choose another", "switch workspace", "select organization"]
         }
     ], "current");
@@ -2848,12 +2920,10 @@ async function confirmWizardWorkspace(rl, session, options) {
         return session;
     }
     writeWizardLine();
-    writeWizardLine("Choose the workspace for this CLI session in the browser.");
-    writeWizardLine();
-    await clearAuthSession();
-    const result = await performLogin({
+    const result = await switchWorkspaceInCli({
         apiUrl: options?.apiUrl ?? session.apiBaseUrl,
-        timeoutSeconds: options?.timeoutSeconds ?? 180
+        timeoutSeconds: options?.timeoutSeconds,
+        rl
     });
     writeSessionSummary(result.session);
     writeWizardLine();
@@ -2866,6 +2936,134 @@ async function switchWorkspaceWithBrowser(options) {
         timeoutSeconds: options?.timeoutSeconds ?? 180
     })).session;
 }
+async function listCliWorkspaces(session) {
+    const { session: refreshedSession, value } = await fetchCliJson(session, async (currentSession) => await fetch(`${normalizeCliApiBaseUrl(currentSession.apiBaseUrl)}/api/cli/auth/workspaces`, {
+        method: "GET",
+        headers: {
+            Authorization: `Bearer ${currentSession.accessToken}`,
+            "X-Salesprompter-Client": "salesprompter-cli/0.2"
+        }
+    }), CliWorkspaceListResponseSchema);
+    return {
+        session: refreshedSession,
+        workspaces: value.workspaces,
+        currentOrgId: value.currentOrgId ?? null
+    };
+}
+async function selectCliWorkspace(session, orgId) {
+    const { value } = await fetchCliJson(session, async (currentSession) => await fetch(`${normalizeCliApiBaseUrl(currentSession.apiBaseUrl)}/api/cli/auth/workspaces`, {
+        method: "POST",
+        headers: {
+            Authorization: `Bearer ${currentSession.accessToken}`,
+            "Content-Type": "application/json",
+            "X-Salesprompter-Client": "salesprompter-cli/0.2"
+        },
+        body: JSON.stringify({ orgId })
+    }), CliWorkspaceSwitchResponseSchema);
+    const nextSession = {
+        accessToken: value.token,
+        refreshToken: session.refreshToken,
+        apiBaseUrl: session.apiBaseUrl,
+        user: value.user,
+        expiresAt: value.expiresAt,
+        createdAt: new Date().toISOString()
+    };
+    await writeAuthSession(nextSession);
+    return nextSession;
+}
+async function promptForCliWorkspace(rl, workspaces, currentOrgId, requestedWorkspace) {
+    const requested = compactOptionalText(requestedWorkspace);
+    if (requested) {
+        const matched = workspaces.find((workspace) => workspaceMatchesInput(workspace, requested));
+        if (!matched) {
+            throw new Error(`workspace not found for this account: ${requested}`);
+        }
+        return matched.id;
+    }
+    const current = currentOrgId ? workspaces.find((workspace) => workspace.id === currentOrgId) : undefined;
+    const options = workspaces.map((workspace) => ({
+        value: workspace.id,
+        label: formatCliWorkspaceLabel(workspace),
+        description: workspace.id === currentOrgId ? "Current cached CLI workspace" : undefined,
+        aliases: [workspace.name, workspace.slug, workspace.workspaceClientId, workspace.workspaceClientName].filter((value) => Boolean(compactOptionalText(value)))
+    }));
+    options.push({
+        value: "browser",
+        label: "Use browser chooser",
+        description: "Fallback if this terminal list is missing a workspace",
+        aliases: ["browser", "open browser", "web"]
+    });
+    return await promptChoice(rl, "Which workspace should I use?", options, current?.id ?? options[0]?.value ?? "browser");
+}
+async function switchWorkspaceInCli(options = {}) {
+    if (options.browser) {
+        return {
+            session: await switchWorkspaceWithBrowser(options),
+            method: "browser"
+        };
+    }
+    let session = null;
+    try {
+        session = await requireAuthSession();
+        if (options.apiUrl) {
+            session = {
+                ...session,
+                apiBaseUrl: normalizeCliApiBaseUrl(options.apiUrl)
+            };
+        }
+    }
+    catch {
+        if (!runtimeOutputOptions.quiet) {
+            writeWizardLine("No cached CLI session found. Starting browser login flow.");
+            writeWizardLine();
+        }
+        return {
+            session: await switchWorkspaceWithBrowser(options),
+            method: "browser"
+        };
+    }
+    let workspaces;
+    let currentOrgId;
+    try {
+        const listed = await listCliWorkspaces(session);
+        session = listed.session;
+        workspaces = listed.workspaces;
+        currentOrgId = listed.currentOrgId;
+    }
+    catch (error) {
+        if (!runtimeOutputOptions.quiet) {
+            const message = error instanceof Error ? error.message : String(error);
+            writeWizardLine(`Terminal workspace selection is unavailable (${message}). Starting browser chooser.`);
+            writeWizardLine();
+        }
+        return {
+            session: await switchWorkspaceWithBrowser(options),
+            method: "browser"
+        };
+    }
+    if (workspaces.length === 0) {
+        if (!runtimeOutputOptions.quiet) {
+            writeWizardLine("No Salesprompter workspaces were returned for this account. Starting browser chooser.");
+            writeWizardLine();
+        }
+        return {
+            session: await switchWorkspaceWithBrowser(options),
+            method: "browser"
+        };
+    }
+    const selectedOrgId = options.orgId ?? (await withPromptReader(options.rl, async (rl) => await promptForCliWorkspace(rl, workspaces, currentOrgId, options.workspace)));
+    if (selectedOrgId === "browser") {
+        return {
+            session: await switchWorkspaceWithBrowser(options),
+            method: "browser"
+        };
+    }
+    const nextSession = await selectCliWorkspace(session, selectedOrgId);
+    return {
+        session: nextSession,
+        method: "terminal"
+    };
+}
 async function resolveLlmAuthReadiness() {
     const apiBaseUrl = process.env.SALESPROMPTER_API_BASE_URL?.trim() || "https://salesprompter.ai";
     const envToken = resolveNonInteractiveAuthToken(process.env);
@@ -5485,10 +5683,11 @@ async function runWizard(options) {
             ], "product-market");
             writeWizardLine();
             if (flow === "switch-workspace") {
-                writeWizardLine("Choose the workspace for this CLI session in the browser.");
-                writeWizardLine();
-                const session = await switchWorkspaceWithBrowser(options);
-                writeSessionSummary(session);
+                const result = await switchWorkspaceInCli({
+                    ...options,
+                    rl
+                });
+                writeSessionSummary(result.session);
                 writeWizardLine();
                 continue;
             }
@@ -5829,19 +6028,25 @@ program
     .alias("auth:switch")
     .description("Switch the active Salesprompter workspace for this CLI session.")
     .option("--api-url <url>", "Salesprompter API base URL, defaults to SALESPROMPTER_API_BASE_URL or salesprompter.ai")
-    .option("--timeout-seconds <number>", "Browser login timeout in seconds", "180")
+    .option("--timeout-seconds <number>", "Browser fallback login timeout in seconds", "180")
+    .option("--org-id <id>", "Switch directly to a Clerk organization id")
+    .option("--workspace <nameOrSlug>", "Switch directly to a workspace by name, slug, client id, or org id")
+    .option("--browser", "Use the browser chooser instead of terminal workspace selection")
     .action(async (options) => {
     const timeoutSeconds = z.coerce.number().int().min(30).max(1800).parse(options.timeoutSeconds);
-    const session = await switchWorkspaceWithBrowser({
+    const result = await switchWorkspaceInCli({
         apiUrl: options.apiUrl,
-        timeoutSeconds
+        timeoutSeconds,
+        orgId: options.orgId,
+        workspace: options.workspace,
+        browser: Boolean(options.browser)
     });
     printOutput({
         status: "ok",
-        method: "browser",
-        apiBaseUrl: session.apiBaseUrl,
-        user: session.user,
-        expiresAt: session.expiresAt ?? null
+        method: result.method,
+        apiBaseUrl: result.session.apiBaseUrl,
+        user: result.session.user,
+        expiresAt: result.session.expiresAt ?? null
     });
 });
 program

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "salesprompter-cli",
-  "version": "0.1.33",
+  "version": "0.1.34",
   "description": "Sales workflow CLI for guided lead generation, enrichment, scoring, and sync.",
   "author": "Daniel Sinewe <hello@danielsinewe.com>",
   "type": "module",