Skip to content

Merge shuvcode-dev into integration #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shuv1337 merged 20 commits into from
Dec 27, 2025
Merged

Merge shuvcode-dev into integration #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
650bd76
feat(desktop): better indicator that session is busy
adamdotdevin Dec 25, 2025
603dae5
chore(ui): radio group primitive
adamdotdevin Dec 26, 2025
42f2bc7
fix(desktop): can't collapse project with active session
adamdotdevin Dec 26, 2025
d0a1b5e
chore: generate
actions-user Dec 26, 2025
583751e
fix(desktop): markdown rendering perf
adamdotdevin Dec 26, 2025
5420702
fix(desktop): missing keybinds in tooltips
adamdotdevin Dec 26, 2025
7469cba
fix(desktop): move session context to top-right
adamdotdevin Dec 26, 2025
e9c2f1f
fix(desktop): padding
adamdotdevin Dec 26, 2025
aaf9a5d
fix(desktop): user message display
adamdotdevin Dec 26, 2025
b307075
chore: brain icon
adamdotdevin Dec 26, 2025
effa7b4
release: v1.0.202
Dec 26, 2025
d9f0f58
feat: haskell lsp support (#6141)
amerocu Dec 26, 2025
8886c78
chore: generate
actions-user Dec 26, 2025
f59d274
fix(lsp): make JDTLS use the correct config directory on Windows (#6121)
apersomany Dec 26, 2025
281ce4c
prompt update to prevent searching via bash tool
thdxr Dec 26, 2025
7cc4b24
release: v1.0.203
Dec 26, 2025
fdfedbb
sync: merge upstream v1.0.203 into integration
shuv1337 Dec 26, 2025
2c648a4
sync: record last synced tag v1.0.203
shuv1337 Dec 26, 2025
cc07bb5
chore: remove completed planning documents
shuv1337 Dec 26, 2025
3044549
fix(tui): add top margin to prompt mode indicator
shuv1337 Dec 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/last-synced-tag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.0.201
v1.0.203
359 changes: 0 additions & 359 deletions CONTEXT/PLAN-202-web-app-askquestion-ui-2025-12-24.md
View file
Open in desktop

This file was deleted.

530 changes: 0 additions & 530 deletions CONTEXT/PLAN-5638-fix-worktree-project-id-collision-2025-12-22.md
View file
Open in desktop

This file was deleted.

30 changes: 15 additions & 15 deletions bun.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/app",
"version": "1.0.201",
"version": "1.0.203",
"description": "",
"type": "module",
"exports": {
Expand Down
8 changes: 5 additions & 3 deletions packages/app/src/components/prompt-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,18 +1009,21 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
onInput={handleInput}
onKeyDown={handleKeyDown}
classList={{
"w-full px-5 py-3 text-14-regular text-text-strong focus:outline-none whitespace-pre-wrap": true,
"w-full px-5 py-3 pr-12 text-14-regular text-text-strong focus:outline-none whitespace-pre-wrap": true,
"[&_[data-type=file]]:text-icon-info-active": true,
"font-mono!": store.mode === "shell",
}}
/>
<Show when={!prompt.dirty() && store.imageAttachments.length === 0}>
<div class="absolute top-0 inset-x-0 px-5 py-3 text-14-regular text-text-weak pointer-events-none whitespace-nowrap truncate">
<div class="absolute top-0 inset-x-0 px-5 py-3 pr-12 text-14-regular text-text-weak pointer-events-none whitespace-nowrap truncate">
{store.mode === "shell"
? "Enter shell command..."
: `Ask anything... "${PLACEHOLDERS[store.placeholder]}"`}
</div>
</Show>
<div class="absolute top-4.5 right-4">
<SessionContextUsage />
</div>
</div>
<div class="relative p-3 flex items-center justify-between">
<div class="flex items-center justify-start gap-1">
Expand Down Expand Up @@ -1077,7 +1080,6 @@ export const PromptInput: Component<PromptInputProps> = (props) => {
</Tooltip>
</Match>
</Switch>
<SessionContextUsage />
</div>
<div class="flex items-center gap-1 absolute right-2 bottom-2">
<input
Expand Down
25 changes: 12 additions & 13 deletions packages/app/src/components/session-context-usage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,27 @@ export function SessionContextUsage() {
<Show when={context?.()}>
{(ctx) => (
<Tooltip
openDelay={300}
value={
<div class="flex flex-col gap-1 p-2">
<div class="flex justify-between gap-4">
<span class="text-text-weaker">Tokens</span>
<span class="text-text-strong">{ctx().tokens}</span>
<div class="flex flex-col gap-1">
<div class="flex gap-3">
<span class="opacity-70 text-right flex-1">Tokens</span>
<span class="text-left flex-1">{ctx().tokens}</span>
</div>
<div class="flex justify-between gap-4">
<span class="text-text-weaker">Usage</span>
<span class="text-text-strong">{ctx().percentage ?? 0}%</span>
<div class="flex gap-3">
<span class="opacity-70 text-right flex-1">Usage</span>
<span class="text-left flex-1">{ctx().percentage ?? 0}%</span>
</div>
<div class="flex justify-between gap-4">
<span class="text-text-weaker">Cost</span>
<span class="text-text-strong">{cost()}</span>
<div class="flex gap-3">
<span class="opacity-70 text-right flex-1">Cost</span>
<span class="text-left flex-1">{cost()}</span>
</div>
</div>
}
placement="top"
>
<div class="flex items-center gap-1">
<span class="text-12-medium text-text-weak">{`${ctx().percentage ?? 0}%`}</span>
<div class="flex items-center gap-1.5">
<ProgressCircle size={16} strokeWidth={2} percentage={ctx().percentage ?? 0} />
{/* <span class="text-12-medium text-text-weak">{`${ctx().percentage ?? 0}%`}</span> */}
Copy link

@greptile-apps greptile-apps bot Dec 26, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

style: commented out percentage text display - remove entirely if no longer needed

Suggested change
{/* <span class="text-12-medium text-text-weak">{`${ctx().percentage ?? 0}%`}</span> */}
<ProgressCircle size={16} strokeWidth={2} percentage={ctx().percentage ?? 0} />

Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!

Prompt To Fix With AI 
This is a comment left during a code review.
Path: packages/app/src/components/session-context-usage.tsx
Line: 57:57

Comment:
**style:** commented out percentage text display - remove entirely if no longer needed

```suggestion
            <ProgressCircle size={16} strokeWidth={2} percentage={ctx().percentage ?? 0} />
```

<sub>Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!</sub>

How can I resolve this? If you propose a fix, please make it concise.

</div>
</Tooltip>
)}
Expand Down
36 changes: 30 additions & 6 deletions packages/app/src/pages/layout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { createEffect, createMemo, For, Match, onMount, ParentProps, Show, Switch, type JSX } from "solid-js"
import { createEffect, createMemo, For, Match, onMount, ParentProps, Show, Switch, untrack, type JSX } from "solid-js"
import { DateTime } from "luxon"
import { A, useNavigate, useParams } from "@solidjs/router"
import { useLayout, getAvatarColors, LocalProject } from "@/context/layout"
Expand Down Expand Up @@ -319,8 +319,11 @@ export default function Layout(props: ParentProps) {
createEffect(() => {
if (!params.dir || !params.id) return
const directory = base64Decode(params.dir)
setStore("lastSession", directory, params.id)
notification.session.markViewed(params.id)
const id = params.id
setStore("lastSession", directory, id)
notification.session.markViewed(id)
untrack(() => layout.projects.expand(directory))
requestAnimationFrame(() => scrollToSession(id))
})

createEffect(() => {
Expand Down Expand Up @@ -467,7 +470,12 @@ export default function Layout(props: ParentProps) {
class="flex flex-col min-w-0 text-left w-full focus:outline-none"
>
<div class="flex items-center self-stretch gap-6 justify-between transition-[padding] group-hover/session:pr-7 group-focus-within/session:pr-7 group-active/session:pr-7">
<span class="text-14-regular text-text-strong overflow-hidden text-ellipsis truncate">
<span
classList={{
"text-14-regular text-text-strong overflow-hidden text-ellipsis truncate": true,
"animate-pulse": isWorking(),
}}
>
{props.session.title}
</span>
<div class="shrink-0 group-hover/session:hidden group-active/session:hidden group-focus-within/session:hidden">
Expand Down Expand Up @@ -515,7 +523,15 @@ export default function Layout(props: ParentProps) {
onClick={() => dialog.show(() => <DialogSessionRenameGlobal session={props.session} />)}
/>
</Tooltip>
<Tooltip placement="right" value="Archive session">
<Tooltip
placement="right"
value={
<div class="flex items-center gap-2">
<span>Archive session</span>
<span class="text-icon-base text-12-medium">{command.keybind("session.archive")}</span>
</div>
}
>
<IconButton icon="archive" variant="ghost" onClick={() => archiveSession(props.session)} />
</Tooltip>
</div>
Expand Down Expand Up @@ -600,7 +616,15 @@ export default function Layout(props: ParentProps) {
</DropdownMenu.Content>
</DropdownMenu.Portal>
</DropdownMenu>
<Tooltip placement="top" value="New session">
<Tooltip
placement="top"
value={
<div class="flex items-center gap-2">
<span>New session</span>
<span class="text-icon-base text-12-medium">{command.keybind("session.new")}</span>
</div>
}
>
<IconButton as={A} href={`${slug()}/session`} icon="plus-small" variant="ghost" />
</Tooltip>
</div>
Expand Down
2 changes: 1 addition & 1 deletion packages/console/app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/console-app",
"version": "1.0.201",
"version": "1.0.203",
"type": "module",
"scripts": {
"typecheck": "tsgo --noEmit",
Expand Down
2 changes: 1 addition & 1 deletion packages/console/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/package.json",
"name": "@opencode-ai/console-core",
"version": "1.0.201",
"version": "1.0.203",
"private": true,
"type": "module",
"dependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/console/function/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/console-function",
"version": "1.0.201",
"version": "1.0.203",
"$schema": "https://json.schemastore.org/package.json",
"private": true,
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion packages/console/mail/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/console-mail",
"version": "1.0.201",
"version": "1.0.203",
"dependencies": {
"@jsx-email/all": "2.2.3",
"@jsx-email/cli": "1.4.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@opencode-ai/desktop",
"private": true,
"version": "1.0.201",
"version": "1.0.203",
"type": "module",
"scripts": {
"typecheck": "tsgo -b",
Expand Down
2 changes: 1 addition & 1 deletion packages/enterprise/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/enterprise",
"version": "1.0.201",
"version": "1.0.203",
"private": true,
"type": "module",
"scripts": {
Expand Down
12 changes: 6 additions & 6 deletions packages/extensions/zed/extension.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
id = "opencode"
name = "OpenCode"
description = "The open source coding agent."
version = "1.0.201"
version = "1.0.203"
schema_version = 1
authors = ["Anomaly"]
repository = "https://github.com/sst/opencode"
Expand All @@ -11,26 +11,26 @@ name = "OpenCode"
icon = "./icons/opencode.svg"

[agent_servers.opencode.targets.darwin-aarch64]
archive = "https://github.com/sst/opencode/releases/download/v1.0.201/opencode-darwin-arm64.zip"
archive = "https://github.com/sst/opencode/releases/download/v1.0.203/opencode-darwin-arm64.zip"
cmd = "./opencode"
args = ["acp"]

[agent_servers.opencode.targets.darwin-x86_64]
archive = "https://github.com/sst/opencode/releases/download/v1.0.201/opencode-darwin-x64.zip"
archive = "https://github.com/sst/opencode/releases/download/v1.0.203/opencode-darwin-x64.zip"
cmd = "./opencode"
args = ["acp"]

[agent_servers.opencode.targets.linux-aarch64]
archive = "https://github.com/sst/opencode/releases/download/v1.0.201/opencode-linux-arm64.tar.gz"
archive = "https://github.com/sst/opencode/releases/download/v1.0.203/opencode-linux-arm64.tar.gz"
cmd = "./opencode"
args = ["acp"]

[agent_servers.opencode.targets.linux-x86_64]
archive = "https://github.com/sst/opencode/releases/download/v1.0.201/opencode-linux-x64.tar.gz"
archive = "https://github.com/sst/opencode/releases/download/v1.0.203/opencode-linux-x64.tar.gz"
cmd = "./opencode"
args = ["acp"]

[agent_servers.opencode.targets.windows-x86_64]
archive = "https://github.com/sst/opencode/releases/download/v1.0.201/opencode-windows-x64.zip"
archive = "https://github.com/sst/opencode/releases/download/v1.0.203/opencode-windows-x64.zip"
cmd = "./opencode.exe"
args = ["acp"]
2 changes: 1 addition & 1 deletion packages/function/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@opencode-ai/function",
"version": "1.0.201",
"version": "1.0.203",
"$schema": "https://json.schemastore.org/package.json",
"private": true,
"type": "module",
Expand Down
2 changes: 1 addition & 1 deletion packages/opencode/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://json.schemastore.org/package.json",
"version": "1.0.201",
"version": "1.0.203",
"name": "opencode",
"type": "module",
"private": true,
Expand Down
Loading