OrgTJWater/TJWaterAgent
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(opencode): restore stable v1 runtime

Browse Source
This commit is contained in:
jiang
2026-08-05 17:59:35 +08:00
parent 764a1f4e82
commit 1407dd3bbe
33 changed files with 1106 additions and 1668 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/opencode/skillManagerTool.test.ts
+8 -11
View File
@@ -7,9 +7,6 @@ import { createSkillManagerTool } from "../../.opencode/tools/skill_manager.js";
import { type RuntimeSessionContext } from "../../src/runtime/sessionContext.js";
import { SkillStore } from "../../src/skills/store.js";
const toolContent = async (result: Promise<{ content?: string }>) =>
(await result).content ?? "";
describe("skill_manager tool", () => {
let tempDir: string;
let skillStore: SkillStore;
@@ -64,7 +61,7 @@ describe("skill_manager tool", () => {
);
const writeResult = JSON.parse(
await toolContent(tool.execute(
await tool.execute(
{
action: "write_skill",
content: skillDocument("# Pressure Review"),
@@ -72,7 +69,7 @@ describe("skill_manager tool", () => {
skill_path: "workflow/pressure-review",
},
toolContext,
)),
) as string,
);
expect(writeResult.decision).toBe("accepted");
await expect(readFile(writeResult.target, "utf8")).resolves.toContain(
@@ -80,7 +77,7 @@ describe("skill_manager tool", () => {
);
const updateResult = JSON.parse(
await toolContent(tool.execute(
await tool.execute(
{
action: "write_skill",
content: skillDocument("# Updated Pressure Review"),
@@ -88,7 +85,7 @@ describe("skill_manager tool", () => {
skill_path: "workflow/pressure-review",
},
toolContext,
)),
) as string,
);
expect(updateResult.decision).toBe("accepted");
await expect(readFile(updateResult.target, "utf8")).resolves.toContain(
@@ -96,14 +93,14 @@ describe("skill_manager tool", () => {
);
const removeResult = JSON.parse(
await toolContent(tool.execute(
await tool.execute(
{
action: "remove_skill",
reason: "workflow is obsolete",
skill_path: "workflow/pressure-review",
},
toolContext,
)),
) as string,
);
expect(removeResult.decision).toBe("accepted");
await expect(readFile(removeResult.target, "utf8")).rejects.toThrow();
@@ -117,7 +114,7 @@ describe("skill_manager tool", () => {
);
const writeResult = JSON.parse(
await toolContent(tool.execute(
await tool.execute(
{
action: "write_skill",
content: [
@@ -132,7 +129,7 @@ describe("skill_manager tool", () => {
skill_path: "__root__",
},
toolContext,
)),
) as string,
);
expect(writeResult.decision).toBe("accepted");
tests/routes/chatStream.test.ts
+87 -149
View File
@@ -21,18 +21,20 @@ describe("streamPromptResponse", () => {
createEventStream([
{
type: "permission.asked",
sessionId: "runtime-session-1",
request: {
properties: {
id: "perm-1",
action: "shell",
resources: ["rm *"],
sessionID: "runtime-session-1",
permission: "bash",
patterns: ["rm *"],
metadata: { command: "rm tmp.txt" },
save: ["rm *"],
always: ["rm *"],
},
},
{
type: "session.execution.succeeded",
sessionId: "runtime-session-1",
type: "session.idle",
properties: {
sessionID: "runtime-session-1",
},
},
]),
prompt: async () => undefined,
@@ -52,7 +54,7 @@ describe("streamPromptResponse", () => {
expect(permissionEvent?.data).toMatchObject({
session_id: "client-session-1",
request_id: "perm-1",
permission: "shell",
permission: "bash",
patterns: ["rm *"],
target: "rm tmp.txt",
always: ["rm *"],
@@ -66,18 +68,20 @@ describe("streamPromptResponse", () => {
createEventStream([
{
type: "permission.asked",
sessionId: "runtime-session-1",
request: {
properties: {
id: "perm-1",
action: "shell",
resources: ["npm test"],
sessionID: "runtime-session-1",
permission: "bash",
patterns: ["npm test"],
metadata: { command: "npm test" },
save: ["npm test"],
always: ["npm test"],
},
},
{
type: "session.execution.succeeded",
sessionId: "runtime-session-1",
type: "session.idle",
properties: {
sessionID: "runtime-session-1",
},
},
]),
prompt: async () => undefined,
@@ -112,15 +116,15 @@ describe("streamPromptResponse", () => {
});
});
it("forwards external-directory V2 permission requests as SSE payloads", async () => {
it("forwards opencode v2 permission requests as SSE payloads", async () => {
const runtime = {
subscribeEvents: async () =>
createEventStream([
{
type: "permission.asked",
sessionId: "runtime-session-1",
request: {
type: "permission.v2.asked",
properties: {
id: "perm-v2-1",
sessionID: "runtime-session-1",
action: "external_directory",
resources: ["/tmp"],
save: ["/tmp"],
@@ -128,8 +132,10 @@ describe("streamPromptResponse", () => {
},
},
{
type: "session.execution.succeeded",
sessionId: "runtime-session-1",
type: "session.idle",
properties: {
sessionID: "runtime-session-1",
},
},
]),
prompt: async () => undefined,
@@ -162,9 +168,9 @@ describe("streamPromptResponse", () => {
createEventStream([
{
type: "question.asked",
sessionId: "runtime-session-1",
request: {
properties: {
id: "question-1",
sessionID: "runtime-session-1",
questions: [
{
header: "范围",
@@ -178,13 +184,17 @@ describe("streamPromptResponse", () => {
},
{
type: "question.replied",
sessionId: "runtime-session-1",
requestId: "question-1",
answers: [["城区", "补充说明"]],
properties: {
sessionID: "runtime-session-1",
requestID: "question-1",
answers: [["城区", "补充说明"]],
},
},
{
type: "session.execution.succeeded",
sessionId: "runtime-session-1",
type: "session.idle",
properties: {
sessionID: "runtime-session-1",
},
},
]),
prompt: async () => undefined,
@@ -220,16 +230,19 @@ describe("streamPromptResponse", () => {
});
});
it("waits for the Form event instead of exposing the question tool call ID", async () => {
it("converts question tool parts into question request SSE payloads", async () => {
const runtime = {
subscribeEvents: async () =>
createEventStream([
{
type: "tool.updated",
sessionId: "runtime-session-1",
part: {
type: "message.part.updated",
properties: {
sessionID: "runtime-session-1",
part: {
id: "tool-part-1",
sessionID: "runtime-session-1",
messageID: "message-1",
type: "tool",
callID: "call-1",
tool: "question",
state: {
@@ -248,31 +261,17 @@ describe("streamPromptResponse", () => {
},
],
},
time: { start: Date.now() },
},
},
},
{
type: "question.asked",
sessionId: "runtime-session-1",
request: {
id: "frm_1",
questions: [
{
header: "测试问题",
question: "你觉得这个 question 工具好用吗？",
options: [
{
label: "非常好用",
description: "交互清晰，选项方便",
},
],
},
],
time: Date.now(),
},
},
{
type: "session.execution.succeeded",
sessionId: "runtime-session-1",
type: "session.idle",
properties: {
sessionID: "runtime-session-1",
},
},
]),
prompt: async () => undefined,
@@ -290,7 +289,7 @@ describe("streamPromptResponse", () => {
expect(events.find((item) => item.event === "question_request")?.data).toMatchObject({
session_id: "client-session-1",
request_id: "frm_1",
request_id: "call-1",
questions: [
{
header: "测试问题",
@@ -303,12 +302,11 @@ describe("streamPromptResponse", () => {
],
},
],
tool: {
messageID: "message-1",
callID: "call-1",
},
});
expect(
events.some(
(item) => item.event === "question_request" && item.data.request_id === "call-1",
),
).toBe(false);
expect(
events.some(
(item) => item.event === "tool_call" && item.data.tool === "question",
@@ -316,32 +314,25 @@ describe("streamPromptResponse", () => {
).toBe(false);
});
it("forwards normalized V2 text and reasoning deltas", async () => {
it("forwards todo updates as structured SSE payloads and progress", async () => {
const runtime = {
subscribeEvents: async () =>
createEventStream([
{
type: "reasoning.updated",
sessionId: "runtime-session-1",
partId: "reasoning-1",
delta: "分析中",
completed: false,
type: "todo.updated",
properties: {
sessionID: "runtime-session-1",
todos: [
{ content: "分析水位", status: "completed", priority: "high" },
{ content: "生成建议", status: "in_progress", priority: "medium" },
],
},
},
{
type: "reasoning.updated",
sessionId: "runtime-session-1",
partId: "reasoning-1",
completed: true,
},
{
type: "text.delta",
sessionId: "runtime-session-1",
partId: "text-1",
delta: "完成",
},
{
type: "session.execution.succeeded",
sessionId: "runtime-session-1",
type: "session.idle",
properties: {
sessionID: "runtime-session-1",
},
},
]),
prompt: async () => undefined,
@@ -357,83 +348,30 @@ describe("streamPromptResponse", () => {
write: (event, data) => events.push({ event, data }),
});
expect(events.find((item) => item.event === "token")?.data).toEqual({
session_id: "client-session-1",
content: "完成",
});
expect(
events.find(
(item) =>
item.event === "progress" &&
item.data.id === "reasoning-1" &&
item.data.status === "completed",
(item) => item.event === "progress" && item.data.id === "todo-progress",
)?.data,
).toMatchObject({
id: "todo-progress",
phase: "planning",
title: "分析规划完成",
title: "计划进度 1/2",
});
expect(events.find((item) => item.event === "todo_update")?.data).toMatchObject({
session_id: "client-session-1",
todos: [
expect.objectContaining({
content: "分析水位",
status: "completed",
priority: "high",
}),
expect.objectContaining({
content: "生成建议",
status: "in_progress",
priority: "medium",
}),
],
});
});
it("retains the first runtime event when prompt resolves before delivery", async () => {
const runtime = {
subscribeEvents: async () => ({
async *[Symbol.asyncIterator]() {
await Promise.resolve();
yield {
type: "text.delta",
sessionId: "runtime-session-1",
partId: "text-1",
delta: "首个事件",
};
yield {
type: "session.execution.succeeded",
sessionId: "runtime-session-1",
};
},
}),
prompt: async () => undefined,
messages: async () => [],
} as unknown as OpencodeRuntimeAdapter;
const events: Array<{ event: string; data: Record<string, unknown> }> = [];
await streamPromptResponse({
runtime,
sessionId: "runtime-session-1",
clientSessionId: "client-session-1",
message: "race",
write: (event, data) => events.push({ event, data }),
});
expect(events.find((item) => item.event === "token")?.data.content).toBe("首个事件");
expect(events.find((item) => item.event === "done")?.data.session_id).toBe(
"client-session-1",
);
});
it("terminates the stream when V2 reports execution failure", async () => {
const runtime = {
subscribeEvents: async () =>
createEventStream([
{
type: "session.execution.failed",
sessionId: "runtime-session-1",
error: { name: "ExecutionError", data: { message: "执行失败" } },
},
]),
prompt: async () => undefined,
messages: async () => [],
} as unknown as OpencodeRuntimeAdapter;
const events: Array<{ event: string; data: Record<string, unknown> }> = [];
const result = await streamPromptResponse({
runtime,
sessionId: "runtime-session-1",
clientSessionId: "client-session-1",
message: "fail",
write: (event, data) => events.push({ event, data }),
});
expect(events.find((item) => item.event === "error")?.data.message).toBe("执行失败");
expect(result.failed).toBe(true);
});
});
tests/runtime/opencode.test.ts
+39 -82
View File
@@ -1,57 +1,34 @@
import { describe, expect, it } from "bun:test";
import { type OpenCodeClient } from "@opencode-ai/client";
import { type OpencodeClient } from "@opencode-ai/sdk/v2";
import {
getEmbeddedServicePaths,
OpencodeRuntimeAdapter,
} from "../../src/runtime/opencode.js";
describe("getEmbeddedServicePaths", () => {
it("isolates service registrations by workspace and Agent port", () => {
const internal = getEmbeddedServicePaths("/srv/tjwater-agent", 8787);
const customer = getEmbeddedServicePaths("/srv/tjwater-agent-customer", 8787);
const secondPort = getEmbeddedServicePaths("/srv/tjwater-agent", 8788);
expect(internal.registrationFile).not.toBe(customer.registrationFile);
expect(internal.registrationFile).not.toBe(secondPort.registrationFile);
expect(internal.registrationFile).toEndWith(
"/data/opencode-service/8787/opencode/service.json",
);
});
});
import { config } from "../../src/config.js";
import { OpencodeRuntimeAdapter } from "../../src/runtime/opencode.js";
const createRuntimeAdapter = (
messages: unknown[],
calls: { staged: string[]; committed: string[] } = {
staged: [],
committed: [],
},
calls: {
reverted: string[];
removed: string[];
} = { reverted: [], removed: [] },
) =>
Object.assign(Object.create(OpencodeRuntimeAdapter.prototype), {
messages: async () => messages,
ensureClient: async () =>
({
session: {
revert: {
stage: async ({ messageID }: { messageID: string }) => {
calls.staged.push(messageID);
},
commit: async ({ sessionID }: { sessionID: string }) => {
calls.committed.push(sessionID);
},
},
},
}) as unknown as OpenCodeClient,
revertMessage: async (_sessionId: string, messageId: string) => {
calls.reverted.push(messageId);
},
removeMessage: async (_sessionId: string, messageId: string) => {
calls.removed.push(messageId);
},
}) as OpencodeRuntimeAdapter;
describe("OpencodeRuntimeAdapter.revertToUserMessage", () => {
it("skips reverting the first user message when the runtime session is empty", async () => {
const calls = { staged: [] as string[], committed: [] as string[] };
const calls = { reverted: [] as string[], removed: [] as string[] };
const runtime = createRuntimeAdapter([], calls);
await runtime.revertToUserMessage("session-1", { userOrdinal: 1 });
expect(calls).toEqual({ staged: [], committed: [] });
expect(calls).toEqual({ reverted: [], removed: [] });
});
it("keeps ordinal mismatches visible when runtime messages exist", async () => {
@@ -65,8 +42,8 @@ describe("OpencodeRuntimeAdapter.revertToUserMessage", () => {
).rejects.toThrow("target user message not found to revert");
});
it("stages and commits the V2 revert at the target user message", async () => {
const calls = { staged: [] as string[], committed: [] as string[] };
it("reverts and removes messages from the target user message onward", async () => {
const calls = { reverted: [] as string[], removed: [] as string[] };
const runtime = createRuntimeAdapter(
[
{ info: { id: "user-1", role: "user" } },
@@ -80,8 +57,8 @@ describe("OpencodeRuntimeAdapter.revertToUserMessage", () => {
await runtime.revertToUserMessage("session-1", { userOrdinal: 2 });
expect(calls).toEqual({
staged: ["user-2"],
committed: ["session-1"],
reverted: ["user-2"],
removed: ["assistant-2", "user-2"],
});
});
});
@@ -90,10 +67,11 @@ describe("OpencodeRuntimeAdapter.ensureClient", () => {
it("retries bootstrap after a failed startup attempt", async () => {
let attempts = 0;
const client = {
health: { get: async () => ({ healthy: true }) },
} as unknown as OpenCodeClient;
global: { health: async () => ({ data: { healthy: true } }) },
} as unknown as OpencodeClient;
const runtime = Object.assign(Object.create(OpencodeRuntimeAdapter.prototype), {
clientPromise: null,
closeServer: null,
bootstrapClient: async () => {
attempts += 1;
if (attempts === 1) {
@@ -110,66 +88,45 @@ describe("OpencodeRuntimeAdapter.ensureClient", () => {
});
describe("OpencodeRuntimeAdapter.warmup", () => {
it("rejects a service that is not the pinned V2 release", async () => {
const client = {
health: {
get: async () => ({ healthy: true, version: "1.18.12" }),
},
} as unknown as OpenCodeClient;
const runtime = Object.assign(Object.create(OpencodeRuntimeAdapter.prototype), {
clientPromise: null,
ensureClient: async () => client,
}) as OpencodeRuntimeAdapter;
await expect(runtime.warmup()).rejects.toThrow(
"incompatible OpenCode service version",
);
});
it("checks V2 health, catalogs and plugins, then removes the probe session", async () => {
it("initializes the project session and model tools before reporting ready", async () => {
const calls: string[] = [];
const client = {
health: {
get: async () => {
calls.push("health.get");
return { healthy: true, version: "0.0.0-next-16741" };
global: {
health: async () => {
calls.push("health");
return { data: { healthy: true, version: "test" } };
},
},
session: {
create: async () => {
calls.push("session.create");
return { id: "warmup-session" };
return { data: { id: "warmup-session" } };
},
remove: async ({ sessionID }: { sessionID: string }) => {
calls.push(`session.remove:${sessionID}`);
delete: async ({ sessionID }: { sessionID: string }) => {
calls.push(`session.delete:${sessionID}`);
return { data: true };
},
},
model: {
list: async () => {
calls.push("model.list");
tool: {
list: async (model: { provider: string; model: string }) => {
calls.push(`tool.list:${model.provider}/${model.model}`);
return { data: [] };
},
},
plugin: {
list: async () => {
calls.push("plugin.list");
return [];
},
},
} as unknown as OpenCodeClient;
} as unknown as OpencodeClient;
const runtime = Object.assign(Object.create(OpencodeRuntimeAdapter.prototype), {
clientPromise: null,
closeServer: null,
ensureClient: async () => client,
}) as OpencodeRuntimeAdapter;
await runtime.warmup();
expect(calls).toEqual([
"health.get",
"health",
"session.create",
"model.list",
"plugin.list",
"session.remove:warmup-session",
`tool.list:${config.OPENCODE_MODEL}`,
"session.delete:warmup-session",
]);
});
});
tests/runtime/opencodeInteraction.test.ts
-193
View File
@@ -1,193 +0,0 @@
import { describe, expect, it } from "bun:test";
import { type OpenCodeClient } from "@opencode-ai/client";
import { OpencodeRuntimeAdapter } from "../../src/runtime/opencode.js";
const createRuntimeAdapter = (client: unknown) =>
Object.assign(new OpencodeRuntimeAdapter(), {
clientPromise: Promise.resolve(client as OpenCodeClient),
}) as OpencodeRuntimeAdapter;
const createEventStream = (events: unknown[]) => ({
async *[Symbol.asyncIterator]() {
for (const event of events) {
yield event;
}
},
});
describe("OpencodeRuntimeAdapter V2 interaction responses", () => {
it("replies through the top-level V2 permission API", async () => {
const runtime = createRuntimeAdapter({
permission: {
reply: async (parameters: Record<string, unknown>) => {
expect(parameters).toEqual({
sessionID: "session-1",
requestID: "request-1",
reply: "once",
message: "approved",
});
},
},
});
await expect(
runtime.replyPermission({
requestId: "request-1",
sessionId: "session-1",
reply: "once",
message: "approved",
}),
).resolves.toBeUndefined();
});
it("replies through the top-level V2 question API", async () => {
const runtime = createRuntimeAdapter({
question: {
reply: async (parameters: Record<string, unknown>) => {
expect(parameters).toEqual({
sessionID: "session-1",
requestID: "request-1",
answers: [["A"]],
});
},
},
});
await expect(
runtime.replyQuestion({
requestId: "request-1",
sessionId: "session-1",
answers: [["A"]],
}),
).resolves.toBeUndefined();
});
it("rejects through the top-level V2 question API", async () => {
const runtime = createRuntimeAdapter({
question: {
reject: async (parameters: Record<string, unknown>) => {
expect(parameters).toEqual({
sessionID: "session-1",
requestID: "request-1",
});
},
},
});
await expect(
runtime.rejectQuestion({
requestId: "request-1",
sessionId: "session-1",
}),
).resolves.toBeUndefined();
});
it("maps frontend question answers to the V2 Form API", async () => {
const runtime = createRuntimeAdapter({
form: {
get: async (parameters: Record<string, unknown>) => {
expect(parameters).toEqual({ sessionID: "session-1", formID: "frm_1" });
return {
fields: [
{
key: "scope",
type: "string",
title: "范围",
options: [{ value: "urban", label: "城区" }],
},
{ key: "confirmed", type: "boolean", title: "确认" },
],
};
},
reply: async (parameters: Record<string, unknown>) => {
expect(parameters).toEqual({
sessionID: "session-1",
formID: "frm_1",
answer: { scope: "urban", confirmed: true },
});
},
},
});
await expect(
runtime.replyQuestion({
requestId: "frm_1",
sessionId: "session-1",
answers: [["城区"], ["是"]],
}),
).resolves.toBeUndefined();
});
it("cancels V2 Form requests by form ID", async () => {
const runtime = createRuntimeAdapter({
form: {
cancel: async (parameters: Record<string, unknown>) => {
expect(parameters).toEqual({ sessionID: "session-1", formID: "frm_1" });
},
},
});
await expect(
runtime.rejectQuestion({ requestId: "frm_1", sessionId: "session-1" }),
).resolves.toBeUndefined();
});
it("normalizes V2 Form and execution events for the chat stream", async () => {
const runtime = createRuntimeAdapter({
event: {
subscribe: () =>
createEventStream([
{
type: "form.created",
data: {
form: {
id: "frm_1",
sessionID: "session-1",
title: "分析参数",
fields: [
{
key: "scope",
type: "string",
title: "范围",
description: "选择分析范围",
options: [{ value: "urban", label: "城区" }],
},
],
},
},
},
{
type: "session.execution.succeeded",
data: { sessionID: "session-1" },
},
]),
},
});
const events = [];
for await (const event of await runtime.subscribeEvents()) {
events.push(event);
}
expect(events).toEqual([
{
type: "question.asked",
sessionId: "session-1",
request: {
id: "frm_1",
questions: [
{
header: "范围",
question: "选择分析范围",
options: [{ label: "城区", description: "" }],
multiple: false,
custom: false,
},
],
},
},
{ type: "session.execution.succeeded", sessionId: "session-1" },
]);
});
});