@agentmessier/openclaw-agent-messier 0.3.1 → 0.3.2

package/index.ts

@@ -116,13 +116,16 @@ export default function register(api: OpenClawPluginApi) {
         else ctx.logger.info(`[${label}] idle — ask me to join or create a game.`);
       } catch (e) { ctx.logger.error(`[${label}] startup seating failed: ${String(e)}`); }
 
-      // Seat poller: a seat may be taken from ANOTHER process (a chat turn, the
-      // generated *_join tool, the dashboard). Poll the venue's lobby for a
-      // non-ended room that references our agentId and aim the loop at it. Driven
-      // by spec.client.lobby.route — no hardcoded /matches path. Skipped for
-      // venues with no lobby in their spec.
-      if (lobbyRoute) {
+      // Seat poller: when the agent is IDLE, a seat may be taken from ANOTHER
+      // process (a chat turn, the generated *_join tool, the dashboard). Poll the
+      // venue's lobby for a non-ended room referencing our agentId and adopt it.
+      // Driven by spec.client.lobby.route — no hardcoded /matches path. Skipped
+      // when a match is pinned (explicit room wins) or the venue has no lobby.
+      // Critically it only adopts while idle (session.matchId empty): once we're
+      // in a match it must NOT yank us into some other (e.g. stale) room.
+      if (lobbyRoute && !cfg.matchId) {
         poller = setInterval(async () => {
+          if (session.matchId) return; // already seated/playing → nothing to adopt
           try {
             const res = await fetch(`${base}${lobbyRoute}`);
             if (!res.ok) return;
@@ -130,7 +133,7 @@ export default function register(api: OpenClawPluginApi) {
             const rows = (data.matches ?? data.rows ?? []) as Record<string, any>[];
             const mine = rows.find((r) => !ENDED.has(String(r.status ?? "")) && referencesAgent(r, agentId));
             const id = mine?.id ?? mine?.[roomIdField];
-            if (id && id !== session.matchId) {
+            if (id) {
               ctx.logger.info(`[${label}] found my seat in ${id} (taken elsewhere) — starting to play`);
               await session.joinAndWatch!(id);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentmessier/openclaw-agent-messier",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Agent Messier multi-venue client for OpenClaw \u2014 play games and work tasks on the AgentNet platform (soccer today; venues discovered from the marketplace registry)",
   "type": "module",
   "license": "MIT",

package/src/generate.test.ts

@@ -86,6 +86,17 @@ describe("joinVenue — the one spec-driven seating path (tool + service share i
     expect(url).toBe("http://golf.test/rounds/r7/join");
   });
 
+  it("rejoin response without the seat-id field falls back to the matchId joined with", async () => {
+    _resetSeats();
+    // per-room join responses omit matchId (you already know it from the URL) —
+    // seat.id must still resolve, or the observe loop 404s and reclaim-loops.
+    vi.stubGlobal("fetch", vi.fn(async () =>
+      ({ ok: true, json: async () => ({ token: "t", playerIds: ["p1", "p2", "p3"], started: true }) }) as any));
+    const seat = await joinVenue(GOLF_VENUE, GOLF_SPEC, cfg(), { matchId: "r7" });
+    expect(seat.id).toBe("r7");
+    expect(session.matchId).toBe("r7");
+  });
+
   it("service extras (teamSize/identity) ride along but tool calls omit them", async () => {
     let body: any = null;
     vi.stubGlobal("fetch", vi.fn(async (_u: any, init?: any) => {

package/src/generate.ts

@@ -85,7 +85,10 @@ export async function joinVenue(
   const d = r.data;
   if (typeof d.did === "string") rememberDid(cfg, d.did);     // cross-process identity
   if (typeof d.token === "string") rememberToken(cfg, d.token); // cross-process seat token
-  const seat: Seat = { id: d[sm.id], token: d[sm.token], controls: d[sm.controls] ?? [], agentId: d.did ?? meId, started: d.started, managerUrl: d.managerUrl };
+  // A rejoin via seatRoute already KNOWS the room (it's in the URL), so the
+  // server's response omits it — fall back to the matchId we joined with, or
+  // seat.id ends up undefined and the observe loop hits /…//… → 404 → reclaim.
+  const seat: Seat = { id: d[sm.id] ?? opts.matchId, token: d[sm.token], controls: d[sm.controls] ?? [], agentId: d.did ?? meId, started: d.started, managerUrl: d.managerUrl };
   seats.set(venue.id, seat);
   // soccer back-compat: the service watcher + seat-poller read `session`.
   session.matchId = seat.id ?? null; session.players = seat.controls ?? []; session.token = seat.token ?? null; session.did = seat.agentId ?? null;