OpenCode/MeshBot
2
0
Fork 0
Code Issues Pull Requests Actions Activity

opencode: notifier wrapper gains the packet id (id <n>)

Browse Source
This commit is contained in:
kamilkrzywda
2026-09-25 15:06:31 +00:00
parent 34e7bfe0bb
commit 88b617f8b7
4 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/opencode/opencode.service.spec.ts
+10 -10
View File
@@ -68,7 +68,7 @@ describe('OpencodeService.notify', () => {
.mockResolvedValueOnce(json([WORKSPACE]))
.mockResolvedValueOnce(json({}));
await svc.notify('hi', 42);
await svc.notify(7, 'hi', 42);
expect(fetchMock).toHaveBeenCalledTimes(2);
const [url, init] = fetchMock.mock.calls[1];
@@ -89,7 +89,7 @@ describe('OpencodeService.notify', () => {
parts: [
{
type: 'text',
text: 'New mesh message from node 42: "hi" — please react to it.',
text: 'New mesh message (id 7) from node 42: "hi" — please react to it.',
},
],
}),
@@ -106,7 +106,7 @@ describe('OpencodeService.notify', () => {
.mockResolvedValueOnce(json([WORKSPACE]))
.mockResolvedValueOnce(json({}));
await svc.notify('hi');
await svc.notify(7, 'hi');
const [, init] = fetchMock.mock.calls[1];
expect(String((init as { body?: string }).body)).toBe(
@@ -114,7 +114,7 @@ describe('OpencodeService.notify', () => {
parts: [
{
type: 'text',
text: 'New mesh message: "hi" — please react to it.',
text: 'New mesh message (id 7): "hi" — please react to it.',
},
],
}),
@@ -146,7 +146,7 @@ describe('OpencodeService.notify', () => {
);
fetchMock.mockResolvedValueOnce(json({}));
await svc.notify('hi');
await svc.notify(7, 'hi');
expect(fetchMock.mock.calls[1][0]).toBe(
`${API}/proxy/abc/session/ses_pinned/message`,
@@ -179,7 +179,7 @@ describe('OpencodeService.notify', () => {
);
fetchMock.mockResolvedValueOnce(json({}));
await svc.notify('hi');
await svc.notify(7, 'hi');
expect(fetchMock.mock.calls[1][0]).toBe(
`${API}/proxy/b/session/ses_pinned/message`,
@@ -198,7 +198,7 @@ describe('OpencodeService.notify', () => {
)
.mockResolvedValueOnce(json({}));
await svc.notify('hi');
await svc.notify(7, 'hi');
expect(fetchMock.mock.calls[1][0]).toBe(`${API}/proxy/abc/session`);
expect(fetchMock.mock.calls[2][0]).toBe(
@@ -213,7 +213,7 @@ describe('OpencodeService.notify', () => {
.mockResolvedValueOnce(json([{ id: 'ses_a' }, { id: 'ses_b', time: {} }]))
.mockResolvedValueOnce(json({}));
await svc.notify('hi');
await svc.notify(7, 'hi');
expect(fetchMock.mock.calls[2][0]).toBe(
`${API}/proxy/abc/session/ses_a/message`,
@@ -230,7 +230,7 @@ describe('OpencodeService.notify', () => {
.mockResolvedValueOnce(json([WORKSPACE]))
.mockResolvedValueOnce(json({}));
await svc.notify('hi');
await svc.notify(7, 'hi');
// workspaces GET + message POST only — no /session discovery GET
expect(fetchMock).toHaveBeenCalledTimes(2);
@@ -309,7 +309,7 @@ describe('OpencodeService.notify', () => {
string
>[]) {
const svc = makeService(env);
await expect(svc.notify('hi', 42)).resolves.toBeUndefined();
await expect(svc.notify(7, 'hi', 42)).resolves.toBeUndefined();
expect(fetchMock).not.toHaveBeenCalled();
}
});
src/opencode/opencode.service.ts
+2 -2
View File
@@ -49,10 +49,10 @@ export class OpencodeService {
* up to RETRY_DELAYS_MS.length + 1 attempts total; the last failure logs `opencode notify dropped
* after N attempts`. No-op when disabled (no credentials).
*/
async notify(text: string, from?: number): Promise<void> {
async notify(id: number, text: string, from?: number): Promise<void> {
if (!this.enabled) return;
const msg =
'New mesh message' +
`New mesh message (id ${id})` +
(from != null ? ` from node ${from}` : '') +
`: "${text}" — please react to it.`;
const maxAttempts = RETRY_DELAYS_MS.length + 1;