@withone/cli 1.31.0 → 1.32.0

package/dist/{chunk-645Z3ARQ.js → chunk-T7LTS2IE.js}

@@ -66,10 +66,12 @@ var OneApi = class {
     if (!text) return {};
     return JSON.parse(text);
   }
+  async whoami() {
+    return this.request("/users/whoami");
+  }
   async validateApiKey() {
     try {
-      await this.listConnections();
-      return true;
+      return await this.whoami();
     } catch (error) {
       if (error instanceof ApiError && error.status === 401) {
         return false;
@@ -1040,7 +1042,7 @@ async function executeSubflowStep(step, context, api, permissions, allowedAction
   if (flowStack.includes(resolvedKey)) {
     throw new Error(`Circular flow detected: ${[...flowStack, resolvedKey].join(" \u2192 ")}`);
   }
-  const { loadFlowWithMeta: loadFlowWithMeta2 } = await import("./flow-runner-HT74FKPD.js");
+  const { loadFlowWithMeta: loadFlowWithMeta2 } = await import("./flow-runner-6IFPWOS4.js");
   const { flow: subFlow, rootDir: subRootDir } = loadFlowWithMeta2(resolvedKey);
   const subContext = await executeFlow(
     subFlow,

package/dist/{flow-runner-HT74FKPD.js → flow-runner-6IFPWOS4.js}

@@ -11,7 +11,7 @@ import {
   saveFlow,
   summarizeFlowInputs,
   walkSteps
-} from "./chunk-645Z3ARQ.js";
+} from "./chunk-T7LTS2IE.js";
 export {
   FlowRunner,
   collectStepTypes,

package/dist/index.js

@@ -19,7 +19,7 @@ import {
   resolveFlowPath,
   saveFlow,
   validateActionInput
-} from "./chunk-645Z3ARQ.js";
+} from "./chunk-T7LTS2IE.js";
 
 // src/index.ts
 import { createRequire as createRequire2 } from "module";
@@ -187,6 +187,7 @@ function updateApiBase(url) {
   } else {
     delete config2.apiBase;
   }
+  delete config2.whoami;
   writeConfig(config2);
 }
 function getCacheTtl() {
@@ -221,6 +222,29 @@ function updateAccessControl(settings) {
   }
   writeConfig(config2);
 }
+function getWhoAmI() {
+  return readConfig()?.whoami ?? null;
+}
+function updateWhoAmI(whoami) {
+  const config2 = readConfig();
+  if (!config2) return;
+  config2.whoami = whoami;
+  writeConfig(config2);
+}
+async function ensureWhoAmI(api) {
+  const cached2 = getWhoAmI();
+  if (cached2) return cached2;
+  try {
+    const whoami = await api.whoami();
+    updateWhoAmI(whoami);
+    return whoami;
+  } catch {
+    return null;
+  }
+}
+function getEnvFromApiKey(apiKey) {
+  return apiKey.startsWith("sk_test_") ? "test" : "live";
+}
 
 // src/lib/agents.ts
 import fs2 from "fs";
@@ -403,14 +427,19 @@ function getAgentStatuses() {
 // src/lib/browser.ts
 import open from "open";
 var ONE_APP_URL = "https://app.withone.ai";
-function getConnectionUrl(platform) {
-  return `${ONE_APP_URL}/?#open=${platform}`;
+function getConnectionUrl(platform, params) {
+  const searchParams = new URLSearchParams();
+  if (params?.orgId) searchParams.set("orgId", params.orgId);
+  if (params?.projectId) searchParams.set("projectId", params.projectId);
+  if (params?.env) searchParams.set("env", params.env);
+  const qs = searchParams.toString();
+  return `${ONE_APP_URL}/${qs ? `?${qs}` : ""}#open=${platform}`;
 }
 function getApiKeyUrl() {
   return `${ONE_APP_URL}/settings/api-keys`;
 }
-async function openConnectionPage(platform) {
-  const url = getConnectionUrl(platform);
+async function openConnectionPage(platform, params) {
+  const url = getConnectionUrl(platform, params);
   await open(url);
 }
 async function openApiKeyPage() {
@@ -673,6 +702,7 @@ async function configCommand() {
   const updatedConfig = readConfig();
   if (updatedConfig && newApiKey !== config2.apiKey) {
     updatedConfig.apiKey = newApiKey;
+    delete updatedConfig.whoami;
     writeConfig(updatedConfig);
   }
   const ac = getAccessControl();
@@ -1104,10 +1134,17 @@ async function handleExistingConfig(apiKey, scope, options) {
       printOnboardingPrompt();
       p3.outro("Paste the prompt above to your AI agent.");
       break;
-    case "add-connection":
-      await promptConnectIntegrations(apiKey);
+    case "add-connection": {
+      const whoamiCached = getWhoAmI();
+      const addConnParams = {
+        env: getEnvFromApiKey(apiKey),
+        ...whoamiCached?.organization && { orgId: whoamiCached.organization.id },
+        ...whoamiCached?.project && { projectId: whoamiCached.project.id }
+      };
+      await promptConnectIntegrations(apiKey, addConnParams);
       p3.outro("Done.");
       break;
+    }
     case "update-key":
       await handleUpdateKey(statuses, scope);
       break;
@@ -1151,13 +1188,24 @@ ${pc2.cyan(getApiKeyUrl())}`, `API Key ${scopeLabel(scope)}`);
   const spinner5 = p3.spinner();
   spinner5.start("Validating API key...");
   const api = new OneApi(newKey, getApiBase());
-  const isValid = await api.validateApiKey();
-  if (!isValid) {
+  const whoamiResult = await api.validateApiKey();
+  if (!whoamiResult) {
     spinner5.stop("Invalid API key");
     p3.cancel(`Invalid API key. Get a valid key at ${getApiKeyUrl()}`);
     process.exit(1);
   }
   spinner5.stop("API key validated");
+  const env = getEnvFromApiKey(newKey);
+  const contextParts = [];
+  if (whoamiResult.organization) contextParts.push(whoamiResult.organization.name);
+  if (whoamiResult.project) contextParts.push(whoamiResult.project.name);
+  const scopeDisplay = contextParts.length > 0 ? contextParts.join(" / ") : "Personal";
+  const envLabel = env === "test" ? pc2.yellow("test") : pc2.green("live");
+  p3.note(
+    `${scopeDisplay} ${pc2.dim("\xB7")} ${envLabel}
+${whoamiResult.user.name} ${pc2.dim(`(${whoamiResult.user.email})`)}`,
+    "Account"
+  );
   const ac = getAccessControl();
   const reinstalled = [];
   for (const s of statuses) {
@@ -1178,7 +1226,8 @@ ${pc2.cyan(getApiKeyUrl())}`, `API Key ${scopeLabel(scope)}`);
       createdAt: current?.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
       accessControl: current?.accessControl,
       apiBase: current?.apiBase,
-      cacheTtl: current?.cacheTtl
+      cacheTtl: current?.cacheTtl,
+      whoami: whoamiResult
     },
     scope
   );
@@ -1376,23 +1425,40 @@ ${pc2.cyan(getApiKeyUrl())}`, `API Key ${scopeLabel(scope)}`);
   const spinner5 = p3.spinner();
   spinner5.start("Validating API key...");
   const api = new OneApi(apiKey, getApiBase());
-  const isValid = await api.validateApiKey();
-  if (!isValid) {
+  const whoami = await api.validateApiKey();
+  if (!whoami) {
     spinner5.stop("Invalid API key");
     p3.cancel(`Invalid API key. Get a valid key at ${getApiKeyUrl()}`);
     process.exit(1);
   }
   spinner5.stop("API key validated");
+  const env = getEnvFromApiKey(apiKey);
+  const contextParts = [];
+  if (whoami.organization) contextParts.push(whoami.organization.name);
+  if (whoami.project) contextParts.push(whoami.project.name);
+  const scope_label = contextParts.length > 0 ? contextParts.join(" / ") : "Personal";
+  const envLabel = env === "test" ? pc2.yellow("test") : pc2.green("live");
+  p3.note(
+    `${scope_label} ${pc2.dim("\xB7")} ${envLabel}
+${whoami.user.name} ${pc2.dim(`(${whoami.user.email})`)}`,
+    "Account"
+  );
   writeConfig(
     {
       apiKey,
       installedAgents: [],
-      createdAt: (/* @__PURE__ */ new Date()).toISOString()
+      createdAt: (/* @__PURE__ */ new Date()).toISOString(),
+      whoami
     },
     scope
   );
   await promptSkillInstall();
-  await promptConnectIntegrations(apiKey);
+  const connParams = {
+    env,
+    ...whoami.organization && { orgId: whoami.organization.id },
+    ...whoami.project && { projectId: whoami.project.id }
+  };
+  await promptConnectIntegrations(apiKey, connParams);
   const savedPath = scope === "project" ? getProjectConfigPath() : getGlobalConfigPath();
   const resolutionHint = scope === "project" ? `When you run ${pc2.cyan("one")} from ${pc2.bold(path4.basename(getProjectRoot()))}, it uses this project config.
 From anywhere else, it falls back to your global config.` : `This config applies to every folder unless a project config is set.`;
@@ -1427,7 +1493,7 @@ var TOP_INTEGRATIONS = [
   { value: "google-calendar", label: "Google Calendar", hint: "Manage events and schedules" },
   { value: "notion", label: "Notion", hint: "Access pages, databases, and docs" }
 ];
-async function promptConnectIntegrations(apiKey) {
+async function promptConnectIntegrations(apiKey, connParams) {
   const api = new OneApi(apiKey, getApiBase());
   const connected = [];
   try {
@@ -1472,9 +1538,9 @@ async function promptConnectIntegrations(apiKey) {
     const label = integration?.label ?? platform;
     p3.log.info(`Opening browser to connect ${pc2.cyan(label)}...`);
     try {
-      await openConnectionPage(platform);
+      await openConnectionPage(platform, connParams);
     } catch {
-      const url = getConnectionUrl(platform);
+      const url = getConnectionUrl(platform, connParams);
       p3.log.warn("Could not open browser automatically.");
       p3.note(url, "Open manually");
     }
@@ -1654,11 +1720,17 @@ Run ${pc4.cyan("one platforms")} to see available platforms.`);
       process.exit(1);
     }
   }
-  const url = getConnectionUrl(platform);
+  const whoami = await ensureWhoAmI(api);
+  const connParams = {
+    env: getEnvFromApiKey(apiKey),
+    ...whoami?.organization && { orgId: whoami.organization.id },
+    ...whoami?.project && { projectId: whoami.project.id }
+  };
+  const url = getConnectionUrl(platform, connParams);
   p4.log.info(`Opening browser to connect ${pc4.cyan(platform)}...`);
   p4.note(pc4.dim(url), "URL");
   try {
-    await openConnectionPage(platform);
+    await openConnectionPage(platform, connParams);
   } catch {
     p4.log.warn("Could not open browser automatically.");
     p4.note(`Open this URL manually:
@@ -1748,14 +1820,17 @@ Add one with: ${pc4.cyan("one connection add gmail")}`,
       status: getStatusIndicator(conn.state),
       platform: conn.platform,
       state: conn.state,
-      key: conn.key
+      key: conn.key,
+      tags: conn.tags?.length ? conn.tags.join(", ") : ""
     }));
+    const hasTags = rows.some((r) => r.tags);
     printTable(
       [
         { key: "status", label: "" },
         { key: "platform", label: "Platform" },
         { key: "state", label: "Status" },
-        { key: "key", label: "Connection Key", color: pc4.dim }
+        { key: "key", label: "Connection Key", color: pc4.dim },
+        ...hasTags ? [{ key: "tags", label: "Tags", color: pc4.dim }] : []
       ],
       rows
     );
@@ -3988,14 +4063,20 @@ async function relayListCommand(options) {
       return;
     }
     printTable(
-      ["Status", "Description", "Events", "Actions", "ID"],
-      endpoints.map((e) => [
-        e.active ? pc8.green("\u25CF") : pc8.dim("\u25CB"),
-        e.description || pc8.dim("(none)"),
-        e.eventFilters?.join(", ") || pc8.dim("all"),
-        String(e.actions?.length || 0),
-        pc8.dim(e.id.slice(0, 8))
-      ])
+      [
+        { key: "status", label: "" },
+        { key: "description", label: "Description" },
+        { key: "events", label: "Events" },
+        { key: "actions", label: "Actions" },
+        { key: "id", label: "ID", color: pc8.dim }
+      ],
+      endpoints.map((e) => ({
+        status: e.active ? pc8.green("\u25CF") : pc8.dim("\u25CB"),
+        description: e.description || pc8.dim("(none)"),
+        events: e.eventFilters?.join(", ") || pc8.dim("all"),
+        actions: String(e.actions?.length || 0),
+        id: e.id.slice(0, 8)
+      }))
     );
   } catch (error2) {
     spinner5.stop("Failed to list relay endpoints");
@@ -4137,13 +4218,18 @@ async function relayEventsCommand(options) {
       return;
     }
     printTable(
-      ["Platform", "Event Type", "Timestamp", "ID"],
-      events.map((e) => [
-        e.platform,
-        e.eventType || pc8.dim("unknown"),
-        e.timestamp || e.createdAt,
-        pc8.dim(e.id.slice(0, 8))
-      ])
+      [
+        { key: "platform", label: "Platform" },
+        { key: "eventType", label: "Event Type" },
+        { key: "timestamp", label: "Timestamp" },
+        { key: "id", label: "ID", color: pc8.dim }
+      ],
+      events.map((e) => ({
+        platform: e.platform,
+        eventType: e.eventType || pc8.dim("unknown"),
+        timestamp: e.timestamp || e.createdAt,
+        id: e.id.slice(0, 8)
+      }))
     );
   } catch (error2) {
     spinner5.stop("Failed to list relay events");
@@ -4196,14 +4282,20 @@ async function relayDeliveriesCommand(options) {
       return;
     }
     printTable(
-      ["Status", "Code", "Attempt", "Delivered At", "Error"],
-      items.map((d) => [
-        d.status === "success" ? pc8.green(d.status) : pc8.red(d.status),
-        d.statusCode != null ? String(d.statusCode) : pc8.dim("-"),
-        String(d.attempt),
-        d.deliveredAt || pc8.dim("-"),
-        d.error ? pc8.red(d.error.slice(0, 50)) : pc8.dim("-")
-      ])
+      [
+        { key: "status", label: "Status" },
+        { key: "code", label: "Code" },
+        { key: "attempt", label: "Attempt" },
+        { key: "deliveredAt", label: "Delivered At" },
+        { key: "error", label: "Error" }
+      ],
+      items.map((d) => ({
+        status: d.status === "success" ? pc8.green(d.status) : pc8.red(d.status),
+        code: d.statusCode != null ? String(d.statusCode) : pc8.dim("-"),
+        attempt: String(d.attempt),
+        deliveredAt: d.deliveredAt || pc8.dim("-"),
+        error: d.error ? pc8.red(d.error.slice(0, 50)) : pc8.dim("-")
+      }))
     );
   } catch (error2) {
     spinner5.stop("Failed to load deliveries");
@@ -8570,6 +8662,7 @@ program.name("one").option("--agent", "Machine-readable JSON output (no colors,
     one add <platform>                    Connect a platform via OAuth (e.g. gmail, slack, shopify)
     one connection delete <key>           Remove a connection (alias: one connection rm)
     one config                            Configure access control (permissions, scoping)
+    one whoami                            Show current user, organization, and project
 
   Workflow (use these in order):
     1. one list                           List your connected platforms and connection keys
@@ -8840,6 +8933,53 @@ program.command("onboard").description("Agent onboarding \u2014 teaches your age
 program.command("update").description("Update the One CLI to the latest version").action(async () => {
   await updateCommand();
 });
+program.command("whoami").description("Show the user, organization, and project for the current API key").action(async () => {
+  const apiKey = getApiKey();
+  if (!apiKey) {
+    error("Not configured. Run `one init` first.");
+    return;
+  }
+  const api = new OneApi(apiKey, getApiBase());
+  let whoami;
+  try {
+    whoami = await api.whoami();
+    updateWhoAmI(whoami);
+  } catch (error2) {
+    error(`Failed to fetch account info: ${error2 instanceof Error ? error2.message : "Unknown error"}`);
+    return;
+  }
+  const env = getEnvFromApiKey(apiKey);
+  const resolved = resolveConfig();
+  const configScope = resolved.scope ?? "global";
+  const apiBase = getApiBase();
+  if (isAgentMode()) {
+    json({
+      user: whoami.user,
+      organization: whoami.organization,
+      project: whoami.project,
+      env,
+      configScope,
+      apiBase
+    });
+    return;
+  }
+  const pc12 = (await import("picocolors")).default;
+  const contextParts = [];
+  if (whoami.organization) contextParts.push(whoami.organization.name);
+  if (whoami.project) contextParts.push(whoami.project.name);
+  const scopeDisplay = contextParts.length > 0 ? contextParts.join(" / ") : "Personal";
+  const envLabel = env === "test" ? pc12.yellow("test") : pc12.green("live");
+  const configLabel = configScope === "project" ? pc12.cyan("project config") : pc12.magenta("global config");
+  console.log();
+  console.log(`  ${pc12.bold(scopeDisplay)} ${pc12.dim("\xB7")} ${envLabel}`);
+  console.log(`  ${whoami.user.name} ${pc12.dim(`(${whoami.user.email})`)}`);
+  if (whoami.organization) console.log(`  ${pc12.dim("Org:")} ${whoami.organization.name} ${pc12.dim(`(${whoami.organization.id})`)}`);
+  if (whoami.project) console.log(`  ${pc12.dim("Project:")} ${whoami.project.name} ${pc12.dim(`(${whoami.project.id})`)}`);
+  console.log();
+  console.log(`  ${pc12.dim("Using")} ${configLabel}`);
+  console.log(`  ${pc12.dim("API:")} ${apiBase}`);
+  console.log();
+});
 program.command("add [platform]").description("Shortcut for: connection add").action(async (platform) => {
   await connectionAddCommand(platform);
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@withone/cli",
-  "version": "1.31.0",
+  "version": "1.32.0",
   "description": "CLI for managing One",
   "type": "module",
   "files": [