chore(api): Changed the search api to return raw source (instead of base64 encoding)#356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 4 commits into from
Jun 17, 2025
Merged

chore(api): Changed the search api to return raw source (instead of base64 encoding) #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd8d71a
changed search api to return base64 decoded source
brendan-kellam Jun 17, 2025
d397e23
changelog
brendan-kellam Jun 17, 2025
d8013cf
mcp changelog
brendan-kellam Jun 17, 2025
1e3d586
Add note for later
brendan-kellam Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

<!-- @NOTE: this release includes a API change that affects the MCP package (@sourcebot/mcp). On release, bump the MCP package's version and delete this message. -->

### Fixed
- Delete account join request when redeeming an invite. [#352](https://github.com/sourcebot-dev/sourcebot/pull/352)
- Fix issue where a repository would not be included in a search context if the context was created before the repository. [#354](https://github.com/sourcebot-dev/sourcebot/pull/354)

### Changed
- Changed search api (and all apis that depend on it) to return raw source code instead of base64 encoded string. ([356](https://github.com/sourcebot-dev/sourcebot/pull/356)).

Comment thread
brendan-kellam marked this conversation as resolved.

## [4.3.0] - 2025-06-11

### Added
Expand Down
3 changes: 3 additions & 0 deletions packages/mcp/CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed
- Updated API client to match the latest Sourcebot release. [#356](https://github.com/sourcebot-dev/sourcebot/pull/356)

## [1.0.2] - 2025-05-28

### Changed
Expand Down
7 changes: 3 additions & 4 deletions packages/mcp/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { z } from 'zod';
import { listRepos, search, getFileSource } from './client.js';
import { env, numberSchema } from './env.js';
import { TextContent } from './types.js';
import { base64Decode, isServiceError } from './utils.js';
import { isServiceError } from './utils.js';

// Create MCP server
const server = new McpServer({
Expand DownExpand Up@@ -114,8 +114,7 @@ server.tool(

if (includeCodeSnippets) {
const snippets = file.chunks.map(chunk => {
const content = base64Decode(chunk.content);
return `\`\`\`\n${content}\n\`\`\``
return `\`\`\`\n${chunk.content}\n\`\`\``
}).join('\n');
text += `\n\n${snippets}`;
}
Expand DownExpand Up@@ -201,7 +200,7 @@ server.tool(

const content: TextContent[] = [{
type: "text",
text: `file: ${fileName}\nrepository: ${repoId}\nlanguage: ${response.language}\nsource:\n${base64Decode(response.source)}`,
text: `file: ${fileName}\nrepository: ${repoId}\nlanguage: ${response.language}\nsource:\n${response.source}`,
}]

return {
Expand Down
5 changes: 0 additions & 5 deletions packages/mcp/src/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
import { ServiceError } from "./types.js";

// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}

export const isServiceError = (data: unknown): data is ServiceError => {
return typeof data === 'object' &&
Expand Down
4 changes: 2 additions & 2 deletions packages/web/src/app/[domain]/browse/[...path]/components/codePreviewPanel.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
'use client';

import { base64Decode, getCodeHostInfoForRepo, unwrapServiceError } from "@/lib/utils";
import { getCodeHostInfoForRepo, unwrapServiceError } from "@/lib/utils";
import { useBrowseParams } from "@/app/[domain]/browse/hooks/useBrowseParams";
import { useQuery } from "@tanstack/react-query";
import { getFileSource } from "@/features/search/fileSourceApi";
Expand DownExpand Up@@ -88,7 +88,7 @@ export const CodePreviewPanel = () => {
</div>
<Separator />
<PureCodePreviewPanel
source={base64Decode(fileSourceResponse.source)}
source={fileSourceResponse.source}
Comment thread
brendan-kellam marked this conversation as resolved.
language={fileSourceResponse.language}
repoName={repoName}
path={path}
Expand Down
5 changes: 1 addition & 4 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import { useDomain } from "@/hooks/useDomain";
import { SymbolIcon } from "@radix-ui/react-icons";
import { SetStateAction, Dispatch, useMemo } from "react";
import { getFileSource } from "@/features/search/fileSourceApi";
import { base64Decode } from "@/lib/utils";
import { unwrapServiceError } from "@/lib/utils";

interface CodePreviewPanelProps {
Expand DownExpand Up@@ -41,10 +40,8 @@ export const CodePreviewPanel = ({
}, domain)
),
select: (data) => {
const decodedSource = base64Decode(data.source);

return {
content: decodedSource,
content: data.source,
filepath: previewedFile.fileName.text,
Comment thread
brendan-kellam marked this conversation as resolved.
matches: previewedFile.chunks,
link: previewedFile.webUrl,
Expand Down
14 changes: 4 additions & 10 deletions packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
'use client';

import { useCallback, useMemo } from "react";
import { useCallback } from "react";
import { SearchResultFile, SearchResultChunk } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";


Expand All@@ -17,17 +16,12 @@ export const FileMatch = ({
file,
onOpen: _onOpen,
}: FileMatchProps) => {

const content = useMemo(() => {
return base64Decode(match.content);
}, [match.content]);

const onOpen = useCallback((isCtrlKeyPressed: boolean) => {
const startLineNumber = match.contentStart.lineNumber;
const endLineNumber = content.trimEnd().split('\n').length + startLineNumber - 1;
const endLineNumber = match.content.trimEnd().split('\n').length + startLineNumber - 1;

_onOpen(startLineNumber, endLineNumber, isCtrlKeyPressed);
}, [content, match.contentStart.lineNumber, _onOpen]);
}, [match.content, match.contentStart.lineNumber, _onOpen]);

// If it's just the title, don't show a code preview
if (match.matchRanges.length === 0) {
Expand DownExpand Up@@ -57,7 +51,7 @@ export const FileMatch = ({
lineNumbersOffset={match.contentStart.lineNumber}
renderWhitespace={true}
>
{content}
{match.content}
</LightweightCodeHighlighter>
</div>
);
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/ee/features/codeNav/components/exploreMenu/referenceList.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ import { PathHeader } from "@/app/[domain]/components/pathHeader";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import { FindRelatedSymbolsResponse } from "@/features/codeNav/types";
import { RepositoryInfo, SourceRange } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";
import { useMemo, useRef } from "react";
import useCaptureEvent from "@/hooks/useCaptureEvent";
import { useVirtualizer } from "@tanstack/react-virtual";
Expand DownExpand Up@@ -155,10 +154,6 @@ const ReferenceListItem = ({
onClick,
onMouseEnter,
}: ReferenceListItemProps) => {
const decodedLineContent = useMemo(() => {
return base64Decode(lineContent);
}, [lineContent]);

const highlightRanges = useMemo(() => [range], [range]);

return (
Expand All@@ -174,7 +169,7 @@ const ReferenceListItem = ({
lineNumbersOffset={range.start.lineNumber}
renderWhitespace={false}
>
{decodedLineContent}
{lineContent}
</LightweightCodeHighlighter>
</div>
)
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/ee/features/codeNav/components/symbolHoverPopup/symbolDefinitionPreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import { useMemo } from "react";
import { SourceRange } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";

interface SymbolDefinitionPreviewProps {
symbolDefinition: {
Expand All@@ -21,10 +20,6 @@ export const SymbolDefinitionPreview = ({
const { lineContent, language, range } = symbolDefinition;
const highlightRanges = useMemo(() => [range], [range]);

const decodedLineContent = useMemo(() => {
return base64Decode(lineContent);
}, [lineContent]);

return (
<div className="flex flex-col gap-2 mb-2">
<Tooltip
Expand DownExpand Up@@ -55,7 +50,7 @@ export const SymbolDefinitionPreview = ({
lineNumbersOffset={range.start.lineNumber}
renderWhitespace={false}
>
{decodedLineContent}
{lineContent}
</LightweightCodeHighlighter>
</div>
)
Expand Down
3 changes: 1 addition & 2 deletions packages/web/src/features/agents/review-agent/nodes/fetchFileContent.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { sourcebot_context, sourcebot_pr_payload } from "@/features/agents/review-agent/types";
import { getFileSource } from "@/features/search/fileSourceApi";
import { fileSourceResponseSchema } from "@/features/search/schemas";
import { base64Decode } from "@/lib/utils";
import { isServiceError } from "@/lib/utils";
import { env } from "@/env.mjs";
import { createLogger } from "@sourcebot/logger";
Expand All@@ -24,7 +23,7 @@ export const fetchFileContent = async (pr_payload: sourcebot_pr_payload, filenam
}

const fileSourceResponse = fileSourceResponseSchema.parse(response);
const fileContent = base64Decode(fileSourceResponse.source);
const fileContent = fileSourceResponse.source;

const fileContentContext: sourcebot_context = {
type: "file_content",
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/features/search/searchApi.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { SearchRequest, SearchResponse, SourceRange } from "./types";
import { OrgRole, Repo } from "@sourcebot/db";
import * as Sentry from "@sentry/nextjs";
import { sew, withAuth, withOrgMembership } from "@/actions";
import { base64Decode } from "@sourcebot/shared";

// List of supported query prefixes in zoekt.
// @see : https://github.com/sourcebot-dev/zoekt/blob/main/query/parse.go#L417
Expand DownExpand Up@@ -264,7 +265,7 @@ export const search = async ({ query, matches, contextLines, whole }: SearchRequ
.filter((chunk) => !chunk.FileName) // Filter out filename chunks.
.map((chunk) => {
return {
content: chunk.Content,
content: base64Decode(chunk.Content),
matchRanges: chunk.Ranges.map((range) => ({
start: {
byteOffset: range.Start.ByteOffset,
Expand DownExpand Up@@ -295,7 +296,7 @@ export const search = async ({ query, matches, contextLines, whole }: SearchRequ
}
}),
branches: file.Branches,
content: file.Content,
content: file.Content ? base64Decode(file.Content) : undefined,
}
}).filter((file) => file !== undefined) ?? [];

Expand Down
6 changes: 0 additions & 6 deletions packages/web/src/lib/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -301,12 +301,6 @@ export const isServiceError = (data: unknown): data is ServiceError => {
'message' in data;
}

// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}

// @see: https://stackoverflow.com/a/65959350/23221295
export const isDefined = <T>(arg: T | null | undefined): arg is T extends null | undefined ? never : T => {
return arg !== null && arg !== undefined;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all \u003cpre\u003e\u003ccode\u003e blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks"); } } catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); } })(); (function(){ try { var __m = "github.com"; var __re = new RegExp('^' + "github\\.com" + '
Skip to content

chore(api): Changed the search api to return raw source (instead of base64 encoding)#356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 4 commits into from
Jun 17, 2025
Merged

chore(api): Changed the search api to return raw source (instead of base64 encoding) #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd8d71a
changed search api to return base64 decoded source
brendan-kellam Jun 17, 2025
d397e23
changelog
brendan-kellam Jun 17, 2025
d8013cf
mcp changelog
brendan-kellam Jun 17, 2025
1e3d586
Add note for later
brendan-kellam Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

<!-- @NOTE: this release includes a API change that affects the MCP package (@sourcebot/mcp). On release, bump the MCP package's version and delete this message. -->

### Fixed
- Delete account join request when redeeming an invite. [#352](https://github.com/sourcebot-dev/sourcebot/pull/352)
- Fix issue where a repository would not be included in a search context if the context was created before the repository. [#354](https://github.com/sourcebot-dev/sourcebot/pull/354)

### Changed
- Changed search api (and all apis that depend on it) to return raw source code instead of base64 encoded string. ([356](https://github.com/sourcebot-dev/sourcebot/pull/356)).

Comment thread
brendan-kellam marked this conversation as resolved.

## [4.3.0] - 2025-06-11

### Added
Expand Down
3 changes: 3 additions & 0 deletions packages/mcp/CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed
- Updated API client to match the latest Sourcebot release. [#356](https://github.com/sourcebot-dev/sourcebot/pull/356)

## [1.0.2] - 2025-05-28

### Changed
Expand Down
7 changes: 3 additions & 4 deletions packages/mcp/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { z } from 'zod';
import { listRepos, search, getFileSource } from './client.js';
import { env, numberSchema } from './env.js';
import { TextContent } from './types.js';
import { base64Decode, isServiceError } from './utils.js';
import { isServiceError } from './utils.js';

// Create MCP server
const server = new McpServer({
Expand DownExpand Up@@ -114,8 +114,7 @@ server.tool(

if (includeCodeSnippets) {
const snippets = file.chunks.map(chunk => {
const content = base64Decode(chunk.content);
return `\`\`\`\n${content}\n\`\`\``
return `\`\`\`\n${chunk.content}\n\`\`\``
}).join('\n');
text += `\n\n${snippets}`;
}
Expand DownExpand Up@@ -201,7 +200,7 @@ server.tool(

const content: TextContent[] = [{
type: "text",
text: `file: ${fileName}\nrepository: ${repoId}\nlanguage: ${response.language}\nsource:\n${base64Decode(response.source)}`,
text: `file: ${fileName}\nrepository: ${repoId}\nlanguage: ${response.language}\nsource:\n${response.source}`,
}]

return {
Expand Down
5 changes: 0 additions & 5 deletions packages/mcp/src/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
import { ServiceError } from "./types.js";

// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}

export const isServiceError = (data: unknown): data is ServiceError => {
return typeof data === 'object' &&
Expand Down
4 changes: 2 additions & 2 deletions packages/web/src/app/[domain]/browse/[...path]/components/codePreviewPanel.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
'use client';

import { base64Decode, getCodeHostInfoForRepo, unwrapServiceError } from "@/lib/utils";
import { getCodeHostInfoForRepo, unwrapServiceError } from "@/lib/utils";
import { useBrowseParams } from "@/app/[domain]/browse/hooks/useBrowseParams";
import { useQuery } from "@tanstack/react-query";
import { getFileSource } from "@/features/search/fileSourceApi";
Expand DownExpand Up@@ -88,7 +88,7 @@ export const CodePreviewPanel = () => {
</div>
<Separator />
<PureCodePreviewPanel
source={base64Decode(fileSourceResponse.source)}
source={fileSourceResponse.source}
Comment thread
brendan-kellam marked this conversation as resolved.
language={fileSourceResponse.language}
repoName={repoName}
path={path}
Expand Down
5 changes: 1 addition & 4 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import { useDomain } from "@/hooks/useDomain";
import { SymbolIcon } from "@radix-ui/react-icons";
import { SetStateAction, Dispatch, useMemo } from "react";
import { getFileSource } from "@/features/search/fileSourceApi";
import { base64Decode } from "@/lib/utils";
import { unwrapServiceError } from "@/lib/utils";

interface CodePreviewPanelProps {
Expand DownExpand Up@@ -41,10 +40,8 @@ export const CodePreviewPanel = ({
}, domain)
),
select: (data) => {
const decodedSource = base64Decode(data.source);

return {
content: decodedSource,
content: data.source,
filepath: previewedFile.fileName.text,
Comment thread
brendan-kellam marked this conversation as resolved.
matches: previewedFile.chunks,
link: previewedFile.webUrl,
Expand Down
14 changes: 4 additions & 10 deletions packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
'use client';

import { useCallback, useMemo } from "react";
import { useCallback } from "react";
import { SearchResultFile, SearchResultChunk } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";


Expand All@@ -17,17 +16,12 @@ export const FileMatch = ({
file,
onOpen: _onOpen,
}: FileMatchProps) => {

const content = useMemo(() => {
return base64Decode(match.content);
}, [match.content]);

const onOpen = useCallback((isCtrlKeyPressed: boolean) => {
const startLineNumber = match.contentStart.lineNumber;
const endLineNumber = content.trimEnd().split('\n').length + startLineNumber - 1;
const endLineNumber = match.content.trimEnd().split('\n').length + startLineNumber - 1;

_onOpen(startLineNumber, endLineNumber, isCtrlKeyPressed);
}, [content, match.contentStart.lineNumber, _onOpen]);
}, [match.content, match.contentStart.lineNumber, _onOpen]);

// If it's just the title, don't show a code preview
if (match.matchRanges.length === 0) {
Expand DownExpand Up@@ -57,7 +51,7 @@ export const FileMatch = ({
lineNumbersOffset={match.contentStart.lineNumber}
renderWhitespace={true}
>
{content}
{match.content}
</LightweightCodeHighlighter>
</div>
);
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/ee/features/codeNav/components/exploreMenu/referenceList.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ import { PathHeader } from "@/app/[domain]/components/pathHeader";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import { FindRelatedSymbolsResponse } from "@/features/codeNav/types";
import { RepositoryInfo, SourceRange } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";
import { useMemo, useRef } from "react";
import useCaptureEvent from "@/hooks/useCaptureEvent";
import { useVirtualizer } from "@tanstack/react-virtual";
Expand DownExpand Up@@ -155,10 +154,6 @@ const ReferenceListItem = ({
onClick,
onMouseEnter,
}: ReferenceListItemProps) => {
const decodedLineContent = useMemo(() => {
return base64Decode(lineContent);
}, [lineContent]);

const highlightRanges = useMemo(() => [range], [range]);

return (
Expand All@@ -174,7 +169,7 @@ const ReferenceListItem = ({
lineNumbersOffset={range.start.lineNumber}
renderWhitespace={false}
>
{decodedLineContent}
{lineContent}
</LightweightCodeHighlighter>
</div>
)
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/ee/features/codeNav/components/symbolHoverPopup/symbolDefinitionPreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import { useMemo } from "react";
import { SourceRange } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";

interface SymbolDefinitionPreviewProps {
symbolDefinition: {
Expand All@@ -21,10 +20,6 @@ export const SymbolDefinitionPreview = ({
const { lineContent, language, range } = symbolDefinition;
const highlightRanges = useMemo(() => [range], [range]);

const decodedLineContent = useMemo(() => {
return base64Decode(lineContent);
}, [lineContent]);

return (
<div className="flex flex-col gap-2 mb-2">
<Tooltip
Expand DownExpand Up@@ -55,7 +50,7 @@ export const SymbolDefinitionPreview = ({
lineNumbersOffset={range.start.lineNumber}
renderWhitespace={false}
>
{decodedLineContent}
{lineContent}
</LightweightCodeHighlighter>
</div>
)
Expand Down
3 changes: 1 addition & 2 deletions packages/web/src/features/agents/review-agent/nodes/fetchFileContent.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { sourcebot_context, sourcebot_pr_payload } from "@/features/agents/review-agent/types";
import { getFileSource } from "@/features/search/fileSourceApi";
import { fileSourceResponseSchema } from "@/features/search/schemas";
import { base64Decode } from "@/lib/utils";
import { isServiceError } from "@/lib/utils";
import { env } from "@/env.mjs";
import { createLogger } from "@sourcebot/logger";
Expand All@@ -24,7 +23,7 @@ export const fetchFileContent = async (pr_payload: sourcebot_pr_payload, filenam
}

const fileSourceResponse = fileSourceResponseSchema.parse(response);
const fileContent = base64Decode(fileSourceResponse.source);
const fileContent = fileSourceResponse.source;

const fileContentContext: sourcebot_context = {
type: "file_content",
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/features/search/searchApi.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { SearchRequest, SearchResponse, SourceRange } from "./types";
import { OrgRole, Repo } from "@sourcebot/db";
import * as Sentry from "@sentry/nextjs";
import { sew, withAuth, withOrgMembership } from "@/actions";
import { base64Decode } from "@sourcebot/shared";

// List of supported query prefixes in zoekt.
// @see : https://github.com/sourcebot-dev/zoekt/blob/main/query/parse.go#L417
Expand DownExpand Up@@ -264,7 +265,7 @@ export const search = async ({ query, matches, contextLines, whole }: SearchRequ
.filter((chunk) => !chunk.FileName) // Filter out filename chunks.
.map((chunk) => {
return {
content: chunk.Content,
content: base64Decode(chunk.Content),
matchRanges: chunk.Ranges.map((range) => ({
start: {
byteOffset: range.Start.ByteOffset,
Expand DownExpand Up@@ -295,7 +296,7 @@ export const search = async ({ query, matches, contextLines, whole }: SearchRequ
}
}),
branches: file.Branches,
content: file.Content,
content: file.Content ? base64Decode(file.Content) : undefined,
}
}).filter((file) => file !== undefined) ?? [];

Expand Down
6 changes: 0 additions & 6 deletions packages/web/src/lib/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -301,12 +301,6 @@ export const isServiceError = (data: unknown): data is ServiceError => {
'message' in data;
}

// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}

// @see: https://stackoverflow.com/a/65959350/23221295
export const isDefined = <T>(arg: T | null | undefined): arg is T extends null | undefined ? never : T => {
return arg !== null && arg !== undefined;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

chore(api): Changed the search api to return raw source (instead of base64 encoding)#356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 4 commits into from
Jun 17, 2025
Merged

chore(api): Changed the search api to return raw source (instead of base64 encoding) #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd8d71a
changed search api to return base64 decoded source
brendan-kellam Jun 17, 2025
d397e23
changelog
brendan-kellam Jun 17, 2025
d8013cf
mcp changelog
brendan-kellam Jun 17, 2025
1e3d586
Add note for later
brendan-kellam Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

<!-- @NOTE: this release includes a API change that affects the MCP package (@sourcebot/mcp). On release, bump the MCP package's version and delete this message. -->

### Fixed
- Delete account join request when redeeming an invite. [#352](https://github.com/sourcebot-dev/sourcebot/pull/352)
- Fix issue where a repository would not be included in a search context if the context was created before the repository. [#354](https://github.com/sourcebot-dev/sourcebot/pull/354)

### Changed
- Changed search api (and all apis that depend on it) to return raw source code instead of base64 encoded string. ([356](https://github.com/sourcebot-dev/sourcebot/pull/356)).

Comment thread
brendan-kellam marked this conversation as resolved.

## [4.3.0] - 2025-06-11

### Added
Expand Down
3 changes: 3 additions & 0 deletions packages/mcp/CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed
- Updated API client to match the latest Sourcebot release. [#356](https://github.com/sourcebot-dev/sourcebot/pull/356)

## [1.0.2] - 2025-05-28

### Changed
Expand Down
7 changes: 3 additions & 4 deletions packages/mcp/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { z } from 'zod';
import { listRepos, search, getFileSource } from './client.js';
import { env, numberSchema } from './env.js';
import { TextContent } from './types.js';
import { base64Decode, isServiceError } from './utils.js';
import { isServiceError } from './utils.js';

// Create MCP server
const server = new McpServer({
Expand DownExpand Up@@ -114,8 +114,7 @@ server.tool(

if (includeCodeSnippets) {
const snippets = file.chunks.map(chunk => {
const content = base64Decode(chunk.content);
return `\`\`\`\n${content}\n\`\`\``
return `\`\`\`\n${chunk.content}\n\`\`\``
}).join('\n');
text += `\n\n${snippets}`;
}
Expand DownExpand Up@@ -201,7 +200,7 @@ server.tool(

const content: TextContent[] = [{
type: "text",
text: `file: ${fileName}\nrepository: ${repoId}\nlanguage: ${response.language}\nsource:\n${base64Decode(response.source)}`,
text: `file: ${fileName}\nrepository: ${repoId}\nlanguage: ${response.language}\nsource:\n${response.source}`,
}]

return {
Expand Down
5 changes: 0 additions & 5 deletions packages/mcp/src/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
import { ServiceError } from "./types.js";

// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}

export const isServiceError = (data: unknown): data is ServiceError => {
return typeof data === 'object' &&
Expand Down
4 changes: 2 additions & 2 deletions packages/web/src/app/[domain]/browse/[...path]/components/codePreviewPanel.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
'use client';

import { base64Decode, getCodeHostInfoForRepo, unwrapServiceError } from "@/lib/utils";
import { getCodeHostInfoForRepo, unwrapServiceError } from "@/lib/utils";
import { useBrowseParams } from "@/app/[domain]/browse/hooks/useBrowseParams";
import { useQuery } from "@tanstack/react-query";
import { getFileSource } from "@/features/search/fileSourceApi";
Expand DownExpand Up@@ -88,7 +88,7 @@ export const CodePreviewPanel = () => {
</div>
<Separator />
<PureCodePreviewPanel
source={base64Decode(fileSourceResponse.source)}
source={fileSourceResponse.source}
Comment thread
brendan-kellam marked this conversation as resolved.
language={fileSourceResponse.language}
repoName={repoName}
path={path}
Expand Down
5 changes: 1 addition & 4 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import { useDomain } from "@/hooks/useDomain";
import { SymbolIcon } from "@radix-ui/react-icons";
import { SetStateAction, Dispatch, useMemo } from "react";
import { getFileSource } from "@/features/search/fileSourceApi";
import { base64Decode } from "@/lib/utils";
import { unwrapServiceError } from "@/lib/utils";

interface CodePreviewPanelProps {
Expand DownExpand Up@@ -41,10 +40,8 @@ export const CodePreviewPanel = ({
}, domain)
),
select: (data) => {
const decodedSource = base64Decode(data.source);

return {
content: decodedSource,
content: data.source,
filepath: previewedFile.fileName.text,
Comment thread
brendan-kellam marked this conversation as resolved.
matches: previewedFile.chunks,
link: previewedFile.webUrl,
Expand Down
14 changes: 4 additions & 10 deletions packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
'use client';

import { useCallback, useMemo } from "react";
import { useCallback } from "react";
import { SearchResultFile, SearchResultChunk } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";


Expand All@@ -17,17 +16,12 @@ export const FileMatch = ({
file,
onOpen: _onOpen,
}: FileMatchProps) => {

const content = useMemo(() => {
return base64Decode(match.content);
}, [match.content]);

const onOpen = useCallback((isCtrlKeyPressed: boolean) => {
const startLineNumber = match.contentStart.lineNumber;
const endLineNumber = content.trimEnd().split('\n').length + startLineNumber - 1;
const endLineNumber = match.content.trimEnd().split('\n').length + startLineNumber - 1;

_onOpen(startLineNumber, endLineNumber, isCtrlKeyPressed);
}, [content, match.contentStart.lineNumber, _onOpen]);
}, [match.content, match.contentStart.lineNumber, _onOpen]);

// If it's just the title, don't show a code preview
if (match.matchRanges.length === 0) {
Expand DownExpand Up@@ -57,7 +51,7 @@ export const FileMatch = ({
lineNumbersOffset={match.contentStart.lineNumber}
renderWhitespace={true}
>
{content}
{match.content}
</LightweightCodeHighlighter>
</div>
);
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/ee/features/codeNav/components/exploreMenu/referenceList.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ import { PathHeader } from "@/app/[domain]/components/pathHeader";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import { FindRelatedSymbolsResponse } from "@/features/codeNav/types";
import { RepositoryInfo, SourceRange } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";
import { useMemo, useRef } from "react";
import useCaptureEvent from "@/hooks/useCaptureEvent";
import { useVirtualizer } from "@tanstack/react-virtual";
Expand DownExpand Up@@ -155,10 +154,6 @@ const ReferenceListItem = ({
onClick,
onMouseEnter,
}: ReferenceListItemProps) => {
const decodedLineContent = useMemo(() => {
return base64Decode(lineContent);
}, [lineContent]);

const highlightRanges = useMemo(() => [range], [range]);

return (
Expand All@@ -174,7 +169,7 @@ const ReferenceListItem = ({
lineNumbersOffset={range.start.lineNumber}
renderWhitespace={false}
>
{decodedLineContent}
{lineContent}
</LightweightCodeHighlighter>
</div>
)
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/ee/features/codeNav/components/symbolHoverPopup/symbolDefinitionPreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import { useMemo } from "react";
import { SourceRange } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";

interface SymbolDefinitionPreviewProps {
symbolDefinition: {
Expand All@@ -21,10 +20,6 @@ export const SymbolDefinitionPreview = ({
const { lineContent, language, range } = symbolDefinition;
const highlightRanges = useMemo(() => [range], [range]);

const decodedLineContent = useMemo(() => {
return base64Decode(lineContent);
}, [lineContent]);

return (
<div className="flex flex-col gap-2 mb-2">
<Tooltip
Expand DownExpand Up@@ -55,7 +50,7 @@ export const SymbolDefinitionPreview = ({
lineNumbersOffset={range.start.lineNumber}
renderWhitespace={false}
>
{decodedLineContent}
{lineContent}
</LightweightCodeHighlighter>
</div>
)
Expand Down
3 changes: 1 addition & 2 deletions packages/web/src/features/agents/review-agent/nodes/fetchFileContent.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { sourcebot_context, sourcebot_pr_payload } from "@/features/agents/review-agent/types";
import { getFileSource } from "@/features/search/fileSourceApi";
import { fileSourceResponseSchema } from "@/features/search/schemas";
import { base64Decode } from "@/lib/utils";
import { isServiceError } from "@/lib/utils";
import { env } from "@/env.mjs";
import { createLogger } from "@sourcebot/logger";
Expand All@@ -24,7 +23,7 @@ export const fetchFileContent = async (pr_payload: sourcebot_pr_payload, filenam
}

const fileSourceResponse = fileSourceResponseSchema.parse(response);
const fileContent = base64Decode(fileSourceResponse.source);
const fileContent = fileSourceResponse.source;

const fileContentContext: sourcebot_context = {
type: "file_content",
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/features/search/searchApi.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { SearchRequest, SearchResponse, SourceRange } from "./types";
import { OrgRole, Repo } from "@sourcebot/db";
import * as Sentry from "@sentry/nextjs";
import { sew, withAuth, withOrgMembership } from "@/actions";
import { base64Decode } from "@sourcebot/shared";

// List of supported query prefixes in zoekt.
// @see : https://github.com/sourcebot-dev/zoekt/blob/main/query/parse.go#L417
Expand DownExpand Up@@ -264,7 +265,7 @@ export const search = async ({ query, matches, contextLines, whole }: SearchRequ
.filter((chunk) => !chunk.FileName) // Filter out filename chunks.
.map((chunk) => {
return {
content: chunk.Content,
content: base64Decode(chunk.Content),
matchRanges: chunk.Ranges.map((range) => ({
start: {
byteOffset: range.Start.ByteOffset,
Expand DownExpand Up@@ -295,7 +296,7 @@ export const search = async ({ query, matches, contextLines, whole }: SearchRequ
}
}),
branches: file.Branches,
content: file.Content,
content: file.Content ? base64Decode(file.Content) : undefined,
}
}).filter((file) => file !== undefined) ?? [];

Expand Down
6 changes: 0 additions & 6 deletions packages/web/src/lib/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -301,12 +301,6 @@ export const isServiceError = (data: unknown): data is ServiceError => {
'message' in data;
}

// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}

// @see: https://stackoverflow.com/a/65959350/23221295
export const isDefined = <T>(arg: T | null | undefined): arg is T extends null | undefined ? never : T => {
return arg !== null && arg !== undefined;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length \u003e 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

chore(api): Changed the search api to return raw source (instead of base64 encoding)#356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 4 commits into from
Jun 17, 2025
Merged

chore(api): Changed the search api to return raw source (instead of base64 encoding) #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd8d71a
changed search api to return base64 decoded source
brendan-kellam Jun 17, 2025
d397e23
changelog
brendan-kellam Jun 17, 2025
d8013cf
mcp changelog
brendan-kellam Jun 17, 2025
1e3d586
Add note for later
brendan-kellam Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

<!-- @NOTE: this release includes a API change that affects the MCP package (@sourcebot/mcp). On release, bump the MCP package's version and delete this message. -->

### Fixed
- Delete account join request when redeeming an invite. [#352](https://github.com/sourcebot-dev/sourcebot/pull/352)
- Fix issue where a repository would not be included in a search context if the context was created before the repository. [#354](https://github.com/sourcebot-dev/sourcebot/pull/354)

### Changed
- Changed search api (and all apis that depend on it) to return raw source code instead of base64 encoded string. ([356](https://github.com/sourcebot-dev/sourcebot/pull/356)).

Comment thread
brendan-kellam marked this conversation as resolved.

## [4.3.0] - 2025-06-11

### Added
Expand Down
3 changes: 3 additions & 0 deletions packages/mcp/CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed
- Updated API client to match the latest Sourcebot release. [#356](https://github.com/sourcebot-dev/sourcebot/pull/356)

## [1.0.2] - 2025-05-28

### Changed
Expand Down
7 changes: 3 additions & 4 deletions packages/mcp/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { z } from 'zod';
import { listRepos, search, getFileSource } from './client.js';
import { env, numberSchema } from './env.js';
import { TextContent } from './types.js';
import { base64Decode, isServiceError } from './utils.js';
import { isServiceError } from './utils.js';

// Create MCP server
const server = new McpServer({
Expand DownExpand Up@@ -114,8 +114,7 @@ server.tool(

if (includeCodeSnippets) {
const snippets = file.chunks.map(chunk => {
const content = base64Decode(chunk.content);
return `\`\`\`\n${content}\n\`\`\``
return `\`\`\`\n${chunk.content}\n\`\`\``
}).join('\n');
text += `\n\n${snippets}`;
}
Expand DownExpand Up@@ -201,7 +200,7 @@ server.tool(

const content: TextContent[] = [{
type: "text",
text: `file: ${fileName}\nrepository: ${repoId}\nlanguage: ${response.language}\nsource:\n${base64Decode(response.source)}`,
text: `file: ${fileName}\nrepository: ${repoId}\nlanguage: ${response.language}\nsource:\n${response.source}`,
}]

return {
Expand Down
5 changes: 0 additions & 5 deletions packages/mcp/src/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
import { ServiceError } from "./types.js";

// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}

export const isServiceError = (data: unknown): data is ServiceError => {
return typeof data === 'object' &&
Expand Down
4 changes: 2 additions & 2 deletions packages/web/src/app/[domain]/browse/[...path]/components/codePreviewPanel.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
'use client';

import { base64Decode, getCodeHostInfoForRepo, unwrapServiceError } from "@/lib/utils";
import { getCodeHostInfoForRepo, unwrapServiceError } from "@/lib/utils";
import { useBrowseParams } from "@/app/[domain]/browse/hooks/useBrowseParams";
import { useQuery } from "@tanstack/react-query";
import { getFileSource } from "@/features/search/fileSourceApi";
Expand DownExpand Up@@ -88,7 +88,7 @@ export const CodePreviewPanel = () => {
</div>
<Separator />
<PureCodePreviewPanel
source={base64Decode(fileSourceResponse.source)}
source={fileSourceResponse.source}
Comment thread
brendan-kellam marked this conversation as resolved.
language={fileSourceResponse.language}
repoName={repoName}
path={path}
Expand Down
5 changes: 1 addition & 4 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import { useDomain } from "@/hooks/useDomain";
import { SymbolIcon } from "@radix-ui/react-icons";
import { SetStateAction, Dispatch, useMemo } from "react";
import { getFileSource } from "@/features/search/fileSourceApi";
import { base64Decode } from "@/lib/utils";
import { unwrapServiceError } from "@/lib/utils";

interface CodePreviewPanelProps {
Expand DownExpand Up@@ -41,10 +40,8 @@ export const CodePreviewPanel = ({
}, domain)
),
select: (data) => {
const decodedSource = base64Decode(data.source);

return {
content: decodedSource,
content: data.source,
filepath: previewedFile.fileName.text,
Comment thread
brendan-kellam marked this conversation as resolved.
matches: previewedFile.chunks,
link: previewedFile.webUrl,
Expand Down
14 changes: 4 additions & 10 deletions packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
'use client';

import { useCallback, useMemo } from "react";
import { useCallback } from "react";
import { SearchResultFile, SearchResultChunk } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";


Expand All@@ -17,17 +16,12 @@ export const FileMatch = ({
file,
onOpen: _onOpen,
}: FileMatchProps) => {

const content = useMemo(() => {
return base64Decode(match.content);
}, [match.content]);

const onOpen = useCallback((isCtrlKeyPressed: boolean) => {
const startLineNumber = match.contentStart.lineNumber;
const endLineNumber = content.trimEnd().split('\n').length + startLineNumber - 1;
const endLineNumber = match.content.trimEnd().split('\n').length + startLineNumber - 1;

_onOpen(startLineNumber, endLineNumber, isCtrlKeyPressed);
}, [content, match.contentStart.lineNumber, _onOpen]);
}, [match.content, match.contentStart.lineNumber, _onOpen]);

// If it's just the title, don't show a code preview
if (match.matchRanges.length === 0) {
Expand DownExpand Up@@ -57,7 +51,7 @@ export const FileMatch = ({
lineNumbersOffset={match.contentStart.lineNumber}
renderWhitespace={true}
>
{content}
{match.content}
</LightweightCodeHighlighter>
</div>
);
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/ee/features/codeNav/components/exploreMenu/referenceList.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ import { PathHeader } from "@/app/[domain]/components/pathHeader";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import { FindRelatedSymbolsResponse } from "@/features/codeNav/types";
import { RepositoryInfo, SourceRange } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";
import { useMemo, useRef } from "react";
import useCaptureEvent from "@/hooks/useCaptureEvent";
import { useVirtualizer } from "@tanstack/react-virtual";
Expand DownExpand Up@@ -155,10 +154,6 @@ const ReferenceListItem = ({
onClick,
onMouseEnter,
}: ReferenceListItemProps) => {
const decodedLineContent = useMemo(() => {
return base64Decode(lineContent);
}, [lineContent]);

const highlightRanges = useMemo(() => [range], [range]);

return (
Expand All@@ -174,7 +169,7 @@ const ReferenceListItem = ({
lineNumbersOffset={range.start.lineNumber}
renderWhitespace={false}
>
{decodedLineContent}
{lineContent}
</LightweightCodeHighlighter>
</div>
)
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/ee/features/codeNav/components/symbolHoverPopup/symbolDefinitionPreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import { useMemo } from "react";
import { SourceRange } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";

interface SymbolDefinitionPreviewProps {
symbolDefinition: {
Expand All@@ -21,10 +20,6 @@ export const SymbolDefinitionPreview = ({
const { lineContent, language, range } = symbolDefinition;
const highlightRanges = useMemo(() => [range], [range]);

const decodedLineContent = useMemo(() => {
return base64Decode(lineContent);
}, [lineContent]);

return (
<div className="flex flex-col gap-2 mb-2">
<Tooltip
Expand DownExpand Up@@ -55,7 +50,7 @@ export const SymbolDefinitionPreview = ({
lineNumbersOffset={range.start.lineNumber}
renderWhitespace={false}
>
{decodedLineContent}
{lineContent}
</LightweightCodeHighlighter>
</div>
)
Expand Down
3 changes: 1 addition & 2 deletions packages/web/src/features/agents/review-agent/nodes/fetchFileContent.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { sourcebot_context, sourcebot_pr_payload } from "@/features/agents/review-agent/types";
import { getFileSource } from "@/features/search/fileSourceApi";
import { fileSourceResponseSchema } from "@/features/search/schemas";
import { base64Decode } from "@/lib/utils";
import { isServiceError } from "@/lib/utils";
import { env } from "@/env.mjs";
import { createLogger } from "@sourcebot/logger";
Expand All@@ -24,7 +23,7 @@ export const fetchFileContent = async (pr_payload: sourcebot_pr_payload, filenam
}

const fileSourceResponse = fileSourceResponseSchema.parse(response);
const fileContent = base64Decode(fileSourceResponse.source);
const fileContent = fileSourceResponse.source;

const fileContentContext: sourcebot_context = {
type: "file_content",
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/features/search/searchApi.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { SearchRequest, SearchResponse, SourceRange } from "./types";
import { OrgRole, Repo } from "@sourcebot/db";
import * as Sentry from "@sentry/nextjs";
import { sew, withAuth, withOrgMembership } from "@/actions";
import { base64Decode } from "@sourcebot/shared";

// List of supported query prefixes in zoekt.
// @see : https://github.com/sourcebot-dev/zoekt/blob/main/query/parse.go#L417
Expand DownExpand Up@@ -264,7 +265,7 @@ export const search = async ({ query, matches, contextLines, whole }: SearchRequ
.filter((chunk) => !chunk.FileName) // Filter out filename chunks.
.map((chunk) => {
return {
content: chunk.Content,
content: base64Decode(chunk.Content),
matchRanges: chunk.Ranges.map((range) => ({
start: {
byteOffset: range.Start.ByteOffset,
Expand DownExpand Up@@ -295,7 +296,7 @@ export const search = async ({ query, matches, contextLines, whole }: SearchRequ
}
}),
branches: file.Branches,
content: file.Content,
content: file.Content ? base64Decode(file.Content) : undefined,
}
}).filter((file) => file !== undefined) ?? [];

Expand Down
6 changes: 0 additions & 6 deletions packages/web/src/lib/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -301,12 +301,6 @@ export const isServiceError = (data: unknown): data is ServiceError => {
'message' in data;
}

// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}

// @see: https://stackoverflow.com/a/65959350/23221295
export const isDefined = <T>(arg: T | null | undefined): arg is T extends null | undefined ? never : T => {
return arg !== null && arg !== undefined;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

chore(api): Changed the search api to return raw source (instead of base64 encoding)#356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 4 commits into from
Jun 17, 2025
Merged

chore(api): Changed the search api to return raw source (instead of base64 encoding) #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd8d71a
changed search api to return base64 decoded source
brendan-kellam Jun 17, 2025
d397e23
changelog
brendan-kellam Jun 17, 2025
d8013cf
mcp changelog
brendan-kellam Jun 17, 2025
1e3d586
Add note for later
brendan-kellam Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

<!-- @NOTE: this release includes a API change that affects the MCP package (@sourcebot/mcp). On release, bump the MCP package's version and delete this message. -->

### Fixed
- Delete account join request when redeeming an invite. [#352](https://github.com/sourcebot-dev/sourcebot/pull/352)
- Fix issue where a repository would not be included in a search context if the context was created before the repository. [#354](https://github.com/sourcebot-dev/sourcebot/pull/354)

### Changed
- Changed search api (and all apis that depend on it) to return raw source code instead of base64 encoded string. ([356](https://github.com/sourcebot-dev/sourcebot/pull/356)).

Comment thread
brendan-kellam marked this conversation as resolved.

## [4.3.0] - 2025-06-11

### Added
Expand Down
3 changes: 3 additions & 0 deletions packages/mcp/CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed
- Updated API client to match the latest Sourcebot release. [#356](https://github.com/sourcebot-dev/sourcebot/pull/356)

## [1.0.2] - 2025-05-28

### Changed
Expand Down
7 changes: 3 additions & 4 deletions packages/mcp/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { z } from 'zod';
import { listRepos, search, getFileSource } from './client.js';
import { env, numberSchema } from './env.js';
import { TextContent } from './types.js';
import { base64Decode, isServiceError } from './utils.js';
import { isServiceError } from './utils.js';

// Create MCP server
const server = new McpServer({
Expand DownExpand Up@@ -114,8 +114,7 @@ server.tool(

if (includeCodeSnippets) {
const snippets = file.chunks.map(chunk => {
const content = base64Decode(chunk.content);
return `\`\`\`\n${content}\n\`\`\``
return `\`\`\`\n${chunk.content}\n\`\`\``
}).join('\n');
text += `\n\n${snippets}`;
}
Expand DownExpand Up@@ -201,7 +200,7 @@ server.tool(

const content: TextContent[] = [{
type: "text",
text: `file: ${fileName}\nrepository: ${repoId}\nlanguage: ${response.language}\nsource:\n${base64Decode(response.source)}`,
text: `file: ${fileName}\nrepository: ${repoId}\nlanguage: ${response.language}\nsource:\n${response.source}`,
}]

return {
Expand Down
5 changes: 0 additions & 5 deletions packages/mcp/src/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
import { ServiceError } from "./types.js";

// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}

export const isServiceError = (data: unknown): data is ServiceError => {
return typeof data === 'object' &&
Expand Down
4 changes: 2 additions & 2 deletions packages/web/src/app/[domain]/browse/[...path]/components/codePreviewPanel.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
'use client';

import { base64Decode, getCodeHostInfoForRepo, unwrapServiceError } from "@/lib/utils";
import { getCodeHostInfoForRepo, unwrapServiceError } from "@/lib/utils";
import { useBrowseParams } from "@/app/[domain]/browse/hooks/useBrowseParams";
import { useQuery } from "@tanstack/react-query";
import { getFileSource } from "@/features/search/fileSourceApi";
Expand DownExpand Up@@ -88,7 +88,7 @@ export const CodePreviewPanel = () => {
</div>
<Separator />
<PureCodePreviewPanel
source={base64Decode(fileSourceResponse.source)}
source={fileSourceResponse.source}
Comment thread
brendan-kellam marked this conversation as resolved.
language={fileSourceResponse.language}
repoName={repoName}
path={path}
Expand Down
5 changes: 1 addition & 4 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import { useDomain } from "@/hooks/useDomain";
import { SymbolIcon } from "@radix-ui/react-icons";
import { SetStateAction, Dispatch, useMemo } from "react";
import { getFileSource } from "@/features/search/fileSourceApi";
import { base64Decode } from "@/lib/utils";
import { unwrapServiceError } from "@/lib/utils";

interface CodePreviewPanelProps {
Expand DownExpand Up@@ -41,10 +40,8 @@ export const CodePreviewPanel = ({
}, domain)
),
select: (data) => {
const decodedSource = base64Decode(data.source);

return {
content: decodedSource,
content: data.source,
filepath: previewedFile.fileName.text,
Comment thread
brendan-kellam marked this conversation as resolved.
matches: previewedFile.chunks,
link: previewedFile.webUrl,
Expand Down
14 changes: 4 additions & 10 deletions packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
'use client';

import { useCallback, useMemo } from "react";
import { useCallback } from "react";
import { SearchResultFile, SearchResultChunk } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";


Expand All@@ -17,17 +16,12 @@ export const FileMatch = ({
file,
onOpen: _onOpen,
}: FileMatchProps) => {

const content = useMemo(() => {
return base64Decode(match.content);
}, [match.content]);

const onOpen = useCallback((isCtrlKeyPressed: boolean) => {
const startLineNumber = match.contentStart.lineNumber;
const endLineNumber = content.trimEnd().split('\n').length + startLineNumber - 1;
const endLineNumber = match.content.trimEnd().split('\n').length + startLineNumber - 1;

_onOpen(startLineNumber, endLineNumber, isCtrlKeyPressed);
}, [content, match.contentStart.lineNumber, _onOpen]);
}, [match.content, match.contentStart.lineNumber, _onOpen]);

// If it's just the title, don't show a code preview
if (match.matchRanges.length === 0) {
Expand DownExpand Up@@ -57,7 +51,7 @@ export const FileMatch = ({
lineNumbersOffset={match.contentStart.lineNumber}
renderWhitespace={true}
>
{content}
{match.content}
</LightweightCodeHighlighter>
</div>
);
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/ee/features/codeNav/components/exploreMenu/referenceList.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ import { PathHeader } from "@/app/[domain]/components/pathHeader";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import { FindRelatedSymbolsResponse } from "@/features/codeNav/types";
import { RepositoryInfo, SourceRange } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";
import { useMemo, useRef } from "react";
import useCaptureEvent from "@/hooks/useCaptureEvent";
import { useVirtualizer } from "@tanstack/react-virtual";
Expand DownExpand Up@@ -155,10 +154,6 @@ const ReferenceListItem = ({
onClick,
onMouseEnter,
}: ReferenceListItemProps) => {
const decodedLineContent = useMemo(() => {
return base64Decode(lineContent);
}, [lineContent]);

const highlightRanges = useMemo(() => [range], [range]);

return (
Expand All@@ -174,7 +169,7 @@ const ReferenceListItem = ({
lineNumbersOffset={range.start.lineNumber}
renderWhitespace={false}
>
{decodedLineContent}
{lineContent}
</LightweightCodeHighlighter>
</div>
)
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/ee/features/codeNav/components/symbolHoverPopup/symbolDefinitionPreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import { useMemo } from "react";
import { SourceRange } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";

interface SymbolDefinitionPreviewProps {
symbolDefinition: {
Expand All@@ -21,10 +20,6 @@ export const SymbolDefinitionPreview = ({
const { lineContent, language, range } = symbolDefinition;
const highlightRanges = useMemo(() => [range], [range]);

const decodedLineContent = useMemo(() => {
return base64Decode(lineContent);
}, [lineContent]);

return (
<div className="flex flex-col gap-2 mb-2">
<Tooltip
Expand DownExpand Up@@ -55,7 +50,7 @@ export const SymbolDefinitionPreview = ({
lineNumbersOffset={range.start.lineNumber}
renderWhitespace={false}
>
{decodedLineContent}
{lineContent}
</LightweightCodeHighlighter>
</div>
)
Expand Down
3 changes: 1 addition & 2 deletions packages/web/src/features/agents/review-agent/nodes/fetchFileContent.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { sourcebot_context, sourcebot_pr_payload } from "@/features/agents/review-agent/types";
import { getFileSource } from "@/features/search/fileSourceApi";
import { fileSourceResponseSchema } from "@/features/search/schemas";
import { base64Decode } from "@/lib/utils";
import { isServiceError } from "@/lib/utils";
import { env } from "@/env.mjs";
import { createLogger } from "@sourcebot/logger";
Expand All@@ -24,7 +23,7 @@ export const fetchFileContent = async (pr_payload: sourcebot_pr_payload, filenam
}

const fileSourceResponse = fileSourceResponseSchema.parse(response);
const fileContent = base64Decode(fileSourceResponse.source);
const fileContent = fileSourceResponse.source;

const fileContentContext: sourcebot_context = {
type: "file_content",
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/features/search/searchApi.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { SearchRequest, SearchResponse, SourceRange } from "./types";
import { OrgRole, Repo } from "@sourcebot/db";
import * as Sentry from "@sentry/nextjs";
import { sew, withAuth, withOrgMembership } from "@/actions";
import { base64Decode } from "@sourcebot/shared";

// List of supported query prefixes in zoekt.
// @see : https://github.com/sourcebot-dev/zoekt/blob/main/query/parse.go#L417
Expand DownExpand Up@@ -264,7 +265,7 @@ export const search = async ({ query, matches, contextLines, whole }: SearchRequ
.filter((chunk) => !chunk.FileName) // Filter out filename chunks.
.map((chunk) => {
return {
content: chunk.Content,
content: base64Decode(chunk.Content),
matchRanges: chunk.Ranges.map((range) => ({
start: {
byteOffset: range.Start.ByteOffset,
Expand DownExpand Up@@ -295,7 +296,7 @@ export const search = async ({ query, matches, contextLines, whole }: SearchRequ
}
}),
branches: file.Branches,
content: file.Content,
content: file.Content ? base64Decode(file.Content) : undefined,
}
}).filter((file) => file !== undefined) ?? [];

Expand Down
6 changes: 0 additions & 6 deletions packages/web/src/lib/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -301,12 +301,6 @@ export const isServiceError = (data: unknown): data is ServiceError => {
'message' in data;
}

// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}

// @see: https://stackoverflow.com/a/65959350/23221295
export const isDefined = <T>(arg: T | null | undefined): arg is T extends null | undefined ? never : T => {
return arg !== null && arg !== undefined;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

chore(api): Changed the search api to return raw source (instead of base64 encoding)#356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 4 commits into from
Jun 17, 2025
Merged

chore(api): Changed the search api to return raw source (instead of base64 encoding) #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd8d71a
changed search api to return base64 decoded source
brendan-kellam Jun 17, 2025
d397e23
changelog
brendan-kellam Jun 17, 2025
d8013cf
mcp changelog
brendan-kellam Jun 17, 2025
1e3d586
Add note for later
brendan-kellam Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

<!-- @NOTE: this release includes a API change that affects the MCP package (@sourcebot/mcp). On release, bump the MCP package's version and delete this message. -->

### Fixed
- Delete account join request when redeeming an invite. [#352](https://github.com/sourcebot-dev/sourcebot/pull/352)
- Fix issue where a repository would not be included in a search context if the context was created before the repository. [#354](https://github.com/sourcebot-dev/sourcebot/pull/354)

### Changed
- Changed search api (and all apis that depend on it) to return raw source code instead of base64 encoded string. ([356](https://github.com/sourcebot-dev/sourcebot/pull/356)).

Comment thread
brendan-kellam marked this conversation as resolved.

## [4.3.0] - 2025-06-11

### Added
Expand Down
3 changes: 3 additions & 0 deletions packages/mcp/CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed
- Updated API client to match the latest Sourcebot release. [#356](https://github.com/sourcebot-dev/sourcebot/pull/356)

## [1.0.2] - 2025-05-28

### Changed
Expand Down
7 changes: 3 additions & 4 deletions packages/mcp/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { z } from 'zod';
import { listRepos, search, getFileSource } from './client.js';
import { env, numberSchema } from './env.js';
import { TextContent } from './types.js';
import { base64Decode, isServiceError } from './utils.js';
import { isServiceError } from './utils.js';

// Create MCP server
const server = new McpServer({
Expand DownExpand Up@@ -114,8 +114,7 @@ server.tool(

if (includeCodeSnippets) {
const snippets = file.chunks.map(chunk => {
const content = base64Decode(chunk.content);
return `\`\`\`\n${content}\n\`\`\``
return `\`\`\`\n${chunk.content}\n\`\`\``
}).join('\n');
text += `\n\n${snippets}`;
}
Expand DownExpand Up@@ -201,7 +200,7 @@ server.tool(

const content: TextContent[] = [{
type: "text",
text: `file: ${fileName}\nrepository: ${repoId}\nlanguage: ${response.language}\nsource:\n${base64Decode(response.source)}`,
text: `file: ${fileName}\nrepository: ${repoId}\nlanguage: ${response.language}\nsource:\n${response.source}`,
}]

return {
Expand Down
5 changes: 0 additions & 5 deletions packages/mcp/src/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
import { ServiceError } from "./types.js";

// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}

export const isServiceError = (data: unknown): data is ServiceError => {
return typeof data === 'object' &&
Expand Down
4 changes: 2 additions & 2 deletions packages/web/src/app/[domain]/browse/[...path]/components/codePreviewPanel.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
'use client';

import { base64Decode, getCodeHostInfoForRepo, unwrapServiceError } from "@/lib/utils";
import { getCodeHostInfoForRepo, unwrapServiceError } from "@/lib/utils";
import { useBrowseParams } from "@/app/[domain]/browse/hooks/useBrowseParams";
import { useQuery } from "@tanstack/react-query";
import { getFileSource } from "@/features/search/fileSourceApi";
Expand DownExpand Up@@ -88,7 +88,7 @@ export const CodePreviewPanel = () => {
</div>
<Separator />
<PureCodePreviewPanel
source={base64Decode(fileSourceResponse.source)}
source={fileSourceResponse.source}
Comment thread
brendan-kellam marked this conversation as resolved.
language={fileSourceResponse.language}
repoName={repoName}
path={path}
Expand Down
5 changes: 1 addition & 4 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import { useDomain } from "@/hooks/useDomain";
import { SymbolIcon } from "@radix-ui/react-icons";
import { SetStateAction, Dispatch, useMemo } from "react";
import { getFileSource } from "@/features/search/fileSourceApi";
import { base64Decode } from "@/lib/utils";
import { unwrapServiceError } from "@/lib/utils";

interface CodePreviewPanelProps {
Expand DownExpand Up@@ -41,10 +40,8 @@ export const CodePreviewPanel = ({
}, domain)
),
select: (data) => {
const decodedSource = base64Decode(data.source);

return {
content: decodedSource,
content: data.source,
filepath: previewedFile.fileName.text,
Comment thread
brendan-kellam marked this conversation as resolved.
matches: previewedFile.chunks,
link: previewedFile.webUrl,
Expand Down
14 changes: 4 additions & 10 deletions packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
'use client';

import { useCallback, useMemo } from "react";
import { useCallback } from "react";
import { SearchResultFile, SearchResultChunk } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";


Expand All@@ -17,17 +16,12 @@ export const FileMatch = ({
file,
onOpen: _onOpen,
}: FileMatchProps) => {

const content = useMemo(() => {
return base64Decode(match.content);
}, [match.content]);

const onOpen = useCallback((isCtrlKeyPressed: boolean) => {
const startLineNumber = match.contentStart.lineNumber;
const endLineNumber = content.trimEnd().split('\n').length + startLineNumber - 1;
const endLineNumber = match.content.trimEnd().split('\n').length + startLineNumber - 1;

_onOpen(startLineNumber, endLineNumber, isCtrlKeyPressed);
}, [content, match.contentStart.lineNumber, _onOpen]);
}, [match.content, match.contentStart.lineNumber, _onOpen]);

// If it's just the title, don't show a code preview
if (match.matchRanges.length === 0) {
Expand DownExpand Up@@ -57,7 +51,7 @@ export const FileMatch = ({
lineNumbersOffset={match.contentStart.lineNumber}
renderWhitespace={true}
>
{content}
{match.content}
</LightweightCodeHighlighter>
</div>
);
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/ee/features/codeNav/components/exploreMenu/referenceList.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ import { PathHeader } from "@/app/[domain]/components/pathHeader";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import { FindRelatedSymbolsResponse } from "@/features/codeNav/types";
import { RepositoryInfo, SourceRange } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";
import { useMemo, useRef } from "react";
import useCaptureEvent from "@/hooks/useCaptureEvent";
import { useVirtualizer } from "@tanstack/react-virtual";
Expand DownExpand Up@@ -155,10 +154,6 @@ const ReferenceListItem = ({
onClick,
onMouseEnter,
}: ReferenceListItemProps) => {
const decodedLineContent = useMemo(() => {
return base64Decode(lineContent);
}, [lineContent]);

const highlightRanges = useMemo(() => [range], [range]);

return (
Expand All@@ -174,7 +169,7 @@ const ReferenceListItem = ({
lineNumbersOffset={range.start.lineNumber}
renderWhitespace={false}
>
{decodedLineContent}
{lineContent}
</LightweightCodeHighlighter>
</div>
)
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/ee/features/codeNav/components/symbolHoverPopup/symbolDefinitionPreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import { useMemo } from "react";
import { SourceRange } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";

interface SymbolDefinitionPreviewProps {
symbolDefinition: {
Expand All@@ -21,10 +20,6 @@ export const SymbolDefinitionPreview = ({
const { lineContent, language, range } = symbolDefinition;
const highlightRanges = useMemo(() => [range], [range]);

const decodedLineContent = useMemo(() => {
return base64Decode(lineContent);
}, [lineContent]);

return (
<div className="flex flex-col gap-2 mb-2">
<Tooltip
Expand DownExpand Up@@ -55,7 +50,7 @@ export const SymbolDefinitionPreview = ({
lineNumbersOffset={range.start.lineNumber}
renderWhitespace={false}
>
{decodedLineContent}
{lineContent}
</LightweightCodeHighlighter>
</div>
)
Expand Down
3 changes: 1 addition & 2 deletions packages/web/src/features/agents/review-agent/nodes/fetchFileContent.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { sourcebot_context, sourcebot_pr_payload } from "@/features/agents/review-agent/types";
import { getFileSource } from "@/features/search/fileSourceApi";
import { fileSourceResponseSchema } from "@/features/search/schemas";
import { base64Decode } from "@/lib/utils";
import { isServiceError } from "@/lib/utils";
import { env } from "@/env.mjs";
import { createLogger } from "@sourcebot/logger";
Expand All@@ -24,7 +23,7 @@ export const fetchFileContent = async (pr_payload: sourcebot_pr_payload, filenam
}

const fileSourceResponse = fileSourceResponseSchema.parse(response);
const fileContent = base64Decode(fileSourceResponse.source);
const fileContent = fileSourceResponse.source;

const fileContentContext: sourcebot_context = {
type: "file_content",
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/features/search/searchApi.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { SearchRequest, SearchResponse, SourceRange } from "./types";
import { OrgRole, Repo } from "@sourcebot/db";
import * as Sentry from "@sentry/nextjs";
import { sew, withAuth, withOrgMembership } from "@/actions";
import { base64Decode } from "@sourcebot/shared";

// List of supported query prefixes in zoekt.
// @see : https://github.com/sourcebot-dev/zoekt/blob/main/query/parse.go#L417
Expand DownExpand Up@@ -264,7 +265,7 @@ export const search = async ({ query, matches, contextLines, whole }: SearchRequ
.filter((chunk) => !chunk.FileName) // Filter out filename chunks.
.map((chunk) => {
return {
content: chunk.Content,
content: base64Decode(chunk.Content),
matchRanges: chunk.Ranges.map((range) => ({
start: {
byteOffset: range.Start.ByteOffset,
Expand DownExpand Up@@ -295,7 +296,7 @@ export const search = async ({ query, matches, contextLines, whole }: SearchRequ
}
}),
branches: file.Branches,
content: file.Content,
content: file.Content ? base64Decode(file.Content) : undefined,
}
}).filter((file) => file !== undefined) ?? [];

Expand Down
6 changes: 0 additions & 6 deletions packages/web/src/lib/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -301,12 +301,6 @@ export const isServiceError = (data: unknown): data is ServiceError => {
'message' in data;
}

// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}

// @see: https://stackoverflow.com/a/65959350/23221295
export const isDefined = <T>(arg: T | null | undefined): arg is T extends null | undefined ? never : T => {
return arg !== null && arg !== undefined;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

chore(api): Changed the search api to return raw source (instead of base64 encoding)#356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 4 commits into from
Jun 17, 2025
Merged

chore(api): Changed the search api to return raw source (instead of base64 encoding) #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd8d71a
changed search api to return base64 decoded source
brendan-kellam Jun 17, 2025
d397e23
changelog
brendan-kellam Jun 17, 2025
d8013cf
mcp changelog
brendan-kellam Jun 17, 2025
1e3d586
Add note for later
brendan-kellam Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

<!-- @NOTE: this release includes a API change that affects the MCP package (@sourcebot/mcp). On release, bump the MCP package's version and delete this message. -->

### Fixed
- Delete account join request when redeeming an invite. [#352](https://github.com/sourcebot-dev/sourcebot/pull/352)
- Fix issue where a repository would not be included in a search context if the context was created before the repository. [#354](https://github.com/sourcebot-dev/sourcebot/pull/354)

### Changed
- Changed search api (and all apis that depend on it) to return raw source code instead of base64 encoded string. ([356](https://github.com/sourcebot-dev/sourcebot/pull/356)).

Comment thread
brendan-kellam marked this conversation as resolved.

## [4.3.0] - 2025-06-11

### Added
Expand Down
3 changes: 3 additions & 0 deletions packages/mcp/CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed
- Updated API client to match the latest Sourcebot release. [#356](https://github.com/sourcebot-dev/sourcebot/pull/356)

## [1.0.2] - 2025-05-28

### Changed
Expand Down
7 changes: 3 additions & 4 deletions packages/mcp/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { z } from 'zod';
import { listRepos, search, getFileSource } from './client.js';
import { env, numberSchema } from './env.js';
import { TextContent } from './types.js';
import { base64Decode, isServiceError } from './utils.js';
import { isServiceError } from './utils.js';

// Create MCP server
const server = new McpServer({
Expand DownExpand Up@@ -114,8 +114,7 @@ server.tool(

if (includeCodeSnippets) {
const snippets = file.chunks.map(chunk => {
const content = base64Decode(chunk.content);
return `\`\`\`\n${content}\n\`\`\``
return `\`\`\`\n${chunk.content}\n\`\`\``
}).join('\n');
text += `\n\n${snippets}`;
}
Expand DownExpand Up@@ -201,7 +200,7 @@ server.tool(

const content: TextContent[] = [{
type: "text",
text: `file: ${fileName}\nrepository: ${repoId}\nlanguage: ${response.language}\nsource:\n${base64Decode(response.source)}`,
text: `file: ${fileName}\nrepository: ${repoId}\nlanguage: ${response.language}\nsource:\n${response.source}`,
}]

return {
Expand Down
5 changes: 0 additions & 5 deletions packages/mcp/src/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
import { ServiceError } from "./types.js";

// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}

export const isServiceError = (data: unknown): data is ServiceError => {
return typeof data === 'object' &&
Expand Down
4 changes: 2 additions & 2 deletions packages/web/src/app/[domain]/browse/[...path]/components/codePreviewPanel.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
'use client';

import { base64Decode, getCodeHostInfoForRepo, unwrapServiceError } from "@/lib/utils";
import { getCodeHostInfoForRepo, unwrapServiceError } from "@/lib/utils";
import { useBrowseParams } from "@/app/[domain]/browse/hooks/useBrowseParams";
import { useQuery } from "@tanstack/react-query";
import { getFileSource } from "@/features/search/fileSourceApi";
Expand DownExpand Up@@ -88,7 +88,7 @@ export const CodePreviewPanel = () => {
</div>
<Separator />
<PureCodePreviewPanel
source={base64Decode(fileSourceResponse.source)}
source={fileSourceResponse.source}
Comment thread
brendan-kellam marked this conversation as resolved.
language={fileSourceResponse.language}
repoName={repoName}
path={path}
Expand Down
5 changes: 1 addition & 4 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import { useDomain } from "@/hooks/useDomain";
import { SymbolIcon } from "@radix-ui/react-icons";
import { SetStateAction, Dispatch, useMemo } from "react";
import { getFileSource } from "@/features/search/fileSourceApi";
import { base64Decode } from "@/lib/utils";
import { unwrapServiceError } from "@/lib/utils";

interface CodePreviewPanelProps {
Expand DownExpand Up@@ -41,10 +40,8 @@ export const CodePreviewPanel = ({
}, domain)
),
select: (data) => {
const decodedSource = base64Decode(data.source);

return {
content: decodedSource,
content: data.source,
filepath: previewedFile.fileName.text,
Comment thread
brendan-kellam marked this conversation as resolved.
matches: previewedFile.chunks,
link: previewedFile.webUrl,
Expand Down
14 changes: 4 additions & 10 deletions packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
'use client';

import { useCallback, useMemo } from "react";
import { useCallback } from "react";
import { SearchResultFile, SearchResultChunk } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";


Expand All@@ -17,17 +16,12 @@ export const FileMatch = ({
file,
onOpen: _onOpen,
}: FileMatchProps) => {

const content = useMemo(() => {
return base64Decode(match.content);
}, [match.content]);

const onOpen = useCallback((isCtrlKeyPressed: boolean) => {
const startLineNumber = match.contentStart.lineNumber;
const endLineNumber = content.trimEnd().split('\n').length + startLineNumber - 1;
const endLineNumber = match.content.trimEnd().split('\n').length + startLineNumber - 1;

_onOpen(startLineNumber, endLineNumber, isCtrlKeyPressed);
}, [content, match.contentStart.lineNumber, _onOpen]);
}, [match.content, match.contentStart.lineNumber, _onOpen]);

// If it's just the title, don't show a code preview
if (match.matchRanges.length === 0) {
Expand DownExpand Up@@ -57,7 +51,7 @@ export const FileMatch = ({
lineNumbersOffset={match.contentStart.lineNumber}
renderWhitespace={true}
>
{content}
{match.content}
</LightweightCodeHighlighter>
</div>
);
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/ee/features/codeNav/components/exploreMenu/referenceList.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ import { PathHeader } from "@/app/[domain]/components/pathHeader";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import { FindRelatedSymbolsResponse } from "@/features/codeNav/types";
import { RepositoryInfo, SourceRange } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";
import { useMemo, useRef } from "react";
import useCaptureEvent from "@/hooks/useCaptureEvent";
import { useVirtualizer } from "@tanstack/react-virtual";
Expand DownExpand Up@@ -155,10 +154,6 @@ const ReferenceListItem = ({
onClick,
onMouseEnter,
}: ReferenceListItemProps) => {
const decodedLineContent = useMemo(() => {
return base64Decode(lineContent);
}, [lineContent]);

const highlightRanges = useMemo(() => [range], [range]);

return (
Expand All@@ -174,7 +169,7 @@ const ReferenceListItem = ({
lineNumbersOffset={range.start.lineNumber}
renderWhitespace={false}
>
{decodedLineContent}
{lineContent}
</LightweightCodeHighlighter>
</div>
)
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/ee/features/codeNav/components/symbolHoverPopup/symbolDefinitionPreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import { useMemo } from "react";
import { SourceRange } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";

interface SymbolDefinitionPreviewProps {
symbolDefinition: {
Expand All@@ -21,10 +20,6 @@ export const SymbolDefinitionPreview = ({
const { lineContent, language, range } = symbolDefinition;
const highlightRanges = useMemo(() => [range], [range]);

const decodedLineContent = useMemo(() => {
return base64Decode(lineContent);
}, [lineContent]);

return (
<div className="flex flex-col gap-2 mb-2">
<Tooltip
Expand DownExpand Up@@ -55,7 +50,7 @@ export const SymbolDefinitionPreview = ({
lineNumbersOffset={range.start.lineNumber}
renderWhitespace={false}
>
{decodedLineContent}
{lineContent}
</LightweightCodeHighlighter>
</div>
)
Expand Down
3 changes: 1 addition & 2 deletions packages/web/src/features/agents/review-agent/nodes/fetchFileContent.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { sourcebot_context, sourcebot_pr_payload } from "@/features/agents/review-agent/types";
import { getFileSource } from "@/features/search/fileSourceApi";
import { fileSourceResponseSchema } from "@/features/search/schemas";
import { base64Decode } from "@/lib/utils";
import { isServiceError } from "@/lib/utils";
import { env } from "@/env.mjs";
import { createLogger } from "@sourcebot/logger";
Expand All@@ -24,7 +23,7 @@ export const fetchFileContent = async (pr_payload: sourcebot_pr_payload, filenam
}

const fileSourceResponse = fileSourceResponseSchema.parse(response);
const fileContent = base64Decode(fileSourceResponse.source);
const fileContent = fileSourceResponse.source;

const fileContentContext: sourcebot_context = {
type: "file_content",
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/features/search/searchApi.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { SearchRequest, SearchResponse, SourceRange } from "./types";
import { OrgRole, Repo } from "@sourcebot/db";
import * as Sentry from "@sentry/nextjs";
import { sew, withAuth, withOrgMembership } from "@/actions";
import { base64Decode } from "@sourcebot/shared";

// List of supported query prefixes in zoekt.
// @see : https://github.com/sourcebot-dev/zoekt/blob/main/query/parse.go#L417
Expand DownExpand Up@@ -264,7 +265,7 @@ export const search = async ({ query, matches, contextLines, whole }: SearchRequ
.filter((chunk) => !chunk.FileName) // Filter out filename chunks.
.map((chunk) => {
return {
content: chunk.Content,
content: base64Decode(chunk.Content),
matchRanges: chunk.Ranges.map((range) => ({
start: {
byteOffset: range.Start.ByteOffset,
Expand DownExpand Up@@ -295,7 +296,7 @@ export const search = async ({ query, matches, contextLines, whole }: SearchRequ
}
}),
branches: file.Branches,
content: file.Content,
content: file.Content ? base64Decode(file.Content) : undefined,
}
}).filter((file) => file !== undefined) ?? [];

Expand Down
6 changes: 0 additions & 6 deletions packages/web/src/lib/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -301,12 +301,6 @@ export const isServiceError = (data: unknown): data is ServiceError => {
'message' in data;
}

// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}

// @see: https://stackoverflow.com/a/65959350/23221295
export const isDefined = <T>(arg: T | null | undefined): arg is T extends null | undefined ? never : T => {
return arg !== null && arg !== undefined;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

chore(api): Changed the search api to return raw source (instead of base64 encoding)#356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brendan-kellam merged 4 commits into from
Jun 17, 2025
Merged

chore(api): Changed the search api to return raw source (instead of base64 encoding) #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cd8d71a
changed search api to return base64 decoded source
brendan-kellam Jun 17, 2025
d397e23
changelog
brendan-kellam Jun 17, 2025
d8013cf
mcp changelog
brendan-kellam Jun 17, 2025
1e3d586
Add note for later
brendan-kellam Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

<!-- @NOTE: this release includes a API change that affects the MCP package (@sourcebot/mcp). On release, bump the MCP package's version and delete this message. -->

### Fixed
- Delete account join request when redeeming an invite. [#352](https://github.com/sourcebot-dev/sourcebot/pull/352)
- Fix issue where a repository would not be included in a search context if the context was created before the repository. [#354](https://github.com/sourcebot-dev/sourcebot/pull/354)

### Changed
- Changed search api (and all apis that depend on it) to return raw source code instead of base64 encoded string. ([356](https://github.com/sourcebot-dev/sourcebot/pull/356)).

Comment thread
brendan-kellam marked this conversation as resolved.

## [4.3.0] - 2025-06-11

### Added
Expand Down
3 changes: 3 additions & 0 deletions packages/mcp/CHANGELOG.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed
- Updated API client to match the latest Sourcebot release. [#356](https://github.com/sourcebot-dev/sourcebot/pull/356)

## [1.0.2] - 2025-05-28

### Changed
Expand Down
7 changes: 3 additions & 4 deletions packages/mcp/src/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,7 +8,7 @@ import { z } from 'zod';
import { listRepos, search, getFileSource } from './client.js';
import { env, numberSchema } from './env.js';
import { TextContent } from './types.js';
import { base64Decode, isServiceError } from './utils.js';
import { isServiceError } from './utils.js';

// Create MCP server
const server = new McpServer({
Expand DownExpand Up@@ -114,8 +114,7 @@ server.tool(

if (includeCodeSnippets) {
const snippets = file.chunks.map(chunk => {
const content = base64Decode(chunk.content);
return `\`\`\`\n${content}\n\`\`\``
return `\`\`\`\n${chunk.content}\n\`\`\``
}).join('\n');
text += `\n\n${snippets}`;
}
Expand DownExpand Up@@ -201,7 +200,7 @@ server.tool(

const content: TextContent[] = [{
type: "text",
text: `file: ${fileName}\nrepository: ${repoId}\nlanguage: ${response.language}\nsource:\n${base64Decode(response.source)}`,
text: `file: ${fileName}\nrepository: ${repoId}\nlanguage: ${response.language}\nsource:\n${response.source}`,
}]

return {
Expand Down
5 changes: 0 additions & 5 deletions packages/mcp/src/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
import { ServiceError } from "./types.js";

// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}

export const isServiceError = (data: unknown): data is ServiceError => {
return typeof data === 'object' &&
Expand Down
4 changes: 2 additions & 2 deletions packages/web/src/app/[domain]/browse/[...path]/components/codePreviewPanel.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
'use client';

import { base64Decode, getCodeHostInfoForRepo, unwrapServiceError } from "@/lib/utils";
import { getCodeHostInfoForRepo, unwrapServiceError } from "@/lib/utils";
import { useBrowseParams } from "@/app/[domain]/browse/hooks/useBrowseParams";
import { useQuery } from "@tanstack/react-query";
import { getFileSource } from "@/features/search/fileSourceApi";
Expand DownExpand Up@@ -88,7 +88,7 @@ export const CodePreviewPanel = () => {
</div>
<Separator />
<PureCodePreviewPanel
source={base64Decode(fileSourceResponse.source)}
source={fileSourceResponse.source}
Comment thread
brendan-kellam marked this conversation as resolved.
language={fileSourceResponse.language}
repoName={repoName}
path={path}
Expand Down
5 changes: 1 addition & 4 deletions packages/web/src/app/[domain]/search/components/codePreviewPanel/index.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,6 @@ import { useDomain } from "@/hooks/useDomain";
import { SymbolIcon } from "@radix-ui/react-icons";
import { SetStateAction, Dispatch, useMemo } from "react";
import { getFileSource } from "@/features/search/fileSourceApi";
import { base64Decode } from "@/lib/utils";
import { unwrapServiceError } from "@/lib/utils";

interface CodePreviewPanelProps {
Expand DownExpand Up@@ -41,10 +40,8 @@ export const CodePreviewPanel = ({
}, domain)
),
select: (data) => {
const decodedSource = base64Decode(data.source);

return {
content: decodedSource,
content: data.source,
filepath: previewedFile.fileName.text,
Comment thread
brendan-kellam marked this conversation as resolved.
matches: previewedFile.chunks,
link: previewedFile.webUrl,
Expand Down
14 changes: 4 additions & 10 deletions packages/web/src/app/[domain]/search/components/searchResultsPanel/fileMatch.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
'use client';

import { useCallback, useMemo } from "react";
import { useCallback } from "react";
import { SearchResultFile, SearchResultChunk } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";


Expand All@@ -17,17 +16,12 @@ export const FileMatch = ({
file,
onOpen: _onOpen,
}: FileMatchProps) => {

const content = useMemo(() => {
return base64Decode(match.content);
}, [match.content]);

const onOpen = useCallback((isCtrlKeyPressed: boolean) => {
const startLineNumber = match.contentStart.lineNumber;
const endLineNumber = content.trimEnd().split('\n').length + startLineNumber - 1;
const endLineNumber = match.content.trimEnd().split('\n').length + startLineNumber - 1;

_onOpen(startLineNumber, endLineNumber, isCtrlKeyPressed);
}, [content, match.contentStart.lineNumber, _onOpen]);
}, [match.content, match.contentStart.lineNumber, _onOpen]);

// If it's just the title, don't show a code preview
if (match.matchRanges.length === 0) {
Expand DownExpand Up@@ -57,7 +51,7 @@ export const FileMatch = ({
lineNumbersOffset={match.contentStart.lineNumber}
renderWhitespace={true}
>
{content}
{match.content}
</LightweightCodeHighlighter>
</div>
);
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/ee/features/codeNav/components/exploreMenu/referenceList.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,6 @@ import { PathHeader } from "@/app/[domain]/components/pathHeader";
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import { FindRelatedSymbolsResponse } from "@/features/codeNav/types";
import { RepositoryInfo, SourceRange } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";
import { useMemo, useRef } from "react";
import useCaptureEvent from "@/hooks/useCaptureEvent";
import { useVirtualizer } from "@tanstack/react-virtual";
Expand DownExpand Up@@ -155,10 +154,6 @@ const ReferenceListItem = ({
onClick,
onMouseEnter,
}: ReferenceListItemProps) => {
const decodedLineContent = useMemo(() => {
return base64Decode(lineContent);
}, [lineContent]);

const highlightRanges = useMemo(() => [range], [range]);

return (
Expand All@@ -174,7 +169,7 @@ const ReferenceListItem = ({
lineNumbersOffset={range.start.lineNumber}
renderWhitespace={false}
>
{decodedLineContent}
{lineContent}
</LightweightCodeHighlighter>
</div>
)
Expand Down
7 changes: 1 addition & 6 deletions packages/web/src/ee/features/codeNav/components/symbolHoverPopup/symbolDefinitionPreview.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,7 +3,6 @@ import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip
import { LightweightCodeHighlighter } from "@/app/[domain]/components/lightweightCodeHighlighter";
import { useMemo } from "react";
import { SourceRange } from "@/features/search/types";
import { base64Decode } from "@/lib/utils";

interface SymbolDefinitionPreviewProps {
symbolDefinition: {
Expand All@@ -21,10 +20,6 @@ export const SymbolDefinitionPreview = ({
const { lineContent, language, range } = symbolDefinition;
const highlightRanges = useMemo(() => [range], [range]);

const decodedLineContent = useMemo(() => {
return base64Decode(lineContent);
}, [lineContent]);

return (
<div className="flex flex-col gap-2 mb-2">
<Tooltip
Expand DownExpand Up@@ -55,7 +50,7 @@ export const SymbolDefinitionPreview = ({
lineNumbersOffset={range.start.lineNumber}
renderWhitespace={false}
>
{decodedLineContent}
{lineContent}
</LightweightCodeHighlighter>
</div>
)
Expand Down
3 changes: 1 addition & 2 deletions packages/web/src/features/agents/review-agent/nodes/fetchFileContent.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
import { sourcebot_context, sourcebot_pr_payload } from "@/features/agents/review-agent/types";
import { getFileSource } from "@/features/search/fileSourceApi";
import { fileSourceResponseSchema } from "@/features/search/schemas";
import { base64Decode } from "@/lib/utils";
import { isServiceError } from "@/lib/utils";
import { env } from "@/env.mjs";
import { createLogger } from "@sourcebot/logger";
Expand All@@ -24,7 +23,7 @@ export const fetchFileContent = async (pr_payload: sourcebot_pr_payload, filenam
}

const fileSourceResponse = fileSourceResponseSchema.parse(response);
const fileContent = base64Decode(fileSourceResponse.source);
const fileContent = fileSourceResponse.source;

const fileContentContext: sourcebot_context = {
type: "file_content",
Expand Down
5 changes: 3 additions & 2 deletions packages/web/src/features/search/searchApi.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { SearchRequest, SearchResponse, SourceRange } from "./types";
import { OrgRole, Repo } from "@sourcebot/db";
import * as Sentry from "@sentry/nextjs";
import { sew, withAuth, withOrgMembership } from "@/actions";
import { base64Decode } from "@sourcebot/shared";

// List of supported query prefixes in zoekt.
// @see : https://github.com/sourcebot-dev/zoekt/blob/main/query/parse.go#L417
Expand DownExpand Up@@ -264,7 +265,7 @@ export const search = async ({ query, matches, contextLines, whole }: SearchRequ
.filter((chunk) => !chunk.FileName) // Filter out filename chunks.
.map((chunk) => {
return {
content: chunk.Content,
content: base64Decode(chunk.Content),
matchRanges: chunk.Ranges.map((range) => ({
start: {
byteOffset: range.Start.ByteOffset,
Expand DownExpand Up@@ -295,7 +296,7 @@ export const search = async ({ query, matches, contextLines, whole }: SearchRequ
}
}),
branches: file.Branches,
content: file.Content,
content: file.Content ? base64Decode(file.Content) : undefined,
}
}).filter((file) => file !== undefined) ?? [];

Expand Down
6 changes: 0 additions & 6 deletions packages/web/src/lib/utils.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -301,12 +301,6 @@ export const isServiceError = (data: unknown): data is ServiceError => {
'message' in data;
}

// From https://developer.mozilla.org/en-US/docs/Glossary/Base64#the_unicode_problem
export const base64Decode = (base64: string): string => {
const binString = atob(base64);
return Buffer.from(Uint8Array.from(binString, (m) => m.codePointAt(0)!).buffer).toString();
}

// @see: https://stackoverflow.com/a/65959350/23221295
export const isDefined = <T>(arg: T | null | undefined): arg is T extends null | undefined ? never : T => {
return arg !== null && arg !== undefined;
Expand Down