@ollie-shop/cli 1.2.2 → 1.3.3

package/.env.example

@@ -1,6 +1,10 @@
-# Required for all authenticated commands (store, version, component, whoami)
-OLLIE_SUPABASE_URL=http://127.0.0.1:54321
-OLLIE_SUPABASE_ANON_KEY=your-anon-key-here
+# None of these are required in prod — the published CLI bakes in the prod
+# Supabase URL/anon key and Builder URL. Set these only to point the CLI at a
+# non-prod environment (local Supabase, staging Builder, etc.).
 
-# Required for deploy and status commands
-OLLIE_BUILDER_URL=https://builder.ollie.shop
+# Local dev preset (uncomment to target localhost Supabase):
+# OLLIE_SUPABASE_URL=http://127.0.0.1:54321
+# OLLIE_SUPABASE_ANON_KEY=your-anon-key-here
+
+# Override Builder service URL (uncomment for staging):
+# OLLIE_BUILDER_URL=https://staging-builder.example.com

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @ollie-shop/cli@1.2.2 build /home/runner/work/ollie-shop/ollie-shop/packages/cli
+> @ollie-shop/cli@1.3.3 build /home/runner/work/ollie-shop/ollie-shop/packages/cli
 > tsup
 
 CLI Building entry: src/index.tsx
@@ -9,5 +9,5 @@
 CLI Target: node22
 CLI Cleaning output folder
 ESM Build start
-ESM dist/index.js 85.34 KB
-ESM ⚡️ Build success in 216ms
+ESM dist/index.js 92.64 KB
+ESM ⚡️ Build success in 300ms

package/CHANGELOG.md

@@ -1,5 +1,56 @@
 # @ollie-shop/cli
 
+## 1.3.3
+
+### Patch Changes
+
+- 464da1e: adjusting cli to update trigger function
+
+## 1.3.2
+
+### Patch Changes
+
+- b8d922f: Detect newly created components without restarting the dev server. The esbuild context is now recreated when a component folder is added or removed, so `ollieshop start` serves new components immediately instead of returning 404 until restart.
+- 3b01903: Fix `-v`/`--version` and enrich `whoami`.
+
+  `-v`/`--version` now report the real package version (inlined from
+  `package.json` at build time) instead of the hardcoded `ollie v0.1.0`, and the
+  brand string matches the `ollieshop` binary.
+
+  `whoami` now rejects expired sessions (local `exp` check) and, when an
+  `ollie.json` is present, resolves and prints the linked store and organization —
+  gated by Supabase RLS, so a store you cannot access is reported as not found
+  rather than leaked. With no config it returns just the user plus a hint to run
+  `ollieshop init`. The `--stage`/`-s` flag is now parsed as a global flag so
+  `whoami` (and other commands) can target `ollie.{stage}.json`.
+
+- 2587194: Sync a component's slot back to its local `meta.json` when it's edited in Studio. The CLI `/meta` endpoint now only writes when the incoming `id` matches the component already linked in `meta.json`, so the slot is synced only for the matching local component and never written into the wrong one.
+
+## 1.3.1
+
+### Patch Changes
+
+- 2f535de: Bake the prod Builder URL into the published CLI so `ollieshop deploy` works zero-config.
+
+  `getBuilderUrl()` now falls back to `https://api.ollie.shop/builder/v1` when neither `OLLIE_BUILDER_URL` (runtime env) nor `__OLLIE_BUILDER_URL__` (CI build-time inline) is set. Same pattern is applied to the Supabase URL/anon key as a belt-and-braces fix in case CI inject is ever missing for those too. The CHANGELOG for 1.2.1/1.2.2 already promised this baking via a `PROD_DEFAULTS` const and `envOrDefault()` helper, but the actual code relied solely on the tsup `define` substitution — which silently fell through to an empty string whenever the CI `BUILDER_URL` variable was unset or stale. Result: every published CLI since 1.2.2 has required users to manually export `OLLIE_BUILDER_URL=…` before running `ollieshop deploy` or `ollieshop status`.
+
+  Resolution order is now explicit: `process.env.OLLIE_*` (local dev override) > tsup build-time inline (per-environment publish) > hardcoded prod default. All three values are public (anon Supabase JWT, public API URLs), so inlining carries no secret-leak risk. Local devs pointing the CLI at `http://127.0.0.1:54321` or a non-prod Supabase project are unaffected — the env var still wins.
+
+## 1.3.0
+
+### Minor Changes
+
+- 18c3e52: Add `--org <uuid>` flag to `ollieshop store create` and `ollieshop store list` so users who belong to multiple organizations can target a specific one.
+
+  Previously, `getOrganizationId()` blindly took the oldest org the user had a membership in, so multi-org users silently landed every `store create` in the same place with no escape hatch (no flag, no config, no env var). Now:
+
+  - `--org <uuid>` explicitly targets an org; validated via the existing `validateUuid` helper.
+  - When `--org` is omitted and the user has multiple orgs, the CLI throws an error listing every accessible org (id + name) instead of silently picking the oldest.
+  - When `--org` points to an org the user is not a member of, the same list is surfaced so they can see what they _can_ access.
+  - Single-org users are unaffected.
+
+  Scope is limited to `store` because `getOrganizationId` is only called from `core/store.ts` — other commands (`component`, `version`, `deploy`) derive org through `store_id` relationships.
+
 ## 1.2.2
 
 ### Patch Changes

package/CONTEXT.md

@@ -16,15 +16,15 @@ Run `ollieshop login` once. Credentials are stored in `~/.ollie-shop/credentials
 
 ## Environment Variables
 
-Set these before running authenticated commands (or use a `.env` file):
+None required for prod. Supabase URL, Supabase anon key, and Builder URL are all baked into the published binary. Set these only to override the defaults (e.g. point at local Supabase or a staging Builder):
 
 ```
 OLLIE_SUPABASE_URL=http://127.0.0.1:54321
 OLLIE_SUPABASE_ANON_KEY=<your-anon-key>
-OLLIE_BUILDER_URL=https://builder.ollie.shop
+OLLIE_BUILDER_URL=https://staging-builder.example.com
 ```
 
-The CLI will throw a clear error if a required env var is missing. See `.env.example` for reference.
+Resolution order: runtime env var > CI build-time inline > hardcoded prod default. See `.env.example` for the local-dev preset.
 
 ## Typical Agent Workflow
 

package/README.md

@@ -21,14 +21,10 @@ node packages/cli/dist/index.js <command>
 # 1. Authenticate
 ollieshop login
 
-# 2. Set environment variables
-export OLLIE_SUPABASE_URL=https://your-project.supabase.co
-export OLLIE_SUPABASE_ANON_KEY=your-anon-key
-
-# 3. Verify identity
+# 2. Verify identity (prod Supabase/Builder URLs are baked in — no env setup needed)
 ollieshop whoami -o json
 
-# 4. List your stores
+# 3. List your stores
 ollieshop store list -o json --fields id,name,platform
 ```
 
@@ -36,11 +32,11 @@ ollieshop store list -o json --fields id,name,platform
 
 | Variable | Required | Description |
 |----------|----------|-------------|
-| `OLLIE_SUPABASE_URL` | Yes (agent commands) | Supabase project URL |
-| `OLLIE_SUPABASE_ANON_KEY` | Yes (agent commands) | Supabase anon/public key |
-| `OLLIE_BUILDER_URL` | Yes (deploy/status) | Builder service URL |
+| `OLLIE_SUPABASE_URL` | No (prod baked) | Override Supabase project URL — e.g. `http://127.0.0.1:54321` for local dev |
+| `OLLIE_SUPABASE_ANON_KEY` | No (prod baked) | Override Supabase anon/public key |
+| `OLLIE_BUILDER_URL` | No (prod baked) | Override Builder service URL — e.g. a staging endpoint |
 
-See `.env.example` for reference. The CLI will throw a clear error if a required variable is missing.
+All three default to prod and are baked into the published binary. Set the env vars only when pointing the CLI at a non-prod environment. See `.env.example` for local-dev defaults.
 
 ## Commands
 

package/dist/index.js

@@ -36,7 +36,7 @@ function HelpCommand() {
     /* @__PURE__ */ jsxs(Box, { marginLeft: 2, flexDirection: "column", gap: 0, children: [
       /* @__PURE__ */ jsxs(Box, { children: [
         /* @__PURE__ */ jsx(Box, { width: 24, children: /* @__PURE__ */ jsx(Text, { color: "green", children: "whoami" }) }),
-        /* @__PURE__ */ jsx(Text, { children: "Show current user and organization" })
+        /* @__PURE__ */ jsx(Text, { children: "Show current user (and linked store/org from ollie.json)" })
       ] }),
       /* @__PURE__ */ jsxs(Box, { children: [
         /* @__PURE__ */ jsx(Box, { width: 24, children: /* @__PURE__ */ jsx(Text, { color: "green", children: "store create|list" }) }),
@@ -116,6 +116,7 @@ function HelpCommand() {
       /* @__PURE__ */ jsx(Text, { dimColor: true, children: "$ ollieshop whoami -o json" }),
       /* @__PURE__ */ jsx(Text, { dimColor: true, children: "$ ollieshop schema store.create" }),
       /* @__PURE__ */ jsx(Text, { dimColor: true, children: '$ ollieshop store create --name "My Store" --platform vtex --platform-store-id mystore' }),
+      /* @__PURE__ */ jsx(Text, { dimColor: true, children: '$ ollieshop store create --org UUID --name "My Store" --platform vtex --platform-store-id mystore' }),
       /* @__PURE__ */ jsxs(Text, { dimColor: true, children: [
         "$ ollieshop store create --data",
         " ",
@@ -304,6 +305,9 @@ async function getCurrentUser() {
   if (!credentials) return null;
   try {
     const decoded = jwtDecode(credentials.accessToken);
+    if (decoded.exp && decoded.exp * 1e3 <= Date.now()) {
+      return null;
+    }
     return decoded.email ? { email: decoded.email } : null;
   } catch {
     return null;
@@ -439,6 +443,7 @@ function resolveStage(cliStage) {
 }
 
 // src/utils/esbuild.ts
+import { watch } from "fs";
 import fs4 from "fs/promises";
 import http from "http";
 import path4 from "path";
@@ -663,16 +668,69 @@ async function createBuildContext(components, options = {}) {
   });
   return ctx;
 }
-async function startDevServer(ctx, options = {}) {
-  const { port = 4e3, host = "localhost", cwd = process.cwd() } = options;
+async function startDevServer(options = {}) {
+  const {
+    port = 4e3,
+    host = "localhost",
+    cwd = process.cwd(),
+    stage,
+    onRequest,
+    onBuildEnd
+  } = options;
   const servedir = path4.join(cwd, "node_modules/.ollie", "build");
-  await ctx.watch();
+  const componentsDir = path4.join(cwd, "components");
   const internalPort = port + 1;
-  await ctx.serve({
-    port: internalPort,
-    host,
-    servedir,
-    onRequest: options.onRequest
+  let ctx = null;
+  let entryNames = /* @__PURE__ */ new Set();
+  async function buildAndServe(components) {
+    entryNames = new Set(components.map((c) => c.name));
+    ctx = await createBuildContext(components, { cwd, stage, onBuildEnd });
+    await ctx.rebuild();
+    await ctx.watch();
+    await ctx.serve({ port: internalPort, host, servedir, onRequest });
+  }
+  async function recreate() {
+    const components = await discoverComponents({ cwd, stage });
+    const oldCtx = ctx;
+    ctx = null;
+    if (oldCtx) await oldCtx.dispose();
+    await buildAndServe(components);
+  }
+  await buildAndServe(await discoverComponents({ cwd, stage }));
+  async function currentComponentNames() {
+    try {
+      const entries = await glob("*/index.tsx", { cwd: componentsDir });
+      return new Set(entries.map((e) => path4.dirname(e)));
+    } catch {
+      return /* @__PURE__ */ new Set();
+    }
+  }
+  let watchTimer = null;
+  let recreating = false;
+  let pending = false;
+  async function maybeRecreate() {
+    if (recreating) {
+      pending = true;
+      return;
+    }
+    recreating = true;
+    try {
+      do {
+        pending = false;
+        const names = await currentComponentNames();
+        const changed = names.size !== entryNames.size || [...names].some((n) => !entryNames.has(n));
+        if (!changed) break;
+        await recreate();
+      } while (pending);
+    } catch (err) {
+      console.error("[DevServer] Failed to reload components:", err);
+    } finally {
+      recreating = false;
+    }
+  }
+  const componentsWatcher = watch(componentsDir, { recursive: true }, () => {
+    if (watchTimer) clearTimeout(watchTimer);
+    watchTimer = setTimeout(maybeRecreate, 150);
   });
   const proxyServer = http.createServer(async (req, res) => {
     const url = new URL(req.url || "/", `http://${host}:${port}`);
@@ -756,6 +814,16 @@ async function startDevServer(ctx, options = {}) {
             existingMeta = JSON.parse(content);
           } catch {
           }
+          if (typeof updates.id === "string" && typeof existingMeta.id === "string" && existingMeta.id !== updates.id) {
+            res.statusCode = 409;
+            res.setHeader("Content-Type", "application/json");
+            res.end(
+              JSON.stringify({
+                error: `id mismatch: ${componentName} is linked to ${existingMeta.id}`
+              })
+            );
+            return;
+          }
           const newMeta = { ...existingMeta, ...updates };
           await fs4.writeFile(metaPath, JSON.stringify(newMeta, null, 2));
           res.setHeader("Content-Type", "application/json");
@@ -817,9 +885,14 @@ async function startDevServer(ctx, options = {}) {
   return {
     host,
     port,
+    rebuild: async () => {
+      await ctx?.rebuild();
+    },
     stop: async () => {
+      if (watchTimer) clearTimeout(watchTimer);
+      componentsWatcher.close();
       proxyServer.close();
-      await ctx.dispose();
+      await ctx?.dispose();
     }
   };
 }
@@ -869,7 +942,7 @@ function StartCommand({ args }) {
   const [buildCount, setBuildCount] = useState2(0);
   const [lastBuildTime, setLastBuildTime] = useState2(null);
   const logIdRef = useRef(0);
-  const ctxRef = useRef(null);
+  const rebuildRef = useRef(null);
   const stopRef = useRef(null);
   const stage = resolveStage(parseArg(args, "--stage", "-s"));
   const addLog = useCallback((log) => {
@@ -919,21 +992,17 @@ function StartCommand({ args }) {
         }
         setComponents(found);
         setState({ status: "building" });
-        const ctx = await createBuildContext(found, {
+        const server = await startDevServer({
+          port: PORT,
           stage,
+          onRequest: handleRequest,
           onBuildEnd: (updatedComponents) => {
             setComponents(updatedComponents);
             setBuildCount((c) => c + 1);
             setLastBuildTime(/* @__PURE__ */ new Date());
           }
         });
-        ctxRef.current = ctx;
-        await ctx.rebuild();
-        if (!mounted) return;
-        const server = await startDevServer(ctx, {
-          port: PORT,
-          onRequest: handleRequest
-        });
+        rebuildRef.current = server.rebuild;
         stopRef.current = server.stop;
         if (!mounted) {
           await server.stop();
@@ -971,7 +1040,7 @@ function StartCommand({ args }) {
       stopRef.current?.().then(() => exit());
     }
     if (input === "r" && state.status === "running") {
-      ctxRef.current?.rebuild();
+      rebuildRef.current?.();
     }
     if (input === "o" && state.status === "running") {
       const studioUrl = new URL(STUDIO_BASE_URL);
@@ -1177,7 +1246,11 @@ function App({ command, args }) {
   }
 }
 function VersionCommand() {
-  return /* @__PURE__ */ jsx4(Box4, { children: /* @__PURE__ */ jsx4(Text4, { children: "ollie v0.1.0" }) });
+  const version = "1.3.3" ? "1.3.3" : "unknown";
+  return /* @__PURE__ */ jsx4(Box4, { children: /* @__PURE__ */ jsxs4(Text4, { children: [
+    "ollieshop v",
+    version
+  ] }) });
 }
 function UnknownCommand({ command }) {
   return /* @__PURE__ */ jsxs4(Box4, { flexDirection: "column", gap: 1, children: [
@@ -1377,7 +1450,8 @@ function parseArgs(argv) {
     output: flags.output || flags.o || void 0,
     dryRun: flags["dry-run"] === true,
     fields: flags.fields ? String(flags.fields).split(",").map((f) => f.trim()) : void 0,
-    data: flags.data || flags.d || void 0
+    data: flags.data || flags.d || void 0,
+    stage: flags.stage || flags.s || void 0
   };
   return { command, subcommand, flags, global, positional };
 }
@@ -1397,13 +1471,33 @@ function getBoolFlag(flags, ...names) {
 
 // src/utils/supabase.ts
 import { createClient } from "@supabase/supabase-js";
+var PROD_DEFAULTS = {
+  supabaseUrl: "https://aazahtmqrhjqsyqoqdkm.supabase.co",
+  supabaseAnonKey: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImFhemFodG1xcmhqcXN5cW9xZGttIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDg2MzEwOTcsImV4cCI6MjA2NDIwNzA5N30.VuAbAyjDe0HcL09SZtQ-UmP1o7Z6qwGuOtvfFhnyAcM",
+  builderUrl: "https://api.ollie.shop/builder/v1"
+};
+function envOrDefault(envValue, buildTimeValue, prodDefault) {
+  return envValue || buildTimeValue || prodDefault;
+}
+function unwrapToOne(embed) {
+  const record = Array.isArray(embed) ? embed[0] : embed;
+  return record && typeof record === "object" ? record : null;
+}
 async function getAuthenticatedClient() {
   const credentials = await getCredentials();
   if (!credentials) {
     throw new Error("Not authenticated. Run `ollieshop login` first.");
   }
-  const supabaseUrl = process.env.OLLIE_SUPABASE_URL || "https://aazahtmqrhjqsyqoqdkm.supabase.co";
-  const supabaseAnonKey = process.env.OLLIE_SUPABASE_ANON_KEY || "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImFhemFodG1xcmhqcXN5cW9xZGttIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDg2MzEwOTcsImV4cCI6MjA2NDIwNzA5N30.VuAbAyjDe0HcL09SZtQ-UmP1o7Z6qwGuOtvfFhnyAcM";
+  const supabaseUrl = envOrDefault(
+    process.env.OLLIE_SUPABASE_URL,
+    "https://aazahtmqrhjqsyqoqdkm.supabase.co",
+    PROD_DEFAULTS.supabaseUrl
+  );
+  const supabaseAnonKey = envOrDefault(
+    process.env.OLLIE_SUPABASE_ANON_KEY,
+    "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImFhemFodG1xcmhqcXN5cW9xZGttIiwicm9sZSI6ImFub24iLCJpYXQiOjE3NDg2MzEwOTcsImV4cCI6MjA2NDIwNzA5N30.VuAbAyjDe0HcL09SZtQ-UmP1o7Z6qwGuOtvfFhnyAcM",
+    PROD_DEFAULTS.supabaseAnonKey
+  );
   const client = createClient(supabaseUrl, supabaseAnonKey, {
     auth: {
       autoRefreshToken: false,
@@ -1417,7 +1511,11 @@ async function getAuthenticatedClient() {
   return client;
 }
 function getBuilderUrl() {
-  return process.env.OLLIE_BUILDER_URL || "";
+  return envOrDefault(
+    process.env.OLLIE_BUILDER_URL,
+    "",
+    PROD_DEFAULTS.builderUrl
+  );
 }
 async function getAuthToken() {
   const credentials = await getCredentials();
@@ -1426,17 +1524,35 @@ async function getAuthToken() {
   }
   return credentials.accessToken;
 }
-async function getOrganizationId(client) {
-  const { data: org, error } = await client.from("organizations").select("id").order("created_at", { ascending: true }).limit(1).maybeSingle();
+async function getOrganizationId(client, preferredOrgId) {
+  const { data: orgs, error } = await client.from("organizations").select("id, name").order("created_at", { ascending: true });
   if (error) {
     throw new Error(`Failed to get organization: ${error.message}`);
   }
-  if (!org) {
+  if (!orgs || orgs.length === 0) {
     throw new Error(
       "No organization found for your account. Create one at https://admin.ollie.shop"
     );
   }
-  return org.id;
+  if (preferredOrgId) {
+    const match = orgs.find((o) => o.id === preferredOrgId);
+    if (!match) {
+      const list = orgs.map((o) => `  - ${o.id}  ${o.name}`).join("\n");
+      throw new Error(
+        `Organization ${preferredOrgId} not found or you are not a member. Orgs you can access:
+${list}`
+      );
+    }
+    return match.id;
+  }
+  if (orgs.length > 1) {
+    const list = orgs.map((o) => `  - ${o.id}  ${o.name}`).join("\n");
+    throw new Error(
+      `You belong to multiple organizations. Pass --org <id> to select one:
+${list}`
+    );
+  }
+  return orgs[0].id;
 }
 
 // src/utils/validate.ts
@@ -1663,8 +1779,11 @@ var componentListSchema = z2.object({
 var functionCreateSchema = z2.object({
   versionId: z2.string().uuid().describe("Parent version UUID"),
   name: z2.string().min(1).describe("Function name"),
-  trigger: z2.string().min(1).optional().describe(
-    "Function trigger URL \u2014 absolute http(s) URL or relative path starting with /"
+  trigger: z2.object({
+    url: z2.string().min(1).describe("Trigger URL \u2014 absolute http(s) URL"),
+    expression: z2.string().min(1).describe(`JSONata-like match expression (e.g. 'method in ["GET"]')`)
+  }).optional().describe(
+    "Function trigger \u2014 both url and expression are required together"
   ),
   active: z2.boolean().default(false).describe("Whether function is active (default: false)"),
   onError: z2.enum(["throw", "skip"]).optional().describe("Error handling: throw (default) or skip"),
@@ -2087,6 +2206,36 @@ async function listFunctions(client, storeId, versionId) {
 
 // src/commands/function-cmd.ts
 var ON_ERROR_VALUES = ["throw", "skip"];
+function parseTriggerFromFlags(urlFlag, expressionFlag) {
+  if (urlFlag === void 0 && expressionFlag === void 0) return void 0;
+  if (urlFlag === void 0 || expressionFlag === void 0) {
+    throw new Error(
+      "Both --trigger-url and --trigger-expression are required when configuring a trigger."
+    );
+  }
+  return {
+    url: validateTriggerUrl(urlFlag, "trigger-url"),
+    expression: validateRequired(expressionFlag, "trigger-expression")
+  };
+}
+function parseTriggerFromData(raw) {
+  if (raw === void 0 || raw === null) return void 0;
+  if (typeof raw !== "object" || Array.isArray(raw)) {
+    throw new Error(
+      'Invalid trigger: must be an object with "url" and "expression" string properties.'
+    );
+  }
+  const obj = raw;
+  if (typeof obj.url !== "string" || typeof obj.expression !== "string") {
+    throw new Error(
+      'Invalid trigger: both "url" and "expression" must be non-empty strings.'
+    );
+  }
+  return {
+    url: validateTriggerUrl(obj.url, "trigger.url"),
+    expression: validateRequired(obj.expression, "trigger.expression")
+  };
+}
 async function functionCommand(parsed2) {
   const sub = parsed2.subcommand;
   if (sub === "create") return functionCreateCommand(parsed2);
@@ -2105,13 +2254,14 @@ async function functionCreateCommand(parsed2) {
       input = {
         versionId: validateUuid(raw.versionId, "versionId"),
         name: validateRequired(raw.name, "name"),
-        trigger: raw.trigger !== void 0 && raw.trigger !== null ? validateTriggerUrl(String(raw.trigger), "trigger") : void 0,
+        trigger: parseTriggerFromData(raw.trigger),
         active: raw.active === true,
         onError: raw.onError !== void 0 && raw.onError !== null ? validateEnum(String(raw.onError), ON_ERROR_VALUES, "on-error") : "throw",
         priority: raw.priority !== void 0 && raw.priority !== null ? validateInteger(raw.priority, "priority", { min: 0 }) : 0
       };
     } else {
-      const triggerFlag = getFlag(parsed2.flags, "trigger");
+      const triggerUrlFlag = getFlag(parsed2.flags, "trigger-url");
+      const triggerExpressionFlag = getFlag(parsed2.flags, "trigger-expression");
       const onErrorFlag = getFlag(parsed2.flags, "on-error");
       const priorityFlag = getFlag(parsed2.flags, "priority");
       input = {
@@ -2120,7 +2270,7 @@ async function functionCreateCommand(parsed2) {
           "version-id"
         ),
         name: validateRequired(getFlag(parsed2.flags, "name", "n"), "name"),
-        trigger: triggerFlag !== void 0 ? validateTriggerUrl(triggerFlag, "trigger") : void 0,
+        trigger: parseTriggerFromFlags(triggerUrlFlag, triggerExpressionFlag),
         active: getBoolFlag(parsed2.flags, "active"),
         onError: onErrorFlag !== void 0 ? validateEnum(onErrorFlag, ON_ERROR_VALUES, "on-error") : "throw",
         priority: priorityFlag !== void 0 ? validateInteger(priorityFlag, "priority", { min: 0 }) : 0
@@ -2304,14 +2454,14 @@ async function statusCommand(parsed2) {
 }
 
 // src/core/store.ts
-async function createStore(client, input) {
+async function createStore(client, input, orgId) {
   const parsed2 = storeCreateSchema.safeParse(input);
   if (!parsed2.success) {
     return {
       error: { message: parsed2.error.issues.map((i) => i.message).join("; ") }
     };
   }
-  const organizationId = await getOrganizationId(client);
+  const organizationId = await getOrganizationId(client, orgId);
   const { data, error } = await client.from("stores").insert({
     name: parsed2.data.name,
     platform: parsed2.data.platform,
@@ -2325,8 +2475,33 @@ async function createStore(client, input) {
   }
   return { data: { id: data.id } };
 }
-async function listStores(client) {
-  const organizationId = await getOrganizationId(client);
+async function getStoreById(client, storeId) {
+  const { data, error } = await client.from("stores").select("id, name, organization_id, organizations(id, name)").eq("id", storeId).maybeSingle();
+  if (error) {
+    return { error: { message: error.message } };
+  }
+  if (!data) {
+    return {
+      error: {
+        message: `Store ${storeId} not found or you don't have access to it.`
+      }
+    };
+  }
+  const org = unwrapToOne(
+    data.organizations
+  );
+  const orgName = org?.name ?? null;
+  return {
+    data: {
+      id: data.id,
+      name: data.name,
+      organizationId: data.organization_id,
+      organizationName: orgName
+    }
+  };
+}
+async function listStores(client, orgId) {
+  const organizationId = await getOrganizationId(client, orgId);
   const { data, error } = await client.from("stores").select(
     "id, name, platform, platform_store_id, organization_id, logo, settings, created_at"
   ).eq("organization_id", organizationId).order("created_at", { ascending: false });
@@ -2378,12 +2553,14 @@ async function storeCreateCommand(parsed2) {
         settings: getFlag(parsed2.flags, "settings")
       };
     }
+    const orgFlag = getFlag(parsed2.flags, "org");
+    const orgId = orgFlag ? validateUuid(orgFlag, "org") : void 0;
     if (parsed2.global.dryRun) {
-      outputDryRun("store.create", input, format);
+      outputDryRun("store.create", { ...input, orgId }, format);
       return;
     }
     const client = await getAuthenticatedClient();
-    const result = await createStore(client, input);
+    const result = await createStore(client, input, orgId);
     outputResult(result, format, parsed2.global.fields);
     if (result.error) process.exit(1);
   } catch (err) {
@@ -2399,8 +2576,10 @@ async function storeCreateCommand(parsed2) {
 async function storeListCommand(parsed2) {
   const format = detectOutputFormat(parsed2.global.output);
   try {
+    const orgFlag = getFlag(parsed2.flags, "org");
+    const orgId = orgFlag ? validateUuid(orgFlag, "org") : void 0;
     const client = await getAuthenticatedClient();
-    const result = await listStores(client);
+    const result = await listStores(client, orgId);
     outputResult(result, format, parsed2.global.fields);
     if (result.error) process.exit(1);
   } catch (err) {
@@ -2524,21 +2703,71 @@ async function whoamiCommand(parsed2) {
   if (!user) {
     outputResult(
       {
-        error: { message: "Not logged in. Run `ollieshop login`." }
+        error: {
+          message: "Not logged in or session expired. Run `ollieshop login`."
+        }
+      },
+      format
+    );
+    process.exit(1);
+  }
+  try {
+    const stage = resolveStage(parsed2.global.stage);
+    const config = await loadConfig({ stage });
+    if (!config?.storeId) {
+      outputResult(
+        {
+          data: {
+            email: user.email,
+            hint: "No ollie.json found. Run `ollieshop init` to link a store."
+          }
+        },
+        format,
+        parsed2.global.fields
+      );
+      return;
+    }
+    const client = await getAuthenticatedClient();
+    const result = await getStoreById(client, config.storeId);
+    if (result.error || !result.data) {
+      outputResult(
+        {
+          data: {
+            email: user.email,
+            storeId: config.storeId,
+            store: null,
+            note: result.error?.message ?? "Store not found. Run `ollieshop login` or check the storeId in ollie.json."
+          }
+        },
+        format,
+        parsed2.global.fields
+      );
+      return;
+    }
+    const store = result.data;
+    outputResult(
+      {
+        data: {
+          email: user.email,
+          orgId: store.organizationId,
+          org: store.organizationName,
+          storeId: store.id,
+          store: store.name,
+          ...config.versionId ? { versionId: config.versionId } : {}
+        }
+      },
+      format,
+      parsed2.global.fields
+    );
+  } catch (err) {
+    outputResult(
+      {
+        error: { message: err instanceof Error ? err.message : String(err) }
       },
       format
     );
     process.exit(1);
   }
-  outputResult(
-    {
-      data: {
-        email: user.email
-      }
-    },
-    format,
-    parsed2.global.fields
-  );
 }
 
 // src/index.tsx