fix(ui): circular exports

PetrBulanek · PetrBulanek · commit 82f8c7a67a7e · 2026-01-09T14:59:02.000+01:00
Signed-off-by: Petr Bulánek &lt;bulanek.petr@gmail.com&gt;
diff --git a/apps/agentstack-sdk-ts/src/client/a2a/extensions/auth/oauth/index.ts b/apps/agentstack-sdk-ts/src/client/a2a/extensions/auth/oauth/index.ts
@@ -5,7 +5,7 @@
 
 import z from 'zod';
 
-import type { A2AServiceExtension, A2AUiExtension } from '../../../../core';
+import type { A2AServiceExtension, A2AUiExtension } from '../../../../core/extensions/types';
 import { oAuthDemandsSchema, oAuthFulfillmentsSchema, oAuthRequestSchema } from './schemas';
 import type { OAuthDemands, OAuthFulfillments, OAuthRequest } from './types';
 
diff --git a/apps/agentstack-sdk-ts/src/client/a2a/extensions/auth/secrets/index.ts b/apps/agentstack-sdk-ts/src/client/a2a/extensions/auth/secrets/index.ts
@@ -5,7 +5,7 @@
 
 import z from 'zod';
 
-import type { A2AServiceExtension, A2AUiExtension } from '../../../../core';
+import type { A2AServiceExtension, A2AUiExtension } from '../../../../core/extensions/types';
 import { secretDemandsSchema, secretFulfillmentsSchema } from './schemas';
 import type { SecretDemands, SecretFulfillments } from './types';
 
diff --git a/apps/agentstack-sdk-ts/src/client/a2a/extensions/services/embedding/index.ts b/apps/agentstack-sdk-ts/src/client/a2a/extensions/services/embedding/index.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { A2AServiceExtension } from '../../../../core';
+import type { A2AServiceExtension } from '../../../../core/extensions/types';
 import { embeddingDemandsSchema, embeddingFulfillmentsSchema } from './schemas';
 import type { EmbeddingDemands, EmbeddingFulfillments } from './types';
 
diff --git a/apps/agentstack-sdk-ts/src/client/a2a/extensions/services/form/index.ts b/apps/agentstack-sdk-ts/src/client/a2a/extensions/services/form/index.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { A2AServiceExtension } from '../../../../core';
+import type { A2AServiceExtension } from '../../../../core/extensions/types';
 import { formDemandsSchema, formFulfillmentsSchema } from './schemas';
 import type { FormDemands, FormFulfillments } from './types';
 
diff --git a/apps/agentstack-sdk-ts/src/client/a2a/extensions/services/form/schemas.ts b/apps/agentstack-sdk-ts/src/client/a2a/extensions/services/form/schemas.ts
@@ -5,7 +5,7 @@
 
 import z from 'zod';
 
-import { formRenderSchema, formResponseSchema } from '../../schemas';
+import { formRenderSchema, formResponseSchema } from '../../common/form/schemas';
 
 export const formDemandsSchema = z.object({
   form_demands: z
diff --git a/apps/agentstack-sdk-ts/src/client/a2a/extensions/services/llm/index.ts b/apps/agentstack-sdk-ts/src/client/a2a/extensions/services/llm/index.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { A2AServiceExtension } from '../../../../core';
+import type { A2AServiceExtension } from '../../../../core/extensions/types';
 import { llmDemandsSchema, llmFulfillmentsSchema } from './schemas';
 import type { LLMDemands, LLMFulfillments } from './types';
 
diff --git a/apps/agentstack-sdk-ts/src/client/a2a/extensions/services/mcp/index.ts b/apps/agentstack-sdk-ts/src/client/a2a/extensions/services/mcp/index.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { A2AServiceExtension } from '../../../../core';
+import type { A2AServiceExtension } from '../../../../core/extensions/types';
 import { mcpDemandsSchema, mcpFulfillmentsSchema } from './schemas';
 import type { MCPDemands, MCPFulfillments } from './types';
 
diff --git a/apps/agentstack-sdk-ts/src/client/a2a/extensions/services/platform-api/index.ts b/apps/agentstack-sdk-ts/src/client/a2a/extensions/services/platform-api/index.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { ContextToken } from '../../../../api';
+import type { ContextToken } from '../../../../api/contexts/types';
 
 const URI = 'https://a2a-extensions.agentstack.beeai.dev/services/platform_api/v1';
 
diff --git a/apps/agentstack-sdk-ts/src/client/a2a/extensions/ui/agent-detail/index.ts b/apps/agentstack-sdk-ts/src/client/a2a/extensions/ui/agent-detail/index.ts
@@ -5,7 +5,7 @@
 
 import z from 'zod';
 
-import type { A2AUiExtension } from '../../../../core';
+import type { A2AUiExtension } from '../../../../core/extensions/types';
 import { agentDetailSchema } from './schemas';
 import type { AgentDetail } from './types';
 
diff --git a/apps/agentstack-sdk-ts/src/client/a2a/extensions/ui/canvas/index.ts b/apps/agentstack-sdk-ts/src/client/a2a/extensions/ui/canvas/index.ts
@@ -5,7 +5,7 @@
 
 import z from 'zod';
 
-import type { A2AUiExtension } from '../../../../core';
+import type { A2AUiExtension } from '../../../../core/extensions/types';
 import { canvasEditRequestSchema } from './schemas';
 import type { CanvasEditRequest } from './types';
 
diff --git a/apps/agentstack-sdk-ts/src/client/a2a/extensions/ui/citation/index.ts b/apps/agentstack-sdk-ts/src/client/a2a/extensions/ui/citation/index.ts
@@ -5,7 +5,7 @@
 
 import z from 'zod';
 
-import type { A2AUiExtension } from '../../../../core';
+import type { A2AUiExtension } from '../../../../core/extensions/types';
 import { citationMetadataSchema } from './schemas';
 import type { CitationMetadata } from './types';
 
diff --git a/apps/agentstack-sdk-ts/src/client/a2a/extensions/ui/error/index.ts b/apps/agentstack-sdk-ts/src/client/a2a/extensions/ui/error/index.ts
@@ -5,7 +5,7 @@
 
 import z from 'zod';
 
-import type { A2AUiExtension } from '../../../../core';
+import type { A2AUiExtension } from '../../../../core/extensions/types';
 import { errorMetadataSchema } from './schemas';
 import type { ErrorMetadata } from './types';
 
diff --git a/apps/agentstack-sdk-ts/src/client/a2a/extensions/ui/form-request/index.ts b/apps/agentstack-sdk-ts/src/client/a2a/extensions/ui/form-request/index.ts
@@ -5,9 +5,9 @@
 
 import z from 'zod';
 
-import type { A2AUiExtension } from '../../../../core';
-import { formRenderSchema } from '../../schemas';
-import type { FormRender } from '../../types';
+import type { A2AUiExtension } from '../../../../core/extensions/types';
+import { formRenderSchema } from '../../common/form/schemas';
+import type { FormRender } from '../../common/form/types';
 
 const URI = 'https://a2a-extensions.agentstack.beeai.dev/ui/form_request/v1';
 
diff --git a/apps/agentstack-sdk-ts/src/client/a2a/extensions/ui/settings/index.ts b/apps/agentstack-sdk-ts/src/client/a2a/extensions/ui/settings/index.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { A2AServiceExtension } from '../../../../core';
+import type { A2AServiceExtension } from '../../../../core/extensions/types';
 import { settingsDemandsSchema, settingsFulfillmentsSchema } from './schemas';
 import type { SettingsDemands, SettingsFulfillments } from './types';
 
diff --git a/apps/agentstack-sdk-ts/src/client/a2a/extensions/ui/trajectory/index.ts b/apps/agentstack-sdk-ts/src/client/a2a/extensions/ui/trajectory/index.ts
@@ -5,7 +5,7 @@
 
 import z from 'zod';
 
-import type { A2AUiExtension } from '../../../../core';
+import type { A2AUiExtension } from '../../../../core/extensions/types';
 import { trajectoryMetadataSchema } from './schemas';
 import type { TrajectoryMetadata } from './types';
 
diff --git a/apps/agentstack-sdk-ts/src/client/api/configuration/api.ts b/apps/agentstack-sdk-ts/src/client/api/configuration/api.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CallApi } from '../core';
-import { ApiMethod } from '../core';
+import type { CallApi } from '../core/types';
+import { ApiMethod } from '../core/types';
 import { readSystemConfigurationResponseSchema, updateSystemConfigurationResponseSchema } from './schemas';
 import type { UpdateSystemConfigurationRequest } from './types';
 
diff --git a/apps/agentstack-sdk-ts/src/client/api/connectors/api.ts b/apps/agentstack-sdk-ts/src/client/api/connectors/api.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CallApi } from '../core';
-import { ApiMethod } from '../core';
+import type { CallApi } from '../core/types';
+import { ApiMethod } from '../core/types';
 import {
   connectConnectorResponseSchema,
   createConnectorResponseSchema,
diff --git a/apps/agentstack-sdk-ts/src/client/api/contexts/api.ts b/apps/agentstack-sdk-ts/src/client/api/contexts/api.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CallApi } from '../core';
-import { ApiMethod } from '../core';
+import type { CallApi } from '../core/types';
+import { ApiMethod } from '../core/types';
 import {
   createContextHistoryResponseSchema,
   createContextResponseSchema,
diff --git a/apps/agentstack-sdk-ts/src/client/api/contexts/schemas.ts b/apps/agentstack-sdk-ts/src/client/api/contexts/schemas.ts
@@ -5,7 +5,7 @@
 
 import z from 'zod';
 
-import { artifactSchema, messageSchema } from '../../a2a';
+import { artifactSchema, messageSchema } from '../../a2a/protocol/schemas';
 import { paginatedResponseSchema, paginationQuerySchema } from '../core/schemas';
 import { ContextHistoryKind } from './types';
 
diff --git a/apps/agentstack-sdk-ts/src/client/api/files/api.ts b/apps/agentstack-sdk-ts/src/client/api/files/api.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CallApi } from '../core';
-import { ApiMethod } from '../core';
+import type { CallApi } from '../core/types';
+import { ApiMethod } from '../core/types';
 import {
   createFileResponseSchema,
   deleteFileResponseSchema,
diff --git a/apps/agentstack-sdk-ts/src/client/api/model-providers/api.ts b/apps/agentstack-sdk-ts/src/client/api/model-providers/api.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CallApi } from '../core';
-import { ApiMethod } from '../core';
+import type { CallApi } from '../core/types';
+import { ApiMethod } from '../core/types';
 import {
   createModelProviderResponseSchema,
   deleteModelProviderResponseSchema,
diff --git a/apps/agentstack-sdk-ts/src/client/api/provider-builds/api.ts b/apps/agentstack-sdk-ts/src/client/api/provider-builds/api.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CallApi } from '../core';
-import { ApiMethod } from '../core';
+import type { CallApi } from '../core/types';
+import { ApiMethod } from '../core/types';
 import {
   createProviderBuildResponseSchema,
   deleteProviderBuildResponseSchema,
diff --git a/apps/agentstack-sdk-ts/src/client/api/provider-builds/schemas.ts b/apps/agentstack-sdk-ts/src/client/api/provider-builds/schemas.ts
@@ -5,8 +5,8 @@
 
 import z from 'zod';
 
+import { dockerImageIdSchema, readableStreamSchema, resolvedGitHubUrlSchema } from '../../api/common/schemas';
 import { paginatedResponseSchema, paginationQuerySchema } from '../core/schemas';
-import { dockerImageIdSchema, readableStreamSchema, resolvedGitHubUrlSchema } from '../schemas';
 import { ProviderBuildState } from './types';
 
 export const providerBuildStateSchema = z.enum(ProviderBuildState);
diff --git a/apps/agentstack-sdk-ts/src/client/api/providers/api.ts b/apps/agentstack-sdk-ts/src/client/api/providers/api.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CallApi } from '../core';
-import { ApiMethod } from '../core';
+import type { CallApi } from '../core/types';
+import { ApiMethod } from '../core/types';
 import {
   createProviderResponseSchema,
   deleteProviderResponseSchema,
diff --git a/apps/agentstack-sdk-ts/src/client/api/providers/schemas.ts b/apps/agentstack-sdk-ts/src/client/api/providers/schemas.ts
@@ -5,8 +5,7 @@
 
 import z from 'zod';
 
-import { agentCardSchema } from '../../a2a';
-import { paginatedResponseSchema } from '../core/schemas';
+import { agentCardSchema } from '../../a2a/protocol/schemas';
 import {
   dockerImageProviderLocationSchema,
   fileSystemRegistryLocationSchema,
@@ -16,7 +15,8 @@ import {
   readableStreamSchema,
   resolvedDockerImageIdSchema,
   resolvedGitHubUrlSchema,
-} from '../schemas';
+} from '../common/schemas';
+import { paginatedResponseSchema } from '../core/schemas';
 import { ProviderStatus, ProviderType, ProviderUnmanagedStatus } from './types';
 
 export const providerTypeSchema = z.enum(ProviderType);
diff --git a/apps/agentstack-sdk-ts/src/client/api/user-feedback/api.ts b/apps/agentstack-sdk-ts/src/client/api/user-feedback/api.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CallApi } from '../core';
-import { ApiMethod } from '../core';
+import type { CallApi } from '../core/types';
+import { ApiMethod } from '../core/types';
 import { createUserFeedbackResponseSchema } from './schemas';
 import type { CreateUserFeedbackRequest } from './types';
 
diff --git a/apps/agentstack-sdk-ts/src/client/api/users/api.ts b/apps/agentstack-sdk-ts/src/client/api/users/api.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CallApi } from '../core';
-import { ApiMethod } from '../core';
+import type { CallApi } from '../core/types';
+import { ApiMethod } from '../core/types';
 import { readUserResponseSchema } from './schemas';
 
 export function createUsersApi(callApi: CallApi) {
diff --git a/apps/agentstack-sdk-ts/src/client/api/variables/api.ts b/apps/agentstack-sdk-ts/src/client/api/variables/api.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { CallApi } from '../core';
-import { ApiMethod } from '../core';
+import type { CallApi } from '../core/types';
+import { ApiMethod } from '../core/types';
 import { listVariablesResponseSchema, updateVariablesResponseSchema } from './schemas';
 import type { UpdateVariablesRequest } from './types';
 
diff --git a/apps/agentstack-sdk-ts/src/client/core/extensions/extract.ts b/apps/agentstack-sdk-ts/src/client/core/extensions/extract.ts
@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { AgentExtension } from '../../a2a';
+import type { AgentExtension } from '../../a2a/protocol/types';
 import type { A2AServiceExtension, A2AUiExtension } from './types';
 
 export function extractUiExtensionData<U extends string, D>(extension: A2AUiExtension<U, D>) {
diff --git a/apps/agentstack-sdk-ts/src/client/core/extensions/resolveUserMetadata.ts b/apps/agentstack-sdk-ts/src/client/core/extensions/resolveUserMetadata.ts
@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import { canvasExtension, formRequestExtension } from '../../a2a';
+import { canvasExtension } from '../../a2a/extensions/ui/canvas';
+import { formRequestExtension } from '../../a2a/extensions/ui/form-request';
 import type { UserMetadataInputs } from './types';
 
 export const resolveUserMetadata = async (inputs: UserMetadataInputs) => {
diff --git a/apps/agentstack-sdk-ts/src/client/core/extensions/types.ts b/apps/agentstack-sdk-ts/src/client/core/extensions/types.ts
@@ -5,26 +5,16 @@
 
 import type { z } from 'zod';
 
-import type {
-  CanvasEditRequest,
-  EmbeddingDemands,
-  EmbeddingFulfillments,
-  FormDemands,
-  FormFulfillments,
-  FormRender,
-  FormValues,
-  LLMDemands,
-  LLMFulfillments,
-  MCPDemands,
-  MCPFulfillments,
-  OAuthDemands,
-  OAuthFulfillments,
-  SecretDemands,
-  SecretFulfillments,
-  SettingsDemands,
-  SettingsFulfillments,
-} from '../../a2a';
-import type { ContextToken } from '../../api';
+import type { OAuthDemands, OAuthFulfillments } from '../../a2a/extensions/auth/oauth/types';
+import type { SecretDemands, SecretFulfillments } from '../../a2a/extensions/auth/secrets/types';
+import type { FormRender, FormValues } from '../../a2a/extensions/common/form/types';
+import type { EmbeddingDemands, EmbeddingFulfillments } from '../../a2a/extensions/services/embedding/types';
+import type { FormDemands, FormFulfillments } from '../../a2a/extensions/services/form/types';
+import type { LLMDemands, LLMFulfillments } from '../../a2a/extensions/services/llm/types';
+import type { MCPDemands, MCPFulfillments } from '../../a2a/extensions/services/mcp/types';
+import type { CanvasEditRequest } from '../../a2a/extensions/ui/canvas/types';
+import type { SettingsDemands, SettingsFulfillments } from '../../a2a/extensions/ui/settings/types';
+import type { ContextToken } from '../../api/contexts/types';
 
 export interface A2AExtension<U extends string> {
   getUri: () => U;
diff --git a/apps/agentstack-sdk-ts/src/client/core/fulfillment-resolvers/buildLLMExtensionFulfillmentResolver.ts b/apps/agentstack-sdk-ts/src/client/core/fulfillment-resolvers/buildLLMExtensionFulfillmentResolver.ts
@@ -3,9 +3,11 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { LLMDemands, LLMFulfillments } from '../../a2a';
-import type { AgentStackClient, ContextToken } from '../../api';
-import { ModelCapability, unwrapResult } from '../../api';
+import type { LLMDemands, LLMFulfillments } from '../../a2a/extensions/services/llm/types';
+import type { ContextToken } from '../../api/contexts/types';
+import { unwrapResult } from '../../api/core/client';
+import type { AgentStackClient } from '../../api/core/types';
+import { ModelCapability } from '../../api/model-providers/types';
 
 const DEFAULT_SCORE_CUTOFF = 0.4;
 
diff --git a/apps/agentstack-sdk-ts/src/client/core/handleAgentCard.ts b/apps/agentstack-sdk-ts/src/client/core/handleAgentCard.ts
@@ -3,18 +3,15 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { AgentCapabilities } from '../a2a';
-import {
-  embeddingExtension,
-  formExtension,
-  llmExtension,
-  mcpExtension,
-  oAuthExtension,
-  oAuthRequestExtension,
-  platformApiExtension,
-  secretsExtension,
-  settingsExtension,
-} from '../a2a';
+import { oAuthExtension, oAuthRequestExtension } from '../a2a/extensions/auth/oauth';
+import { secretsExtension } from '../a2a/extensions/auth/secrets';
+import { embeddingExtension } from '../a2a/extensions/services/embedding';
+import { formExtension } from '../a2a/extensions/services/form';
+import { llmExtension } from '../a2a/extensions/services/llm';
+import { mcpExtension } from '../a2a/extensions/services/mcp';
+import { platformApiExtension } from '../a2a/extensions/services/platform-api';
+import { settingsExtension } from '../a2a/extensions/ui/settings';
+import type { AgentCapabilities } from '../a2a/protocol/types';
 import { extractServiceExtensionDemands } from './extensions/extract';
 import { fulfillServiceExtensionDemand } from './extensions/fulfill';
 import type { Fulfillments } from './extensions/types';
diff --git a/apps/agentstack-sdk-ts/src/client/core/handleTaskStatusUpdate.ts b/apps/agentstack-sdk-ts/src/client/core/handleTaskStatusUpdate.ts
@@ -3,8 +3,10 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import type { TaskStatusUpdateEvent } from '../a2a';
-import { formRequestExtension, oAuthRequestExtension, secretsRequestExtension } from '../a2a';
+import { oAuthRequestExtension } from '../a2a/extensions/auth/oauth';
+import { secretsRequestExtension } from '../a2a/extensions/auth/secrets';
+import { formRequestExtension } from '../a2a/extensions/ui/form-request';
+import type { TaskStatusUpdateEvent } from '../a2a/protocol/types';
 import { extractUiExtensionData } from './extensions/extract';
 import type { TaskStatusUpdateResult } from './extensions/types';
 import { TaskStatusUpdateType } from './extensions/types';
diff --git a/apps/agentstack-sdk-ts/src/client/core/utils/buildMessageBuilder.ts b/apps/agentstack-sdk-ts/src/client/core/utils/buildMessageBuilder.ts
