@walkhi/code-relax 0.1.0-beta.19 → 0.1.0-beta.20

package/dist/src/self-relay/connector.mjs

@@ -266,8 +266,10 @@ export function connectBridgeRelay({ relayUrl, hostKey, bridgeUrl, bridgeToken,
                     const turnKind = usage.created ? 'start' : response.body?.usage?.kind;
                     send(remote, { type: 'usage-message', session: message.session, requestId: response.id,
                       threadId, messageKey: usage.messageKey, turnId, turnKind,
-                      completed: completedTurns.has(`${threadId}:${turnId}`), observerReady: turnObserverReady });
-                    if (turnKind === 'start' && typeof turnId === 'string' && !completedTurns.has(`${threadId}:${turnId}`)) {
+                      completed: completedTurns.has(`${threadId}:${turnId}`), observerReady: turnObserverReady,
+                      active: activeTurns.get(threadId) === turnId });
+                    if (['start', 'steer'].includes(turnKind) && typeof turnId === 'string' &&
+                        !completedTurns.has(`${threadId}:${turnId}`)) {
                       trackedTurns.set(threadId, turnId); saveTrackedTurns();
                       if (turnObserverReady && !activeTurns.has(threadId)) queueTurnResync(threadId, turnId);
                     }

package/dist/src/self-relay/server.mjs

@@ -507,16 +507,19 @@ export async function startSelfRelay({ port = 0, hostKey = secret(), pairingTtlM
               try {
                 await meter.action(arm, room.id, arm.clientId, 'message', message.messageKey);
                 diagnostics?.record('message-counted', 'confirmed');
-                if (message.turnKind === 'start' && plainText(message.threadId, 80, false) && plainText(message.turnId, 80, false)) {
+                if (['start', 'steer'].includes(message.turnKind) &&
+                    plainText(message.threadId, 80, false) && plainText(message.turnId, 80, false)) {
                   const key = `${message.threadId}:${message.turnId}`;
-                  if (key.length <= 128 && !room.usageTasks.has(key)) {
-                    const task = { userId: arm.userId, clientId: arm.clientId };
-                    await meter.action(task, room.id, arm.clientId, 'turn', key);
-                    diagnostics?.record('turn-counted', 'confirmed');
-                    if (message.observerReady === true) {
-                      await meter.pulse(task, true, room.id, arm.clientId, key);
-                      if (message.completed) await meter.pulse(task, false, room.id, arm.clientId);
-                      else room.usageTasks.set(key, task);
+                  if (key.length <= 128) {
+                    const counted = await meter.action(arm, room.id, arm.clientId, 'turn', key);
+                    if (counted) diagnostics?.record('turn-counted', 'confirmed');
+                    if (!room.usageTasks.has(key) && message.observerReady === true && message.completed !== true &&
+                        (message.turnKind === 'start' || message.active === true)) {
+                      const task = await meter.turnOrigin(room.id, key);
+                      if (task) {
+                        await meter.pulse(task, true, room.id, task.clientId, key);
+                        room.usageTasks.set(key, task);
+                      }
                     }
                   }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@walkhi/code-relax",
-  "version": "0.1.0-beta.19",
+  "version": "0.1.0-beta.20",
   "license": "UNLICENSED",
   "type": "module",
   "scripts": {