expandai 0.0.2 → 0.0.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +42 -5
- package/build/dts/ApiClient.d.ts +128 -194
- package/build/dts/ApiClient.d.ts.map +1 -1
- package/build/dts/Auth/Domain.d.ts +95 -0
- package/build/dts/Auth/Domain.d.ts.map +1 -0
- package/build/dts/Auth/ManualAuthorization.d.ts +107 -0
- package/build/dts/Auth/ManualAuthorization.d.ts.map +1 -0
- package/build/dts/Auth/PendingInit.d.ts +35 -0
- package/build/dts/Auth/PendingInit.d.ts.map +1 -0
- package/build/dts/Auth/Pkce.d.ts +10 -0
- package/build/dts/Auth/Pkce.d.ts.map +1 -0
- package/build/dts/Auth/SetupGrantAuthorization.d.ts +34 -0
- package/build/dts/Auth/SetupGrantAuthorization.d.ts.map +1 -0
- package/build/dts/Authentication.d.ts +10 -9
- package/build/dts/Authentication.d.ts.map +1 -1
- package/build/dts/BrowserOAuth.d.ts +7 -7
- package/build/dts/BrowserOAuth.d.ts.map +1 -1
- package/build/dts/CommandPath.d.ts +2 -0
- package/build/dts/CommandPath.d.ts.map +1 -0
- package/build/dts/Commands/Fetch.d.ts.map +1 -1
- package/build/dts/Commands/Hook.d.ts +5 -5
- package/build/dts/Commands/Init.d.ts +55 -0
- package/build/dts/Commands/Init.d.ts.map +1 -0
- package/build/dts/Commands/Mcp.d.ts +6 -6
- package/build/dts/Commands/Search.d.ts.map +1 -1
- package/build/dts/Commands/Skill.d.ts +4 -4
- package/build/dts/Commands/Status.d.ts +27 -0
- package/build/dts/Commands/Status.d.ts.map +1 -0
- package/build/dts/Commands/Telemetry.d.ts +7 -0
- package/build/dts/Commands/Telemetry.d.ts.map +1 -0
- package/build/dts/Commands/Uninstall.d.ts +4 -4
- package/build/dts/Config.d.ts +108 -17
- package/build/dts/Config.d.ts.map +1 -1
- package/build/dts/Hook/SnapshotNote.d.ts +8 -4
- package/build/dts/Hook/SnapshotNote.d.ts.map +1 -1
- package/build/dts/Init/ClaudeAdapter.d.ts +61 -0
- package/build/dts/Init/ClaudeAdapter.d.ts.map +1 -0
- package/build/dts/Init/ClaudeProfile.d.ts +77 -0
- package/build/dts/Init/ClaudeProfile.d.ts.map +1 -0
- package/build/dts/Init/Domain.d.ts +139 -0
- package/build/dts/Init/Domain.d.ts.map +1 -0
- package/build/dts/Init/HarnessAdapter.d.ts +33 -0
- package/build/dts/Init/HarnessAdapter.d.ts.map +1 -0
- package/build/dts/Init/HarnessDetector.d.ts +19 -0
- package/build/dts/Init/HarnessDetector.d.ts.map +1 -0
- package/build/dts/Init/HarnessRegistry.d.ts +50 -0
- package/build/dts/Init/HarnessRegistry.d.ts.map +1 -0
- package/build/dts/Init/MutationTransaction.d.ts +96 -0
- package/build/dts/Init/MutationTransaction.d.ts.map +1 -0
- package/build/dts/Init/Service.d.ts +72 -0
- package/build/dts/Init/Service.d.ts.map +1 -0
- package/build/dts/Init/StandardAdapters.d.ts +42 -0
- package/build/dts/Init/StandardAdapters.d.ts.map +1 -0
- package/build/dts/Init/Status.d.ts +149 -0
- package/build/dts/Init/Status.d.ts.map +1 -0
- package/build/dts/Install/Claude/Hook.d.ts +57 -29
- package/build/dts/Install/Claude/Hook.d.ts.map +1 -1
- package/build/dts/Install/Claude/Mcp.d.ts +21 -18
- package/build/dts/Install/Claude/Mcp.d.ts.map +1 -1
- package/build/dts/Install/Claude/Skill.d.ts +14 -15
- package/build/dts/Install/Claude/Skill.d.ts.map +1 -1
- package/build/dts/Install/Codex/Mcp.d.ts +14 -8
- package/build/dts/Install/Codex/Mcp.d.ts.map +1 -1
- package/build/dts/Install/Codex/Skill.d.ts +4 -2
- package/build/dts/Install/Codex/Skill.d.ts.map +1 -1
- package/build/dts/Install/Cursor/Mcp.d.ts +13 -13
- package/build/dts/Install/Cursor/Mcp.d.ts.map +1 -1
- package/build/dts/Install/Cursor/Skill.d.ts +4 -2
- package/build/dts/Install/Cursor/Skill.d.ts.map +1 -1
- package/build/dts/Install/Domain.d.ts +35 -5
- package/build/dts/Install/Domain.d.ts.map +1 -1
- package/build/dts/Install/Hook.d.ts +4 -4
- package/build/dts/Install/Hook.d.ts.map +1 -1
- package/build/dts/Install/Mcp.d.ts +5 -5
- package/build/dts/Install/Mcp.d.ts.map +1 -1
- package/build/dts/Install/Opencode/Hook.d.ts +4 -3
- package/build/dts/Install/Opencode/Hook.d.ts.map +1 -1
- package/build/dts/Install/Opencode/Mcp.d.ts +11 -11
- package/build/dts/Install/Opencode/Mcp.d.ts.map +1 -1
- package/build/dts/Install/Opencode/Skill.d.ts +4 -2
- package/build/dts/Install/Opencode/Skill.d.ts.map +1 -1
- package/build/dts/Install/Skill.d.ts +3 -3
- package/build/dts/Install/Uninstall.d.ts +6 -6
- package/build/dts/Install/Uninstall.d.ts.map +1 -1
- package/build/dts/MarkdownAnsi.d.ts +29 -0
- package/build/dts/MarkdownAnsi.d.ts.map +1 -0
- package/build/dts/Mcp/ExpandDocs.d.ts +17 -5
- package/build/dts/Mcp/ExpandDocs.d.ts.map +1 -1
- package/build/dts/Mcp/Server.d.ts +1 -1
- package/build/dts/Mcp/Server.d.ts.map +1 -1
- package/build/dts/Mcp/tools/Citations.d.ts +100 -71
- package/build/dts/Mcp/tools/Citations.d.ts.map +1 -1
- package/build/dts/Mcp/tools/Fetch.d.ts +16 -15
- package/build/dts/Mcp/tools/Fetch.d.ts.map +1 -1
- package/build/dts/SecureFile.d.ts +23 -0
- package/build/dts/SecureFile.d.ts.map +1 -0
- package/build/dts/Snippets.d.ts +11 -12
- package/build/dts/Snippets.d.ts.map +1 -1
- package/build/dts/Telemetry.d.ts +30 -0
- package/build/dts/Telemetry.d.ts.map +1 -0
- package/build/dts/Version.d.ts +2 -0
- package/build/dts/Version.d.ts.map +1 -0
- package/build/dts/Xdg.d.ts +11 -0
- package/build/dts/Xdg.d.ts.map +1 -0
- package/build/esm/ApiClient.js +133 -10
- package/build/esm/ApiClient.js.map +1 -1
- package/build/esm/Auth/Domain.js +56 -0
- package/build/esm/Auth/Domain.js.map +1 -0
- package/build/esm/Auth/ManualAuthorization.js +253 -0
- package/build/esm/Auth/ManualAuthorization.js.map +1 -0
- package/build/esm/Auth/PendingInit.js +267 -0
- package/build/esm/Auth/PendingInit.js.map +1 -0
- package/build/esm/Auth/Pkce.js +23 -0
- package/build/esm/Auth/Pkce.js.map +1 -0
- package/build/esm/Auth/SetupGrantAuthorization.js +91 -0
- package/build/esm/Auth/SetupGrantAuthorization.js.map +1 -0
- package/build/esm/Authentication.js +38 -7
- package/build/esm/Authentication.js.map +1 -1
- package/build/esm/BrowserOAuth.js +7 -10
- package/build/esm/BrowserOAuth.js.map +1 -1
- package/build/esm/CommandPath.js +31 -0
- package/build/esm/CommandPath.js.map +1 -0
- package/build/esm/Commands/Fetch.js +30 -6
- package/build/esm/Commands/Fetch.js.map +1 -1
- package/build/esm/Commands/Init.js +371 -0
- package/build/esm/Commands/Init.js.map +1 -0
- package/build/esm/Commands/Search.js +6 -3
- package/build/esm/Commands/Search.js.map +1 -1
- package/build/esm/Commands/Status.js +186 -0
- package/build/esm/Commands/Status.js.map +1 -0
- package/build/esm/Commands/Telemetry.js +23 -0
- package/build/esm/Commands/Telemetry.js.map +1 -0
- package/build/esm/Config.js +502 -28
- package/build/esm/Config.js.map +1 -1
- package/build/esm/Hook/Claude.js +1 -1
- package/build/esm/Hook/Claude.js.map +1 -1
- package/build/esm/Hook/SnapshotNote.js +54 -7
- package/build/esm/Hook/SnapshotNote.js.map +1 -1
- package/build/esm/Init/ClaudeAdapter.js +137 -0
- package/build/esm/Init/ClaudeAdapter.js.map +1 -0
- package/build/esm/Init/ClaudeProfile.js +344 -0
- package/build/esm/Init/ClaudeProfile.js.map +1 -0
- package/build/esm/Init/Domain.js +118 -0
- package/build/esm/Init/Domain.js.map +1 -0
- package/build/esm/Init/HarnessAdapter.js +21 -0
- package/build/esm/Init/HarnessAdapter.js.map +1 -0
- package/build/esm/Init/HarnessDetector.js +65 -0
- package/build/esm/Init/HarnessDetector.js.map +1 -0
- package/build/esm/Init/HarnessRegistry.js +58 -0
- package/build/esm/Init/HarnessRegistry.js.map +1 -0
- package/build/esm/Init/MutationTransaction.js +494 -0
- package/build/esm/Init/MutationTransaction.js.map +1 -0
- package/build/esm/Init/Service.js +319 -0
- package/build/esm/Init/Service.js.map +1 -0
- package/build/esm/Init/StandardAdapters.js +116 -0
- package/build/esm/Init/StandardAdapters.js.map +1 -0
- package/build/esm/Init/Status.js +215 -0
- package/build/esm/Init/Status.js.map +1 -0
- package/build/esm/Install/Claude/Hook.js +52 -64
- package/build/esm/Install/Claude/Hook.js.map +1 -1
- package/build/esm/Install/Claude/Mcp.js +56 -26
- package/build/esm/Install/Claude/Mcp.js.map +1 -1
- package/build/esm/Install/Claude/Skill.js +49 -27
- package/build/esm/Install/Claude/Skill.js.map +1 -1
- package/build/esm/Install/Codex/Mcp.js +9 -4
- package/build/esm/Install/Codex/Mcp.js.map +1 -1
- package/build/esm/Install/Codex/Skill.js +4 -1
- package/build/esm/Install/Codex/Skill.js.map +1 -1
- package/build/esm/Install/Cursor/Mcp.js +7 -4
- package/build/esm/Install/Cursor/Mcp.js.map +1 -1
- package/build/esm/Install/Cursor/Skill.js +4 -1
- package/build/esm/Install/Cursor/Skill.js.map +1 -1
- package/build/esm/Install/Domain.js +60 -3
- package/build/esm/Install/Domain.js.map +1 -1
- package/build/esm/Install/Hook.js.map +1 -1
- package/build/esm/Install/Mcp.js +1 -1
- package/build/esm/Install/Mcp.js.map +1 -1
- package/build/esm/Install/Opencode/Hook.js +1 -1
- package/build/esm/Install/Opencode/Hook.js.map +1 -1
- package/build/esm/Install/Opencode/Mcp.js +6 -3
- package/build/esm/Install/Opencode/Mcp.js.map +1 -1
- package/build/esm/Install/Opencode/Skill.js +4 -1
- package/build/esm/Install/Opencode/Skill.js.map +1 -1
- package/build/esm/Install/Opencode/expandai-webfetch.js +27 -9
- package/build/esm/Install/Skill.js.map +1 -1
- package/build/esm/Install/Uninstall.js +2 -2
- package/build/esm/Install/Uninstall.js.map +1 -1
- package/build/esm/MarkdownAnsi.js +142 -0
- package/build/esm/MarkdownAnsi.js.map +1 -0
- package/build/esm/Mcp/ExpandDocs.js +44 -52
- package/build/esm/Mcp/ExpandDocs.js.map +1 -1
- package/build/esm/Mcp/RequestHeaders.js.map +1 -1
- package/build/esm/Mcp/Server.js +2 -1
- package/build/esm/Mcp/Server.js.map +1 -1
- package/build/esm/Mcp/tools/Citations.js +109 -8
- package/build/esm/Mcp/tools/Citations.js.map +1 -1
- package/build/esm/Mcp/tools/Fetch.js +36 -12
- package/build/esm/Mcp/tools/Fetch.js.map +1 -1
- package/build/esm/SecureFile.js +36 -0
- package/build/esm/SecureFile.js.map +1 -0
- package/build/esm/Snippets.js +12 -1
- package/build/esm/Snippets.js.map +1 -1
- package/build/esm/Telemetry.js +157 -0
- package/build/esm/Telemetry.js.map +1 -0
- package/build/esm/Version.js +4 -0
- package/build/esm/Version.js.map +1 -0
- package/build/esm/Xdg.js +15 -0
- package/build/esm/Xdg.js.map +1 -0
- package/build/esm/main.js +122 -14
- package/build/esm/main.js.map +1 -1
- package/build/skills/expandai/SKILL.md +37 -8
- package/package.json +4 -4
- package/src/ApiClient.ts +206 -13
- package/src/Auth/Domain.ts +63 -0
- package/src/Auth/ManualAuthorization.ts +296 -0
- package/src/Auth/PendingInit.ts +338 -0
- package/src/Auth/Pkce.ts +26 -0
- package/src/Auth/SetupGrantAuthorization.ts +116 -0
- package/src/Authentication.ts +49 -11
- package/src/BrowserOAuth.ts +10 -12
- package/src/CommandPath.ts +30 -0
- package/src/Commands/Fetch.ts +42 -11
- package/src/Commands/Init.ts +489 -0
- package/src/Commands/Search.ts +8 -3
- package/src/Commands/Status.ts +228 -0
- package/src/Commands/Telemetry.ts +42 -0
- package/src/Config.ts +695 -50
- package/src/Hook/Claude.ts +1 -1
- package/src/Hook/SnapshotNote.ts +55 -7
- package/src/Init/ClaudeAdapter.ts +191 -0
- package/src/Init/ClaudeProfile.ts +453 -0
- package/src/Init/Domain.ts +153 -0
- package/src/Init/HarnessAdapter.ts +35 -0
- package/src/Init/HarnessDetector.ts +77 -0
- package/src/Init/HarnessRegistry.ts +87 -0
- package/src/Init/MutationTransaction.ts +747 -0
- package/src/Init/Service.ts +385 -0
- package/src/Init/StandardAdapters.ts +141 -0
- package/src/Init/Status.ts +253 -0
- package/src/Install/Claude/Hook.ts +81 -91
- package/src/Install/Claude/Mcp.ts +80 -33
- package/src/Install/Claude/Skill.ts +70 -37
- package/src/Install/Codex/Mcp.ts +14 -9
- package/src/Install/Codex/Skill.ts +9 -5
- package/src/Install/Cursor/Mcp.ts +12 -9
- package/src/Install/Cursor/Skill.ts +9 -5
- package/src/Install/Domain.ts +77 -4
- package/src/Install/Hook.ts +3 -3
- package/src/Install/Mcp.ts +6 -6
- package/src/Install/Opencode/Hook.ts +5 -5
- package/src/Install/Opencode/Mcp.ts +11 -8
- package/src/Install/Opencode/Skill.ts +9 -5
- package/src/Install/Opencode/expandai-webfetch.js +27 -9
- package/src/Install/Skill.ts +3 -3
- package/src/Install/Uninstall.ts +3 -3
- package/src/MarkdownAnsi.ts +162 -0
- package/src/Mcp/ExpandDocs.ts +46 -55
- package/src/Mcp/Server.ts +2 -1
- package/src/Mcp/tools/Citations.ts +117 -8
- package/src/Mcp/tools/Fetch.ts +40 -14
- package/src/SecureFile.ts +70 -0
- package/src/Snippets.ts +19 -12
- package/src/Telemetry.ts +186 -0
- package/src/Version.ts +3 -0
- package/src/Xdg.ts +18 -0
- package/src/main.ts +171 -12
- package/build/dts/DeviceAuth.d.ts +0 -87
- package/build/dts/DeviceAuth.d.ts.map +0 -1
- package/build/esm/DeviceAuth.js +0 -127
- package/build/esm/DeviceAuth.js.map +0 -1
- package/src/DeviceAuth.ts +0 -193
|
@@ -0,0 +1,142 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Zero-dependency ANSI syntax highlighting for markdown printed to an
|
|
3
|
+
* interactive terminal.
|
|
4
|
+
*
|
|
5
|
+
* This is a highlighter, not a renderer: the input text is preserved
|
|
6
|
+
* byte-for-byte and only wrapped in ANSI escape sequences, so copying
|
|
7
|
+
* from the terminal or stripping the escapes yields the exact document
|
|
8
|
+
* the API returned. Piped output (non-TTY) must stay unstyled — gate
|
|
9
|
+
* calls with `shouldColorizeMarkdown`.
|
|
10
|
+
*/
|
|
11
|
+
// Styling is intentionally limited to 4-bit SGR (bold/dim/underline + the 8
|
|
12
|
+
// base colors): it renders on every color-capable terminal and inherits the
|
|
13
|
+
// user's palette. Do NOT introduce 256-color (38;5;n) or truecolor (38;2;r;g;b)
|
|
14
|
+
// sequences without adding capability detection first — truecolor needs
|
|
15
|
+
// COLORTERM=truecolor|24bit (TERM alone is not enough: e.g. ghostty sets
|
|
16
|
+
// TERM=xterm-ghostty), and 256-color needs TERM=*-256color; emitting either
|
|
17
|
+
// tier on a lesser terminal produces garbage.
|
|
18
|
+
const RESET = '\x1b[0m';
|
|
19
|
+
const BOLD = '\x1b[1m';
|
|
20
|
+
const DIM = '\x1b[2m';
|
|
21
|
+
const CYAN = '\x1b[36m';
|
|
22
|
+
const YELLOW = '\x1b[33m';
|
|
23
|
+
const GREEN = '\x1b[32m';
|
|
24
|
+
const BLUE_UNDERLINE = '\x1b[34;4m';
|
|
25
|
+
const HEADING = '\x1b[1;36m';
|
|
26
|
+
/**
|
|
27
|
+
* Standard CLI color negotiation: color only on an interactive terminal,
|
|
28
|
+
* `NO_COLOR` (https://no-color.org) and `TERM=dumb` opt out, a non-zero
|
|
29
|
+
* `FORCE_COLOR` opts in regardless of the terminal.
|
|
30
|
+
*/
|
|
31
|
+
export function shouldColorizeMarkdown(environment = { isTty: process.stdout.isTTY === true, env: process.env }) {
|
|
32
|
+
const { env, isTty } = environment;
|
|
33
|
+
const forceColor = env.FORCE_COLOR?.trim();
|
|
34
|
+
if (forceColor !== undefined && forceColor !== '')
|
|
35
|
+
return forceColor !== '0';
|
|
36
|
+
if (env.NO_COLOR !== undefined && env.NO_COLOR !== '')
|
|
37
|
+
return false;
|
|
38
|
+
if (env.TERM === 'dumb')
|
|
39
|
+
return false;
|
|
40
|
+
return isTty;
|
|
41
|
+
}
|
|
42
|
+
function styleLine(style, line) {
|
|
43
|
+
return line === '' ? line : `${style}${line}${RESET}`;
|
|
44
|
+
}
|
|
45
|
+
// Inline code spans are styled first and must be shielded from the link,
|
|
46
|
+
// bold, and table-pipe passes; ANSI escapes never contain \x00, so a
|
|
47
|
+
// NUL-delimited stash is collision-free.
|
|
48
|
+
function styleInline(line, options) {
|
|
49
|
+
const stash = [];
|
|
50
|
+
let out = line.replace(/`[^`\n]+`/g, (code) => {
|
|
51
|
+
stash.push(`${CYAN}${code}${RESET}`);
|
|
52
|
+
return `\x00${stash.length - 1}\x00`;
|
|
53
|
+
});
|
|
54
|
+
if (options?.dimPipes) {
|
|
55
|
+
// While code spans are stashed, so pipes inside `...` keep their
|
|
56
|
+
// code styling instead of being re-wrapped in DIM.
|
|
57
|
+
out = out.replaceAll('|', `${DIM}|${RESET}`);
|
|
58
|
+
}
|
|
59
|
+
out = out.replace(/\[([^\]\n]*)\]\(([^)\n]*)\)/g, (_match, text, target) => `${DIM}[${RESET}${BLUE_UNDERLINE}${text}${RESET}${DIM}](${target})${RESET}`);
|
|
60
|
+
out = out.replace(/\*\*([^*\n]+)\*\*/g, (_match, text) => `${BOLD}**${text}**${RESET}`);
|
|
61
|
+
return out.replace(/\x00(\d+)\x00/g, (_match, index) => stash[Number(index)] ?? '');
|
|
62
|
+
}
|
|
63
|
+
const FENCE_PATTERN = /^(\s*)(`{3,}|~{3,})(.*)$/;
|
|
64
|
+
const HEADING_PATTERN = /^#{1,6}\s/;
|
|
65
|
+
const HR_PATTERN = /^ {0,3}(-{3,}|\*{3,}|_{3,})\s*$/;
|
|
66
|
+
const LIST_MARKER_PATTERN = /^(\s*)([-*+]|\d{1,9}[.)])(\s+)(.*)$/;
|
|
67
|
+
const FRONTMATTER_KEY_PATTERN = /^(\s*)([\w.-]+):(.*)$/;
|
|
68
|
+
/**
|
|
69
|
+
* Wrap a markdown document in ANSI styles for terminal display. Line-based:
|
|
70
|
+
* headings, fences, front matter, blockquotes, list markers, and table pipes
|
|
71
|
+
* get block styling; plain text lines get inline code / link / bold styling.
|
|
72
|
+
*/
|
|
73
|
+
export function highlightMarkdownAnsi(markdown) {
|
|
74
|
+
const lines = markdown.split('\n');
|
|
75
|
+
const out = [];
|
|
76
|
+
let inFrontmatter = false;
|
|
77
|
+
let fenceClose;
|
|
78
|
+
lines.forEach((line, index) => {
|
|
79
|
+
if (fenceClose) {
|
|
80
|
+
if (FENCE_PATTERN.test(line) && fenceClose.test(line)) {
|
|
81
|
+
fenceClose = undefined;
|
|
82
|
+
out.push(styleLine(DIM, line));
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
out.push(styleLine(YELLOW, line));
|
|
86
|
+
}
|
|
87
|
+
return;
|
|
88
|
+
}
|
|
89
|
+
if (index === 0 && line === '---') {
|
|
90
|
+
inFrontmatter = true;
|
|
91
|
+
out.push(styleLine(DIM, line));
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
if (inFrontmatter) {
|
|
95
|
+
if (line === '---') {
|
|
96
|
+
inFrontmatter = false;
|
|
97
|
+
out.push(styleLine(DIM, line));
|
|
98
|
+
return;
|
|
99
|
+
}
|
|
100
|
+
const keyMatch = line.match(FRONTMATTER_KEY_PATTERN);
|
|
101
|
+
out.push(keyMatch ? `${keyMatch[1]}${CYAN}${keyMatch[2]}${RESET}${DIM}:${keyMatch[3]}${RESET}` : styleLine(DIM, line));
|
|
102
|
+
return;
|
|
103
|
+
}
|
|
104
|
+
const fenceMatch = line.match(FENCE_PATTERN);
|
|
105
|
+
if (fenceMatch) {
|
|
106
|
+
const marker = fenceMatch[2] ?? '```';
|
|
107
|
+
fenceClose = new RegExp(`^\\s*${marker[0] === '`' ? '`' : '~'}{${marker.length},}\\s*$`);
|
|
108
|
+
out.push(styleLine(DIM, line));
|
|
109
|
+
return;
|
|
110
|
+
}
|
|
111
|
+
if (HEADING_PATTERN.test(line)) {
|
|
112
|
+
out.push(styleLine(HEADING, line));
|
|
113
|
+
return;
|
|
114
|
+
}
|
|
115
|
+
if (HR_PATTERN.test(line)) {
|
|
116
|
+
out.push(styleLine(DIM, line));
|
|
117
|
+
return;
|
|
118
|
+
}
|
|
119
|
+
if (line.trimStart().startsWith('>')) {
|
|
120
|
+
out.push(styleLine(GREEN, line));
|
|
121
|
+
return;
|
|
122
|
+
}
|
|
123
|
+
if (line.trimStart().startsWith('|')) {
|
|
124
|
+
out.push(styleInline(line, { dimPipes: true }));
|
|
125
|
+
return;
|
|
126
|
+
}
|
|
127
|
+
const listMatch = line.match(LIST_MARKER_PATTERN);
|
|
128
|
+
if (listMatch) {
|
|
129
|
+
out.push(`${listMatch[1]}${YELLOW}${listMatch[2]}${RESET}${listMatch[3]}${styleInline(listMatch[4] ?? '')}`);
|
|
130
|
+
return;
|
|
131
|
+
}
|
|
132
|
+
out.push(styleInline(line));
|
|
133
|
+
});
|
|
134
|
+
return out.join('\n');
|
|
135
|
+
}
|
|
136
|
+
/** Strip the escape sequences this module emits; used to verify lossless styling. */
|
|
137
|
+
export function stripAnsi(text) {
|
|
138
|
+
// Only SGR sequences are emitted by this module.
|
|
139
|
+
// biome-ignore lint/suspicious/noControlCharactersInRegex: ANSI escapes are control characters by definition.
|
|
140
|
+
return text.replace(/\x1b\[[0-9;]*m/g, '');
|
|
141
|
+
}
|
|
142
|
+
//# sourceMappingURL=MarkdownAnsi.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"MarkdownAnsi.js","sourceRoot":"","sources":["../../src/MarkdownAnsi.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,64 +1,56 @@
|
|
|
1
1
|
import { McpServer } from '@effect/ai';
|
|
2
2
|
import { Effect, Layer, String } from 'effect';
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|\`\`\`
|
|
44
|
-
|`);
|
|
3
|
+
import { ConfigManager } from '../Config.js';
|
|
4
|
+
/**
|
|
5
|
+
* These resources are read by an agent that will follow their links, so every
|
|
6
|
+
* URL must resolve to the stack this CLI is configured against — production by
|
|
7
|
+
* default, or whatever `EXPAND_APP_URL` names for local and self-hosted setups.
|
|
8
|
+
*/
|
|
9
|
+
export function makeAgentSetupPrompt(appUrl) {
|
|
10
|
+
return `Read ${new URL('/start.md', appUrl).toString()} and set up Expand. Fetch it as raw text with curl — a summarizing web-fetch tool drops the exact commands.`;
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Points at the hosted guide instead of restating it. A local copy of the setup
|
|
14
|
+
* procedure drifts silently the moment the commands change, and this resource
|
|
15
|
+
* is read by an agent that can fetch the current one itself.
|
|
16
|
+
*/
|
|
17
|
+
export function makeStartGuideMarkdown(appUrl) {
|
|
18
|
+
return String.stripMargin(`
|
|
19
|
+
|# Expand Start Guide
|
|
20
|
+
|
|
|
21
|
+
|The setup procedure is served as a single document. Fetch it and follow it:
|
|
22
|
+
|
|
|
23
|
+
|${new URL('/start.md', appUrl).toString()}
|
|
24
|
+
|
|
|
25
|
+
|## Agent Setup Prompt
|
|
26
|
+
|
|
|
27
|
+
|${makeAgentSetupPrompt(appUrl)}
|
|
28
|
+
|`);
|
|
29
|
+
}
|
|
30
|
+
export function makeAboutMarkdown(appUrl) {
|
|
31
|
+
return String.stripMargin(`
|
|
32
|
+
|# expand.ai
|
|
33
|
+
|
|
|
34
|
+
|- Website: ${appUrl}
|
|
35
|
+
|- Quickstart: ${new URL('/docs', appUrl).toString()}
|
|
36
|
+
|- Dashboard: ${new URL('/dashboard', appUrl).toString()}
|
|
37
|
+
|`);
|
|
38
|
+
}
|
|
39
|
+
const appUrl = Effect.gen(function* () {
|
|
40
|
+
const configManager = yield* ConfigManager;
|
|
41
|
+
return yield* configManager.getAppUrl();
|
|
42
|
+
});
|
|
45
43
|
export const ExpandDocs = McpServer.resource({
|
|
46
44
|
uri: 'expand://about',
|
|
47
45
|
name: 'About expand.ai',
|
|
48
46
|
description: 'Key links for the expand.ai platform',
|
|
49
|
-
content: Effect.
|
|
50
|
-
|# expand.ai
|
|
51
|
-
|
|
|
52
|
-
|- Website: https://expand.ai
|
|
53
|
-
|- Quickstart: https://expand.ai/docs
|
|
54
|
-
|- Dashboard: https://expand.ai/dashboard
|
|
55
|
-
|`)),
|
|
47
|
+
content: Effect.map(appUrl, makeAboutMarkdown),
|
|
56
48
|
});
|
|
57
49
|
export const ExpandStartDocs = McpServer.resource({
|
|
58
50
|
uri: 'expand://start',
|
|
59
51
|
name: 'Expand Start Guide',
|
|
60
|
-
description: '
|
|
61
|
-
content: Effect.
|
|
52
|
+
description: 'Where to find the Expand agent setup guide, and the prompt that runs it',
|
|
53
|
+
content: Effect.map(appUrl, makeStartGuideMarkdown),
|
|
62
54
|
});
|
|
63
|
-
export const ExpandDocsLayer = Layer.mergeAll(ExpandDocs, ExpandStartDocs);
|
|
55
|
+
export const ExpandDocsLayer = Layer.mergeAll(ExpandDocs, ExpandStartDocs).pipe(Layer.provide(ConfigManager.Default));
|
|
64
56
|
//# sourceMappingURL=ExpandDocs.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExpandDocs.js","sourceRoot":"","sources":["../../../src/Mcp/ExpandDocs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"ExpandDocs.js","sourceRoot":"","sources":["../../../src/Mcp/ExpandDocs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAA;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAE5C;;;;GAIG;AACH,MAAM,UAAU,oBAAoB,CAAC,MAAc;IAClD,OAAO,QAAQ,IAAI,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,QAAQ,EAAE,6GAA6G,CAAA;AACpK,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAC,MAAc;IACpD,OAAO,MAAM,CAAC,WAAW,CAAC;;;;;KAKtB,IAAI,GAAG,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,QAAQ,EAAE;;;;KAIvC,oBAAoB,CAAC,MAAM,CAAC;IAC7B,CAAC,CAAA;AACL,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAAc;IAC/C,OAAO,MAAM,CAAC,WAAW,CAAC;;;gBAGX,MAAM;mBACH,IAAI,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,QAAQ,EAAE;kBACpC,IAAI,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC,QAAQ,EAAE;IACtD,CAAC,CAAA;AACL,CAAC;AAED,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClC,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,aAAa,CAAA;IAC1C,OAAO,KAAK,CAAC,CAAC,aAAa,CAAC,SAAS,EAAE,CAAA;AACxC,CAAC,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,SAAS,CAAC,QAAQ,CAAC;IAC5C,GAAG,EAAE,gBAAgB;IACrB,IAAI,EAAE,iBAAiB;IACvB,WAAW,EAAE,sCAAsC;IACnD,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,iBAAiB,CAAC;CAC9C,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,SAAS,CAAC,QAAQ,CAAC;IACjD,GAAG,EAAE,gBAAgB;IACrB,IAAI,EAAE,oBAAoB;IAC1B,WAAW,EAAE,yEAAyE;IACtF,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC;CACnD,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,CAAC,QAAQ,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestHeaders.js","sourceRoot":"","sources":["../../../src/Mcp/RequestHeaders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAEvC;;;;;;;GAOG;AACH,MAAM,OAAO,qBAAsB,SAAQ,OAAO,CAAC,GAAG,CAAC,wDAAwD,CAAC,EAG7G;IACF,MAAM,CAAU,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"RequestHeaders.js","sourceRoot":"","sources":["../../../src/Mcp/RequestHeaders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAEvC;;;;;;;GAOG;AACH,MAAM,OAAO,qBAAsB,SAAQ,OAAO,CAAC,GAAG,CAAC,wDAAwD,CAAC,EAG7G;IACF,MAAM,CAAU,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;CACjD"}
|
package/build/esm/Mcp/Server.js
CHANGED
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { Layer } from 'effect';
|
|
2
2
|
import { SERVER_KEY } from '../Install/Domain.js';
|
|
3
|
+
import { CLI_VERSION } from '../Version.js';
|
|
3
4
|
import { ExpandDocsLayer } from './ExpandDocs.js';
|
|
4
5
|
import { ExpandToolKit } from './Toolkit.js';
|
|
5
6
|
export { CurrentRequestHeaders } from './RequestHeaders.js';
|
|
6
7
|
export const ServerInfo = {
|
|
7
8
|
name: SERVER_KEY,
|
|
8
|
-
version:
|
|
9
|
+
version: CLI_VERSION,
|
|
9
10
|
};
|
|
10
11
|
export const makeServerLayer = (options = {}) => options.includeDocs ? Layer.mergeAll(ExpandToolKit, ExpandDocsLayer) : ExpandToolKit;
|
|
11
12
|
//# sourceMappingURL=Server.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../../../src/Mcp/Server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAE3D,MAAM,CAAC,MAAM,UAAU,GAAG;IACzB,IAAI,EAAE,UAAU;IAChB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"Server.js","sourceRoot":"","sources":["../../../src/Mcp/Server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAA;AAC9B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAA;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAA;AAE3D,MAAM,CAAC,MAAM,UAAU,GAAG;IACzB,IAAI,EAAE,UAAU;IAChB,OAAO,EAAE,WAAW;CACX,CAAA;AAEV,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,OAAO,GAAuC,EAAE,EAAE,EAAE,CACnF,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,aAAa,CAAA"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
import * as Generated from '@expandai/sdk/Generated';
|
|
6
6
|
import { citationUrl, playgroundBase, resolvePlaygroundHost } from '@expandai/sdk/Playground';
|
|
7
7
|
import { Schema as S } from 'effect';
|
|
8
|
+
export const FetchInvocationPath = S.Literal('cli-recovery', 'mcp-fetch-search');
|
|
8
9
|
export class CitedSnippet extends S.Class('CitedSnippet')({
|
|
9
10
|
type: S.optionalWith(S.Literal('text'), { nullable: true, default: () => 'text' }),
|
|
10
11
|
source: S.Literal('markdown', 'appendix', 'statejson'),
|
|
@@ -17,6 +18,85 @@ export class CitedSnippet extends S.Class('CitedSnippet')({
|
|
|
17
18
|
}),
|
|
18
19
|
}) {
|
|
19
20
|
}
|
|
21
|
+
/**
|
|
22
|
+
* Carried in the tool result itself, not only in `SKILL.md`. A harness may not load
|
|
23
|
+
* skills at all, and the hook's snapshot note never reaches this path — so without
|
|
24
|
+
* this the model receives perfect `citationUrl`s and no instruction to use them, and
|
|
25
|
+
* answers with no citation. Observed on OpenCode before this was added.
|
|
26
|
+
*/
|
|
27
|
+
export const CITATION_INSTRUCTIONS = 'Cite every claim you take from this result. Append the ready-made `citationBlock` from this ' +
|
|
28
|
+
'result to the end of your answer. Delete every entry whose marker you did not actually place ' +
|
|
29
|
+
'in your text, and renumber what remains from [1] — an entry with no matching marker is not a ' +
|
|
30
|
+
'citation, it is clutter. Do not ' +
|
|
31
|
+
'retype the URLs, do not substitute the page you fetched, and do not build a link yourself — ' +
|
|
32
|
+
"the citation points at expand.ai's stored capture, not at the original site. Never invent an " +
|
|
33
|
+
'evidence id and never reuse one from different text. A link without `?id=` is not a citation.';
|
|
34
|
+
const CitationInstructionsField = S.optionalWith(S.String, { default: () => CITATION_INSTRUCTIONS }).annotations({
|
|
35
|
+
description: 'How to cite this result back to the user. Follow it exactly.',
|
|
36
|
+
});
|
|
37
|
+
const CitationBlockField = S.optionalWith(S.String, { default: () => '' }).annotations({
|
|
38
|
+
description: 'Ready-to-append citation block, one entry per citable snippet. Copy it to the end of your ' +
|
|
39
|
+
'answer, keeping only the entries whose markers you placed in your text and renumbering ' +
|
|
40
|
+
'from [1]. You may also correct the page title.',
|
|
41
|
+
});
|
|
42
|
+
/**
|
|
43
|
+
* Prebuilds the citation markdown instead of asking the model to assemble it.
|
|
44
|
+
* Selecting `citationUrl` out of a JSON result and pasting it correctly is the step
|
|
45
|
+
* weaker models get wrong — observed repeatedly on OpenCode, which substituted the
|
|
46
|
+
* fetched page URL for the capture link. Copying one block has no such failure mode.
|
|
47
|
+
*/
|
|
48
|
+
const MAX_CITATION_MARKERS = 3;
|
|
49
|
+
const EVIDENCE_MARKER = /\{(\d{1,6})\}/gu;
|
|
50
|
+
/**
|
|
51
|
+
* Citation URLs for a plain fetch with no search. The markdown still stamps evidence
|
|
52
|
+
* ids, so a citation is always possible — without this a `fetch` called without a
|
|
53
|
+
* query produced an empty block and the model answered uncited.
|
|
54
|
+
*/
|
|
55
|
+
function markdownCitationUrls(markdown, snapshotId, host) {
|
|
56
|
+
const urls = [];
|
|
57
|
+
for (const match of markdown.matchAll(EVIDENCE_MARKER)) {
|
|
58
|
+
const id = Number(match[1]);
|
|
59
|
+
if (!Number.isFinite(id))
|
|
60
|
+
continue;
|
|
61
|
+
const url = citationUrl(snapshotId, { evidenceId: id }, host);
|
|
62
|
+
if (!urls.includes(url))
|
|
63
|
+
urls.push(url);
|
|
64
|
+
if (urls.length >= MAX_CITATION_MARKERS)
|
|
65
|
+
break;
|
|
66
|
+
}
|
|
67
|
+
return urls;
|
|
68
|
+
}
|
|
69
|
+
/**
|
|
70
|
+
* `statejson` snippets are extracted page state — arrays of routes, config blobs — not
|
|
71
|
+
* prose anyone can quote. Offering one as a citable source produced a `Sources` entry
|
|
72
|
+
* pointing at a list of URLs, so only quotable text earns a citation.
|
|
73
|
+
*/
|
|
74
|
+
function isQuotable(snippet) {
|
|
75
|
+
return snippet.source !== 'statejson';
|
|
76
|
+
}
|
|
77
|
+
function citationBlock(sourceLabel, snippets, fallback = []) {
|
|
78
|
+
const urls = [];
|
|
79
|
+
for (const snippet of snippets) {
|
|
80
|
+
if (!isQuotable(snippet))
|
|
81
|
+
continue;
|
|
82
|
+
if (snippet.citationUrl.length > 0 && !urls.includes(snippet.citationUrl))
|
|
83
|
+
urls.push(snippet.citationUrl);
|
|
84
|
+
}
|
|
85
|
+
if (urls.length === 0)
|
|
86
|
+
urls.push(...fallback);
|
|
87
|
+
if (urls.length === 0)
|
|
88
|
+
return '';
|
|
89
|
+
// One linked source line per marker.
|
|
90
|
+
// Grouping all the sources first and all the links after loses every link when a
|
|
91
|
+
// model copies only the opening lines — observed on OpenCode.
|
|
92
|
+
const lines = ['**Sources**'];
|
|
93
|
+
urls.slice(0, MAX_CITATION_MARKERS).forEach((url, index) => {
|
|
94
|
+
if (index > 0)
|
|
95
|
+
lines.push('');
|
|
96
|
+
lines.push(`[${index + 1}] [${sourceLabel}](${url})`);
|
|
97
|
+
});
|
|
98
|
+
return lines.join('\n');
|
|
99
|
+
}
|
|
20
100
|
export class CitedSearchResult extends S.Class('CitedSearchResult')({
|
|
21
101
|
query: S.String,
|
|
22
102
|
snippets: S.Array(CitedSnippet),
|
|
@@ -24,17 +104,22 @@ export class CitedSearchResult extends S.Class('CitedSearchResult')({
|
|
|
24
104
|
}) {
|
|
25
105
|
}
|
|
26
106
|
export class CitedObjectModeResult extends S.Class('CitedObjectModeResult')({
|
|
107
|
+
invocationPath: S.Literal('mcp-fetch-search'),
|
|
108
|
+
citationInstructions: CitationInstructionsField,
|
|
109
|
+
citationBlock: CitationBlockField,
|
|
27
110
|
meta: Generated.FetchObjectModeMeta,
|
|
28
111
|
markdown: S.String,
|
|
29
112
|
json: S.Array(Generated.FetchObjectModeEvidence),
|
|
30
113
|
data: S.optionalWith(S.Struct({
|
|
31
114
|
assets: S.optionalWith(S.Array(Generated.FetchAssetReference), { nullable: true }),
|
|
32
|
-
captureTelemetry: S.optionalWith(Generated.CaptureTelemetryInfo, { nullable: true }),
|
|
33
115
|
search: S.optionalWith(CitedSearchResult, { nullable: true }),
|
|
34
116
|
}), { nullable: true }),
|
|
35
117
|
}) {
|
|
36
118
|
}
|
|
37
119
|
export class CitedSnapshotSearchResult extends S.Class('CitedSnapshotSearchResult')({
|
|
120
|
+
invocationPath: FetchInvocationPath,
|
|
121
|
+
citationInstructions: CitationInstructionsField,
|
|
122
|
+
citationBlock: CitationBlockField,
|
|
38
123
|
snapshotId: S.String.pipe(S.minLength(1)),
|
|
39
124
|
response: Generated.ResponseInfo,
|
|
40
125
|
search: CitedSearchResult,
|
|
@@ -50,7 +135,7 @@ function toCitedSnippet(snapshotId, host, snippet) {
|
|
|
50
135
|
json: snippet.json,
|
|
51
136
|
score: snippet.score,
|
|
52
137
|
location: snippet.location,
|
|
53
|
-
citationUrl: citationUrl(snapshotId, snippet.
|
|
138
|
+
citationUrl: citationUrl(snapshotId, snippet.location, host),
|
|
54
139
|
});
|
|
55
140
|
}
|
|
56
141
|
function toCitedSearch(snapshotId, host, search) {
|
|
@@ -66,25 +151,41 @@ export function enrichObjectModeResult(result, fallbackHost) {
|
|
|
66
151
|
// it is somehow not a parseable URL.
|
|
67
152
|
const host = resolvePlaygroundHost(result.meta.playground, fallbackHost);
|
|
68
153
|
const data = result.data;
|
|
154
|
+
const citedSearch = data?.search == null ? undefined : toCitedSearch(result.meta.snapshotId, host, data.search);
|
|
155
|
+
const block = citationBlock(result.meta.url, citedSearch?.snippets ?? [], markdownCitationUrls(result.markdown, result.meta.snapshotId, host));
|
|
69
156
|
return new CitedObjectModeResult({
|
|
157
|
+
invocationPath: 'mcp-fetch-search',
|
|
158
|
+
citationInstructions: CITATION_INSTRUCTIONS,
|
|
159
|
+
citationBlock: block,
|
|
70
160
|
meta: result.meta,
|
|
71
|
-
|
|
161
|
+
// The block is appended to the content, not just offered as a sibling field.
|
|
162
|
+
// A model summarising `markdown` carries an inline footer through; a separate
|
|
163
|
+
// JSON field it has to notice and copy gets dropped — repeatedly, on OpenCode.
|
|
164
|
+
markdown: block.length === 0 ? result.markdown : `${result.markdown.trimEnd()}\n\n---\n\n${block}\n`,
|
|
72
165
|
json: result.json,
|
|
73
166
|
data: data == null
|
|
74
167
|
? data
|
|
75
168
|
: {
|
|
76
169
|
assets: data.assets,
|
|
77
|
-
|
|
78
|
-
search: data.search == null ? data.search : toCitedSearch(result.meta.snapshotId, host, data.search),
|
|
170
|
+
search: citedSearch,
|
|
79
171
|
},
|
|
80
172
|
});
|
|
81
173
|
}
|
|
82
|
-
/** Add `citationUrl` to each snippet of a snapshot-search result
|
|
83
|
-
export function enrichSnapshotSearchResult(result,
|
|
174
|
+
/** Add `citationUrl` to each snippet of a snapshot-search result. */
|
|
175
|
+
export function enrichSnapshotSearchResult(result, fallbackHost, invocationPath = 'mcp-fetch-search') {
|
|
176
|
+
// `playground` is server-resolved (staging-safe), exactly like `meta.playground`
|
|
177
|
+
// above; fall back to the configured host only if it is somehow not a parseable
|
|
178
|
+
// URL. The playground is a separate deployment from the API, so the server is
|
|
179
|
+
// the only component that can say where its snapshots are publicly served.
|
|
180
|
+
const host = resolvePlaygroundHost(result.playground, fallbackHost);
|
|
181
|
+
const citedSearch = toCitedSearch(result.snapshotId, host, result.search);
|
|
84
182
|
return new CitedSnapshotSearchResult({
|
|
183
|
+
invocationPath,
|
|
184
|
+
citationInstructions: CITATION_INSTRUCTIONS,
|
|
185
|
+
citationBlock: citationBlock(result.response.url, citedSearch.snippets),
|
|
85
186
|
snapshotId: result.snapshotId,
|
|
86
187
|
response: result.response,
|
|
87
|
-
search:
|
|
188
|
+
search: citedSearch,
|
|
88
189
|
durationMs: result.durationMs,
|
|
89
190
|
playground: playgroundBase(result.snapshotId, host),
|
|
90
191
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Citations.js","sourceRoot":"","sources":["../../../../src/Mcp/tools/Citations.ts"],"names":[],"mappings":"AAAA,iGAAiG;AACjG,iGAAiG;AACjG,6FAA6F;AAC7F,6CAA6C;AAG7C,OAAO,KAAK,SAAS,MAAM,yBAAyB,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAA;AAC7F,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAA;AAEpC,MAAM,OAAO,YAAa,SAAQ,CAAC,CAAC,KAAK,CAAe,cAAc,CAAC,CAAC;IACvE,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,MAAe,EAAE,CAAC;IAC3F,MAAM,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,UAAU,EAAE,WAAW,CAAC;IACtD,IAAI,EAAE,CAAC,CAAC,MAAM;IACd,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACnD,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC;IACvE,QAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,0BAA0B,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAClF,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC;QACjC,WAAW,EAAE,qFAAqF;KAClG,CAAC;CACF,CAAC;CAAG;AAEL,MAAM,OAAO,iBAAkB,SAAQ,CAAC,CAAC,KAAK,CAAoB,mBAAmB,CAAC,CAAC;IACtF,KAAK,EAAE,CAAC,CAAC,MAAM;IACf,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC;IAC/B,IAAI,EAAE,CAAC,CAAC,YAAY,CAAC,SAAS,CAAC,eAAe,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;CACnE,CAAC;CAAG;AAEL,MAAM,OAAO,qBAAsB,SAAQ,CAAC,CAAC,KAAK,CAAwB,uBAAuB,CAAC,CAAC;IAClG,IAAI,EAAE,SAAS,CAAC,mBAAmB;IACnC,QAAQ,EAAE,CAAC,CAAC,MAAM;IAClB,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,uBAAuB,CAAC;IAChD,IAAI,EAAE,CAAC,CAAC,YAAY,CACnB,CAAC,CAAC,MAAM,CAAC;QACR,MAAM,EAAE,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,SAAS,CAAC,mBAAmB,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;QAClF,
|
|
1
|
+
{"version":3,"file":"Citations.js","sourceRoot":"","sources":["../../../../src/Mcp/tools/Citations.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,7 @@ import { Tool } from '@effect/ai';
|
|
|
2
2
|
import { Effect, Schema, String } from 'effect';
|
|
3
3
|
import { ApiClient } from '../../ApiClient.js';
|
|
4
4
|
import { ConfigManager } from '../../Config.js';
|
|
5
|
+
import { Telemetry } from '../../Telemetry.js';
|
|
5
6
|
import { CitedObjectModeResult, CitedSnapshotSearchResult, enrichObjectModeResult, enrichSnapshotSearchResult, } from './Citations.js';
|
|
6
7
|
export class FetchSearchParams extends Schema.Class('FetchSearchParams')({
|
|
7
8
|
query: Schema.NonEmptyTrimmedString.annotations({
|
|
@@ -63,11 +64,15 @@ export const FetchTool = Tool.make('fetch', {
|
|
|
63
64
|
description: String.stripMargin(`
|
|
64
65
|
|Fetch and extract content from any URL.
|
|
65
66
|
|
|
|
67
|
+
|You MUST cite what you take from the result. The result carries a ready-made
|
|
68
|
+
|'citationBlock' — append it verbatim to the end of your answer. Do not retype it, do not
|
|
69
|
+
|substitute the URL you fetched, and do not build a link yourself: the citation points at
|
|
70
|
+
|expand.ai's stored capture, not at the original site. Drop only the markers you did not use.
|
|
71
|
+
|A 'Verify it' link without '?id=' is not a citation. Never invent or reuse an evidence id.
|
|
72
|
+
|
|
|
66
73
|
|Returns object-mode output with markdown, front-matter metadata, and optional extracted JSON.
|
|
67
74
|
|When 'search' is set, the response also carries ranked snippets under data.search.snippets.
|
|
68
|
-
|
|
|
69
|
-
|for State JSON sources, the extracted 'json' value. Return the citationUrl to the user so they
|
|
70
|
-
|can verify the source.`),
|
|
75
|
+
|For State JSON sources each snippet also carries the extracted 'json' value.`),
|
|
71
76
|
parameters: FetchParams.fields,
|
|
72
77
|
success: CitedObjectModeResult,
|
|
73
78
|
failure: Schema.Defect,
|
|
@@ -79,10 +84,15 @@ export const FetchSearchTool = Tool.make('fetch_search', {
|
|
|
79
84
|
description: String.stripMargin(`
|
|
80
85
|
|Search a previous fetch by snapshotId without starting a new capture.
|
|
81
86
|
|
|
|
82
|
-
|
|
|
83
|
-
|
|
|
84
|
-
|
|
|
85
|
-
|
|
|
87
|
+
|You MUST cite what you take from the result. The result carries a ready-made
|
|
88
|
+
|'citationBlock' — append it verbatim to the end of your answer. Do not retype it, do not
|
|
89
|
+
|substitute the URL you fetched, and do not build a link yourself: the citation points at
|
|
90
|
+
|expand.ai's stored capture, not at the original site. Drop only the markers you did not use.
|
|
91
|
+
|A 'Verify it' link without '?id=' is not a citation. Never invent or reuse an evidence id.
|
|
92
|
+
|
|
|
93
|
+
|Returns ranked snippets from stored markdown, appendix, or State JSON artifacts. For State JSON
|
|
94
|
+
|sources each snippet also carries the extracted 'json' value. The result also includes a
|
|
95
|
+
|whole-snapshot 'playground' link.`),
|
|
86
96
|
parameters: FetchSnapshotSearchParams.fields,
|
|
87
97
|
success: CitedSnapshotSearchResult,
|
|
88
98
|
failure: Schema.Defect,
|
|
@@ -91,13 +101,21 @@ export const FetchSearchTool = Tool.make('fetch_search', {
|
|
|
91
101
|
.annotate(Tool.Readonly, true)
|
|
92
102
|
.annotate(Tool.Destructive, false);
|
|
93
103
|
export class Fetch extends Effect.Service()('@expandai/cli/Mcp/Fetch', {
|
|
94
|
-
dependencies: [ApiClient.Default, ConfigManager.Default],
|
|
104
|
+
dependencies: [ApiClient.Default, ConfigManager.Default, Telemetry.Default],
|
|
95
105
|
scoped: Effect.gen(function* () {
|
|
96
106
|
const client = yield* ApiClient;
|
|
97
107
|
const configManager = yield* ConfigManager;
|
|
108
|
+
const telemetry = yield* Telemetry;
|
|
98
109
|
const playgroundHost = yield* configManager.getPlaygroundHost();
|
|
99
110
|
const fetch = Effect.fn('Fetch.fetch')(function* ({ url, search, includeMeta, includeAppendix, includeJson, }) {
|
|
100
|
-
yield* Effect.logDebug(
|
|
111
|
+
yield* Effect.logDebug('MCP fetch started').pipe(Effect.annotateLogs({
|
|
112
|
+
operation: 'fetch',
|
|
113
|
+
hasSearch: search !== undefined,
|
|
114
|
+
includeMeta,
|
|
115
|
+
includeAppendix,
|
|
116
|
+
includeJson,
|
|
117
|
+
}));
|
|
118
|
+
yield* telemetry.capture('mcp_tool_called', { tool: 'fetch', has_search: search !== undefined });
|
|
101
119
|
const includeParam = includeAppendix && includeJson
|
|
102
120
|
? 'appendix,statejson'
|
|
103
121
|
: includeAppendix
|
|
@@ -118,11 +136,17 @@ export class Fetch extends Effect.Service()('@expandai/cli/Mcp/Fetch', {
|
|
|
118
136
|
search,
|
|
119
137
|
},
|
|
120
138
|
});
|
|
121
|
-
yield* Effect.logDebug(
|
|
139
|
+
yield* Effect.logDebug('MCP fetch completed').pipe(Effect.annotateLogs({
|
|
140
|
+
operation: 'fetch',
|
|
141
|
+
hasSearch: search !== undefined,
|
|
142
|
+
searchResultCount: result.data?.search?.snippets.length ?? 0,
|
|
143
|
+
jsonEvidenceCount: result.json.length,
|
|
144
|
+
}));
|
|
122
145
|
return enrichObjectModeResult(result, playgroundHost);
|
|
123
146
|
});
|
|
124
147
|
const fetchSearch = Effect.fn('Fetch.fetchSearch')(function* ({ snapshotId, search, includeMarkdown, includeAppendix, includeJson, }) {
|
|
125
|
-
yield* Effect.logDebug(
|
|
148
|
+
yield* Effect.logDebug('MCP snapshot search started').pipe(Effect.annotateLogs({ operation: 'fetch_search', includeMarkdown, includeAppendix, includeJson }));
|
|
149
|
+
yield* telemetry.capture('mcp_tool_called', { tool: 'fetch_search', has_search: true });
|
|
126
150
|
const result = yield* client.fetchFetchSearch({
|
|
127
151
|
snapshotId,
|
|
128
152
|
search,
|
|
@@ -132,7 +156,7 @@ export class Fetch extends Effect.Service()('@expandai/cli/Mcp/Fetch', {
|
|
|
132
156
|
appendix: includeAppendix,
|
|
133
157
|
},
|
|
134
158
|
});
|
|
135
|
-
return enrichSnapshotSearchResult(result, playgroundHost);
|
|
159
|
+
return enrichSnapshotSearchResult(result, playgroundHost, 'mcp-fetch-search');
|
|
136
160
|
});
|
|
137
161
|
return { fetch, fetchSearch };
|
|
138
162
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Fetch.js","sourceRoot":"","sources":["../../../../src/Mcp/tools/Fetch.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Fetch.js","sourceRoot":"","sources":["../../../../src/Mcp/tools/Fetch.ts"],"names":[],"mappings":"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"}
|