salesprompter-cli 0.1.30 → 0.1.32

package/dist/auth.js

@@ -15,7 +15,9 @@ const UserSchema = z.object({
     name: nullableOptionalString,
     orgId: nullableOptionalString,
     orgName: nullableOptionalString,
-    orgSlug: nullableOptionalString
+    orgSlug: nullableOptionalString,
+    workspaceClientId: nullableOptionalString,
+    workspaceClientName: nullableOptionalString
 });
 const AuthSessionSchema = z.object({
     accessToken: z.string().min(1),
@@ -84,6 +86,8 @@ const WhoAmIResponseSchema = z
         orgId: nullableOptionalString,
         orgName: nullableOptionalString,
         orgSlug: nullableOptionalString,
+        workspaceClientId: nullableOptionalString,
+        workspaceClientName: nullableOptionalString,
         expiresAt: z.string().datetime().optional()
     }),
     z.object({
@@ -107,7 +111,9 @@ const WhoAmIResponseSchema = z
             name: value.name,
             orgId: value.orgId,
             orgName: value.orgName,
-            orgSlug: value.orgSlug
+            orgSlug: value.orgSlug,
+            workspaceClientId: value.workspaceClientId,
+            workspaceClientName: value.workspaceClientName
         },
         expiresAt: value.expiresAt
     };

package/dist/cli.js

@@ -10,7 +10,7 @@ import { setTimeout as delay } from "node:timers/promises";
 import { createClient } from "@supabase/supabase-js";
 import { Command } from "commander";
 import { z } from "zod";
-import { clearAuthSession, loginWithBrowserConnect, loginWithDeviceFlow, loginWithToken, requireAuthSession, shouldBypassAuth, verifySession } from "./auth.js";
+import { clearAuthSession, loginWithBrowserConnect, loginWithDeviceFlow, loginWithToken, requireAuthSession, shouldBypassAuth, verifySession, writeAuthSession } from "./auth.js";
 import { buildBigQueryLeadLookupSql, executeBigQuerySql, normalizeBigQueryLeadRows, runBigQueryQuery, runBigQueryRows } from "./bigquery.js";
 import { AccountProfileSchema, EnrichedLeadSchema, IcpSchema, LeadSchema, ScoredLeadSchema, SyncTargetSchema } from "./domain.js";
 import { auditDomainDecisions, buildDomainfinderBacklogQueries, buildDomainfinderCandidatesSql, buildDomainfinderInputSql, buildDomainfinderWritebackSql, buildExistingDomainRepairSql, buildExistingDomainAuditQueries, compareDomainSelectionStrategies, selectBestDomains } from "./domainfinder.js";
@@ -2540,9 +2540,24 @@ function writeWizardSection(title, description) {
     }
     writeWizardLine();
 }
+function compactOptionalText(value) {
+    const compacted = value?.trim();
+    return compacted && compacted.length > 0 ? compacted : null;
+}
 function getOrgLabel(session) {
-    const label = session.user.orgName ?? session.user.orgSlug ?? session.user.orgId ?? null;
-    return label;
+    const orgName = compactOptionalText(session.user.orgName) ?? compactOptionalText(session.user.workspaceClientName);
+    const orgSlug = compactOptionalText(session.user.orgSlug);
+    const orgId = compactOptionalText(session.user.orgId);
+    const workspaceClientId = compactOptionalText(session.user.workspaceClientId);
+    if (orgName) {
+        const clientLabel = workspaceClientId ? `client ${workspaceClientId}` : null;
+        const details = [orgSlug, clientLabel, orgId].filter((value) => Boolean(value));
+        return details.length > 0 ? `${orgName} (${details.join(", ")})` : orgName;
+    }
+    if (orgSlug) {
+        return orgId ? `${orgSlug} (${orgId})` : orgSlug;
+    }
+    return orgId;
 }
 function resolveSessionOrgId(session) {
     const orgId = session.user.orgId?.trim();
@@ -2771,7 +2786,9 @@ async function ensureWizardSession(options) {
         };
     }
     try {
-        const session = await requireAuthSession();
+        const cachedSession = await requireAuthSession();
+        const session = await verifySession(cachedSession);
+        await writeAuthSession(session);
         writeSessionSummary(session);
         writeWizardLine();
         return {
@@ -2800,9 +2817,32 @@ async function ensureWizardSession(options) {
 }
 async function confirmWizardWorkspace(rl, session, options) {
     const orgLabel = getOrgLabel(session);
-    const promptLabel = orgLabel ? `workspace ${orgLabel}` : "this signed-in account without a selected workspace";
-    const useCurrentWorkspace = await promptYesNo(rl, `Use ${promptLabel} for this CLI run?`, true);
-    if (useCurrentWorkspace) {
+    const hasNamedOrg = Boolean(compactOptionalText(session.user.orgName) || compactOptionalText(session.user.orgSlug));
+    const currentLabel = orgLabel
+        ? hasNamedOrg
+            ? `Use ${orgLabel}`
+            : `Use current workspace (${orgLabel})`
+        : "Use signed-in account without a selected workspace";
+    const currentDescription = orgLabel
+        ? 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";
+    const workspaceChoice = await promptChoice(rl, "Which workspace should I use?", [
+        {
+            value: "current",
+            label: currentLabel,
+            description: currentDescription,
+            aliases: ["current", "cached", "this workspace", "use current"]
+        },
+        {
+            value: "browser",
+            label: "Choose another workspace in the browser",
+            description: "Opens Salesprompter so you can pick from your organizations",
+            aliases: ["browser", "choose another", "switch workspace", "select organization"]
+        }
+    ], "current");
+    if (workspaceChoice === "current") {
         writeWizardLine();
         return session;
     }

package/package.json

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