@dhf-claude/grix 0.1.9 → 0.1.11

package/.claude-plugin/plugin.json

@@ -6,7 +6,7 @@
     "name": "Aibot"
   },
   "homepage": "https://grix.dhf.pub",
-  "repository": "https://github.com/askie/clawpool-claude",
+  "repository": "https://github.com/askie/grix-claude",
   "license": "MIT",
   "keywords": [
     "claude-code",

package/dist/daemon.js

@@ -15674,17 +15674,17 @@ var init_package = __esm({
   "package.json"() {
     package_default = {
       name: "@dhf-claude/grix",
-      version: "0.1.9",
+      version: "0.1.11",
       description: "Claude Code channel plugin for Aibot Grix",
       type: "module",
       repository: {
         type: "git",
-        url: "git+https://github.com/askie/clawpool-claude.git"
+        url: "git+ssh://git@github.com/askie/grix-claude.git"
       },
       bugs: {
-        url: "https://github.com/askie/clawpool-claude/issues"
+        url: "https://github.com/askie/grix-claude/issues"
       },
-      homepage: "https://github.com/askie/clawpool-claude#readme",
+      homepage: "https://github.com/askie/grix-claude#readme",
       publishConfig: {
         access: "public"
       },
@@ -15945,6 +15945,13 @@ function withOptionalString(target, key, value) {
     target[key] = normalized;
   }
 }
+function normalizeSessionActivityKind(value) {
+  const normalized = normalizeString20(value);
+  if (!normalized || normalized === "composing") {
+    return "typing";
+  }
+  return normalized;
+}
 function buildAuthPayload(config) {
   const clientVersion = normalizeString20(config?.clientVersion) || pluginVersion;
   const hostVersion = normalizeString20(config?.hostVersion) || clientVersion;
@@ -15973,7 +15980,7 @@ function buildSessionActivityPayload({
 }) {
   const payload = {
     session_id: normalizeString20(sessionID),
-    kind: normalizeString20(kind),
+    kind: normalizeSessionActivityKind(kind),
     active: active === true
   };
   if (Number.isFinite(Number(ttlMs)) && Number(ttlMs) > 0) {
@@ -18896,6 +18903,11 @@ var init_runtime = __esm({
         if (normalizedMsg) {
           payload.msg = normalizedMsg;
         }
+        this.stopTypingForEvent({
+          eventID: event.event_id,
+          sessionID: event.session_id,
+          msgID: event.msg_id
+        });
         this.aibotClient.sendEventResult(payload);
         this.trace({
           stage: "event_result_sent",
@@ -19196,6 +19208,33 @@ var init_runtime = __esm({
           msg_id: event.msg_id
         });
       }
+      stopTypingForEvent({
+        eventID,
+        sessionID = "",
+        msgID = ""
+      } = {}) {
+        const normalizedEventID = normalizeString32(eventID);
+        const normalizedSessionID = normalizeString32(sessionID) || this.messageDeliveryStore.getRememberedSessionID(normalizedEventID);
+        if (!normalizedEventID || !normalizedSessionID || typeof this.aibotClient?.setSessionComposing !== "function") {
+          return;
+        }
+        try {
+          this.aibotClient.setSessionComposing({
+            sessionID: normalizedSessionID,
+            kind: "typing",
+            active: false,
+            refMsgID: normalizeString32(msgID),
+            refEventID: normalizedEventID
+          });
+        } catch (error) {
+          this.trace({
+            stage: "event_typing_stop_failed",
+            event_id: normalizedEventID,
+            session_id: normalizedSessionID,
+            error: error instanceof Error ? error.message : String(error)
+          }, "error");
+        }
+      }
       async shouldResumeClaudeSession(binding) {
         const claudeSessionID = normalizeString32(binding?.claude_session_id);
         const cwd = normalizeString32(binding?.cwd);
@@ -20122,6 +20161,12 @@ var init_runtime = __esm({
         const nextPayload = this.buildForwardedWorkerEventResult(payload, failureOptions);
         await this.recordWorkerEventResultObserved(nextPayload);
         await this.notifyWorkerEventResultFailure(nextPayload, failureOptions);
+        const record = this.getPendingEvent(nextPayload?.event_id);
+        this.stopTypingForEvent({
+          eventID: nextPayload?.event_id,
+          sessionID: nextPayload?.session_id || record?.sessionID,
+          msgID: record?.msgID
+        });
         this.aibotClient.sendEventResult(nextPayload);
         await this.handleEventCompleted(nextPayload?.event_id);
         return nextPayload;
@@ -20791,12 +20836,13 @@ var init_runtime = __esm({
         if (!event.event_id || !event.session_id || !event.msg_id) {
           return;
         }
+        this.ack(event);
         const queue = this.sessionQueues.ensure(event.session_id);
-        queue.run(() => this.handleEvent(rawPayload)).catch((err) => {
+        queue.run(() => this.handleEvent(rawPayload, { alreadyAcked: true })).catch((err) => {
           this.trace({ stage: "handle_event_error", session_id: event.session_id, event_id: event.event_id, error: String(err?.message ?? err) }, "error");
         });
       }
-      async handleEvent(rawPayload) {
+      async handleEvent(rawPayload, { alreadyAcked = false } = {}) {
         const event = normalizeInboundEventPayload(rawPayload);
         if (!event.event_id || !event.session_id || !event.msg_id) {
           return;
@@ -20808,7 +20854,9 @@ var init_runtime = __esm({
           msg_id: event.msg_id,
           sender_id: event.sender_id
         });
-        this.ack(event);
+        if (!alreadyAcked) {
+          this.ack(event);
+        }
         if (isRecordOnlyMirror(event)) {
           this.trace({
             stage: "event_mirrored_record_only",
@@ -21256,7 +21304,8 @@ __export(main_exports, {
   notifyWorkerReady: () => notifyWorkerReady,
   run: () => run,
   shouldIgnoreWorkerStatusUpdate: () => shouldIgnoreWorkerStatusUpdate,
-  shouldNotifyWorkerReady: () => shouldNotifyWorkerReady
+  shouldNotifyWorkerReady: () => shouldNotifyWorkerReady,
+  shouldPreserveWorkerStatusOnRegister: () => shouldPreserveWorkerStatusOnRegister
 });
 import process15 from "node:process";
 function usage() {
@@ -21338,6 +21387,21 @@ function shouldIgnoreWorkerStatusUpdate(previousBinding, payload) {
   }
   return false;
 }
+function shouldPreserveWorkerStatusOnRegister(previousBinding, payload) {
+  if (!previousBinding) {
+    return false;
+  }
+  if (shouldIgnoreWorkerStatusUpdate(previousBinding, payload)) {
+    return false;
+  }
+  const currentStatus = normalizeString35(previousBinding.worker_status);
+  if (currentStatus !== "connected" && currentStatus !== "ready") {
+    return false;
+  }
+  return Boolean(
+    normalizeString35(previousBinding.worker_control_url) && normalizeString35(previousBinding.worker_control_token)
+  );
+}
 function buildWorkerReadyNoticeText(binding) {
   return "claude ready! please retry again.";
 }
@@ -21435,6 +21499,27 @@ async function run(argv = [], env = process15.env) {
       if (!existing) {
         return { ok: false, reason: "binding_not_found" };
       }
+      if (shouldIgnoreWorkerStatusUpdate(existing, payload)) {
+        logger.trace({
+          stage: "worker_register_ignored_stale",
+          aibot_session_id: aibotSessionID,
+          worker_id: payload?.worker_id,
+          claude_session_id: payload?.claude_session_id,
+          expected_worker_id: existing?.worker_id,
+          expected_claude_session_id: existing?.claude_session_id
+        }, { level: "error" });
+        return { ok: true };
+      }
+      if (shouldPreserveWorkerStatusOnRegister(existing, payload)) {
+        logger.trace({
+          stage: "worker_register_preserved_existing_status",
+          aibot_session_id: aibotSessionID,
+          worker_id: payload?.worker_id,
+          claude_session_id: payload?.claude_session_id,
+          worker_status: existing?.worker_status
+        });
+        return { ok: true };
+      }
       await bindingRegistry.markWorkerStarting(aibotSessionID, {
         workerID,
         workerPid,

package/dist/index.js

@@ -25776,8 +25776,8 @@ function createWorkerApp({ env = process4.env } = {}) {
       await elicitationStore.init();
       await interactionService.restoreEventState();
       await bridge.startControlServer();
-      await mcp.connect(new StdioServerTransport());
       if (!bridge.isDaemonBridgeActive()) {
+        await mcp.connect(new StdioServerTransport());
         logger.info("worker started without daemon bridge for MCP health checks");
         return;
       }
@@ -25787,6 +25787,7 @@ function createWorkerApp({ env = process4.env } = {}) {
         pid: process4.pid
       });
       await bridge.sendConnectedStatus();
+      await mcp.connect(new StdioServerTransport());
       interactionService.startDispatchPumps();
       logger.info("worker connected in daemon bridge mode");
     },

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@dhf-claude/grix",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "Claude Code channel plugin for Aibot Grix",
   "type": "module",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/askie/clawpool-claude.git"
+    "url": "git+ssh://git@github.com/askie/grix-claude.git"
   },
   "bugs": {
-    "url": "https://github.com/askie/clawpool-claude/issues"
+    "url": "https://github.com/askie/grix-claude/issues"
   },
-  "homepage": "https://github.com/askie/clawpool-claude#readme",
+  "homepage": "https://github.com/askie/grix-claude#readme",
   "publishConfig": {
     "access": "public"
   },