anomalyco/opencode
1
0
Fork 0
mirror of https://github.com/anomalyco/opencode.git synced 2026-08-09 10:59:49 -04:00
Code Issues 5.9k Packages Projects Releases 19 Wiki Activity

feat: attach skills to prompts

Browse Source
This commit is contained in:
Kit Langton
2026-08-07 22:47:39 -04:00
parent 2cf65c025a
commit 56ef6eee24
32 changed files with 545 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/client/src/effect/api/api.ts
+1
View File
@@ -180,6 +180,7 @@ export type Endpoint5_12Input = {
readonly text: string
readonly files?: ReadonlyArray<PromptInput.FileAttachment> | undefined
readonly agents?: ReadonlyArray<AgentAttachment> | undefined
readonly skills?: ReadonlyArray<PromptInput.SkillAttachment> | undefined
readonly metadata?: { readonly [x: string]: unknown } | undefined
readonly delivery?: "steer" | "queue" | undefined
readonly resume?: boolean | undefined
packages/client/src/effect/generated/client.ts
+1
View File
@@ -412,6 +412,7 @@ const Endpoint5_12 = (raw: RawClient["server.session"]) => (input: Endpoint5_12I
text: input["text"],
files: input["files"],
agents: input["agents"],
skills: input["skills"],
metadata: input["metadata"],
delivery: input["delivery"],
resume: input["resume"],
packages/client/src/promise/generated/client.ts
+1
View File
@@ -615,6 +615,7 @@ export function make(options: ClientOptions) {
text: input["text"],
files: input["files"],
agents: input["agents"],
skills: input["skills"],
metadata: input["metadata"],
delivery: input["delivery"],
resume: input["resume"],
packages/client/src/promise/generated/types.ts
+72
View File
@@ -1080,6 +1080,8 @@ export type PromptFileAttachment = {
export type PromptAgentAttachment = { name: string; mention?: PromptMention }
export type PromptSkillAttachment = { id: string; name: string; text: string; mention?: PromptMention }
export type SessionMessageAssistantText = { type: "text"; text: string; state?: SessionMessageProviderState }
export type SessionMessageAssistantReasoning = {
@@ -1565,6 +1567,7 @@ export type SessionMessageUser = {
text: string
files?: Array<PromptFileAttachment>
agents?: Array<PromptAgentAttachment>
skills?: Array<PromptSkillAttachment>
type: "user"
}
@@ -1572,6 +1575,7 @@ export type SessionPendingUserData = {
text: string
files?: Array<PromptFileAttachment>
agents?: Array<PromptAgentAttachment>
skills?: Array<PromptSkillAttachment>
metadata?: { [x: string]: JsonValue }
}
@@ -1579,6 +1583,7 @@ export type SessionPendingUserData1 = {
text: string
files?: Array<PromptFileAttachment>
agents?: Array<PromptAgentAttachment>
skills?: Array<PromptSkillAttachment>
metadata?: { [x: string]: any }
}
@@ -2579,6 +2584,12 @@ export type SessionImportInput = {
readonly name: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly skills?: ReadonlyArray<{
readonly id: string
readonly name: string
readonly text: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly type: "user"
}
| {
@@ -2824,6 +2835,12 @@ export type SessionImportInput = {
readonly name: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly skills?: ReadonlyArray<{
readonly id: string
readonly name: string
readonly text: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly type: "user"
}
| {
@@ -3069,6 +3086,12 @@ export type SessionImportInput = {
readonly name: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly skills?: ReadonlyArray<{
readonly id: string
readonly name: string
readonly text: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly type: "user"
}
| {
@@ -3320,6 +3343,10 @@ export type SessionPromptInput = {
readonly name: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly skills?: ReadonlyArray<{
readonly id: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly metadata?: { readonly [x: string]: JsonValue }
readonly delivery?: "steer" | "queue" | null
readonly resume?: boolean | null
@@ -3337,6 +3364,10 @@ export type SessionPromptInput = {
readonly name: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly skills?: ReadonlyArray<{
readonly id: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly metadata?: { readonly [x: string]: JsonValue }
readonly delivery?: "steer" | "queue" | null
readonly resume?: boolean | null
@@ -3354,6 +3385,10 @@ export type SessionPromptInput = {
readonly name: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly skills?: ReadonlyArray<{
readonly id: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly metadata?: { readonly [x: string]: JsonValue }
readonly delivery?: "steer" | "queue" | null
readonly resume?: boolean | null
@@ -3371,10 +3406,35 @@ export type SessionPromptInput = {
readonly name: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly skills?: ReadonlyArray<{
readonly id: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly metadata?: { readonly [x: string]: JsonValue }
readonly delivery?: "steer" | "queue" | null
readonly resume?: boolean | null
}["agents"]
readonly skills?: {
readonly id?: string | null
readonly text: string
readonly files?: ReadonlyArray<{
readonly uri: string
readonly name?: string
readonly description?: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly agents?: ReadonlyArray<{
readonly name: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly skills?: ReadonlyArray<{
readonly id: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly metadata?: { readonly [x: string]: JsonValue }
readonly delivery?: "steer" | "queue" | null
readonly resume?: boolean | null
}["skills"]
readonly metadata?: {
readonly id?: string | null
readonly text: string
@@ -3388,6 +3448,10 @@ export type SessionPromptInput = {
readonly name: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly skills?: ReadonlyArray<{
readonly id: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly metadata?: { readonly [x: string]: JsonValue }
readonly delivery?: "steer" | "queue" | null
readonly resume?: boolean | null
@@ -3405,6 +3469,10 @@ export type SessionPromptInput = {
readonly name: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly skills?: ReadonlyArray<{
readonly id: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly metadata?: { readonly [x: string]: JsonValue }
readonly delivery?: "steer" | "queue" | null
readonly resume?: boolean | null
@@ -3422,6 +3490,10 @@ export type SessionPromptInput = {
readonly name: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly skills?: ReadonlyArray<{
readonly id: string
readonly mention?: { readonly start: number; readonly end: number; readonly text: string }
}>
readonly metadata?: { readonly [x: string]: JsonValue }
readonly delivery?: "steer" | "queue" | null
readonly resume?: boolean | null
packages/core/src/plugin/promise.ts
+2
View File
@@ -11,6 +11,7 @@ import { Provider } from "@opencode-ai/schema/provider"
import { AbsolutePath } from "@opencode-ai/schema/schema"
import { Session } from "@opencode-ai/schema/session"
import { SessionMessage } from "@opencode-ai/schema/session-message"
import { Skill } from "@opencode-ai/schema/skill"
import { Workspace } from "@opencode-ai/schema/workspace"
import { WebSearch } from "@opencode-ai/schema/websearch"
import { DateTime, Effect, Scope, Stream } from "effect"
@@ -296,6 +297,7 @@ export function fromPromise(plugin: Plugin) {
...input,
sessionID: Session.ID.make(input.sessionID),
id: input.id == null ? undefined : SessionMessage.ID.make(input.id),
skills: input.skills?.map((skill) => ({ ...skill, id: Skill.ID.make(skill.id) })),
delivery: input.delivery ?? undefined,
resume: input.resume ?? undefined,
}),
packages/core/src/session.ts
+33 -7
View File
@@ -218,10 +218,11 @@ export interface Interface {
text: string
files?: PromptInput.Prompt["files"]
agents?: PromptInput.Prompt["agents"]
skills?: PromptInput.Prompt["skills"]
metadata?: Record<string, unknown>
delivery?: SessionPending.Delivery
resume?: boolean
}) => Effect.Effect<SessionPending.User, NotFoundError | PromptConflictError | AttachmentError>
}) => Effect.Effect<SessionPending.User, NotFoundError | PromptConflictError | AttachmentError | SkillNotFoundError>
/** Generates text from current Session context without admitting input or mutating history. */
readonly generate: (input: {
sessionID: SessionSchema.ID
@@ -240,7 +241,12 @@ export interface Interface {
resume?: boolean
}) => Effect.Effect<
SessionPending.User,
NotFoundError | PromptConflictError | AttachmentError | Command.NotFoundError | Command.EvaluationError
| NotFoundError
| PromptConflictError
| AttachmentError
| SkillNotFoundError
| Command.NotFoundError
| Command.EvaluationError
>
readonly shell: (input: {
id?: Event.ID
@@ -345,9 +351,7 @@ const layer = Layer.effect(
Effect.gen(function* () {
yield* mutation(bus, { sessionID: input.sessionID, id: input.inputID }).pipe(
Effect.catchDefect((defect) =>
defect instanceof SessionPending.LifecycleConflict
? pendingConflict(input)
: Effect.die(defect),
defect instanceof SessionPending.LifecycleConflict ? pendingConflict(input) : Effect.die(defect),
),
)
if (wake) yield* execution.wake(input.sessionID)
@@ -567,9 +571,11 @@ const layer = Layer.effect(
// Resolved lazily so prompt admission only boots location services when an
// image attachment actually needs the resizer.
const image = Image.Service.pipe(Effect.provide(locations.get(session.location)))
const skills = Skill.Service.pipe(Effect.provide(locations.get(session.location)))
const prompt = yield* resolvePrompt(
{ text: input.text, files: input.files, agents: input.agents },
{ text: input.text, files: input.files, agents: input.agents, skills: input.skills },
image,
skills,
).pipe(Effect.provideService(FSUtil.Service, fs))
const messageID = input.id ?? SessionMessage.ID.create()
const admittedInput = SessionPending.Message.make({
@@ -897,12 +903,32 @@ function synthesizeTerminalShellInfo(started: ShellSchema.Info): ShellSchema.Inf
const resolvePrompt = Effect.fn("Session.resolvePrompt")(function* (
input: PromptInput.Prompt,
image: Effect.Effect<Image.Interface>,
skills: Effect.Effect<Skill.Interface>,
) {
const fs = yield* FSUtil.Service
const files = input.files
? yield* Effect.forEach(input.files, (file) => materializeAttachment(fs, file, image), { concurrency: 8 })
: undefined
return Prompt.make({ text: input.text, agents: input.agents, files })
const requested = input.skills
const selected = requested?.length
? yield* Effect.gen(function* () {
const available = yield* (yield* skills).list()
const attachments = Array.from(new Map(requested.map((attachment) => [attachment.id, attachment])).values())
return yield* Effect.forEach(attachments, (attachment) => {
const skill = available.find((item) => item.id === attachment.id)
if (!skill) return Effect.fail(new SkillNotFoundError({ skill: attachment.id }))
return Skill.modelOutput(fs, skill).pipe(
Effect.map((output) => ({
id: skill.id,
name: skill.name,
text: output.output,
mention: attachment.mention,
})),
)
})
})
: undefined
return Prompt.make({ text: input.text, agents: input.agents, files, skills: selected?.length ? selected : undefined })
})
const MAX_ATTACHMENT_BYTES = 20 * 1024 * 1024
packages/core/src/session/compaction.ts
+2 -1
View File
@@ -124,7 +124,8 @@ const serialize = (message: SessionMessage.Info) => {
(file) =>
`[Attached ${file.mime}: ${file.name ?? (file.source.type === "uri" ? file.source.uri : "inline attachment")}]`,
) ?? []
return [`[User]: ${message.text}`, ...files].join("\n")
const skills = message.skills?.map((skill) => `[Attached skill: ${skill.name}]\n${skill.text}`) ?? []
return [`[User]: ${message.text}`, ...skills, ...files].join("\n")
}
if (message.type === "assistant") {
return message.content
packages/core/src/session/projector.ts
+1
View File
@@ -453,6 +453,7 @@ const layer = Layer.effectDiscard(
text: input.data.text,
files: input.data.files,
agents: input.data.agents,
skills: input.data.skills,
time: { created: event.created },
}
: {
packages/core/src/session/runner/to-llm-message.ts
+1
View File
@@ -184,6 +184,7 @@ function toLLMMessage(message: SessionMessage.Info, model: Model.Ref, providerMe
return []
case "user":
const content = [
...(message.skills ?? []).map((skill) => Message.text(skill.text)),
...(message.text === "" ? [] : [Message.text(message.text)]),
...(message.files ?? []).flatMap(attachmentContent),
]
packages/core/src/session/transfer.ts
+9
View File
@@ -2,6 +2,7 @@ export * as SessionTransfer from "./transfer"
import { SessionTransfer } from "@opencode-ai/schema/session-transfer"
import { Tool } from "@opencode-ai/schema/tool"
import { Skill } from "@opencode-ai/schema/skill"
import { eq, isNotNull, isNull, ne, or } from "drizzle-orm"
import { Context, DateTime, Effect, Layer, Schema } from "effect"
import path from "path"
@@ -219,6 +220,14 @@ function sanitizeMessage(message: SessionMessage.Info): SessionMessage.Info {
? { ...agent.mention, text: redact("agent-mention", String(index), agent.mention.text) }
: undefined,
})),
skills: message.skills?.map((skill, index) => ({
...skill,
name: Skill.Name.make(redact("skill-name", String(index), skill.name)),
text: redact("skill", String(index), skill.text),
mention: skill.mention
? { ...skill.mention, text: redact("skill-mention", String(index), skill.mention.text) }
: undefined,
})),
}
if (message.type === "synthetic")
return {
packages/core/src/skill.ts
+35
View File
@@ -38,6 +38,41 @@ export { Event } from "@opencode-ai/schema/skill"
export const available = (skills: ReadonlyArray<Info>, agent: Agent.Info) =>
skills.filter((skill) => Permission.evaluate("skill", skill.id, agent.permissions).effect !== "deny")
const FILE_LIMIT = 10
export const toModelOutput = (skill: Info, files: ReadonlyArray<string>) => {
const directory = path.dirname(skill.location)
return [
`<skill_content name="${skill.name}">`,
`# Skill: ${skill.name}`,
"",
skill.content.trim(),
"",
`Base directory for this skill: ${directory}`,
"Relative paths in this skill (e.g., scripts/, reference/) are relative to this base directory.",
"Note: file list is sampled.",
"",
"<skill_files>",
...files.map((file) => `<file>${file}</file>`),
"</skill_files>",
"</skill_content>",
].join("\n")
}
export const modelOutput = Effect.fn("Skill.modelOutput")(function* (fs: FSUtil.Interface, skill: Info) {
const directory = path.dirname(skill.location)
const files =
path.basename(skill.location) === "SKILL.md"
? (yield* fs
.scan("**/*", { cwd: directory, absolute: true, include: "file", dot: true })
.pipe(Effect.catch(() => Effect.succeed([] as string[]))))
.filter((file) => path.basename(file) !== "SKILL.md")
.toSorted()
.slice(0, FILE_LIMIT)
: []
return { directory, output: toModelOutput(skill, files) }
})
const Frontmatter = Schema.Struct({
name: Schema.String.pipe(Schema.optional),
description: Schema.String.pipe(Schema.optional),
packages/core/src/tool/plugin/skill.ts
+4 -30
View File
@@ -1,7 +1,6 @@
export * as SkillTool from "./skill"
import type { Context as PluginContext } from "@opencode-ai/plugin/effect/plugin"
import path from "path"
import { ToolFailure } from "@opencode-ai/ai"
import { Effect, Schema } from "effect"
import { FSUtil } from "@opencode-ai/util/fs-util"
@@ -9,7 +8,6 @@ import { Skill } from "../../skill"
import { Permission } from "../../permission"
export const name = "skill"
const FILE_LIMIT = 10
export const Input = Schema.Struct({
id: Skill.ID.annotate({ description: "The ID of the skill from the available skills list" }),
@@ -26,24 +24,7 @@ export const description = [
"The skill ID must match one of the available skills in the instructions.",
].join("\n")
export const toModelOutput = (skill: Skill.Info, files: ReadonlyArray<string>) => {
const directory = path.dirname(skill.location)
return [
`<skill_content name="${skill.name}">`,
`# Skill: ${skill.name}`,
"",
skill.content.trim(),
"",
`Base directory for this skill: ${directory}`,
"Relative paths in this skill (e.g., scripts/, reference/) are relative to this base directory.",
"Note: file list is sampled.",
"",
"<skill_files>",
...files.map((file) => `<file>${file}</file>`),
"</skill_files>",
"</skill_content>",
].join("\n")
}
export const toModelOutput = Skill.toModelOutput
const unableToLoad = (name: string, error?: unknown) =>
new ToolFailure({ message: `Unable to load skill ${name}`, error })
@@ -77,18 +58,11 @@ export const Plugin = {
agent: context.agent,
source: { type: "tool", messageID: context.messageID, id: context.id },
})
const directory = path.dirname(skill.location)
const files =
path.basename(skill.location) === "SKILL.md"
? (yield* fs.scan("**/*", { cwd: directory, absolute: true, include: "file", dot: true }))
.filter((file) => path.basename(file) !== "SKILL.md")
.toSorted()
.slice(0, FILE_LIMIT)
: []
const output = yield* Skill.modelOutput(fs, skill)
return {
name: skill.name,
directory,
output: toModelOutput(skill, files),
directory: output.directory,
output: output.output,
}
}).pipe(Effect.mapError((error) => unableToLoad(input.id, error)))
}).pipe(
packages/core/test/session-runner-message.test.ts
+36 -1
View File
@@ -3,7 +3,8 @@ import { Message } from "@opencode-ai/ai"
import { Model } from "@opencode-ai/core/model"
import { Provider } from "@opencode-ai/core/provider"
import { SessionMessage } from "@opencode-ai/core/session/message"
import { AgentAttachment, Base64, FileAttachment } from "@opencode-ai/schema/prompt"
import { AgentAttachment, Base64, FileAttachment, SkillAttachment } from "@opencode-ai/schema/prompt"
import { Skill } from "@opencode-ai/schema/skill"
import { toLLMMessages } from "@opencode-ai/core/session/runner/to-llm-message"
import { Agent } from "@opencode-ai/core/agent"
import { Shell } from "@opencode-ai/schema/shell"
@@ -184,6 +185,40 @@ Recent work
})
})
test("lowers selected skill instructions with the original user prompt", () => {
const messages = toLLMMessages(
[
SessionMessage.User.make({
id: id("user-skill"),
type: "user",
text: "Design this API",
skills: [
SkillAttachment.make({
id: Skill.ID.make("api-design"),
name: Skill.Name.make("API design"),
text: "Start from the ideal call site.",
}),
],
time: { created },
}),
],
model,
)
expect(messages).toHaveLength(1)
expect(messages[0]).toMatchObject({
id: id("user-skill"),
role: "user",
content: [
{
type: "text",
text: "Start from the ideal call site.",
},
{ type: "text", text: "Design this API" },
],
})
})
test("decodes inline text attachment content", () => {
const messages = toLLMMessages(
[
packages/core/test/session-skill.test.ts
+37 -1
View File
@@ -15,6 +15,7 @@ import { SessionExecution } from "@opencode-ai/core/session/execution"
import { SessionMessage } from "@opencode-ai/core/session/message"
import { SessionProjector } from "@opencode-ai/core/session/projector"
import { SessionStore } from "@opencode-ai/core/session/store"
import { SessionPending } from "@opencode-ai/core/session/pending"
import { Skill } from "@opencode-ai/core/skill"
import { testEffect } from "./lib/effect"
@@ -29,7 +30,7 @@ const skills = Layer.mock(Skill.Service, {
id: Skill.ID.make("effect"),
name: Skill.Name.make("Effect"),
description: "Effect guidance",
location: AbsolutePath.make(path.resolve("/skills/effect/SKILL.md")),
location: AbsolutePath.make(path.resolve("/skills/effect.md")),
content: "Use Effect",
}),
]),
@@ -55,6 +56,41 @@ const it = testEffect(
)
describe("Session.skill", () => {
it.effect("attaches a resolved skill snapshot to a normal prompt", () =>
Effect.gen(function* () {
const sessions = yield* Session.Service
const database = yield* Database.Service
const bus = yield* Bus.Service
const session = yield* sessions.create({ location })
const id = SessionMessage.ID.make("msg_skill_attachment")
yield* sessions.prompt({
id,
sessionID: session.id,
text: "Apply this guidance",
skills: [{ id: Skill.ID.make("effect"), mention: { start: 20, end: 27, text: "/effect" } }],
resume: false,
})
yield* SessionPending.promote(database.db, bus, session.id, "steer")
expect(yield* sessions.messages({ sessionID: session.id })).toContainEqual(
expect.objectContaining({
id,
type: "user",
text: "Apply this guidance",
skills: [
{
id: "effect",
name: "Effect",
text: expect.stringContaining("Use Effect"),
mention: { start: 20, end: 27, text: "/effect" },
},
],
}),
)
}),
)
it.effect("projects the caller-supplied message ID", () =>
Effect.gen(function* () {
const sessions = yield* Session.Service
packages/schema/src/prompt-input.ts
+8
View File
@@ -3,6 +3,7 @@ export * as PromptInput from "./prompt-input.js"
import { Schema } from "effect"
import { AgentAttachment, PromptMention } from "./prompt.js"
import { optional, statics } from "./schema.js"
import { Skill } from "./skill.js"
export interface FileAttachment extends Schema.Schema.Type<typeof FileAttachment> {}
export const FileAttachment = Schema.Struct({
@@ -19,8 +20,15 @@ export const FileAttachment = Schema.Struct({
)
export interface Prompt extends Schema.Schema.Type<typeof Prompt> {}
export interface SkillAttachment extends Schema.Schema.Type<typeof SkillAttachment> {}
export const SkillAttachment = Schema.Struct({
id: Skill.ID,
mention: PromptMention.pipe(optional),
}).annotate({ identifier: "PromptInput.SkillAttachment" })
export const Prompt = Schema.Struct({
text: Schema.String,
files: Schema.Array(FileAttachment).pipe(optional),
agents: Schema.Array(AgentAttachment).pipe(optional),
skills: Schema.Array(SkillAttachment).pipe(optional),
}).annotate({ identifier: "PromptInput" })
packages/schema/src/prompt.ts
+12 -1
View File
@@ -1,6 +1,7 @@
import { Schema } from "effect"
import { optional } from "./schema.js"
import { statics } from "./schema.js"
import { Skill } from "./skill.js"
export interface PromptMention extends Schema.Schema.Type<typeof PromptMention> {}
export const PromptMention = Schema.Struct({
@@ -52,21 +53,31 @@ export const AgentAttachment = Schema.Struct({
mention: PromptMention.pipe(optional),
}).annotate({ identifier: "Prompt.AgentAttachment" })
export interface SkillAttachment extends Schema.Schema.Type<typeof SkillAttachment> {}
export const SkillAttachment = Schema.Struct({
id: Skill.ID,
name: Skill.Name,
text: Schema.String,
mention: PromptMention.pipe(optional),
}).annotate({ identifier: "Prompt.SkillAttachment" })
export interface Prompt extends Schema.Schema.Type<typeof Prompt> {}
export const Prompt = Schema.Struct({
text: Schema.String,
files: Schema.Array(FileAttachment).pipe(optional),
agents: Schema.Array(AgentAttachment).pipe(optional),
skills: Schema.Array(SkillAttachment).pipe(optional),
})
.annotate({ identifier: "Prompt" })
.pipe(
statics((schema) => ({
equivalence: Schema.toEquivalence(schema),
fromUserMessage: (input: Pick<Prompt, "text" | "files" | "agents">) =>
fromUserMessage: (input: Pick<Prompt, "text" | "files" | "agents" | "skills">) =>
schema.make({
text: input.text,
...(input.files === undefined ? {} : { files: input.files }),
...(input.agents === undefined ? {} : { agents: input.agents }),
...(input.skills === undefined ? {} : { skills: input.skills }),
}),
})),
)
packages/schema/src/session-message.ts
+1
View File
@@ -58,6 +58,7 @@ export const User = Schema.Struct({
text: Prompt.fields.text,
files: Prompt.fields.files,
agents: Prompt.fields.agents,
skills: Prompt.fields.skills,
type: Schema.tag("user"),
}).annotate({ identifier: "Session.Message.User" })
packages/server/src/handlers/session.ts
+7
View File
@@ -313,6 +313,7 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl
text: ctx.payload.text,
files: ctx.payload.files,
agents: ctx.payload.agents,
skills: ctx.payload.skills,
metadata: ctx.payload.metadata,
delivery: ctx.payload.delivery,
resume: ctx.payload.resume,
@@ -337,6 +338,9 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl
Effect.catchTag("Session.AttachmentError", (error) =>
Effect.fail(new InvalidRequestError({ message: error.message, field: "files" })),
),
Effect.catchTag("Session.SkillNotFoundError", (error) =>
Effect.fail(new InvalidRequestError({ message: `Skill not found: ${error.skill}`, field: "skills" })),
),
),
}
}),
@@ -394,6 +398,9 @@ export const SessionHandler = HttpApiBuilder.group(Api, "server.session", (handl
Effect.catchTag("Session.AttachmentError", (error) =>
Effect.fail(new InvalidRequestError({ message: error.message, field: "files" })),
),
Effect.catchTag("Session.SkillNotFoundError", (error) =>
Effect.fail(new InvalidRequestError({ message: `Skill not found: ${error.skill}`, field: "skills" })),
),
),
}
}),
packages/theme/src/tui/syntax.ts
+1
View File
@@ -12,6 +12,7 @@ export function generateSyntax(theme: ResolvedThemeTokens, mode: Mode) {
rule(["prompt"], theme.hue.accent[step]),
rule(["extmark.file"], feedback.warning.default, { bold: true }),
rule(["extmark.agent"], theme.categorical[0][step], { bold: true }),
rule(["extmark.skill"], theme.categorical[1][step], { bold: true }),
// V1 migration preserves its selected/inverse foreground in this action state.
rule(["extmark.paste"], theme.text.action.primary.focused, {
background: feedback.warning.default,
packages/tui/src/component/prompt/index.tsx
+43 -5
View File
@@ -29,6 +29,7 @@ import { parseSlashHead } from "../../prompt/parse"
import { stringWidth } from "../../util/string-width"
import { createStore, produce, unwrap } from "solid-js/store"
import { emptyPrompt, usePromptHistory, type PromptInfo, type PromptPartRef } from "../../prompt/history"
import { Skill } from "@opencode-ai/schema/skill"
import { computePromptTraits } from "../../prompt/traits"
import { expandPastedTextPlaceholders, expandTrackedPastedText } from "../../prompt/part"
import { usePromptStash } from "../../prompt/stash"
@@ -273,6 +274,7 @@ export function Prompt(props: PromptProps) {
}
const fileStyleId = syntax().getStyleId("extmark.file")!
const agentStyleId = syntax().getStyleId("extmark.agent")!
const skillStyleId = syntax().getStyleId("extmark.skill")!
const pasteStyleId = syntax().getStyleId("extmark.paste")!
let promptPartTypeId = 0
const event = useEvent()
@@ -493,12 +495,29 @@ export function Prompt(props: PromptProps) {
<DialogSkill
location={currentLocation.current}
onSelect={(skill) => {
input.setText(`/${skill} `)
setStore("prompt", {
...emptyPrompt(),
text: `/${skill} `,
if (store.prompt.skills?.some((item) => item.id === skill)) return
const text = `/${skill}`
const start = input.cursorOffset
input.insertText(text + " ")
const extmarkId = input.extmarks.create({
start,
end: start + promptOffsetWidth(text),
virtual: true,
styleId: skillStyleId,
typeId: promptPartTypeId,
})
input.gotoBufferEnd()
setStore(
produce((draft) => {
draft.prompt.text = input.plainText
const skills = (draft.prompt.skills ??= [])
const index = skills.length
skills.push({
id: Skill.ID.make(skill),
mention: { start, end: start + promptOffsetWidth(text), text },
})
draft.extmarkToPart.set(extmarkId, { type: "skill", index })
}),
)
}}
/>
))
@@ -639,6 +658,11 @@ export function Prompt(props: PromptProps) {
ref: { type: "agent" as const, index },
styleId: agentStyleId,
})),
...(prompt.skills ?? []).map((part, index) => ({
mention: part.mention,
ref: { type: "skill" as const, index },
styleId: skillStyleId,
})),
...prompt.pasted.map((part, index) => ({
mention: part.source,
ref: { type: "pasted" as const, index },
@@ -671,6 +695,7 @@ export function Prompt(props: PromptProps) {
const newMap = new Map<number, PromptPartRef>()
const files: NonNullable<PromptInfo["files"]> = []
const agents: NonNullable<PromptInfo["agents"]> = []
const skills: NonNullable<PromptInfo["skills"]> = []
const pasted: PromptInfo["pasted"] = []
for (const extmark of allExtmarks) {
@@ -696,6 +721,16 @@ export function Prompt(props: PromptProps) {
newMap.set(extmark.id, { type: "agent", index })
continue
}
if (ref.type === "skill") {
const part = draft.prompt.skills?.[ref.index]
if (!part?.mention) continue
part.mention.start = extmark.start
part.mention.end = extmark.end
const index = skills.length
skills.push(part)
newMap.set(extmark.id, { type: "skill", index })
continue
}
const part = draft.prompt.pasted[ref.index]
if (!part) continue
part.source.start = extmark.start
@@ -708,6 +743,7 @@ export function Prompt(props: PromptProps) {
draft.extmarkToPart = newMap
draft.prompt.files = files
draft.prompt.agents = agents
draft.prompt.skills = skills
draft.prompt.pasted = pasted
}),
)
@@ -983,6 +1019,7 @@ export function Prompt(props: PromptProps) {
)
const slashHead = parseSlashHead(inputText, /\s/)
const isSkill =
!(store.prompt.skills?.length ?? 0) &&
slashHead !== undefined &&
(data.location.skill.list(currentLocation.ref) ?? []).some(
(skill) => skill.slash === true && skill.id === slashHead.name,
@@ -1146,6 +1183,7 @@ export function Prompt(props: PromptProps) {
text: inputText,
files: store.prompt.files,
agents: store.prompt.agents,
skills: store.prompt.skills?.length ? store.prompt.skills : undefined,
delivery,
})
.then(
packages/tui/src/mini/footer.prompt.tsx
+72 -21
View File
@@ -21,6 +21,7 @@ import {
isExitCommand,
isCompactCommand,
mentionTriggerIndex,
slashTriggerIndex,
isNewCommand,
movePromptHistory,
promptCopy,
@@ -50,7 +51,7 @@ export const TEXTAREA_MIN_ROWS = 1
const TEXTAREA_MAX_ROWS = 6
export const PROMPT_MAX_ROWS = TEXTAREA_MAX_ROWS + AUTOCOMPLETE_ROWS - 1 + AUTOCOMPLETE_BOTTOM_ROWS
type Mention = Extract<RunPromptPart, { type: "file" | "agent" }>
type Mention = Extract<RunPromptPart, { type: "file" | "agent" | "skill" }>
type Auto = RunFooterMenuItem & {
kind: "mention"
@@ -65,7 +66,12 @@ type SlashOption = RunFooterMenuItem & {
action?: "skill-menu" | "editor" | "settings"
}
type PromptOption = Auto | SlashOption
type SkillOption = RunFooterMenuItem & {
kind: "skill"
id: string
}
type PromptOption = Auto | SlashOption | SkillOption
type MenuMode = false | "mention" | "slash"
@@ -124,12 +130,9 @@ function emptyPrompt(shell: boolean): RunPrompt {
}
function slashQuery(text: string, cursor: number) {
const head = parseSlashHead(text.slice(0, cursor))
if (!head || head.end !== cursor) {
return
}
return head.name
const at = slashTriggerIndex(text, cursor)
if (at === undefined) return
return { at, value: displaySlice(text, at + 1, cursor) }
}
function parseSlashCommand(text: string, commands: RunCommand[] | undefined) {
@@ -382,10 +385,18 @@ export function createPromptState(input: PromptInput): PromptState {
)
const mentionOptions = createMemo(() => [...agents(), ...files(), ...references()])
const skillCommands = createMemo(() => (input.commands() ?? []).filter((item) => item.source === "skill"))
const skillOptions = createMemo<SkillOption[]>(() =>
skillCommands().map((item) => ({
kind: "skill",
id: item.name,
display: `/${item.name}`,
description: item.description,
})),
)
const hasSkillsCommand = createMemo(() =>
(input.commands() ?? []).some((item) => item.source !== "skill" && item.name === "skills"),
)
const slashOptions = createMemo<SlashOption[]>(() => {
const slashOptions = createMemo<Array<SlashOption | SkillOption>>(() => {
const builtins = [
{
kind: "slash",
@@ -417,6 +428,7 @@ export function createPromptState(input: PromptInput): PromptState {
}
return [
...skillOptions(),
...(showSkillMenu
? [
{
@@ -443,7 +455,7 @@ export function createPromptState(input: PromptInput): PromptState {
].sort((a, b) => a.display.localeCompare(b.display))
})
const options = createMemo<PromptOption[]>(() => {
const mixed: PromptOption[] = mode() === "slash" ? slashOptions() : mentionOptions()
const mixed: PromptOption[] = mode() === "slash" ? (at() === 0 ? slashOptions() : skillOptions()) : mentionOptions()
if (!query()) {
return mixed
}
@@ -459,7 +471,11 @@ export function createPromptState(input: PromptInput): PromptState {
return fuzzysort
.go(next, mixed, {
keys: [(item) => (item.kind === "mention" ? item.value : item.name).trimEnd(), "display", "description"],
keys: [
(item) => (item.kind === "mention" ? item.value : item.kind === "skill" ? item.id : item.name).trimEnd(),
"display",
"description",
],
})
.map((item) => item.obj)
})
@@ -516,13 +532,15 @@ export function createPromptState(input: PromptInput): PromptState {
const prev =
part.type === "agent"
? (part.source?.value ?? "@" + part.name)
: (part.source?.text.value ?? "@" + (part.filename ?? ""))
: part.type === "skill"
? (part.source?.value ?? "/" + part.id)
: (part.source?.text.value ?? "@" + (part.filename ?? ""))
if (text !== prev) {
continue
}
const copy = structuredClone(part)
if (copy.type === "agent") {
if (copy.type === "agent" || copy.type === "skill") {
copy.source = {
start: item.start,
end: item.end,
@@ -558,7 +576,7 @@ export function createPromptState(input: PromptInput): PromptState {
const restoreParts = (value: RunPromptPart[]) => {
clearParts()
parts = value
.filter((item): item is Mention => item.type === "file" || item.type === "agent")
.filter((item): item is Mention => item.type === "file" || item.type === "agent" || item.type === "skill")
.map((item) => structuredClone(item))
if (!area || area.isDestroyed || type === 0) {
return
@@ -566,8 +584,8 @@ export function createPromptState(input: PromptInput): PromptState {
const box = area
parts.forEach((item, idx) => {
const start = item.type === "agent" ? item.source?.start : item.source?.text.start
const end = item.type === "agent" ? item.source?.end : item.source?.text.end
const start = item.type === "file" ? item.source?.text.start : item.source?.start
const end = item.type === "file" ? item.source?.text.end : item.source?.end
if (start === undefined || end === undefined) {
return
}
@@ -627,16 +645,16 @@ export function createPromptState(input: PromptInput): PromptState {
return
}
setAt(0)
setQuery(slash)
setAt(slash.at)
setQuery(slash.value)
return
}
if (slash !== undefined) {
setAt(0)
setAt(slash.at)
menu.reset()
setMode("slash")
setQuery(slash)
setQuery(slash.value)
return
}
@@ -782,7 +800,7 @@ export function createPromptState(input: PromptInput): PromptState {
}
const cursor = area.cursorOffset
const startOffset = mode() === "slash" ? 0 : at()
const startOffset = at()
area.cursorOffset = startOffset
const start = area.logicalCursor
area.cursorOffset = cursor
@@ -828,6 +846,39 @@ export function createPromptState(input: PromptInput): PromptState {
return
}
if (next.kind === "skill") {
if (parts.some((part) => part.type === "skill" && part.id === next.id)) {
cancelAutocomplete()
return
}
const cursor = area.cursorOffset
const tail = displayCharAt(area.plainText, cursor)
const append = `/${next.id}${tail === " " ? "" : " "}`
area.cursorOffset = at()
const start = area.logicalCursor
area.cursorOffset = cursor
const end = area.logicalCursor
area.deleteRange(start.row, start.col, end.row, end.col)
area.insertText(append)
const text = `/${next.id}`
const startOffset = at()
const endOffset = startOffset + stringWidth(text)
const part: Extract<RunPromptPart, { type: "skill" }> = {
type: "skill",
id: next.id,
source: { start: startOffset, end: endOffset, value: text },
}
const id = area.extmarks.create({ start: startOffset, end: endOffset, virtual: true, typeId: type })
marks.set(id, parts.length)
parts.push(part)
hide()
syncDraft()
scheduleRows()
area.focus()
return
}
if (next.kind === "slash") {
if (next.action === "editor") {
void openEditor({
packages/tui/src/mini/prompt.editor.ts
+5 -5
View File
@@ -2,7 +2,7 @@ import type { RunPromptPart } from "./types"
import { realignPromptMentions } from "../prompt/mention"
import { parseSlashHead } from "../prompt/parse"
type Mention = Extract<RunPromptPart, { type: "file" | "agent" }>
type Mention = Extract<RunPromptPart, { type: "file" | "agent" | "skill" }>
export function resolveEditorSlashValue(text: string) {
const head = parseSlashHead(text)
@@ -17,13 +17,13 @@ export function realignEditorPromptParts(content: string, parts: RunPromptPart[]
const matches = realignPromptMentions(
content,
parts.map((part) => {
if (part.type !== "file" && part.type !== "agent") return
if (part.type !== "file" && part.type !== "agent" && part.type !== "skill") return
return promptPartMention(part)
}),
)
return parts.flatMap((part, index) => {
if (part.type !== "file" && part.type !== "agent") return [part]
if (part.type !== "file" && part.type !== "agent" && part.type !== "skill") return [part]
const mention = promptPartMention(part)
if (!mention?.text) return [part]
const match = matches[index]
@@ -32,13 +32,13 @@ export function realignEditorPromptParts(content: string, parts: RunPromptPart[]
}
function promptPartMention(part: Mention) {
const source = part.type === "agent" ? part.source : part.source?.text
const source = part.type === "file" ? part.source?.text : part.source
if (!source) return
return { start: source.start, end: source.end, text: source.value }
}
function updatePromptPart(part: Mention, start: number, end: number, text: string): Mention {
if (part.type === "agent") {
if (part.type === "agent" || part.type === "skill") {
return {
...part,
source: {
packages/tui/src/mini/prompt.shared.ts
+1 -1
View File
@@ -7,7 +7,7 @@
// the current browse position. When the user arrows up at cursor offset 0,
// the current draft is saved and history begins. Arrowing past the end
// restores the draft.
export { displayCharAt, displaySlice, mentionTriggerIndex } from "../prompt/display"
export { displayCharAt, displaySlice, mentionTriggerIndex, slashTriggerIndex } from "../prompt/display"
import { stringWidth } from "../util/string-width"
import type { RunPrompt } from "./types"
packages/tui/src/mini/stream-v2.transport.ts
+21 -1
View File
@@ -288,6 +288,21 @@ function promptAgents(next: SessionTurnInput) {
)
}
function promptSkills(next: SessionTurnInput) {
return next.prompt.parts.flatMap((part) =>
part.type === "skill"
? [
{
id: part.id,
mention: part.source
? { start: part.source.start, end: part.source.end, text: part.source.value }
: undefined,
},
]
: [],
)
}
function streamPartKey(messageID: string, partID: string) {
return `${messageID}\u0000${partID}`
}
@@ -637,7 +652,10 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
state.messageIDs.add(message.id)
if (!render) return
if (reuseVisibleWait && waiting) return
write([{ kind: "user", source: "system", text: message.text, phase: "start", messageID: message.id }])
write([
...(message.skills ?? []).map((skill) => skillCommit(message.id + ":" + skill.id, skill.name)),
{ kind: "user", source: "system", text: message.text, phase: "start", messageID: message.id },
])
return
}
if (message.type === "skill") {
@@ -1618,6 +1636,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
const command = next.prompt.command
const attachments = await prepareAttachments(next, command ? "command" : "prompt", input.readTextFile)
const agents = promptAgents(next)
const skills = promptSkills(next)
if (!command) {
input.trace?.write("send.prompt", { sessionID: input.sessionID, messageID, delivery })
return client.session.prompt(
@@ -1627,6 +1646,7 @@ export async function createSessionTransport(input: StreamInput): Promise<Sessio
text: [next.prompt.text, ...attachments.text].join("\n\n"),
files: attachments.files.length ? attachments.files : undefined,
agents: agents.length ? agents : undefined,
skills: skills.length ? skills : undefined,
delivery,
},
{ signal: next.signal },
packages/tui/src/mini/types.ts
+1
View File
@@ -47,6 +47,7 @@ export type RunPromptPart =
}
}
| { type: "agent"; name: string; source?: { start: number; end: number; value: string } }
| { type: "skill"; id: string; source?: { start: number; end: number; value: string } }
export type RunCommand = {
name: string
packages/tui/src/prompt/codec.ts
+10 -1
View File
@@ -1,9 +1,14 @@
import type { Prompt, PromptInput } from "@opencode-ai/schema"
import { Skill } from "@opencode-ai/schema/skill"
import type { Types } from "effect"
export type EditablePromptInput = Types.DeepMutable<PromptInput.Prompt>
export function projectedPromptInput(input: Pick<Prompt, "text" | "files" | "agents">): EditablePromptInput {
type ProjectedPrompt = Pick<Prompt, "text" | "files" | "agents"> & {
readonly skills?: ReadonlyArray<{ readonly id: string; readonly mention?: PromptInput.SkillAttachment["mention"] }>
}
export function projectedPromptInput(input: ProjectedPrompt): EditablePromptInput {
return {
text: input.text,
files: input.files?.map((file) => ({
@@ -16,5 +21,9 @@ export function projectedPromptInput(input: Pick<Prompt, "text" | "files" | "age
name: agent.name,
mention: agent.mention ? { ...agent.mention } : undefined,
})),
skills: input.skills?.map((skill) => ({
id: Skill.ID.make(skill.id),
mention: skill.mention ? { ...skill.mention } : undefined,
})),
}
}
packages/tui/src/prompt/display.ts
+11
View File
@@ -48,3 +48,14 @@ export function mentionTriggerIndex(value: string, offset = promptOffsetWidth(va
return promptOffsetWidth(text.slice(0, index))
}
}
export function slashTriggerIndex(value: string, offset = promptOffsetWidth(value)) {
const text = displaySlice(value, 0, offset)
for (let index = text.lastIndexOf("/"); index >= 0; index = text.lastIndexOf("/", index - 1)) {
const before = index === 0 ? undefined : text[index - 1]
const query = text.slice(index)
if (before !== undefined && !/\s/.test(before)) continue
if (/\s/.test(query) || query.slice(1).includes("/")) return
return promptOffsetWidth(text.slice(0, index))
}
}
packages/tui/src/prompt/history.tsx
+4 -4
View File
@@ -1,7 +1,7 @@
import path from "path"
import { onMount } from "solid-js"
import { createStore, produce, unwrap } from "solid-js/store"
import type { SessionPromptInput } from "@opencode-ai/client"
import type { PromptInput } from "@opencode-ai/schema"
import type { Types } from "effect"
import { createSimpleContext } from "../context/helper"
import { useTuiPaths } from "../context/runtime"
@@ -16,17 +16,17 @@ export type PastedText = {
}
}
export type PromptInfo = Types.DeepMutable<Pick<SessionPromptInput, "text" | "files" | "agents">> & {
export type PromptInfo = Types.DeepMutable<Pick<PromptInput.Prompt, "text" | "files" | "agents" | "skills">> & {
pasted: PastedText[]
mode?: "normal" | "shell"
}
export type PromptPartRef = {
type: "file" | "agent" | "pasted"
type: "file" | "agent" | "skill" | "pasted"
index: number
}
export const emptyPrompt = (): PromptInfo => ({ text: "", files: [], agents: [], pasted: [] })
export const emptyPrompt = (): PromptInfo => ({ text: "", files: [], agents: [], skills: [], pasted: [] })
export const MAX_HISTORY_ENTRIES = 50
packages/tui/src/prompt/mention.ts
+9 -4
View File
@@ -35,9 +35,7 @@ export function realignPromptMentions(
([left], [right]) => right.length - left.length || left.localeCompare(right),
)) {
const candidates = mentionRanges(content, text)
const available = candidates.filter(
(candidate) => !protectedRanges.some((range) => overlaps(candidate, range)),
)
const available = candidates.filter((candidate) => !protectedRanges.some((range) => overlaps(candidate, range)))
for (const [item, candidate] of assignMentions(items, available)) {
aligned[item.index] = {
text,
@@ -54,9 +52,11 @@ export function realignPromptMentions(
export function realignPromptInputMentions(content: string, input: PromptInput.Prompt): EditablePromptInput {
const files = input.files ?? []
const agents = input.agents ?? []
const skills = input.skills ?? []
const mentions = realignPromptMentions(content, [
...files.map((file) => file.mention),
...agents.map((agent) => agent.mention),
...skills.map((skill) => skill.mention),
])
const align = <T extends { mention?: PromptMention }>(items: readonly T[] | undefined, offset = 0) =>
items?.flatMap((item, index) => {
@@ -69,6 +69,7 @@ export function realignPromptInputMentions(content: string, input: PromptInput.P
text: content,
files: align(input.files),
agents: align(input.agents, files.length),
skills: align(input.skills, files.length + agents.length),
}
}
@@ -91,6 +92,7 @@ export function expandPromptInputPastedText(
text: expandTrackedPastedText(input.text, ranges),
files: input.files?.map((file) => ({ ...file, mention: shift(file.mention) })),
agents: input.agents?.map((agent) => ({ ...agent, mention: shift(agent.mention) })),
skills: input.skills?.map((skill) => ({ ...skill, mention: shift(skill.mention) })),
}
}
@@ -109,7 +111,10 @@ function assignMentions(items: MentionItem[], candidates: CandidateRange[]) {
const ordered = items.toSorted((left, right) => left.mention.start - right.mention.start || left.index - right.index)
const memo = new Map<string, { matches: number; cost: number; pairs: Array<[MentionItem, CandidateRange]> }>()
function solve(item: number, candidate: number): { matches: number; cost: number; pairs: Array<[MentionItem, CandidateRange]> } {
function solve(
item: number,
candidate: number,
): { matches: number; cost: number; pairs: Array<[MentionItem, CandidateRange]> } {
if (item >= ordered.length || candidate >= candidates.length) return { matches: 0, cost: 0, pairs: [] }
const key = `${item}:${candidate}`
const cached = memo.get(key)
packages/tui/src/routes/session/index.tsx
+24 -1
View File
@@ -1919,6 +1919,7 @@ function UserMessage(props: { message: SessionMessageUser }) {
const data = useData()
const local = useLocal()
const files = createMemo(() => props.message.files ?? [])
const skills = createMemo(() => props.message.skills ?? [])
const themes = useThemes()
const theme = useTheme("elevated")
const mode = themes.mode
@@ -1934,7 +1935,7 @@ function UserMessage(props: { message: SessionMessageUser }) {
}
return (
<Show when={props.message.text.trim() || files().length}>
<Show when={props.message.text.trim() || files().length || skills().length}>
<box
border={["left"]}
borderColor={delivery() ? theme.border.default : color()}
@@ -1979,6 +1980,28 @@ function UserMessage(props: { message: SessionMessageUser }) {
flexShrink={0}
>
<text fg={theme.text.default}>{props.message.text}</text>
<Show when={skills().length}>
<box flexDirection="row" paddingTop={1} gap={1} flexWrap="wrap">
<For each={skills()}>
{(skill) => (
<text fg={theme.text.default}>
<span
style={{
bg: theme.hue.accent[mode() === "light" ? 700 : 200],
fg: theme.background.default,
bold: true,
}}
>
{" skill "}
</span>
<span style={{ bg: theme.raise(theme.background.default), fg: theme.text.subdued }}>
{` ${skill.name} `}
</span>
</text>
)}
</For>
</box>
</Show>
<Show when={files().length}>
<box flexDirection="row" paddingTop={1} gap={1} flexWrap="wrap">
<For each={files()}>
packages/tui/test/mini/stream-v2.transport.test.ts
+69
View File
@@ -2851,6 +2851,75 @@ describe("V2 mini transport", () => {
await transport.close()
})
test("sends inline skill attachments with a normal prompt", async () => {
const events = feed()
events.push(connected())
const client = sdk({ streams: [events] })
const ui = footer()
const transport = await createSessionTransport({
sdk: client,
sessionID: "ses_1",
thinking: false,
footer: ui.api,
})
let request: Parameters<OpenCodeClient["session"]["prompt"]>[0] | undefined
spyOn(client.session, "prompt").mockImplementation((input) => {
request = input
queueMicrotask(() => {
events.push({
id: "evt_prompted",
created: 0,
type: "session.input.promoted",
durable: durable("ses_1"),
data: { sessionID: "ses_1", inputID: "msg_skill_attachment" },
})
events.push({
id: "evt_settled",
created: 0,
type: "session.execution.succeeded",
durable: durable("ses_1"),
data: { sessionID: "ses_1" },
})
})
return ok({
id: input.id ?? "msg_skill_attachment",
sessionID: "ses_1",
type: "user" as const,
data: { text: input.text },
delivery: "steer" as const,
timeCreated: 2,
})
})
await transport.runPromptTurn({
agent: undefined,
model: undefined,
variant: undefined,
prompt: {
messageID: "msg_skill_attachment",
text: "Review this /api-design",
parts: [
{
type: "skill",
id: "api-design",
source: { start: 12, end: 23, value: "/api-design" },
},
],
},
files: [],
includeFiles: false,
})
expect(request).toMatchObject({
sessionID: "ses_1",
id: "msg_skill_attachment",
text: "Review this /api-design",
skills: [{ id: "api-design", mention: { start: 12, end: 23, text: "/api-design" } }],
delivery: "steer",
})
await transport.close()
})
test("refreshes catalogs on connection and location-scoped invalidations", async () => {
const events = feed()
events.push(connected())
packages/tui/test/prompt/display.test.ts
+11 -1
View File
@@ -1,5 +1,5 @@
import { describe, expect, test } from "bun:test"
import { displayCharAt, displaySlice, mentionTriggerIndex } from "../../src/prompt/display"
import { displayCharAt, displaySlice, mentionTriggerIndex, slashTriggerIndex } from "../../src/prompt/display"
describe("prompt display", () => {
test("uses display-width offsets for mentions", () => {
@@ -30,4 +30,14 @@ describe("prompt display", () => {
expect(mentionTriggerIndex("foo@bar.com")).toBeUndefined()
expect(mentionTriggerIndex("中文 @src file")).toBeUndefined()
})
test("finds slash attachments at token boundaries", () => {
expect(slashTriggerIndex("/")).toBe(0)
expect(slashTriggerIndex("Review this /api-design")).toBe(12)
expect(slashTriggerIndex("中文 /api-design")).toBe(5)
expect(slashTriggerIndex("Review /api design")).toBeUndefined()
expect(slashTriggerIndex("Review /tmp/file.ts")).toBeUndefined()
expect(slashTriggerIndex("https://opencode.ai/docs")).toBeUndefined()
expect(slashTriggerIndex("src/prompt/index.ts")).toBeUndefined()
})
})