mirrors/opencode
1
0
Fork 0
mirror of https://github.com/sst/opencode.git synced 2025-12-23 10:11:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

sync

Browse source
This commit is contained in:
Dax Raad 2025-12-19 17:11:01 -05:00
parent 598c6171cd
commit eae0b36d49
2 changed files with 49 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

54
packages/opencode/src/cli/cmd/tui/context/sync.tsx
View file

@ -7,7 +7,7 @@ import type {
Config,
Todo,
Command,
Permission,
PermissionRequest,
LspStatus,
McpStatus,
FormatterStatus,
@ -39,7 +39,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
agent: Agent[]
command: Command[]
permission: {
[sessionID: string]: Permission[]
[sessionID: string]: PermissionRequest[]
}
config: Config
session: Session[]
@ -97,30 +97,10 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
sdk.event.listen((e) => {
const event = e.details
switch (event.type) {
case "permission.updated": {
const permissions = store.permission[event.properties.sessionID]
if (!permissions) {
setStore("permission", event.properties.sessionID, [event.properties])
break
}
const match = Binary.search(permissions, event.properties.id, (p) => p.id)
setStore(
"permission",
event.properties.sessionID,
produce((draft) => {
if (match.found) {
draft[match.index] = event.properties
return
}
draft.push(event.properties)
}),
)
break
}
case "permission.replied": {
const permissions = store.permission[event.properties.sessionID]
const match = Binary.search(permissions, event.properties.permissionID, (p) => p.id)
case "permission.next.replied": {
const requests = store.permission[event.properties.sessionID]
if (!requests) break
const match = Binary.search(requests, event.properties.requestID, (r) => r.id)
if (!match.found) break
setStore(
"permission",
@ -132,6 +112,28 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
break
}
case "permission.next.asked": {
const request = event.properties
const requests = store.permission[request.sessionID]
if (!requests) {
setStore("permission", request.sessionID, [request])
break
}
const match = Binary.search(requests, request.id, (r) => r.id)
if (match.found) {
setStore("permission", request.sessionID, match.index, reconcile(request))
break
}
setStore(
"permission",
request.sessionID,
produce((draft) => {
draft.splice(match.index, 0, request)
}),
)
break
}
case "todo.updated":
setStore("todo", event.properties.sessionID, event.properties.todos)
break

65
packages/opencode/src/cli/cmd/tui/routes/session/index.tsx
View file

@ -67,6 +67,7 @@ import { Footer } from "./footer.tsx"
import { usePromptRef } from "../../context/prompt"
import { Filesystem } from "@/util/filesystem"
import { DialogSubagent } from "./dialog-subagent.tsx"
import { PermissionPrompt } from "./permission"
addDefaultParsers(parsers.parsers)
@ -87,7 +88,6 @@ const context = createContext<{
showTimestamps: () => boolean
usernameVisible: () => boolean
showDetails: () => boolean
userMessageMarkdown: () => boolean
diffWrapMode: () => "word" | "none"
sync: ReturnType<typeof useSync>
}>()
@ -125,7 +125,6 @@ export function Session() {
const [usernameVisible, setUsernameVisible] = createSignal(kv.get("username_visible", true))
const [showDetails, setShowDetails] = createSignal(kv.get("tool_details_visibility", true))
const [showScrollbar, setShowScrollbar] = createSignal(kv.get("scrollbar_visible", false))
const [userMessageMarkdown, setUserMessageMarkdown] = createSignal(kv.get("user_message_markdown", true))
const [diffWrapMode, setDiffWrapMode] = createSignal<"word" | "none">("word")
const wide = createMemo(() => dimensions().width > 120)
@ -524,19 +523,6 @@ export function Session() {
dialog.clear()
},
},
{
title: userMessageMarkdown() ? "Disable user message markdown" : "Enable user message markdown",
value: "session.toggle.user_message_markdown",
category: "Session",
onSelect: (dialog) => {
setUserMessageMarkdown((prev) => {
const next = !prev
kv.set("user_message_markdown", next)
return next
})
dialog.clear()
},
},
{
title: "Page up",
value: "session.page.up",
@ -874,7 +860,6 @@ export function Session() {
showTimestamps,
usernameVisible,
showDetails,
userMessageMarkdown,
diffWrapMode,
sync,
}}
@ -1000,17 +985,24 @@ export function Session() {
</For>
</scrollbox>
<box flexShrink={0}>
<Prompt
ref={(r) => {
prompt = r
promptRef.set(r)
}}
disabled={permissions().length > 0}
onSubmit={() => {
toBottom()
}}
sessionID={route.sessionID}
/>
<Switch>
<Match when={permissions().length > 0}>
<PermissionPrompt request={permissions()[0]} />
</Match>
<Match when={true}>
<Prompt
ref={(r) => {
prompt = r
promptRef.set(r)
}}
disabled={permissions().length > 0}
onSubmit={() => {
toBottom()
}}
sessionID={route.sessionID}
/>
</Match>
</Switch>
</box>
<Show when={!sidebarVisible()}>
<Footer />
@ -1048,7 +1040,7 @@ function UserMessage(props: {
const text = createMemo(() => props.parts.flatMap((x) => (x.type === "text" && !x.synthetic ? [x] : []))[0])
const files = createMemo(() => props.parts.flatMap((x) => (x.type === "file" ? [x] : [])))
const sync = useSync()
const { theme, syntax } = useTheme()
const { theme } = useTheme()
const [hover, setHover] = createSignal(false)
const queued = createMemo(() => props.pending && props.message.id > props.pending)
const color = createMemo(() => (queued() ? theme.accent : local.agent.color(props.message.agent)))
@ -1079,22 +1071,7 @@ function UserMessage(props: {
backgroundColor={hover() ? theme.backgroundElement : theme.backgroundPanel}
flexShrink={0}
>
<Switch>
<Match when={ctx.userMessageMarkdown()}>
<code
filetype="markdown"
drawUnstyledText={false}
streaming={false}
syntaxStyle={syntax()}
content={text()?.text ?? ""}
conceal={ctx.conceal()}
fg={theme.text}
/>
</Match>
<Match when={!ctx.userMessageMarkdown()}>
<text fg={theme.text}>{text()?.text}</text>
</Match>
</Switch>
<text fg={theme.text}>{text()?.text}</text>
<Show when={files().length}>
<box flexDirection="row" paddingBottom={1} paddingTop={1} gap={1} flexWrap="wrap">
<For each={files()}>