Skip to content

Commit 166bc3f

Browse files
authored
chore: merge Roo Code upstream sunset into Zoo Code (#123)
* Merge upstream/main (Roo Code sunset) into Zoo Code * test: updating e2e collision and optimization 4.7 tests * chore: remove web-roo-code website and evals packages * fix: deepseek e2e fixture matching and mock model list fallback * refactor: make reasoningEffort optional in GetModelReasoningOptions * test(deepseek): updating fixture format * test: adding back coverage for telemetry and marketplace * fix(Announcement): reverting finalRelease message key * fix(ModeSelector): adding back telemetry * fix(DismissibleUpsell): adding back telemetry * fix(Announcement): adding back className * fix(McpView): keeping marketplace view * fix: adding back marketplace buttons * fix: adding back telemetry * fix: merge history * test: bumping coverage * merge: feedback
1 parent 3bd1a80 commit 166bc3f

413 files changed

Lines changed: 549 additions & 44377 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/ISSUE_TEMPLATE/feature_request.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ body:
6464
attributes:
6565
value: |
6666
---
67-
Optional (for contributors): You can stop here if you're just proposing the improvement.
67+
Optional: You can stop here if you're just proposing the improvement.
6868
6969
- type: textarea
7070
id: acceptance-criteria

.github/workflows/evals.yml

Lines changed: 0 additions & 74 deletions
This file was deleted.

.github/workflows/update-contributors.yml

Lines changed: 0 additions & 67 deletions
This file was deleted.

.github/workflows/website-deploy.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

.github/workflows/website-preview.yml

Lines changed: 0 additions & 102 deletions
This file was deleted.

apps/cli/scripts/integration/cases/create-with-session-id-resume-loads-correct-session.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ async function createSessionWithCustomId(
8888
"dev",
8989
"--print",
9090
"--provider",
91-
"roo",
91+
"openrouter",
9292
"--output-format",
9393
"stream-json",
9494
"--workspace",
@@ -148,7 +148,7 @@ async function resumeSessionAndSendMarker(
148148
"--print",
149149
"--stdin-prompt-stream",
150150
"--provider",
151-
"roo",
151+
"openrouter",
152152
"--output-format",
153153
"stream-json",
154154
"--workspace",

apps/cli/scripts/integration/lib/stream-harness.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export async function runStreamCase(options: RunStreamCaseOptions): Promise<void
6969

7070
const child = execa(
7171
"pnpm",
72-
["dev", "--print", "--stdin-prompt-stream", "--provider", "roo", "--output-format", "stream-json"],
72+
["dev", "--print", "--stdin-prompt-stream", "--provider", "openrouter", "--output-format", "stream-json"],
7373
{
7474
cwd: cliRoot,
7575
stdin: "pipe",

apps/cli/src/commands/cli/__tests__/list.test.ts

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { readWorkspaceTaskSessions } from "@/lib/task-history/index.js"
2+
import { isRecord } from "@/lib/utils/guards.js"
23

34
import { listSessions, parseFormat } from "../list.js"
45

@@ -38,6 +39,33 @@ describe("parseFormat", () => {
3839
})
3940
})
4041

42+
describe("router model extraction", () => {
43+
// This mirrors the extraction logic in requestOpenRouterModels (list.ts:226-228)
44+
const extractOpenRouterModels = (routerModelsRaw: unknown) => {
45+
const routerModels = isRecord(routerModelsRaw) ? routerModelsRaw : {}
46+
const openRouterModels = routerModels.openrouter
47+
return isRecord(openRouterModels) ? openRouterModels : {}
48+
}
49+
50+
it("extracts openrouter models from valid routerModels", () => {
51+
const models = { "openai/gpt-4.1": { contextWindow: 128000, supportsPromptCache: false } }
52+
const result = extractOpenRouterModels({ openrouter: models })
53+
expect(result).toEqual(models)
54+
})
55+
56+
it("returns empty object when routerModels is null", () => {
57+
expect(extractOpenRouterModels(null)).toEqual({})
58+
})
59+
60+
it("returns empty object when openrouter key is missing", () => {
61+
expect(extractOpenRouterModels({ requesty: {} })).toEqual({})
62+
})
63+
64+
it("returns empty object when openrouter value is not a record", () => {
65+
expect(extractOpenRouterModels({ openrouter: "invalid" })).toEqual({})
66+
})
67+
})
68+
4169
describe("listSessions", () => {
4270
const workspacePath = process.cwd()
4371

0 commit comments

Comments
 (0)