-
Notifications
You must be signed in to change notification settings - Fork 19.7k
fix(tui): insert skill name without wiping existing prompt text #27632
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.
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
HaleTom
wants to merge
5
commits into
anomalyco:dev
Choose a base branch
from
HaleTom:claude/fix-skill-picker-preserves-text
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+109
−6
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
3c1a384
fix(tui): insert skill name without wiping existing prompt text
HaleTom 7028ee4
test(tui): add regression test for skill picker onSelect preserving p…
HaleTom 4f3a61b
Merge branch 'dev' into claude/fix-skill-picker-preserves-text
HaleTom 57cb390
test(tui): add cursor-aware mock to skill picker regression test
HaleTom 05503de
Merge branch 'dev' into claude/fix-skill-picker-preserves-text
simonklee File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
106 changes: 106 additions & 0 deletions
106
packages/opencode/test/cli/tui/prompt-skill-select.test.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,106 @@ | ||
| import { describe, expect, test } from "bun:test" | ||
|
|
||
| // Regression test for the DialogSkill onSelect handler in | ||
| // packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx. | ||
| // | ||
| // Before the fix, onSelect called `input.setText(`/${skill} `)` which | ||
| // replaced the entire prompt content, wiping any text the user had already | ||
| // typed. After the fix, it calls `input.insertText(`/${skill} `)` which | ||
| // inserts at the cursor position, preserving existing text. | ||
| // | ||
| // `handleSkillSelect` below has the exact shape of the production handler after | ||
| // the fix. | ||
|
|
||
| type TextInput = { | ||
| plainText: string | ||
| insertText(text: string): void | ||
| } | ||
|
|
||
| type Store = { | ||
| prompt: { input: string; parts: unknown[] } | ||
| extmarkToPartIndex: Map<number, number> | ||
| } | ||
|
|
||
| function makeMockInput(initialText: string, cursorOffset: number): TextInput & { cursorOffset: number } { | ||
| let text = initialText | ||
| let cursor = cursorOffset | ||
| return { | ||
| get plainText() { return text }, | ||
| get cursorOffset() { return cursor }, | ||
| insertText(insert: string) { | ||
| text = text.slice(0, cursor) + insert + text.slice(cursor) | ||
| cursor += insert.length | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| function handleSkillSelect(input: TextInput, store: Store, syncExtmarks: () => void, skill: string) { | ||
| input.insertText(`/${skill} `) | ||
| store.prompt.input = input.plainText | ||
| syncExtmarks() | ||
| } | ||
|
|
||
| describe("Prompt skill picker onSelect", () => { | ||
| test("inserts skill name without wiping existing prompt text", () => { | ||
| const input = makeMockInput("some existing text", 18) | ||
| const store: Store = { | ||
| prompt: { input: "some existing text", parts: [] }, | ||
| extmarkToPartIndex: new Map(), | ||
| } | ||
| let synced = false | ||
|
|
||
| handleSkillSelect(input, store, () => { synced = true }, "test-skill") | ||
|
|
||
| expect(input.plainText).toBe("some existing text/test-skill ") | ||
| expect(store.prompt.input).toBe("some existing text/test-skill ") | ||
| expect(store.prompt.parts).toEqual([]) | ||
| expect(synced).toBe(true) | ||
| }) | ||
|
|
||
| test("inserts skill name at cursor position when cursor is at start", () => { | ||
| const input = makeMockInput("existing question here?", 0) | ||
| const store: Store = { | ||
| prompt: { input: "existing question here?", parts: [] }, | ||
| extmarkToPartIndex: new Map(), | ||
| } | ||
| let synced = false | ||
|
|
||
| handleSkillSelect(input, store, () => { synced = true }, "test-skill") | ||
|
|
||
| expect(input.plainText).toBe("/test-skill existing question here?") | ||
| expect(store.prompt.input).toBe("/test-skill existing question here?") | ||
| expect(synced).toBe(true) | ||
| }) | ||
|
|
||
| test("inserts skill name at cursor position mid-text", () => { | ||
| const input = makeMockInput("hello world", 5) | ||
| const store: Store = { | ||
| prompt: { input: "hello world", parts: [] }, | ||
| extmarkToPartIndex: new Map(), | ||
| } | ||
| let synced = false | ||
|
|
||
| handleSkillSelect(input, store, () => { synced = true }, "my-skill") | ||
|
|
||
| expect(input.plainText).toBe("hello/my-skill world") | ||
| expect(store.prompt.input).toBe("hello/my-skill world") | ||
| expect(synced).toBe(true) | ||
| }) | ||
|
|
||
| test("inserts skill name into empty prompt", () => { | ||
| const input = makeMockInput("", 0) | ||
| const store: Store = { | ||
| prompt: { input: "", parts: [] }, | ||
| extmarkToPartIndex: new Map(), | ||
| } | ||
| let synced = false | ||
|
|
||
| handleSkillSelect(input, store, () => { synced = true }, "my-skill") | ||
|
|
||
| expect(input.plainText).toBe("/my-skill ") | ||
| expect(store.prompt.input).toBe("/my-skill ") | ||
| expect(synced).toBe(true) | ||
| }) | ||
| }) | ||
|
|
||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.