Skip to content

Commit 8ea33da

Browse files
authored
Merge branch 'main' into fix/smoke-test-draft-release
2 parents a1321bf + b24baf9 commit 8ea33da

442 files changed

Lines changed: 27737 additions & 81857 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.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"@kilocode/cli": patch
3+
"@kilocode/kilo-gateway": patch
4+
---
5+
6+
Update `@ai-sdk/anthropic` to 3.0.71, adding `xhigh` effort for Opus 4.7 adaptive thinking (3.0.70) and fixing fine-grained tool streaming beta header for Opus 4.7 (3.0.71)

.github/workflows/test.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ permissions:
1717
contents: read
1818
checks: write
1919

20+
env:
21+
FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
22+
2023
jobs:
2124
unit:
2225
name: unit (${{ matrix.settings.name }})
@@ -38,6 +41,11 @@ jobs:
3841
with:
3942
token: ${{ secrets.GITHUB_TOKEN }}
4043

44+
- name: Setup Node
45+
uses: actions/setup-node@v4
46+
with:
47+
node-version: "24"
48+
4149
- name: Setup Bun
4250
uses: ./.github/actions/setup-bun
4351

@@ -104,6 +112,11 @@ jobs:
104112
with:
105113
token: ${{ secrets.GITHUB_TOKEN }}
106114

115+
- name: Setup Node
116+
uses: actions/setup-node@v4
117+
with:
118+
node-version: "24"
119+
107120
- name: Setup Bun
108121
uses: ./.github/actions/setup-bun
109122

.opencode/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ plans
33
package.json
44
bun.lock
55
.gitignore
6-
package-lock.json
6+
package-lock.json
7+
references/

.opencode/skills/effect/SKILL.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
name: effect
3+
description: Answer questions about the Effect framework
4+
---
5+
6+
# Effect
7+
8+
This codebase uses Effect, a framework for writing typescript.
9+
10+
## How to Answer Effect Questions
11+
12+
1. Clone the Effect repository: `https://github.com/Effect-TS/effect-smol` to
13+
`.opencode/references/effect-smol` in this project NOT the skill folder.
14+
2. Use the explore agent to search the codebase for answers about Effect patterns, APIs, and concepts
15+
3. Provide responses based on the actual Effect source code and documentation
16+
17+
## Guidelines
18+
19+
- Always use the explore agent with the cloned repository when answering Effect-related questions
20+
- Reference specific files and patterns found in the Effect codebase
21+
- Do not answer from memory - always verify against the source

.opencode/themes/mytheme.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@
116116
"light": "nord5"
117117
},
118118
"diffLineNumber": {
119-
"dark": "nord2",
120-
"light": "nord4"
119+
"dark": "#abafb7",
120+
"light": "textMuted"
121121
},
122122
"diffAddedLineNumberBg": {
123123
"dark": "#3B4252",

bun.lock

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

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-ONeelp9tNMWmMOpLjXZ3px7J7u9MFQq5aPnSONCnwxg=",
4-
"aarch64-linux": "sha256-kuoQtHAcyxoPxoJo19CPqqsqOORkb4o0y0F85P+2ZVE=",
5-
"aarch64-darwin": "sha256-5k9eXr0OLvtExkmy9E8f55V5JzpgESZTA0aQ55nWMkk=",
6-
"x86_64-darwin": "sha256-nBBpYODQZqzT+2Gv18yggJ+3y62RceG9z6SmHAe3fwU="
3+
"x86_64-linux": "sha256-ppKBRQ6VMQl4I8RUO0npqm72FGdL5GrryiQ9D63bHls=",
4+
"aarch64-linux": "sha256-HIr+rCJkpup9eL2oiILL/7qLO7486+Nt37dsEkox55Q=",
5+
"aarch64-darwin": "sha256-GP2bT2Zu7obWkZig4IgCdTn5c1vT1kYf6+Bn/HiFG5s=",
6+
"x86_64-darwin": "sha256-eRz7XqW0RV0vaAAX5jtvv4/M3xNSSHzvvs04v8lz5KY="
77
}
88
}

nix/kilo.nix

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
sysctl,
88
makeBinaryWrapper,
99
models-dev,
10-
ripgrep,
1110
installShellFiles,
1211
versionCheckHook,
1312
writableTmpDirAsHomeHook,
@@ -52,25 +51,25 @@ stdenvNoCC.mkDerivation (finalAttrs: {
5251
runHook postBuild
5352
'';
5453

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

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

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"packages/sdk/js"
2626
],
2727
"catalog": {
28-
"@effect/platform-node": "4.0.0-beta.43",
28+
"@effect/platform-node": "4.0.0-beta.46",
2929
"@types/bun": "1.3.11",
3030
"@types/cross-spawn": "6.0.6",
3131
"@octokit/rest": "22.0.0",
@@ -46,8 +46,8 @@
4646
"dompurify": "3.3.3",
4747
"drizzle-kit": "1.0.0-beta.19-d95b7a4",
4848
"drizzle-orm": "1.0.0-beta.19-d95b7a4",
49-
"effect": "4.0.0-beta.43",
50-
"ai": "6.0.149",
49+
"effect": "4.0.0-beta.46",
50+
"ai": "6.0.158",
5151
"cross-spawn": "7.0.6",
5252
"hono": "4.12.12",
5353
"hono-openapi": "1.1.2",
@@ -120,7 +120,7 @@
120120
"@types/bun": "catalog:",
121121
"@types/node": "catalog:",
122122
"effect": "catalog:",
123-
"@effect/platform-node-shared": "4.0.0-beta.35",
123+
"@effect/platform-node-shared": "4.0.0-beta.46",
124124
"path-to-regexp": ">=8.4.0",
125125
"picomatch": ">=2.3.2",
126126
"defu": "6.1.6",

packages/app/e2e/backend.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,12 @@ async function waitForHealth(url: string, probe = "/global/health") {
4444
throw new Error(`Timed out waiting for backend health at ${url}${probe}${last ? ` (${last})` : ""}`)
4545
}
4646

47+
function done(proc: ReturnType<typeof spawn>) {
48+
return proc.exitCode !== null || proc.signalCode !== null
49+
}
50+
4751
async function waitExit(proc: ReturnType<typeof spawn>, timeout = 10_000) {
48-
if (proc.exitCode !== null) return
52+
if (done(proc)) return
4953
await Promise.race([
5054
new Promise<void>((resolve) => proc.once("exit", () => resolve())),
5155
new Promise<void>((resolve) => setTimeout(resolve, timeout)),
@@ -123,11 +127,11 @@ export async function startBackend(label: string, input?: { llmUrl?: string }):
123127
return {
124128
url,
125129
async stop() {
126-
if (proc.exitCode === null) {
130+
if (!done(proc)) {
127131
proc.kill("SIGTERM")
128132
await waitExit(proc)
129133
}
130-
if (proc.exitCode === null) {
134+
if (!done(proc)) {
131135
proc.kill("SIGKILL")
132136
await waitExit(proc)
133137
}

0 commit comments

Comments
 (0)