Skip to content

Commit ba5b32b

Browse files
authored
Resolve transitive dep issue where foyle relied on outdated APIs (runme's parser) (#2208)
* Move to protos served out of runmedev org buf registry Signed-off-by: Sebastian (Tiedtke) Huckleberry <[email protected]> * Fix unit tests Signed-off-by: Sebastian (Tiedtke) Huckleberry <[email protected]> --------- Signed-off-by: Sebastian (Tiedtke) Huckleberry <[email protected]>
1 parent e0b5553 commit ba5b32b

26 files changed

Lines changed: 259 additions & 83 deletions

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ If you want to run the extension against a specific runme kernel binary, you can
133133
To upgrade the kernel gRPC dependencies, you can run the following command. Be sure to release the `runme` kernel binary before a stable merge/release.
134134

135135
```sh {"background":"false","id":"01JAQYD2R3KN63QZ7EC2T2AB58"}
136-
npm install -s "@buf/stateful_runme.community_timostamm-protobuf-ts@latest"
136+
npm install -s "@buf/runmedev_runme.community_timostamm-protobuf-ts@latest"
137137
```
138138

139139
### Debug Project

package-lock.json

Lines changed: 115 additions & 43 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1480,12 +1480,12 @@
14801480
"@aws-sdk/client-eks": "^3.906.0",
14811481
"@aws-sdk/credential-providers": "^3.906.0",
14821482
"@buf/grpc_grpc.community_timostamm-protobuf-ts": "^2.11.1-20250429200738-0ee95b84c2c7.1",
1483-
"@buf/jlewi_foyle.bufbuild_es": "^1.10.0-20241219050144-856e893555b3.1",
1484-
"@buf/jlewi_foyle.connectrpc_es": "^1.6.1-20241219050144-856e893555b3.2",
1485-
"@buf/stateful_runme.bufbuild_es": "^1.10.0-20250206174444-18b490372055.1",
1486-
"@buf/stateful_runme.community_timostamm-protobuf-ts": "^2.11.1-20250528202426-1ee80741ba94.1",
1487-
"@connectrpc/connect": "^1.4.0",
1488-
"@connectrpc/connect-node": "^1.6.1",
1483+
"@buf/runmedev_foyle.bufbuild_es": "^1.10.0-20251009191544-e8a5d004daaa.1",
1484+
"@buf/runmedev_foyle.connectrpc_es": "^1.6.1-20251009191544-e8a5d004daaa.2",
1485+
"@buf/runmedev_runme.bufbuild_es": "^1.10.0-20251009190022-068cc6f56f01.1",
1486+
"@buf/runmedev_runme.community_timostamm-protobuf-ts": "^2.11.1-20251009190022-068cc6f56f01.1",
1487+
"@connectrpc/connect": "^1.7.0",
1488+
"@connectrpc/connect-node": "^1.7.0",
14891489
"@google-cloud/compute": "^5.2.0",
14901490
"@google-cloud/container": "^6.1.0",
14911491
"@google-cloud/run": "^3.0.0",

src/extension/ai/converters.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// See ../vscode_apis.md for an exlanation. It is very helpful for understanding this folder.
44

55
import * as vscode from 'vscode'
6-
import * as parser_pb from '@buf/stateful_runme.bufbuild_es/runme/parser/v1/parser_pb'
6+
import * as parser_pb from '@buf/runmedev_runme.bufbuild_es/runme/parser/v1/parser_pb'
77

88
import { ServerLifecycleIdentity, getServerConfigurationValue } from '../../utils/configuration'
99
import { Serializer } from '../../types'

src/extension/ai/events.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
LogEvent,
55
LogEvent_ExecuteStatus,
66
StreamGenerateRequest_Trigger,
7-
} from '@buf/jlewi_foyle.bufbuild_es/foyle/v1alpha1/agent_pb'
7+
} from '@buf/runmedev_foyle.bufbuild_es/foyle/v1alpha1/agent_pb'
88
import * as vscode from 'vscode'
99
import { ulid } from 'ulidx'
1010
import { Subject, Subscription, from, map, mergeMap } from 'rxjs'

src/extension/ai/generate.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as vscode from 'vscode'
22
import {
33
GenerateCellsRequest,
44
GenerateCellsResponse,
5-
} from '@buf/jlewi_foyle.bufbuild_es/foyle/v1alpha1/agent_pb'
5+
} from '@buf/runmedev_foyle.bufbuild_es/foyle/v1alpha1/agent_pb'
66

77
import getLogger from '../logger'
88
import * as protos from '../grpc/parser/protos'

src/extension/ai/ghost.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as vscode from 'vscode'
2-
import * as agent_pb from '@buf/jlewi_foyle.bufbuild_es/foyle/v1alpha1/agent_pb'
3-
import { StreamGenerateRequest_Trigger } from '@buf/jlewi_foyle.bufbuild_es/foyle/v1alpha1/agent_pb'
2+
import * as agent_pb from '@buf/runmedev_foyle.bufbuild_es/foyle/v1alpha1/agent_pb'
3+
import { StreamGenerateRequest_Trigger } from '@buf/runmedev_foyle.bufbuild_es/foyle/v1alpha1/agent_pb'
44
import { workspace } from 'vscode'
55
import { share, Subject } from 'rxjs'
66

src/extension/ai/manager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
import * as vscode from 'vscode'
1212
import { createClient, Client, Transport } from '@connectrpc/connect'
1313
import { createConnectTransport } from '@connectrpc/connect-node'
14-
import { AIService } from '@buf/jlewi_foyle.connectrpc_es/foyle/v1alpha1/agent_connect'
14+
import { AIService } from '@buf/runmedev_foyle.connectrpc_es/foyle/v1alpha1/agent_connect'
1515

1616
import { Kernel } from '../kernel'
1717
import getLogger from '../logger'

src/extension/ai/sessions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { LogEvent, LogEventType } from '@buf/jlewi_foyle.bufbuild_es/foyle/v1alpha1/agent_pb'
1+
import { LogEvent, LogEventType } from '@buf/runmedev_foyle.bufbuild_es/foyle/v1alpha1/agent_pb'
22
import { ulid } from 'ulidx'
33
import * as vscode from 'vscode'
44

src/extension/ai/stream.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
StreamGenerateRequest,
44
StreamGenerateResponse,
55
StreamGenerateRequest_Trigger,
6-
} from '@buf/jlewi_foyle.bufbuild_es/foyle/v1alpha1/agent_pb'
6+
} from '@buf/runmedev_foyle.bufbuild_es/foyle/v1alpha1/agent_pb'
77
import {
88
buffer,
99
debounceTime,

0 commit comments

Comments
 (0)