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
1 change: 1 addition & 0 deletions packages/app/vite.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export default [
resolve: {
alias: {
"@": fileURLToPath(new URL("./src", import.meta.url)),
"@opencode-ai/core": fileURLToPath(new URL("../core/src", import.meta.url)),
},
},
define: {
Expand Down
23 changes: 20 additions & 3 deletions packages/opencode/src/session/prompt.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1218,14 +1218,27 @@ export const layer = Layer.effect(
let structured: unknown
let step = 0
const session = yield* sessions.get(sessionID).pipe(Effect.orDie)
let msgs: MessageV2.WithParts[] | undefined
let needsFullReload = true

while (true) {
yield* status.set(sessionID, { type: "busy" })
yield* Effect.logInfo("loop", { "session.id": sessionID, step })

let msgs = yield* MessageV2.filterCompactedEffect(sessionID).pipe(
Effect.provideService(Database.Service, database),
)
if (needsFullReload || !msgs) {
msgs = yield* MessageV2.filterCompactedEffect(sessionID).pipe(
Effect.provideService(Database.Service, database),
)
needsFullReload = false
} else {
const fresh = yield* MessageV2.filterCompactedEffect(sessionID).pipe(
Effect.provideService(Database.Service, database),
)
const knownIDs = new Set(msgs.map((m) => m.info.id))
for (const m of fresh) {
if (!knownIDs.has(m.info.id)) msgs.push(m)
}
}

const { user: lastUser, assistant: lastAssistant, finished: lastFinished, tasks } = MessageV2.latest(msgs)

Expand Down Expand Up @@ -1277,6 +1290,7 @@ export const layer = Layer.effect(

if (task?.type === "subtask") {
yield* handleSubtask({ task, model, lastUser, sessionID, session, msgs })
needsFullReload = true
continue
}

Expand All @@ -1289,6 +1303,7 @@ export const layer = Layer.effect(
overflow: task.overflow,
})
if (result === "stop") break
needsFullReload = true
continue
}

Expand All @@ -1298,6 +1313,7 @@ export const layer = Layer.effect(
(yield* compaction.isOverflow({ tokens: lastFinished.tokens, model }))
) {
yield* compaction.create({ sessionID, agent: lastUser.agent, model: lastUser.model, auto: true })
needsFullReload = true
continue
}

Expand Down Expand Up @@ -1455,6 +1471,7 @@ export const layer = Layer.effect(
auto: true,
overflow: !handle.message.finish,
})
needsFullReload = true
}
return "continue" as const
}).pipe(
Expand Down
Loading