Skip to content
Merged
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
36 changes: 29 additions & 7 deletions packages/provider-muse/src/server/adapter.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -850,16 +850,33 @@ describe("MuseAdapterV2", () => {
}).pipe(Effect.provide(testLayer)),
);

it.effect(
"closes a newly opened host when native session registration returns another identity",
() =>
it.effect.each([
{
reason: "another identity",
method: "session/start",
sessionId: "unexpected-session",
initialNativeThreadId: undefined,
history: { items: [] },
},
{
reason: "an unavailable projection",
method: "session/resume",
sessionId: "saved-session",
initialNativeThreadId: "saved-session",
history: { items: null, mode: "none", noneReason: "projectionUnavailable" },
},
])(
"closes a newly opened host when native session registration returns $reason",
({ method, sessionId, initialNativeThreadId, history }) =>
Effect.gen(function* () {
const fake = yield* makeFakeMuse();
fake.queueResponse("session/start", {
session: { sessionId: "unexpected-session", modelId: MODEL, activeTurnId: null },
history: { items: [] },
fake.queueResponse(method, {
session: { sessionId, modelId: MODEL, activeTurnId: null },
history,
});
const result = yield* makeHarness(fake).pipe(Effect.exit);
const result = yield* makeHarness(fake, INSTANCE_ID, initialNativeThreadId).pipe(
Effect.exit,
);
assert.strictEqual(result._tag, "Failure");
yield* Effect.promise(() => fake.host.exited);
assert.strictEqual(fake.closeCount(), 1);
Expand Down Expand Up @@ -1441,6 +1458,11 @@ describe("MuseAdapterV2", () => {
text: "Previous answer",
};
fake.setHistory([nativeItem]);
fake.queueResponse("session/resume", {
session: { sessionId: "saved-session", modelId: MODEL, activeTurnId: null },
viewCursor: "",
history: { items: null, mode: "none", noneReason: "excluded" },
});
const harness = yield* makeHarness(fake, INSTANCE_ID, "saved-session");
const resumed = yield* fake.takeCall("session/resume");
assert.strictEqual(resumed.params.sessionId, "saved-session");
Expand Down
4 changes: 4 additions & 0 deletions packages/provider-muse/src/server/adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1879,6 +1879,10 @@ export const makeMuseAdapterV2 = Effect.fn("makeMuseAdapterV2")(function* (
);
if (result.session.sessionId !== nativeSessionId)
return yield* protocolError("Muse returned a different session identity");
if (result.history?.noneReason === "projectionUnavailable")
return yield* protocolError(
"Muse cannot stream this session because its live view is unavailable",
);
if (requestedId)
yield* request("session/setApprovalMode", {
mode: museApprovalMode(args.runtimePolicy.runtimeMode),
Expand Down
1 change: 1 addition & 0 deletions packages/provider-muse/src/server/protocol.ts
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export const MuseSessionResult = Schema.Struct({
history: Schema.optional(
Schema.Struct({
items: Schema.NullOr(Schema.Array(MuseItem)),
noneReason: Schema.optional(Schema.String),
snapshot: Schema.optional(
Schema.NullOr(
Schema.Struct({
Expand Down
Loading