fix: preserve OpenCode lifecycle event ordering

Co-authored-by: Shukan Shah <shukanshah14@gmail.com>

Author: cursoragent

cli/beacon/internal/endpoint/hooks/assets/opencode/beacon.ts

@@ -208,7 +208,7 @@ export const BeaconEndpointPlugin = async ({ project, directory, worktree, clien
   return {
     "chat.message": async (input, output) => {
       if (output?.message?.id) messageRoles.set(output.message.id, "user")
-      await sendToBeacon(client, {
+      await enqueue({
         type: "chat.message",
         session_id: sessionID(input),
         model: modelName(input),
@@ -218,8 +218,7 @@ export const BeaconEndpointPlugin = async ({ project, directory, worktree, clien
       })
     },
     "command.execute.before": async (input, output) => {
-      await sendToBeacon(
-        client,
+      await enqueue(
         payload("command.execute.before", {
           session_id: sessionID(input),
           command_name: input?.command,
@@ -237,8 +236,7 @@ export const BeaconEndpointPlugin = async ({ project, directory, worktree, clien
         started_at: Date.now(),
       })
       rememberFilePath(input?.tool, output?.args || {}, sid, input?.callID)
-      await sendToBeacon(
-        client,
+      await enqueue(
         payload("tool.execute.before", {
           session_id: sessionID(input),
           tool_name: input?.tool,
@@ -251,8 +249,7 @@ export const BeaconEndpointPlugin = async ({ project, directory, worktree, clien
       const active = activeCalls.get(input?.callID)
       const args = input?.args || active?.args || {}
       rememberFilePath(input?.tool, args, sessionID(input), input?.callID)
-      await sendToBeacon(
-        client,
+      await enqueue(
         payload("tool.execute.after", {
           session_id: sessionID(input),
           tool_name: input?.tool,

plugins/opencode-beacon/src/beacon.test.ts

@@ -26,6 +26,9 @@ describe("BeaconEndpointPlugin", () => {
   test("forwards prompts and correlated tool lifecycle payloads", async () => {
     const hooks = await plugin()
 
+    await hooks.event!({
+      event: { type: "session.created", properties: { sessionID: "ses_1", info: { id: "ses_1" } } },
+    } as any)
     await hooks["chat.message"]!(
       { sessionID: "ses_1", model: { providerID: "moonshotai", modelID: "kimi-k3" } } as any,
       { parts: [{ type: "text", text: "summarize" }] } as any,
@@ -40,11 +43,12 @@ describe("BeaconEndpointPlugin", () => {
     )
 
     expect(payloads.map((item) => item.type)).toEqual([
+      "session.created",
       "chat.message",
       "tool.execute.before",
       "tool.execute.after",
     ])
-    expect(payloads[2]).toMatchObject({
+    expect(payloads[3]).toMatchObject({
       session_id: "ses_1",
       call_id: "call_1",
       tool_name: "bash",

plugins/opencode-beacon/src/beacon.ts

@@ -208,7 +208,7 @@ export const BeaconEndpointPlugin = async ({ project, directory, worktree, clien
   return {
     "chat.message": async (input, output) => {
       if (output?.message?.id) messageRoles.set(output.message.id, "user")
-      await sendToBeacon(client, {
+      await enqueue({
         type: "chat.message",
         session_id: sessionID(input),
         model: modelName(input),
@@ -218,8 +218,7 @@ export const BeaconEndpointPlugin = async ({ project, directory, worktree, clien
       })
     },
     "command.execute.before": async (input, output) => {
-      await sendToBeacon(
-        client,
+      await enqueue(
         payload("command.execute.before", {
           session_id: sessionID(input),
           command_name: input?.command,
@@ -237,8 +236,7 @@ export const BeaconEndpointPlugin = async ({ project, directory, worktree, clien
         started_at: Date.now(),
       })
       rememberFilePath(input?.tool, output?.args || {}, sid, input?.callID)
-      await sendToBeacon(
-        client,
+      await enqueue(
         payload("tool.execute.before", {
           session_id: sessionID(input),
           tool_name: input?.tool,
@@ -251,8 +249,7 @@ export const BeaconEndpointPlugin = async ({ project, directory, worktree, clien
       const active = activeCalls.get(input?.callID)
       const args = input?.args || active?.args || {}
       rememberFilePath(input?.tool, args, sessionID(input), input?.callID)
-      await sendToBeacon(
-        client,
+      await enqueue(
         payload("tool.execute.after", {
           session_id: sessionID(input),
           tool_name: input?.tool,