@tscircuit/fake-snippets 0.0.110 → 0.0.112

package/dist/index.d.ts

@@ -151,9 +151,11 @@ declare const accountSchema: z.ZodObject<{
         apartment?: string | undefined;
     }>>;
     personal_org_id: z.ZodOptional<z.ZodString>;
+    is_tscircuit_staff: z.ZodDefault<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     account_id: string;
     github_username: string;
+    is_tscircuit_staff: boolean;
     shippingInfo?: {
         firstName: string;
         lastName: string;
@@ -183,6 +185,7 @@ declare const accountSchema: z.ZodObject<{
         apartment?: string | undefined;
     } | undefined;
     personal_org_id?: string | undefined;
+    is_tscircuit_staff?: boolean | undefined;
 }>;
 type Account = z.infer<typeof accountSchema>;
 declare const orderSchema: z.ZodObject<{
@@ -945,23 +948,26 @@ declare const packageBuildSchema: z.ZodObject<{
 type PackageBuild = z.infer<typeof packageBuildSchema>;
 declare const orgSchema: z.ZodObject<{
     org_id: z.ZodString;
-    github_handle: z.ZodString;
+    github_handle: z.ZodOptional<z.ZodString>;
     owner_account_id: z.ZodString;
     is_personal_org: z.ZodDefault<z.ZodBoolean>;
     created_at: z.ZodString;
     org_display_name: z.ZodOptional<z.ZodString>;
+    org_name: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     created_at: string;
     org_id: string;
-    github_handle: string;
     owner_account_id: string;
     is_personal_org: boolean;
+    org_name: string;
+    github_handle?: string | undefined;
     org_display_name?: string | undefined;
 }, {
     created_at: string;
     org_id: string;
-    github_handle: string;
     owner_account_id: string;
+    org_name: string;
+    github_handle?: string | undefined;
     is_personal_org?: boolean | undefined;
     org_display_name?: string | undefined;
 }>;
@@ -1091,6 +1097,7 @@ declare const createDatabase: ({ seed }?: {
     accounts: {
         account_id: string;
         github_username: string;
+        is_tscircuit_staff: boolean;
         shippingInfo?: {
             firstName: string;
             lastName: string;
@@ -1158,9 +1165,10 @@ declare const createDatabase: ({ seed }?: {
     organizations: {
         created_at: string;
         org_id: string;
-        github_handle: string;
         owner_account_id: string;
         is_personal_org: boolean;
+        org_name: string;
+        github_handle?: string | undefined;
         org_display_name?: string | undefined;
     }[];
     orgAccounts: {
@@ -1338,7 +1346,8 @@ declare const createDatabase: ({ seed }?: {
     updateJlcpcbOrderState: (orderId: string, updates: Partial<JlcpcbOrderState>) => void;
     addOrderFile: (orderFile: Omit<OrderFile, "order_file_id">) => OrderFile;
     getOrderFileById: (orderFileId: string) => OrderFile | undefined;
-    addAccount: (account: Omit<Account, "account_id"> & Partial<Pick<Account, "account_id">>) => {
+    addAccount: (account: Omit<Account, "account_id" | "is_tscircuit_staff"> & Partial<Pick<Account, "account_id" | "is_tscircuit_staff">>) => {
+        is_tscircuit_staff: boolean;
         github_username: string;
         shippingInfo?: {
             firstName: string;
@@ -1430,12 +1439,14 @@ declare const createDatabase: ({ seed }?: {
         org_id?: string;
         is_personal_org?: boolean;
         owner_account_id: string;
+        github_handle?: string;
     }) => {
         created_at: string;
         org_id: string;
-        github_handle: string;
         owner_account_id: string;
         is_personal_org: boolean;
+        org_name: string;
+        github_handle?: string | undefined;
         org_display_name?: string | undefined;
     };
     getOrgs: (filters?: {
@@ -1450,9 +1461,10 @@ declare const createDatabase: ({ seed }?: {
         can_manage_org: boolean;
         created_at: string;
         org_id: string;
-        github_handle: string;
         owner_account_id: string;
         is_personal_org: boolean;
+        org_name: string;
+        github_handle?: string | undefined;
         org_display_name?: string | undefined;
     }[];
     getOrg: (filters: {
@@ -1467,9 +1479,10 @@ declare const createDatabase: ({ seed }?: {
         can_manage_org: boolean;
         created_at: string;
         org_id: string;
-        github_handle: string;
         owner_account_id: string;
         is_personal_org: boolean;
+        org_name: string;
+        github_handle?: string | undefined;
         org_display_name?: string | undefined;
     } | null;
     addOrganizationAccount: (organizationAccount: {
@@ -1598,6 +1611,7 @@ declare const createDatabase: ({ seed }?: {
     accounts: {
         account_id: string;
         github_username: string;
+        is_tscircuit_staff: boolean;
         shippingInfo?: {
             firstName: string;
             lastName: string;
@@ -1665,9 +1679,10 @@ declare const createDatabase: ({ seed }?: {
     organizations: {
         created_at: string;
         org_id: string;
-        github_handle: string;
         owner_account_id: string;
         is_personal_org: boolean;
+        org_name: string;
+        github_handle?: string | undefined;
         org_display_name?: string | undefined;
     }[];
     orgAccounts: {
@@ -1845,7 +1860,8 @@ declare const createDatabase: ({ seed }?: {
     updateJlcpcbOrderState: (orderId: string, updates: Partial<JlcpcbOrderState>) => void;
     addOrderFile: (orderFile: Omit<OrderFile, "order_file_id">) => OrderFile;
     getOrderFileById: (orderFileId: string) => OrderFile | undefined;
-    addAccount: (account: Omit<Account, "account_id"> & Partial<Pick<Account, "account_id">>) => {
+    addAccount: (account: Omit<Account, "account_id" | "is_tscircuit_staff"> & Partial<Pick<Account, "account_id" | "is_tscircuit_staff">>) => {
+        is_tscircuit_staff: boolean;
         github_username: string;
         shippingInfo?: {
             firstName: string;
@@ -1937,12 +1953,14 @@ declare const createDatabase: ({ seed }?: {
         org_id?: string;
         is_personal_org?: boolean;
         owner_account_id: string;
+        github_handle?: string;
     }) => {
         created_at: string;
         org_id: string;
-        github_handle: string;
         owner_account_id: string;
         is_personal_org: boolean;
+        org_name: string;
+        github_handle?: string | undefined;
         org_display_name?: string | undefined;
     };
     getOrgs: (filters?: {
@@ -1957,9 +1975,10 @@ declare const createDatabase: ({ seed }?: {
         can_manage_org: boolean;
         created_at: string;
         org_id: string;
-        github_handle: string;
         owner_account_id: string;
         is_personal_org: boolean;
+        org_name: string;
+        github_handle?: string | undefined;
         org_display_name?: string | undefined;
     }[];
     getOrg: (filters: {
@@ -1974,9 +1993,10 @@ declare const createDatabase: ({ seed }?: {
         can_manage_org: boolean;
         created_at: string;
         org_id: string;
-        github_handle: string;
         owner_account_id: string;
         is_personal_org: boolean;
+        org_name: string;
+        github_handle?: string | undefined;
         org_display_name?: string | undefined;
     } | null;
     addOrganizationAccount: (organizationAccount: {

package/dist/index.js

@@ -66,7 +66,8 @@ var accountSchema = z.object({
   account_id: z.string(),
   github_username: z.string(),
   shippingInfo: shippingInfoSchema.optional(),
-  personal_org_id: z.string().optional()
+  personal_org_id: z.string().optional(),
+  is_tscircuit_staff: z.boolean().default(false)
 });
 var orderSchema = z.object({
   order_id: z.string(),
@@ -336,11 +337,12 @@ var packageBuildSchema = z.object({
 });
 var orgSchema = z.object({
   org_id: z.string(),
-  github_handle: z.string(),
+  github_handle: z.string().optional(),
   owner_account_id: z.string(),
   is_personal_org: z.boolean().default(false),
   created_at: z.string().datetime(),
-  org_display_name: z.string().optional()
+  org_display_name: z.string().optional(),
+  org_name: z.string()
 });
 var orgAccountSchema = z.object({
   org_account_id: z.string(),
@@ -359,6 +361,7 @@ var publicOrgSchema = z.object({
   is_personal_org: z.boolean(),
   display_name: z.string().optional(),
   package_count: z.number(),
+  github_handle: z.string().optional(),
   created_at: z.string(),
   user_permissions: z.object({
     can_manage_org: z.boolean().optional(),
@@ -2276,6 +2279,7 @@ export const SquareWaveModule = () => (
   });
   const testOrg = db.addOrganization({
     name: "test-organization",
+    github_handle: "tscircuit",
     owner_account_id: account_id
   });
   db.addOrganizationAccount({
@@ -2363,6 +2367,7 @@ exports.TestComponent = TestComponent;
   db.addOrganization({
     name: "testuser",
     owner_account_id: account_id,
+    github_handle: "tscircuit",
     is_personal_org: true
   });
 };
@@ -2503,7 +2508,8 @@ var initializer = combine(databaseSchema.parse({}), (set, get) => ({
   addAccount: (account) => {
     const newAccount = {
       account_id: account.account_id || `account_${get().idCounter + 1}`,
-      ...account
+      ...account,
+      is_tscircuit_staff: Boolean(account.is_tscircuit_staff)
     };
     set((state) => {
       return {
@@ -3551,8 +3557,9 @@ var initializer = combine(databaseSchema.parse({}), (set, get) => ({
   },
   addOrganization: (organization) => {
     const newOrganization = {
+      org_name: organization.name,
       org_id: organization.org_id || `org_${get().idCounter + 1}`,
-      github_handle: organization.name,
+      github_handle: organization.github_handle,
       is_personal_org: organization.is_personal_org || false,
       created_at: (/* @__PURE__ */ new Date()).toISOString(),
       ...organization
@@ -3607,7 +3614,7 @@ var initializer = combine(databaseSchema.parse({}), (set, get) => ({
       orgs = orgs.filter((org2) => org2.org_id === filters.org_id);
     }
     if (filters?.org_name) {
-      orgs = orgs.filter((org2) => org2.github_handle === filters.org_name);
+      orgs = orgs.filter((org2) => org2.org_name === filters.org_name);
     }
     if (filters?.github_handle) {
       orgs = orgs.filter((org2) => org2.github_handle === filters.github_handle);

package/dist/schema.d.ts

@@ -219,9 +219,11 @@ declare const accountSchema: z.ZodObject<{
         apartment?: string | undefined;
     }>>;
     personal_org_id: z.ZodOptional<z.ZodString>;
+    is_tscircuit_staff: z.ZodDefault<z.ZodBoolean>;
 }, "strip", z.ZodTypeAny, {
     account_id: string;
     github_username: string;
+    is_tscircuit_staff: boolean;
     shippingInfo?: {
         firstName: string;
         lastName: string;
@@ -251,6 +253,7 @@ declare const accountSchema: z.ZodObject<{
         apartment?: string | undefined;
     } | undefined;
     personal_org_id?: string | undefined;
+    is_tscircuit_staff?: boolean | undefined;
 }>;
 type Account = z.infer<typeof accountSchema>;
 declare const orderSchema: z.ZodObject<{
@@ -1118,23 +1121,26 @@ declare const packageBuildSchema: z.ZodObject<{
 type PackageBuild = z.infer<typeof packageBuildSchema>;
 declare const orgSchema: z.ZodObject<{
     org_id: z.ZodString;
-    github_handle: z.ZodString;
+    github_handle: z.ZodOptional<z.ZodString>;
     owner_account_id: z.ZodString;
     is_personal_org: z.ZodDefault<z.ZodBoolean>;
     created_at: z.ZodString;
     org_display_name: z.ZodOptional<z.ZodString>;
+    org_name: z.ZodString;
 }, "strip", z.ZodTypeAny, {
     created_at: string;
     org_id: string;
-    github_handle: string;
     owner_account_id: string;
     is_personal_org: boolean;
+    org_name: string;
+    github_handle?: string | undefined;
     org_display_name?: string | undefined;
 }, {
     created_at: string;
     org_id: string;
-    github_handle: string;
     owner_account_id: string;
+    org_name: string;
+    github_handle?: string | undefined;
     is_personal_org?: boolean | undefined;
     org_display_name?: string | undefined;
 }>;
@@ -1167,6 +1173,7 @@ declare const publicOrgSchema: z.ZodObject<{
     is_personal_org: z.ZodBoolean;
     display_name: z.ZodOptional<z.ZodString>;
     package_count: z.ZodNumber;
+    github_handle: z.ZodOptional<z.ZodString>;
     created_at: z.ZodString;
     user_permissions: z.ZodOptional<z.ZodObject<{
         can_manage_org: z.ZodOptional<z.ZodBoolean>;
@@ -1186,6 +1193,7 @@ declare const publicOrgSchema: z.ZodObject<{
     is_personal_org: boolean;
     member_count: number;
     package_count: number;
+    github_handle?: string | undefined;
     display_name?: string | undefined;
     user_permissions?: {
         can_manage_org?: boolean | undefined;
@@ -1199,6 +1207,7 @@ declare const publicOrgSchema: z.ZodObject<{
     is_personal_org: boolean;
     member_count: number;
     package_count: number;
+    github_handle?: string | undefined;
     display_name?: string | undefined;
     user_permissions?: {
         can_manage_org?: boolean | undefined;
@@ -1527,9 +1536,11 @@ declare const databaseSchema: z.ZodObject<{
             apartment?: string | undefined;
         }>>;
         personal_org_id: z.ZodOptional<z.ZodString>;
+        is_tscircuit_staff: z.ZodDefault<z.ZodBoolean>;
     }, "strip", z.ZodTypeAny, {
         account_id: string;
         github_username: string;
+        is_tscircuit_staff: boolean;
         shippingInfo?: {
             firstName: string;
             lastName: string;
@@ -1559,6 +1570,7 @@ declare const databaseSchema: z.ZodObject<{
             apartment?: string | undefined;
         } | undefined;
         personal_org_id?: string | undefined;
+        is_tscircuit_staff?: boolean | undefined;
     }>, "many">>;
     packages: z.ZodDefault<z.ZodArray<z.ZodObject<{
         package_id: z.ZodString;
@@ -1714,23 +1726,26 @@ declare const databaseSchema: z.ZodObject<{
     }>, "many">>;
     organizations: z.ZodDefault<z.ZodArray<z.ZodObject<{
         org_id: z.ZodString;
-        github_handle: z.ZodString;
+        github_handle: z.ZodOptional<z.ZodString>;
         owner_account_id: z.ZodString;
         is_personal_org: z.ZodDefault<z.ZodBoolean>;
         created_at: z.ZodString;
         org_display_name: z.ZodOptional<z.ZodString>;
+        org_name: z.ZodString;
     }, "strip", z.ZodTypeAny, {
         created_at: string;
         org_id: string;
-        github_handle: string;
         owner_account_id: string;
         is_personal_org: boolean;
+        org_name: string;
+        github_handle?: string | undefined;
         org_display_name?: string | undefined;
     }, {
         created_at: string;
         org_id: string;
-        github_handle: string;
         owner_account_id: string;
+        org_name: string;
+        github_handle?: string | undefined;
         is_personal_org?: boolean | undefined;
         org_display_name?: string | undefined;
     }>, "many">>;
@@ -2326,6 +2341,7 @@ declare const databaseSchema: z.ZodObject<{
     accounts: {
         account_id: string;
         github_username: string;
+        is_tscircuit_staff: boolean;
         shippingInfo?: {
             firstName: string;
             lastName: string;
@@ -2393,9 +2409,10 @@ declare const databaseSchema: z.ZodObject<{
     organizations: {
         created_at: string;
         org_id: string;
-        github_handle: string;
         owner_account_id: string;
         is_personal_org: boolean;
+        org_name: string;
+        github_handle?: string | undefined;
         org_display_name?: string | undefined;
     }[];
     orgAccounts: {
@@ -2671,6 +2688,7 @@ declare const databaseSchema: z.ZodObject<{
             apartment?: string | undefined;
         } | undefined;
         personal_org_id?: string | undefined;
+        is_tscircuit_staff?: boolean | undefined;
     }[] | undefined;
     packages?: {
         name: string;
@@ -2725,8 +2743,9 @@ declare const databaseSchema: z.ZodObject<{
     organizations?: {
         created_at: string;
         org_id: string;
-        github_handle: string;
         owner_account_id: string;
+        org_name: string;
+        github_handle?: string | undefined;
         is_personal_org?: boolean | undefined;
         org_display_name?: string | undefined;
     }[] | undefined;

package/dist/schema.js

@@ -61,7 +61,8 @@ var accountSchema = z.object({
   account_id: z.string(),
   github_username: z.string(),
   shippingInfo: shippingInfoSchema.optional(),
-  personal_org_id: z.string().optional()
+  personal_org_id: z.string().optional(),
+  is_tscircuit_staff: z.boolean().default(false)
 });
 var orderSchema = z.object({
   order_id: z.string(),
@@ -331,11 +332,12 @@ var packageBuildSchema = z.object({
 });
 var orgSchema = z.object({
   org_id: z.string(),
-  github_handle: z.string(),
+  github_handle: z.string().optional(),
   owner_account_id: z.string(),
   is_personal_org: z.boolean().default(false),
   created_at: z.string().datetime(),
-  org_display_name: z.string().optional()
+  org_display_name: z.string().optional(),
+  org_name: z.string()
 });
 var orgAccountSchema = z.object({
   org_account_id: z.string(),
@@ -354,6 +356,7 @@ var publicOrgSchema = z.object({
   is_personal_org: z.boolean(),
   display_name: z.string().optional(),
   package_count: z.number(),
+  github_handle: z.string().optional(),
   created_at: z.string(),
   user_permissions: z.object({
     can_manage_org: z.boolean().optional(),

package/fake-snippets-api/lib/db/db-client.ts

@@ -178,11 +178,13 @@ const initializer = combine(databaseSchema.parse({}), (set, get) => ({
     return state.orderFiles.find((file) => file.order_file_id === orderFileId)
   },
   addAccount: (
-    account: Omit<Account, "account_id"> & Partial<Pick<Account, "account_id">>,
+    account: Omit<Account, "account_id" | "is_tscircuit_staff"> &
+      Partial<Pick<Account, "account_id" | "is_tscircuit_staff">>,
   ) => {
     const newAccount = {
       account_id: account.account_id || `account_${get().idCounter + 1}`,
       ...account,
+      is_tscircuit_staff: Boolean(account.is_tscircuit_staff),
     }
 
     set((state) => {
@@ -1549,10 +1551,12 @@ const initializer = combine(databaseSchema.parse({}), (set, get) => ({
     org_id?: string
     is_personal_org?: boolean
     owner_account_id: string
+    github_handle?: string
   }) => {
     const newOrganization: Organization = {
+      org_name: organization.name,
       org_id: organization.org_id || `org_${get().idCounter + 1}`,
-      github_handle: organization.name,
+      github_handle: organization.github_handle,
       is_personal_org: organization.is_personal_org || false,
       created_at: new Date().toISOString(),
       ...organization,
@@ -1630,7 +1634,7 @@ const initializer = combine(databaseSchema.parse({}), (set, get) => ({
       orgs = orgs.filter((org) => org.org_id === filters.org_id)
     }
     if (filters?.org_name) {
-      orgs = orgs.filter((org) => org.github_handle === filters.org_name)
+      orgs = orgs.filter((org) => org.org_name === filters.org_name)
     }
     // if (filters?.org_name && auth?.account_id) {
     //   const account = get().accounts.find(x => x.account_id == auth?.account_id)

package/fake-snippets-api/lib/db/schema.ts

@@ -67,12 +67,12 @@ export const shippingInfoSchema = z.object({
   country: z.string(),
   phone: z.string(),
 })
-
 export const accountSchema = z.object({
   account_id: z.string(),
   github_username: z.string(),
   shippingInfo: shippingInfoSchema.optional(),
   personal_org_id: z.string().optional(),
+  is_tscircuit_staff: z.boolean().default(false),
 })
 export type Account = z.infer<typeof accountSchema>
 
@@ -401,11 +401,12 @@ export type PackageBuild = z.infer<typeof packageBuildSchema>
 
 export const orgSchema = z.object({
   org_id: z.string(),
-  github_handle: z.string(),
+  github_handle: z.string().optional(),
   owner_account_id: z.string(),
   is_personal_org: z.boolean().default(false),
   created_at: z.string().datetime(),
   org_display_name: z.string().optional(),
+  org_name: z.string(),
 })
 export type Organization = z.infer<typeof orgSchema>
 
@@ -426,6 +427,7 @@ export const publicOrgSchema = z.object({
   is_personal_org: z.boolean(),
   display_name: z.string().optional(),
   package_count: z.number(),
+  github_handle: z.string().optional(),
   created_at: z.string(),
   user_permissions: z
     .object({

package/fake-snippets-api/lib/db/seed.ts

@@ -1736,6 +1736,7 @@ export const SquareWaveModule = () => (
 
   const testOrg = db.addOrganization({
     name: "test-organization",
+    github_handle: "tscircuit",
     owner_account_id: account_id,
   })
 
@@ -1831,6 +1832,7 @@ exports.TestComponent = TestComponent;
   db.addOrganization({
     name: "testuser",
     owner_account_id: account_id,
+    github_handle: "tscircuit",
     is_personal_org: true,
   })
 }

package/fake-snippets-api/lib/middleware/with-session-auth.ts

@@ -1,10 +1,11 @@
 import type { Middleware } from "winterspec/middleware"
 import type { CtxErrorFn } from "./with-ctx-error"
+import type { DbClient } from "../db/db-client"
 
 export const withSessionAuth: Middleware<
   {
     error: CtxErrorFn
-    db: any
+    db: DbClient
   },
   {
     auth: {
@@ -13,6 +14,13 @@ export const withSessionAuth: Middleware<
       personal_org_id: string
       github_username: string
       session_id: string
+      orgs: Array<{
+        org_id: string
+        name: string
+        user_permissions: {
+          can_manage_packages: boolean
+        }
+      }>
     }
   },
   {}
@@ -22,28 +30,72 @@ export const withSessionAuth: Middleware<
   const token = req.headers.get("authorization")?.split("Bearer ")?.[1]
 
   // Only check database accounts when we're in a Bun test environment
-  if (process.env.BUN_TEST === "true" && ctx.db?.accounts) {
-    const account = ctx.db.accounts.find((acc: any) => acc.account_id === token)
-
+  if (process.env.BUN_TEST === "true" && ctx.db?.getState) {
+    const state = ctx.db.getState()
+    const account = state.accounts.find((acc: any) => acc.account_id === token)
     if (account) {
+      // Fetch orgs for this account
+      const orgAccounts = state.orgAccounts.filter(
+        (oa: any) => oa.account_id === account.account_id,
+      )
+
+      const orgs = orgAccounts.map((oa: any) => {
+        const org = state.organizations.find((o: any) => o.org_id === oa.org_id)
+        return {
+          org_id: oa.org_id,
+          name:
+            org?.org_display_name ||
+            org?.org_name ||
+            org?.github_handle ||
+            oa.org_id,
+          user_permissions: { can_manage_packages: true },
+        }
+      })
+
       ctx.auth = {
         type: "session",
         account_id: account.account_id,
         personal_org_id: account.personal_org_id || `org-${account.account_id}`,
         github_username: account.github_username,
         session_id: `session-${account.account_id}`,
+        orgs:
+          orgs.length > 0
+            ? orgs
+            : [
+                {
+                  org_id:
+                    account.personal_org_id || `org-${account.account_id}`,
+                  name:
+                    account.github_username ||
+                    account.personal_org_id ||
+                    `org-${account.account_id}`,
+                  user_permissions: { can_manage_packages: true },
+                },
+              ],
       }
       return next(req, ctx)
     }
   }
 
-  // For all other environments or if account not found in test, use hardcoded auth
+  // Fallback auth for non-test environments or when no token is found
+  const fallbackAccountId = "account-1234"
+  const fallbackOrgId = "org-1234"
+
+  const fallbackOrgs = [
+    {
+      org_id: fallbackOrgId,
+      name: "org-1234",
+      user_permissions: { can_manage_packages: true },
+    },
+  ]
+
   ctx.auth = {
     type: "session",
-    account_id: "account-1234",
-    personal_org_id: "org-1234",
+    account_id: fallbackAccountId,
+    personal_org_id: fallbackOrgId,
     github_username: "testuser",
     session_id: "session-1234",
+    orgs: fallbackOrgs,
   }
 
   return next(req, ctx)

package/fake-snippets-api/lib/public-mapping/public-map-org.ts

@@ -16,17 +16,19 @@ export const publicMapOrg = (
     created_at,
     is_personal_org,
     org_display_name,
+    org_name,
     ...org
   } = internal_org
   return {
     org_id: org.org_id,
-    display_name: org_display_name ?? github_handle ?? "",
+    display_name: org_display_name ?? org_name,
     owner_account_id: org.owner_account_id,
-    name: github_handle,
+    name: org_name,
     member_count: Number(member_count) || 0,
     package_count: Number(package_count) || 0,
     is_personal_org: Boolean(is_personal_org),
     created_at: String(created_at),
+    ...(github_handle ? { github_handle } : {}),
     ...(can_manage_org ? { user_permissions: { can_manage_org: true } } : {}),
   }
 }