Third revision: web search, MCP sign-in, exams, intelligent UI, clarifying questions
All checks were successful
Verify and publish V2 container / build-and-push (push) Successful in 1m0s
All checks were successful
Verify and publish V2 container / build-and-push (push) Successful in 1m0s
- Built-in Parallel web search (keyless; optional sign-in for higher limits and research) with its own settings page; OAuth sign-in (RFC 9728/8414/7591, PKCE, RFC 8707) for any MCP server, with token refresh and pre-registered client support - Friendly tool steps (icon, name, status; details on click) and ids stripped from results; per-chat tool switches; taller thinking box - Exams within classes: exam tabs, scoped lists, uploads, imports and Generate; exam-only material for generation; class setting for what the groups are called - Assistant can ask clarifying questions in an inline form before generating - OpenUI blocks (charts, questions, flashcards, inputs) in assistant, Explain and share chats - Explain beside the quiz on wide screens, grounded in the cited source pages - Quiz results: percentage ring coloured by score band, rainbow at 100 - Share links: assistant button like the owner's, hidden during quizzes; documents readable in the browser - Live draft and library updates over server-sent events Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
parent
60cf2322f7
commit
c595e0ff2c
54 changed files with 4710 additions and 387 deletions
|
|
@ -10,6 +10,7 @@ import type { DB } from '../db.ts';
|
|||
import { HttpError, notFound, type AppContext } from '../http.ts';
|
||||
import { getSetting, setSetting } from '../settings.ts';
|
||||
import { newId, now, parseJson } from '../util.ts';
|
||||
import { clipOutput, mcpActivity, type ToolActivity } from './activity.ts';
|
||||
import { loadMcpTools, mcpPromptNote, type McpArea } from './mcp.ts';
|
||||
import { cachedInputPrice, cacheWriteRatio, getAdapter, lookupModelDefaults, priceMultiplier } from './providers/index.ts';
|
||||
import {
|
||||
|
|
@ -589,10 +590,10 @@ const MCP_ROUNDS = 4;
|
|||
* rounds; the result is the first reply with no MCP calls (or any call to the caller's own
|
||||
* tools), so callers handle it exactly like a plain runChat result.
|
||||
*/
|
||||
export async function runChatWithMcp(app: AppContext, opts: ChatOptions, area: McpArea, hooks: { onTool?: (label: string) => void } = {}): Promise<ChatResult> {
|
||||
export async function runChatWithMcp(app: AppContext, opts: ChatOptions, area: McpArea, hooks: { onTool?: (activity: ToolActivity) => void; exclude?: string[] } = {}): Promise<ChatResult> {
|
||||
const resolved = resolveModel(app, opts.task, opts.modelId);
|
||||
if (!resolved.model.capabilities.tools) return runChat(app, opts);
|
||||
const mcp = await loadMcpTools(app, area, opts.signal);
|
||||
const mcp = await loadMcpTools(app, area, opts.signal, { exclude: hooks.exclude });
|
||||
if (!mcp.tools.length) return runChat(app, opts);
|
||||
const own = new Set((opts.tools ?? []).map((t) => t.name));
|
||||
const forced = opts.toolChoice === 'required' || typeof opts.toolChoice === 'object';
|
||||
|
|
@ -612,15 +613,24 @@ export async function runChatWithMcp(app: AppContext, opts: ChatOptions, area: M
|
|||
const binding = mcp.tools.find((t) => t.def.name === call.name);
|
||||
let output: string;
|
||||
let isError = false;
|
||||
const activity: ToolActivity = binding ? mcpActivity(binding, call.id, call.input) : { id: call.id, name: call.name, label: call.name, status: 'running', kind: 'mcp' };
|
||||
try {
|
||||
if (!binding) throw new Error(`Unknown tool "${call.name}"`);
|
||||
hooks.onTool?.(`${binding.serverName}: ${binding.toolName}`);
|
||||
output = await binding.call(call.input, opts.signal);
|
||||
hooks.onTool?.({ ...activity });
|
||||
const result = await binding.call(call.input, opts.signal);
|
||||
output = result.text;
|
||||
activity.status = 'done';
|
||||
activity.sources = result.sources;
|
||||
activity.output = clipOutput(result.text);
|
||||
} catch (err) {
|
||||
if (opts.signal?.aborted) throw new AIError('aborted', 'Cancelled.');
|
||||
isError = true;
|
||||
output = JSON.stringify({ error: err instanceof Error ? err.message : 'Tool failed' });
|
||||
const message = err instanceof Error ? err.message : 'Tool failed';
|
||||
output = JSON.stringify({ error: message });
|
||||
activity.status = 'error';
|
||||
activity.summary = message.slice(0, 200);
|
||||
}
|
||||
hooks.onTool?.({ ...activity });
|
||||
if (output.length > 24_000) output = `${output.slice(0, 24_000)}… [truncated]`;
|
||||
results.push({ type: 'tool_result', toolCallId: call.id, name: call.name, output, isError });
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue