@datalayer/core 1.0.24 → 1.1.41

package/lib/hooks/useDatalayer.js

@@ -8,6 +8,7 @@ import { useToast } from './useToast.js';
 // import { useRuMnock } from './../mocks/index.js';
 import { useIAMStore } from '../state/index.js';
 import { requestDatalayerAPI } from '../api/DatalayerApi.js';
+import { isPublicPath } from '../routes/publicPaths.js';
 export function useDatalayer(props = {}) {
     const { loginRoute = '/login', notifyOnError = true } = props;
     const location = useLocation();
@@ -56,9 +57,10 @@ export function useDatalayer(props = {}) {
                 if (responseError.response.status === 401) {
                     console.log('Datalayer sent a 401 return code.');
                     const resolvedLoginRoute = resolveLoginRoute(loginRoute_);
+                    const isPublicRoute = isPublicPath(location.pathname || '');
                     const alreadyOnLoginRoute = location.pathname === resolvedLoginRoute ||
                         location.pathname.endsWith('/login');
-                    if (!alreadyOnLoginRoute) {
+                    if (!alreadyOnLoginRoute && !isPublicRoute) {
                         iamStore.logout();
                         navigate(resolvedLoginRoute);
                     }

package/lib/hooks/useIAM.js

@@ -4,7 +4,7 @@
  */
 import { useEffect, useState } from 'react';
 import { useCache } from './useCache.js';
-import { useIAMStore, useLayoutStore, useOrganizationStore, useSpaceStore, } from '../state/index.js';
+import { useIAMStore, useLayoutStore, useOrganizationStore, } from '../state/index.js';
 import { asUser, ANONYMOUS_USER, ANONYMOUS_USER_TOKEN, } from '../models/index.js';
 import { requestDatalayerAPI, } from '../api/DatalayerApi.js';
 export const useIAM = (props = { user: undefined, token: undefined }) => {
@@ -13,7 +13,6 @@ export const useIAM = (props = { user: undefined, token: undefined }) => {
     const iamStore = useIAMStore();
     const layoutStore = useLayoutStore();
     const organizationStore = useOrganizationStore();
-    const spaceStore = useSpaceStore();
     const { useWhoami, useLogout } = useCache();
     const { data: whoamiData } = useWhoami();
     const logoutMutation = useLogout();
@@ -61,7 +60,6 @@ export const useIAM = (props = { user: undefined, token: undefined }) => {
         iamStore.logout();
         layoutStore.reset();
         organizationStore.updateOrganizations([]);
-        spaceStore.updateSpaces([]);
         // Call TanStack Query logout mutation which will clear all caches
         logoutMutation.mutate();
         setIAMState({ user: ANONYMOUS_USER, token: ANONYMOUS_USER_TOKEN });

package/lib/hooks/useLocationHandles.d.ts

@@ -1,9 +1,11 @@
 export declare const useLocationHandles: () => {
     accountHandle: string | undefined;
-    spaceHandler: string | undefined;
+    spaceHandler: any;
+    teamHandle?: undefined;
     spaceHandle?: undefined;
 } | {
     accountHandle: string;
+    teamHandle: string;
     spaceHandle: string;
     spaceHandler?: undefined;
 };

package/lib/hooks/useLocationHandles.js

@@ -7,7 +7,7 @@ import { useParams } from './useParams.js';
 import { useRunStore } from '../state/index.js';
 export const useLocationHandles = () => {
     const params = useParams();
-    const { accountHandle, spaceHandle } = params;
+    const { accountHandle, teamHandle, spaceHandle } = params;
     const { pathname } = useLocation();
     const runStore = useRunStore();
     if (pathname.startsWith('/public')) {
@@ -18,6 +18,7 @@ export const useLocationHandles = () => {
     }
     return {
         accountHandle,
+        teamHandle,
         spaceHandle,
     };
 };

package/lib/hooks/usePrincipalStore.d.ts

@@ -5,7 +5,7 @@
  * and sharing of artifacts. Only user / organization / team are principals.
  * Agents are NOT principals (an agent is owned by an account).
  */
-export type PrincipalKind = 'user' | 'organization' | 'team';
+export type PrincipalKind = 'personal' | 'organization' | 'team';
 export type PrincipalState = {
     /** Kind of the currently selected principal. */
     selectedPrincipalKind: PrincipalKind;
@@ -17,7 +17,7 @@ export type PrincipalState = {
     selectedTeamParentOrganizationUid?: string;
     /** Parent organization handle — set only when `selectedPrincipalKind === 'team'`. */
     selectedTeamParentOrganizationHandle?: string;
-    selectUserPrincipal: (uid: string, handle: string) => void;
+    selectPersonalPrincipal: (uid: string, handle: string) => void;
     selectOrganizationPrincipal: (uid: string, handle: string) => void;
     selectTeamPrincipal: (args: {
         teamUid: string;

package/lib/hooks/usePrincipalStore.js

@@ -5,14 +5,73 @@
 import { create } from 'zustand';
 import { createJSONStorage, persist } from 'zustand/middleware';
 import { useUsageRefreshStore } from './useUsageRefreshStore.js';
+const PRINCIPAL_CONTEXT_COOKIE = 'datalayer-principal-context';
+const PRINCIPAL_CONTEXT_COOKIE_MAX_AGE = 60 * 60 * 24 * 365;
+const readPrincipalContextCookie = () => {
+    if (typeof document === 'undefined') {
+        return {};
+    }
+    const escaped = PRINCIPAL_CONTEXT_COOKIE.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&');
+    const match = document.cookie.match(new RegExp(`(?:^|;\\s*)${escaped}=([^;]*)`));
+    if (!match?.[1]) {
+        return {};
+    }
+    try {
+        const parsed = JSON.parse(decodeURIComponent(match[1]));
+        if (!parsed || typeof parsed !== 'object') {
+            return {};
+        }
+        const kind = parsed.selectedPrincipalKind === 'organization' ||
+            parsed.selectedPrincipalKind === 'team' ||
+            parsed.selectedPrincipalKind === 'personal'
+            ? parsed.selectedPrincipalKind
+            : undefined;
+        return {
+            selectedPrincipalKind: kind,
+            selectedPrincipalUid: typeof parsed.selectedPrincipalUid === 'string'
+                ? parsed.selectedPrincipalUid
+                : undefined,
+            selectedPrincipalHandle: typeof parsed.selectedPrincipalHandle === 'string'
+                ? parsed.selectedPrincipalHandle
+                : undefined,
+            selectedTeamParentOrganizationUid: typeof parsed.selectedTeamParentOrganizationUid === 'string'
+                ? parsed.selectedTeamParentOrganizationUid
+                : undefined,
+            selectedTeamParentOrganizationHandle: typeof parsed.selectedTeamParentOrganizationHandle === 'string'
+                ? parsed.selectedTeamParentOrganizationHandle
+                : undefined,
+        };
+    }
+    catch {
+        return {};
+    }
+};
+const writePrincipalContextCookie = (context) => {
+    if (typeof document === 'undefined') {
+        return;
+    }
+    const value = encodeURIComponent(JSON.stringify(context));
+    document.cookie =
+        `${PRINCIPAL_CONTEXT_COOKIE}=${value};` +
+            ` path=/; max-age=${PRINCIPAL_CONTEXT_COOKIE_MAX_AGE}; SameSite=Lax`;
+};
+const clearPrincipalContextCookie = () => {
+    if (typeof document === 'undefined') {
+        return;
+    }
+    document.cookie =
+        `${PRINCIPAL_CONTEXT_COOKIE}=;` +
+            ' path=/; max-age=0; SameSite=Lax';
+};
+const initialPrincipalContext = readPrincipalContextCookie();
 export const usePrincipalStore = create()(persist(set => ({
-    selectedPrincipalKind: 'user',
-    selectedPrincipalUid: undefined,
-    selectedPrincipalHandle: undefined,
-    selectedTeamParentOrganizationUid: undefined,
-    selectedTeamParentOrganizationHandle: undefined,
-    selectUserPrincipal: (uid, handle) => set(state => {
-        const unchanged = state.selectedPrincipalKind === 'user' &&
+    selectedPrincipalKind: initialPrincipalContext.selectedPrincipalKind || 'personal',
+    selectedPrincipalUid: initialPrincipalContext.selectedPrincipalUid,
+    selectedPrincipalHandle: initialPrincipalContext.selectedPrincipalHandle,
+    selectedTeamParentOrganizationUid: initialPrincipalContext.selectedTeamParentOrganizationUid,
+    selectedTeamParentOrganizationHandle: initialPrincipalContext.selectedTeamParentOrganizationHandle,
+    selectPersonalPrincipal: (uid, handle) => set(state => {
+        const unchanged = state.selectedPrincipalKind === 'personal' &&
             state.selectedPrincipalUid === uid &&
             state.selectedPrincipalHandle === handle;
         if (unchanged) {
@@ -21,13 +80,15 @@ export const usePrincipalStore = create()(persist(set => ({
         useUsageRefreshStore
             .getState()
             .requestUsageRefresh('principal-user-changed');
-        return {
-            selectedPrincipalKind: 'user',
+        const nextState = {
+            selectedPrincipalKind: 'personal',
             selectedPrincipalUid: uid,
             selectedPrincipalHandle: handle,
             selectedTeamParentOrganizationUid: undefined,
             selectedTeamParentOrganizationHandle: undefined,
         };
+        writePrincipalContextCookie(nextState);
+        return nextState;
     }),
     selectOrganizationPrincipal: (uid, handle) => set(state => {
         const unchanged = state.selectedPrincipalKind === 'organization' &&
@@ -39,13 +100,15 @@ export const usePrincipalStore = create()(persist(set => ({
         useUsageRefreshStore
             .getState()
             .requestUsageRefresh('principal-organization-changed');
-        return {
+        const nextState = {
             selectedPrincipalKind: 'organization',
             selectedPrincipalUid: uid,
             selectedPrincipalHandle: handle,
             selectedTeamParentOrganizationUid: undefined,
             selectedTeamParentOrganizationHandle: undefined,
         };
+        writePrincipalContextCookie(nextState);
+        return nextState;
     }),
     selectTeamPrincipal: ({ teamUid, teamHandle, organizationUid, organizationHandle, }) => set(state => {
         const unchanged = state.selectedPrincipalKind === 'team' &&
@@ -59,16 +122,18 @@ export const usePrincipalStore = create()(persist(set => ({
         useUsageRefreshStore
             .getState()
             .requestUsageRefresh('principal-team-changed');
-        return {
+        const nextState = {
             selectedPrincipalKind: 'team',
             selectedPrincipalUid: teamUid,
             selectedPrincipalHandle: teamHandle,
             selectedTeamParentOrganizationUid: organizationUid,
             selectedTeamParentOrganizationHandle: organizationHandle,
         };
+        writePrincipalContextCookie(nextState);
+        return nextState;
     }),
     resetPrincipal: () => set(state => {
-        const unchanged = state.selectedPrincipalKind === 'user' &&
+        const unchanged = state.selectedPrincipalKind === 'personal' &&
             state.selectedPrincipalUid === undefined &&
             state.selectedPrincipalHandle === undefined &&
             state.selectedTeamParentOrganizationUid === undefined &&
@@ -79,13 +144,15 @@ export const usePrincipalStore = create()(persist(set => ({
         useUsageRefreshStore
             .getState()
             .requestUsageRefresh('principal-reset');
-        return {
-            selectedPrincipalKind: 'user',
+        const nextState = {
+            selectedPrincipalKind: 'personal',
             selectedPrincipalUid: undefined,
             selectedPrincipalHandle: undefined,
             selectedTeamParentOrganizationUid: undefined,
             selectedTeamParentOrganizationHandle: undefined,
         };
+        clearPrincipalContextCookie();
+        return nextState;
     }),
 }), {
     name: 'datalayer-principal',
@@ -97,5 +164,21 @@ export const usePrincipalStore = create()(persist(set => ({
         selectedTeamParentOrganizationUid: state.selectedTeamParentOrganizationUid,
         selectedTeamParentOrganizationHandle: state.selectedTeamParentOrganizationHandle,
     }),
+    onRehydrateStorage: () => state => {
+        if (!state) {
+            return;
+        }
+        if (state.selectedPrincipalKind === 'personal' && !state.selectedPrincipalUid) {
+            clearPrincipalContextCookie();
+            return;
+        }
+        writePrincipalContextCookie({
+            selectedPrincipalKind: state.selectedPrincipalKind,
+            selectedPrincipalUid: state.selectedPrincipalUid,
+            selectedPrincipalHandle: state.selectedPrincipalHandle,
+            selectedTeamParentOrganizationUid: state.selectedTeamParentOrganizationUid,
+            selectedTeamParentOrganizationHandle: state.selectedTeamParentOrganizationHandle,
+        });
+    },
 }));
 export default usePrincipalStore;

package/lib/hooks/useProjectStore.d.ts

@@ -16,7 +16,7 @@ export type ProjectRuntimeEntry = {
     agentName?: string;
     /** Agent runtime status (running, starting, terminated, etc.). */
     agentStatus?: string;
-    /** The agent spec ID used to create the runtime. */
+    /** The agentspec ID used to create the runtime. */
     agentSpecId?: string;
 };
 export type ProjectStoreState = {

package/lib/hooks/useSelectedPrincipal.js

@@ -21,7 +21,7 @@ export function useSelectedPrincipal() {
         selectedPrincipalHandle,
         selectedTeamParentOrganizationUid,
         selectedTeamParentOrganizationHandle,
-        isUserSelected: selectedPrincipalKind === 'user',
+        isUserSelected: selectedPrincipalKind === 'personal',
         isOrganizationSelected: selectedPrincipalKind === 'organization',
         isTeamSelected: selectedPrincipalKind === 'team',
     };

package/lib/hooks/useUser.js

@@ -3,18 +3,35 @@
  * Distributed under the terms of the Modified BSD License.
  */
 import { useIAMStore } from '../state/index.js';
+import { isPublicPath } from '../routes/publicPaths.js';
 const LOGIN_HREF = '/login';
+/**
+ * Whether the browser is currently on a public route where anonymous users are
+ * allowed, so `useUser` must NOT force a navigation to the login page.
+ */
+const isOnPublicPath = () => {
+    if (typeof window === 'undefined') {
+        return false;
+    }
+    return isPublicPath(window.location?.pathname || '');
+};
 export const useUser = (role) => {
     const { user } = useIAMStore();
     if (role) {
         if (!user?.roles.includes(role.handle)) {
-            console.log(`User should have role ${role.handle} - Forcing navigation to login page...`);
+            if (isOnPublicPath()) {
+                return user;
+            }
+            console.warn(`User should have role ${role.handle} - Forcing navigation to login page...`);
             window.location.href = LOGIN_HREF;
             throw new Error(`User should have role ${role.handle}`);
         }
     }
     if (!user) {
-        console.log('No user found... Forcing navigation to /login');
+        if (isOnPublicPath()) {
+            return user;
+        }
+        console.warn('No user found... Forcing navigation to /login');
         window.location.href = LOGIN_HREF;
     }
     return user;

package/lib/index.d.ts

@@ -1,17 +1,12 @@
 export * from './components';
 export * from './utils';
 export * from './state';
-export * from './collaboration';
-export * from './services';
 export * from './navigation';
 export * from './hooks';
 export { requestDatalayerAPI, RunResponseError, NetworkError, } from './api/DatalayerApi';
 export type { IRequestDatalayerAPIOptions } from './api/DatalayerApi';
 export { API_BASE_PATHS } from './api/constants';
-export * as runtimesApi from './api/runtimes';
 export * as iamApi from './api/iam';
-export * as spacerApi from './api/spacer';
-export { DatalayerClient, type DatalayerClientConfig, type ClientHandlers, User, Runtime, Environment, Snapshot, Space, Project, Notebook, LexicalDTO, Secret, Credits, Item, type RuntimeJSON, type EnvironmentJSON, type UserJSON, type RuntimeData, type EnvironmentData, type UserData, type SpaceData, type SpaceItem, type NotebookData, type LexicalData, type CodeSandboxSnapshotData, type CreditsInfo, type CreditReservation, type CreateRuntimeRequest, type CreateRuntimeResponse, type ListRuntimesResponse, type ListEnvironmentsResponse, type CreateCodeSandboxSnapshotRequest, type CreateCodeSandboxSnapshotResponse, type GetCodeSandboxSnapshotResponse, type ListCodeSandboxSnapshotsResponse, type CreateSpaceRequest, type CreateSpaceResponse, type SpacesForUserResponse, type CollaborationSessionResponse, type DeleteSpaceItemResponse, type GetSpaceItemResponse, type GetSpaceItemsResponse, type CreateNotebookRequest, type CreateNotebookResponse, type GetNotebookResponse, type UpdateNotebookRequest, type UpdateNotebookResponse, type CreateLexicalRequest, type CreateLexicalResponse, type GetLexicalResponse, type UpdateLexicalRequest, type UpdateLexicalResponse, type CreditsResponse, type CreateDatasourceResponse, type GetDatasourceResponse, type ListDatasourcesResponse, type UpdateDatasourceResponse, type CreateSecretRequest, type CreateSecretResponse, type GetSecretResponse, type ListSecretsResponse, type UpdateSecretRequest, type UpdateSecretResponse, type SpaceJSON, type ProjectJSON, type ProjectDefaultItems, type UpdateSpaceRequest, type GetSpaceResponse, type UpdateSpaceResponse, type DeleteSpaceResponse, type GetSpaceDefaultItemsResponse, type GetSpacesByTypeResponse, type NotebookJSON, type LexicalJSON, type CodeSandboxSnapshotJSON, HealthCheck, type HealthCheckJSON, type LoginRequest, type LoginResponse, type UserMeResponse, type MembershipsResponse, type WhoAmIResponse, type HealthzPingResponse, AuthenticationManager, type IUser, type IBaseUser, type ICell, type IDatasource, type IDatasourceVariant, type ICredits, type ICreditsReservation, type ISpaceItem, type ISurvey, type ISpace, type IBaseSpace, type IAnySpace, type ISpaceVariant, type IBaseTeam, type IAnyTeam, type IOrganization, type IAnyOrganization, type IBaseOrganization, type IRuntimeModel, type IRuntimePod, type IRuntimeType, type IRuntimeLocation, type IRuntimeCapabilities, type ICodeSandboxSnapshot, type IDatalayerEnvironment, type IResources, type ISnippet, type IRole, type IAssignment, type IContact, type ICourse, type IOrganizationMember, type IPage, type PageTagName, type PageTheme, type PageVariant, type ISecret, type ISecretVariant, type SecretData, type SecretJSON, type DatasourceData, type DatasourceJSON, type DatasourceType, type CreateDatasourceRequest, type UpdateDatasourceRequest, Datasource, type IIAMToken, type IIAMTokenVariant, type IDocument, type IBaseDocument, type IEnvironment, type IExercise, type ICode, type IHelp, type IInvite, type ILesson, type INotebook, type IBaseNotebook, type ISchool, type ITeam, type TeamMember, type IUserOnboarding, type IClient, type IOnboardingPosition, type IOnboardingTours, type ITour, type ITourStatus, type IUserSettings, type IDataset, type IUsage, type IItem, type IItemType, type Member, type Profile, type SpaceMember, type IContactEvent, type IContactIAMProvider, type IStudentItem, type Instructor, type IStudent, type IDean, type IUserEvent, type IIAMProviderLinked, type IContent, type AuthResult, type TokenValidationResult, type AuthOptions, type TokenStorage, type IRuntimeOptions, type IMultiServiceManager, type IRemoteServicesManager, type IEnvironmentsManager, type IRemoteRuntimesManager, type NavigationLinkProps, type IDatalayerCoreConfig, type IRuntimesConfiguration, type IIAMProviderName, } from './client';
-export { getEnvironments, createRuntime, getRuntimes, deleteRuntime, snapshotRuntime, getSandboxSnapshots, loadSandboxSnapshot, } from './stateful/runtimes/actions';
+export * from './client';
 export * from './otel';
 export * from './views';

package/lib/index.js

@@ -6,26 +6,14 @@
 export * from './components/index.js';
 export * from './utils/index.js';
 export * from './state/index.js';
-export * from './collaboration/index.js';
-export * from './services/index.js';
 // Export navigation before hooks to avoid conflicts
 export * from './navigation/index.js';
 export * from './hooks/index.js';
 // Export APIs.
 export { requestDatalayerAPI, RunResponseError, NetworkError, } from './api/DatalayerApi.js';
 export { API_BASE_PATHS } from './api/constants.js';
-export * as runtimesApi from './api/runtimes/index.js';
 export * as iamApi from './api/iam/index.js';
-export * as spacerApi from './api/spacer/index.js';
-export { 
-// Export client and config types
-DatalayerClient, 
-// Export domain models
-User, Runtime, Environment, Snapshot, Space, Project, Notebook, LexicalDTO, Secret, Credits, Item, HealthCheck, 
-// Export auth
-AuthenticationManager, Datasource, } from './client/index.js';
-// Export commonly used functions directly for convenience
-export { getEnvironments, createRuntime, getRuntimes, deleteRuntime, snapshotRuntime, getSandboxSnapshots, loadSandboxSnapshot, } from './stateful/runtimes/actions.js';
+export * from './client/index.js';
 // OTEL observability components, hooks, and types
 export * from './otel/index.js';
 // Reusable views (sign-in pages, etc.)

package/lib/main.js

@@ -1,12 +1,12 @@
-import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 /*
  * Copyright (c) 2023-2025 Datalayer, Inc.
  * Distributed under the terms of the Modified BSD License.
  */
 import { createRoot } from 'react-dom/client';
-import App from './App.js';
+// import App from './App.js';
 import './index.css';
 const rootElement = document.getElementById('root');
 if (rootElement) {
-    createRoot(rootElement).render(_jsx(App, {}));
+    createRoot(rootElement).render(_jsx(_Fragment, {}));
 }

package/lib/mocks/index.js

@@ -4,6 +4,6 @@
  */
 export * from './components/index.js';
 export * from './hooks/index.js';
-// export * from './jupyter/index.js';
+// export * from './jupyter.js';
 export * from './models/index.js';
 export * from './views/index.js';

package/lib/mocks/models/index.d.ts

@@ -4,6 +4,5 @@ export * from './InviteMock';
 export * from './JupyterLabUserMock';
 export * from './OrganisationMock';
 export * from './SchoolMock';
-export * from './SpaceMock';
 export * from './TeamMock';
 export * from './UserMock';

package/lib/mocks/models/index.js

@@ -8,6 +8,5 @@ export * from './InviteMock.js';
 export * from './JupyterLabUserMock.js';
 export * from './OrganisationMock.js';
 export * from './SchoolMock.js';
-export * from './SpaceMock.js';
 export * from './TeamMock.js';
 export * from './UserMock.js';

package/lib/models/Datasource.d.ts

@@ -9,7 +9,7 @@ export type IDatasource = {
     outputBucket: string;
 };
 export default IDatasource;
-import type { DatalayerClient } from '../client';
+import type { DatalayerCoreClient } from '../client';
 /**
  * Datasource type matching UI and API.
  */
@@ -148,7 +148,7 @@ export declare class DatasourceDTO {
      * @param data - Datasource data from API
      * @param client - Client instance
      */
-    constructor(data: DatasourceData, client: DatalayerClient);
+    constructor(data: DatasourceData, client: DatalayerCoreClient);
     private _checkDeleted;
     get uid(): string;
     get type(): DatasourceType;

package/lib/models/IAM.d.ts

@@ -120,7 +120,7 @@ export interface MembershipsResponse {
  * user can share artifacts with.
  */
 export interface ShareablePrincipal {
-    kind: 'user' | 'organization' | 'team';
+    kind: 'personal' | 'organization' | 'team';
     uid: string;
     handle: string;
     name?: string | null;

package/lib/models/IAMToken.d.ts

@@ -1,5 +1,5 @@
 export declare const asToken: (s: any) => IIAMToken;
-export type IIAMTokenVariant = 'user_token';
+export type IIAMTokenVariant = 'secret' | 'publishable' | 'restricted' | 'temporary';
 export type IIAMToken = {
     id: string;
     variant: IIAMTokenVariant;

package/lib/models/School.d.ts

@@ -1,11 +1,20 @@
 import { IDean } from './Dean';
 import { IStudent } from './Student';
-import { ICourse } from './Course';
 import { IBaseOrganization } from './Organization';
-export type ISchool = IBaseOrganization & {
+/**
+ * A school organization.
+ *
+ * The `courses` field is generic over the course type. The concrete course
+ * model lives in the runtime/content package (`@datalayer/agent-runtimes`),
+ * so consumers that need the rich `ICourse` shape parameterize this type; the
+ * core package intentionally does not depend on the content models.
+ *
+ * @typeParam C - The course type carried by the `courses` array.
+ */
+export type ISchool<C = unknown> = IBaseOrganization & {
     type: 'school';
     dean?: IDean;
     students: Array<IStudent>;
-    courses: Array<ICourse>;
+    courses: Array<C>;
 };
 export default ISchool;

package/lib/models/Secret.d.ts

@@ -8,7 +8,7 @@ export type ISecret = {
     value: string;
 };
 export default ISecret;
-import type { DatalayerClient } from '../client';
+import type { DatalayerCoreClient } from '../client';
 /**
  * Raw secret data from API (snake_case with suffixes).
  */
@@ -138,7 +138,7 @@ export declare class SecretDTO {
      * @param data - Secret data from API
      * @param client - Client instance
      */
-    constructor(data: SecretData, client: DatalayerClient);
+    constructor(data: SecretData, client: DatalayerCoreClient);
     private _checkDeleted;
     private _decodeValue;
     get uid(): string;

package/lib/models/Student.d.ts

@@ -1,6 +1,16 @@
 import { IUser } from './User';
-import { IStudentItem } from './StudentItem';
-export type IStudent = IUser & {
-    studentItems?: Map<string, IStudentItem>;
+/**
+ * A student user.
+ *
+ * The `studentItems` map is generic over the student-item type. The concrete
+ * `IStudentItem` model lives in the runtime/content package
+ * (`@datalayer/agent-runtimes`), so consumers that need the rich shape
+ * parameterize this type; the core package intentionally does not depend on
+ * the content models.
+ *
+ * @typeParam SI - The student-item type carried by the `studentItems` map.
+ */
+export type IStudent<SI = unknown> = IUser & {
+    studentItems?: Map<string, SI>;
 };
 export default IStudent;

package/lib/models/Usage.d.ts

@@ -1,4 +1,13 @@
-import { IResources } from './Environment';
+/**
+ * Compute resource shape (CPU / memory / GPU) associated with a usage record.
+ * Mirrors the runtime environment resource shape but is declared locally so
+ * the account/usage model does not depend on the runtime/content package.
+ */
+interface IResources {
+    cpu: string;
+    memory: string;
+    'nvidia.com/gpu'?: string;
+}
 export interface IRawUsage {
     account_uid: string;
     resource_uid: string;
@@ -59,3 +68,4 @@ export interface IUsage {
     usagePeriodEnd?: Date;
     metadata: Map<string, string>;
 }
+export {};

package/lib/models/UserDTO.d.ts

@@ -3,7 +3,7 @@
  *
  * @module models/UserDTO
  */
-import type { DatalayerClient } from '../index';
+import type { DatalayerCoreClient } from '../client';
 /**
  * Represents a user in the Datalayer platform
  * @interface UserData
@@ -56,7 +56,7 @@ export declare class UserDTO {
      * @param data - User data from API
      * @param client - Client instance (currently unused but kept for compatibility)
      */
-    constructor(data: UserData, client?: DatalayerClient);
+    constructor(data: UserData, client?: DatalayerCoreClient);
     get id(): string;
     get uid(): string;
     get email(): string;

package/lib/models/index.d.ts

@@ -28,28 +28,17 @@
  *
  * @module models
  */
-export * from './Assignment';
 export * from './Base';
-export * from './Cell';
-export * from './CodeBlock';
-export * from './CodefeedBlocks';
 export * from './Common';
 export * from './Contact';
 export * from './ContactEvent';
 export * from './ContactIAMProvider';
 export * from './ContactTags';
-export * from './Content';
-export * from './Course';
 export * from './Credits';
 export * from './CreditsDTO';
-export * from './Dataset';
 export * from './Datasource';
 export * from './Dean';
-export * from './Document';
-export * from './Environment';
-export * from './EnvironmentDTO';
 export * from './Errors';
-export * from './Exercise';
 export * from './GrowthKPI';
 export * from './IAM';
 export * from './IAMProviderLinked';
@@ -60,38 +49,19 @@ export * from './IAMToken';
 export * from './Inbound';
 export * from './Instructor';
 export * from './Invite';
-export * from './Item';
-export * from './ItemDTO';
-export * from './ItemType';
 export * from './LandingRoles';
-export * from './Lesson';
-export * from './LexicalDTO';
-export * from './Library';
 export * from './Member';
-export * from './Notebook';
-export * from './NotebookDTO';
 export * from './Organization';
 export * from './OrganizationMember';
 export * from './Outbound';
-export * from './Page';
-export * from './PageTag';
 export * from './Profile';
 export * from './Role';
 export * from './RolesOrganization';
 export * from './RolesPlatform';
 export * from './RolesTeam';
-export * from './Runtime';
-export * from './RuntimeDTO';
-export * from './CodeSandboxSnapshot';
-export * from './CodeSandboxSnapshotDTO';
 export * from './School';
 export * from './Secret';
-export * from './Space';
-export * from './SpaceDTO';
-export * from './SpaceItem';
-export * from './SpaceMember';
 export * from './Student';
-export * from './StudentItem';
 export * from './Survey';
 export * from './Team';
 export * from './TeamMember';