Merge branch 'main' into feat/pypi-downloads

Author: epipav

AGENTS.md

@@ -195,7 +195,7 @@ OSSPCKGS_GCP_CREDENTIALS_B64=e30=
 # maven/all.zip 404s). The allowlist check and DB storage normalize to lowercase
 # internally per ADR-0001 §OSV "Ecosystem normalization", so downstream stays lowercase.
 OSV_BULK_BASE_URL=https://osv-vulnerabilities.storage.googleapis.com
-OSV_ECOSYSTEMS=npm,Maven,cargo
+OSV_ECOSYSTEMS=npm,Maven,cargo,NuGet
 OSV_TMP_DIR=/tmp/osv
 OSV_BATCH_SIZE=500
 OSV_DERIVE_BATCH_SIZE=1000

backend/.env.dist.local

@@ -19,6 +19,7 @@
     "script:continue-run": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/continue-run.ts",
     "script:trigger-webhook": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/trigger-webhook.ts",
     "script:send-weekly-analytics-email": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/send-weekly-analytics-email.ts",
+    "script:merge-members": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/merge-members.ts",
     "script:merge-organizations": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/merge-organizations.ts",
     "script:refresh-materialized-views": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/refresh-materialized-views.ts",
     "script:unmerge-members": "SERVICE=script TS_NODE_TRANSPILE_ONLY=true tsx src/bin/scripts/unmerge-members.ts",

backend/package.json

@@ -20,33 +20,38 @@ const LIFECYCLE_SET = new Set<string>(LIFECYCLE_VALUES)
 
 const boolParam = z.preprocess((v) => v === 'true', z.boolean()).default(false)
 
-const querySchema = z.object({
-  page: z.coerce.number().int().min(1).default(1),
-  pageSize: z.coerce.number().int().min(1).max(MAX_PAGE_SIZE).default(25),
-  ecosystem: z.string().trim().optional(),
-  lifecycle: z.enum(LIFECYCLE_VALUES).optional(),
-  name: z.string().trim().optional(),
-  purl: purlFilterSchema,
-  status: z
-    .enum([
-      'unassigned',
-      'open',
-      'assessing',
-      'active',
-      'needs_attention',
-      'escalated',
-      'blocked',
-      'inactive',
-    ])
-    .optional(),
-  healthBand: z.enum(HEALTH_BAND_VALUES).optional(),
-  vulnSeverity: z.enum(['any', 'high', 'critical', 'none']).optional(),
-  staleOnly: boolParam,
-  unstewardedOnly: boolParam,
-  busFactor1Only: boolParam,
-  sortBy: z.enum(['name', 'risk', 'impact', 'openVulns', 'health']).default('risk'),
-  sortDir: z.enum(['asc', 'desc']).default('desc'),
-})
+const querySchema = z
+  .object({
+    page: z.coerce.number().int().min(1).default(1),
+    pageSize: z.coerce.number().int().min(1).max(MAX_PAGE_SIZE).default(25),
+    ecosystem: z.string().trim().optional(),
+    lifecycle: z.enum(LIFECYCLE_VALUES).optional(),
+    name: z.string().trim().optional(),
+    purl: purlFilterSchema,
+    status: z
+      .enum([
+        'unassigned',
+        'open',
+        'assessing',
+        'active',
+        'needs_attention',
+        'escalated',
+        'blocked',
+        'inactive',
+      ])
+      .optional(),
+    healthBand: z.enum(HEALTH_BAND_VALUES).optional(),
+    vulnSeverity: z.enum(['any', 'high', 'critical', 'none']).optional(),
+    staleOnly: boolParam,
+    unstewardedOnly: boolParam,
+    busFactor1Only: boolParam,
+    sortBy: z.enum(['name', 'risk', 'impact', 'openVulns', 'health']).default('risk'),
+    sortDir: z.enum(['asc', 'desc']).optional(),
+  })
+  .transform((data) => ({
+    ...data,
+    sortDir: data.sortDir ?? (data.sortBy === 'name' || data.sortBy === 'health' ? 'asc' : 'desc'),
+  }))
 
 export async function packageListHandler(req: Request, res: Response): Promise<void> {
   const params = validateOrThrow(querySchema, req.query)

backend/src/api/public/v1/ossprey/packageList.ts

@@ -65,7 +65,7 @@ export async function getMyActivityHandler(req: Request, res: Response): Promise
       description: r.content,
       actor: r.actor,
       createdAt: r.createdAt,
-      suggestedAction: SUGGESTED_ACTIONS[r.stewardshipStatus] ?? null,
+      suggestedAction: SUGGESTED_ACTIONS[r.currentStewardshipStatus] ?? null,
     })),
     meta: {
       total,