Merge remote-tracking branch 'origin/master' into cocalc-api-20250927

Author: haraldschilly

src/.claude/settings.json

@@ -17,6 +17,7 @@
       "Bash(git checkout:*)",
       "Bash(git commit:*)",
       "Bash(git diff:*)",
+      "Bash(git log:*)",
       "Bash(git push:*)",
       "Bash(grep:*)",
       "Bash(ln:*)",

src/packages/api-client/package.json

@@ -6,7 +6,6 @@
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "build": "../node_modules/.bin/tsc --build",
-    "tsc": "../node_modules/.bin/tsc --watch --pretty --preserveWatchOutput",
     "depcheck": "pnpx depcheck --ignores @cocalc/api-client "
   },
   "files": ["dist/**", "bin/**", "README.md", "package.json"],

src/packages/backend/package.json

@@ -18,7 +18,6 @@
     "preinstall": "npx only-allow pnpm",
     "clean": "rm -rf dist node_modules",
     "build": "pnpm exec tsc --build",
-    "tsc": "pnpm exec tsc --watch  --pretty --preserveWatchOutput",
     "test": "pnpm exec jest --forceExit",
     "test-conat": " pnpm exec jest --forceExit conat",
     "testp": "pnpm exec jest --forceExit",

src/packages/comm/package.json

@@ -17,7 +17,6 @@
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "build": "../node_modules/.bin/tsc --build",
-    "tsc": "../node_modules/.bin/tsc --watch --pretty --preserveWatchOutput",
     "depcheck": "pnpx depcheck --ignores @types/node"
   },
   "author": "SageMath, Inc.",

src/packages/conat/package.json

@@ -20,7 +20,6 @@
     "preinstall": "npx only-allow pnpm",
     "build": "pnpm exec tsc --build",
     "clean": "rm -rf dist node_modules",
-    "tsc": "pnpm exec tsc  --watch  --pretty --preserveWatchOutput",
     "test": "pnpm exec jest",
     "depcheck": "pnpx depcheck --ignores events,bufferutil,utf-8-validate"
   },

src/packages/database/package.json

@@ -32,7 +32,7 @@
     "random-key": "^0.3.2",
     "read": "^1.0.7",
     "sql-string-escape": "^1.1.6",
-    "validator": "^13.6.0"
+    "validator": "^13.15.20"
   },
   "devDependencies": {
     "@types/lodash": "^4.14.202",
@@ -44,7 +44,6 @@
     "preinstall": "npx only-allow pnpm",
     "build": "../node_modules/.bin/tsc  --build && coffee -c -o dist/ ./",
     "clean": "rm -rf dist",
-    "tsc": "../node_modules/.bin/tsc --watch  --pretty --preserveWatchOutput",
     "test": "pnpm exec jest --forceExit --runInBand",
     "depcheck": "pnpx depcheck | grep -Ev '\\.coffee|coffee$'",
     "prepublishOnly": "pnpm test"

src/packages/database/postgres/registration-tokens.ts

@@ -11,12 +11,14 @@ interface Query {
   expires?: Date;
   limit?: number;
   disabled?: boolean;
+  ephemeral?: boolean;
+  customize?;
 }
 
 export default async function registrationTokensQuery(
   db: PostgreSQL,
   options: { delete?: boolean }[],
-  query: Query
+  query: Query,
 ) {
   if (isDelete(options) && query.token) {
     // delete if option is set and there is a token which is defined and not an empty string
@@ -37,22 +39,27 @@ export default async function registrationTokensQuery(
     return rows;
   } else if (query.token) {
     // upsert an existing one
-    const { token, descr, expires, limit, disabled } = query;
+    const { token, descr, expires, limit, disabled, ephemeral, customize } =
+      query;
     const { rows } = await callback2(db._query, {
-      query: `INSERT INTO registration_tokens ("token","descr","expires","limit","disabled")
-                VALUES ($1, $2, $3, $4, $5) ON CONFLICT (token)
+      query: `INSERT INTO registration_tokens ("token","descr","expires","limit","disabled","ephemeral","customize")
+                VALUES ($1, $2, $3, $4, $5, $6, $7) ON CONFLICT (token)
                 DO UPDATE SET
                   "token"    = EXCLUDED.token,
                   "descr"    = EXCLUDED.descr,
                   "expires"  = EXCLUDED.expires,
                   "limit"    = EXCLUDED.limit,
-                  "disabled" = EXCLUDED.disabled`,
+                  "disabled" = EXCLUDED.disabled,
+                  "ephemeral" = EXCLUDED.ephemeral,
+                  "customize" = EXCLUDED.customize`,
       params: [
         token,
         descr ? descr : null,
         expires ? expires : null,
         limit == null ? null : limit, // if undefined make it null
         disabled != null ? disabled : false,
+        ephemeral == null ? null : ephemeral,
+        customize == null ? null : customize,
       ],
     });
     return rows;

src/packages/file-server/package.json

@@ -9,7 +9,6 @@
   "scripts": {
     "preinstall": "npx only-allow pnpm",
     "build": "pnpm exec tsc --build",
-    "tsc": "pnpm exec tsc  --watch  --pretty --preserveWatchOutput",
     "test": "pnpm exec jest",
     "depcheck": "pnpx depcheck",
     "clean": "rm -rf node_modules dist"

src/packages/frontend/account/table.ts

@@ -46,6 +46,8 @@ export class AccountTable extends Table {
           last_active: null,
           ssh_keys: null,
           created: null,
+          ephemeral: null,
+          customize: null,
           unlisted: null,
           tags: null,
           tours: null,

src/packages/frontend/account/types.ts

@@ -36,6 +36,11 @@ export interface AccountState {
   name?: string;
   unlisted?: boolean;
   profile: TypedMap<{ color: string }>;
+  customize?: {
+    disableCollaborators?: boolean;
+    disableAI?: boolean;
+    [key: string]: any;
+  };
   email_address?: string;
   editor_settings: TypedMap<{
     jupyter_classic?: boolean;
@@ -90,6 +95,7 @@ export interface AccountState {
   is_ready: boolean; // user signed in and account settings have been loaded.
   lti_id?: List<string>;
   created?: Date;
+  ephemeral?: number;
   strategies?: List<TypedMap<PassportStrategyFrontend>>;
   token?: boolean; // whether or not a registration token is required when creating an account
   keyboard_variant_options?: List<any>;