@tradejs/app 3.1.29-beta.261 → 3.1.29-beta.263

package/src/app/oauth/token/route.ts

@@ -0,0 +1,69 @@
+import { readMcpBody } from '#app/lib/mcp/http';
+import OAuth2Server from '@node-oauth/oauth2-server';
+import { mcpStorage } from '@tradejs/infra/redis';
+import {
+  createOAuthServer,
+  mcpEnabled,
+  mcpResource,
+  oauthResponse,
+} from '#app/lib/mcp/oauth';
+
+export const runtime = 'nodejs';
+export const dynamic = 'force-dynamic';
+
+export const POST = async (request: Request) => {
+  if (!mcpEnabled())
+    return oauthResponse({ error: 'temporarily_unavailable' }, 503);
+  if (!(await mcpStorage.rateLimit('token', 600, 60)))
+    return oauthResponse({ error: 'temporarily_unavailable' }, 429);
+  if (
+    !request.headers
+      .get('content-type')
+      ?.startsWith('application/x-www-form-urlencoded')
+  )
+    return oauthResponse({ error: 'invalid_request' }, 400);
+  let text: string;
+  try {
+    text = await readMcpBody(request, 8192);
+  } catch {
+    return oauthResponse({ error: 'invalid_request' }, 400);
+  }
+  if (text.length > 8192)
+    return oauthResponse({ error: 'invalid_request' }, 400);
+  const params = new URLSearchParams(text);
+  if (
+    [...new Set(params.keys())].some((key) => params.getAll(key).length > 1) ||
+    (params.has('resource') && params.get('resource') !== mcpResource()) ||
+    !['authorization_code', 'refresh_token'].includes(
+      params.get('grant_type') || '',
+    )
+  )
+    return oauthResponse({ error: 'invalid_request' }, 400);
+  const response = new OAuth2Server.Response();
+  try {
+    await createOAuthServer().token(
+      new OAuth2Server.Request({
+        method: 'POST',
+        headers: {
+          ...Object.fromEntries(request.headers),
+          'content-length': String(Buffer.byteLength(text)),
+        },
+        query: {},
+        body: Object.fromEntries(params),
+      }),
+      response,
+    );
+    return oauthResponse(
+      response.body,
+      response.status || 200,
+      response.headers,
+    );
+  } catch (error) {
+    if (error instanceof OAuth2Server.OAuthError)
+      return oauthResponse(
+        { error: error.name, error_description: error.message },
+        error.code || 400,
+      );
+    return oauthResponse({ error: 'server_error' }, 503);
+  }
+};

package/src/app/routes/dashboard/Dashboard.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import { useCallback, useEffect } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { useSearchParams } from 'next/navigation';
 import Link from 'next/link';
 import { Box, Button, Flex, ClientOnly } from '@chakra-ui/react';
@@ -16,6 +16,7 @@ import {
 
 const DashboardRoute = () => {
   const searchParams = useSearchParams();
+  const [contextCopied, setContextCopied] = useState(false);
   const { filters, setFilters } = useFilters();
   const { tickers, ensureLoaded: ensureTickersLoaded } = useTickers(
     filters.provider || 'bybit',
@@ -149,16 +150,45 @@ const DashboardRoute = () => {
                 </Flex>
               </Filters.Root>
             </Box>
-            <Button
-              asChild
-              bg="#20c5bd"
-              color="gray.950"
-              _hover={{ bg: '#42d8d0' }}
-              justifySelf={{ base: 'start', lg: 'end' }}
-              mb={4}
-            >
-              <Link href="/routes/backtest">Create backtest</Link>
-            </Button>
+            <Flex gap={2} flexWrap="wrap">
+              <Button
+                onClick={async () => {
+                  const context = {
+                    provider: filters.provider,
+                    universe: filters.universe ?? 'crypto',
+                    symbol: filters.symbol,
+                    interval: filters.interval,
+                    ...(filters.backtestId
+                      ? {
+                          backtestId: filters.backtestId,
+                          backtestStrategy: filters.backtestStrategy,
+                        }
+                      : {}),
+                  };
+                  try {
+                    await navigator.clipboard.writeText(
+                      `TradeJS chart context: ${JSON.stringify(context)}. Use chart_get_context for market candles; for a saved backtest, inspect its recorded results. URL: ${window.location.href}`,
+                    );
+                    setContextCopied(true);
+                  } catch {
+                    setContextCopied(false);
+                  }
+                }}
+                variant="outline"
+              >
+                {contextCopied ? 'Context copied' : 'Copy context for AI'}
+              </Button>
+              <Button
+                asChild
+                bg="#20c5bd"
+                color="gray.950"
+                _hover={{ bg: '#42d8d0' }}
+                justifySelf={{ base: 'start', lg: 'end' }}
+                mb={4}
+              >
+                <Link href="/routes/backtest">Create backtest</Link>
+              </Button>
+            </Flex>
           </Box>
         )}
         <Box position="relative" flex="1" w="full">

package/src/app/routes/mcp/consent/page.tsx

@@ -0,0 +1,67 @@
+import styles from '#app/lib/mcp/Mcp.module.css';
+import { getCurrentUserName } from '#app/lib/currentUser';
+import { readConsent } from '#app/lib/mcp/oauth';
+import Link from 'next/link';
+
+export const dynamic = 'force-dynamic';
+
+export default async function ConsentPage({
+  searchParams,
+}: {
+  searchParams: Promise<{ ticket?: string }>;
+}) {
+  const { ticket = '' } = await searchParams;
+  const userName = await getCurrentUserName();
+  const consent = await readConsent(ticket);
+  if (!consent || consent.userName !== userName)
+    return (
+      <main style={{ padding: 32 }}>
+        Authorization request expired. Start the connection again.
+      </main>
+    );
+  return (
+    <main className={styles.main}>
+      <h1>Connect to TradeJS</h1>
+      <p>
+        <strong>{consent.client.name}</strong> requests access as{' '}
+        <strong>{userName}</strong>.
+      </p>
+      <p>The client name is supplied by the application requesting access.</p>
+      <p>
+        Return address: <code>{consent.query.redirect_uri}</code>
+      </p>
+      <p>
+        Market and runtime data you request will be shared with this client. Run
+        permissions allow background computations. They do not allow live
+        trading or deployment changes.
+      </p>
+      <form action="/oauth/authorize" method="post">
+        <input type="hidden" name="ticket" value={ticket} />
+        <fieldset>
+          <legend>Requested permissions</legend>
+          {consent.scopes.map((scope) => (
+            <label key={scope} style={{ display: 'block', margin: '8px 0' }}>
+              <input
+                type="checkbox"
+                name="scope"
+                value={scope}
+                defaultChecked={!scope.endsWith(':run')}
+              />{' '}
+              {scope}
+            </label>
+          ))}
+        </fieldset>
+        <button name="decision" value="allow" type="submit">
+          Allow access
+        </button>{' '}
+        <button name="decision" value="deny" type="submit">
+          Deny
+        </button>
+      </form>
+      <p>
+        You can revoke access in <Link href="/routes/mcp">MCP connections</Link>
+        .
+      </p>
+    </main>
+  );
+}

package/src/app/routes/mcp/page.tsx

@@ -0,0 +1,58 @@
+import styles from '#app/lib/mcp/Mcp.module.css';
+import { revalidatePath } from 'next/cache';
+import { getCurrentUserName } from '#app/lib/currentUser';
+import { listConnections, mcpResource, revokeGrant } from '#app/lib/mcp/oauth';
+
+export const dynamic = 'force-dynamic';
+
+async function revoke(form: FormData) {
+  'use server';
+  const userName = await getCurrentUserName();
+  if (!userName) throw new Error('Unauthorized');
+  await revokeGrant(userName, String(form.get('grantId') || ''));
+  revalidatePath('/routes/mcp');
+}
+
+export default async function ConnectionsPage() {
+  const userName = await getCurrentUserName();
+  if (!userName) return null;
+  const connections = await listConnections(userName);
+  const url = mcpResource();
+  return (
+    <main className={styles.main}>
+      <h1>MCP connections</h1>
+      <p>
+        Connect Codex or Claude Code to your TradeJS instance. Sign in and
+        review access in your browser.
+      </p>
+      <p>
+        Server: <code>{url}</code>
+      </p>
+      <h2>Codex</h2>
+      <pre>{`codex mcp add tradejs --url ${url}\ncodex mcp login tradejs`}</pre>
+      <p>
+        For background jobs, authorize the required run permissions yourself:
+      </p>
+      <pre>{`codex mcp login tradejs --scopes market:read,runtime:read,backtests:read,backtests:run,diagnostics:read,diagnostics:run`}</pre>
+      <h2>Claude Code</h2>
+      <pre>{`claude mcp add --transport http --scope user tradejs ${url}`}</pre>
+      <p>
+        In Claude Code, open <code>/mcp</code> to authenticate. Request
+        additional scopes explicitly when you need to run computations.
+      </p>
+      <h2>Authorized applications</h2>
+      {!connections.length && <p>No active connections.</p>}
+      {connections.map((connection) => (
+        <section key={connection.id} className={styles.connection}>
+          <h3>{connection.clientName}</h3>
+          <p>{connection.scopes.join(', ')}</p>
+          <p>Expires: {new Date(connection.expiresAt).toISOString()}</p>
+          <form action={revoke}>
+            <input type="hidden" name="grantId" value={connection.id} />
+            <button type="submit">Revoke access</button>
+          </form>
+        </section>
+      ))}
+    </main>
+  );
+}

package/src/app/store/index.ts

@@ -3,7 +3,6 @@ export { useTickers } from './tickers';
 export { useIndicators } from './indicators';
 export type { IndicatorRendererConfig } from './indicators';
 export { useData } from './data';
-export { useAiChatStore } from './ai';
 export {
   useTest,
   useTestsCompare,

package/src/proxy.ts

@@ -52,6 +52,24 @@ const issueSession = async (
 export const proxy = async (req: NextRequest) => {
   const { pathname } = req.nextUrl;
 
+  // These endpoints implement Bearer OAuth themselves. Never redirect MCP or
+  // discovery/token requests to the browser session login.
+  if (
+    pathname === '/mcp' ||
+    pathname.startsWith('/mcp/') ||
+    [
+      '/oauth/authorize',
+      '/oauth/token',
+      '/oauth/register',
+      '/oauth/revoke',
+      '/.well-known/oauth-authorization-server',
+      '/.well-known/oauth-protected-resource',
+      '/.well-known/oauth-protected-resource/mcp',
+    ].includes(pathname)
+  ) {
+    return NextResponse.next();
+  }
+
   if (
     pathname.startsWith('/_next') ||
     pathname === '/favicon.ico' ||

package/src/app/actions/ai.ts

@@ -1,33 +0,0 @@
-import { API } from '@tradejs/core/api';
-import { AIChatMessage, AIChatHistory, Filters } from '@tradejs/types';
-
-interface SendMessageProps {
-  message: AIChatMessage;
-  filters: Filters;
-}
-
-const API_PATH = '/api/ai';
-
-export const getHistory = async (symbol: string): Promise<AIChatHistory> => {
-  if (!symbol) {
-    return [];
-  }
-
-  const data = await API.get<{ history?: AIChatHistory }>(
-    `${API_PATH}?symbol=${encodeURIComponent(symbol)}`,
-  );
-
-  return data.history ?? [];
-};
-
-export const sendMessage = async ({
-  message,
-  filters,
-}: SendMessageProps): Promise<AIChatMessage> => {
-  const data = await API.post<{ message: AIChatMessage }>(API_PATH, {
-    message,
-    filters,
-  });
-
-  return data.message;
-};

package/src/app/api/ai/route.ts

@@ -1,201 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server';
-import { TTL_1M } from '@tradejs/core/constants';
-import { toJson } from '@tradejs/core/data';
-import {
-  getAiResponseLanguagePromptName,
-  normalizeAiResponseLanguage,
-} from '@tradejs/core/aiLanguages';
-import { invokeAiChat, type AiChatMessage } from '@tradejs/node/ai';
-import {
-  AIChatHistory,
-  AIChatMessage,
-  ConnectorCreator,
-  Filters,
-} from '@tradejs/types';
-import { getData, redisKeys, setData } from '@tradejs/infra/redis';
-import { logger } from '@tradejs/infra/logger';
-import { getUserSettings } from '@tradejs/infra/userSettings';
-import { resolveConnectorCreatorByProvider } from '#app/lib/connectorCreator';
-import { getCurrentUserName } from '#app/lib/currentUser';
-
-export const dynamic = 'force-dynamic';
-
-const projectRoot =
-  String(process.env.PROJECT_CWD || process.cwd()).trim() || process.cwd();
-
-const normalizeChatSymbolKey = (symbol: string): string => {
-  const normalized = symbol
-    .trim()
-    .toUpperCase()
-    .replace(/[^A-Z0-9._-]+/g, '_')
-    .replace(/_+/g, '_')
-    .replace(/^_+|_+$/g, '')
-    .slice(0, 120);
-
-  if (!normalized) {
-    throw new Error('Invalid AI chat symbol');
-  }
-
-  return normalized;
-};
-
-const getHistoryKey = (userName: string, symbol: string) =>
-  redisKeys.aiChatHistory(userName, normalizeChatSymbolKey(symbol));
-
-const getHistory = async (
-  userName: string,
-  symbol: string,
-): Promise<AIChatHistory> => {
-  return (await getData(getHistoryKey(userName, symbol), [])) as AIChatHistory;
-};
-
-const appendMessagesToHistory = async (
-  userName: string,
-  symbol: string,
-  messages: AIChatHistory,
-): Promise<void> => {
-  const history = await getHistory(userName, symbol);
-  await setData(getHistoryKey(userName, symbol), [...history, ...messages], {
-    expire: TTL_1M,
-  });
-};
-
-const buildMessages = (
-  filters: Filters,
-  historyEntry: AIChatMessage,
-  historyData: unknown,
-  responseLanguage: string,
-) => {
-  const messages: AiChatMessage[] = [];
-
-  messages.push({
-    role: 'system',
-    content: `You are a crypto trader assistant. Reply in ${getAiResponseLanguagePromptName(
-      responseLanguage,
-    )}.`,
-  });
-
-  messages.push({
-    role: 'system',
-    content: `Here is the market data for ${filters.symbol}: ${toJson(historyData)}`,
-  });
-
-  if (historyEntry.command === '/line') {
-    messages.push({ role: 'user', content: historyEntry.text });
-  }
-
-  if (historyEntry.command === 'prompt') {
-    messages.push({ role: 'user', content: historyEntry.text });
-  }
-
-  return messages;
-};
-
-export const GET = async (request: NextRequest) => {
-  try {
-    const userName = await getCurrentUserName();
-    if (!userName) {
-      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
-    }
-
-    const symbol = request.nextUrl.searchParams.get('symbol');
-
-    if (!symbol) {
-      return NextResponse.json(
-        { error: 'Missing required parameter: symbol' },
-        { status: 400 },
-      );
-    }
-
-    try {
-      normalizeChatSymbolKey(symbol);
-    } catch {
-      return NextResponse.json({ error: 'Invalid symbol' }, { status: 400 });
-    }
-
-    const history = await getHistory(userName, symbol);
-    return NextResponse.json({ history });
-  } catch (error) {
-    logger.log('error', `AI history error: %o`, error);
-    return NextResponse.json(
-      { error: 'Internal Server Error' },
-      { status: 500 },
-    );
-  }
-};
-
-export const POST = async (request: NextRequest) => {
-  try {
-    const userName = await getCurrentUserName();
-    if (!userName) {
-      return NextResponse.json({ error: 'Unauthorized' }, { status: 401 });
-    }
-
-    const body = await request.json();
-    const { message, filters } = body as {
-      message?: AIChatMessage;
-      filters?: Filters;
-    };
-
-    if (!message || !filters) {
-      return NextResponse.json(
-        { error: 'Missing required fields: message, filters' },
-        { status: 400 },
-      );
-    }
-
-    try {
-      normalizeChatSymbolKey(filters.symbol);
-    } catch {
-      return NextResponse.json({ error: 'Invalid symbol' }, { status: 400 });
-    }
-
-    await appendMessagesToHistory(userName, filters.symbol, [message]);
-
-    const connectorCreator = await resolveConnectorCreatorByProvider(
-      'bybit',
-      projectRoot,
-    );
-    if (!connectorCreator) {
-      throw new Error('No connector available for provider');
-    }
-
-    const byBitConnector = await (connectorCreator as ConnectorCreator)({
-      userName,
-    });
-
-    const data = await byBitConnector.kline({
-      ...filters,
-      interval: '60',
-    });
-
-    const settings = await getUserSettings(userName);
-    const chatMessages = buildMessages(
-      filters,
-      message,
-      data.slice(-100),
-      normalizeAiResponseLanguage(settings.AI_RESPONSE_LANGUAGE),
-    );
-
-    const response = await invokeAiChat({
-      messages: chatMessages,
-      userName,
-      temperature: 0.7,
-    });
-
-    const responseMessage: AIChatMessage = {
-      from: 'ai',
-      text: response.content as string,
-    };
-
-    await appendMessagesToHistory(userName, filters.symbol, [responseMessage]);
-
-    return NextResponse.json({ message: responseMessage });
-  } catch (error) {
-    logger.log('error', `AI message error: %o`, error);
-    return NextResponse.json(
-      { error: 'Internal Server Error' },
-      { status: 500 },
-    );
-  }
-};

package/src/app/components/Dashboard/AiDrawer/Message.tsx

@@ -1,34 +0,0 @@
-import { Timeline, Box, Text } from '@chakra-ui/react';
-import { PiRobotFill, PiUserFill } from 'react-icons/pi';
-import { AIChatMessage } from '@tradejs/types';
-
-interface MessageProps {
-  message: AIChatMessage;
-  index: number;
-}
-
-export const Message = ({ message, index }: MessageProps) => {
-  return (
-    <Timeline.Item>
-      <Timeline.Connector>
-        <Timeline.Separator />
-        <Timeline.Indicator>
-          {message.from === 'user' ? <PiUserFill /> : <PiRobotFill />}
-        </Timeline.Indicator>
-      </Timeline.Connector>
-
-      <Timeline.Content>
-        <Timeline.Title fontSize="sm" fontWeight="bold">
-          {message.from === 'user' ? 'User' : 'AI'}
-        </Timeline.Title>
-        <Timeline.Description fontSize="xs" color="gray.500">
-          {/* В будущем сюда можно вставить timestamp */}
-          Message #{index + 1}
-        </Timeline.Description>
-        <Box mt={1} py={2} borderRadius="lg" w="fit-content" maxW="full">
-          <Text fontSize="sm">{message.text}</Text>
-        </Box>
-      </Timeline.Content>
-    </Timeline.Item>
-  );
-};