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
18 changes: 10 additions & 8 deletions packages/daemon/src/opencode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,7 @@ import {
} from "@opencode-ai/sdk/v2";

export interface OpencodeSessionClient {
create(parameters: {
directory?: string;
title?: string;
}): Promise<{ data: Session }>;
create(parameters: { directory?: string; title?: string }): Promise<Session>;
prompt(parameters: {
sessionID: string;
directory?: string;
Expand All @@ -22,7 +19,7 @@ export interface OpencodeSessionClient {
system?: string;
variant?: string;
parts?: Array<TextPartInput>;
}): Promise<{ data: { info: AssistantMessage; parts: Part[] } }>;
}): Promise<{ info: AssistantMessage; parts: Part[] }>;
abort(parameters: {
sessionID: string;
directory?: string;
Expand Down Expand Up @@ -70,24 +67,29 @@ export class OpencodeRegistry implements OpencodeRuntimeManager {
return entry.starting;
}

const starting = createOpencode().then(({ client, server }) => {
const starting = createOpencode().then(async ({ client, server }) => {
const runtime: ManagedOpencodeRuntime = {
client: {
instance: {
dispose: () => client.instance.dispose(),
},
session: {
create: async (parameters) => {
return await client.session.create(parameters, {
const res = await client.session.create(parameters, {
throwOnError: true,
responseStyle: "data",
});
return res as unknown as Session;
},
prompt: async (parameters) => {
return await client.session.prompt(parameters, {
const res = await client.session.prompt(parameters, {
throwOnError: true,
responseStyle: "data",
});
return res as unknown as {
info: AssistantMessage;
parts: Part[];
};
},
abort: (parameters) =>
client.session.abort(parameters, {
Expand Down
8 changes: 4 additions & 4 deletions packages/daemon/src/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -538,8 +538,8 @@ export class Daemon {
variant: job.task.variant,
parts: [{ type: "text", text: job.task.prompt }],
});
job.messageId = response.data.info.id;
job.outputText = extractText(response.data.parts);
job.messageId = response.info.id;
job.outputText = extractText(response.parts);
job.error = undefined;
job.state = controller.signal.aborted ? "cancelled" : "succeeded";
break;
Expand Down Expand Up @@ -575,10 +575,10 @@ export class Daemon {
directory: instance.directory,
title: job.session.title,
});
job.sessionId = session.data.id;
job.sessionId = session.id;
this.state = this.store.upsertJob(this.state, job);
await this.store.save(this.state);
return session.data.id;
return session.id;
}

private async startInstance(instanceId: string): Promise<ManagedInstance> {
Expand Down
Loading