Skip to content

Commit 9d3bb1b

Browse files
msukkariclaude
msukkari
and
claude
authored
chore: sync vendor/zoekt with upstream sourcegraph/zoekt (#1140)
* chore: sync vendor/zoekt with upstream sourcegraph/zoekt Bumps the vendor/zoekt submodule to pull in 108 upstream commits from sourcegraph/zoekt. See sourcebot-dev/zoekt#10. The -shard_prefix flag on zoekt-git-index was renamed upstream to -shard_prefix_override; the backend indexer is updated accordingly. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: add changelog entry for zoekt upstream sync Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: regenerate web protos from upgraded zoekt Adds the new Meta message, Q.meta field, and Repository.metadata map that upstream zoekt added in sourcegraph/zoekt#962 and #979. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * chore: repoint vendor/zoekt at sourcebot-dev/zoekt@main merge commit sourcebot-dev/zoekt#10 merged as da9bf1a3. Updating the submodule pointer from the feature-branch tip (8566836f) to the merge commit on main so vendor/zoekt tracks the canonical history before merging. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent b8145a6 commit 9d3bb1b

8 files changed

Lines changed: 40 additions & 4 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
77

88
## [Unreleased]
99

10+
### Changed
11+
- Synced `vendor/zoekt` with upstream `sourcegraph/zoekt`. [#1140](https://github.com/sourcebot-dev/sourcebot/pull/1140)
12+
1013
## [4.16.12] - 2026-04-20
1114

1215
### Fixed

‎packages/backend/src/zoekt.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const indexGitRepository = async (repo: Repo, settings: Settings, revisio
2323
`-branches "${revisions.join(',')}"`,
2424
`-tenant_id ${repo.orgId}`,
2525
`-repo_id ${repo.id}`,
26-
`-shard_prefix ${shardPrefix}`,
26+
`-shard_prefix_override ${shardPrefix}`,
2727
...largeFileGlobPatterns.map((pattern) => `-large_file "${pattern}"`),
2828
repoPath
2929
].join(' ');

‎packages/web/src/proto/query.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import type { BranchRepos as _zoekt_webserver_v1_BranchRepos, BranchRepos__Outpu
88
import type { BranchesRepos as _zoekt_webserver_v1_BranchesRepos, BranchesRepos__Output as _zoekt_webserver_v1_BranchesRepos__Output } from './zoekt/webserver/v1/BranchesRepos';
99
import type { FileNameSet as _zoekt_webserver_v1_FileNameSet, FileNameSet__Output as _zoekt_webserver_v1_FileNameSet__Output } from './zoekt/webserver/v1/FileNameSet';
1010
import type { Language as _zoekt_webserver_v1_Language, Language__Output as _zoekt_webserver_v1_Language__Output } from './zoekt/webserver/v1/Language';
11+
import type { Meta as _zoekt_webserver_v1_Meta, Meta__Output as _zoekt_webserver_v1_Meta__Output } from './zoekt/webserver/v1/Meta';
1112
import type { Not as _zoekt_webserver_v1_Not, Not__Output as _zoekt_webserver_v1_Not__Output } from './zoekt/webserver/v1/Not';
1213
import type { Or as _zoekt_webserver_v1_Or, Or__Output as _zoekt_webserver_v1_Or__Output } from './zoekt/webserver/v1/Or';
1314
import type { Q as _zoekt_webserver_v1_Q, Q__Output as _zoekt_webserver_v1_Q__Output } from './zoekt/webserver/v1/Q';
@@ -36,6 +37,7 @@ export interface ProtoGrpcType {
3637
BranchesRepos: MessageTypeDefinition<_zoekt_webserver_v1_BranchesRepos, _zoekt_webserver_v1_BranchesRepos__Output>
3738
FileNameSet: MessageTypeDefinition<_zoekt_webserver_v1_FileNameSet, _zoekt_webserver_v1_FileNameSet__Output>
3839
Language: MessageTypeDefinition<_zoekt_webserver_v1_Language, _zoekt_webserver_v1_Language__Output>
40+
Meta: MessageTypeDefinition<_zoekt_webserver_v1_Meta, _zoekt_webserver_v1_Meta__Output>
3941
Not: MessageTypeDefinition<_zoekt_webserver_v1_Not, _zoekt_webserver_v1_Not__Output>
4042
Or: MessageTypeDefinition<_zoekt_webserver_v1_Or, _zoekt_webserver_v1_Or__Output>
4143
Q: MessageTypeDefinition<_zoekt_webserver_v1_Q, _zoekt_webserver_v1_Q__Output>

‎packages/web/src/proto/webserver.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import type { ListOptions as _zoekt_webserver_v1_ListOptions, ListOptions__Outpu
1919
import type { ListRequest as _zoekt_webserver_v1_ListRequest, ListRequest__Output as _zoekt_webserver_v1_ListRequest__Output } from './zoekt/webserver/v1/ListRequest';
2020
import type { ListResponse as _zoekt_webserver_v1_ListResponse, ListResponse__Output as _zoekt_webserver_v1_ListResponse__Output } from './zoekt/webserver/v1/ListResponse';
2121
import type { Location as _zoekt_webserver_v1_Location, Location__Output as _zoekt_webserver_v1_Location__Output } from './zoekt/webserver/v1/Location';
22+
import type { Meta as _zoekt_webserver_v1_Meta, Meta__Output as _zoekt_webserver_v1_Meta__Output } from './zoekt/webserver/v1/Meta';
2223
import type { MinimalRepoListEntry as _zoekt_webserver_v1_MinimalRepoListEntry, MinimalRepoListEntry__Output as _zoekt_webserver_v1_MinimalRepoListEntry__Output } from './zoekt/webserver/v1/MinimalRepoListEntry';
2324
import type { Not as _zoekt_webserver_v1_Not, Not__Output as _zoekt_webserver_v1_Not__Output } from './zoekt/webserver/v1/Not';
2425
import type { Or as _zoekt_webserver_v1_Or, Or__Output as _zoekt_webserver_v1_Or__Output } from './zoekt/webserver/v1/Or';
@@ -78,6 +79,7 @@ export interface ProtoGrpcType {
7879
ListRequest: MessageTypeDefinition<_zoekt_webserver_v1_ListRequest, _zoekt_webserver_v1_ListRequest__Output>
7980
ListResponse: MessageTypeDefinition<_zoekt_webserver_v1_ListResponse, _zoekt_webserver_v1_ListResponse__Output>
8081
Location: MessageTypeDefinition<_zoekt_webserver_v1_Location, _zoekt_webserver_v1_Location__Output>
82+
Meta: MessageTypeDefinition<_zoekt_webserver_v1_Meta, _zoekt_webserver_v1_Meta__Output>
8183
MinimalRepoListEntry: MessageTypeDefinition<_zoekt_webserver_v1_MinimalRepoListEntry, _zoekt_webserver_v1_MinimalRepoListEntry__Output>
8284
Not: MessageTypeDefinition<_zoekt_webserver_v1_Not, _zoekt_webserver_v1_Not__Output>
8385
Or: MessageTypeDefinition<_zoekt_webserver_v1_Or, _zoekt_webserver_v1_Or__Output>

‎packages/web/src/proto/zoekt/webserver/v1/Meta.ts‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Original file: ../../vendor/zoekt/grpc/protos/zoekt/webserver/v1/query.proto
2+
3+
4+
/**
5+
* Meta allows filtering results by repo metadata.
6+
*/
7+
export interface Meta {
8+
'key'?: (string);
9+
'value'?: (string);
10+
}
11+
12+
/**
13+
* Meta allows filtering results by repo metadata.
14+
*/
15+
export interface Meta__Output {
16+
'key': (string);
17+
'value': (string);
18+
}

‎packages/web/src/proto/zoekt/webserver/v1/Q.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import type { Or as _zoekt_webserver_v1_Or, Or__Output as _zoekt_webserver_v1_Or
1717
import type { Not as _zoekt_webserver_v1_Not, Not__Output as _zoekt_webserver_v1_Not__Output } from '../../../zoekt/webserver/v1/Not';
1818
import type { Branch as _zoekt_webserver_v1_Branch, Branch__Output as _zoekt_webserver_v1_Branch__Output } from '../../../zoekt/webserver/v1/Branch';
1919
import type { Boost as _zoekt_webserver_v1_Boost, Boost__Output as _zoekt_webserver_v1_Boost__Output } from '../../../zoekt/webserver/v1/Boost';
20+
import type { Meta as _zoekt_webserver_v1_Meta, Meta__Output as _zoekt_webserver_v1_Meta__Output } from '../../../zoekt/webserver/v1/Meta';
2021

2122
export interface Q {
2223
'raw_config'?: (_zoekt_webserver_v1_RawConfig | null);
@@ -37,7 +38,8 @@ export interface Q {
3738
'not'?: (_zoekt_webserver_v1_Not | null);
3839
'branch'?: (_zoekt_webserver_v1_Branch | null);
3940
'boost'?: (_zoekt_webserver_v1_Boost | null);
40-
'query'?: "raw_config"|"regexp"|"symbol"|"language"|"const"|"repo"|"repo_regexp"|"branches_repos"|"repo_ids"|"repo_set"|"file_name_set"|"type"|"substring"|"and"|"or"|"not"|"branch"|"boost";
41+
'meta'?: (_zoekt_webserver_v1_Meta | null);
42+
'query'?: "raw_config"|"regexp"|"symbol"|"language"|"const"|"repo"|"repo_regexp"|"branches_repos"|"repo_ids"|"repo_set"|"file_name_set"|"type"|"substring"|"and"|"or"|"not"|"branch"|"boost"|"meta";
4143
}
4244

4345
export interface Q__Output {
@@ -59,5 +61,6 @@ export interface Q__Output {
5961
'not'?: (_zoekt_webserver_v1_Not__Output | null);
6062
'branch'?: (_zoekt_webserver_v1_Branch__Output | null);
6163
'boost'?: (_zoekt_webserver_v1_Boost__Output | null);
62-
'query'?: "raw_config"|"regexp"|"symbol"|"language"|"const"|"repo"|"repo_regexp"|"branches_repos"|"repo_ids"|"repo_set"|"file_name_set"|"type"|"substring"|"and"|"or"|"not"|"branch"|"boost";
64+
'meta'?: (_zoekt_webserver_v1_Meta__Output | null);
65+
'query'?: "raw_config"|"regexp"|"symbol"|"language"|"const"|"repo"|"repo_regexp"|"branches_repos"|"repo_ids"|"repo_set"|"file_name_set"|"type"|"substring"|"and"|"or"|"not"|"branch"|"boost"|"meta";
6366
}

‎packages/web/src/proto/zoekt/webserver/v1/Repository.ts‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ export interface Repository {
9292
* tenant_id is the tenant ID of the repository.
9393
*/
9494
'tenant_id'?: (number | string | Long);
95+
/**
96+
* Additional metadata about the repository.
97+
*/
98+
'metadata'?: ({[key: string]: string});
9599
}
96100

97101
export interface Repository__Output {
@@ -181,4 +185,8 @@ export interface Repository__Output {
181185
* tenant_id is the tenant ID of the repository.
182186
*/
183187
'tenant_id': (number);
188+
/**
189+
* Additional metadata about the repository.
190+
*/
191+
'metadata': ({[key: string]: string});
184192
}

‎vendor/zoekt‎

Submodule zoekt updated 234 files

0 commit comments

Comments
 (0)