@axiom-lattice/gateway 2.1.49 → 2.1.50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@axiom-lattice/gateway",
-  "version": "2.1.49",
+  "version": "2.1.50",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
@@ -38,8 +38,8 @@
     "pg": "^8.11.0",
     "redis": "^5.0.1",
     "uuid": "^9.0.1",
-    "@axiom-lattice/core": "2.1.43",
-    "@axiom-lattice/pg-stores": "1.0.33",
+    "@axiom-lattice/core": "2.1.44",
+    "@axiom-lattice/pg-stores": "1.0.34",
     "@axiom-lattice/protocols": "2.1.23",
     "@axiom-lattice/queue-redis": "1.0.22"
   },

package/src/controllers/auth.ts

@@ -29,6 +29,11 @@ interface AssignTenantRequest {
   role?: UserTenantRole;
 }
 
+interface ChangePasswordRequest {
+  currentPassword: string;
+  newPassword: string;
+}
+
 export interface AuthConfig {
   autoApproveUsers: boolean;
   allowTenantRegistration: boolean;
@@ -391,6 +396,71 @@ export class AuthController {
     }
     return btoa(JSON.stringify(payload));
   }
+
+  async changePassword(
+    request: FastifyRequest<{ Body: ChangePasswordRequest }>,
+    reply: FastifyReply
+  ) {
+    const userId = (request as any).user?.id;
+    const { currentPassword, newPassword } = request.body;
+
+    if (!userId) {
+      return reply.status(401).send({
+        success: false,
+        error: "Unauthorized",
+      });
+    }
+
+    try {
+      const user = await this.userStore.getUserById(userId);
+      if (!user) {
+        return reply.status(404).send({
+          success: false,
+          error: "User not found",
+        });
+      }
+
+      // Verify current password
+      const isValidPassword = await this.verifyPassword(
+        currentPassword,
+        user.metadata?.passwordHash || ""
+      );
+
+      if (!isValidPassword) {
+        return reply.status(401).send({
+          success: false,
+          error: "Current password is incorrect",
+        });
+      }
+
+      // Validate new password length
+      if (newPassword.length < 6) {
+        return reply.status(400).send({
+          success: false,
+          error: "New password must be at least 6 characters",
+        });
+      }
+
+      // Update password
+      await this.userStore.updateUser(userId, {
+        metadata: {
+          ...user.metadata,
+          passwordHash: await this.hashPassword(newPassword),
+        },
+      });
+
+      return reply.send({
+        success: true,
+        message: "Password changed successfully",
+      });
+    } catch (error) {
+      console.error("Change password error:", error);
+      return reply.status(500).send({
+        success: false,
+        error: "Failed to change password",
+      });
+    }
+  }
 }
 
 export function registerAuthRoutes(
@@ -440,4 +510,7 @@ export function registerAuthRoutes(
   app.post("/api/auth/approve", { preHandler: authHook }, (req, res) => controller.approveUser(req as any, res));
   app.get("/api/auth/pending", { preHandler: authHook }, (req, res) => controller.listPendingUsers(req, res));
   app.post("/api/auth/assign-tenant", { preHandler: authHook }, (req, res) => controller.assignTenant(req as any, res));
+  app.post("/api/auth/change-password", { preHandler: authHook }, 
+    (req, res) => controller.changePassword(req as any, res)
+  );
 }

package/src/controllers/run.ts

@@ -6,6 +6,7 @@ import {
   ThreadStatus,
   agentLatticeManager,
   agentInstanceManager,
+  QueueMode,
 } from "@axiom-lattice/core";
 import { MessageChunkTypes } from "@axiom-lattice/protocols";
 
@@ -26,10 +27,12 @@ export const createRun = async (
     const {
       assistant_id,
       thread_id,
+      message_id,
       command,
       streaming,
       background,
       custom_run_config,
+      mode,
       ...input
     } = request.body as CreateRunRequest;
 
@@ -72,11 +75,16 @@ export const createRun = async (
       try {
 
         // Execute agent with streaming
+        // Only pass id if message_id is provided (for backward compatibility)
+        const messageInput = message_id 
+          ? { ...input, id: message_id }
+          : input;
+        
         const result = await agent.addMessage({
-          input,
+          input: messageInput,
           command,
           custom_run_config,
-        });
+        }, mode as QueueMode);
 
         // const agentStatus = await agent.getRunStatus()
         // console.log(agentStatus)

package/src/controllers/thread_status.ts

@@ -1,228 +1,66 @@
-// import { FastifyRequest, FastifyReply } from "fastify";
-// import { QueueMode } from "@axiom-lattice/core";
-
-
-// /**
-//  * GET /api/threads/:thread_id/status
-//  * Query single thread status
-//  */
-// export async function getThreadStatusHandler(
-//   request: FastifyRequest,
-//   reply: FastifyReply
-// ) {
-//   try {
-//     const { thread_id } = request.params as { thread_id: string };
-//     const tenant_id = request.headers["x-tenant-id"] as string;
-
-//     if (!tenant_id) {
-//       return reply.code(400).send({ error: "Missing x-tenant-id header" });
-//     }
-
-//     const state = lifecycleManager.getThreadStatus(tenant_id, thread_id);
-
-//     if (!state) {
-//       return reply.code(404).send({
-//         error: "Thread not found",
-//         threadId: thread_id,
-//       });
-//     }
-
-//     return reply.send(state);
-//   } catch (error) {
-//     console.error("Error getting thread status:", error);
-//     return reply.code(500).send({
-//       error: "Internal server error",
-//       message: error instanceof Error ? error.message : String(error),
-//     });
-//   }
-// }
-
-// /**
-//  * GET /api/assistants/:assistant_id/threads/status
-//  * Query all threads status for an agent
-//  */
-// export async function getAgentThreadsHandler(
-//   request: FastifyRequest,
-//   reply: FastifyReply
-// ) {
-//   try {
-//     const { assistant_id } = request.params as { assistant_id: string };
-//     const tenant_id = request.headers["x-tenant-id"] as string;
-
-//     if (!tenant_id) {
-//       return reply.code(400).send({ error: "Missing x-tenant-id header" });
-//     }
-
-//     const threads = lifecycleManager.getAgentThreads(tenant_id, assistant_id);
-
-//     return reply.send({
-//       assistantId: assistant_id,
-//       threads,
-//       count: threads.length,
-//     });
-//   } catch (error) {
-//     console.error("Error getting agent threads:", error);
-//     return reply.code(500).send({
-//       error: "Internal server error",
-//       message: error instanceof Error ? error.message : String(error),
-//     });
-//   }
-// }
-
-// /**
-//  * GET /api/threads/active
-//  * Query all active threads (BUSY + INTERRUPTED)
-//  */
-// export async function getActiveThreadsHandler(
-//   request: FastifyRequest,
-//   reply: FastifyReply
-// ) {
-//   try {
-//     const tenant_id = request.headers["x-tenant-id"] as string;
-
-//     if (!tenant_id) {
-//       return reply.code(400).send({ error: "Missing x-tenant-id header" });
-//     }
-
-//     const threads = lifecycleManager.getActiveThreads(tenant_id);
-
-//     return reply.send({
-//       threads,
-//       count: threads.length,
-//     });
-//   } catch (error) {
-//     console.error("Error getting active threads:", error);
-//     return reply.code(500).send({
-//       error: "Internal server error",
-//       message: error instanceof Error ? error.message : String(error),
-//     });
-//   }
-// }
-
-// /**
-//  * POST /api/threads/:thread_id/messages
-//  * Add message to queue or execute immediately (steer mode)
-//  */
-// export async function addMessageHandler(
-//   request: FastifyRequest,
-//   reply: FastifyReply
-// ) {
-//   try {
-//     const { thread_id } = request.params as { thread_id: string };
-//     const tenant_id = request.headers["x-tenant-id"] as string;
-//     const { assistant_id, content, mode } = request.body as {
-//       assistant_id: string;
-//       content: any;
-//       mode?: QueueMode;
-//     };
-
-//     if (!tenant_id) {
-//       return reply.code(400).send({ error: "Missing x-tenant-id header" });
-//     }
-
-//     if (!assistant_id || !content) {
-//       return reply.code(400).send({ error: "Missing assistant_id or content" });
-//     }
-
-//     const result = await lifecycleManager.addMessage(
-//       tenant_id,
-//       assistant_id,
-//       thread_id,
-//       content,
-//       mode
-//     );
-
-//     return reply.send({
-//       success: true,
-//       threadId: thread_id,
-//       ...result,
-//     });
-//   } catch (error) {
-//     console.error("Error adding message:", error);
-//     return reply.code(500).send({
-//       error: "Internal server error",
-//       message: error instanceof Error ? error.message : String(error),
-//     });
-//   }
-// }
-
-// /**
-//  * DELETE /api/threads/:thread_id/messages/:message_id
-//  * Remove pending message
-//  */
-// export async function removeMessageHandler(
-//   request: FastifyRequest,
-//   reply: FastifyReply
-// ) {
-//   try {
-//     const { thread_id, message_id } = request.params as {
-//       thread_id: string;
-//       message_id: string;
-//     };
-//     const tenant_id = request.headers["x-tenant-id"] as string;
-
-//     if (!tenant_id) {
-//       return reply.code(400).send({ error: "Missing x-tenant-id header" });
-//     }
-
-//     const success = await lifecycleManager.removePendingMessage(
-//       tenant_id,
-//       thread_id,
-//       message_id
-//     );
-
-//     if (!success) {
-//       return reply.code(404).send({
-//         error: "Message not found",
-//         messageId: message_id,
-//       });
-//     }
-
-//     return reply.send({
-//       success: true,
-//       messageId: message_id,
-//     });
-//   } catch (error) {
-//     console.error("Error removing message:", error);
-//     return reply.code(500).send({
-//       error: "Internal server error",
-//       message: error instanceof Error ? error.message : String(error),
-//     });
-//   }
-// }
-
-// /**
-//  * PUT /api/threads/:thread_id/queue-config
-//  * Update queue configuration
-//  */
-// export async function updateQueueConfigHandler(
-//   request: FastifyRequest,
-//   reply: FastifyReply
-// ) {
-//   try {
-//     const { thread_id } = request.params as { thread_id: string };
-//     const tenant_id = request.headers["x-tenant-id"] as string;
-//     const config = request.body as {
-//       mode?: QueueMode;
-//       maxSize?: number;
-//     };
-
-//     if (!tenant_id) {
-//       return reply.code(400).send({ error: "Missing x-tenant-id header" });
-//     }
-
-//     await lifecycleManager.setQueueConfig(tenant_id, thread_id, config);
-
-//     return reply.send({
-//       success: true,
-//       threadId: thread_id,
-//       config,
-//     });
-//   } catch (error) {
-//     console.error("Error updating queue config:", error);
-//     return reply.code(500).send({
-//       error: "Internal server error",
-//       message: error instanceof Error ? error.message : String(error),
-//     });
-//   }
-// }
+import { FastifyRequest, FastifyReply } from "fastify";
+import { agentInstanceManager } from "@axiom-lattice/core";
+
+/**
+ * DELETE /api/assistants/:assistant_id/threads/:thread_id/pending-messages/:message_id
+ * Remove pending message from queue
+ */
+export async function removePendingMessageHandler(
+  request: FastifyRequest,
+  reply: FastifyReply
+) {
+  try {
+    const { assistant_id, thread_id, message_id } = request.params as {
+      assistant_id: string;
+      thread_id: string;
+      message_id: string;
+    };
+    const tenant_id = request.headers["x-tenant-id"] as string;
+    const workspace_id = request.headers["x-workspace-id"] as string;
+    const project_id = request.headers["x-project-id"] as string;
+
+    if (!tenant_id) {
+      return reply.code(400).send({ error: "Missing x-tenant-id header" });
+    }
+
+    if (!assistant_id) {
+      return reply.code(400).send({ error: "Missing assistant_id parameter" });
+    }
+
+    // Get agent instance
+    const agent = agentInstanceManager.getAgent({
+      assistant_id,
+      thread_id,
+      tenant_id,
+      workspace_id,
+      project_id,
+    });
+
+    if (!agent) {
+      return reply.code(404).send({
+        error: "Thread not found",
+        threadId: thread_id,
+      });
+    }
+
+    const success = await agent.removePendingMessage(message_id);
+
+    if (!success) {
+      return reply.code(404).send({
+        error: "Message not found",
+        messageId: message_id,
+      });
+    }
+
+    return reply.send({
+      success: true,
+      messageId: message_id,
+    });
+  } catch (error) {
+    console.error("Error removing pending message:", error);
+    return reply.code(500).send({
+      error: "Internal server error",
+      message: error instanceof Error ? error.message : String(error),
+    });
+  }
+}

package/src/index.ts

@@ -69,6 +69,22 @@ const app = fastify({
   bodyLimit: Number(process.env.BODY_LIMIT) || 50 * 1024 * 1024, // Default 50MB, configurable via BODY_LIMIT env var
 });
 
+// Custom content type parser to handle DELETE requests with Content-Type but no body
+// This prevents "Body cannot be empty when content-type is set to 'application/json'" error
+app.addContentTypeParser('application/json', { parseAs: 'string' }, function (request, body, done) {
+  // For DELETE requests or empty body, return empty object
+  if (request.method === 'DELETE' || !body || body.length === 0) {
+    done(null, {});
+    return;
+  }
+  try {
+    const json = JSON.parse(body as string);
+    done(null, json);
+  } catch (err) {
+    done(err as Error, undefined);
+  }
+});
+
 
 // Add custom logging hooks
 app.addHook("onRequest", (request, reply, done) => {
@@ -93,15 +109,6 @@ app.addHook("onRequest", (request, reply, done) => {
   done();
 });
 
-// Fix for DELETE requests with Content-Type: application/json header
-// Some clients send Content-Type header even for DELETE requests without body
-app.addHook("onRequest", async (request, reply) => {
-  if (request.method === "DELETE" && request.headers["content-type"]) {
-    // Remove content-type header for DELETE requests to avoid body parsing errors
-    delete request.headers["content-type"];
-  }
-});
-
 app.addHook("onResponse", (request, reply, done) => {
   // Convert headers to strings (Fastify headers can be string | string[])
   const getHeaderValue = (

package/src/routes/index.ts

@@ -30,6 +30,7 @@ import {
   getSandboxUrlSchema,
   dataQuerySchema,
 } from "../schemas";
+import { removePendingMessageHandler } from "../controllers/thread_status";
 import { registerSandboxProxyRoutes } from "../controllers/sandbox";
 import { registerWorkspaceRoutes } from "../controllers/workspace";
 import { registerDatabaseConfigRoutes } from "../controllers/database-configs";
@@ -346,4 +347,12 @@ export const registerLatticeRoutes = (app: FastifyInstance): void => {
   // app.post("/api/threads/:thread_id/messages", addMessageHandler);
   // app.delete("/api/threads/:thread_id/messages/:message_id", removeMessageHandler);
   // app.put("/api/threads/:thread_id/queue-config", updateQueueConfigHandler);
+
+  // Delete pending message route
+  app.delete<{
+    Params: { assistant_id: string; thread_id: string; message_id: string };
+  }>(
+    "/api/assistants/:assistant_id/threads/:thread_id/pending-messages/:message_id",
+    removePendingMessageHandler
+  );
 };

package/src/types/index.ts

@@ -77,10 +77,12 @@ export interface CreateRunRequest {
   thread_id: string;
   assistant_id: string;
   message: any;
+  message_id?: string;
   command?: any;
   streaming?: boolean;
   background?: boolean;
   custom_run_config?: Record<string, any>;
+  mode?: 'collect' | 'followup' | 'steer';
 }
 
 // 添加消息请求类型