Skip to content

Commit 09e4e5a

Browse files
authored
Merge branch 'dev' into feat/canceled-prompts-in-history
2 parents 731c1e5 + 871789c commit 09e4e5a

529 files changed

Lines changed: 46731 additions & 22821 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/VOUCHED.td

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ r44vc0rp
2727
rekram1-node
2828
-ricardo-m-l
2929
-robinmordasiewicz
30+
rubdos
3031
shantur
3132
simonklee
3233
-spider-yamet clawdbot/llm psychosis, spam pinging the team

.opencode/agent/translator.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -594,7 +594,6 @@ OPENCODE_DISABLE_CLAUDE_CODE
594594
OPENCODE_DISABLE_CLAUDE_CODE_PROMPT
595595
OPENCODE_DISABLE_CLAUDE_CODE_SKILLS
596596
OPENCODE_DISABLE_DEFAULT_PLUGINS
597-
OPENCODE_DISABLE_FILETIME_CHECK
598597
OPENCODE_DISABLE_LSP_DOWNLOAD
599598
OPENCODE_DISABLE_MODELS_FETCH
600599
OPENCODE_DISABLE_PRUNE

.opencode/opencode.jsonc

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
{
22
"$schema": "https://opencode.ai/config.json",
3-
"provider": {
4-
"opencode": {
5-
"options": {},
6-
},
7-
},
3+
"provider": {},
84
"permission": {
95
"edit": {
106
"packages/opencode/migration/*": "deny",

AGENTS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
- Use Bun APIs when possible, like `Bun.file()`
1515
- Rely on type inference when possible; avoid explicit type annotations or interfaces unless necessary for exports or clarity
1616
- Prefer functional array methods (flatMap, filter, map) over for loops; use type guards on filter to maintain type inference downstream
17+
- In `src/config`, follow the existing self-export pattern at the top of the file (for example `export * as ConfigAgent from "./agent"`) when adding a new config module.
1718

1819
Reduce total variable count by inlining when a value is only used once.
1920

bun.lock

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

flake.lock

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

infra/console.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,6 @@ new sst.cloudflare.x.SolidStart("Console", {
236236
SALESFORCE_INSTANCE_URL,
237237
ZEN_BLACK_PRICE,
238238
ZEN_LITE_PRICE,
239-
new sst.Secret("ZEN_LITE_COUPON_FIRST_MONTH_100_INVITEES"),
240239
new sst.Secret("ZEN_LIMITS"),
241240
new sst.Secret("ZEN_SESSION_SECRET"),
242241
...ZEN_MODELS,

nix/hashes.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"nodeModules": {
3-
"x86_64-linux": "sha256-tYAb5Mo39UW1VEejYuo0jW0jzH2OyY/HrqgiZL3rmjY=",
4-
"aarch64-linux": "sha256-3zGKV5UwokXpmY0nT1mry3IhNf2EQYLKT7ac+/trmQA=",
5-
"aarch64-darwin": "sha256-oKXAut7eu/eW5a43OT8+aFuH1F1tuIldTs+7PUXSCv4=",
6-
"x86_64-darwin": "sha256-Az+9X1scOEhw3aOO8laKJoZjiuz3qlLTIk1bx25P/z4="
3+
"x86_64-linux": "sha256-AgHhYsiygxbsBo3JN4HqHXKAwh8n1qeuSCe2qqxlxW4=",
4+
"aarch64-linux": "sha256-h2lpWRQ5EDYnjpqZXtUAp1mxKLQxJ4m8MspgSY8Ev78=",
5+
"aarch64-darwin": "sha256-xnd91+WyeAqn06run2ajsekxJvTMiLsnqNPe/rR8VTM=",
6+
"x86_64-darwin": "sha256-rXpz45IOjGEk73xhP9VY86eOj2CZBg2l1vzwzTIOOOQ="
77
}
88
}

nix/opencode.nix

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
sysctl,
88
makeBinaryWrapper,
99
models-dev,
10+
ripgrep,
1011
installShellFiles,
1112
versionCheckHook,
1213
writableTmpDirAsHomeHook,
@@ -51,25 +52,25 @@ stdenvNoCC.mkDerivation (finalAttrs: {
5152
runHook postBuild
5253
'';
5354

54-
installPhase =
55-
''
56-
runHook preInstall
57-
58-
install -Dm755 dist/opencode-*/bin/opencode $out/bin/opencode
59-
install -Dm644 schema.json $out/share/opencode/schema.json
60-
''
61-
# bun runs sysctl to detect if dunning on rosetta2
62-
+ lib.optionalString stdenvNoCC.hostPlatform.isDarwin ''
63-
wrapProgram $out/bin/opencode \
64-
--prefix PATH : ${
65-
lib.makeBinPath [
66-
sysctl
55+
installPhase = ''
56+
runHook preInstall
57+
58+
install -Dm755 dist/opencode-*/bin/opencode $out/bin/opencode
59+
install -Dm644 schema.json $out/share/opencode/schema.json
60+
61+
wrapProgram $out/bin/opencode \
62+
--prefix PATH : ${
63+
lib.makeBinPath (
64+
[
65+
ripgrep
6766
]
68-
}
69-
''
70-
+ ''
71-
runHook postInstall
72-
'';
67+
# bun runs sysctl to detect if dunning on rosetta2
68+
++ lib.optional stdenvNoCC.hostPlatform.isDarwin sysctl
69+
)
70+
}
71+
72+
runHook postInstall
73+
'';
7374

7475
postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) ''
7576
# trick yargs into also generating zsh completions

package.json

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
"description": "AI-powered development tool",
55
"private": true,
66
"type": "module",
7-
"packageManager": "bun@1.3.11",
7+
"packageManager": "bun@1.3.13",
88
"scripts": {
99
"dev": "bun run --cwd packages/opencode --conditions=browser src/index.ts",
10-
"dev:desktop": "bun --cwd packages/desktop tauri dev",
10+
"dev:desktop": "bun --cwd packages/desktop-electron dev",
1111
"dev:web": "bun --cwd packages/app dev",
1212
"dev:console": "ulimit -n 10240 2>/dev/null; bun run --cwd packages/console/app dev",
1313
"dev:storybook": "bun --cwd packages/storybook storybook",
@@ -30,10 +30,12 @@
3030
"@effect/opentelemetry": "4.0.0-beta.48",
3131
"@effect/platform-node": "4.0.0-beta.48",
3232
"@npmcli/arborist": "9.4.0",
33-
"@types/bun": "1.3.11",
33+
"@types/bun": "1.3.12",
3434
"@types/cross-spawn": "6.0.6",
3535
"@octokit/rest": "22.0.0",
3636
"@hono/zod-validator": "0.4.2",
37+
"@opentui/core": "0.1.99",
38+
"@opentui/solid": "0.1.99",
3739
"ulid": "3.0.1",
3840
"@kobalte/core": "0.13.11",
3941
"@types/luxon": "3.7.1",
@@ -51,7 +53,7 @@
5153
"drizzle-kit": "1.0.0-beta.19-d95b7a4",
5254
"drizzle-orm": "1.0.0-beta.19-d95b7a4",
5355
"effect": "4.0.0-beta.48",
54-
"ai": "6.0.158",
56+
"ai": "6.0.168",
5557
"cross-spawn": "7.0.6",
5658
"hono": "4.10.7",
5759
"hono-openapi": "1.1.2",
@@ -125,6 +127,7 @@
125127
"@types/node": "catalog:"
126128
},
127129
"patchedDependencies": {
130+
"@npmcli/agent@4.0.0": "patches/@npmcli%2Fagent@4.0.0.patch",
128131
"@standard-community/standard-openapi@0.2.9": "patches/@standard-community%2Fstandard-openapi@0.2.9.patch",
129132
"solid-js@1.9.10": "patches/solid-js@1.9.10.patch"
130133
}

0 commit comments

Comments
 (0)