Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"name": "Project 1",
"image": "node:22-bookworm",
"postCreateCommand": "curl -fsSL https://bun.sh/install | bash"
}
83 changes: 46 additions & 37 deletions packages/app/src/components/prompt-input/build-request-parts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,19 +87,8 @@ const toOptimisticPart = (part: PromptRequestPart, sessionID: string, messageID:
messageID,
}
}

export function buildRequestParts(input: BuildRequestPartsInput) {
const requestParts: PromptRequestPart[] = input.text.trim()
? [
{
id: Identifier.ascending("part"),
type: "text",
text: input.text,
},
]
: []

const files = input.prompt.filter(isFileAttachment).map((attachment) => {
function buildFileParts(input: BuildRequestPartsInput) {
return input.prompt.filter(isFileAttachment).map((attachment) => {
const path = absolute(input.sessionDirectory, attachment.path)
const source = attachment.source
? {
Expand Down Expand Up @@ -128,8 +117,10 @@ export function buildRequestParts(input: BuildRequestPartsInput) {
source,
} satisfies PromptRequestPart
})
}

const agents = input.prompt.filter(isAgentAttachment).map((attachment) => {
function buildAgentParts(input: BuildRequestPartsInput): PromptRequestPart[] {
return input.prompt.filter(isAgentAttachment).map((attachment) => {
return {
id: Identifier.ascending("part"),
type: "agent",
Expand All @@ -141,40 +132,41 @@ export function buildRequestParts(input: BuildRequestPartsInput) {
},
} satisfies PromptRequestPart
})
}

const used = new Set(files.map((part) => part.url))
const context = input.context.flatMap((item) => {
function buildContextMentionParts(sessionDirectory: string, comment: string, used: Set<string>): PromptRequestPart[] {
return parseCommentMentions(comment).flatMap((path) => {
const url = `file://${encodeFilePath(absolute(sessionDirectory, path))}`
if (used.has(url)) return []
used.add(url)
return [
{
id: Identifier.ascending("part"),
type: "file",
mime: "text/plain",
url,
filename: getFilename(path),
} satisfies PromptRequestPart,
]
})
}

function buildContextParts(input: BuildRequestPartsInput, used: Set<string>): PromptRequestPart[] {
return input.context.flatMap((item) => {
const path = absolute(input.sessionDirectory, item.path)
const url = `file://${encodeFilePath(path)}${fileQuery(item.selection)}`
const comment = item.comment?.trim()
if (!comment && used.has(url)) return []
used.add(url)

const filePart = {
id: Identifier.ascending("part"),
type: "file",
mime: "text/plain",
url,
filename: getFilename(item.path),
} satisfies PromptRequestPart

if (!comment) return [filePart]

const mentions = parseCommentMentions(comment).flatMap((path) => {
const url = `file://${encodeFilePath(absolute(input.sessionDirectory, path))}`
if (used.has(url)) return []
used.add(url)
return [
{
id: Identifier.ascending("part"),
type: "file",
mime: "text/plain",
url,
filename: getFilename(path),
} satisfies PromptRequestPart,
]
})

const mentions = buildContextMentionParts(input.sessionDirectory, comment, used)
return [
{
id: Identifier.ascending("part"),
Expand All @@ -193,8 +185,10 @@ export function buildRequestParts(input: BuildRequestPartsInput) {
...mentions,
]
})
}

const images = input.images.map((attachment) => {
function buildImageParts(input: BuildRequestPartsInput): PromptRequestPart[] {
return input.images.map((attachment) => {
return {
id: Identifier.ascending("part"),
type: "file",
Expand All @@ -203,11 +197,26 @@ export function buildRequestParts(input: BuildRequestPartsInput) {
filename: attachment.sourcePath ?? attachment.filename,
} satisfies PromptRequestPart
})
}

export function buildRequestParts(input: BuildRequestPartsInput) {
const requestParts: PromptRequestPart[] = input.text.trim()
? [
{
id: Identifier.ascending("part"),
type: "text",
text: input.text,
},
]
: []
const files = buildFileParts(input)
const agents = buildAgentParts(input)
const used = new Set(files.map((part) => part.url))
const context = buildContextParts(input, used)
const images = buildImageParts(input)
requestParts.push(...files, ...context, ...agents, ...images)

return {
requestParts,
optimisticParts: requestParts.map((part) => toOptimisticPart(part, input.sessionID, input.messageID)),
}
}
}
Loading