diff --git a/.gitmodules b/.gitmodules
index 195d55a9..1dbb83bc 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,6 +2,10 @@
 	path = extensions
 	url = https://github.com/lumibase-ai/extensions
 	branch = main
+[submodule "apps/marketplace"]
+	path = apps/marketplace
+	url = git@github.com:lumibase-ai/marketplace.git
+	branch = main
 [submodule "apps/enterprise"]
 	path = apps/enterprise
 	url = https://github.com/lumibase-ai/enterprise-core.git
diff --git a/.kiro/specs/admin-setup-wizard/setup-impact.md b/.kiro/specs/admin-setup-wizard/setup-impact.md
index 157185f2..49212d0f 100644
--- a/.kiro/specs/admin-setup-wizard/setup-impact.md
+++ b/.kiro/specs/admin-setup-wizard/setup-impact.md
@@ -88,6 +88,7 @@ Trạng thái: `pending` (chưa làm) · `in-progress` · `done` (setup + backfi
 | 33 | collection-create-modes | v0.9.x (proposal) | Bước chọn chế độ tạo collection (View / DB View / Flexible View) + Default_Field_Catalogue + Localize_Dropdown dùng chung. View_Mode không cần khởi tạo. DB/Flexible mode đề xuất 2 cột mới `collections.read_only`/`source_object` | pending | [collection-create-modes/tasks.md](../collection-create-modes/tasks.md) Phase 5.1 | Rà soát 2026-06-29 (PROPOSAL, chưa code). (1) Có thể cần seed `localize` field type khi nền tảng field-localization xong (chờ ADR). (2) Localize_Dropdown đọc Tenant_Locales từ feature #34 — chưa có nguồn truth chính thức (fallback `['en','vi']` hard-code hiện tại). (4) Bước UI mới = mode selector TRƯỚC wizard (không thuộc setup wizard). (6) DB/Flexible mode cần migration thủ công 2 cột (`read_only`,`source_object`) → backfill default an toàn (`false`/`null`); View_Mode KHÔNG migration. Phụ thuộc #34, #35 |
 | 34 | tenant-localization-config | v0.9.x (proposal) | Nguồn truth Tenant_Locales (khuyến nghị `settings.key='locales'`) + UI Settings → Languages + sửa Admin_Path. Lấp GAP: hiện không có bảng/API available-locales, `settings.get('locales')` fallback hard-code `['en','vi']` | pending | [tenant-localization-config/tasks.md](../tenant-localization-config/tasks.md) Phase 5.1 | Rà soát 2026-06-29 (PROPOSAL, chưa code). (1) Setup KHỞI TẠO `settings.locales=[default_language]` khi xong (Req 4.2). (2) Settings key `locales` mới — operator cần biết. (4) Tùy chọn thêm bước "ngôn ngữ" vào setup wizard; nếu không thì default `[default_language]`. (6) Nếu dùng `settings` (khuyến nghị) → KHÔNG migration; instance cũ thiếu key → fallback `[default_language]`. Admin_Path từ `/setup/path` thành giá trị sửa-được. Phụ thuộc lẫn nhau với #33 |
 | 35 | db-view-introspection | v0.9.x (proposal) | Endpoint introspection DB (`/db/objects`, `/collections/:name/introspect`) + chấm than (⚠) cho Uncatalogued_Field + bootstrap-on-click tạo record `fields`. Lấp GAP: hiện không có introspection, field chỉ đọc từ bảng `fields` | pending | [db-view-introspection/tasks.md](../db-view-introspection/tasks.md) Phase 5.1 | Rà soát 2026-06-29 (PROPOSAL, chưa code). (1) KHÔNG seed. (2) KHÔNG settings key. (3) Quyền dùng = quyền quản trị schema sẵn có; bootstrap qua agent cần HITL `ai_approvals` (rule #4). (4) KHÔNG bước setup wizard mới. (5) Có thể cần capability flag báo runtime hỗ trợ introspection. (6) KHÔNG bảng mới của riêng nó (đọc `information_schema`/`PRAGMA`); dùng chung 2 cột với #33. Adapter introspect qua runtime abstraction (rule #3). Phụ thuộc #33 |
+| 36 | (marketplace community: install-trust/download/vote/submit) | v0.16.x | Đã rà soát: mở rộng marketplace — badge `verified` (trusted source: signature + publisher key + hash) trên catalog, nút download package (`GET /extensions/:slug/download`, bump `downloadCount`, 302 → bundle), upvote (`POST`/`DELETE /extensions/:slug/vote`, idempotent qua unique `(userId, marketplaceSlug)`), community submit (`POST /submit` → row global `pending`/unpublished) + moderation (`GET /submissions`, `POST /submissions/:id/review` cần `extensions:configure`). Thêm cột `extensions.download_count`/`submission_status`/`submitted_by` + bảng mới `extension_votes` (migration `0003_marketplace_votes_downloads`) | n/a | — | Rà soát 2026-07-04. (1) KHÔNG seed: votes/submissions tạo theo nhu cầu; `download_count` mặc định 0. (2) KHÔNG feature-flag/settings key mới. (3) KHÔNG policy/grant DB mới — vote/submit chỉ cần `withAuth` (user đã đăng nhập); moderation dùng lại capability `extensions:configure` sẵn có (không role mặc định nào cần bổ sung ngoài admin đã có). (4) KHÔNG bước UI wizard mới — thao tác ở Studio → Marketplace / site công khai sau setup. (5) KHÔNG capability `/setup/capabilities` mới. (6) KHÔNG cần backfill dữ liệu: migration `0003` chỉ `ADD COLUMN` (có default `0`/nullable) + `CREATE TABLE extension_votes` (forward-only qua journal); instance cũ nhận `download_count=0`, bảng votes rỗng, listing chưa ký hiện `verified=false`. **Submodule move** của `apps/marketplace` → `lumibase-ai/marketplace` là thao tác git thuần (script `scripts/marketplace-submodule-migration.sh`), KHÔNG ảnh hưởng setup/DB |
 | 37 | (security hardening: file upload) | v0.17.x | Đã rà soát: mở rộng `withFileUploadPolicy` để phủ luôn `POST /api/v1/media/:key` (trước đây chỉ phủ `/files`): chặn public role đẩy bytes, cap size theo bytes THẬT (không chỉ `Content-Length`), allowlist MIME, đối chiếu đuôi↔MIME, content-sniff magic bytes, và chặn SVG chứa mã động (`<script>`/`on*=`/`javascript:`/`<foreignObject>`/XXE). Serve media dưới `Content-Disposition: attachment` + `nosniff`; storage adapter map `contentType` sang field native R2/S3 để round-trip đúng. Allowlist/size giờ cấu hình được **per-site qua DB** (settings key `upload_policy`) + trang Studio **Settings → Uploads** + endpoint `GET/PUT /api/v1/uploads/config`; guard đọc DB→env→default (fail-safe). Catalogue đuôi/MIME gom về `@lumibase/shared/schemas` (single source cho server + picker). Code + test + docs only | n/a | — | Rà soát 2026-07-05. (1) KHÔNG seed: không cần seed row `upload_policy` — vắng row → guard fallback env→default (allowlist ảnh/PDF/CSV/text + 10 MiB). (2) **Settings key mới `upload_policy`** (scope `site`, lưu trong bảng `settings` sẵn có) — operator có thể sửa qua Settings → Uploads; env `FILE_UPLOAD_MAX_BYTES`/`FILE_UPLOAD_ALLOWED_MIME_TYPES` vẫn là fallback. (3) KHÔNG policy/grant DB mới — PUT gated bằng `requireSiteAdmin`; `/media` vẫn dựa RBAC `media:create` (default-deny). (4) KHÔNG bước setup wizard mới (trang nằm trong Settings, không phải wizard). (5) KHÔNG capability `/setup/capabilities` mới. (6) KHÔNG backfill/migration: `upload_policy` dùng bảng `settings` (đã tồn tại), instance cũ thiếu row → fallback tự động; object media cũ (content-type chỉ trong custom metadata) vẫn serve đúng nhờ fallback `obj.metadata?.contentType`. Xem `docs/en/security/runtime-security-guards-plan.md` mục "File upload policy" |
 
 ## Lưu ý backfill
diff --git a/apps/cms/src/routes/__tests__/marketplace-catalog.test.ts b/apps/cms/src/routes/__tests__/marketplace-catalog.test.ts
index 1a8febcb..79d5df41 100644
--- a/apps/cms/src/routes/__tests__/marketplace-catalog.test.ts
+++ b/apps/cms/src/routes/__tests__/marketplace-catalog.test.ts
@@ -1,25 +1,34 @@
-import type { Database } from '@lumibase/database';
+import { extensionVotes, type Database } from '@lumibase/database';
 import { Hono } from 'hono';
 import { describe, expect, it } from 'vitest';
 import type { AppEnv } from '../../env';
 import { marketplaceRouter } from '../marketplace';
 
-function makeDb(rows: unknown[]): Database {
-  const selectFluent = {
-    from: () => selectFluent,
-    where: () => Promise.resolve(rows),
-  };
+type VoteRow = { marketplaceSlug: string; userId: string };
 
+// Table-aware mock: `.from(extensionVotes)` resolves to the vote rows, every
+// other table resolves to the extension rows.
+function makeDb(rows: unknown[], votes: VoteRow[] = []): Database {
   return {
-    select: () => selectFluent,
+    select: () => {
+      let data: unknown[] = rows;
+      const fluent = {
+        from: (table: unknown) => {
+          data = table === extensionVotes ? votes : rows;
+          return fluent;
+        },
+        where: () => Promise.resolve(data),
+      };
+      return fluent;
+    },
   } as unknown as Database;
 }
 
-function buildApp(rows: unknown[]) {
+function buildApp(rows: unknown[], votes: VoteRow[] = []) {
   const app = new Hono<AppEnv>();
   app.use('*', async (c, next) => {
     c.set('siteId', 'site_1');
-    c.set('db', makeDb(rows));
+    c.set('db', makeDb(rows, votes));
     c.set('runtime', { cache: undefined, search: undefined, queue: undefined } as never);
     await next();
   });
@@ -153,6 +162,39 @@ describe('marketplace public catalog routes', () => {
     });
   });
 
+  it('marks a signed listing verified and surfaces download + vote metrics', async () => {
+    const app = buildApp(
+      [
+        row({
+          signature: 'sig',
+          publisherKeyId: 'key_1',
+          bundleSha256: 'a'.repeat(64),
+          downloadCount: 42,
+        }),
+      ],
+      [
+        { marketplaceSlug: 'seo-toolkit', userId: 'u1' },
+        { marketplaceSlug: 'seo-toolkit', userId: 'u2' },
+      ],
+    );
+
+    const res = await app.request('/api/v1/marketplace/extensions');
+    const body = (await res.json()) as { data: Array<Record<string, unknown>> };
+    expect(body.data[0]).toMatchObject({
+      verified: true,
+      totalDownloads: 42,
+      voteCount: 2,
+      hasVoted: false,
+    });
+  });
+
+  it('leaves an unsigned listing unverified with zeroed metrics', async () => {
+    const app = buildApp([row({})]);
+    const res = await app.request('/api/v1/marketplace/extensions');
+    const body = (await res.json()) as { data: Array<Record<string, unknown>> };
+    expect(body.data[0]).toMatchObject({ verified: false, voteCount: 0, totalDownloads: 0 });
+  });
+
   it('returns 404 for missing extension detail', async () => {
     const res = await buildApp([]).request('/api/v1/marketplace/extensions/missing');
 
diff --git a/apps/cms/src/routes/__tests__/marketplace-community.test.ts b/apps/cms/src/routes/__tests__/marketplace-community.test.ts
new file mode 100644
index 00000000..b90dc1f5
--- /dev/null
+++ b/apps/cms/src/routes/__tests__/marketplace-community.test.ts
@@ -0,0 +1,262 @@
+import { extensionVotes, type Database } from '@lumibase/database';
+import { Hono } from 'hono';
+import { describe, expect, it } from 'vitest';
+import type { AppEnv } from '../../env';
+import { marketplaceRouter } from '../marketplace';
+
+type Row = Record<string, unknown>;
+
+interface State {
+  extensions: Row[];
+  votes: Array<{ marketplaceSlug: string; userId: string }>;
+}
+
+/**
+ * Stateful, table-aware mock covering the mutation chains the community routes
+ * use: select/insert(onConflictDoNothing|returning)/update(set.where[.returning])/delete.
+ * It is deliberately predicate-blind — tests are seeded with a single logical
+ * subject so the coarse mutations (e.g. delete clears votes) behave correctly.
+ */
+function makeDb(state: State): Database {
+  return {
+    select: () => {
+      let data: unknown[] = state.extensions;
+      const fluent = {
+        from: (table: unknown) => {
+          data = table === extensionVotes ? state.votes : state.extensions;
+          return fluent;
+        },
+        where: () => Promise.resolve(data),
+      };
+      return fluent;
+    },
+    insert: (table: unknown) => ({
+      values: (vals: Row | Row[]) => {
+        const arr = Array.isArray(vals) ? vals : [vals];
+        return {
+          onConflictDoNothing: () => {
+            if (table === extensionVotes) {
+              for (const v of arr) {
+                const exists = state.votes.some(
+                  (x) =>
+                    x.userId === v.userId &&
+                    x.marketplaceSlug === v.marketplaceSlug,
+                );
+                if (!exists)
+                  state.votes.push(
+                    v as { marketplaceSlug: string; userId: string },
+                  );
+              }
+            }
+            return Promise.resolve();
+          },
+          returning: () => {
+            if (table !== extensionVotes) state.extensions.push(...arr);
+            return Promise.resolve(arr);
+          },
+        };
+      },
+    }),
+    update: () => ({
+      set: (patch: Row) => ({
+        where: () => {
+          const result =
+            state.extensions.length > 0
+              ? [{ ...state.extensions[0], ...patch }]
+              : [];
+          return Object.assign(Promise.resolve(result), {
+            returning: () => Promise.resolve(result),
+          });
+        },
+      }),
+    }),
+    delete: () => ({
+      where: () => {
+        state.votes = [];
+        return Promise.resolve();
+      },
+    }),
+  } as unknown as Database;
+}
+
+function buildApp(state: State, userId: string | null) {
+  const app = new Hono<AppEnv>();
+  app.use('*', async (c, next) => {
+    c.set('siteId', 'site_1');
+    c.set('db', makeDb(state));
+    c.set('runtime', { cache: undefined } as never);
+    if (userId) c.set('auth', { userId } as never);
+    await next();
+  });
+  app.route('/api/v1/marketplace', marketplaceRouter);
+  return app;
+}
+
+const published: Row = {
+  id: 'ext_1',
+  siteId: null,
+  name: 'SEO Toolkit',
+  version: '1.0.0',
+  type: 'module',
+  bundleUrl: 'https://cdn.example/seo.js',
+  bundleSha256: 'a'.repeat(64),
+  signature: 'sig',
+  signatureAlg: 'ed25519',
+  publisherKeyId: 'key_1',
+  publisher: 'LumiBase',
+  marketplaceSlug: 'seo-toolkit',
+  publishedAt: new Date('2026-06-01T00:00:00.000Z'),
+  downloadCount: 5,
+  submissionStatus: null,
+  submittedBy: null,
+};
+
+describe('marketplace download', () => {
+  it('redirects to the bundle by default', async () => {
+    const app = buildApp({ extensions: [{ ...published }], votes: [] }, null);
+    const res = await app.request('/api/v1/marketplace/extensions/seo-toolkit/download', {
+      redirect: 'manual',
+    });
+    expect(res.status).toBe(302);
+    expect(res.headers.get('location')).toBe('https://cdn.example/seo.js');
+  });
+
+  it('returns bundle metadata with an incremented count when redirect=0', async () => {
+    const app = buildApp({ extensions: [{ ...published }], votes: [] }, null);
+    const res = await app.request(
+      '/api/v1/marketplace/extensions/seo-toolkit/download?redirect=0',
+    );
+    expect(res.status).toBe(200);
+    const body = (await res.json()) as { data: Record<string, unknown> };
+    expect(body.data).toMatchObject({
+      slug: 'seo-toolkit',
+      bundleUrl: 'https://cdn.example/seo.js',
+      bundleSha256: 'a'.repeat(64),
+      downloadCount: 6,
+    });
+  });
+
+  it('404s for an unknown slug', async () => {
+    const app = buildApp({ extensions: [], votes: [] }, null);
+    const res = await app.request('/api/v1/marketplace/extensions/nope/download');
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('marketplace voting', () => {
+  it('requires authentication', async () => {
+    const app = buildApp({ extensions: [{ ...published }], votes: [] }, null);
+    const res = await app.request('/api/v1/marketplace/extensions/seo-toolkit/vote', {
+      method: 'POST',
+    });
+    expect(res.status).toBe(401);
+  });
+
+  it('records an upvote and reports the new tally', async () => {
+    const state: State = { extensions: [{ ...published }], votes: [] };
+    const app = buildApp(state, 'user_1');
+    const res = await app.request('/api/v1/marketplace/extensions/seo-toolkit/vote', {
+      method: 'POST',
+    });
+    expect(res.status).toBe(200);
+    expect(await res.json()).toEqual({
+      data: { slug: 'seo-toolkit', voteCount: 1, hasVoted: true },
+    });
+    expect(state.votes).toHaveLength(1);
+  });
+
+  it('is idempotent for a repeat vote from the same user', async () => {
+    const state: State = { extensions: [{ ...published }], votes: [] };
+    const app = buildApp(state, 'user_1');
+    await app.request('/api/v1/marketplace/extensions/seo-toolkit/vote', { method: 'POST' });
+    const res = await app.request('/api/v1/marketplace/extensions/seo-toolkit/vote', {
+      method: 'POST',
+    });
+    const body = (await res.json()) as { data: { voteCount: number } };
+    expect(body.data.voteCount).toBe(1);
+    expect(state.votes).toHaveLength(1);
+  });
+
+  it('removes a vote on DELETE', async () => {
+    const state: State = {
+      extensions: [{ ...published }],
+      votes: [{ marketplaceSlug: 'seo-toolkit', userId: 'user_1' }],
+    };
+    const app = buildApp(state, 'user_1');
+    const res = await app.request('/api/v1/marketplace/extensions/seo-toolkit/vote', {
+      method: 'DELETE',
+    });
+    expect(res.status).toBe(200);
+    expect(await res.json()).toEqual({
+      data: { slug: 'seo-toolkit', voteCount: 0, hasVoted: false },
+    });
+  });
+
+  it('404s when voting for an unpublished slug', async () => {
+    const app = buildApp({ extensions: [], votes: [] }, 'user_1');
+    const res = await app.request('/api/v1/marketplace/extensions/ghost/vote', {
+      method: 'POST',
+    });
+    expect(res.status).toBe(404);
+  });
+});
+
+describe('marketplace community submission', () => {
+  const validBody = {
+    name: 'My Widget',
+    version: '0.1.0',
+    type: 'panel',
+    marketplaceSlug: 'my-widget',
+    bundleUrl: 'https://cdn.example/my-widget.js',
+    description: 'A handy widget.',
+    publisher: 'Acme',
+  };
+
+  it('requires authentication', async () => {
+    const app = buildApp({ extensions: [], votes: [] }, null);
+    const res = await app.request('/api/v1/marketplace/submit', {
+      method: 'POST',
+      body: JSON.stringify(validBody),
+      headers: { 'Content-Type': 'application/json' },
+    });
+    expect(res.status).toBe(401);
+  });
+
+  it('creates a pending, unpublished listing', async () => {
+    const state: State = { extensions: [], votes: [] };
+    const app = buildApp(state, 'user_1');
+    const res = await app.request('/api/v1/marketplace/submit', {
+      method: 'POST',
+      body: JSON.stringify(validBody),
+      headers: { 'Content-Type': 'application/json' },
+    });
+    expect(res.status).toBe(201);
+    const body = (await res.json()) as { data: Record<string, unknown> };
+    expect(body.data).toMatchObject({
+      marketplaceSlug: 'my-widget',
+      submissionStatus: 'pending',
+      submittedBy: 'user_1',
+      publishedAt: null,
+    });
+  });
+
+  it('rejects a slug already live in the catalog', async () => {
+    const app = buildApp({ extensions: [{ ...published, marketplaceSlug: 'my-widget' }], votes: [] }, 'user_1');
+    const res = await app.request('/api/v1/marketplace/submit', {
+      method: 'POST',
+      body: JSON.stringify(validBody),
+      headers: { 'Content-Type': 'application/json' },
+    });
+    expect(res.status).toBe(409);
+  });
+
+  it('validates the payload', async () => {
+    const app = buildApp({ extensions: [], votes: [] }, 'user_1');
+    const res = await app.request('/api/v1/marketplace/submit', {
+      method: 'POST',
+      body: JSON.stringify({ ...validBody, version: 'not-semver' }),
+      headers: { 'Content-Type': 'application/json' },
+    });
+    expect(res.status).toBe(400);
+  });
+});
diff --git a/apps/cms/src/routes/marketplace.ts b/apps/cms/src/routes/marketplace.ts
index ddd66e79..6a57b617 100644
--- a/apps/cms/src/routes/marketplace.ts
+++ b/apps/cms/src/routes/marketplace.ts
@@ -17,8 +17,9 @@
  *     using WebCrypto (`subtle.verify`).
  */
 
-import { extensions, userSites, notifications, roles } from "@lumibase/database";
+import { extensions, extensionVotes, userSites, notifications, roles } from "@lumibase/database";
 import { and, eq, inArray, isNotNull, isNull } from "drizzle-orm";
+import { nanoid } from "nanoid";
 import { Hono, type Context } from "hono";
 import { z } from "zod";
 import type { AppEnv } from "../env";
@@ -187,7 +188,14 @@ function latestPublishedRows(rows: ExtensionRow[]): ExtensionRow[] {
   return [...bySlug.values()];
 }
 
-function toCatalogExtension(row: ExtensionRow) {
+interface CatalogProjectionOpts {
+  /** Total upvotes for the listing (across versions). */
+  voteCount?: number;
+  /** Whether the requesting user has already upvoted. */
+  hasVoted?: boolean;
+}
+
+function toCatalogExtension(row: ExtensionRow, opts: CatalogProjectionOpts = {}) {
   const manifest = asManifest(row.manifest);
   const slug = row.marketplaceSlug ?? row.key ?? extensionKey(row);
   const category = asString(catalogValue(manifest, "category")) ?? row.type;
@@ -215,7 +223,15 @@ function toCatalogExtension(row: ExtensionRow) {
     latestVersion: row.version,
     version: row.version,
     type: row.type,
-    totalDownloads: 0,
+    totalDownloads: row.downloadCount ?? 0,
+    voteCount: opts.voteCount ?? 0,
+    hasVoted: opts.hasVoted ?? false,
+    /**
+     * Trusted source signal: the listing carries a detached signature bound
+     * to a registered publisher key and an integrity hash. The install path
+     * re-verifies cryptographically; this flag drives the "verified" badge.
+     */
+    verified: Boolean(row.signature && row.publisherKeyId && row.bundleSha256),
     rating: null,
     ratingCount: null,
     versions: [
@@ -249,6 +265,40 @@ function parsePositiveInt(value: string | undefined, fallback: number, max?: num
   return max ? Math.min(integer, max) : integer;
 }
 
+/**
+ * Load raw vote rows for the given slugs. Aggregated in JS (consistent with the
+ * catalog which already materialises rows in memory) so callers can derive both
+ * per-slug counts and the caller's own vote state from a single query.
+ */
+async function loadVotes(
+  db: AppEnv["Variables"]["db"],
+  slugs: string[],
+): Promise<Array<{ marketplaceSlug: string; userId: string }>> {
+  if (slugs.length === 0) return [];
+  const rows = await db
+    .select()
+    .from(extensionVotes)
+    .where(inArray(extensionVotes.marketplaceSlug, slugs));
+  return rows.map((r) => ({ marketplaceSlug: r.marketplaceSlug, userId: r.userId }));
+}
+
+function tallyVotes(
+  votes: Array<{ marketplaceSlug: string; userId: string }>,
+  userId: string | null,
+): { counts: Map<string, number>; voted: Set<string> } {
+  const counts = new Map<string, number>();
+  const voted = new Set<string>();
+  for (const v of votes) {
+    counts.set(v.marketplaceSlug, (counts.get(v.marketplaceSlug) ?? 0) + 1);
+    if (userId && v.userId === userId) voted.add(v.marketplaceSlug);
+  }
+  return { counts, voted };
+}
+
+function currentUserId(c: Context<AppEnv>): string | null {
+  return c.get("auth")?.userId ?? null;
+}
+
 // ── routes ─────────────────────────────────────────────────────────────────
 
 marketplaceRouter.get("/extensions", async (c) => {
@@ -269,7 +319,7 @@ marketplaceRouter.get("/extensions", async (c) => {
     .from(extensions)
     .where(and(isNull(extensions.siteId), isNotNull(extensions.publishedAt)));
 
-  let catalog = latestPublishedRows(rows).map(toCatalogExtension);
+  let catalog = latestPublishedRows(rows).map((row) => toCatalogExtension(row));
 
   if (q) {
     catalog = catalog.filter((ext) => {
@@ -311,10 +361,19 @@ marketplaceRouter.get("/extensions", async (c) => {
   const total = catalog.length;
   const totalPages = Math.max(1, Math.ceil(total / perPage));
   const start = (page - 1) * perPage;
+  const pageItems = catalog.slice(start, start + perPage);
 
+  // Attach vote metrics only for the current page's listings.
+  const votes = await loadVotes(db, pageItems.map((ext) => ext.slug));
+  const { counts, voted } = tallyVotes(votes, currentUserId(c));
+  const data = pageItems.map((ext) => ({
+    ...ext,
+    voteCount: counts.get(ext.slug) ?? 0,
+    hasVoted: voted.has(ext.slug),
+  }));
 
   return c.json({
-    data: catalog.slice(start, start + perPage),
+    data,
     total,
     page,
     perPage,
@@ -342,11 +401,136 @@ marketplaceRouter.get("/extensions/:slug", async (c) => {
       404,
     );
 
+  const votes = await loadVotes(db, [slug]);
+  const { counts, voted } = tallyVotes(votes, currentUserId(c));
+
   return c.json({
-    data: toCatalogExtension(row),
+    data: toCatalogExtension(row, {
+      voteCount: counts.get(slug) ?? 0,
+      hasVoted: voted.has(slug),
+    }),
   });
 });
 
+// ── package download ─────────────────────────────────────────────────────────
+// Public "Download package" action. Bumps the download counter and hands back
+// the signed bundle location so the client can save it without installing.
+marketplaceRouter.get("/extensions/:slug/download", async (c) => {
+  const db = c.get("db");
+  const slug = c.req.param("slug");
+
+  const rows = await db
+    .select()
+    .from(extensions)
+    .where(
+      and(
+        eq(extensions.marketplaceSlug, slug),
+        isNull(extensions.siteId),
+        isNotNull(extensions.publishedAt),
+      ),
+    );
+  const [row] = latestPublishedRows(rows);
+  if (!row)
+    return c.json(
+      { errors: [{ code: "NOT_FOUND", message: "Extension not found" }] },
+      404,
+    );
+
+  await db
+    .update(extensions)
+    .set({ downloadCount: (row.downloadCount ?? 0) + 1 })
+    .where(eq(extensions.id, row.id));
+
+  // A redirect keeps large bundles off the Worker; `?redirect=0` returns JSON
+  // for programmatic clients that want the metadata (hash/signature) too.
+  if (c.req.query("redirect") === "0") {
+    return c.json({
+      data: {
+        slug,
+        version: row.version,
+        bundleUrl: row.bundleUrl,
+        bundleSha256: row.bundleSha256,
+        signature: row.signature,
+        signatureAlg: row.signatureAlg,
+        publisherKeyId: row.publisherKeyId,
+        downloadCount: (row.downloadCount ?? 0) + 1,
+      },
+    });
+  }
+  return c.redirect(row.bundleUrl, 302);
+});
+
+// ── voting ────────────────────────────────────────────────────────────────────
+async function slugIsPublished(
+  db: AppEnv["Variables"]["db"],
+  slug: string,
+): Promise<boolean> {
+  const rows = await db
+    .select()
+    .from(extensions)
+    .where(
+      and(
+        eq(extensions.marketplaceSlug, slug),
+        isNull(extensions.siteId),
+        isNotNull(extensions.publishedAt),
+      ),
+    );
+  return rows.length > 0;
+}
+
+marketplaceRouter.post("/extensions/:slug/vote", async (c) => {
+  const userId = currentUserId(c);
+  if (!userId)
+    return c.json(
+      { errors: [{ code: "UNAUTHORIZED", message: "Sign in to vote." }] },
+      401,
+    );
+
+  const db = c.get("db");
+  const slug = c.req.param("slug");
+
+  if (!(await slugIsPublished(db, slug)))
+    return c.json(
+      { errors: [{ code: "NOT_FOUND", message: "Extension not found" }] },
+      404,
+    );
+
+  // Idempotent: the unique (user, slug) index absorbs repeat votes.
+  await db
+    .insert(extensionVotes)
+    .values({ id: nanoid(), marketplaceSlug: slug, userId })
+    .onConflictDoNothing();
+
+  const votes = await loadVotes(db, [slug]);
+  const { counts } = tallyVotes(votes, userId);
+  return c.json({ data: { slug, voteCount: counts.get(slug) ?? 0, hasVoted: true } });
+});
+
+marketplaceRouter.delete("/extensions/:slug/vote", async (c) => {
+  const userId = currentUserId(c);
+  if (!userId)
+    return c.json(
+      { errors: [{ code: "UNAUTHORIZED", message: "Sign in to vote." }] },
+      401,
+    );
+
+  const db = c.get("db");
+  const slug = c.req.param("slug");
+
+  await db
+    .delete(extensionVotes)
+    .where(
+      and(
+        eq(extensionVotes.marketplaceSlug, slug),
+        eq(extensionVotes.userId, userId),
+      ),
+    );
+
+  const votes = await loadVotes(db, [slug]);
+  const { counts } = tallyVotes(votes, userId);
+  return c.json({ data: { slug, voteCount: counts.get(slug) ?? 0, hasVoted: false } });
+});
+
 marketplaceRouter.get("/updates", async (c) => {
   const siteId = c.get("siteId");
   const db = c.get("db");
@@ -618,3 +802,205 @@ marketplaceRouter.post("/publish", async (c) => {
 
   return c.json({ data: source });
 });
+
+// ── community submissions ─────────────────────────────────────────────────────
+// Any authenticated user can propose an extension for the catalog. The listing
+// lands in `submission_status = 'pending'` and unpublished (`publishedAt` null),
+// so it never appears in the public catalog until a moderator approves and a
+// signed bundle is published via /publish.
+
+async function requireConfigurePermission(
+  c: Context<AppEnv>,
+): Promise<Response | null> {
+  const perm = await new PermissionService({
+    db: c.get("db"),
+    cache: c.get("runtime").cache,
+    ctx: permissionCtx(c),
+  }).canAccess("extensions", "configure");
+
+  if (perm) return null;
+  return c.json(
+    {
+      errors: [
+        {
+          code: "FORBIDDEN",
+          message: 'Action "extensions:configure" is not allowed.',
+        },
+      ],
+    },
+    403,
+  );
+}
+
+const submitSchema = z.object({
+  name: z.string().min(1).max(120),
+  version: z
+    .string()
+    .regex(/^\d+\.\d+\.\d+([-.+][0-9A-Za-z-.]+)?$/, "Expected SemVer version"),
+  type: z.enum([
+    "hook",
+    "endpoint",
+    "operation",
+    "interface",
+    "display",
+    "layout",
+    "panel",
+    "module",
+  ]),
+  marketplaceSlug: z.string().regex(/^[a-z0-9-]+$/),
+  bundleUrl: z.string().url(),
+  bundleSha256: z
+    .string()
+    .regex(/^[0-9a-f]{64}$/)
+    .optional(),
+  description: z.string().max(2000).optional(),
+  publisher: z.string().min(1).max(120).optional(),
+  repositoryUrl: z.string().url().optional(),
+  capabilities: z.array(z.string()).max(100).optional(),
+});
+
+marketplaceRouter.post("/submit", async (c) => {
+  const userId = currentUserId(c);
+  if (!userId)
+    return c.json(
+      { errors: [{ code: "UNAUTHORIZED", message: "Sign in to submit." }] },
+      401,
+    );
+
+  const db = c.get("db");
+  const parsed = submitSchema.safeParse(await c.req.json());
+  if (!parsed.success) {
+    return c.json(
+      {
+        errors: parsed.error.issues.map((i) => ({
+          code: "VALIDATION",
+          message: `${i.path.join(".") || "(root)"}: ${i.message}`,
+        })),
+      },
+      400,
+    );
+  }
+  const input = parsed.data;
+
+  // Guard the namespace: a slug already live in the public catalog can only be
+  // updated by its publisher through /publish, not re-claimed via /submit.
+  const existingPublished = await db
+    .select()
+    .from(extensions)
+    .where(
+      and(
+        eq(extensions.marketplaceSlug, input.marketplaceSlug),
+        isNull(extensions.siteId),
+        isNotNull(extensions.publishedAt),
+      ),
+    );
+  if (existingPublished.length > 0)
+    return c.json(
+      {
+        errors: [
+          {
+            code: "SLUG_TAKEN",
+            message: `Slug "${input.marketplaceSlug}" is already published.`,
+          },
+        ],
+      },
+      409,
+    );
+
+  const manifest: MarketplaceManifest = {
+    name: input.name,
+    marketplace: {
+      description: input.description,
+      publisherName: input.publisher,
+      repositoryUrl: input.repositoryUrl,
+    },
+  };
+
+  const submitted = await db
+    .insert(extensions)
+    .values({
+      siteId: null,
+      key: input.marketplaceSlug,
+      name: input.name,
+      version: input.version,
+      type: input.type,
+      enabled: false,
+      bundleUrl: input.bundleUrl,
+      manifest,
+      capabilities: input.capabilities ?? [],
+      bundleSha256: input.bundleSha256 ?? null,
+      publisher: input.publisher ?? null,
+      marketplaceSlug: input.marketplaceSlug,
+      publishedAt: null,
+      submissionStatus: "pending",
+      submittedBy: userId,
+    })
+    .returning();
+
+  return c.json({ data: submitted[0] }, 201);
+});
+
+// List submissions for moderation (defaults to pending).
+marketplaceRouter.get("/submissions", async (c) => {
+  const denied = await requireConfigurePermission(c);
+  if (denied) return denied;
+
+  const db = c.get("db");
+  const status = c.req.query("status") ?? "pending";
+
+  const rows = await db
+    .select()
+    .from(extensions)
+    .where(
+      and(isNull(extensions.siteId), eq(extensions.submissionStatus, status)),
+    );
+
+  return c.json({ data: rows });
+});
+
+const reviewSchema = z.object({
+  action: z.enum(["approve", "reject"]),
+});
+
+// Moderate a submission. Approving marks it reviewed; publishing to the public
+// catalog still requires a signed bundle via /publish.
+marketplaceRouter.post("/submissions/:id/review", async (c) => {
+  const denied = await requireConfigurePermission(c);
+  if (denied) return denied;
+
+  const db = c.get("db");
+  const id = c.req.param("id");
+  const parsed = reviewSchema.safeParse(await c.req.json());
+  if (!parsed.success)
+    return c.json(
+      {
+        errors: parsed.error.issues.map((i) => ({
+          code: "VALIDATION",
+          message: i.message,
+        })),
+      },
+      400,
+    );
+
+  const nextStatus = parsed.data.action === "approve" ? "approved" : "rejected";
+
+  const updated = await db
+    .update(extensions)
+    .set({ submissionStatus: nextStatus })
+    .where(
+      and(
+        eq(extensions.id, id),
+        isNull(extensions.siteId),
+        isNotNull(extensions.submissionStatus),
+      ),
+    )
+    .returning();
+
+  if (updated.length === 0)
+    return c.json(
+      { errors: [{ code: "NOT_FOUND", message: "Submission not found" }] },
+      404,
+    );
+
+  return c.json({ data: updated[0] });
+});
diff --git a/apps/marketplace b/apps/marketplace
new file mode 160000
index 00000000..5958c50e
--- /dev/null
+++ b/apps/marketplace
@@ -0,0 +1 @@
+Subproject commit 5958c50e8cd0aa1a01bfa55d26bad2c01f7a14b5
diff --git a/apps/marketplace/.eslintrc.json b/apps/marketplace/.eslintrc.json
deleted file mode 100644
index bffb357a..00000000
--- a/apps/marketplace/.eslintrc.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "extends": "next/core-web-vitals"
-}
diff --git a/apps/marketplace/next-env.d.ts b/apps/marketplace/next-env.d.ts
deleted file mode 100644
index 830fb594..00000000
--- a/apps/marketplace/next-env.d.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-/// <reference path="./.next/types/routes.d.ts" />
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
diff --git a/apps/marketplace/next.config.ts b/apps/marketplace/next.config.ts
deleted file mode 100644
index 82a19d90..00000000
--- a/apps/marketplace/next.config.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import type { NextConfig } from "next";
-
-const nextConfig: NextConfig = {
-  reactStrictMode: true,
-  output: "export",
-  images: {
-    unoptimized: true,
-  },
-  trailingSlash: true,
-};
-
-export default nextConfig;
diff --git a/apps/marketplace/package.json b/apps/marketplace/package.json
deleted file mode 100644
index 9418ae51..00000000
--- a/apps/marketplace/package.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "name": "@lumibase/marketplace",
-  "version": "0.18.0",
-  "private": true,
-  "description": "LumiBase Marketplace - browse and discover extensions",
-  "scripts": {
-    "dev": "next dev --port 3002",
-    "build": "next build",
-    "start": "next start",
-    "lint": "eslint . --ext .ts,.tsx --max-warnings 0",
-    "typecheck": "tsc --noEmit",
-    "clean": "rm -rf .next .turbo out"
-  },
-  "dependencies": {
-    "next": "^15.0.0",
-    "react": "^18.3.1",
-    "react-dom": "^18.3.1",
-    "lucide-react": "^0.452.0"
-  },
-  "devDependencies": {
-    "@types/node": "^22.0.0",
-    "@types/react": "^18.3.11",
-    "@types/react-dom": "^18.3.0",
-    "autoprefixer": "^10.4.20",
-    "eslint": "^8.57.0",
-    "eslint-config-next": "^15.0.0",
-    "postcss": "^8.4.47",
-    "tailwindcss": "^3.4.13",
-    "typescript": "^5.6.2"
-  }
-}
diff --git a/apps/marketplace/postcss.config.mjs b/apps/marketplace/postcss.config.mjs
deleted file mode 100644
index a982c641..00000000
--- a/apps/marketplace/postcss.config.mjs
+++ /dev/null
@@ -1,8 +0,0 @@
-const config = {
-  plugins: {
-    tailwindcss: {},
-    autoprefixer: {},
-  },
-};
-
-export default config;
diff --git a/apps/marketplace/src/app/categories/[cat]/page.tsx b/apps/marketplace/src/app/categories/[cat]/page.tsx
deleted file mode 100644
index 7b9abf00..00000000
--- a/apps/marketplace/src/app/categories/[cat]/page.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { redirect } from "next/navigation";
-import { CATEGORIES } from "@/lib/api";
-import type { Metadata } from "next";
-
-interface PageProps {
-  params: Promise<{ cat: string }>;
-}
-
-export async function generateStaticParams() {
-  return CATEGORIES.map((c) => ({ cat: c.slug }));
-}
-
-export async function generateMetadata({ params }: PageProps): Promise<Metadata> {
-  const { cat } = await params;
-  const category = CATEGORIES.find((c) => c.slug === cat);
-  return {
-    title: category ? `${category.label} Extensions` : "Extensions",
-  };
-}
-
-export default async function CategoryPage({ params }: PageProps) {
-  const { cat } = await params;
-  redirect(`/extensions/?category=${cat}`);
-}
diff --git a/apps/marketplace/src/app/extensions/ExtensionsClient.tsx b/apps/marketplace/src/app/extensions/ExtensionsClient.tsx
deleted file mode 100644
index b4315653..00000000
--- a/apps/marketplace/src/app/extensions/ExtensionsClient.tsx
+++ /dev/null
@@ -1,155 +0,0 @@
-"use client";
-
-import { useSearchParams } from "next/navigation";
-import { useEffect, useState } from "react";
-import { listExtensions, CATEGORIES } from "@/lib/api";
-import type { Extension } from "@/lib/types";
-import ExtensionCard from "@/components/ExtensionCard";
-import FilterSidebar from "@/components/FilterSidebar";
-import SearchBar from "@/components/SearchBar";
-import EmptyState from "@/components/EmptyState";
-import { ChevronLeft, ChevronRight } from "lucide-react";
-
-const PER_PAGE = 9;
-
-export default function ExtensionsClient() {
-  const searchParams = useSearchParams();
-  const q = searchParams.get("q") ?? "";
-  const category = searchParams.get("category") ?? "";
-  const sort = (searchParams.get("sort") as "popular" | "latest" | "name") ?? "popular";
-  const page = Number(searchParams.get("page") ?? "1");
-
-  const [extensions, setExtensions] = useState<Extension[]>([]);
-  const [total, setTotal] = useState(0);
-  const [totalPages, setTotalPages] = useState(1);
-  const [loading, setLoading] = useState(true);
-
-  useEffect(() => {
-    setLoading(true);
-    listExtensions({ q, category, sort, page, perPage: PER_PAGE })
-      .then((res) => {
-        setExtensions(res.data);
-        setTotal(res.total);
-        setTotalPages(res.totalPages);
-      })
-      .finally(() => setLoading(false));
-  }, [q, category, sort, page]);
-
-  const buildPageUrl = (p: number) => {
-    const params = new URLSearchParams(searchParams.toString());
-    params.set("page", String(p));
-    return `/extensions/?${params.toString()}`;
-  };
-
-  const activeCategory = category
-    ? CATEGORIES.find((c) => c.slug === category)?.label ??
-      category.charAt(0).toUpperCase() + category.slice(1)
-    : null;
-
-  return (
-    <div className="mx-auto max-w-[1140px] px-6 py-10">
-      {/* Page header */}
-      <div className="mb-7 flex flex-wrap items-baseline justify-between gap-2">
-        <h1 className="text-[26px] font-bold tracking-[-0.3px] text-white">
-          {activeCategory ? `${activeCategory} extensions` : "All extensions"}
-        </h1>
-        {!loading && (
-          <span className="text-sm font-medium text-txt-faint">
-            {total} extension{total !== 1 ? "s" : ""}
-            {q ? ` for "${q}"` : ""}
-          </span>
-        )}
-      </div>
-
-      {/* Search bar */}
-      <div className="mb-9">
-        <SearchBar className="max-w-[560px]" />
-      </div>
-
-      <div className="flex flex-col gap-10 lg:flex-row">
-        {/* Sidebar */}
-        <FilterSidebar />
-
-        {/* Grid */}
-        <div className="min-w-0 flex-1">
-          {loading ? (
-            <div className="grid gap-4 sm:grid-cols-2 xl:grid-cols-3">
-              {Array.from({ length: PER_PAGE }).map((_, i) => (
-                <div key={i} className="surface-card h-56 animate-pulse" />
-              ))}
-            </div>
-          ) : extensions.length === 0 ? (
-            <EmptyState
-              title={q ? `No results for "${q}"` : "No extensions found"}
-              description={
-                q
-                  ? "Try a different search term or remove some filters."
-                  : "Try removing category filters."
-              }
-            />
-          ) : (
-            <>
-              <div className="animate-fade-in grid gap-4 sm:grid-cols-2 xl:grid-cols-3">
-                {extensions.map((ext) => (
-                  <ExtensionCard key={ext.id} extension={ext} />
-                ))}
-              </div>
-
-              {/* Pagination */}
-              {totalPages > 1 && (
-                <div className="mt-10 flex items-center justify-center gap-2">
-                  <a
-                    href={buildPageUrl(page - 1)}
-                    id="pagination-prev"
-                    aria-label="Previous page"
-                    aria-disabled={page <= 1}
-                    className={`flex h-9 w-9 items-center justify-center rounded-full transition-colors ${
-                      page <= 1
-                        ? "pointer-events-none text-white/20"
-                        : "bg-surface-3 text-txt-secondary ring-glass hover:text-white"
-                    }`}
-                  >
-                    <ChevronLeft className="h-4 w-4" />
-                  </a>
-
-                  {Array.from({ length: totalPages }, (_, i) => i + 1).map(
-                    (p) => (
-                      <a
-                        key={p}
-                        href={buildPageUrl(p)}
-                        id={`pagination-page-${p}`}
-                        aria-label={`Page ${p}`}
-                        aria-current={p === page ? "page" : undefined}
-                        className={`flex h-9 w-9 items-center justify-center rounded-full text-sm font-semibold transition-colors ${
-                          p === page
-                            ? "bg-accent-violet text-white shadow-[0_8px_24px_-8px_rgba(123,97,255,0.7)]"
-                            : "bg-surface-3 text-txt-secondary ring-glass hover:text-white"
-                        }`}
-                      >
-                        {p}
-                      </a>
-                    )
-                  )}
-
-                  <a
-                    href={buildPageUrl(page + 1)}
-                    id="pagination-next"
-                    aria-label="Next page"
-                    aria-disabled={page >= totalPages}
-                    className={`flex h-9 w-9 items-center justify-center rounded-full transition-colors ${
-                      page >= totalPages
-                        ? "pointer-events-none text-white/20"
-                        : "bg-surface-3 text-txt-secondary ring-glass hover:text-white"
-                    }`}
-                  >
-                    <ChevronRight className="h-4 w-4" />
-                  </a>
-                </div>
-              )}
-            </>
-          )}
-        </div>
-      </div>
-    </div>
-  );
-}
diff --git a/apps/marketplace/src/app/extensions/[slug]/page.tsx b/apps/marketplace/src/app/extensions/[slug]/page.tsx
deleted file mode 100644
index d0102a61..00000000
--- a/apps/marketplace/src/app/extensions/[slug]/page.tsx
+++ /dev/null
@@ -1,309 +0,0 @@
-import { notFound } from "next/navigation";
-import Link from "next/link";
-import type { Metadata } from "next";
-import { getExtension, getAllSlugs, listExtensions } from "@/lib/api";
-import type { Extension } from "@/lib/types";
-import {
-  categoryAccent,
-  categoryLabel,
-  formatInstalls,
-  trustLevel,
-} from "@/lib/design";
-import Badge from "@/components/Badge";
-import TagChip from "@/components/TagChip";
-import PlanetIcon from "@/components/PlanetIcon";
-import VersionHistory from "@/components/VersionHistory";
-import InstallSlug from "@/components/InstallSlug";
-import AddToWorkspace from "@/components/AddToWorkspace";
-
-interface PageProps {
-  params: Promise<{ slug: string }>;
-}
-
-export const dynamicParams = false;
-
-export async function generateStaticParams() {
-  const slugs = await getAllSlugs();
-  return slugs.map((slug) => ({ slug }));
-}
-
-export async function generateMetadata({ params }: PageProps): Promise<Metadata> {
-  const { slug } = await params;
-  const ext = await getExtension(slug);
-  if (!ext) return { title: "Extension Not Found" };
-  return {
-    title: `${ext.name} — ${ext.publisherName}`,
-    description: ext.description,
-  };
-}
-
-function formatDate(iso: string | null) {
-  if (!iso) return "Unknown";
-  return new Date(iso).toLocaleDateString("en-US", {
-    year: "numeric",
-    month: "long",
-    day: "numeric",
-  });
-}
-
-function ratingStars(rating: number): string {
-  return "★".repeat(Math.round(rating)) + "☆".repeat(5 - Math.round(rating));
-}
-
-/** Render a subset of Markdown to HTML spans. Very lightweight — not a full parser. */
-function renderSimpleMarkdown(md: string): React.ReactNode[] {
-  return md.split("\n").map((line, i) => {
-    if (line.startsWith("# "))
-      return <h1 key={i} className="mt-6 first:mt-0">{line.slice(2)}</h1>;
-    if (line.startsWith("## "))
-      return <h2 key={i}>{line.slice(3)}</h2>;
-    if (line.startsWith("### "))
-      return <h3 key={i}>{line.slice(4)}</h3>;
-    if (line.startsWith("- "))
-      return <li key={i}>{line.slice(2)}</li>;
-    if (line.trim() === "") return <br key={i} />;
-    return <p key={i}>{line}</p>;
-  });
-}
-
-async function getRelated(ext: Extension): Promise<Extension[]> {
-  const sameCategory = await listExtensions({
-    category: ext.category,
-    sort: "popular",
-    perPage: 4,
-  });
-  const related = sameCategory.data.filter((e) => e.slug !== ext.slug);
-  if (related.length >= 3) return related.slice(0, 3);
-  // Fill with most-installed extensions from other categories.
-  const popular = await listExtensions({ sort: "popular", perPage: 6 });
-  for (const e of popular.data) {
-    if (related.length >= 3) break;
-    if (e.slug !== ext.slug && !related.some((r) => r.slug === e.slug)) {
-      related.push(e);
-    }
-  }
-  return related.slice(0, 3);
-}
-
-export default async function ExtensionDetailPage({ params }: PageProps) {
-  const { slug } = await params;
-  const ext = await getExtension(slug);
-
-  if (!ext) notFound();
-
-  const {
-    name,
-    description,
-    readme,
-    category,
-    tags,
-    publisherName,
-    latestVersion,
-    rating,
-    ratingCount,
-    updatedAt,
-    repositoryUrl,
-    licenseType,
-    versions,
-  } = ext;
-
-  const accent = categoryAccent(category);
-  const trust = trustLevel(category);
-  const related = await getRelated(ext);
-
-  return (
-    <div className="pb-4">
-      {/* Breadcrumb */}
-      <nav
-        aria-label="Breadcrumb"
-        className="mx-auto flex max-w-[1140px] items-center gap-2 px-6 pt-7 text-[13px] font-medium text-[rgb(150,150,156)]"
-      >
-        <Link href="/" className="transition-colors hover:text-white">
-          Marketplace
-        </Link>
-        <span className="text-[rgb(90,90,96)]">/</span>
-        <Link
-          href={`/categories/${category}/`}
-          className="transition-colors hover:text-white"
-        >
-          {categoryLabel(category)}
-        </Link>
-        <span className="text-[rgb(90,90,96)]">/</span>
-        <span className="text-[rgb(205,205,210)]">{name}</span>
-      </nav>
-
-      {/* Identity header */}
-      <header className="mx-auto flex max-w-[1140px] flex-col items-start gap-6 px-6 pt-7 md:flex-row">
-        <PlanetIcon
-          accent={accent}
-          size={88}
-          radius={22}
-          glow={50}
-          className="shadow-[0_20px_44px_rgba(0,0,0,.5)]"
-        />
-        <div className="min-w-0 flex-1">
-          <div className="flex flex-wrap items-center gap-3">
-            <h1 className="text-[30px] font-bold tracking-[-0.5px] text-white md:text-[38px]">
-              {name}
-            </h1>
-            <Badge tone={accent} dot>
-              {categoryLabel(category)}
-            </Badge>
-          </div>
-          <div className="mt-2.5 flex flex-wrap items-center gap-x-[18px] gap-y-1.5 text-sm font-medium text-[rgb(175,175,182)]">
-            <span className="flex items-center gap-[7px]">
-              <span
-                aria-hidden
-                className="h-4 w-4 rounded-full"
-                style={{ background: "linear-gradient(180deg,#fff,#cfcfcf)" }}
-              />
-              by {publisherName}
-            </span>
-            {rating != null && ratingCount != null && ratingCount > 0 && (
-              <span className="text-gold">
-                {ratingStars(rating)}{" "}
-                <span className="text-[rgb(175,175,182)]">
-                  {rating.toFixed(1)} ({ratingCount.toLocaleString("en-US")})
-                </span>
-              </span>
-            )}
-            <span>{formatInstalls(ext.totalDownloads)}</span>
-          </div>
-          <p className="mt-4 max-w-[620px] text-base font-medium leading-[26px] text-[rgb(195,195,200)]">
-            {description}
-          </p>
-        </div>
-        <div className="flex flex-shrink-0 flex-row gap-2.5 md:flex-col">
-          <AddToWorkspace slug={slug} />
-          {repositoryUrl && (
-            <a
-              href={repositoryUrl}
-              target="_blank"
-              rel="noopener noreferrer"
-              id={`ext-repo-${slug}`}
-              className="btn-pill btn-glass btn-md w-[180px]"
-            >
-              <span>View source</span>
-            </a>
-          )}
-        </div>
-      </header>
-
-      {/* Body grid */}
-      <div className="mx-auto grid max-w-[1140px] gap-10 px-6 pt-11 lg:grid-cols-[minmax(0,1fr)_320px]">
-        <main className="min-w-0">
-          {/* About / readme */}
-          <section>
-            <h2 className="text-2xl font-bold tracking-[-0.3px] text-white">
-              About this extension
-            </h2>
-            <div className="prose-dark mt-3.5 max-w-[620px]">
-              {renderSimpleMarkdown(readme)}
-            </div>
-          </section>
-
-          {/* What's new */}
-          <section className="mt-10">
-            <h2 className="mb-4 text-2xl font-bold tracking-[-0.3px] text-white">
-              What&apos;s new · v{latestVersion}
-            </h2>
-            <VersionHistory versions={versions} />
-          </section>
-        </main>
-
-        {/* Sidebar */}
-        <aside className="space-y-5">
-          <div className="flex flex-col gap-4 rounded-[18px] bg-surface-1 p-[22px] ring-glass lg:sticky lg:top-6">
-            <div className="flex justify-between text-sm font-medium">
-              <span className="text-[rgb(150,150,156)]">Publisher</span>
-              <span className="text-white">{publisherName}</span>
-            </div>
-            <div className="h-px bg-white/[.07]" />
-            <div className="flex justify-between text-sm font-medium">
-              <span className="text-[rgb(150,150,156)]">Version</span>
-              <span className="text-white">{latestVersion}</span>
-            </div>
-            <div className="flex justify-between text-sm font-medium">
-              <span className="text-[rgb(150,150,156)]">Updated</span>
-              <span className="text-white">{formatDate(updatedAt)}</span>
-            </div>
-            {licenseType && (
-              <div className="flex justify-between text-sm font-medium">
-                <span className="text-[rgb(150,150,156)]">License</span>
-                <span className="text-white">{licenseType}</span>
-              </div>
-            )}
-            <div className="h-px bg-white/[.07]" />
-            <div>
-              <div className="mb-2.5 text-xs font-semibold uppercase tracking-[.6px] text-[rgb(130,130,138)]">
-                Trust level required
-              </div>
-              <div className="flex items-center gap-2">
-                <span className="rounded-lg bg-[rgba(123,97,255,.16)] px-2.5 py-[5px] text-xs font-semibold text-[#c9bcff] shadow-[inset_0_0_0_1px_rgba(123,97,255,.30)]">
-                  {trust.level}
-                </span>
-                <span className="text-xs font-medium text-[rgb(150,150,156)]">
-                  {trust.note}
-                </span>
-              </div>
-            </div>
-            {tags.length > 0 && (
-              <>
-                <div className="h-px bg-white/[.07]" />
-                <div>
-                  <div className="mb-2.5 text-xs font-semibold uppercase tracking-[.6px] text-[rgb(130,130,138)]">
-                    Works with
-                  </div>
-                  <div className="flex flex-wrap gap-[7px]">
-                    {tags.map((tag) => (
-                      <TagChip key={tag}>{tag}</TagChip>
-                    ))}
-                  </div>
-                </div>
-              </>
-            )}
-          </div>
-
-          <InstallSlug slug={slug} />
-        </aside>
-      </div>
-
-      {/* Related extensions */}
-      {related.length > 0 && (
-        <section className="mx-auto max-w-[1140px] px-6 pt-[72px]">
-          <h2 className="mb-6 text-2xl font-bold tracking-[-0.3px] text-white">
-            Related extensions
-          </h2>
-          <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
-            {related.map((rel) => (
-              <Link
-                key={rel.slug}
-                href={`/extensions/${rel.slug}/`}
-                id={`related-${rel.slug}`}
-                className="flex items-start gap-3.5 rounded-[20px] bg-surface-1 p-5 ring-glass transition-transform duration-300 hover:-translate-y-0.5"
-              >
-                <PlanetIcon
-                  accent={categoryAccent(rel.category)}
-                  size={42}
-                  radius={13}
-                  glow={26}
-                />
-                <div className="min-w-0">
-                  <div className="text-[15px] font-semibold text-white">
-                    {rel.name}
-                  </div>
-                  <p className="mt-[5px] line-clamp-2 text-[12.5px] font-medium leading-5 text-[rgb(170,170,178)]">
-                    {rel.description}
-                  </p>
-                  <div className="mt-2 text-xs font-medium text-[rgb(150,150,156)]">
-                    {formatInstalls(rel.totalDownloads)}
-                  </div>
-                </div>
-              </Link>
-            ))}
-          </div>
-        </section>
-      )}
-    </div>
-  );
-}
diff --git a/apps/marketplace/src/app/extensions/page.tsx b/apps/marketplace/src/app/extensions/page.tsx
deleted file mode 100644
index e36779fe..00000000
--- a/apps/marketplace/src/app/extensions/page.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { Suspense } from "react";
-import type { Metadata } from "next";
-import ExtensionsClient from "./ExtensionsClient";
-
-export const metadata: Metadata = {
-  title: "Extensions",
-  description:
-    "Browse all LumiBase extensions. Filter by category, tags, or search by name.",
-};
-
-export default function ExtensionsPage() {
-  return (
-    <Suspense
-      fallback={
-        <div className="flex min-h-[60vh] items-center justify-center">
-          <div className="flex flex-col items-center gap-3">
-            <div className="h-8 w-8 animate-spin rounded-full border-2 border-accent-violet border-t-transparent" />
-            <span className="text-sm font-medium text-txt-faint">
-              Loading extensions…
-            </span>
-          </div>
-        </div>
-      }
-    >
-      <ExtensionsClient />
-    </Suspense>
-  );
-}
diff --git a/apps/marketplace/src/app/globals.css b/apps/marketplace/src/app/globals.css
deleted file mode 100644
index 632c0403..00000000
--- a/apps/marketplace/src/app/globals.css
+++ /dev/null
@@ -1,287 +0,0 @@
-@import url("https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&family=JetBrains+Mono:wght@400;500&display=swap");
-
-@tailwind base;
-@tailwind components;
-@tailwind utilities;
-
-/* ── LumiBase cosmic design tokens ──────────────────────────────────────── */
-:root {
-  --color-bg-top: rgb(30, 30, 32);
-  --color-bg-bottom: rgb(14, 14, 17);
-  --gradient-page: linear-gradient(135deg, rgb(30, 30, 32) 0%, rgb(14, 14, 17) 32%);
-  --color-surface-1: rgb(29, 28, 32);
-  --color-surface-2: rgb(36, 35, 37);
-  --color-surface-3: rgb(41, 41, 43);
-  --color-surface-4: rgb(52, 50, 54);
-  --color-surface-sunken: rgb(23, 22, 25);
-  --color-glass: rgba(255, 255, 255, 0.08);
-  --color-glass-hover: rgba(255, 255, 255, 0.14);
-  --color-text: #fff;
-  --color-text-secondary: rgb(189, 189, 192);
-  --color-text-muted: rgb(169, 169, 169);
-  --color-violet: rgb(123, 97, 255);
-  --color-blue: rgb(24, 160, 251);
-  --color-green: rgb(46, 196, 124);
-  --color-red: rgb(232, 86, 86);
-  --color-border: rgba(255, 255, 255, 0.08);
-  --color-border-strong: rgba(255, 255, 255, 0.16);
-  --radius-pill: 32px;
-  --radius-card: 24px;
-  --radius-lg: 20px;
-  --radius-md: 16px;
-  --radius-sm: 12px;
-  --radius-xs: 8px;
-  --ring-glass: inset 0 0 0 1px rgba(255, 255, 255, 0.08);
-  --ring-glass-strong: inset 0 0 0 1px rgba(255, 255, 255, 0.16);
-  --shadow-sm: 0 2px 4px rgba(0, 0, 0, 0.32);
-  --shadow-md: 0 8px 24px rgba(0, 0, 0, 0.5);
-  --shadow-lg: 0 24px 64px rgba(0, 0, 0, 0.8);
-  --glow-violet: 0 0 80px rgba(123, 97, 255, 0.45);
-  --glow-blue: 0 0 80px rgba(24, 160, 251, 0.4);
-  --ease-out: cubic-bezier(0.22, 1, 0.36, 1);
-  --duration: 240ms;
-  --font-sans: "Inter", -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, sans-serif;
-}
-
-* {
-  box-sizing: border-box;
-}
-
-html {
-  color-scheme: dark;
-  scroll-behavior: smooth;
-}
-
-body {
-  color: var(--color-text);
-  background: var(--gradient-page);
-  background-attachment: fixed;
-  font-family: var(--font-sans);
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-/* ── Starfield overlay (fixed, behind content) ──────────────────────────── */
-.starfield {
-  position: fixed;
-  inset: 0;
-  pointer-events: none;
-  z-index: 0;
-  background-image:
-    radial-gradient(1.4px 1.4px at 12% 18%, rgba(255, 255, 255, 0.7), transparent),
-    radial-gradient(1.2px 1.2px at 34% 62%, rgba(255, 255, 255, 0.5), transparent),
-    radial-gradient(1.6px 1.6px at 58% 28%, rgba(255, 255, 255, 0.6), transparent),
-    radial-gradient(1px 1px at 72% 76%, rgba(255, 255, 255, 0.5), transparent),
-    radial-gradient(1.3px 1.3px at 88% 42%, rgba(255, 255, 255, 0.6), transparent),
-    radial-gradient(1.5px 1.5px at 46% 8%, rgba(255, 255, 255, 0.55), transparent);
-  background-repeat: repeat;
-  background-size: 100% 900px;
-}
-
-/* ── Reusable utilities ─────────────────────────────────────────────────── */
-.ring-glass {
-  box-shadow: var(--ring-glass);
-}
-.ring-glass-strong {
-  box-shadow: var(--ring-glass-strong);
-}
-
-/* Surface card — radius 24, surface-1, hairline inset ring */
-.surface-card {
-  border-radius: var(--radius-card);
-  background: var(--color-surface-1);
-  box-shadow: var(--ring-glass);
-}
-
-/* Glass search pill */
-.glass-pill {
-  border-radius: var(--radius-pill);
-  background: rgba(255, 255, 255, 0.06);
-  box-shadow: inset 0 0 0 1px rgba(255, 255, 255, 0.1);
-  backdrop-filter: blur(12px);
-  -webkit-backdrop-filter: blur(12px);
-}
-
-/* ── Pill buttons ───────────────────────────────────────────────────────── */
-.btn-pill {
-  position: relative;
-  display: inline-flex;
-  align-items: center;
-  justify-content: center;
-  gap: 8px;
-  border: none;
-  border-radius: 999px;
-  font-weight: 600;
-  letter-spacing: 0.2px;
-  white-space: nowrap;
-  cursor: pointer;
-  text-decoration: none;
-  transition:
-    filter var(--duration) var(--ease-out),
-    transform 380ms cubic-bezier(0.34, 1.56, 0.64, 1),
-    background var(--duration) var(--ease-out);
-}
-.btn-pill:hover {
-  filter: brightness(1.14);
-  transform: translateY(-1px);
-}
-.btn-pill:active {
-  transform: translateY(0) scale(0.96);
-}
-
-.btn-sm {
-  height: 34px;
-  padding: 0 14px;
-  font-size: 13px;
-  gap: 6px;
-}
-.btn-md {
-  height: 46px;
-  padding: 0 22px;
-  font-size: 14px;
-}
-.btn-lg {
-  height: 54px;
-  padding: 0 28px;
-  font-size: 16px;
-  gap: 10px;
-}
-
-.btn-glass {
-  background: rgba(24, 23, 28, 0.55);
-  color: var(--color-text);
-  text-shadow: 0 1px 2px rgba(0, 0, 0, 0.55);
-  overflow: hidden;
-  box-shadow:
-    inset 0 1px 0 rgba(255, 255, 255, 0.28),
-    inset 0 0 0 1px rgba(255, 255, 255, 0.14),
-    inset 0 -7px 14px rgba(0, 0, 0, 0.28),
-    0 7px 20px -4px rgba(0, 0, 0, 0.55);
-}
-.btn-glass::before {
-  content: "";
-  position: absolute;
-  inset: 0;
-  border-radius: 999px;
-  background: linear-gradient(180deg, rgba(255, 255, 255, 0.1) 0%, rgba(255, 255, 255, 0.02) 100%);
-  backdrop-filter: blur(5px) saturate(185%);
-  -webkit-backdrop-filter: blur(5px) saturate(185%);
-  pointer-events: none;
-}
-.btn-glass > * {
-  position: relative;
-  z-index: 1;
-}
-
-.btn-primary {
-  background: var(--color-violet);
-  color: #fff;
-  box-shadow: 0 8px 24px -8px rgba(123, 97, 255, 0.7);
-}
-
-/* ── Custom scrollbar ───────────────────────────────────────────────────── */
-::-webkit-scrollbar {
-  width: 6px;
-  height: 6px;
-}
-::-webkit-scrollbar-track {
-  background: var(--color-surface-sunken);
-}
-::-webkit-scrollbar-thumb {
-  background: var(--color-surface-4);
-  border-radius: 3px;
-}
-::-webkit-scrollbar-thumb:hover {
-  background: var(--color-violet);
-}
-
-/* Selection */
-::selection {
-  background-color: rgba(123, 97, 255, 0.35);
-  color: #fff;
-}
-
-/* Focus visible ring */
-:focus-visible {
-  outline: 2px solid var(--color-violet);
-  outline-offset: 2px;
-  border-radius: 6px;
-}
-
-/* ── Prose for readme (cosmic) ──────────────────────────────────────────── */
-.prose-dark h1,
-.prose-dark h2,
-.prose-dark h3,
-.prose-dark h4 {
-  color: var(--color-text);
-  font-weight: 700;
-  letter-spacing: -0.2px;
-  margin-top: 1.5rem;
-  margin-bottom: 0.75rem;
-}
-.prose-dark h1 {
-  font-size: 1.375rem;
-}
-.prose-dark h2 {
-  font-size: 1.125rem;
-}
-.prose-dark h3 {
-  font-size: 1rem;
-}
-.prose-dark p {
-  color: rgb(185, 185, 192);
-  font-weight: 500;
-  font-size: 16px;
-  line-height: 27px;
-  margin-bottom: 1rem;
-}
-.prose-dark ul,
-.prose-dark ol {
-  color: rgb(185, 185, 192);
-  font-weight: 500;
-  font-size: 15px;
-  line-height: 26px;
-  padding-left: 1.25rem;
-  margin-bottom: 1rem;
-}
-.prose-dark li {
-  margin-bottom: 0.25rem;
-  list-style: disc;
-}
-.prose-dark code {
-  background: rgb(18, 17, 21);
-  box-shadow: var(--ring-glass);
-  border-radius: 6px;
-  padding: 0.125rem 0.375rem;
-  font-family: "JetBrains Mono", monospace;
-  font-size: 0.8rem;
-  color: #c9bcff;
-}
-.prose-dark pre {
-  background: rgb(18, 17, 21);
-  box-shadow: var(--ring-glass);
-  border-radius: 14px;
-  padding: 1rem;
-  overflow-x: auto;
-  margin-bottom: 1rem;
-}
-.prose-dark pre code {
-  background: none;
-  box-shadow: none;
-  padding: 0;
-  color: rgb(210, 210, 216);
-}
-.prose-dark a {
-  color: #c9bcff;
-  text-decoration: underline;
-  text-underline-offset: 3px;
-}
-.prose-dark a:hover {
-  color: #fff;
-}
-
-@layer utilities {
-  .text-balance {
-    text-wrap: balance;
-  }
-}
diff --git a/apps/marketplace/src/app/layout.tsx b/apps/marketplace/src/app/layout.tsx
deleted file mode 100644
index f6407f06..00000000
--- a/apps/marketplace/src/app/layout.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import type { Metadata } from "next";
-import "./globals.css";
-import Header from "@/components/Header";
-import Footer from "@/components/Footer";
-
-export const metadata: Metadata = {
-  title: {
-    default: "LumiBase Marketplace — Extend your Content OS",
-    template: "%s | LumiBase Marketplace",
-  },
-  description:
-    "Browse, install, and publish extensions that give your agents new skills. SEO, analytics, media, localization, and more for the LumiBase Content OS.",
-  keywords: [
-    "LumiBase",
-    "Content OS",
-    "headless CMS",
-    "extensions",
-    "agent skills",
-    "marketplace",
-    "edge CMS",
-  ],
-  authors: [{ name: "LumiBase" }],
-  openGraph: {
-    title: "LumiBase Marketplace",
-    description:
-      "Browse, install, and publish extensions that give your agents new skills.",
-    url: "https://marketplace.lumibase.dev",
-    siteName: "LumiBase Marketplace",
-    type: "website",
-  },
-  twitter: {
-    card: "summary_large_image",
-    title: "LumiBase Marketplace",
-    description:
-      "Browse, install, and publish extensions that give your agents new skills.",
-  },
-};
-
-export default function RootLayout({
-  children,
-}: Readonly<{
-  children: React.ReactNode;
-}>) {
-  return (
-    <html lang="en" className="dark">
-      <body className="min-h-screen text-white antialiased">
-        {/* Fixed starfield overlay */}
-        <div aria-hidden className="starfield" />
-        <div className="relative z-[1]">
-          <Header />
-          <main>{children}</main>
-          <Footer />
-        </div>
-      </body>
-    </html>
-  );
-}
diff --git a/apps/marketplace/src/app/page.tsx b/apps/marketplace/src/app/page.tsx
deleted file mode 100644
index 8747cea0..00000000
--- a/apps/marketplace/src/app/page.tsx
+++ /dev/null
@@ -1,130 +0,0 @@
-import { Search } from "lucide-react";
-import { listExtensions, CATEGORIES } from "@/lib/api";
-import ExtensionCard from "@/components/ExtensionCard";
-import TagChip from "@/components/TagChip";
-import type { Metadata } from "next";
-
-export const metadata: Metadata = {
-  title: "LumiBase Marketplace — Extend your Content OS",
-};
-
-const PUBLISH_URL = "https://docs.lumibase.dev/extensions/create";
-
-export default async function HomePage() {
-  const featured = await listExtensions({ sort: "popular", perPage: 6 });
-
-  return (
-    <div className="flex flex-col">
-      {/* ── Hero ──────────────────────────────────────────────────────────── */}
-      <section className="px-5 pb-5 pt-16 text-center md:pt-20">
-        <h1 className="mx-auto text-[40px] font-bold leading-[48px] tracking-[-0.4px] text-white md:text-[60px] md:leading-[70px]">
-          Extend your Content OS.
-        </h1>
-        <p className="mx-auto mt-5 max-w-[480px] text-[19px] font-medium leading-[31px] text-txt-secondary">
-          Browse, install, and publish extensions that give your agents new
-          skills.
-        </p>
-
-        {/* Glass search pill */}
-        <form
-          action="/extensions/"
-          method="get"
-          role="search"
-          className="glass-pill mx-auto mt-[34px] flex max-w-[560px] items-center gap-2.5 py-2 pl-5 pr-2"
-        >
-          <Search
-            className="h-[18px] w-[18px] flex-shrink-0 text-txt-faint"
-            aria-hidden
-          />
-          <input
-            type="text"
-            name="q"
-            id="hero-search"
-            placeholder="Search extensions and skills"
-            aria-label="Search extensions"
-            className="h-10 min-w-0 flex-1 border-none bg-transparent text-[15px] font-medium text-white outline-none placeholder:text-txt-faint"
-          />
-          <button type="submit" className="btn-pill btn-primary btn-sm h-10">
-            <span>Search</span>
-          </button>
-        </form>
-
-        {/* Category chips */}
-        <div className="mx-auto mt-[30px] flex max-w-[720px] flex-wrap justify-center gap-[9px]">
-          <TagChip href="/extensions/" active id="home-cat-all">
-            All
-          </TagChip>
-          {CATEGORIES.map((cat) => (
-            <TagChip
-              key={cat.slug}
-              href={`/categories/${cat.slug}/`}
-              id={`home-cat-${cat.slug}`}
-            >
-              {cat.label}
-            </TagChip>
-          ))}
-        </div>
-      </section>
-
-      {/* ── Featured extensions ───────────────────────────────────────────── */}
-      <section className="mx-auto w-full max-w-[1140px] px-6 pt-14">
-        <div className="mb-7 flex items-baseline justify-between">
-          <h2 className="text-[26px] font-bold tracking-[-0.3px] text-white">
-            Featured extensions
-          </h2>
-          <span className="text-sm font-medium text-txt-faint">
-            {featured.total} total
-          </span>
-        </div>
-
-        <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
-          {featured.data.map((ext) => (
-            <ExtensionCard key={ext.id} extension={ext} />
-          ))}
-        </div>
-      </section>
-
-      {/* ── Publish CTA ──────────────────────────────────────────────────── */}
-      <section className="mx-auto mt-28 w-full max-w-[1140px] px-6">
-        <div
-          className="relative flex flex-col items-start gap-8 overflow-hidden rounded-[28px] p-8 shadow-[inset_0_0_0_1px_rgba(255,255,255,.10)] md:flex-row md:items-center md:justify-between md:px-12 md:py-[52px]"
-          style={{
-            background:
-              "linear-gradient(135deg, rgba(123,97,255,.16), rgba(24,160,251,.08))",
-          }}
-        >
-          {/* Decorative planet sphere */}
-          <div
-            aria-hidden
-            className="absolute -right-10 -top-10 h-[220px] w-[220px] rounded-full opacity-50"
-            style={{
-              background:
-                "radial-gradient(circle at 34% 30%, #fff 0%, #7B61FF 58%, #26204a 100%)",
-              boxShadow: "0 0 80px rgba(123,97,255,.4)",
-            }}
-          />
-          <div className="relative max-w-[560px]">
-            <h2 className="text-[28px] font-bold tracking-[-0.4px] text-white md:text-[34px]">
-              Publish your extension.
-            </h2>
-            <p className="mt-3 text-base font-medium leading-[26px] text-[rgb(205,205,210)]">
-              Ship a skill to every agent on the platform. Provenance,
-              versioning and review are handled — you write the logic.
-            </p>
-          </div>
-          <div className="relative flex-shrink-0">
-            <a
-              href={PUBLISH_URL}
-              target="_blank"
-              rel="noopener noreferrer"
-              id="cta-create-ext"
-              className="btn-pill btn-primary btn-md"
-            >
-              <span>Start building</span>
-            </a>
-          </div>
-        </div>
-      </section>
-    </div>
-  );
-}
diff --git a/apps/marketplace/src/components/AddToWorkspace.tsx b/apps/marketplace/src/components/AddToWorkspace.tsx
deleted file mode 100644
index fac0c370..00000000
--- a/apps/marketplace/src/components/AddToWorkspace.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-"use client";
-
-import { useCallback, useState } from "react";
-import { Check } from "lucide-react";
-
-interface AddToWorkspaceProps {
-  slug: string;
-}
-
-/** Primary detail-page action — copies the extension slug for Studio install. */
-export default function AddToWorkspace({ slug }: AddToWorkspaceProps) {
-  const [copied, setCopied] = useState(false);
-
-  const handleCopy = useCallback(async () => {
-    try {
-      await navigator.clipboard.writeText(slug);
-    } catch {
-      const el = document.createElement("textarea");
-      el.value = slug;
-      document.body.appendChild(el);
-      el.select();
-      document.execCommand("copy");
-      document.body.removeChild(el);
-    }
-    setCopied(true);
-    setTimeout(() => setCopied(false), 2000);
-  }, [slug]);
-
-  return (
-    <button
-      id={`add-to-workspace-${slug}`}
-      onClick={handleCopy}
-      className="btn-pill btn-primary btn-md w-[180px]"
-    >
-      {copied ? (
-        <span className="inline-flex items-center gap-1.5">
-          <Check className="h-4 w-4" />
-          Slug copied
-        </span>
-      ) : (
-        <span>Add to workspace</span>
-      )}
-    </button>
-  );
-}
diff --git a/apps/marketplace/src/components/Badge.tsx b/apps/marketplace/src/components/Badge.tsx
deleted file mode 100644
index 12f95c51..00000000
--- a/apps/marketplace/src/components/Badge.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { ACCENT_COLORS, type Accent } from "@/lib/design";
-
-interface BadgeProps {
-  children: React.ReactNode;
-  tone?: Accent;
-  dot?: boolean;
-  className?: string;
-}
-
-/** Category chip — glass pill with a glowing tone dot. */
-export default function Badge({
-  children,
-  tone = "neutral",
-  dot = true,
-  className = "",
-}: BadgeProps) {
-  const c = tone === "neutral" ? "rgb(189,189,192)" : ACCENT_COLORS[tone].accent;
-  return (
-    <span
-      className={`inline-flex h-6 items-center gap-1.5 whitespace-nowrap rounded-full bg-glass px-2.5 text-[11px] font-semibold leading-4 text-txt-secondary ring-glass ${className}`}
-    >
-      {dot && (
-        <span
-          aria-hidden
-          className="h-1.5 w-1.5 rounded-full"
-          style={{ background: c, boxShadow: `0 0 8px ${c}` }}
-        />
-      )}
-      {children}
-    </span>
-  );
-}
diff --git a/apps/marketplace/src/components/EmptyState.tsx b/apps/marketplace/src/components/EmptyState.tsx
deleted file mode 100644
index 4a2ddf6e..00000000
--- a/apps/marketplace/src/components/EmptyState.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { PackageSearch } from "lucide-react";
-
-interface EmptyStateProps {
-  title?: string;
-  description?: string;
-}
-
-export default function EmptyState({
-  title = "No extensions found",
-  description = "Adjust your search or filters and try again.",
-}: EmptyStateProps) {
-  return (
-    <div className="surface-card animate-fade-in flex flex-col items-center justify-center px-6 py-16 text-center">
-      <div className="flex h-16 w-16 items-center justify-center rounded-2xl bg-surface-3 text-txt-faint ring-glass">
-        <PackageSearch className="h-8 w-8" />
-      </div>
-      <h3 className="mt-4 text-base font-semibold text-white">{title}</h3>
-      <p className="mt-2 max-w-sm text-sm font-medium text-txt-faint">
-        {description}
-      </p>
-    </div>
-  );
-}
diff --git a/apps/marketplace/src/components/ExtensionCard.tsx b/apps/marketplace/src/components/ExtensionCard.tsx
deleted file mode 100644
index 979e2bed..00000000
--- a/apps/marketplace/src/components/ExtensionCard.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import Link from "next/link";
-import type { Extension } from "@/lib/types";
-import { categoryAccent, categoryLabel, formatInstalls } from "@/lib/design";
-import PlanetIcon from "./PlanetIcon";
-import Badge from "./Badge";
-
-interface ExtensionCardProps {
-  extension: Extension;
-  featured?: boolean;
-}
-
-export default function ExtensionCard({ extension }: ExtensionCardProps) {
-  const { slug, name, description, category, publisherName, totalDownloads } =
-    extension;
-  const accent = categoryAccent(category);
-
-  return (
-    <Link
-      href={`/extensions/${slug}/`}
-      id={`ext-card-${slug}`}
-      className="surface-card group flex flex-col gap-4 p-6 transition-transform duration-300 hover:-translate-y-0.5"
-    >
-      {/* Header row: planet icon + category badge */}
-      <div className="flex items-start justify-between">
-        <PlanetIcon accent={accent} size={46} radius={14} glow={30} />
-        <Badge tone={accent} dot>
-          {categoryLabel(category)}
-        </Badge>
-      </div>
-
-      {/* Name + description */}
-      <div>
-        <h3 className="text-[19px] font-semibold tracking-[-0.2px] text-white">
-          {name}
-        </h3>
-        <p className="mt-2 text-sm font-medium leading-[22px] text-txt-secondary">
-          {description}
-        </p>
-      </div>
-
-      {/* Footer: publisher · installs + Install */}
-      <div className="mt-auto flex items-center justify-between">
-        <span className="text-[13px] font-medium text-txt-faint">
-          {publisherName} · {formatInstalls(totalDownloads)}
-        </span>
-        <span className="btn-pill btn-glass btn-sm" aria-hidden>
-          <span>Install</span>
-        </span>
-      </div>
-    </Link>
-  );
-}
diff --git a/apps/marketplace/src/components/FilterSidebar.tsx b/apps/marketplace/src/components/FilterSidebar.tsx
deleted file mode 100644
index b0e9e5d1..00000000
--- a/apps/marketplace/src/components/FilterSidebar.tsx
+++ /dev/null
@@ -1,104 +0,0 @@
-"use client";
-
-import { useRouter, useSearchParams } from "next/navigation";
-import { useCallback } from "react";
-import { CATEGORIES } from "@/lib/api";
-import TagChip from "./TagChip";
-
-const SORT_OPTIONS = [
-  { value: "popular", label: "Most installed" },
-  { value: "latest", label: "Recently updated" },
-  { value: "name", label: "Name (A–Z)" },
-];
-
-export default function FilterSidebar() {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-
-  const activeCategory = searchParams.get("category") ?? "";
-  const activeSort = searchParams.get("sort") ?? "popular";
-
-  const setParam = useCallback(
-    (key: string, value: string) => {
-      const params = new URLSearchParams(searchParams.toString());
-      if (value) {
-        params.set(key, value);
-      } else {
-        params.delete(key);
-      }
-      params.delete("page");
-      router.push(`/extensions/?${params.toString()}`);
-    },
-    [router, searchParams]
-  );
-
-  const toggleCategory = (slug: string) => {
-    setParam("category", activeCategory === slug ? "" : slug);
-  };
-
-  const clearAll = () => {
-    router.push("/extensions/");
-  };
-
-  const hasFilters = activeCategory || searchParams.get("q");
-
-  return (
-    <aside
-      className="w-full space-y-7 lg:w-56 xl:w-64"
-      aria-label="Filter extensions"
-    >
-      {/* Sort */}
-      <div>
-        <h3 className="mb-3 text-xs font-semibold uppercase tracking-[.6px] text-[rgb(130,130,138)]">
-          Sort by
-        </h3>
-        <div className="space-y-1">
-          {SORT_OPTIONS.map((opt) => (
-            <button
-              key={opt.value}
-              id={`sort-${opt.value}`}
-              onClick={() => setParam("sort", opt.value)}
-              className={`w-full rounded-[10px] px-3 py-[7px] text-left text-sm transition-colors ${
-                activeSort === opt.value
-                  ? "bg-[rgba(123,97,255,.16)] font-semibold text-white shadow-[inset_0_0_0_1px_rgba(123,97,255,.30)]"
-                  : "font-medium text-[rgb(170,170,176)] hover:text-white"
-              }`}
-            >
-              {opt.label}
-            </button>
-          ))}
-        </div>
-      </div>
-
-      {/* Categories */}
-      <div>
-        <h3 className="mb-3 text-xs font-semibold uppercase tracking-[.6px] text-[rgb(130,130,138)]">
-          Category
-        </h3>
-        <div className="flex flex-wrap gap-2">
-          {CATEGORIES.map((cat) => (
-            <TagChip
-              key={cat.slug}
-              id={`filter-cat-${cat.slug}`}
-              active={activeCategory === cat.slug}
-              onClick={() => toggleCategory(cat.slug)}
-            >
-              {cat.label}
-            </TagChip>
-          ))}
-        </div>
-      </div>
-
-      {/* Clear filters */}
-      {hasFilters && (
-        <button
-          id="clear-filters"
-          onClick={clearAll}
-          className="btn-pill btn-glass btn-sm w-full"
-        >
-          <span>Clear filters</span>
-        </button>
-      )}
-    </aside>
-  );
-}
diff --git a/apps/marketplace/src/components/Footer.tsx b/apps/marketplace/src/components/Footer.tsx
deleted file mode 100644
index 2bf735a0..00000000
--- a/apps/marketplace/src/components/Footer.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-const LINKS = [
-  { label: "Docs", href: "https://docs.lumibase.dev" },
-  { label: "Twitter", href: "https://twitter.com/lumibase" },
-  { label: "Discord", href: "https://discord.gg/lumibase" },
-  { label: "GitHub", href: "https://github.com/khuepm/lumibase" },
-];
-
-export default function Footer() {
-  return (
-    <footer className="mx-auto mt-28 flex max-w-[1140px] items-center justify-between border-t border-hairline px-6 pb-14 pt-10 text-[13px] font-medium text-txt-muted">
-      <span>© 2026 LumiBase, Inc.</span>
-      <span className="flex gap-[18px]">
-        {LINKS.map((link) => (
-          <a
-            key={link.label}
-            href={link.href}
-            target="_blank"
-            rel="noopener noreferrer"
-            className="transition-colors hover:text-white"
-          >
-            {link.label}
-          </a>
-        ))}
-      </span>
-    </footer>
-  );
-}
diff --git a/apps/marketplace/src/components/Header.tsx b/apps/marketplace/src/components/Header.tsx
deleted file mode 100644
index f8767cd1..00000000
--- a/apps/marketplace/src/components/Header.tsx
+++ /dev/null
@@ -1,115 +0,0 @@
-"use client";
-
-import Link from "next/link";
-import { useState } from "react";
-import { Menu, X } from "lucide-react";
-import PillNav, { type PillNavItem } from "./PillNav";
-
-const NAV_ITEMS: PillNavItem[] = [
-  { label: "Home", href: "/" },
-  { label: "Extensions", href: "/extensions/" },
-  { label: "Docs", href: "https://docs.lumibase.dev", external: true },
-  { label: "GitHub", href: "https://github.com/khuepm/lumibase", external: true },
-];
-
-const PUBLISH_URL = "https://docs.lumibase.dev/extensions/create";
-
-export default function Header() {
-  const [open, setOpen] = useState(false);
-
-  return (
-    <header className="relative z-40">
-      <div className="relative flex h-[72px] items-center justify-between px-5 sm:px-10">
-        {/* Logo */}
-        <Link
-          href="/"
-          className="flex items-center gap-2.5"
-          aria-label="LumiBase Marketplace Home"
-        >
-          <span
-            aria-hidden
-            className="h-[22px] w-[22px] rounded-full"
-            style={{
-              background: "linear-gradient(180deg,#fff,#cfcfcf)",
-              boxShadow: "0 0 18px rgba(123,97,255,.6)",
-            }}
-          />
-          <span className="text-lg font-bold tracking-[-0.3px] text-white">
-            LumiBase
-          </span>
-          <span className="ml-1.5 border-l border-white/[.14] pl-3 text-[13px] font-semibold text-txt-faint">
-            Marketplace
-          </span>
-        </Link>
-
-        {/* Centered liquid-glass pill nav */}
-        <div className="absolute left-1/2 top-1/2 hidden -translate-x-1/2 -translate-y-1/2 lg:block">
-          <PillNav items={NAV_ITEMS} />
-        </div>
-
-        {/* Right actions */}
-        <div className="flex items-center gap-2.5">
-          <a
-            href={PUBLISH_URL}
-            target="_blank"
-            rel="noopener noreferrer"
-            id="nav-publish"
-            className="btn-pill btn-glass btn-sm hidden sm:inline-flex"
-          >
-            <span>Publish</span>
-          </a>
-
-          {/* Mobile menu toggle */}
-          <button
-            onClick={() => setOpen(!open)}
-            className="flex h-9 w-9 items-center justify-center rounded-full text-txt-secondary transition-colors hover:bg-glass hover:text-white lg:hidden"
-            aria-label={open ? "Close menu" : "Open menu"}
-            aria-expanded={open}
-          >
-            {open ? <X className="h-5 w-5" /> : <Menu className="h-5 w-5" />}
-          </button>
-        </div>
-      </div>
-
-      {/* Mobile menu */}
-      {open && (
-        <div className="mx-4 mb-3 rounded-2xl bg-surface-1 px-3 py-3 ring-glass lg:hidden">
-          <nav className="flex flex-col gap-1" aria-label="Mobile navigation">
-            {NAV_ITEMS.map((item) =>
-              item.external ? (
-                <a
-                  key={item.label}
-                  href={item.href}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                  onClick={() => setOpen(false)}
-                  className="rounded-xl px-3 py-2.5 text-sm font-medium text-txt-secondary transition-colors hover:bg-glass hover:text-white"
-                >
-                  {item.label}
-                </a>
-              ) : (
-                <Link
-                  key={item.label}
-                  href={item.href}
-                  onClick={() => setOpen(false)}
-                  className="rounded-xl px-3 py-2.5 text-sm font-medium text-txt-secondary transition-colors hover:bg-glass hover:text-white"
-                >
-                  {item.label}
-                </Link>
-              )
-            )}
-            <a
-              href={PUBLISH_URL}
-              target="_blank"
-              rel="noopener noreferrer"
-              onClick={() => setOpen(false)}
-              className="rounded-xl px-3 py-2.5 text-sm font-medium text-txt-secondary transition-colors hover:bg-glass hover:text-white"
-            >
-              Publish
-            </a>
-          </nav>
-        </div>
-      )}
-    </header>
-  );
-}
diff --git a/apps/marketplace/src/components/InstallSlug.tsx b/apps/marketplace/src/components/InstallSlug.tsx
deleted file mode 100644
index 6b8f0a40..00000000
--- a/apps/marketplace/src/components/InstallSlug.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-"use client";
-
-import { useState, useCallback } from "react";
-import { Copy, Check, Package } from "lucide-react";
-
-interface InstallSlugProps {
-  slug: string;
-}
-
-export default function InstallSlug({ slug }: InstallSlugProps) {
-  const [copied, setCopied] = useState(false);
-
-  const handleCopy = useCallback(async () => {
-    try {
-      await navigator.clipboard.writeText(slug);
-      setCopied(true);
-      setTimeout(() => setCopied(false), 2000);
-    } catch {
-      // Fallback for older browsers
-      const el = document.createElement("textarea");
-      el.value = slug;
-      document.body.appendChild(el);
-      el.select();
-      document.execCommand("copy");
-      document.body.removeChild(el);
-      setCopied(true);
-      setTimeout(() => setCopied(false), 2000);
-    }
-  }, [slug]);
-
-  return (
-    <div className="rounded-[18px] bg-surface-1 p-[22px] ring-glass">
-      <div className="mb-3 flex items-center gap-2">
-        <Package className="h-4 w-4 text-accent-violet" />
-        <span className="text-sm font-semibold text-white">
-          Install in Studio
-        </span>
-      </div>
-      <p className="mb-3 text-xs font-medium leading-[18px] text-txt-faint">
-        Open Studio → Settings → Marketplace, then paste the slug below.
-      </p>
-      <div className="flex items-center gap-2">
-        <div className="min-w-0 flex-1 truncate rounded-xl bg-surface-sunken px-3 py-2.5 font-mono text-sm text-[#c9bcff] ring-glass">
-          {slug}
-        </div>
-        <button
-          id={`copy-slug-${slug}`}
-          onClick={handleCopy}
-          aria-label={copied ? "Copied!" : `Copy slug ${slug}`}
-          className={`flex h-10 w-10 flex-shrink-0 items-center justify-center rounded-xl transition-all duration-200 ${
-            copied
-              ? "bg-[rgba(46,196,124,.16)] text-accent-green shadow-[inset_0_0_0_1px_rgba(46,196,124,.30)]"
-              : "bg-surface-3 text-txt-secondary ring-glass hover:text-white"
-          }`}
-        >
-          {copied ? (
-            <Check className="h-4 w-4" />
-          ) : (
-            <Copy className="h-4 w-4" />
-          )}
-        </button>
-      </div>
-      {copied && (
-        <p className="animate-fade-in mt-2 text-xs font-medium text-accent-green">
-          Copied to clipboard
-        </p>
-      )}
-    </div>
-  );
-}
diff --git a/apps/marketplace/src/components/PillNav.tsx b/apps/marketplace/src/components/PillNav.tsx
deleted file mode 100644
index 6222a0d7..00000000
--- a/apps/marketplace/src/components/PillNav.tsx
+++ /dev/null
@@ -1,216 +0,0 @@
-"use client";
-
-import Link from "next/link";
-import { usePathname } from "next/navigation";
-import { useCallback, useEffect, useLayoutEffect, useRef, useState } from "react";
-
-export interface PillNavItem {
-  label: string;
-  href: string;
-  external?: boolean;
-}
-
-interface PillNavProps {
-  items: PillNavItem[];
-  className?: string;
-}
-
-/**
- * Injects the shared Liquid Glass SVG displacement filters once.
- * Applied via `backdrop-filter: ... url(#dgmLens)`.
- */
-function ensureLiquidGlass(): void {
-  if (typeof document === "undefined") return;
-  if (document.getElementById("dgm-liquid-glass-defs")) return;
-  const wrap = document.createElement("div");
-  wrap.id = "dgm-liquid-glass-defs";
-  wrap.style.cssText =
-    "position:absolute;width:0;height:0;overflow:hidden;pointer-events:none;";
-  wrap.innerHTML = `
-    <svg xmlns="http://www.w3.org/2000/svg" width="0" height="0" aria-hidden="true">
-      <defs>
-        <filter id="dgmLens" x="-35%" y="-35%" width="170%" height="170%" color-interpolation-filters="sRGB">
-          <feTurbulence type="fractalNoise" baseFrequency="0.009 0.013" numOctaves="2" seed="7" result="noise">
-            <animate attributeName="baseFrequency" dur="11s" repeatCount="indefinite"
-              values="0.009 0.013; 0.015 0.008; 0.007 0.016; 0.009 0.013" calcMode="spline"
-              keySplines="0.45 0 0.55 1; 0.45 0 0.55 1; 0.45 0 0.55 1" />
-          </feTurbulence>
-          <feGaussianBlur in="noise" stdDeviation="1.6" result="sn" />
-          <feDisplacementMap in="SourceGraphic" in2="sn" scale="58"
-            xChannelSelector="R" yChannelSelector="G" />
-        </filter>
-      </defs>
-    </svg>`;
-  document.body.appendChild(wrap);
-}
-
-function isItemActive(item: PillNavItem, pathname: string): boolean {
-  if (item.external) return false;
-  if (item.href === "/") return pathname === "/";
-  return pathname === item.href || pathname.startsWith(item.href);
-}
-
-/**
- * Liquid-glass pill navigation — translucent material with a sliding glass
- * "lozenge" behind the active item. Ported from the LumiBase design system.
- */
-export default function PillNav({ items, className = "" }: PillNavProps) {
-  const pathname = usePathname();
-  const active = items.find((item) => isItemActive(item, pathname))?.label;
-  const wrapRef = useRef<HTMLElement | null>(null);
-  const btnRefs = useRef<Record<string, HTMLAnchorElement | null>>({});
-  const [thumb, setThumb] = useState({ left: 0, width: 0, ready: false });
-
-  useEffect(() => {
-    ensureLiquidGlass();
-  }, []);
-
-  const measure = useCallback(() => {
-    if (!active) {
-      setThumb((t) => ({ ...t, ready: false }));
-      return;
-    }
-    const el = btnRefs.current[active];
-    const wrap = wrapRef.current;
-    if (!el || !wrap) return;
-    const w = wrap.getBoundingClientRect();
-    const b = el.getBoundingClientRect();
-    setThumb({ left: b.left - w.left, width: b.width, ready: true });
-  }, [active]);
-
-  useLayoutEffect(() => {
-    measure();
-  }, [measure]);
-
-  useEffect(() => {
-    window.addEventListener("resize", measure);
-    return () => window.removeEventListener("resize", measure);
-  }, [measure]);
-
-  return (
-    <nav
-      ref={wrapRef}
-      aria-label="Main navigation"
-      className={className}
-      style={{
-        position: "relative",
-        display: "inline-flex",
-        alignItems: "center",
-        gap: 2,
-        padding: 5,
-        borderRadius: 999,
-        overflow: "hidden",
-        isolation: "isolate",
-        boxShadow: [
-          "inset 0 1px 0 rgba(255,255,255,0.6)",
-          "inset 0 0 0 1px rgba(255,255,255,0.14)",
-          "inset 1px 0 6px rgba(255,255,255,0.18)",
-          "inset -1px 0 6px rgba(255,255,255,0.18)",
-          "inset 0 -10px 22px rgba(0,0,0,0.32)",
-          "0 10px 34px -6px rgba(0,0,0,0.6)",
-          "0 2px 6px rgba(0,0,0,0.35)",
-        ].join(", "),
-      }}
-    >
-      <span
-        aria-hidden
-        style={{
-          position: "absolute",
-          inset: 0,
-          borderRadius: 999,
-          zIndex: 0,
-          background:
-            "linear-gradient(180deg, rgba(255,255,255,0.14) 0%, rgba(255,255,255,0.05) 48%, rgba(255,255,255,0.02) 100%)",
-          backdropFilter: "blur(7px) saturate(185%) url(#dgmLens)",
-          WebkitBackdropFilter: "blur(7px) saturate(185%)",
-        }}
-      />
-      {thumb.ready && (
-        <span
-          aria-hidden
-          style={{
-            position: "absolute",
-            top: 5,
-            left: thumb.left,
-            width: thumb.width,
-            height: "calc(100% - 10px)",
-            borderRadius: 999,
-            zIndex: 1,
-            background:
-              "linear-gradient(180deg, rgba(255,255,255,0.34) 0%, rgba(255,255,255,0.12) 100%)",
-            backdropFilter: "blur(1px) saturate(170%) brightness(1.16)",
-            WebkitBackdropFilter: "blur(1px) saturate(170%) brightness(1.16)",
-            boxShadow: [
-              "inset 0 1px 0 rgba(255,255,255,0.85)",
-              "inset 0 0 0 1px rgba(255,255,255,0.3)",
-              "inset 0 -6px 12px rgba(0,0,0,0.18)",
-              "0 6px 16px -2px rgba(0,0,0,0.45)",
-            ].join(", "),
-            transition:
-              "left 620ms cubic-bezier(0.34,1.56,0.64,1), width 620ms cubic-bezier(0.34,1.56,0.64,1)",
-          }}
-        />
-      )}
-      {items.map((item) => {
-        const isActive = active === item.label;
-        const style: React.CSSProperties = {
-          position: "relative",
-          zIndex: 2,
-          display: "inline-flex",
-          alignItems: "center",
-          height: 38,
-          padding: "0 18px",
-          borderRadius: 999,
-          fontWeight: 600,
-          fontSize: 13,
-          lineHeight: 1,
-          letterSpacing: "0.2px",
-          whiteSpace: "nowrap",
-          textDecoration: "none",
-          color: isActive ? "#fff" : "rgba(255,255,255,0.66)",
-          textShadow: isActive ? "0 1px 2px rgba(0,0,0,0.35)" : "none",
-          transition: "color 240ms cubic-bezier(0.22,1,0.36,1)",
-        };
-        const hoverHandlers = {
-          onMouseEnter: (e: React.MouseEvent<HTMLAnchorElement>) => {
-            if (!isActive) e.currentTarget.style.color = "rgba(255,255,255,0.92)";
-          },
-          onMouseLeave: (e: React.MouseEvent<HTMLAnchorElement>) => {
-            if (!isActive) e.currentTarget.style.color = "rgba(255,255,255,0.66)";
-          },
-        };
-        if (item.external) {
-          return (
-            <a
-              key={item.label}
-              ref={(n) => {
-                btnRefs.current[item.label] = n;
-              }}
-              href={item.href}
-              target="_blank"
-              rel="noopener noreferrer"
-              style={style}
-              {...hoverHandlers}
-            >
-              {item.label}
-            </a>
-          );
-        }
-        return (
-          <Link
-            key={item.label}
-            ref={(n) => {
-              btnRefs.current[item.label] = n;
-            }}
-            href={item.href}
-            aria-current={isActive ? "page" : undefined}
-            style={style}
-            {...hoverHandlers}
-          >
-            {item.label}
-          </Link>
-        );
-      })}
-    </nav>
-  );
-}
diff --git a/apps/marketplace/src/components/PlanetIcon.tsx b/apps/marketplace/src/components/PlanetIcon.tsx
deleted file mode 100644
index db9ec760..00000000
--- a/apps/marketplace/src/components/PlanetIcon.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { ACCENT_COLORS, planetGradient, type Accent } from "@/lib/design";
-
-interface PlanetIconProps {
-  accent: Accent;
-  /** Square size in px. */
-  size?: number;
-  /** Border radius in px. */
-  radius?: number;
-  /** Glow blur radius in px (0 disables). */
-  glow?: number;
-  className?: string;
-}
-
-/** Planet-style app icon — radial gradient sphere with a soft accent glow. */
-export default function PlanetIcon({
-  accent,
-  size = 46,
-  radius = 14,
-  glow = 30,
-  className = "",
-}: PlanetIconProps) {
-  const colors = ACCENT_COLORS[accent];
-  return (
-    <div
-      aria-hidden
-      className={`flex-shrink-0 ${className}`}
-      style={{
-        width: size,
-        height: size,
-        borderRadius: radius,
-        background: planetGradient(accent),
-        boxShadow: glow > 0 ? `0 0 ${glow}px ${colors.glow}` : undefined,
-      }}
-    />
-  );
-}
diff --git a/apps/marketplace/src/components/SearchBar.tsx b/apps/marketplace/src/components/SearchBar.tsx
deleted file mode 100644
index b6596913..00000000
--- a/apps/marketplace/src/components/SearchBar.tsx
+++ /dev/null
@@ -1,76 +0,0 @@
-"use client";
-
-import { useCallback, useRef } from "react";
-import { useRouter, useSearchParams } from "next/navigation";
-import { Search, X } from "lucide-react";
-
-interface SearchBarProps {
-  placeholder?: string;
-  className?: string;
-}
-
-export default function SearchBar({
-  placeholder = "Search extensions and skills",
-  className = "",
-}: SearchBarProps) {
-  const router = useRouter();
-  const searchParams = useSearchParams();
-  const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
-  const inputRef = useRef<HTMLInputElement>(null);
-
-  const currentQ = searchParams.get("q") ?? "";
-
-  const push = useCallback(
-    (value: string) => {
-      const params = new URLSearchParams(searchParams.toString());
-      if (value) {
-        params.set("q", value);
-      } else {
-        params.delete("q");
-      }
-      params.delete("page");
-      router.push(`/extensions/?${params.toString()}`);
-    },
-    [router, searchParams]
-  );
-
-  const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    if (debounceRef.current) clearTimeout(debounceRef.current);
-    debounceRef.current = setTimeout(() => push(e.target.value), 400);
-  };
-
-  const handleClear = () => {
-    if (inputRef.current) inputRef.current.value = "";
-    push("");
-  };
-
-  return (
-    <div
-      className={`glass-pill flex items-center gap-2.5 py-2 pl-5 pr-2 ${className}`}
-    >
-      <Search
-        className="h-[18px] w-[18px] flex-shrink-0 text-txt-faint"
-        aria-hidden
-      />
-      <input
-        ref={inputRef}
-        id="marketplace-search"
-        type="search"
-        defaultValue={currentQ}
-        onChange={handleChange}
-        placeholder={placeholder}
-        aria-label="Search extensions"
-        className="h-9 min-w-0 flex-1 border-none bg-transparent text-[15px] font-medium text-white outline-none placeholder:text-txt-faint [&::-webkit-search-cancel-button]:hidden"
-      />
-      {currentQ && (
-        <button
-          onClick={handleClear}
-          aria-label="Clear search"
-          className="flex h-9 w-9 flex-shrink-0 items-center justify-center rounded-full text-txt-faint transition-colors hover:text-white"
-        >
-          <X className="h-4 w-4" />
-        </button>
-      )}
-    </div>
-  );
-}
diff --git a/apps/marketplace/src/components/TagChip.tsx b/apps/marketplace/src/components/TagChip.tsx
deleted file mode 100644
index 6a492cd1..00000000
--- a/apps/marketplace/src/components/TagChip.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import Link from "next/link";
-
-interface TagChipProps {
-  children: React.ReactNode;
-  active?: boolean;
-  href?: string;
-  onClick?: () => void;
-  id?: string;
-  className?: string;
-}
-
-const baseClasses =
-  "inline-flex h-7 items-center gap-1.5 whitespace-nowrap rounded-lg px-2.5 text-xs font-semibold leading-none transition-colors";
-
-/** Filter chip — solid surface chip; violet when active. Renders as Link, button, or span. */
-export default function TagChip({
-  children,
-  active = false,
-  href,
-  onClick,
-  id,
-  className = "",
-}: TagChipProps) {
-  const stateClasses = active
-    ? "bg-accent-violet text-white"
-    : "bg-surface-3 text-txt-secondary ring-glass hover:text-white";
-  const classes = `${baseClasses} ${stateClasses} ${className}`;
-
-  if (href) {
-    return (
-      <Link href={href} id={id} className={classes}>
-        {children}
-      </Link>
-    );
-  }
-  if (onClick) {
-    return (
-      <button type="button" id={id} onClick={onClick} className={classes}>
-        {children}
-      </button>
-    );
-  }
-  return (
-    <span id={id} className={classes}>
-      {children}
-    </span>
-  );
-}
diff --git a/apps/marketplace/src/components/VersionHistory.tsx b/apps/marketplace/src/components/VersionHistory.tsx
deleted file mode 100644
index 9719b1ce..00000000
--- a/apps/marketplace/src/components/VersionHistory.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-import type { ExtensionVersion } from "@/lib/types";
-import Badge from "./Badge";
-
-interface VersionHistoryProps {
-  versions: ExtensionVersion[];
-}
-
-function formatDate(iso: string | null) {
-  if (!iso) return "Unknown";
-  return new Date(iso).toLocaleDateString("en-US", {
-    year: "numeric",
-    month: "short",
-    day: "numeric",
-  });
-}
-
-/**
- * "What's new" changelog — latest release as a highlighted card (green badge),
- * older releases as compact hairline-divided rows below.
- */
-export default function VersionHistory({ versions }: VersionHistoryProps) {
-  if (versions.length === 0) return null;
-  const [latest, ...older] = versions;
-
-  return (
-    <div className="space-y-3">
-      {/* Latest release */}
-      <div className="rounded-2xl bg-surface-1 px-[22px] py-5 ring-glass">
-        <div className="mb-3 flex items-center gap-2.5">
-          <Badge tone="green" dot>
-            v{latest.version}
-          </Badge>
-          <span className="text-[13px] font-medium text-txt-faint">
-            Released {formatDate(latest.publishedAt)}
-          </span>
-          {latest.sha256 && (
-            <code className="ml-auto hidden rounded bg-surface-sunken px-1.5 py-0.5 font-mono text-[10px] text-txt-faint sm:inline">
-              {latest.sha256.slice(0, 8)}…
-            </code>
-          )}
-        </div>
-        {latest.changelog && (
-          <p className="text-sm font-medium leading-[25px] text-[rgb(185,185,192)]">
-            {latest.changelog}
-          </p>
-        )}
-      </div>
-
-      {/* Older releases */}
-      {older.length > 0 && (
-        <div className="rounded-2xl bg-surface-1 ring-glass">
-          {older.map((v, i) => (
-            <div
-              key={v.id}
-              className={`px-[22px] py-4 ${i > 0 ? "border-t border-hairline" : ""}`}
-            >
-              <div className="flex items-center gap-2.5">
-                <Badge tone="neutral" dot={false}>
-                  v{v.version}
-                </Badge>
-                <span className="text-xs font-medium text-txt-faint">
-                  {formatDate(v.publishedAt)}
-                </span>
-                {v.sha256 && (
-                  <code className="ml-auto hidden rounded bg-surface-sunken px-1.5 py-0.5 font-mono text-[10px] text-txt-faint sm:inline">
-                    {v.sha256.slice(0, 8)}…
-                  </code>
-                )}
-              </div>
-              {v.changelog && (
-                <p className="mt-2 text-[13px] font-medium leading-[21px] text-[rgb(170,170,178)]">
-                  {v.changelog}
-                </p>
-              )}
-            </div>
-          ))}
-        </div>
-      )}
-    </div>
-  );
-}
diff --git a/apps/marketplace/src/lib/api.ts b/apps/marketplace/src/lib/api.ts
deleted file mode 100644
index d85c7369..00000000
--- a/apps/marketplace/src/lib/api.ts
+++ /dev/null
@@ -1,501 +0,0 @@
-import type {
-  Extension,
-  ExtensionListResponse,
-  ListExtensionsParams,
-} from "./types";
-
-// ─── Mock data for static export (replace with real CMS API calls) ─────────────
-
-const MOCK_EXTENSIONS: Extension[] = [
-  {
-    id: "ext-001",
-    slug: "seo-toolkit",
-    name: "SEO Toolkit",
-    description:
-      "Gives your agents an SEO skill. Sitemaps, meta tags, and structured data on every publish.",
-    readme: `# SEO Toolkit\n\nAn SEO skill for your agents. Every publish run carries the metadata it needs.\n\n## Features\n\n- Auto-generate XML sitemaps\n- Meta tags editor with preview\n- JSON-LD structured data\n- Open Graph & Twitter Cards\n- Canonical URL management\n\n## Installation\n\nSearch for \`seo-toolkit\` in the Studio Marketplace tab and click Install.`,
-    category: "seo",
-    tags: ["seo", "sitemap", "meta-tags", "structured-data"],
-    publisherName: "LumiBase Team",
-    iconUrl: "",
-    latestVersion: "2.1.0",
-    totalDownloads: 12840,
-    rating: 4.8,
-    ratingCount: 241,
-    publishedAt: "2024-03-01T00:00:00Z",
-    updatedAt: "2025-05-10T00:00:00Z",
-    repositoryUrl: "https://github.com/lumibase/ext-seo-toolkit",
-    licenseType: "MIT",
-    versions: [
-      {
-        id: "v-001-3",
-        version: "2.1.0",
-        publishedAt: "2025-05-10T00:00:00Z",
-        sha256: "a1b2c3d4e5f6a7b8",
-        changelog: "Added JSON-LD support and canonical URL management.",
-      },
-      {
-        id: "v-001-2",
-        version: "2.0.0",
-        publishedAt: "2025-01-15T00:00:00Z",
-        sha256: "b2c3d4e5f6a7b8c9",
-        changelog: "Major rewrite with improved performance.",
-      },
-      {
-        id: "v-001-1",
-        version: "1.0.0",
-        publishedAt: "2024-03-01T00:00:00Z",
-        sha256: "c3d4e5f6a7b8c9d0",
-        changelog: "Initial release.",
-      },
-    ],
-  },
-  {
-    id: "ext-002",
-    slug: "media-optimizer",
-    name: "Media Optimizer",
-    description:
-      "Automatic image compression, WebP conversion, and responsive image generation on upload.",
-    readme: `# Media Optimizer\n\nOptimize every image automatically.\n\n## Features\n- WebP/AVIF conversion\n- Responsive breakpoints\n- EXIF stripping\n- Lazy-load helpers`,
-    category: "media",
-    tags: ["images", "webp", "optimization", "cdn"],
-    publisherName: "PixelCraft",
-    latestVersion: "1.4.2",
-    totalDownloads: 9320,
-    rating: 4.6,
-    ratingCount: 183,
-    publishedAt: "2024-06-20T00:00:00Z",
-    updatedAt: "2025-04-22T00:00:00Z",
-    licenseType: "MIT",
-    versions: [
-      {
-        id: "v-002-2",
-        version: "1.4.2",
-        publishedAt: "2025-04-22T00:00:00Z",
-        sha256: "d4e5f6a7b8c9d0e1",
-        changelog: "AVIF support and bug fixes.",
-      },
-      {
-        id: "v-002-1",
-        version: "1.0.0",
-        publishedAt: "2024-06-20T00:00:00Z",
-        sha256: "e5f6a7b8c9d0e1f2",
-        changelog: "Initial release.",
-      },
-    ],
-  },
-  {
-    id: "ext-003",
-    slug: "analytics-hub",
-    name: "Analytics Hub",
-    description:
-      "Connect Google Analytics, Plausible, and Fathom to your content with a single extension.",
-    readme: `# Analytics Hub\n\nUnified analytics for all your content.\n\n## Supported providers\n- Google Analytics 4\n- Plausible Analytics\n- Fathom Analytics\n- Umami`,
-    category: "analytics",
-    tags: ["analytics", "google-analytics", "plausible", "tracking"],
-    publisherName: "DataFlow Labs",
-    latestVersion: "3.0.1",
-    totalDownloads: 21450,
-    rating: 4.9,
-    ratingCount: 512,
-    publishedAt: "2023-11-01T00:00:00Z",
-    updatedAt: "2025-05-01T00:00:00Z",
-    licenseType: "Apache-2.0",
-    versions: [
-      {
-        id: "v-003-2",
-        version: "3.0.1",
-        publishedAt: "2025-05-01T00:00:00Z",
-        sha256: "f6a7b8c9d0e1f2a3",
-        changelog: "Improved event tracking reliability.",
-      },
-      {
-        id: "v-003-1",
-        version: "3.0.0",
-        publishedAt: "2025-03-10T00:00:00Z",
-        sha256: "a7b8c9d0e1f2a3b4",
-        changelog: "GA4 support, breaking changes from v2.",
-      },
-    ],
-  },
-  {
-    id: "ext-004",
-    slug: "form-builder",
-    name: "Form Builder",
-    description:
-      "Drag-and-drop form creation with validation, file uploads, and webhook integrations.",
-    readme: `# Form Builder\n\nBuild forms without code. Each submission is a run you can inspect.\n\n## Features\n- Visual drag-and-drop editor\n- 20+ field types\n- Conditional logic\n- Webhook & email notifications`,
-    category: "forms",
-    tags: ["forms", "drag-drop", "validation", "webhooks"],
-    publisherName: "FormCraft",
-    latestVersion: "1.2.0",
-    totalDownloads: 7890,
-    rating: 4.5,
-    ratingCount: 98,
-    publishedAt: "2024-09-15T00:00:00Z",
-    updatedAt: "2025-03-30T00:00:00Z",
-    licenseType: "MIT",
-    versions: [
-      {
-        id: "v-004-1",
-        version: "1.2.0",
-        publishedAt: "2025-03-30T00:00:00Z",
-        sha256: "b8c9d0e1f2a3b4c5",
-        changelog: "Added file upload support.",
-      },
-    ],
-  },
-  {
-    id: "ext-005",
-    slug: "i18n-manager",
-    name: "i18n Manager",
-    description:
-      "Multi-language content management with translation workflows and locale switching.",
-    readme: `# i18n Manager\n\nManage translations at scale.\n\n## Features\n- Side-by-side translation editor\n- Translation memory\n- Import/export XLIFF & JSON\n- Machine translation integration`,
-    category: "localization",
-    tags: ["i18n", "localization", "translation", "multilang"],
-    publisherName: "GlobalContent",
-    latestVersion: "4.1.0",
-    totalDownloads: 15600,
-    rating: 4.7,
-    ratingCount: 307,
-    publishedAt: "2023-08-01T00:00:00Z",
-    updatedAt: "2025-05-20T00:00:00Z",
-    licenseType: "MIT",
-    versions: [
-      {
-        id: "v-005-2",
-        version: "4.1.0",
-        publishedAt: "2025-05-20T00:00:00Z",
-        sha256: "c9d0e1f2a3b4c5d6",
-        changelog: "Machine translation via DeepL API.",
-      },
-      {
-        id: "v-005-1",
-        version: "4.0.0",
-        publishedAt: "2025-01-10T00:00:00Z",
-        sha256: "d0e1f2a3b4c5d6e7",
-        changelog: "Major rewrite with new editor.",
-      },
-    ],
-  },
-  {
-    id: "ext-006",
-    slug: "ecommerce-connect",
-    name: "E-Commerce Connect",
-    description:
-      "Sync products, prices, and inventory from Shopify, WooCommerce, and Stripe to your CMS content.",
-    readme: `# E-Commerce Connect\n\nBridge your store and your content.\n\n## Supported Platforms\n- Shopify\n- WooCommerce\n- Stripe Products\n- BigCommerce`,
-    category: "e-commerce",
-    tags: ["shopify", "woocommerce", "stripe", "products", "inventory"],
-    publisherName: "ShopSync",
-    latestVersion: "2.3.0",
-    totalDownloads: 6540,
-    rating: 4.4,
-    ratingCount: 72,
-    publishedAt: "2024-11-01T00:00:00Z",
-    updatedAt: "2025-04-10T00:00:00Z",
-    licenseType: "Commercial",
-    versions: [
-      {
-        id: "v-006-1",
-        version: "2.3.0",
-        publishedAt: "2025-04-10T00:00:00Z",
-        sha256: "e1f2a3b4c5d6e7f8",
-        changelog: "BigCommerce integration added.",
-      },
-    ],
-  },
-];
-
-// ─── Categories derived from mock data ────────────────────────────────────────
-
-export const CATEGORIES = [
-  { slug: "analytics", label: "Analytics" },
-  { slug: "e-commerce", label: "E-Commerce" },
-  { slug: "forms", label: "Forms" },
-  { slug: "localization", label: "Localization" },
-  { slug: "media", label: "Media" },
-  { slug: "seo", label: "SEO" },
-];
-
-// ─── API functions (static — swap with real fetch for ISR) ───────────────────
-
-const CMS_BASE_URL =
-  process.env.NEXT_PUBLIC_CMS_API_URL ?? "https://api.lumibase.dev";
-const USE_REAL_API = process.env.NEXT_PUBLIC_USE_REAL_API === "true";
-const ALLOW_MOCK_FALLBACK = process.env.NODE_ENV !== "production";
-const USE_STATIC_MOCK = !USE_REAL_API;
-
-function buildQuery(params: Record<string, string | number | undefined>) {
-  const q = new URLSearchParams();
-  for (const [k, v] of Object.entries(params)) {
-    if (v !== undefined && v !== "") q.set(k, String(v));
-  }
-  return q.toString();
-}
-
-type CmsListResponse = {
-  data?: unknown;
-  total?: number;
-  page?: number;
-  perPage?: number;
-  totalPages?: number;
-};
-
-function asRecord(value: unknown): Record<string, unknown> {
-  return value && typeof value === "object" && !Array.isArray(value)
-    ? (value as Record<string, unknown>)
-    : {};
-}
-
-function asString(value: unknown, fallback = ""): string {
-  return typeof value === "string" && value.trim() ? value.trim() : fallback;
-}
-
-function asNumber(value: unknown, fallback = 0): number {
-  return typeof value === "number" && Number.isFinite(value) ? value : fallback;
-}
-
-function asStringArray(value: unknown): string[] {
-  if (!Array.isArray(value)) return [];
-  return value
-    .filter((item): item is string => typeof item === "string")
-    .map((item) => item.trim())
-    .filter(Boolean);
-}
-
-function normalizeExtension(input: unknown): Extension {
-  const row = asRecord(input);
-  const manifest = asRecord(row.manifest);
-  const marketplace = asRecord(manifest.marketplace);
-  const pick = (key: string) => marketplace[key] ?? manifest[key] ?? row[key];
-
-  const slug = asString(row.slug ?? row.marketplaceSlug ?? row.key, asString(row.id, "extension"));
-  const name = asString(pick("name"), slug);
-  const description = asString(
-    pick("description"),
-    `${name} extension for LumiBase.`
-  );
-  const latestVersion = asString(row.latestVersion ?? row.version, "0.0.0");
-  const publisherName = asString(
-    row.publisherName ?? pick("publisherName") ?? row.publisher ?? manifest.publisher,
-    "Unknown publisher"
-  );
-  const publishedAt = asString(row.publishedAt, new Date(0).toISOString());
-  const updatedAt = asString(row.updatedAt, publishedAt);
-  const versionsInput = Array.isArray(row.versions) ? row.versions : [];
-  const versions =
-    versionsInput.length > 0
-      ? versionsInput.map((version) => {
-          const versionRow = asRecord(version);
-          return {
-            id: asString(versionRow.id, asString(row.id, slug)),
-            version: asString(versionRow.version, latestVersion),
-            publishedAt: asString(versionRow.publishedAt, publishedAt),
-            sha256: asString(versionRow.sha256 ?? row.bundleSha256, ""),
-            changelog: asString(versionRow.changelog) || undefined,
-          };
-        })
-      : [
-          {
-            id: asString(row.id, slug),
-            version: latestVersion,
-            publishedAt,
-            sha256: asString(row.bundleSha256, ""),
-          },
-        ];
-
-  return {
-    id: asString(row.id, slug),
-    slug,
-    name,
-    description,
-    readme: asString(pick("readme"), description),
-    category: asString(pick("category"), asString(row.type, "module")),
-    tags: asStringArray(pick("tags")),
-    publisherName,
-    iconUrl: asString(pick("iconUrl")) || undefined,
-    bannerUrl: asString(pick("bannerUrl")) || undefined,
-    latestVersion,
-    totalDownloads: asNumber(row.totalDownloads, 0),
-    rating: typeof row.rating === "number" ? row.rating : null,
-    ratingCount: typeof row.ratingCount === "number" ? row.ratingCount : null,
-    versions,
-    publishedAt,
-    updatedAt,
-    repositoryUrl: asString(pick("repositoryUrl")) || undefined,
-    documentationUrl: asString(pick("documentationUrl")) || undefined,
-    licenseType: asString(pick("licenseType") ?? pick("license")) || undefined,
-  };
-}
-
-async function fetchCmsList(params: ListExtensionsParams): Promise<ExtensionListResponse> {
-  const qs = buildQuery({
-    q: params.q,
-    category: params.category,
-    tags: params.tags,
-    page: params.page ?? 1,
-    perPage: params.perPage ?? 12,
-    sort: params.sort ?? "popular",
-  });
-  const res = await fetch(`${CMS_BASE_URL}/api/v1/marketplace/extensions?${qs}`, {
-    next: { revalidate: 60 },
-  });
-  if (!res.ok) throw new Error(`CMS API error: ${res.status}`);
-  const body = (await res.json()) as CmsListResponse;
-  const rawData = Array.isArray(body.data) ? body.data : [];
-  const data = rawData.map(normalizeExtension);
-  return {
-    data,
-    total: body.total ?? data.length,
-    page: body.page ?? params.page ?? 1,
-    perPage: body.perPage ?? params.perPage ?? 12,
-    totalPages:
-      body.totalPages ??
-      Math.max(1, Math.ceil((body.total ?? data.length) / (body.perPage ?? params.perPage ?? 12))),
-  };
-}
-
-async function fetchCmsExtension(slug: string): Promise<Extension | null> {
-  const res = await fetch(
-    `${CMS_BASE_URL}/api/v1/marketplace/extensions/${slug}`,
-    { next: { revalidate: 60 } }
-  );
-  if (res.status === 404) return null;
-  if (!res.ok) throw new Error(`CMS API error: ${res.status}`);
-  const body = (await res.json()) as { data?: unknown };
-  return body.data ? normalizeExtension(body.data) : null;
-}
-
-function emptyList(params: ListExtensionsParams = {}): ExtensionListResponse {
-  return {
-    data: [],
-    total: 0,
-    page: params.page ?? 1,
-    perPage: params.perPage ?? 12,
-    totalPages: 1,
-  };
-}
-
-/**
- * List extensions with optional filters.
- * Without NEXT_PUBLIC_USE_REAL_API=true, filters are applied to the local
- * static catalog so preview builds can still export deterministic pages.
- */
-export async function listExtensions(
-  params: ListExtensionsParams = {}
-): Promise<ExtensionListResponse> {
-  if (USE_REAL_API) {
-    try {
-      return await fetchCmsList(params);
-    } catch (error) {
-      if (!ALLOW_MOCK_FALLBACK) return emptyList(params);
-      console.warn(error);
-    }
-  } else if (!USE_STATIC_MOCK) {
-    return emptyList(params);
-  }
-
-  // Static: filter mock data
-  let data = [...MOCK_EXTENSIONS];
-
-  if (params.q) {
-    const q = params.q.toLowerCase();
-    data = data.filter(
-      (e) =>
-        e.name.toLowerCase().includes(q) ||
-        e.description.toLowerCase().includes(q) ||
-        e.tags.some((t) => t.includes(q))
-    );
-  }
-
-  if (params.category) {
-    data = data.filter((e) => e.category === params.category);
-  }
-
-  if (params.tags) {
-    const filterTags = params.tags.split(",").map((t) => t.trim());
-    data = data.filter((e) => filterTags.some((t) => e.tags.includes(t)));
-  }
-
-  if (params.sort === "latest") {
-    data.sort(
-      (a, b) =>
-        new Date(b.updatedAt).getTime() - new Date(a.updatedAt).getTime()
-    );
-  } else if (params.sort === "name") {
-    data.sort((a, b) => a.name.localeCompare(b.name));
-  } else {
-    data.sort((a, b) => (b.totalDownloads ?? 0) - (a.totalDownloads ?? 0));
-  }
-
-  const page = params.page ?? 1;
-  const perPage = params.perPage ?? 12;
-  const total = data.length;
-  const start = (page - 1) * perPage;
-
-  return {
-    data: data.slice(start, start + perPage),
-    total,
-    page,
-    perPage,
-    totalPages: Math.ceil(total / perPage),
-  };
-}
-
-/**
- * Get a single extension by slug.
- */
-export async function getExtension(slug: string): Promise<Extension | null> {
-  if (USE_REAL_API) {
-    try {
-      return await fetchCmsExtension(slug);
-    } catch (error) {
-      if (!ALLOW_MOCK_FALLBACK) return null;
-      console.warn(error);
-    }
-  } else if (!USE_STATIC_MOCK) {
-    return null;
-  }
-
-  return MOCK_EXTENSIONS.find((e) => e.slug === slug) ?? null;
-}
-
-/**
- * Get all slugs (for generateStaticParams).
- */
-export async function getAllSlugs(): Promise<string[]> {
-  if (USE_REAL_API) {
-    try {
-      const result = await fetchCmsList({ perPage: 50, sort: "latest" });
-      return result.data.map((e) => e.slug);
-    } catch (error) {
-      if (!ALLOW_MOCK_FALLBACK) {
-        throw error;
-      }
-      console.warn(error);
-    }
-  }
-
-  return MOCK_EXTENSIONS.map((e) => e.slug);
-}
-
-/**
- * Get featured extensions (top 3 by downloads).
- */
-export async function getFeaturedExtensions(): Promise<Extension[]> {
-  const result = await listExtensions({ sort: "popular", perPage: 3 });
-  return result.data;
-}
-
-export async function getMarketplaceStats(): Promise<{
-  totalExtensions: number;
-  totalCategories: number;
-}> {
-  const result = await listExtensions({ perPage: 1 });
-  return {
-    totalExtensions: result.total,
-    totalCategories: CATEGORIES.length,
-  };
-}
diff --git a/apps/marketplace/src/lib/design.ts b/apps/marketplace/src/lib/design.ts
deleted file mode 100644
index a3e070a7..00000000
--- a/apps/marketplace/src/lib/design.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-// ─── Cosmic design helpers — category accents, planet icons, trust levels ────
-
-export type Accent = "violet" | "blue" | "green" | "neutral";
-
-interface AccentColors {
-  /** Main accent color (planet mid-tone, badge dot). */
-  accent: string;
-  /** Deep planet edge color. */
-  deep: string;
-  /** Glow box-shadow for planet icons. */
-  glow: string;
-}
-
-export const ACCENT_COLORS: Record<Accent, AccentColors> = {
-  violet: {
-    accent: "#7B61FF",
-    deep: "#26204a",
-    glow: "rgba(123,97,255,0.45)",
-  },
-  blue: {
-    accent: "#18A0FB",
-    deep: "#123a52",
-    glow: "rgba(24,160,251,0.42)",
-  },
-  green: {
-    accent: "#2EC47C",
-    deep: "#12402c",
-    glow: "rgba(46,196,124,0.4)",
-  },
-  neutral: {
-    accent: "#8a8a92",
-    deep: "#26262b",
-    glow: "rgba(255,255,255,0.16)",
-  },
-};
-
-/** Deterministic category → accent mapping. */
-const CATEGORY_ACCENT: Record<string, Accent> = {
-  automation: "violet",
-  developer: "violet",
-  forms: "violet",
-  seo: "violet",
-  ai: "blue",
-  analytics: "blue",
-  media: "blue",
-  content: "green",
-  localization: "green",
-  integrations: "neutral",
-  "e-commerce": "neutral",
-};
-
-const ACCENT_ORDER: Accent[] = ["violet", "blue", "green", "neutral"];
-
-export function categoryAccent(category: string): Accent {
-  const key = category.toLowerCase();
-  const mapped = CATEGORY_ACCENT[key];
-  if (mapped) return mapped;
-  // Deterministic fallback: hash the category name onto the accent wheel.
-  let hash = 0;
-  for (let i = 0; i < key.length; i++) {
-    hash = (hash * 31 + key.charCodeAt(i)) | 0;
-  }
-  return ACCENT_ORDER[Math.abs(hash) % ACCENT_ORDER.length];
-}
-
-/** Radial planet gradient for extension icons. */
-export function planetGradient(accent: Accent): string {
-  const c = ACCENT_COLORS[accent];
-  return `radial-gradient(circle at 32% 28%, #fff 0%, ${c.accent} 60%, ${c.deep} 100%)`;
-}
-
-/** Human label for a category slug. */
-export function categoryLabel(slug: string): string {
-  return slug
-    .split("-")
-    .map((part) => (part.length <= 3 ? part.toUpperCase() : part[0].toUpperCase() + part.slice(1)))
-    .join(" ")
-    .replace("E Commerce", "E-Commerce");
-}
-
-/** Trust level required to run an extension, derived from its category. */
-export function trustLevel(category: string): { level: string; note: string } {
-  switch (category.toLowerCase()) {
-    case "analytics":
-      return { level: "L1 · Propose", note: "reads runs, writes nothing" };
-    case "e-commerce":
-      return { level: "L3 · Veto-window", note: "syncs after a veto window" };
-    default:
-      return { level: "L2 · Assisted", note: "installs skills, never publishes" };
-  }
-}
-
-export function formatInstalls(n?: number): string {
-  if (!n) return "New";
-  if (n >= 1000) return `${(n / 1000).toFixed(1)}k installs`;
-  return `${n} installs`;
-}
diff --git a/apps/marketplace/src/lib/types.ts b/apps/marketplace/src/lib/types.ts
deleted file mode 100644
index 6b5148c0..00000000
--- a/apps/marketplace/src/lib/types.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-// ─── Extension types for Marketplace ──────────────────────────────────────────
-
-export interface ExtensionVersion {
-  id: string;
-  version: string;
-  publishedAt: string | null;
-  sha256: string | null;
-  changelog?: string;
-}
-
-export interface Extension {
-  id: string;
-  slug: string;
-  name: string;
-  description: string;
-  readme: string;
-  category: string;
-  tags: string[];
-  publisherName: string;
-  publisherAvatar?: string;
-  iconUrl?: string;
-  bannerUrl?: string;
-  latestVersion: string;
-  totalDownloads?: number;
-  rating?: number | null;
-  ratingCount?: number | null;
-  versions: ExtensionVersion[];
-  publishedAt: string;
-  updatedAt: string;
-  repositoryUrl?: string;
-  documentationUrl?: string;
-  licenseType?: string;
-}
-
-export interface ExtensionListResponse {
-  data: Extension[];
-  total: number;
-  page: number;
-  perPage: number;
-  totalPages: number;
-}
-
-export interface ListExtensionsParams {
-  q?: string;
-  category?: string;
-  tags?: string;
-  page?: number;
-  perPage?: number;
-  sort?: "latest" | "popular" | "name";
-}
diff --git a/apps/marketplace/tailwind.config.ts b/apps/marketplace/tailwind.config.ts
deleted file mode 100644
index 9352bea1..00000000
--- a/apps/marketplace/tailwind.config.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-import type { Config } from "tailwindcss";
-
-const config: Config = {
-  content: [
-    "./src/pages/**/*.{js,ts,jsx,tsx,mdx}",
-    "./src/components/**/*.{js,ts,jsx,tsx,mdx}",
-    "./src/app/**/*.{js,ts,jsx,tsx,mdx}",
-  ],
-  darkMode: "class",
-  theme: {
-    extend: {
-      colors: {
-        // Cosmic accents
-        accent: {
-          violet: "rgb(123,97,255)",
-          blue: "rgb(24,160,251)",
-          green: "rgb(46,196,124)",
-          red: "rgb(232,86,86)",
-        },
-        // Brand palette — re-pointed at the violet accent family
-        brand: {
-          50: "#f4f1ff",
-          100: "#e8e2ff",
-          200: "#d4c9ff",
-          300: "#b6a4ff",
-          400: "#9d85ff",
-          500: "#7b61ff",
-          600: "#6a4fe8",
-          700: "#5840c4",
-          800: "#453394",
-          900: "#352a6e",
-          950: "#26204a",
-        },
-        // Cosmic surfaces (spec: surface-1..4 + sunken; legacy numeric scale kept)
-        surface: {
-          1: "rgb(29,28,32)",
-          2: "rgb(36,35,37)",
-          3: "rgb(41,41,43)",
-          4: "rgb(52,50,54)",
-          sunken: "rgb(23,22,25)",
-          950: "rgb(14,14,17)",
-          900: "rgb(23,22,25)",
-          800: "rgb(29,28,32)",
-          700: "rgb(36,35,37)",
-          600: "rgb(41,41,43)",
-        },
-        glass: "rgba(255,255,255,0.08)",
-        "glass-hover": "rgba(255,255,255,0.14)",
-        hairline: "rgba(255,255,255,0.08)",
-        "hairline-strong": "rgba(255,255,255,0.16)",
-        "txt-secondary": "rgb(189,189,192)",
-        "txt-muted": "rgb(169,169,169)",
-        "txt-faint": "rgb(155,155,160)",
-        gold: "#F5C451",
-      },
-      borderRadius: {
-        pill: "32px",
-        card: "24px",
-      },
-      fontFamily: {
-        sans: ["Inter", "system-ui", "sans-serif"],
-        mono: ["JetBrains Mono", "Fira Code", "monospace"],
-      },
-      boxShadow: {
-        "ring-glass": "inset 0 0 0 1px rgba(255,255,255,0.08)",
-        "ring-glass-strong": "inset 0 0 0 1px rgba(255,255,255,0.16)",
-        "glow-violet": "0 0 80px rgba(123,97,255,0.45)",
-        "glow-blue": "0 0 80px rgba(24,160,251,0.4)",
-      },
-      animation: {
-        "fade-in": "fadeIn 0.5s ease-in-out",
-        "slide-up": "slideUp 0.4s ease-out",
-      },
-      keyframes: {
-        fadeIn: {
-          "0%": { opacity: "0" },
-          "100%": { opacity: "1" },
-        },
-        slideUp: {
-          "0%": { opacity: "0", transform: "translateY(16px)" },
-          "100%": { opacity: "1", transform: "translateY(0)" },
-        },
-      },
-    },
-  },
-  plugins: [],
-};
-
-export default config;
diff --git a/apps/marketplace/tsconfig.json b/apps/marketplace/tsconfig.json
deleted file mode 100644
index b8cdcc79..00000000
--- a/apps/marketplace/tsconfig.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ES2017",
-    "lib": ["dom", "dom.iterable", "esnext"],
-    "allowJs": true,
-    "skipLibCheck": true,
-    "strict": true,
-    "noEmit": true,
-    "esModuleInterop": true,
-    "module": "esnext",
-    "moduleResolution": "bundler",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "jsx": "preserve",
-    "incremental": true,
-    "plugins": [{ "name": "next" }],
-    "paths": {
-      "@/*": ["./src/*"]
-    }
-  },
-  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", ".next/types/**/*.ts"],
-  "exclude": ["node_modules"]
-}
diff --git a/apps/marketplace/wrangler.toml b/apps/marketplace/wrangler.toml
deleted file mode 100644
index 002f20e6..00000000
--- a/apps/marketplace/wrangler.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-name = "lumibase-marketplace"
-compatibility_date = "2024-01-01"
-
-[vars]
-ENVIRONMENT = "production"
-
-[build]
-command = "npm run build"
-cwd = "."
-
-pages_build_output_dir = "out"
diff --git a/apps/studio/src/modules/settings/marketplace-page.tsx b/apps/studio/src/modules/settings/marketplace-page.tsx
index d74a1a82..351271ae 100644
--- a/apps/studio/src/modules/settings/marketplace-page.tsx
+++ b/apps/studio/src/modules/settings/marketplace-page.tsx
@@ -1,6 +1,6 @@
 import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { useTranslation } from 'react-i18next';
-import { Puzzle, Download, Search, Check, ExternalLink, ShieldAlert, Info, X, User } from 'lucide-react';
+import { Puzzle, Download, Search, Check, ExternalLink, ShieldAlert, ShieldCheck, Info, X, User, ArrowBigUp, Upload } from 'lucide-react';
 import { useState } from 'react';
 import { getApiClient } from '@/lib/api';
 
@@ -12,6 +12,14 @@ interface PublishedExtension {
   publisher: string;
   marketplaceSlug: string;
   publishedAt: string;
+  /** Cryptographically signed by a registered publisher key. */
+  verified?: boolean;
+  /** Cumulative package downloads. */
+  totalDownloads?: number;
+  /** Community upvotes for the listing. */
+  voteCount?: number;
+  /** Whether the current user has upvoted. */
+  hasVoted?: boolean;
 }
 
 interface ExtensionDetail extends PublishedExtension {
@@ -154,6 +162,127 @@ function PublishDialog({
   );
 }
 
+/**
+ * Community submit dialog: lets any user propose an extension for the public
+ * catalog. The listing lands in `pending` review (unpublished) — publishing a
+ * signed bundle is a separate, moderated step.
+ */
+function SubmitDialog({ onClose }: { onClose: () => void }) {
+  const client = getApiClient();
+  const qc = useQueryClient();
+  const [form, setForm] = useState({
+    name: '',
+    version: '0.1.0',
+    type: 'module',
+    marketplaceSlug: '',
+    bundleUrl: '',
+    description: '',
+    publisher: '',
+    repositoryUrl: '',
+  });
+
+  const mutation = useMutation({
+    mutationFn: () =>
+      client.rawRequest<unknown>('/api/v1/marketplace/submit', {
+        method: 'POST',
+        body: JSON.stringify({
+          ...form,
+          repositoryUrl: form.repositoryUrl || undefined,
+          description: form.description || undefined,
+          publisher: form.publisher || undefined,
+        }),
+        headers: { 'Content-Type': 'application/json' },
+      }),
+    onSuccess: () => {
+      qc.invalidateQueries({ queryKey: ['marketplace-extensions'] });
+      onClose();
+    },
+  });
+
+  const set =
+    (key: keyof typeof form) =>
+    (e: React.ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement>) =>
+      setForm((prev) => ({ ...prev, [key]: e.target.value }));
+
+  const valid =
+    form.name &&
+    /^\d+\.\d+\.\d+/.test(form.version) &&
+    /^[a-z0-9-]+$/.test(form.marketplaceSlug) &&
+    /^https?:\/\//.test(form.bundleUrl);
+
+  return (
+    <div
+      className="fixed inset-0 z-50 flex items-center justify-center bg-black/35 p-4"
+      role="dialog"
+      aria-label="Submit extension"
+    >
+      <div className="max-h-[85vh] w-full max-w-lg space-y-3 overflow-y-auto rounded-lg border bg-background p-4 shadow-xl">
+        <div className="flex items-center justify-between">
+          <h2 className="text-base font-semibold">Submit an extension</h2>
+          <button type="button" onClick={onClose} aria-label="Close submit dialog" className="rounded-md border p-1 hover:bg-muted">
+            <X className="h-4 w-4" />
+          </button>
+        </div>
+        <p className="text-xs text-muted-foreground">
+          Propose an extension for the public catalog. It enters review before it
+          becomes installable.
+        </p>
+        <div className="grid grid-cols-1 gap-2 sm:grid-cols-2">
+          <label className="text-xs">
+            <span className="mb-1 block text-muted-foreground">Name *</span>
+            <input value={form.name} onChange={set('name')} className="w-full rounded-md border bg-background px-2 py-1.5" />
+          </label>
+          <label className="text-xs">
+            <span className="mb-1 block text-muted-foreground">Version *</span>
+            <input value={form.version} onChange={set('version')} className="w-full rounded-md border bg-background px-2 py-1.5 font-mono" />
+          </label>
+          <label className="text-xs">
+            <span className="mb-1 block text-muted-foreground">Type *</span>
+            <select value={form.type} onChange={set('type')} aria-label="Extension type" className="w-full rounded-md border bg-background px-2 py-1.5">
+              {['module', 'interface', 'display', 'layout', 'panel', 'endpoint', 'hook', 'operation'].map((tp) => (
+                <option key={tp} value={tp}>{tp}</option>
+              ))}
+            </select>
+          </label>
+          <label className="text-xs">
+            <span className="mb-1 block text-muted-foreground">Marketplace slug *</span>
+            <input value={form.marketplaceSlug} onChange={set('marketplaceSlug')} placeholder="my-extension" className="w-full rounded-md border bg-background px-2 py-1.5 font-mono" />
+          </label>
+          <label className="text-xs sm:col-span-2">
+            <span className="mb-1 block text-muted-foreground">Bundle URL *</span>
+            <input value={form.bundleUrl} onChange={set('bundleUrl')} placeholder="https://…/bundle.js" className="w-full rounded-md border bg-background px-2 py-1.5 font-mono" />
+          </label>
+          <label className="text-xs">
+            <span className="mb-1 block text-muted-foreground">Publisher</span>
+            <input value={form.publisher} onChange={set('publisher')} className="w-full rounded-md border bg-background px-2 py-1.5" />
+          </label>
+          <label className="text-xs">
+            <span className="mb-1 block text-muted-foreground">Repository URL</span>
+            <input value={form.repositoryUrl} onChange={set('repositoryUrl')} placeholder="https://github.com/…" className="w-full rounded-md border bg-background px-2 py-1.5 font-mono" />
+          </label>
+          <label className="text-xs sm:col-span-2">
+            <span className="mb-1 block text-muted-foreground">Description</span>
+            <textarea value={form.description} onChange={set('description')} rows={3} className="w-full rounded-md border bg-background px-2 py-1.5" />
+          </label>
+        </div>
+        {mutation.isError && (
+          <p className="text-xs text-destructive">
+            {mutation.error instanceof Error ? mutation.error.message : 'Submission failed.'}
+          </p>
+        )}
+        <button
+          type="button"
+          onClick={() => mutation.mutate()}
+          disabled={!valid || mutation.isPending}
+          className="rounded-md bg-primary px-3 py-1.5 text-xs font-medium text-primary-foreground hover:opacity-90 disabled:opacity-50"
+        >
+          {mutation.isPending ? 'Submitting…' : 'Submit for review'}
+        </button>
+      </div>
+    </div>
+  );
+}
+
 export function MarketplacePage() {
   const { t } = useTranslation();
   const client = getApiClient();
@@ -163,6 +292,7 @@ export function MarketplacePage() {
   const [selectedSlug, setSelectedSlug] = useState<string | null>(null);
   const [filterType, setFilterType] = useState<string>('all');
   const [publishing, setPublishing] = useState(false);
+  const [submitting, setSubmitting] = useState(false);
 
   // Fetch installed extensions
   const installedQuery = useQuery({
@@ -203,6 +333,25 @@ export function MarketplacePage() {
     },
   });
 
+  // Toggle upvote — DELETE when already voted, POST otherwise.
+  const voteMutation = useMutation({
+    mutationFn: ({ slug, hasVoted }: { slug: string; hasVoted: boolean }) =>
+      client.rawRequest<unknown>(`/api/v1/marketplace/extensions/${slug}/vote`, {
+        method: hasVoted ? 'DELETE' : 'POST',
+      }),
+    onSuccess: () => {
+      qc.invalidateQueries({ queryKey: ['marketplace-extensions'] });
+      qc.invalidateQueries({ queryKey: ['marketplace-extension-detail'] });
+    },
+  });
+
+  // Download the signed package without installing. The endpoint bumps the
+  // download counter and 302s to the bundle.
+  const handleDownload = (slug: string) => {
+    window.open(`/api/v1/marketplace/extensions/${slug}/download`, '_blank', 'noopener');
+    qc.invalidateQueries({ queryKey: ['marketplace-extensions'] });
+  };
+
   const published = marketplaceQuery.data ?? [];
   const installed = installedQuery.data ?? [];
 
@@ -244,16 +393,28 @@ export function MarketplacePage() {
             Browse and install verified third-party extensions to extend Lumibase's capabilities.
           </p>
         </div>
-        {/* Publish loop (studio-ops-ui Req 3) */}
-        <button
-          type="button"
-          onClick={() => setPublishing(true)}
-          className="inline-flex items-center gap-1 self-start rounded-md border px-3 py-2 text-sm font-medium hover:bg-muted"
-        >
-          <ExternalLink className="h-4 w-4" /> Publish extension
-        </button>
+        <div className="flex items-center gap-2 self-start">
+          {/* Community submission loop */}
+          <button
+            type="button"
+            onClick={() => setSubmitting(true)}
+            className="inline-flex items-center gap-1 rounded-md border px-3 py-2 text-sm font-medium hover:bg-muted"
+          >
+            <Upload className="h-4 w-4" /> {t('submit_extension', 'Submit extension')}
+          </button>
+          {/* Publish loop (studio-ops-ui Req 3) */}
+          <button
+            type="button"
+            onClick={() => setPublishing(true)}
+            className="inline-flex items-center gap-1 rounded-md border px-3 py-2 text-sm font-medium hover:bg-muted"
+          >
+            <ExternalLink className="h-4 w-4" /> {t('publish_extension', 'Publish extension')}
+          </button>
+        </div>
       </header>
 
+      {submitting && <SubmitDialog onClose={() => setSubmitting(false)} />}
+
       {publishing && (
         <PublishDialog
           extensions={installed.map((ext) => ({
@@ -320,9 +481,17 @@ export function MarketplacePage() {
                     <div className="flex h-11 w-11 items-center justify-center rounded-lg bg-primary/5 text-primary border border-primary/10 group-hover:bg-primary group-hover:text-primary-foreground transition-colors duration-200">
                       <Puzzle className="h-6 w-6" />
                     </div>
-                    <span className="inline-flex items-center rounded-full bg-secondary px-2.5 py-0.5 text-xs font-semibold text-secondary-foreground border border-secondary-foreground/10 capitalize">
-                      {ext.type}
-                    </span>
+                    <div className="flex flex-col items-end gap-1">
+                      <span className="inline-flex items-center rounded-full bg-secondary px-2.5 py-0.5 text-xs font-semibold text-secondary-foreground border border-secondary-foreground/10 capitalize">
+                        {ext.type}
+                      </span>
+                      {ext.verified && (
+                        <span className="inline-flex items-center gap-1 rounded-full bg-emerald-50 border border-emerald-200 px-2 py-0.5 text-[10px] font-bold text-emerald-700" title={t('verified_source', 'Signed by a verified publisher')}>
+                          <ShieldCheck className="h-3 w-3" />
+                          {t('verified', 'Verified')}
+                        </span>
+                      )}
+                    </div>
                   </div>
 
                   <div className="mt-4">
@@ -340,7 +509,37 @@ export function MarketplacePage() {
                   </div>
                 </div>
 
-                <div className="mt-6 flex items-center justify-between border-t pt-4">
+                <div className="mt-4 flex items-center gap-2 text-xs">
+                  <button
+                    type="button"
+                    onClick={() => voteMutation.mutate({ slug: ext.marketplaceSlug, hasVoted: !!ext.hasVoted })}
+                    disabled={voteMutation.isPending}
+                    aria-pressed={!!ext.hasVoted}
+                    aria-label={t('upvote', 'Upvote')}
+                    className={`inline-flex items-center gap-1 rounded-md border px-2 py-1 font-semibold transition disabled:opacity-50 ${
+                      ext.hasVoted
+                        ? 'border-primary/40 bg-primary/10 text-primary'
+                        : 'hover:bg-muted text-muted-foreground'
+                    }`}
+                  >
+                    <ArrowBigUp className="h-3.5 w-3.5" />
+                    {ext.voteCount ?? 0}
+                  </button>
+                  <span className="inline-flex items-center gap-1 text-muted-foreground" title={t('downloads', 'Downloads')}>
+                    <Download className="h-3.5 w-3.5" />
+                    {ext.totalDownloads ?? 0}
+                  </span>
+                  <button
+                    type="button"
+                    onClick={() => handleDownload(ext.marketplaceSlug)}
+                    className="ml-auto inline-flex items-center gap-1 rounded-md border px-2 py-1 font-medium hover:bg-muted"
+                  >
+                    <Download className="h-3.5 w-3.5" />
+                    {t('download_package', 'Download')}
+                  </button>
+                </div>
+
+                <div className="mt-4 flex items-center justify-between border-t pt-4">
                   <button
                     onClick={() => setSelectedSlug(ext.marketplaceSlug)}
                     className="inline-flex items-center gap-1 text-sm font-semibold text-primary hover:underline"
@@ -465,6 +664,13 @@ export function MarketplacePage() {
                 </div>
 
                 <div className="border-t pt-4 flex justify-end gap-2">
+                  <button
+                    onClick={() => handleDownload(selectedExtension.marketplaceSlug)}
+                    className="inline-flex items-center gap-1.5 rounded-lg border px-4 py-2 text-sm font-semibold hover:bg-muted transition"
+                  >
+                    <Download className="h-4 w-4" />
+                    {t('download_package', 'Download')}
+                  </button>
                   <button
                     onClick={() => setSelectedSlug(null)}
                     className="rounded-lg border px-4 py-2 text-sm font-semibold hover:bg-muted transition"
diff --git a/docs/en/features/marketplace.md b/docs/en/features/marketplace.md
index cfa4befe..bf7ade7e 100644
--- a/docs/en/features/marketplace.md
+++ b/docs/en/features/marketplace.md
@@ -25,6 +25,17 @@ The LumiBase Marketplace lets you publish and install **digitally signed** exten
 | `marketplaceSlug` | Slug used to build the public detail URL |
 | `publishedAt` | Null when not yet published |
 | `bundleSha256` | The bundle's SHA-256 hex, to verify integrity |
+| `downloadCount` | Cumulative package downloads (bumped by `/download`) |
+| `submissionStatus` | Community submission state: `pending` / `approved` / `rejected` (null = not a submission) |
+| `submittedBy` | User who submitted the extension via the community flow |
+
+`extension_votes` records marketplace upvotes — one row per `(userId, marketplaceSlug)`, enforced by a unique index so voting is idempotent. Votes are keyed by slug so they survive version bumps.
+
+| Column | Purpose |
+|--------|----------|
+| `marketplaceSlug` | The listing being voted for |
+| `userId` | The voter (FK → `users`, cascade delete) |
+| `createdAt` | When the vote was cast |
 
 ## Public keys registry
 
@@ -42,14 +53,52 @@ Loaded once at router init, not cached long-term (can be rotated via an env upda
 ## API endpoints
 
 ```
-GET  /api/v1/marketplace/extensions             List published extensions
-GET  /api/v1/marketplace/extensions/:slug       Detail (with signature)
-POST /api/v1/marketplace/extensions/:slug/install   Install into the current site
-POST /api/v1/marketplace/publish                Publish an uploaded extension
+GET    /api/v1/marketplace/extensions              List published extensions
+GET    /api/v1/marketplace/extensions/:slug        Detail (with signature)
+GET    /api/v1/marketplace/extensions/:slug/download   Download package (302 → bundle; ?redirect=0 → JSON)
+POST   /api/v1/marketplace/extensions/:slug/install    Install into the current site
+POST   /api/v1/marketplace/extensions/:slug/vote       Upvote (auth; idempotent)
+DELETE /api/v1/marketplace/extensions/:slug/vote       Remove upvote (auth)
+POST   /api/v1/marketplace/publish                 Publish an uploaded (signed) extension
+POST   /api/v1/marketplace/submit                  Community-submit an extension for review (auth)
+GET    /api/v1/marketplace/submissions?status=     List submissions for moderation (extensions:configure)
+POST   /api/v1/marketplace/submissions/:id/review  Approve / reject a submission (extensions:configure)
 ```
 
 Implementation: `apps/cms/src/routes/marketplace.ts`.
 
+The catalog projection adds three derived fields on top of the stable public
+fields: `verified` (true when the listing carries a signature + registered
+publisher key + integrity hash — drives the "Verified" badge and the trusted
+install path), `voteCount`, and `hasVoted` (for the authenticated caller).
+`totalDownloads` now reflects `downloadCount`.
+
+## Download
+
+`GET /extensions/:slug/download` bumps `downloadCount` on the latest published
+version and, by default, `302`-redirects to the signed `bundleUrl` so large
+bundles never transit the Worker. Programmatic clients pass `?redirect=0` to get
+the bundle metadata (URL, hash, signature, key id, new count) as JSON instead.
+
+## Voting
+
+Any authenticated user can upvote a listing. `POST …/vote` inserts a row with
+`ON CONFLICT DO NOTHING` against the unique `(userId, marketplaceSlug)` index, so
+repeat votes are no-ops; `DELETE …/vote` retracts it. Both return the fresh
+`{ voteCount, hasVoted }`.
+
+## Community submissions
+
+`POST /submit` lets any authenticated user propose an extension for the public
+catalog. It validates the payload (name, SemVer `version`, `type`, slug, bundle
+URL, optional description/publisher/repo/capabilities), rejects a slug that is
+already live in the catalog (`409 SLUG_TAKEN`), and creates a **global,
+unpublished** row (`siteId = null`, `publishedAt = null`) with
+`submissionStatus = 'pending'` and `submittedBy = <user>`. Because it is
+unpublished, it never appears in the public catalog until a moderator approves
+it (`/submissions/:id/review`) **and** a signed bundle is published via
+`/publish`. Moderation endpoints require the `extensions:configure` permission.
+
 ## Verification flow
 
 On `POST /install`:
diff --git a/docs/en/marketplace-submodule-migration.md b/docs/en/marketplace-submodule-migration.md
new file mode 100644
index 00000000..07006622
--- /dev/null
+++ b/docs/en/marketplace-submodule-migration.md
@@ -0,0 +1,74 @@
+# Moving the marketplace app to a submodule
+
+The public marketplace site (`apps/marketplace`) is being extracted into its own
+repository and re-attached to this monorepo as a git submodule:
+
+- **Target repo:** `git@github.com:lumibase-ai/marketplace.git`
+- **Mount path:** `apps/marketplace` (unchanged — the `@lumibase/marketplace`
+  workspace package keeps its path, so `pnpm-workspace.yaml`'s `apps/*` glob
+  still picks it up once the submodule is checked out).
+
+## Why this isn't done automatically
+
+The automation that prepared this change is scoped to `khuepm/lumibase` and has
+**no push access** to `lumibase-ai/*`. The extraction therefore ships as a
+runnable script — run it from a machine (or CI) that can push to
+`lumibase-ai/marketplace`.
+
+## Prerequisites
+
+1. `lumibase-ai/marketplace` exists and is empty (or willing to accept a fresh
+   `main`).
+2. Your git remote has push access to it (SSH key or PAT).
+3. Run from a clean working tree at the repo root.
+
+## Run it
+
+```bash
+# Dry run — prints every git command without executing:
+./scripts/marketplace-submodule-migration.sh
+
+# Execute for real:
+APPLY=1 ./scripts/marketplace-submodule-migration.sh
+
+# Execute, overwriting scaffolding (README/license) on the remote's main:
+FORCE=1 APPLY=1 ./scripts/marketplace-submodule-migration.sh
+```
+
+Overridable env vars: `MARKETPLACE_REPO_URL`, `MARKETPLACE_BRANCH`, `FORCE`.
+
+### If the push is rejected ("fetch first" / non-fast-forward)
+
+The target repo already has commits on `main` — almost always the initial
+`README`/license GitHub adds when you create a repo through the UI. The
+extracted subtree history is a separate root, so it can't fast-forward.
+
+- **Discard that scaffolding** (safe when `main` is just the auto-init commit):
+  re-run with `FORCE=1` — it pushes with `--force` (a `--force-with-lease` can't
+  be used on an ad-hoc URL push: with no remote-tracking ref it always rejects
+  with "stale info").
+- **Keep the remote history**: push to a side branch and reconcile via PR:
+  ```bash
+  git push git@github.com:lumibase-ai/marketplace.git marketplace-export:import-app
+  ```
+
+The script stops before touching the monorepo, so a rejected push leaves
+`apps/marketplace` intact — just resolve the push and re-run.
+
+## What it does
+
+1. `git subtree split --prefix=apps/marketplace` — extracts the full history of
+   the app onto a temporary `marketplace-export` branch (every commit that
+   touched the folder is preserved).
+2. Pushes that history to `lumibase-ai/marketplace` as `main`.
+3. `git rm -r apps/marketplace` and commits the removal from the monorepo.
+4. `git submodule add` at the same path and commits the submodule pointer.
+5. Deletes the temporary export branch.
+
+## After the move
+
+- `.gitmodules` will list **both** `extensions` and `apps/marketplace`.
+- Contributors: `git submodule update --init --recursive` after pulling.
+- CI: enable submodule checkout (`actions/checkout` with `submodules: recursive`).
+- Bumping the app = committing a new submodule SHA in the monorepo (or a
+  `git submodule update --remote`).
diff --git a/packages/database/drizzle/0003_marketplace_votes_downloads.sql b/packages/database/drizzle/0003_marketplace_votes_downloads.sql
new file mode 100644
index 00000000..4b5df711
--- /dev/null
+++ b/packages/database/drizzle/0003_marketplace_votes_downloads.sql
@@ -0,0 +1,34 @@
+-- Marketplace community features: package downloads, upvotes & community submit.
+-- Additive and idempotent (DoD §2): one new site-agnostic table + three new
+-- columns on the existing `lumibase_extensions` table, all guarded so that
+-- re-running is safe and existing installations are unaffected.
+--
+-- RLS is NOT applied to `lumibase_extension_votes` here (votes are global to a
+-- marketplace listing, keyed by voter). Per project convention, any site-level
+-- RLS lives in `packages/database/migrations/rls-policies.sql`.
+
+CREATE TABLE IF NOT EXISTS "lumibase_extension_votes" (
+	"id" text PRIMARY KEY NOT NULL,
+	"marketplace_slug" text NOT NULL,
+	"user_id" text NOT NULL,
+	"created_at" timestamp DEFAULT now() NOT NULL
+);
+--> statement-breakpoint
+ALTER TABLE "lumibase_extensions" ADD COLUMN IF NOT EXISTS "download_count" integer DEFAULT 0 NOT NULL;--> statement-breakpoint
+ALTER TABLE "lumibase_extensions" ADD COLUMN IF NOT EXISTS "submission_status" text;--> statement-breakpoint
+ALTER TABLE "lumibase_extensions" ADD COLUMN IF NOT EXISTS "submitted_by" text;--> statement-breakpoint
+DO $$ BEGIN
+	ALTER TABLE "lumibase_extension_votes" ADD CONSTRAINT "lumibase_extension_votes_user_id_lumibase_users_id_fk"
+		FOREIGN KEY ("user_id") REFERENCES "public"."lumibase_users"("id") ON DELETE cascade ON UPDATE no action;
+EXCEPTION
+	WHEN duplicate_object THEN NULL;
+END $$;--> statement-breakpoint
+DO $$ BEGIN
+	ALTER TABLE "lumibase_extensions" ADD CONSTRAINT "lumibase_extensions_submitted_by_lumibase_users_id_fk"
+		FOREIGN KEY ("submitted_by") REFERENCES "public"."lumibase_users"("id") ON DELETE no action ON UPDATE no action;
+EXCEPTION
+	WHEN duplicate_object THEN NULL;
+END $$;--> statement-breakpoint
+CREATE UNIQUE INDEX IF NOT EXISTS "extension_votes_user_slug_idx" ON "lumibase_extension_votes" USING btree ("user_id","marketplace_slug");--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "extension_votes_slug_idx" ON "lumibase_extension_votes" USING btree ("marketplace_slug");--> statement-breakpoint
+CREATE INDEX IF NOT EXISTS "extensions_submission_status_idx" ON "lumibase_extensions" USING btree ("submission_status");
diff --git a/packages/database/drizzle/meta/_journal.json b/packages/database/drizzle/meta/_journal.json
index 5270e8dc..2f67c839 100644
--- a/packages/database/drizzle/meta/_journal.json
+++ b/packages/database/drizzle/meta/_journal.json
@@ -22,6 +22,13 @@
       "when": 1783329587877,
       "tag": "0002_add_user_token_version",
       "breakpoints": true
+    },
+    {
+      "idx": 3,
+      "version": "7",
+      "when": 1783329687877,
+      "tag": "0003_marketplace_votes_downloads",
+      "breakpoints": true
     }
   ]
 }
diff --git a/packages/database/src/schema/platform.ts b/packages/database/src/schema/platform.ts
index 5029fe95..e0839a70 100644
--- a/packages/database/src/schema/platform.ts
+++ b/packages/database/src/schema/platform.ts
@@ -195,12 +195,52 @@ export const extensions = pgTable(
     publishedAt: timestamp('published_at'),
     /** SHA-256 of the bundle for integrity verification at install time. */
     bundleSha256: text('bundle_sha256'),
+    /** Cumulative package downloads (increments on the /download endpoint). */
+    downloadCount: integer('download_count').default(0).notNull(),
+    /**
+     * User-submission review state for community-contributed extensions:
+     * null = not a submission, `pending` = awaiting review, `approved`,
+     * `rejected`. Publishing to the catalog still goes through /publish.
+     */
+    submissionStatus: text('submission_status'),
+    /** User who submitted this extension via the community submit flow. */
+    submittedBy: text('submitted_by').references(() => users.id),
   },
   (t) => ({
     siteNameIdx: index('extensions_site_name_idx').on(t.siteId, t.name),
     siteKeyIdx: index('extensions_site_key_idx').on(t.siteId, t.key),
     publisherIdx: index('extensions_publisher_idx').on(t.publisher, t.publishedAt),
     marketplaceSlugIdx: index('extensions_marketplace_slug_idx').on(t.marketplaceSlug),
+    submissionStatusIdx: index('extensions_submission_status_idx').on(
+      t.submissionStatus,
+    ),
+  }),
+);
+
+/**
+ * Marketplace upvotes. One row per (user, marketplace listing); the unique
+ * index makes voting idempotent and prevents ballot-stuffing. Votes are keyed
+ * by `marketplaceSlug` (not extension row id) so they persist across version
+ * bumps of the same listing.
+ */
+export const extensionVotes = pgTable(
+  'lumibase_extension_votes',
+  {
+    id: id(),
+    /** Marketplace listing slug the vote is cast for. */
+    marketplaceSlug: text('marketplace_slug').notNull(),
+    /** Voter. */
+    userId: text('user_id')
+      .notNull()
+      .references(() => users.id, { onDelete: 'cascade' }),
+    createdAt: createdAt(),
+  },
+  (t) => ({
+    userSlugIdx: uniqueIndex('extension_votes_user_slug_idx').on(
+      t.userId,
+      t.marketplaceSlug,
+    ),
+    slugIdx: index('extension_votes_slug_idx').on(t.marketplaceSlug),
   }),
 );
 
diff --git a/scripts/marketplace-submodule-migration.sh b/scripts/marketplace-submodule-migration.sh
new file mode 100755
index 00000000..17b8a293
--- /dev/null
+++ b/scripts/marketplace-submodule-migration.sh
@@ -0,0 +1,106 @@
+#!/usr/bin/env bash
+#
+# Move apps/marketplace out of this monorepo into its own repository and
+# re-attach it as a git submodule.
+#
+#   Target repo: git@github.com:lumibase-ai/marketplace.git
+#
+# WHY A SCRIPT (not done automatically): the CI/session that generated this
+# change is scoped to `khuepm/lumibase` and cannot push to `lumibase-ai/*`.
+# Run this from a machine with push access to lumibase-ai/marketplace.
+#
+# It preserves the full git history of apps/marketplace via `git subtree
+# split`, so the standalone repo keeps every commit that touched the app.
+#
+# Usage:
+#   ./scripts/marketplace-submodule-migration.sh                 # dry run (prints steps)
+#   APPLY=1 ./scripts/marketplace-submodule-migration.sh         # execute
+#   FORCE=1 APPLY=1 ./scripts/marketplace-submodule-migration.sh # execute, overwriting
+#                                                                # scaffolding on remote main
+#
+set -euo pipefail
+
+REPO_URL="${MARKETPLACE_REPO_URL:-git@github.com:lumibase-ai/marketplace.git}"
+SUBTREE_PREFIX="apps/marketplace"
+SUBMODULE_PATH="apps/marketplace"
+BRANCH="${MARKETPLACE_BRANCH:-main}"
+APPLY="${APPLY:-0}"
+
+run() {
+  echo "+ $*"
+  if [[ "$APPLY" == "1" ]]; then
+    "$@"
+  fi
+}
+
+echo "== Marketplace submodule migration =="
+echo "   monorepo dir : $SUBTREE_PREFIX"
+echo "   target repo  : $REPO_URL (branch: $BRANCH)"
+echo "   mode         : $([[ "$APPLY" == "1" ]] && echo APPLY || echo DRY-RUN)"
+echo
+
+if [[ ! -d "$SUBTREE_PREFIX" ]]; then
+  echo "error: $SUBTREE_PREFIX not found — run from the repo root." >&2
+  exit 1
+fi
+
+# 1. Extract history of apps/marketplace onto a detached branch.
+#    Recreate the export branch each run so re-invoking after a failed push
+#    doesn't trip over an existing branch.
+echo "-- 1. Split subtree history --"
+run git branch -D marketplace-export 2>/dev/null || true
+run git subtree split --prefix="$SUBTREE_PREFIX" -b marketplace-export
+
+# 2. Push the extracted history to the standalone repo.
+#    A brand-new repo created via the GitHub UI usually has an initial commit
+#    (README/license) on `main`, so the fresh subtree history is NOT a
+#    fast-forward and the push is rejected. Set FORCE=1 to replace that
+#    scaffolding with the app history (safe when main is throwaway scaffold).
+echo "-- 2. Push extracted history to standalone repo --"
+# NOTE: plain --force, not --force-with-lease. A lease needs a remote-tracking
+# ref, which an ad-hoc URL push doesn't have, so --force-with-lease always
+# rejects with "stale info". main here is throwaway scaffold, so --force is safe.
+PUSH_ARGS=()
+[[ "${FORCE:-0}" == "1" ]] && PUSH_ARGS+=(--force)
+if [[ "$APPLY" == "1" ]]; then
+  echo "+ git push ${PUSH_ARGS[*]} $REPO_URL marketplace-export:$BRANCH"
+  if ! git push "${PUSH_ARGS[@]}" "$REPO_URL" "marketplace-export:$BRANCH"; then
+    cat >&2 <<HINT
+
+Push rejected — the remote '$BRANCH' already has commits (likely repo
+scaffolding: an initial README/license). Options:
+  * Replace it with the app history:   FORCE=1 APPLY=1 $0
+  * Keep it and reconcile via a PR:     git push $REPO_URL marketplace-export:import-app
+The monorepo has NOT been modified; re-run once the push succeeds.
+HINT
+    exit 1
+  fi
+else
+  echo "+ git push ${PUSH_ARGS[*]} $REPO_URL marketplace-export:$BRANCH"
+fi
+
+# 3. Remove the app from the monorepo and commit the removal.
+echo "-- 3. Remove app from monorepo --"
+run git rm -r "$SUBTREE_PREFIX"
+run git commit -m "chore(marketplace): move app to standalone repo (submodule)"
+
+# 4. Re-add it as a submodule at the same path.
+echo "-- 4. Add submodule --"
+run git submodule add -b "$BRANCH" "$REPO_URL" "$SUBMODULE_PATH"
+run git commit -m "chore(marketplace): add marketplace as submodule"
+
+# 5. Clean up the temporary export branch.
+echo "-- 5. Cleanup --"
+run git branch -D marketplace-export
+
+cat <<'NOTE'
+
+Done (or dry-run complete).
+
+Follow-ups after APPLY:
+  * pnpm-workspace.yaml already globs apps/* — the submodule keeps the
+    @lumibase/marketplace package in the workspace once checked out.
+  * Contributors must run: git submodule update --init --recursive
+  * CI must checkout submodules (actions/checkout: submodules: recursive).
+  * .gitmodules will now contain BOTH `extensions` and `apps/marketplace`.
+NOTE