Skip to content

Commit bd1c93c

Browse files
committed
Merge branch 'dev' into zed-acp-fixes
2 parents ef2a6de + bdfa213 commit bd1c93c

File tree

36 files changed

+1551
-1558
lines changed

36 files changed

+1551
-1558
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ dist
1313
.turbo
1414
**/.serena
1515
.serena/
16+
refs

.opencode/command/commit.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
description: Git commit and push
3+
subtask: true
34
---
45

56
commit and push

.opencode/opencode.json

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

.opencode/opencode.jsonc

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"$schema": "https://opencode.ai/config.json",
3+
"plugin": ["opencode-openai-codex-auth"],
4+
"provider": {
5+
"opencode": {
6+
"options": {
7+
// "baseURL": "http://localhost:8080",
8+
},
9+
},
10+
},
11+
}

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ For more info on how to configure OpenCode [**head over to our docs**](https://o
5959

6060
If you're interested in contributing to OpenCode, please read our [contributing docs](./CONTRIBUTING.md) before submitting a pull request.
6161

62+
### Building on OpenCode
63+
64+
If you are working on a project that's related to OpenCode and is using "opencode" as a part of its name; for example, "opencode-dashboard" or "opencode-mobile", please add a note to your README to clarify that it is not built by the OpenCode team and is not affiliated with us in anyway.
65+
6266
### FAQ
6367

6468
#### How is this different than Claude Code?

STATS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,3 +142,4 @@
142142
| 2025-11-14 | 759,928 (+10,023) | 705,237 (+9,080) | 1,465,165 (+19,103) |
143143
| 2025-11-15 | 765,955 (+6,027) | 712,870 (+7,633) | 1,478,825 (+13,660) |
144144
| 2025-11-16 | 771,069 (+5,114) | 716,596 (+3,726) | 1,487,665 (+8,840) |
145+
| 2025-11-17 | 780,161 (+9,092) | 723,339 (+6,743) | 1,503,500 (+15,835) |

a.out

Whitespace-only changes.

packages/opencode/src/agent/agent.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export namespace Agent {
1212
.object({
1313
name: z.string(),
1414
description: z.string().optional(),
15-
mode: z.union([z.literal("subagent"), z.literal("primary"), z.literal("all")]),
15+
mode: z.enum(["subagent", "primary", "all"]),
1616
builtIn: z.boolean(),
1717
topP: z.number().optional(),
1818
temperature: z.number().optional(),

packages/opencode/src/cli/cmd/debug/file.ts

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { EOL } from "os"
22
import { File } from "../../../file"
33
import { bootstrap } from "../../bootstrap"
44
import { cmd } from "../cmd"
5+
import { Ripgrep } from "@/file/ripgrep"
56

67
const FileSearchCommand = cmd({
78
command: "search <query>",
@@ -62,6 +63,20 @@ const FileListCommand = cmd({
6263
},
6364
})
6465

66+
const FileTreeCommand = cmd({
67+
command: "tree [dir]",
68+
builder: (yargs) =>
69+
yargs.positional("dir", {
70+
type: "string",
71+
description: "Directory to tree",
72+
default: process.cwd(),
73+
}),
74+
async handler(args) {
75+
const files = await Ripgrep.tree({ cwd: args.dir, limit: 200 })
76+
console.log(files)
77+
},
78+
})
79+
6580
export const FileCommand = cmd({
6681
command: "file",
6782
builder: (yargs) =>
@@ -70,6 +85,7 @@ export const FileCommand = cmd({
7085
.command(FileStatusCommand)
7186
.command(FileListCommand)
7287
.command(FileSearchCommand)
88+
.command(FileTreeCommand)
7389
.demandCommand(),
7490
async handler() {},
7591
})

packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,11 @@ export function Prompt(props: PromptProps) {
665665
return
666666
}
667667

668-
const pastedContent = event.text.trim()
668+
// Normalize line endings at the boundary
669+
// Windows ConPTY/Terminal often sends CR-only newlines in bracketed paste
670+
// Replace CRLF first, then any remaining CR
671+
const normalizedText = event.text.replace(/\r\n/g, "\n").replace(/\r/g, "\n")
672+
const pastedContent = normalizedText.trim()
669673
if (!pastedContent) {
670674
command.trigger("prompt.paste")
671675
return

0 commit comments

Comments
 (0)