Skip to content

Commit eb1cbbe

Browse files
authored
Merge branch 'dev' into fix/xhigh-mode-openrouter
2 parents a6c87c1 + 5495fdd commit eb1cbbe

88 files changed

Lines changed: 1483 additions & 574 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/pull_request_template.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
### What does this PR do?
22

3+
Please provide a description of the issue (if there is one), the changes you made to fix it, and why they work. It is expected that you understand why your changes work and if you do not understand why at least say as much so a maintainer knows how much to value the pr.
4+
5+
**If you paste a large clearly AI generated description here your PR may be IGNORED or CLOSED!**
6+
37
### How did you verify your code works?

.github/workflows/generate.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44
push:
55
branches:
66
- dev
7-
pull_request:
8-
workflow_dispatch:
97

108
jobs:
119
generate:

infra/console.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ const ZEN_MODELS = [
133133
new sst.Secret("ZEN_MODELS6"),
134134
new sst.Secret("ZEN_MODELS7"),
135135
new sst.Secret("ZEN_MODELS8"),
136+
new sst.Secret("ZEN_MODELS9"),
137+
new sst.Secret("ZEN_MODELS10"),
136138
]
137139
const STRIPE_SECRET_KEY = new sst.Secret("STRIPE_SECRET_KEY")
138140
const STRIPE_PUBLISHABLE_KEY = new sst.Secret("STRIPE_PUBLISHABLE_KEY")
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { test, expect } from "./fixtures"
2-
import { serverName } from "./utils"
1+
import { test, expect } from "../fixtures"
2+
import { serverName } from "../utils"
33

44
test("home renders and shows core entrypoints", async ({ page }) => {
55
await page.goto("/")
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { test, expect } from "./fixtures"
2-
import { dirPath, promptSelector } from "./utils"
1+
import { test, expect } from "../fixtures"
2+
import { dirPath, promptSelector } from "../utils"
33

44
test("project route redirects to /session", async ({ page, directory, slug }) => {
55
await page.goto(dirPath(directory))
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { test, expect } from "./fixtures"
2-
import { modKey } from "./utils"
1+
import { test, expect } from "../fixtures"
2+
import { modKey } from "../utils"
33

44
test("search palette opens and closes", async ({ page, gotoSession }) => {
55
await gotoSession()

packages/app/e2e/server-default.spec.ts renamed to packages/app/e2e/app/server-default.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { test, expect } from "./fixtures"
2-
import { serverName, serverUrl } from "./utils"
1+
import { test, expect } from "../fixtures"
2+
import { serverName, serverUrl } from "../utils"
33

44
const DEFAULT_SERVER_URL_KEY = "opencode.settings.dat:defaultServerUrl"
55

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { test, expect } from "./fixtures"
2-
import { promptSelector } from "./utils"
1+
import { test, expect } from "../fixtures"
2+
import { promptSelector } from "../utils"
33

44
test("can open an existing session and type into the prompt", async ({ page, sdk, gotoSession }) => {
55
const title = `e2e smoke ${Date.now()}`

packages/app/e2e/titlebar-history.spec.ts renamed to packages/app/e2e/app/titlebar-history.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { test, expect } from "./fixtures"
2-
import { modKey, promptSelector } from "./utils"
1+
import { test, expect } from "../fixtures"
2+
import { modKey, promptSelector } from "../utils"
33

44
test("titlebar back/forward navigates between sessions", async ({ page, slug, sdk, gotoSession }) => {
55
await page.setViewportSize({ width: 1400, height: 800 })
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { test, expect } from "./fixtures"
2-
import { modKey } from "./utils"
1+
import { test, expect } from "../fixtures"
2+
import { modKey } from "../utils"
33

44
test("can open a file tab from the search palette", async ({ page, gotoSession }) => {
55
await gotoSession()

0 commit comments

Comments
 (0)