Skip to content

Commit 1aeab50

Browse files
authored
Merge pull request #153 from Latitudes-Dev/opencode/issue151-20251220031612
sync: merge upstream v1.0.171
2 parents 25ea365 + d512de1 commit 1aeab50

15 files changed

Lines changed: 548 additions & 490 deletions

File tree

.github/last-synced-tag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.0.170
1+
v1.0.171

.github/workflows/publish.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,12 @@ jobs:
8282
node-version: "24"
8383
registry-url: "https://registry.npmjs.org"
8484

85+
- name: Setup Git Identity
86+
run: |
87+
git config --global user.email "opencode@sst.dev"
88+
git config --global user.name "opencode"
89+
git remote set-url origin https://x-access-token:${{ secrets.SST_GITHUB_TOKEN }}@github.com/${{ github.repository }}
90+
8591
- name: Publish
8692
id: publish
8793
run: ./script/publish.ts

bun.lock

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

nix/hashes.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"nodeModules": "sha256-Z+eNK5D8Wt//ywysj/VCzOa2232fPwD0M+QX2C7DSBY="
2+
"nodeModules": "sha256-cpXmqJQJeFj3eED/aOb4YLUdkZFV//7u4f0STBxzUhk="
33
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"vite": "7.1.4",
5151
"@solidjs/meta": "0.29.4",
5252
"@solidjs/router": "0.15.4",
53-
"@solidjs/start": "https://pkg.pr.new/@solidjs/start@57aeb22",
53+
"@solidjs/start": "https://pkg.pr.new/@solidjs/start@dfb2020",
5454
"solid-js": "1.9.10",
5555
"vite-plugin-solid": "2.11.10"
5656
}

packages/console/app/src/routes/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import "./index.css"
22
import { Title, Meta, Link } from "@solidjs/meta"
3-
import { HttpHeader } from "@solidjs/start"
3+
//import { HttpHeader } from "@solidjs/start"
44
import video from "../asset/lander/opencode-min.mp4"
55
import videoPoster from "../asset/lander/opencode-poster.png"
66
import { IconCopy, IconCheck } from "../component/icon"
@@ -42,7 +42,7 @@ export default function Home() {
4242

4343
return (
4444
<main data-page="opencode">
45-
<HttpHeader name="Cache-Control" value="public, max-age=1, s-maxage=3600, stale-while-revalidate=86400" />
45+
{/*<HttpHeader name="Cache-Control" value="public, max-age=1, s-maxage=3600, stale-while-revalidate=86400" />*/}
4646
<Title>OpenCode | The open source AI coding agent</Title>
4747
<Link rel="canonical" href={config.baseUrl} />
4848
<Meta property="og:image" content="/social-share.png" />

packages/console/app/src/routes/zen/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import "./index.css"
22
import { createAsync, query, redirect } from "@solidjs/router"
33
import { Title, Meta, Link } from "@solidjs/meta"
4-
import { HttpHeader } from "@solidjs/start"
4+
//import { HttpHeader } from "@solidjs/start"
55
import zenLogoLight from "../../asset/zen-ornate-light.svg"
66
import { config } from "~/config"
77
import zenLogoDark from "../../asset/zen-ornate-dark.svg"
@@ -30,7 +30,7 @@ export default function Home() {
3030
const loggedin = createAsync(() => checkLoggedIn())
3131
return (
3232
<main data-page="zen">
33-
<HttpHeader name="Cache-Control" value="public, max-age=1, s-maxage=3600, stale-while-revalidate=86400" />
33+
{/*<HttpHeader name="Cache-Control" value="public, max-age=1, s-maxage=3600, stale-while-revalidate=86400" />*/}
3434
<Title>OpenCode Zen | A curated set of reliable optimized models for coding agents</Title>
3535
<Link rel="canonical" href={`${config.baseUrl}/zen`} />
3636
<Meta property="og:image" content="/social-share-zen.png" />

packages/opencode/src/cli/cmd/tui/routes/session/sidebar.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,11 @@ export function Sidebar(props: { sessionID: string }) {
180180
</box>
181181
<Show when={sync.data.lsp.length <= 2 || expanded.lsp}>
182182
<Show when={sync.data.lsp.length === 0}>
183-
<text fg={theme.textMuted}>LSPs will activate as files are read</text>
183+
<text fg={theme.textMuted}>
184+
{sync.data.config.lsp === false
185+
? "LSPs have been disabled in settings"
186+
: "LSPs will activate as files are read"}
187+
</text>
184188
</Show>
185189
<For each={sync.data.lsp}>
186190
{(item) => (

packages/opencode/src/provider/transform.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,9 @@ export namespace ProviderTransform {
7575
}
7676

7777
if (
78-
model.providerID === "deepseek" ||
79-
model.api.id.toLowerCase().includes("deepseek") ||
80-
(model.capabilities.interleaved &&
81-
typeof model.capabilities.interleaved === "object" &&
82-
model.capabilities.interleaved.field === "reasoning_content")
78+
model.capabilities.interleaved &&
79+
typeof model.capabilities.interleaved === "object" &&
80+
model.capabilities.interleaved.field === "reasoning_content"
8381
) {
8482
return msgs.map((msg) => {
8583
if (msg.role === "assistant" && Array.isArray(msg.content)) {

packages/opencode/test/preload.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@
33
import os from "os"
44
import path from "path"
55
import fs from "fs/promises"
6+
import fsSync from "fs"
7+
import { afterAll } from "bun:test"
68

79
const dir = path.join(os.tmpdir(), "opencode-test-data-" + process.pid)
810
await fs.mkdir(dir, { recursive: true })
11+
afterAll(() => {
12+
fsSync.rmSync(dir, { recursive: true, force: true })
13+
})
914
process.env["XDG_DATA_HOME"] = path.join(dir, "share")
1015
process.env["XDG_CACHE_HOME"] = path.join(dir, "cache")
1116
process.env["XDG_CONFIG_HOME"] = path.join(dir, "config")

0 commit comments

Comments
 (0)