Skip to content

feat(api): abort signal support for native-ollama (completePrompt + createMessage) #1299

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

Open
easonLiangWorldedtech wants to merge 27 commits into
base: main
Choose a base branch
from
+1,795 −168
Open

feat(api): abort signal support for native-ollama (completePrompt + createMessage) #1299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
d56bda1
feat(api): abort signal support for native-ollama (completePrompt + c…
easonliang28 Aug 19, 2026
346eeb3
fix(api): address CodeRabbit review on native-ollama abort handling
easonliang28 Aug 20, 2026
b3449a2
Merge branch 'main' into feat/abort-r1-native-ollama
easonLiangWorldedtech Aug 30, 2026
6d59fad
Merge branch 'main' into feat/abort-r1-native-ollama
easonLiangWorldedtech Sep 1, 2026
1a21368
Merge remote-tracking branch 'upstream/main' into feat/abort-r1-nativ…
easonliang28 Sep 2, 2026
df58e60
fix(api): harden native Ollama abort handling and credential gating
easonliang28 Sep 2, 2026
45c5c0a
fix(api): harden native Ollama cancellation and credential routing
easonliang28 Sep 3, 2026
ec8a491
fix(api): harden Ollama loopback check and stream finalization
easonliang28 Sep 3, 2026
e08e012
Merge upstream/main (79cd12f2c) into feat/abort-r1-native-ollama
easonliang28 Sep 3, 2026
5e1b719
fix(ci): declare vitest as a root devDependency so the mutation gate …
easonliang28 Sep 3, 2026
dc36ac7
Merge branch 'main' into feat/abort-r1-native-ollama
easonLiangWorldedtech Sep 3, 2026
95155b0
fix(api): harden native Ollama abort/timeout paths and add mutation-k…
easonliang28 Sep 3, 2026
0afb9bf
Merge remote-tracking branch 'origin/feat/abort-r1-native-ollama' int…
easonliang28 Sep 3, 2026
192059d
fix(api): kill remaining Ollama mutation survivors (thought tag, Abor…
easonliang28 Sep 3, 2026
c38b376
Merge branch main into feat/abort-r1-native-ollama
easonliang28 Sep 6, 2026
efb32e2
Merge branch 'main' into feat/abort-r1-native-ollama
easonLiangWorldedtech Sep 15, 2026
d8503d8
Merge remote-tracking branch 'upstream/main' into fix-pr-1299
easonliang28 Sep 27, 2026
d2d0cbf
chore: sync pnpm lockfile with root vitest devDependency
easonliang28 Sep 27, 2026
8cb94a5
test: replace double assertions in timer fakes with single structural…
easonliang28 Sep 27, 2026
37dbd62
chore: bump root vitest to 4.1.11 to clear dependency-review finding
easonliang28 Sep 27, 2026
718a89f
Merge branch 'main' into feat/abort-r1-native-ollama
easonLiangWorldedtech Sep 28, 2026
4389c9c
fix(native-ollama): detach abort listener, cancel discovery, align vi…
Sep 28, 2026
e34b840
Merge branch 'main' into feat/abort-r1-native-ollama
easonLiangWorldedtech Sep 29, 2026
d95082b
fix(native-ollama): prove the forwarded discovery signal is linked to…
Sep 29, 2026
2c4feb7
Merge remote-tracking branch 'upstream/main' into feat/abort-r1-nativ…
Oct 2, 2026
7c1d85f
Merge commit 'refs/shapes/upstream-main' into feat/abort-r1-native-ol…
Oct 2, 2026
4172aa2
Merge branch 'main' into feat/abort-r1-native-ollama
easonLiangWorldedtech Oct 5, 2026
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 apps/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"@roo-code/config-typescript": "workspace:^",
"@types/node": "22.20.1",
"@types/react": "18.3.31",
"@vitest/coverage-v8": "4.1.9",
"@vitest/coverage-v8": "4.1.11",
"ink-testing-library": "4.0.0",
"rimraf": "6.0.1",
"tsup": "8.5.1",
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@
"rimraf": "6.0.1",
"tsx": "4.22.4",
"turbo": "2.10.0",
"typescript": "5.9.3"
"typescript": "5.9.3",
"vitest": "4.1.11"
Comment thread
coderabbitai[bot] marked this conversation as resolved.

@edelauna edelauna Oct 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

can we do this in a separate PR

},
"lint-staged": {
"*.{js,jsx,ts,tsx,json,css,md}": [
Expand Down
2 changes: 1 addition & 1 deletion packages/cloud/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"@types/node": "22.20.1",
"@types/vscode": "1.100.0",
"globals": "16.5.0",
"@vitest/coverage-v8": "4.1.9",
"@vitest/coverage-v8": "4.1.11",
"vitest": "4.1.11"
}
}
2 changes: 1 addition & 1 deletion packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"@roo-code/config-eslint": "workspace:^",
"@roo-code/config-typescript": "workspace:^",
"@types/node": "22.20.1",
"@vitest/coverage-v8": "4.1.9",
"@vitest/coverage-v8": "4.1.11",
"vitest": "4.1.11"
}
}
2 changes: 1 addition & 1 deletion packages/telemetry/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"@roo-code/config-typescript": "workspace:^",
"@types/node": "22.20.1",
"@types/vscode": "1.100.0",
"@vitest/coverage-v8": "4.1.9",
"@vitest/coverage-v8": "4.1.11",
"vitest": "4.1.11"
}
}
109 changes: 48 additions & 61 deletions pnpm-lock.yaml
View file
Open in desktop

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

Loading
Loading