Skip to content

fix(core): recover idle moves through the selected instance #46955

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
kitlangton wants to merge 1 commit into
base: v2
Choose a base branch
from
Open

fix(core): recover idle moves through the selected instance #46955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 18 additions & 3 deletions packages/core/src/session.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export * as Session from "./session.js"
export * from "./session/schema.js"

import { Effect, Layer, Schema, Context, Stream } from "effect"
import { Cause, Effect, Layer, Schema, Context, Stream } from "effect"
import { LLMClient } from "@opencode-ai/ai"
import { ListAnchor } from "@opencode-ai/schema/session"
import { and, desc, eq } from "drizzle-orm"
Expand Down Expand Up @@ -418,6 +418,17 @@ const layer = Layer.effect(
Effect.provideService(Project.Service, projects),
Effect.provideService(LocationServiceMap.Service, locations),
)
// Probe the same instance execution would use, without holding up inbox cancellation.
const unavailable =
!(yield* execution.isActive(input.sessionID)) &&
(!(yield* fs.isDir(session.location.directory)) ||
!(yield* SessionRunner.Service.pipe(
instances.provide(session),
Effect.as(true),
Effect.catchCause((cause) =>
Cause.hasInterrupts(cause) ? Effect.failCause(cause) : Effect.succeed(false),
),
)))
const item = SessionInbox.Item.make({
type: "move",
payload,
Expand All @@ -427,9 +438,13 @@ const layer = Layer.effect(
input.sessionID,
Effect.gen(function* () {
const latest = yield* result.get(input.sessionID)
const source = yield* fs.stat(latest.location.directory).pipe(Effect.orElseSucceed(() => undefined))
// Active runners must hand off at a step boundary to retain their continuation.
if ((!source || source.type !== "Directory") && !(yield* execution.isActive(input.sessionID))) {
if (
unavailable &&
latest.location.directory === session.location.directory &&
latest.location.workspaceID === session.location.workspaceID &&
!(yield* execution.isActive(input.sessionID))
) {
const cancellations = (yield* SessionInbox.moveIDs(db, input.sessionID)).map(
(item) => [SessionEvent.InboxCancelled, { sessionID: input.sessionID, inboxID: item.id }] as const,
)
Expand Down
Loading
Loading