@datalayer/agent-runtimes 1.5.80 → 1.5.82

package/lib/examples/main.js

@@ -18,12 +18,12 @@ import { DatalayerThemeProvider, DatalayerLogoText, getLogoColors, themeConfigs,
 import { AgentSummary } from '../components/agents/AgentSummary.js';
 import { HomeIcon, SignInIcon, SignOutIcon } from '@primer/octicons-react';
 import { ActionList, ActionMenu, Button, SegmentedControl, Spinner, Text, TextInput, } from '@primer/react';
-import { AppearanceControlsWithStore } from '@datalayer/primer-addons/lib/components/appearance';
+import { AppearanceControlsWithStore } from '@datalayer/primer-addons/lib/components/appearance/index.js';
 import { coreStore, iamStore } from '@datalayer/core';
 import { DATALAYER_IAM_TOKEN_KEY, DATALAYER_IAM_USER_KEY, } from '../state/substates/index.js';
-import { SignInSimple } from '@datalayer/core/lib/views/iam';
-import { UserBadge } from '@datalayer/core/lib/views/profile';
-import { useSimpleAuthStore } from '@datalayer/core/lib/views/otel';
+import { SignInSimple } from '@datalayer/core/lib/views/iam/index.js';
+import { UserBadge } from '@datalayer/core/lib/views/profile/index.js';
+import { useSimpleAuthStore } from '@datalayer/core/lib/views/otel/index.js';
 import { teardownExampleAgents } from './utils/teardownAgents.js';
 import { OAuthCallback } from '../identity/index.js';
 import { EXAMPLES, getExampleEntries, } from './example-selector.js';

package/lib/examples2/main.js

@@ -12,7 +12,7 @@ import { coreStore } from '../state/index.js';
 import { iamStore } from '../state/index.js';
 import { EXAMPLES } from './example-selector.js';
 import { createDatalayerServiceManager } from '../services/DatalayerServiceManager.js';
-import { BOOTSTRAP_USER_ONBOARDING } from '@datalayer/core/lib/models/UserOnboarding';
+import { BOOTSTRAP_USER_ONBOARDING } from '@datalayer/core/lib/models/UserOnboarding.js';
 import nbformatExample from './notebooks/NotebookExample1.ipynb.json';
 const DEFAULT_RUNTIMES_URL = 'https://r1.datalayer.run';
 const DEFAULT_LOCAL_JUPYTER_SERVER_URL = 'http://0.0.0.0:8888/api/jupyter-server';

package/lib/hooks/index.js

@@ -130,4 +130,4 @@ export { useProgressStore } from './useProgressStore.js';
 export { useProgressTask } from './useProgressTask.js';
 // Re-export core hooks so consumers can progressively migrate imports to
 // agent-runtimes without splitting runtime/content and IAM hook sources.
-export * from '@datalayer/core/lib/hooks';
+export * from '@datalayer/core/lib/hooks/index.js';

package/lib/hooks/useAIAgentsWebSocket.js

@@ -14,8 +14,8 @@
  */
 import { useEffect, useRef, useState } from 'react';
 import { useQueryClient } from '@tanstack/react-query';
-import { useCoreStore, useIAMStore } from '@datalayer/core/lib/state';
-import { DEFAULT_SERVICE_URLS, API_BASE_PATHS, } from '@datalayer/core/lib/api/constants';
+import { useCoreStore, useIAMStore } from '@datalayer/core/lib/state/index.js';
+import { DEFAULT_SERVICE_URLS, API_BASE_PATHS, } from '@datalayer/core/lib/api/constants.js';
 // ─── Auth / URL helpers ──────────────────────────────────────────────
 function useAuthToken() {
     const token = useIAMStore((s) => s.token);

package/lib/hooks/useAgentRuntimes.js

@@ -17,12 +17,12 @@ import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
 import { create } from 'zustand';
 import { persist, createJSONStorage } from 'zustand/middleware';
 import { useCoreStore, useDatalayer } from '@datalayer/core';
-import { useIAMStore } from '@datalayer/core/lib/state';
+import { useIAMStore } from '@datalayer/core/lib/state/index.js';
 import { runtimesStore } from '../state/index.js';
 import { agentRuntimeStore, useAgentRuntimeStore, useAgentRuntimeConnection, useAgentRuntimeStatus, useAgentRuntimeError, useAgentRuntimeIsLaunching, } from '../stores/agentRuntimeStore.js';
 import { parseAgentStreamMessage, } from '../types/stream.js';
 import { DEFAULT_AGENT_CONFIG } from '../types/config.js';
-import { ServiceManager } from '@jupyterlab/services/lib/manager';
+import { ServiceManager } from '@jupyterlab/services/lib/manager.js';
 import { disposeSandboxServiceManagers } from '../services/sandboxServiceManagers.js';
 import { agentDeletionUrl, launchesOwnRoutesOnly, runtimeStatusUrl, } from './ownRoutes.js';
 import { runtimeUrl, runtimesUrl } from '../runtimes/lifecycle.js';
@@ -428,7 +428,7 @@ export function useAgentRuntimes(options = {}) {
     // ─── Auth helpers ─────────────────────────────────────────────────
     const getAuthHeaders = useCallback(async () => {
         try {
-            const { iamStore, coreStore } = await import('@datalayer/core/lib/state');
+            const { iamStore, coreStore } = await import('@datalayer/core/lib/state/index.js');
             const token = iamStore.getState().token || '';
             const config = coreStore.getState().configuration;
             const aiAgentsUrl = config?.aiAgentsUrl || '';

package/lib/hooks/useCellOutputshot.js

@@ -4,7 +4,7 @@
  */
 import { useState } from 'react';
 import { useCellStore } from '../state/substates/index.js';
-import { takeHTMLNodeScreencapture } from '@datalayer/core/lib/utils/Screencapture';
+import { takeHTMLNodeScreencapture } from '@datalayer/core/lib/utils/Screencapture.js';
 const useCellOutputshot = () => {
     const [outputshot, setOutputshot] = useState('');
     const [error, setError] = useState();

package/lib/hooks/useCheckpoints.js

@@ -12,7 +12,7 @@
  */
 import { useMemo, useState, useCallback } from 'react';
 import { useQuery, useQueryClient, useMutation } from '@tanstack/react-query';
-import { useIAMStore } from '@datalayer/core/lib/state';
+import { useIAMStore } from '@datalayer/core/lib/state/index.js';
 import { useCoreStore, useDatalayer } from '@datalayer/core';
 import { agentQueryKeys, AGENT_QUERY_OPTIONS, clearRuntimeDeleted, } from './useAgentRuntimes.js';
 import { disposeSandboxServiceManagers } from '../services/sandboxServiceManagers.js';
@@ -99,7 +99,7 @@ export function usePauseAgent() {
     const queryClient = useQueryClient();
     return useMutation({
         mutationFn: async (params) => {
-            const { iamStore, coreStore } = await import('@datalayer/core/lib/state');
+            const { iamStore, coreStore } = await import('@datalayer/core/lib/state/index.js');
             const token = iamStore.getState().token || '';
             const runtimesUrl = coreStore.getState().configuration?.runtimesUrl || '';
             const { pauseRuntime } = await import('../api/runtimes/runtimes.js');
@@ -144,7 +144,7 @@ export function useResumeAgent() {
     const queryClient = useQueryClient();
     return useMutation({
         mutationFn: async (params) => {
-            const { iamStore, coreStore } = await import('@datalayer/core/lib/state');
+            const { iamStore, coreStore } = await import('@datalayer/core/lib/state/index.js');
             const token = iamStore.getState().token || '';
             const runtimesUrl = coreStore.getState().configuration?.runtimesUrl || '';
             const { resumeRuntime } = await import('../api/runtimes/runtimes.js');
@@ -177,7 +177,7 @@ export function useCheckpointAgent() {
     const queryClient = useQueryClient();
     return useMutation({
         mutationFn: async (params) => {
-            const { iamStore, coreStore } = await import('@datalayer/core/lib/state');
+            const { iamStore, coreStore } = await import('@datalayer/core/lib/state/index.js');
             const token = iamStore.getState().token || '';
             const runtimesUrl = coreStore.getState().configuration?.runtimesUrl || '';
             const { pauseRuntime } = await import('../api/runtimes/runtimes.js');
@@ -223,7 +223,7 @@ export function useTerminateAgent() {
     const queryClient = useQueryClient();
     return useMutation({
         mutationFn: async (params) => {
-            const { iamStore, coreStore } = await import('@datalayer/core/lib/state');
+            const { iamStore, coreStore } = await import('@datalayer/core/lib/state/index.js');
             const token = iamStore.getState().token || '';
             const runtimesUrl = coreStore.getState().configuration?.runtimesUrl || '';
             const { deleteRuntime } = await import('../api/runtimes/runtimes.js');
@@ -304,7 +304,7 @@ export function useAgentLifecycle(options) {
                 // Refresh and rebind runtime connection so downstream calls
                 // target the restored runtime URL.
                 try {
-                    const { iamStore, coreStore } = await import('@datalayer/core/lib/state');
+                    const { iamStore, coreStore } = await import('@datalayer/core/lib/state/index.js');
                     const token = iamStore.getState().token || '';
                     const runtimesUrl = coreStore.getState().configuration?.runtimesUrl || '';
                     const { listRuntimes } = await import('../api/runtimes/runtimes.js');

package/lib/hooks/useMonitoring.js

@@ -8,7 +8,7 @@
  * @module hooks/useMonitoring
  */
 import { useEffect, useState } from 'react';
-import { createOtelClient } from '@datalayer/core/lib/otel';
+import { createOtelClient } from '@datalayer/core/lib/otel/index.js';
 export function toMetricValue(row) {
     const candidates = [row.value_double, row.value_int, row.value];
     for (const candidate of candidates) {

package/lib/hooks/useNotifications.js

@@ -9,8 +9,8 @@
  */
 import { useMemo } from 'react';
 import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
-import { useCoreStore, useIAMStore } from '@datalayer/core/lib/state';
-import { DEFAULT_SERVICE_URLS } from '@datalayer/core/lib/api/constants';
+import { useCoreStore, useIAMStore } from '@datalayer/core/lib/state/index.js';
+import { DEFAULT_SERVICE_URLS } from '@datalayer/core/lib/api/constants.js';
 import { events, notifications } from '../api/index.js';
 // ─── Auth helpers ────────────────────────────────────────────────────
 function useAuthToken() {

package/lib/hooks/useProjects.js

@@ -13,7 +13,7 @@
  * @module hooks/useProjects
  */
 import { useMemo, useCallback } from 'react';
-import { useCache } from '@datalayer/core/lib/hooks/useCache';
+import { useCache } from '@datalayer/core/lib/hooks/useCache.js';
 /** The space type value used to identify project spaces in Solr */
 export const PROJECT_SPACE_VARIANT = 'project';
 const normalizeProjectItems = (items) => {

package/lib/jupyter/serverExecution.js

@@ -5,8 +5,8 @@
 import { CodeCell } from '@jupyterlab/cells';
 import { URLExt } from '@jupyterlab/coreutils';
 import { ServerConnection } from '@jupyterlab/services';
-import { getServerExecutionMetadata, isClientOwnedExecution, setServerExecutionMetadata, } from '@datalayer/jupyter-server-nbmodel/lib/executionMetadata';
-import { NotebookCellServerExecutor, resumeCellServerExecution, } from '@datalayer/jupyter-server-nbmodel/lib/executor';
+import { getServerExecutionMetadata, isClientOwnedExecution, setServerExecutionMetadata, } from '@datalayer/jupyter-server-nbmodel/lib/executionMetadata.js';
+import { NotebookCellServerExecutor, resumeCellServerExecution, } from '@datalayer/jupyter-server-nbmodel/lib/executor.js';
 /**
  * The route `jupyter-server-nbmodel` answers on.
  *

package/lib/mocks/models/CourseMock.js

@@ -3,9 +3,9 @@
  * Distributed under the terms of the Modified BSD License.
  */
 import { uniqueNamesGenerator, names } from 'unique-names-generator';
-import { newUlid } from '@datalayer/core/lib/utils';
+import { newUlid } from '@datalayer/core/lib/utils/index.js';
 import { newSpaceMock } from './SpaceMock.js';
-import { newUserMock } from '@datalayer/core/lib/mocks/models/UserMock';
+import { newUserMock } from '@datalayer/core/lib/mocks/models/UserMock.js';
 export const newCourseMock = (name) => {
     const course = {
         id: newUlid(),

package/lib/mocks/models/SpaceMock.js

@@ -3,8 +3,8 @@
  * Distributed under the terms of the Modified BSD License.
  */
 import { uniqueNamesGenerator, names } from 'unique-names-generator';
-import { newUlid } from '@datalayer/core/lib/utils';
-import { newUserMock } from '@datalayer/core/lib/mocks/models/UserMock';
+import { newUlid } from '@datalayer/core/lib/utils/index.js';
+import { newUserMock } from '@datalayer/core/lib/mocks/models/UserMock.js';
 export const newSpaceMock = (name) => {
     const space = {
         id: newUlid(),

package/lib/models/CodeSandboxSnapshotDTO.js

@@ -3,7 +3,7 @@
  * Distributed under the terms of the Modified BSD License.
  */
 import { snapshots } from '../api/runtimes/index.js';
-import { validateJSON } from '@datalayer/core/lib/api/utils/validation';
+import { validateJSON } from '@datalayer/core/lib/api/utils/validation.js';
 /**
  * Snapshot domain model that wraps API responses with convenient methods.
  * Provides code sandbox snapshot management with data refresh and lifecycle operations.

package/lib/models/EnvironmentDTO.js

@@ -2,7 +2,7 @@
  * Copyright (c) 2025-2026 Datalayer, Inc.
  * Distributed under the terms of the Modified BSD License.
  */
-import { validateJSON } from '@datalayer/core/lib/api/utils/validation';
+import { validateJSON } from '@datalayer/core/lib/api/utils/validation.js';
 /**
  * Environment domain model that wraps API responses with convenient methods.
  * Provides information about available computational environments.

package/lib/models/LexicalDTO.js

@@ -8,9 +8,9 @@
  * @module models/LexicalDTO
  */
 import * as lexicals from '../api/spacer/lexicals.js';
-import { ItemTypes } from '@datalayer/core/lib/client';
+import { ItemTypes } from '@datalayer/core/lib/client/index.js';
 import { ItemDTO } from './ItemDTO.js';
-import { validateJSON } from '@datalayer/core/lib/api/utils/validation';
+import { validateJSON } from '@datalayer/core/lib/api/utils/validation.js';
 /**
  * Lexical domain model that extends the base Item class.
  * Provides lexical document functionality for managing rich text documents.

package/lib/models/NotebookDTO.js

@@ -4,8 +4,8 @@
  */
 import * as notebooks from '../api/spacer/notebooks.js';
 import { ItemDTO } from './ItemDTO.js';
-import { ItemTypes } from '@datalayer/core/lib/client/constants';
-import { validateJSON } from '@datalayer/core/lib/api/utils/validation';
+import { ItemTypes } from '@datalayer/core/lib/client/constants.js';
+import { validateJSON } from '@datalayer/core/lib/api/utils/validation.js';
 /**
  * Notebook domain model that extends the base Item class.
  * Provides notebook-specific functionality for managing Jupyter notebooks.

package/lib/models/Page.js

@@ -2,7 +2,7 @@
  * Copyright (c) 2025-2026 Datalayer, Inc.
  * Distributed under the terms of the Modified BSD License.
  */
-import { asUser } from '@datalayer/core/lib/models/User';
+import { asUser } from '@datalayer/core/lib/models/User.js';
 import { asCodeSandboxSnapshot, } from './CodeSandboxSnapshot.js';
 export const asPage = (s) => {
     return {

package/lib/models/RuntimeDTO.js

@@ -8,7 +8,7 @@
  * @module models/RuntimeDTO
  */
 import { updateRuntime } from '../api/runtimes/runtimes.js';
-import { validateJSON } from '@datalayer/core/lib/api/utils/validation';
+import { validateJSON } from '@datalayer/core/lib/api/utils/validation.js';
 /**
  * Runtime domain model that wraps API responses with convenient methods.
  * Provides state management and lifecycle operations for computational runtimes.

package/lib/models/Space.js

@@ -2,8 +2,8 @@
  * Copyright (c) 2025-2026 Datalayer, Inc.
  * Distributed under the terms of the Modified BSD License.
  */
-import { asUser } from '@datalayer/core/lib/models/User';
-import { asArray } from '@datalayer/core/lib/utils';
+import { asUser } from '@datalayer/core/lib/models/User.js';
+import { asArray } from '@datalayer/core/lib/utils/index.js';
 /**
  * Convert the raw space object to {@link ISpace}.
  *

package/lib/models/SpaceDTO.js

@@ -13,9 +13,9 @@ import * as notebooks from '../api/spacer/notebooks.js';
 import * as lexicals from '../api/spacer/lexicals.js';
 import { NotebookDTO } from './NotebookDTO.js';
 import { LexicalDTO } from './LexicalDTO.js';
-import { ItemTypes } from '@datalayer/core/lib/client/constants';
+import { ItemTypes } from '@datalayer/core/lib/client/constants.js';
 import { convertSpaceItemsToModels } from '../client/utils/spacerUtils.js';
-import { validateJSON } from '@datalayer/core/lib/api/utils/validation';
+import { validateJSON } from '@datalayer/core/lib/api/utils/validation.js';
 /**
  * Space domain model that wraps API responses with convenient methods.
  * Provides workspace management with data refresh and content creation operations.

package/lib/models/index.js

@@ -37,4 +37,4 @@ export * from './SpaceMember.js';
 export * from './StudentItem.js';
 // Re-export identity/plans/account model interfaces that stay in core so
 // agent-runtimes code can resolve every model from this single barrel.
-export * from '@datalayer/core/lib/models';
+export * from '@datalayer/core/lib/models/index.js';

package/lib/portable/sessions.d.ts

@@ -48,6 +48,10 @@ export type SessionStart = {
  * settings, resume (streamed), and stop, end, read (JSON).
  */
 export declare function appSessionsClient(options: RuntimeClientOptions): {
+    /** The runtime's agent-runtimes address this client speaks to. */
+    serverUrl: string;
+    /** The token it calls with now, or `undefined`. */
+    accessToken: () => string | undefined;
     /** Start a session with its first message. */
     start: (start: SessionStart, streaming: StreamOptions) => Promise<void>;
     /** The next turn, or the answer to what the application asked (text, a choice). */

package/lib/portable/sessions.js

@@ -66,6 +66,10 @@ const at = (uid) => `/api/v1/apps/sessions/${encodeURIComponent(uid)}`;
 export function appSessionsClient(options) {
     const { json, stream, fetcher, headers, refused, root } = clientOf(options);
     return {
+        /** The runtime's agent-runtimes address this client speaks to. */
+        serverUrl: root,
+        /** The token it calls with now, or `undefined`. */
+        accessToken: () => options.getAccessToken(),
         /** Start a session with its first message. */
         start: (start, streaming) => stream('/api/v1/apps/sessions', {
             agent: start.agent,

package/lib/runtimes/actions.js

@@ -8,7 +8,7 @@
 import { URLExt } from '@jupyterlab/coreutils';
 import { PromiseDelegate } from '@lumino/coreutils';
 import { Upload } from 'tus-js-client';
-import { requestDatalayerAPI } from '@datalayer/core/lib/api';
+import { requestDatalayerAPI } from '@datalayer/core/lib/api/index.js';
 import { runtimeUrl, runtimesUrl, sandboxSnapshotUrl, sandboxSnapshotsUrl, } from './lifecycle.js';
 import { asCodeSandboxSnapshot } from '../models/index.js';
 import { iamStore, runtimesStore } from '../state/substates/index.js';

package/lib/services/DatalayerServiceManager.js

@@ -3,8 +3,8 @@
  * Distributed under the terms of the Modified BSD License.
  */
 import { ServerConnection, ServiceManager } from '@jupyterlab/services';
-import { coreStore } from '@datalayer/core/lib/state/substates/CoreState';
-import { DEFAULT_DATALAYER_CONFIG } from '@datalayer/core/lib/config/Configuration';
+import { coreStore } from '@datalayer/core/lib/state/substates/CoreState.js';
+import { DEFAULT_DATALAYER_CONFIG } from '@datalayer/core/lib/config/Configuration.js';
 import { createRuntime } from '../runtimes/actions.js';
 const normalizeEnvironmentName = (value) => {
     if (!value) {

package/lib/state/index.js

@@ -5,6 +5,6 @@
 // Export runtime/content substates owned by agent-runtimes.
 export * from './substates/index.js';
 // Re-export core state modules and stores that remain owned by core.
-export * from '@datalayer/core/lib/state/storage';
-export * from '@datalayer/core/lib/state/State';
-export { coreStore, useCoreStore, iamStore, useIAMStore, RESERVATION_WARNING_TIME_MS, layoutStore, useLayoutStore, organizationStore, useOrganizationStore, surveysStore, useSurveysStore, teamStore, useTeamStore, runStore, useRunStore, DATALAYER_IAM_TOKEN_KEY, DATALAYER_IAM_USER_KEY, } from '@datalayer/core/lib/state';
+export * from '@datalayer/core/lib/state/storage/index.js';
+export * from '@datalayer/core/lib/state/State.js';
+export { coreStore, useCoreStore, iamStore, useIAMStore, RESERVATION_WARNING_TIME_MS, layoutStore, useLayoutStore, organizationStore, useOrganizationStore, surveysStore, useSurveysStore, teamStore, useTeamStore, runStore, useRunStore, DATALAYER_IAM_TOKEN_KEY, DATALAYER_IAM_USER_KEY, } from '@datalayer/core/lib/state/index.js';

package/lib/state/substates/RuntimesState.js

@@ -7,8 +7,8 @@ import { createStore } from 'zustand/vanilla';
 import { JSONExt } from '@lumino/coreutils';
 import { Poll } from '@lumino/polling';
 import { getRuntimes } from '../../runtimes/index.js';
-import { coreStore } from '@datalayer/core/lib/state/substates/CoreState';
-import { iamStore } from '@datalayer/core/lib/state/substates/IAMState';
+import { coreStore } from '@datalayer/core/lib/state/substates/CoreState.js';
+import { iamStore } from '@datalayer/core/lib/state/substates/IAMState.js';
 /**
  * Kernel store
  */

package/lib/state/substates/index.js

@@ -11,4 +11,4 @@ export * from './RuntimesState.js';
 export * from './JupyterLabState.js';
 export * from './SpaceState.js';
 // Re-export the identity/plans/layout state that stays in core.
-export { coreStore, useCoreStore, iamStore, useIAMStore, layoutStore, useLayoutStore, organizationStore, useOrganizationStore, surveysStore, useSurveysStore, teamStore, useTeamStore, runStore, useRunStore, DATALAYER_IAM_TOKEN_KEY, DATALAYER_IAM_USER_KEY, } from '@datalayer/core/lib/state';
+export { coreStore, useCoreStore, iamStore, useIAMStore, layoutStore, useLayoutStore, organizationStore, useOrganizationStore, surveysStore, useSurveysStore, teamStore, useTeamStore, runStore, useRunStore, DATALAYER_IAM_TOKEN_KEY, DATALAYER_IAM_USER_KEY, } from '@datalayer/core/lib/state/index.js';

package/lib/stores/agentRuntimeStore.js

@@ -78,7 +78,7 @@ function toAgentRuntimeBaseUrl(baseUrl) {
     return normalized.replace('/jupyter/', '/agent-runtimes/');
 }
 async function createAgentOnRuntime(agentBaseUrl, agentId, config = {}) {
-    const { iamStore } = await import('@datalayer/core/lib/state');
+    const { iamStore } = await import('@datalayer/core/lib/state/index.js');
     const token = iamStore.getState().token || '';
     if (!config.protocol && !config.agentSpecId) {
         throw new Error('Agent protocol is required. Provide config.protocol from the selected spec/config.');

package/lib/types/mcp.js

@@ -2,7 +2,7 @@
  * Copyright (c) 2025-2026 Datalayer, Inc.
  * Distributed under the terms of the Modified BSD License.
  */
-import { defaultIndicatorColors } from '@datalayer/primer-addons/lib/theme';
+import { defaultIndicatorColors } from '@datalayer/primer-addons/lib/theme/index.js';
 /**
  * Primer-addon indicator colours for each aggregate MCP status.
  * Uses the shared indicator palette so colours stay consistent

package/lib/types/sandbox.js

@@ -8,7 +8,7 @@
  *
  * @module types/sandbox
  */
-import { defaultIndicatorColors } from '@datalayer/primer-addons/lib/theme';
+import { defaultIndicatorColors } from '@datalayer/primer-addons/lib/theme/index.js';
 /* ── Visual constants ──────────────────────────────────── */
 export const SANDBOX_STATUS_COLORS = {
     unavailable: defaultIndicatorColors.muted,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@datalayer/agent-runtimes",
-    "version": "1.5.80",
+    "version": "1.5.82",
     "type": "module",
     "workspaces": [
         ".",

package/scripts/check-npm-pack.mjs

@@ -22,7 +22,12 @@
 
 import { execFileSync } from 'node:child_process';
 import { readFileSync } from 'node:fs';
-import { relativeSpecifiers, resolveSpecifier } from './esm-specifiers.mjs';
+import {
+  deepSpecifiers,
+  relativeSpecifiers,
+  resolveDeepSpecifier,
+  resolveSpecifier,
+} from './esm-specifiers.mjs';
 
 const listing = JSON.parse(
   execFileSync('npm', ['pack', '--dry-run', '--json', '--ignore-scripts'], {
@@ -53,7 +58,19 @@ for (const file of [...packed].filter(
   path => path.startsWith('lib/') && path.endsWith('.js'),
 )) {
   read += 1;
-  for (const { specifier } of relativeSpecifiers(readFileSync(file, 'utf8'))) {
+  const text = readFileSync(file, 'utf8');
+  // A deep import into a package with no `exports` map must name its file:
+  // the package found is the one installed, as Node would find it.
+  for (const deep of deepSpecifiers(text)) {
+    const { status, whole } = resolveDeepSpecifier(deep, process.cwd());
+    if (status === 'partial') {
+      specifiers += 1;
+      refused.push(
+        `${file}: '${deep.specifier}' is not written whole (Node needs '${whole}')`,
+      );
+    }
+  }
+  for (const { specifier } of relativeSpecifiers(text)) {
     specifiers += 1;
     const { status, whole } = resolveSpecifier(file, specifier, isFile);
     if (status === 'missing') {
@@ -74,4 +91,6 @@ if (refused.length > 0) {
   console.error(`check-npm-pack: ${refused.length} refused`);
   process.exit(1);
 }
-console.log('check-npm-pack: every relative import of lib/ is in the tarball');
+console.log(
+  'check-npm-pack: every relative import of lib/ is in the tarball, every deep import written whole',
+);

package/scripts/esm-specifiers.mjs

@@ -20,7 +20,8 @@
  */
 
 import ts from 'typescript';
-import { posix } from 'node:path';
+import { existsSync, readFileSync } from 'node:fs';
+import { dirname, join, posix } from 'node:path';
 
 /**
  * Every relative specifier of `text`, with the offset of its first
@@ -74,3 +75,72 @@ export function resolveSpecifier(from, specifier, isFile) {
   }
   return { status: 'missing' };
 }
+
+/**
+ * The deep specifiers of a module into another package — `'@datalayer/core/lib/state'`,
+ * `'pkg/lib/x'` — with where each starts in the text. A package's bare name
+ * (`'react'`, `'@datalayer/core'`) is not one: its `main` or `exports` decides.
+ */
+export function deepSpecifiers(text) {
+  const { importedFiles } = ts.preProcessFile(text, true, true);
+  const found = [];
+  for (const { fileName, pos } of importedFiles) {
+    if (fileName.startsWith('.') || fileName.startsWith('/')) continue;
+    if (fileName.includes(':') || /[?#]/.test(fileName)) continue;
+    const parts = fileName.split('/');
+    const nameLength = fileName.startsWith('@') ? 2 : 1;
+    if (parts.length <= nameLength) continue;
+    const start = text.indexOf(fileName, pos);
+    if (start < 0) {
+      throw new Error(`the specifier ${fileName} is not at ${pos}`);
+    }
+    found.push({
+      specifier: fileName,
+      start,
+      pkg: parts.slice(0, nameLength).join('/'),
+      subpath: parts.slice(nameLength).join('/'),
+    });
+  }
+  return found;
+}
+
+/**
+ * Where a package is installed, looked up from `fromDir` upwards as Node
+ * does; `null` when it is not.
+ */
+export function packageDirOf(pkg, fromDir) {
+  let dir = fromDir;
+  for (;;) {
+    const candidate = join(dir, 'node_modules', pkg);
+    if (existsSync(join(candidate, 'package.json'))) return candidate;
+    const parent = dirname(dir);
+    if (parent === dir) return null;
+    dir = parent;
+  }
+}
+
+/**
+ * A deep specifier written whole, as Node's ESM loader needs it in a
+ * package with no `exports` map: `'<pkg>/lib/x'` becomes `'<pkg>/lib/x.js'`
+ * or `'<pkg>/lib/x/index.js'`. `whole` when it already names a file or its
+ * package maps its own paths (`exports`), `partial` with the rewrite, and
+ * `missing` when the package or the file is not there.
+ */
+export function resolveDeepSpecifier({ specifier, pkg, subpath }, fromDir) {
+  const dir = packageDirOf(pkg, fromDir);
+  if (!dir) return { status: 'missing' };
+  const manifest = JSON.parse(readFileSync(join(dir, 'package.json'), 'utf8'));
+  if (manifest.exports !== undefined) return { status: 'whole' };
+  const target = join(dir, subpath);
+  if (posix.extname(subpath) && existsSync(target)) return { status: 'whole' };
+  if (existsSync(`${target}.js`)) {
+    return { status: 'partial', whole: `${specifier}.js` };
+  }
+  if (existsSync(join(target, 'index.js'))) {
+    return {
+      status: 'partial',
+      whole: `${specifier.replace(/\/$/, '')}/index.js`,
+    };
+  }
+  return existsSync(target) ? { status: 'whole' } : { status: 'missing' };
+}

package/scripts/fully-specify-lib.mjs

@@ -9,14 +9,22 @@
  * `'./approvals'` becomes `'./approvals.js'`, `'./chat'` (a folder)
  * `'./chat/index.js'`, so Node's ESM loader reads `lib/` as a bundler does.
  * A specifier that already names a file, or names none, is left as it is
- * (`check-npm-pack.mjs` refuses the second). Run again, it changes nothing.
+ * (`check-npm-pack.mjs` refuses the second). A deep import into a package
+ * with no `exports` map is written whole the same way, against the package
+ * installed (`'@datalayer/core/lib/state/substates/IAMState'` becomes
+ * `'…/IAMState.js'`): Node refuses it otherwise. Run again, it changes nothing.
  *
  * Usage: node scripts/fully-specify-lib.mjs [lib]
  */
 
 import { readdirSync, readFileSync, statSync, writeFileSync } from 'node:fs';
 import { join, relative, resolve, sep } from 'node:path';
-import { relativeSpecifiers, resolveSpecifier } from './esm-specifiers.mjs';
+import {
+  deepSpecifiers,
+  relativeSpecifiers,
+  resolveDeepSpecifier,
+  resolveSpecifier,
+} from './esm-specifiers.mjs';
 
 const root = resolve(process.argv[2] ?? 'lib');
 const posixOf = path => relative(root, path).split(sep).join('/');
@@ -44,6 +52,13 @@ for (const file of files.filter(name => name.endsWith('.js'))) {
       start,
       ...resolveSpecifier(file, specifier, isFile),
     }))
+    .concat(
+      deepSpecifiers(text).map(deep => ({
+        specifier: deep.specifier,
+        start: deep.start,
+        ...resolveDeepSpecifier(deep, process.cwd()),
+      })),
+    )
     .filter(({ status }) => status === 'partial');
   if (edits.length === 0) continue;
   let out = text;