@maintainer-pro/ai-server 0.1.7 → 0.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maintainer-pro/ai-server",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Node HTTP server for Maintainer Pro chat. Uses @maintainer-pro/ai-cli to talk to coding agents.",
   "keywords": [
     "maintainer-pro",
@@ -30,8 +30,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@maintainer-pro/ai-cli": "^0.1.7",
-    "@maintainer-pro/ai-ui": "^0.2.5",
+    "@maintainer-pro/ai-cli": "^0.1.14",
+    "@maintainer-pro/ai-ui": "^0.2.8",
     "ws": "^8.21.3"
   },
   "engines": {

package/src/server.mjs

@@ -93,6 +93,35 @@ function tryResolveIife(from) {
   }
 }
 
+function readJsonVersion(file) {
+  try {
+    const pkg = JSON.parse(fs.readFileSync(file, "utf8"));
+    return typeof pkg.version === "string" && pkg.version ? pkg.version : null;
+  } catch {
+    return null;
+  }
+}
+
+function readDepPackageVersion(name) {
+  try {
+    return readJsonVersion(createRequire(import.meta.url).resolve(`${name}/package.json`));
+  } catch {
+    return null;
+  }
+}
+
+export const PACKAGE_VERSION =
+  readJsonVersion(path.join(path.dirname(fileURLToPath(import.meta.url)), "..", "package.json")) ||
+  "0.0.0";
+
+export function runtimePackageVersions() {
+  return {
+    server: PACKAGE_VERSION,
+    cli: readDepPackageVersion("@maintainer-pro/ai-cli"),
+    ui: readDepPackageVersion("@maintainer-pro/ai-ui"),
+  };
+}
+
 export function findIife() {
   const here = path.dirname(fileURLToPath(import.meta.url));
   const cwdPkg = path.join(process.cwd(), "package.json");
@@ -367,11 +396,18 @@ export async function startAiServer(options = {}) {
       return {
         status: 200,
         headers: outHeaders,
-        body: Buffer.from(JSON.stringify({ ok: true, workspace: workspaceDir })),
+        body: Buffer.from(
+          JSON.stringify({
+            ok: true,
+            workspace: workspaceDir,
+            versions: runtimePackageVersions(),
+          })
+        ),
       };
     }
     if (pathname === "/embed-config.js") {
       const aiServerUrl = resolvePublicUrl({ headers });
+      const versions = runtimePackageVersions();
       const payload = {
         aiServerUrl,
         apiUrl: `${aiServerUrl}/api/chat`,
@@ -382,6 +418,7 @@ export async function startAiServer(options = {}) {
         maintainerProApiKey:
           pickEnv(env, "MAINTAINER_PRO_CLIENT_API_KEY") ||
           pickEnv(env, "NEXT_PUBLIC_MAINTAINER_PRO_CLIENT_API_KEY"),
+        versions,
       };
       logger.debug({ aiServerUrl }, "embed-config");
       outHeaders["content-type"] = "text/javascript; charset=utf-8";
@@ -484,7 +521,23 @@ export async function startAiServer(options = {}) {
     return messages;
   }
 
-  async function runChatPost(body) {
+  async function runChatPost(body, opts = {}) {
+    const userMessageId =
+      typeof body.userMessageId === "string" ? body.userMessageId : "";
+    const conversationId =
+      typeof body.conversationId === "string" ? body.conversationId : "";
+    let claimedHere = false;
+    if (userMessageId && !opts.alreadyClaimed) {
+      if (runningTurns.has(userMessageId)) {
+        logger.debug({ userMessageId }, "runChatPost duplicate");
+        return { ok: true, status: 200, data: { duplicate: true } };
+      }
+      runningTurns.add(userMessageId);
+      if (conversationId) {
+        runningByConversation.set(conversationId, userMessageId);
+      }
+      claimedHere = true;
+    }
     logger.debug(
       {
         conversationId: body.conversationId,
@@ -498,25 +551,37 @@ export async function startAiServer(options = {}) {
       },
       "runChatPost"
     );
-    const response = await handlers.POST(
-      new Request("http://127.0.0.1/api/chat", {
-        method: "POST",
-        headers: { "content-type": "application/json" },
-        body: JSON.stringify(body),
-      })
-    );
-    const text = await response.text();
-    let data = {};
     try {
-      data = text ? JSON.parse(text) : {};
-    } catch {
-      data = { error: text || "invalid chat response" };
+      const response = await handlers.POST(
+        new Request("http://127.0.0.1/api/chat", {
+          method: "POST",
+          headers: { "content-type": "application/json" },
+          body: JSON.stringify(body),
+        })
+      );
+      const text = await response.text();
+      let data = {};
+      try {
+        data = text ? JSON.parse(text) : {};
+      } catch {
+        data = { error: text || "invalid chat response" };
+      }
+      logger.debug(
+        { conversationId: body.conversationId, ok: response.ok, status: response.status },
+        "runChatPost done"
+      );
+      return { ok: response.ok, status: response.status, data };
+    } finally {
+      if (claimedHere && userMessageId) {
+        runningTurns.delete(userMessageId);
+        if (
+          conversationId &&
+          runningByConversation.get(conversationId) === userMessageId
+        ) {
+          runningByConversation.delete(conversationId);
+        }
+      }
     }
-    logger.debug(
-      { conversationId: body.conversationId, ok: response.ok, status: response.status },
-      "runChatPost done"
-    );
-    return { ok: response.ok, status: response.status, data };
   }
 
   function publishChatResult(
@@ -607,20 +672,23 @@ export async function startAiServer(options = {}) {
         userMessageId,
       });
       const assistantMessageId = randomUUID();
-      const result = await runChatPost({
-        conversationId,
-        messages,
-        userMessage: content,
-        skipPersistUser: true,
-        userMessageId,
-        assistantMessageId,
-        senderType: event.message.senderType === "client" ? "client" : undefined,
-        senderName: event.message.senderName ?? undefined,
-        context:
-          event.message.context && typeof event.message.context === "object"
-            ? event.message.context
-            : undefined,
-      });
+      const result = await runChatPost(
+        {
+          conversationId,
+          messages,
+          userMessage: content,
+          skipPersistUser: true,
+          userMessageId,
+          assistantMessageId,
+          senderType: event.message.senderType === "client" ? "client" : undefined,
+          senderName: event.message.senderName ?? undefined,
+          context:
+            event.message.context && typeof event.message.context === "object"
+              ? event.message.context
+              : undefined,
+        },
+        { alreadyClaimed: true }
+      );
       publishChatResult(conversationId, result, assistantMessageId, userMessageId);
       if (!result.ok) {
         logger.warn({ status: result.status }, "ai turn failed");
@@ -799,18 +867,21 @@ export async function startAiServer(options = {}) {
           conversationId,
           userMessageId,
         });
-        const result = await runChatPost({
-          conversationId,
-          messages,
-          userMessage,
-          skipPersistUser: msg.skipPersistUser !== false,
-          userMessageId,
-          assistantMessageId,
-          senderType: typeof msg.senderType === "string" ? msg.senderType : undefined,
-          senderName: typeof msg.senderName === "string" ? msg.senderName : undefined,
-          context:
-            msg.context && typeof msg.context === "object" ? msg.context : undefined,
-        });
+        const result = await runChatPost(
+          {
+            conversationId,
+            messages,
+            userMessage,
+            skipPersistUser: msg.skipPersistUser !== false,
+            userMessageId,
+            assistantMessageId,
+            senderType: typeof msg.senderType === "string" ? msg.senderType : undefined,
+            senderName: typeof msg.senderName === "string" ? msg.senderName : undefined,
+            context:
+              msg.context && typeof msg.context === "object" ? msg.context : undefined,
+          },
+          { alreadyClaimed: true }
+        );
         publishChatResult(conversationId, result, assistantMessageId, userMessageId);
         if (!result.ok) {
           throw new Error(result.data?.error ?? `chat failed (${result.status})`);
@@ -893,13 +964,13 @@ export async function startAiServer(options = {}) {
           (m) =>
             m.role === "user" &&
             m.queueStatus === "working" &&
-            m.senderType !== "developer"
+            m.provider !== "developer"
         );
         const hasQueued = msgs.some(
           (m) =>
             m.role === "user" &&
             m.queueStatus === "queued" &&
-            m.senderType !== "developer"
+            m.provider !== "developer"
         );
         if (!hasWorking && !hasQueued) continue;
         const result = await db.recoverQueue(conv.id);
@@ -969,7 +1040,10 @@ export async function startAiServer(options = {}) {
         /\/$/,
         ""
       ) || `http://localhost:${port}`;
-    logger.info(`chat → ${base}/api/chat`);
+    logger.info(
+      { versions: runtimePackageVersions() },
+      `chat → ${base}/api/chat`
+    );
     logger.info(`ws   → ${toHttpWsUrl(base)}/api/ws`);
     logger.info(`ui   → ${base}/`);
     logger.info(`embed-config → ${base}/embed-config.js`);