@axiom-lattice/gateway 2.1.38 → 2.1.39

package/dist/index.mjs

@@ -14,12 +14,20 @@ import { Command } from "@langchain/langgraph";
 import { v4 } from "uuid";
 import {
   getAgentClient,
-  getAgentLattice,
+  agentLatticeManager,
   InMemoryChunkBuffer,
   registerChunkBuffer,
   getChunkBuffer,
   hasChunkBuffer
 } from "@axiom-lattice/core";
+async function checkAgentExists(tenant_id, assistant_id) {
+  try {
+    const agentLattice = agentLatticeManager.getAgentLatticeWithTenant(tenant_id, assistant_id);
+    return agentLattice !== void 0;
+  } catch {
+    return false;
+  }
+}
 function getOrCreateChunkBuffer() {
   if (!hasChunkBuffer("default")) {
     const buffer = new InMemoryChunkBuffer({
@@ -43,7 +51,7 @@ async function agent_invoke({
   run_id,
   custom_run_config
 }) {
-  const agentLattice = getAgentLattice(assistant_id);
+  const agentLattice = agentLatticeManager.getAgentLatticeWithTenant(tenant_id, assistant_id);
   const runnable_agent = agentLattice?.client;
   const { message, ...rest } = input;
   const humanMessage = new HumanMessage(message || "");
@@ -53,6 +61,7 @@ async function agent_invoke({
   }
   const runConfig = {
     ...agentLattice?.config?.runConfig || {},
+    tenantId: tenant_id,
     workspaceId: workspace_id,
     projectId: project_id,
     ...custom_run_config || {},
@@ -95,8 +104,8 @@ async function agent_stream({
   run_id,
   custom_run_config
 }) {
-  const runnable_agent = getAgentClient(assistant_id);
-  const agentLattice = getAgentLattice(assistant_id);
+  const runnable_agent = await getAgentClient(tenant_id, assistant_id);
+  const agentLattice = agentLatticeManager.getAgentLatticeWithTenant(tenant_id, assistant_id);
   const { message, ...rest } = input;
   let messages = [];
   if (!command) {
@@ -106,6 +115,7 @@ async function agent_stream({
   const chunkBuffer = getOrCreateChunkBuffer();
   const runConfig = {
     ...agentLattice?.config?.runConfig || {},
+    tenantId: tenant_id,
     workspaceId: workspace_id,
     projectId: project_id,
     ...custom_run_config || {},
@@ -184,10 +194,11 @@ async function agent_stream({
   }
 }
 async function agent_state({
+  assistant_id,
   thread_id,
-  assistant_id
+  tenant_id
 }) {
-  const runnable_agent = getAgentClient(assistant_id);
+  const runnable_agent = await getAgentClient(tenant_id, assistant_id);
   if (!runnable_agent) {
     throw new Error(`Agent ${assistant_id} not found`);
   }
@@ -201,7 +212,7 @@ async function agent_messages({
   tenant_id,
   assistant_id
 }) {
-  const runnable_agent = getAgentClient(assistant_id);
+  const runnable_agent = await getAgentClient(tenant_id, assistant_id);
   if (!runnable_agent) {
     throw new Error(`Agent ${assistant_id} not found`);
   }
@@ -222,8 +233,8 @@ async function agent_messages({
   const new_messages = messagesArray;
   return new_messages;
 }
-async function draw_graph(assistant_id) {
-  const runnable_agent = getAgentClient(assistant_id);
+async function draw_graph(assistant_id, tenant_id) {
+  const runnable_agent = await getAgentClient(tenant_id, assistant_id);
   if (!runnable_agent) {
     throw new Error(`Agent ${assistant_id} not found`);
   }
@@ -260,10 +271,19 @@ async function resume_stream({
 // src/controllers/assistant.ts
 import { getStoreLattice } from "@axiom-lattice/core";
 import { randomUUID } from "crypto";
-import { getAllAgentConfigs, eventBus } from "@axiom-lattice/core";
+import { agentLatticeManager as agentLatticeManager2, eventBus } from "@axiom-lattice/core";
+function getTenantId(request) {
+  const userTenantId = request.user?.tenantId;
+  if (userTenantId) {
+    return userTenantId;
+  }
+  return request.headers["x-tenant-id"] || "default";
+}
 function convertAgentConfigToAssistant(config) {
   return {
     id: config.key,
+    tenantId: "default",
+    // Code-configured agents belong to default tenant
     name: config.name,
     description: config.description,
     graphDefinition: config,
@@ -275,13 +295,14 @@ function convertAgentConfigToAssistant(config) {
   };
 }
 async function getAssistantList(request, reply) {
-  const agentConfigs = await getAllAgentConfigs();
+  const tenantId = getTenantId(request);
+  const agentConfigs = await agentLatticeManager2.getAllAgentConfigsByTenant(tenantId);
   const codeConfiguredAssistants = agentConfigs.map(
     convertAgentConfigToAssistant
   );
   const storeLattice = getStoreLattice("default", "assistant");
   const assistantStore = storeLattice.store;
-  const storedAssistants = await assistantStore.getAllAssistants();
+  const storedAssistants = await assistantStore.getAllAssistants(tenantId);
   const assistantMap = /* @__PURE__ */ new Map();
   codeConfiguredAssistants.forEach((assistant) => {
     assistantMap.set(assistant.id, assistant);
@@ -301,12 +322,12 @@ async function getAssistantList(request, reply) {
 }
 async function getAssistant(request, reply) {
   const { id } = request.params;
+  const tenantId = getTenantId(request);
   const storeLattice = getStoreLattice("default", "assistant");
   const assistantStore = storeLattice.store;
-  let assistant = await assistantStore.getAssistantById(id);
+  let assistant = await assistantStore.getAssistantById(tenantId, id);
   if (!assistant) {
-    const agentConfigs = await getAllAgentConfigs();
-    const agentConfig = agentConfigs.find((config) => config.key === id);
+    const agentConfig = await agentLatticeManager2.getAgentConfigWithTenant(tenantId, id);
     if (agentConfig) {
       assistant = convertAgentConfigToAssistant(agentConfig);
     }
@@ -323,20 +344,20 @@ async function getAssistant(request, reply) {
     data: assistant
   };
 }
-async function upsertAssistant(id, data, reply, requireFields = false) {
+async function upsertAssistant(tenantId, id, data, reply, requireFields = false) {
   const storeLattice = getStoreLattice("default", "assistant");
   const assistantStore = storeLattice.store;
-  const exists = await assistantStore.hasAssistant(id);
+  const exists = await assistantStore.hasAssistant(tenantId, id);
   let assistant;
   if (exists) {
-    assistant = await assistantStore.updateAssistant(id, data);
+    assistant = await assistantStore.updateAssistant(tenantId, id, data);
     if (!assistant) {
       return reply.status(500).send({
         success: false,
         message: "Failed to update assistant"
       });
     }
-    eventBus.publish("assistant:updated", { id: assistant.id, name: assistant.name });
+    eventBus.publish("assistant:updated", { id: assistant.id, name: assistant.name, tenantId });
     return {
       success: true,
       message: "Updated assistant",
@@ -352,8 +373,8 @@ async function upsertAssistant(id, data, reply, requireFields = false) {
       });
     }
   }
-  assistant = await assistantStore.createAssistant(id, data);
-  eventBus.publish("assistant:created", { id: assistant.id, name: assistant.name });
+  assistant = await assistantStore.createAssistant(tenantId, id, data);
+  eventBus.publish("assistant:created", { id: assistant.id, name: assistant.name, tenantId });
   return reply.status(201).send({
     success: true,
     message: "Created assistant",
@@ -361,6 +382,7 @@ async function upsertAssistant(id, data, reply, requireFields = false) {
   });
 }
 async function createAssistant(request, reply) {
+  const tenantId = getTenantId(request);
   const data = request.body;
   if (!data.name || !data.graphDefinition) {
     return reply.status(400).send({
@@ -369,49 +391,51 @@ async function createAssistant(request, reply) {
     });
   }
   const id = data.id ?? randomUUID();
-  return upsertAssistant(id, data, reply, true);
+  return upsertAssistant(tenantId, id, data, reply, true);
 }
 async function updateAssistant(request, reply) {
+  const tenantId = getTenantId(request);
   const { id } = request.params;
   const updates = request.body;
-  return upsertAssistant(id, updates, reply, false);
+  return upsertAssistant(tenantId, id, updates, reply, false);
 }
 async function deleteAssistant(request, reply) {
+  const tenantId = getTenantId(request);
   const { id } = request.params;
   const storeLattice = getStoreLattice("default", "assistant");
   const assistantStore = storeLattice.store;
-  const agentConfigs = await getAllAgentConfigs();
-  const isCodeConfigured = agentConfigs.some((config) => config.key === id);
+  const agentConfig = await agentLatticeManager2.getAgentConfigWithTenant(tenantId, id);
+  const isCodeConfigured = !!agentConfig;
   if (isCodeConfigured) {
-    const exists2 = await assistantStore.hasAssistant(id);
+    const exists2 = await assistantStore.hasAssistant(tenantId, id);
     if (!exists2) {
       return reply.status(404).send({
         success: false,
         message: "Assistant not found (code-configured assistants cannot be deleted from code, only from store)"
       });
     }
-    await assistantStore.deleteAssistant(id);
-    eventBus.publish("assistant:deleted", { id });
+    await assistantStore.deleteAssistant(tenantId, id);
+    eventBus.publish("assistant:deleted", { id, tenantId });
     return {
       success: true,
       message: "Deleted assistant from store (code-configured registration remains)"
     };
   }
-  const exists = await assistantStore.hasAssistant(id);
+  const exists = await assistantStore.hasAssistant(tenantId, id);
   if (!exists) {
     return reply.status(404).send({
       success: false,
       message: "Assistant not found"
     });
   }
-  const deleted = await assistantStore.deleteAssistant(id);
+  const deleted = await assistantStore.deleteAssistant(tenantId, id);
   if (!deleted) {
     return reply.status(500).send({
       success: false,
       message: "Failed to delete assistant"
     });
   }
-  eventBus.publish("assistant:deleted", { id });
+  eventBus.publish("assistant:deleted", { id, tenantId });
   return {
     success: true,
     message: "Successfully deleted assistant"
@@ -420,7 +444,8 @@ async function deleteAssistant(request, reply) {
 var getAgentGraph = async (request, reply) => {
   try {
     const { assistantId } = request.params;
-    const imageData = await draw_graph(assistantId);
+    const tenant_id = getTenantId(request);
+    const imageData = await draw_graph(assistantId, tenant_id);
     reply.header("Content-Type", "application/json").send({
       image: imageData
     });
@@ -457,6 +482,14 @@ var createRun = async (request, reply) => {
       return;
     }
     if (streaming) {
+      const agentExists = await checkAgentExists(tenant_id, assistant_id);
+      if (!agentExists) {
+        reply.status(404).send({
+          success: false,
+          error: `Agent ${assistant_id} not found for tenant ${tenant_id}`
+        });
+        return;
+      }
       const stream = await agent_stream({
         assistant_id,
         input,
@@ -476,13 +509,27 @@ var createRun = async (request, reply) => {
         "Access-Control-Allow-Origin": "*"
       });
       try {
+        let chunkCount = 0;
         for await (const chunk of stream) {
-          reply.raw.write(`data: ${JSON.stringify(chunk)}
+          chunkCount++;
+          const success = reply.raw.write(`data: ${JSON.stringify(chunk)}
 
 `);
+          if (!success) {
+            await new Promise((resolve) => reply.raw.once("drain", resolve));
+          }
         }
       } catch (error) {
-        console.error("Stream processing error:", error);
+        const errorEvent = {
+          type: "error",
+          data: {
+            id: v42(),
+            content: error.message || "Stream processing error"
+          }
+        };
+        reply.raw.write(`data: ${JSON.stringify(errorEvent)}
+
+`);
       } finally {
         reply.raw.end();
       }
@@ -537,7 +584,16 @@ var resumeStream = async (request, reply) => {
 `);
       }
     } catch (error) {
-      console.error("Resume stream processing error:", error);
+      const errorEvent = {
+        type: "error",
+        data: {
+          id: v42(),
+          content: error.message || "Resume stream processing error"
+        }
+      };
+      reply.raw.write(`data: ${JSON.stringify(errorEvent)}
+
+`);
     } finally {
       reply.raw.end();
     }
@@ -648,9 +704,11 @@ var getAgentState = async (request, reply) => {
       });
       return;
     }
+    const tenant_id = request.headers["x-tenant-id"];
     const result = await agent_state({
       assistant_id: assistantId,
-      thread_id
+      thread_id,
+      tenant_id
     });
     if (!result) {
       reply.status(500).send(result);
@@ -750,11 +808,19 @@ var triggerAgentTask = async (request, reply) => {
 // src/controllers/threads.ts
 import { getStoreLattice as getStoreLattice2 } from "@axiom-lattice/core";
 import { randomUUID as randomUUID2 } from "crypto";
+function getTenantId2(request) {
+  const userTenantId = request.user?.tenantId;
+  if (userTenantId) {
+    return userTenantId;
+  }
+  return request.headers["x-tenant-id"] || "default";
+}
 async function getThreadList(request, reply) {
+  const tenantId = getTenantId2(request);
   const { assistantId } = request.params;
   const storeLattice = getStoreLattice2("default", "thread");
   const threadStore = storeLattice.store;
-  const threads = await threadStore.getThreadsByAssistantId(assistantId);
+  const threads = await threadStore.getThreadsByAssistantId(tenantId, assistantId);
   return {
     success: true,
     message: "Successfully retrieved thread list",
@@ -765,10 +831,11 @@ async function getThreadList(request, reply) {
   };
 }
 async function getThread(request, reply) {
-  const { assistantId, threadId } = request.params;
+  const tenantId = getTenantId2(request);
+  const { threadId } = request.params;
   const storeLattice = getStoreLattice2("default", "thread");
   const threadStore = storeLattice.store;
-  const thread = await threadStore.getThreadById(assistantId, threadId);
+  const thread = await threadStore.getThreadById(tenantId, threadId);
   if (!thread) {
     return reply.status(404).send({
       success: false,
@@ -782,12 +849,13 @@ async function getThread(request, reply) {
   };
 }
 async function createThread(request, reply) {
+  const tenantId = getTenantId2(request);
   const { assistantId } = request.params;
   const data = request.body;
   const threadId = randomUUID2();
   const storeLattice = getStoreLattice2("default", "thread");
   const threadStore = storeLattice.store;
-  const newThread = await threadStore.createThread(assistantId, threadId, data);
+  const newThread = await threadStore.createThread(tenantId, assistantId, threadId, data);
   return reply.status(201).send({
     success: true,
     message: "Successfully created thread",
@@ -795,11 +863,12 @@ async function createThread(request, reply) {
   });
 }
 async function updateThread(request, reply) {
-  const { assistantId, threadId } = request.params;
+  const tenantId = getTenantId2(request);
+  const { threadId } = request.params;
   const updates = request.body;
   const storeLattice = getStoreLattice2("default", "thread");
   const threadStore = storeLattice.store;
-  const exists = await threadStore.hasThread(assistantId, threadId);
+  const exists = await threadStore.hasThread(tenantId, threadId);
   if (!exists) {
     return reply.status(404).send({
       success: false,
@@ -807,7 +876,7 @@ async function updateThread(request, reply) {
     });
   }
   const updatedThread = await threadStore.updateThread(
-    assistantId,
+    tenantId,
     threadId,
     updates
   );
@@ -824,17 +893,18 @@ async function updateThread(request, reply) {
   };
 }
 async function deleteThread(request, reply) {
-  const { assistantId, threadId } = request.params;
+  const tenantId = getTenantId2(request);
+  const { threadId } = request.params;
   const storeLattice = getStoreLattice2("default", "thread");
   const threadStore = storeLattice.store;
-  const exists = await threadStore.hasThread(assistantId, threadId);
+  const exists = await threadStore.hasThread(tenantId, threadId);
   if (!exists) {
     return reply.status(404).send({
       success: false,
       message: "Thread not found"
     });
   }
-  const deleted = await threadStore.deleteThread(assistantId, threadId);
+  const deleted = await threadStore.deleteThread(tenantId, threadId);
   if (!deleted) {
     return reply.status(500).send({
       success: false,
@@ -849,6 +919,13 @@ async function deleteThread(request, reply) {
 
 // src/controllers/schedules.ts
 import { scheduleLatticeManager } from "@axiom-lattice/core";
+function getTenantId3(request) {
+  const userTenantId = request.user?.tenantId;
+  if (userTenantId) {
+    return userTenantId;
+  }
+  return request.headers["x-tenant-id"] || "default";
+}
 function getScheduleLattice() {
   const keys = scheduleLatticeManager.getLatticeKeys();
   if (keys.length === 0) {
@@ -885,7 +962,9 @@ async function getThreadSchedules(request, reply) {
         }
       };
     }
+    const tenantId = getTenantId3(request);
     const filters = {
+      tenantId,
       threadId,
       assistantId
     };
@@ -900,6 +979,7 @@ async function getThreadSchedules(request, reply) {
     }
     const tasks = await storage.getAllTasks(filters);
     const total = await storage.countTasks({
+      tenantId,
       threadId,
       assistantId,
       status
@@ -1362,6 +1442,13 @@ async function getHealth(request, reply) {
 // src/controllers/skills.ts
 import { getStoreLattice as getStoreLattice3 } from "@axiom-lattice/core";
 import { validateSkillName } from "@axiom-lattice/core";
+function getTenantId4(request) {
+  const userTenantId = request.user?.tenantId;
+  if (userTenantId) {
+    return userTenantId;
+  }
+  return request.headers["x-tenant-id"] || "default";
+}
 function serializeSkill(skill) {
   const serialized = {
     id: skill.id,
@@ -1384,9 +1471,10 @@ function serializeSkill(skill) {
 }
 async function getSkillList(request, reply) {
   try {
+    const tenantId = getTenantId4(request);
     const storeLattice = getStoreLattice3("default", "skill");
     const skillStore = storeLattice.store;
-    const skills = await skillStore.getAllSkills();
+    const skills = await skillStore.getAllSkills(tenantId);
     const serializedSkills = skills.map(serializeSkill);
     return {
       success: true,
@@ -1409,10 +1497,11 @@ async function getSkillList(request, reply) {
 }
 async function getSkill(request, reply) {
   try {
+    const tenantId = getTenantId4(request);
     const { id } = request.params;
     const storeLattice = getStoreLattice3("default", "skill");
     const skillStore = storeLattice.store;
-    const skill = await skillStore.getSkillById(id);
+    const skill = await skillStore.getSkillById(tenantId, id);
     if (!skill) {
       return reply.status(404).send({
         success: false,
@@ -1461,16 +1550,17 @@ async function createSkill(request, reply) {
         message: `id "${id}" must equal name "${data.name}" (name is used for path addressing)`
       });
     }
+    const tenantId = getTenantId4(request);
     const storeLattice = getStoreLattice3("default", "skill");
     const skillStore = storeLattice.store;
-    const exists = await skillStore.hasSkill(id);
+    const exists = await skillStore.hasSkill(tenantId, id);
     if (exists) {
       return reply.status(409).send({
         success: false,
         message: `Skill with id "${id}" already exists`
       });
     }
-    const newSkill = await skillStore.createSkill(id, data);
+    const newSkill = await skillStore.createSkill(tenantId, id, data);
     return reply.status(201).send({
       success: true,
       message: "Successfully created skill",
@@ -1497,16 +1587,17 @@ async function updateSkill(request, reply) {
         });
       }
     }
+    const tenantId = getTenantId4(request);
     const storeLattice = getStoreLattice3("default", "skill");
     const skillStore = storeLattice.store;
-    const exists = await skillStore.hasSkill(id);
+    const exists = await skillStore.hasSkill(tenantId, id);
     if (!exists) {
       return reply.status(404).send({
         success: false,
         message: "Skill not found"
       });
     }
-    const updatedSkill = await skillStore.updateSkill(id, updates);
+    const updatedSkill = await skillStore.updateSkill(tenantId, id, updates);
     if (!updatedSkill) {
       return reply.status(500).send({
         success: false,
@@ -1528,16 +1619,17 @@ async function updateSkill(request, reply) {
 async function deleteSkill(request, reply) {
   try {
     const { id } = request.params;
+    const tenantId = getTenantId4(request);
     const storeLattice = getStoreLattice3("default", "skill");
     const skillStore = storeLattice.store;
-    const exists = await skillStore.hasSkill(id);
+    const exists = await skillStore.hasSkill(tenantId, id);
     if (!exists) {
       return reply.status(404).send({
         success: false,
         message: "Skill not found"
       });
     }
-    const deleted = await skillStore.deleteSkill(id);
+    const deleted = await skillStore.deleteSkill(tenantId, id);
     if (!deleted) {
       return reply.status(500).send({
         success: false,
@@ -1568,9 +1660,10 @@ async function searchSkillsByMetadata(request, reply) {
         }
       });
     }
+    const tenantId = getTenantId4(request);
     const storeLattice = getStoreLattice3("default", "skill");
     const skillStore = storeLattice.store;
-    const skills = await skillStore.searchByMetadata(key, value);
+    const skills = await skillStore.searchByMetadata(tenantId, key, value);
     const serializedSkills = skills.map(serializeSkill);
     return {
       success: true,
@@ -1604,9 +1697,10 @@ async function filterSkillsByCompatibility(request, reply) {
         }
       });
     }
+    const tenantId = getTenantId4(request);
     const storeLattice = getStoreLattice3("default", "skill");
     const skillStore = storeLattice.store;
-    const skills = await skillStore.filterByCompatibility(compatibility);
+    const skills = await skillStore.filterByCompatibility(tenantId, compatibility);
     const serializedSkills = skills.map(serializeSkill);
     return {
       success: true,
@@ -1640,9 +1734,10 @@ async function filterSkillsByLicense(request, reply) {
         }
       });
     }
+    const tenantId = getTenantId4(request);
     const storeLattice = getStoreLattice3("default", "skill");
     const skillStore = storeLattice.store;
-    const skills = await skillStore.filterByLicense(license);
+    const skills = await skillStore.filterByLicense(tenantId, license);
     const serializedSkills = skills.map(serializeSkill);
     return {
       success: true,
@@ -1665,7 +1760,7 @@ async function filterSkillsByLicense(request, reply) {
 }
 
 // src/controllers/tools.ts
-import { getStoreLattice as getStoreLattice4, toolLatticeManager } from "@axiom-lattice/core";
+import { toolLatticeManager } from "@axiom-lattice/core";
 function serializeSchema(schema) {
   if (!schema) {
     return void 0;
@@ -2021,7 +2116,7 @@ var getHealthSchema = {
 import { Readable } from "stream";
 
 // src/services/sandbox_service.ts
-import { getAgentConfig, getAgentLattice as getAgentLattice2, getSandBoxManager, normalizeSandboxName } from "@axiom-lattice/core";
+import { agentLatticeManager as agentLatticeManager3, getSandBoxManager, normalizeSandboxName } from "@axiom-lattice/core";
 var ERROR_HTML = `<!DOCTYPE html>
 <html lang="zh-CN">
 <head>
@@ -2132,17 +2227,17 @@ var ERROR_HTML = `<!DOCTYPE html>
 </body>
 </html>`;
 var SandboxService = class {
-  getFilesystemIsolatedLevel(assistantId) {
-    const agentConfig = getAgentConfig(assistantId);
-    if (!agentConfig) {
+  getFilesystemIsolatedLevel(tenantId, assistantId) {
+    const agentLattice = agentLatticeManager3.getAgentLatticeWithTenant(tenantId, assistantId);
+    if (!agentLattice) {
       return null;
     }
-    const agentLattice = getAgentLattice2(assistantId);
     const filesystemConfig = agentLattice?.config?.middleware?.find((m) => m.type === "filesystem");
     if (!filesystemConfig) {
       return null;
     }
-    return filesystemConfig.config?.isolatedLevel || null;
+    const config = filesystemConfig.config;
+    return config?.isolatedLevel || null;
   }
   computeSandboxName(assistantId, threadId, isolatedLevel) {
     let sandboxName;
@@ -2161,7 +2256,7 @@ var SandboxService = class {
     return normalizeSandboxName(sandboxName);
   }
   getTargetUrl(sandboxName) {
-    const sandboxManager = getSandBoxManager("default");
+    const sandboxManager = getSandBoxManager();
     return `${sandboxManager.getBaseURL()}/sandbox/${sandboxName}`;
   }
   async getVncHtml(sandboxName) {
@@ -2238,7 +2333,8 @@ function registerSandboxProxyRoutes(app2) {
     async (request, reply) => {
       console.log("[Sandbox Upload] Route matched:", request.url);
       const { assistantId, threadId } = request.params;
-      const isolatedLevel = sandboxService.getFilesystemIsolatedLevel(assistantId);
+      const tenantId = request.headers["x-tenant-id"] || "default";
+      const isolatedLevel = sandboxService.getFilesystemIsolatedLevel(tenantId, assistantId);
       if (!isolatedLevel) {
         return reply.status(500).send({ error: "Assistant sandbox config not found" });
       }
@@ -2247,7 +2343,7 @@ function registerSandboxProxyRoutes(app2) {
         threadId,
         isolatedLevel
       );
-      const sandboxManager = getSandBoxManager2("default");
+      const sandboxManager = getSandBoxManager2();
       const sandbox = await sandboxManager.createSandbox(sandboxName);
       try {
         const data = await request.file();
@@ -2281,10 +2377,11 @@ function registerSandboxProxyRoutes(app2) {
     async (request, reply) => {
       const { assistantId, threadId } = request.params;
       const { path: filePath } = request.query;
+      const tenantId = request.headers["x-tenant-id"] || "default";
       if (!filePath || typeof filePath !== "string") {
         return reply.status(400).send({ error: "Query parameter 'path' is required" });
       }
-      const isolatedLevel = sandboxService.getFilesystemIsolatedLevel(assistantId);
+      const isolatedLevel = sandboxService.getFilesystemIsolatedLevel(tenantId, assistantId);
       if (!isolatedLevel) {
         return reply.status(500).send({ error: "Assistant filesystem isolated level not found" });
       }
@@ -2293,7 +2390,7 @@ function registerSandboxProxyRoutes(app2) {
         threadId,
         isolatedLevel
       );
-      const sandboxManager = getSandBoxManager2("default");
+      const sandboxManager = getSandBoxManager2();
       const sandbox = await sandboxManager.createSandbox(sandboxName);
       try {
         const resolvedPath = filePath.startsWith("/home/gem") ? filePath : `/home/gem/${filePath.replace(/^\//, "")}`;
@@ -2349,16 +2446,24 @@ function registerSandboxProxyRoutes(app2) {
 import * as fs from "fs/promises";
 import * as path from "path";
 import { Readable as Readable2 } from "stream";
-import { getStoreLattice as getStoreLattice5 } from "@axiom-lattice/core";
+import { getStoreLattice as getStoreLattice4 } from "@axiom-lattice/core";
 import { SandboxFilesystem, FilesystemBackend } from "@axiom-lattice/core";
 import { getSandBoxManager as getSandBoxManager3 } from "@axiom-lattice/core";
 import { v4 as uuidv4 } from "uuid";
 var WorkspaceController = class {
   constructor() {
-    this.workspaceStore = getStoreLattice5("default", "workspace").store;
-    this.projectStore = getStoreLattice5("default", "project").store;
+    this.workspaceStore = getStoreLattice4("default", "workspace").store;
+    this.projectStore = getStoreLattice4("default", "project").store;
   }
   getTenantId(request) {
+    const userTenantId = request.user?.tenantId;
+    if (userTenantId) {
+      return userTenantId;
+    }
+    const queryTenantId = request.query?.tenantId;
+    if (queryTenantId) {
+      return String(queryTenantId);
+    }
     return request.headers["x-tenant-id"] || "default";
   }
   // ==================== Workspace CRUD ====================
@@ -2472,8 +2577,7 @@ var WorkspaceController = class {
     return { success: true };
   }
   // ==================== File Operations ====================
-  async getBackend(workspaceId, projectId) {
-    const tenantId = "default";
+  async getBackend(tenantId, workspaceId, projectId) {
     const workspace = await this.workspaceStore.getWorkspaceById(
       tenantId,
       workspaceId
@@ -2482,18 +2586,24 @@ var WorkspaceController = class {
       throw new Error("Workspace not found");
     }
     if (workspace.storageType === "sandbox") {
-      const sandboxManager = getSandBoxManager3("default");
+      const sandboxManager = getSandBoxManager3();
       const sandboxName = "global";
       const sandbox = await sandboxManager.createSandbox(sandboxName);
-      return { backend: new SandboxFilesystem({
-        sandboxInstance: sandbox,
-        workingDirectory: `/workspaces/${workspaceId}/${projectId}`
-      }), workspace };
+      return {
+        backend: new SandboxFilesystem({
+          sandboxInstance: sandbox,
+          workingDirectory: `/tenants/${tenantId}/workspaces/${workspaceId}/${projectId}`
+        }),
+        workspace
+      };
     } else {
-      return { backend: new FilesystemBackend({
-        rootDir: `/lattice_store/workspaces/${workspaceId}/${projectId}`,
-        virtualMode: true
-      }), workspace };
+      return {
+        backend: new FilesystemBackend({
+          rootDir: `/lattice_store/tenants/${tenantId}/workspaces/${workspaceId}/${projectId}`,
+          virtualMode: true
+        }),
+        workspace
+      };
     }
   }
   getFilenameFromPath(filePath) {
@@ -2523,18 +2633,19 @@ var WorkspaceController = class {
     return mimeTypes[ext] || "application/octet-stream";
   }
   async downloadFile(request, reply) {
+    const tenantId = this.getTenantId(request);
     const { workspaceId, projectId } = request.params;
     const filePath = request.query.path;
     if (!filePath) {
       return reply.status(400).send({ success: false, error: "Path is required" });
     }
     try {
-      const { workspace } = await this.getBackend(workspaceId, projectId);
+      const { workspace } = await this.getBackend(tenantId, workspaceId, projectId);
       const resolvedPath = filePath.startsWith("/") ? filePath : `/${filePath}`;
       if (workspace.storageType === "sandbox") {
-        const sandboxManager = getSandBoxManager3("default");
+        const sandboxManager = getSandBoxManager3();
         const sandbox = await sandboxManager.createSandbox("global");
-        const realPath = path.join("/home/gem/workspaces", workspaceId, projectId, resolvedPath);
+        const realPath = path.join("/home/gem/tenants", tenantId, "workspaces", workspaceId, projectId, resolvedPath);
         const filename2 = this.getFilenameFromPath(resolvedPath);
         const inferredContentType = this.getMimeType(filename2);
         const downloadResult = await sandbox.file.downloadFile({
@@ -2551,13 +2662,13 @@ var WorkspaceController = class {
           const webStream = body.stream();
           const nodeStream = Readable2.fromWeb(webStream);
           const contentType2 = body.contentType ?? inferredContentType;
-          const contentDisposition2 = body.contentDisposition ?? `inline; filename*=UTF-8''${encodeURIComponent(filename2)}`;
+          const contentDisposition2 = body.contentDisposition ?? `attachment; filename*=UTF-8''${encodeURIComponent(filename2)}`;
           return reply.status(200).type(contentType2).header("Content-Disposition", contentDisposition2).send(nodeStream);
         }
         const bodyUnknown = downloadResult.body;
         let buf;
         let contentType = inferredContentType;
-        let contentDisposition = `inline; filename*=UTF-8''${encodeURIComponent(filename2)}`;
+        let contentDisposition = `attachment; filename*=UTF-8''${encodeURIComponent(filename2)}`;
         if (bodyUnknown instanceof ArrayBuffer) {
           buf = Buffer.from(bodyUnknown);
         } else if (bodyUnknown instanceof Buffer) {
@@ -2575,28 +2686,96 @@ var WorkspaceController = class {
         }
         return reply.status(200).type(contentType).header("Content-Disposition", contentDisposition).send(buf);
       }
-      const { backend } = await this.getBackend(workspaceId, projectId);
+      const { backend } = await this.getBackend(tenantId, workspaceId, projectId);
       const content = await backend.read(resolvedPath, 0, Infinity);
       const filename = this.getFilenameFromPath(resolvedPath);
       const mimeType = this.getMimeType(filename);
       const buffer = Buffer.from(content, "utf-8");
-      return reply.status(200).type(mimeType).header("Content-Disposition", `inline; filename*=UTF-8''${encodeURIComponent(filename)}`).send(buffer);
+      return reply.status(200).type(mimeType).header("Content-Disposition", `attachment; filename*=UTF-8''${encodeURIComponent(filename)}`).send(buffer);
     } catch (error) {
       const message = error instanceof Error ? error.message : String(error);
       return reply.status(502).send({ success: false, error: `Download proxy error: ${message}` });
     }
   }
+  /**
+   * View a file inline in the browser (not download).
+   * Returns file content with inline Content-Disposition for preview.
+   */
+  async viewFile(request, reply) {
+    const tenantId = this.getTenantId(request);
+    const { workspaceId, projectId } = request.params;
+    const filePath = request.query.path;
+    if (!filePath) {
+      return reply.status(400).send({ success: false, error: "Path is required" });
+    }
+    try {
+      const { workspace } = await this.getBackend(tenantId, workspaceId, projectId);
+      const resolvedPath = filePath.startsWith("/") ? filePath : `/${filePath}`;
+      if (workspace.storageType === "sandbox") {
+        const sandboxManager = getSandBoxManager3();
+        const sandbox = await sandboxManager.createSandbox("global");
+        const realPath = path.join("/home/gem/tenants", tenantId, "workspaces", workspaceId, projectId, resolvedPath);
+        const filename2 = this.getFilenameFromPath(resolvedPath);
+        const inferredContentType = this.getMimeType(filename2);
+        const downloadResult = await sandbox.file.downloadFile({
+          path: realPath
+        });
+        if (!downloadResult.ok) {
+          return reply.status(502).send({
+            success: false,
+            error: `View error: ${JSON.stringify(downloadResult.error)}`
+          });
+        }
+        const body = downloadResult.body;
+        if (typeof body?.stream === "function") {
+          const webStream = body.stream();
+          const nodeStream = Readable2.fromWeb(webStream);
+          const contentType2 = body.contentType ?? inferredContentType;
+          return reply.status(200).type(contentType2).header("Content-Disposition", "inline").send(nodeStream);
+        }
+        const bodyUnknown = downloadResult.body;
+        let buf;
+        let contentType = inferredContentType;
+        if (bodyUnknown instanceof ArrayBuffer) {
+          buf = Buffer.from(bodyUnknown);
+        } else if (bodyUnknown instanceof Buffer) {
+          buf = bodyUnknown;
+        } else if (bodyUnknown && typeof bodyUnknown.arrayBuffer === "function") {
+          const res = bodyUnknown;
+          buf = Buffer.from(await res.arrayBuffer());
+          if (res.headers?.get("content-type")) contentType = res.headers.get("content-type");
+        } else if (bodyUnknown && typeof bodyUnknown.blob === "function") {
+          const blob = await bodyUnknown.blob();
+          buf = Buffer.from(await blob.arrayBuffer());
+        } else {
+          return reply.status(502).send({ success: false, error: "Unexpected view response format" });
+        }
+        return reply.status(200).type(contentType).header("Content-Disposition", "inline").send(buf);
+      }
+      const { backend } = await this.getBackend(tenantId, workspaceId, projectId);
+      const content = await backend.read(resolvedPath, 0, Infinity);
+      const filename = this.getFilenameFromPath(resolvedPath);
+      const mimeType = this.getMimeType(filename);
+      const buffer = Buffer.from(content, "utf-8");
+      return reply.status(200).type(mimeType).header("Content-Disposition", "inline").send(buffer);
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      return reply.status(502).send({ success: false, error: `View proxy error: ${message}` });
+    }
+  }
   async listPath(request) {
+    const tenantId = this.getTenantId(request);
     const { workspaceId, projectId } = request.params;
     const path2 = request.query.path || "/";
-    const { backend } = await this.getBackend(workspaceId, projectId);
+    const { backend } = await this.getBackend(tenantId, workspaceId, projectId);
     const files = await backend.lsInfo(path2);
     return { success: true, data: files };
   }
   async readFile(request) {
+    const tenantId = this.getTenantId(request);
     const { workspaceId, projectId } = request.params;
     const { path: path2, offset = 0, limit = 1e3 } = request.query;
-    const { backend } = await this.getBackend(workspaceId, projectId);
+    const { backend } = await this.getBackend(tenantId, workspaceId, projectId);
     const content = await backend.read(path2, Number(offset), Number(limit));
     return { success: true, data: { content, offset, limit } };
   }
@@ -2633,10 +2812,10 @@ var WorkspaceController = class {
         return reply.status(400).send({ success: false, error: "Invalid path parameter" });
       }
       if (workspace.storageType === "sandbox") {
-        const sandboxManager = getSandBoxManager3("default");
+        const sandboxManager = getSandBoxManager3();
         const sandboxName = "global";
         const sandbox = await sandboxManager.createSandbox(sandboxName);
-        const baseDir = path.join("/home/gem/workspaces", workspaceId, projectId);
+        const baseDir = path.join("/home/gem/tenants", tenantId, "workspaces", workspaceId, projectId);
         const realPath = pathValue ? path.join(baseDir, pathValue, filename) : path.join(baseDir, filename);
         const uploadResult = await sandbox.file.uploadFile({
           file: buffer,
@@ -2648,7 +2827,7 @@ var WorkspaceController = class {
             error: `Upload error: ${JSON.stringify(uploadResult.error)}`
           });
         }
-        const relativePath = uploadResult.body?.data?.file_path?.replace(path.join("/home/gem/workspaces", workspaceId, projectId), "") || (pathValue ? `/${pathValue}/${filename}` : `/${filename}`);
+        const relativePath = uploadResult.body?.data?.file_path?.replace(path.join("/home/gem/tenants", tenantId, "workspaces", workspaceId, projectId), "") || (pathValue ? `/${pathValue}/${filename}` : `/${filename}`);
         const result2 = {
           path: relativePath,
           name: filename,
@@ -2658,7 +2837,7 @@ var WorkspaceController = class {
         };
         return reply.status(200).send({ success: true, data: result2 });
       }
-      const rootDir = `/lattice_store/workspaces/${workspaceId}/${projectId}`;
+      const rootDir = `/lattice_store/tenants/${tenantId}/workspaces/${workspaceId}/${projectId}`;
       const targetDir = pathValue ? path.join(rootDir, pathValue) : rootDir;
       const targetPath = path.join(targetDir, filename);
       await fs.mkdir(path.dirname(targetPath), { recursive: true });
@@ -2732,21 +2911,29 @@ function registerWorkspaceRoutes(app2) {
     "/api/workspaces/:workspaceId/projects/:projectId/downloadfile",
     controller.downloadFile.bind(controller)
   );
+  app2.get(
+    "/api/workspaces/:workspaceId/projects/:projectId/viewfile",
+    controller.viewFile.bind(controller)
+  );
 }
 
 // src/controllers/database-configs.ts
 import {
-  getStoreLattice as getStoreLattice6,
+  getStoreLattice as getStoreLattice5,
   sqlDatabaseManager
 } from "@axiom-lattice/core";
 import { randomUUID as randomUUID3 } from "crypto";
-function getTenantId(request) {
+function getTenantId5(request) {
+  const userTenantId = request.user?.tenantId;
+  if (userTenantId) {
+    return userTenantId;
+  }
   return request.headers["x-tenant-id"] || "default";
 }
 async function getDatabaseConfigList(request, reply) {
-  const tenantId = getTenantId(request);
+  const tenantId = getTenantId5(request);
   try {
-    const storeLattice = getStoreLattice6("default", "database");
+    const storeLattice = getStoreLattice5("default", "database");
     const store = storeLattice.store;
     const configs = await store.getAllConfigs(tenantId);
     console.log("Backend: getAllConfigs returned:", configs);
@@ -2774,10 +2961,10 @@ async function getDatabaseConfigList(request, reply) {
   }
 }
 async function getDatabaseConfig(request, reply) {
-  const tenantId = getTenantId(request);
+  const tenantId = getTenantId5(request);
   const { key } = request.params;
   try {
-    const storeLattice = getStoreLattice6("default", "database");
+    const storeLattice = getStoreLattice5("default", "database");
     const store = storeLattice.store;
     const config = await store.getConfigByKey(tenantId, key);
     if (!config) {
@@ -2800,10 +2987,10 @@ async function getDatabaseConfig(request, reply) {
   }
 }
 async function createDatabaseConfig(request, reply) {
-  const tenantId = getTenantId(request);
+  const tenantId = getTenantId5(request);
   const body = request.body;
   try {
-    const storeLattice = getStoreLattice6("default", "database");
+    const storeLattice = getStoreLattice5("default", "database");
     const store = storeLattice.store;
     const existing = await store.getConfigByKey(tenantId, body.key);
     if (existing) {
@@ -2816,7 +3003,7 @@ async function createDatabaseConfig(request, reply) {
     const id = body.id || randomUUID3();
     const config = await store.createConfig(tenantId, id, body);
     try {
-      sqlDatabaseManager.registerDatabase(config.key, config.config);
+      sqlDatabaseManager.registerDatabase(tenantId, config.key, config.config);
     } catch (error) {
       console.warn("Failed to auto-register database:", error);
     }
@@ -2835,11 +3022,11 @@ async function createDatabaseConfig(request, reply) {
   }
 }
 async function updateDatabaseConfig(request, reply) {
-  const tenantId = getTenantId(request);
+  const tenantId = getTenantId5(request);
   const { key } = request.params;
   const updates = request.body;
   try {
-    const storeLattice = getStoreLattice6("default", "database");
+    const storeLattice = getStoreLattice5("default", "database");
     const store = storeLattice.store;
     const existing = await store.getConfigByKey(tenantId, key);
     if (!existing) {
@@ -2858,7 +3045,7 @@ async function updateDatabaseConfig(request, reply) {
     }
     if (updates.config) {
       try {
-        sqlDatabaseManager.registerDatabase(updated.key, updated.config);
+        sqlDatabaseManager.registerDatabase(tenantId, updated.key, updated.config);
       } catch (error) {
         console.warn("Failed to re-register database:", error);
       }
@@ -2877,10 +3064,10 @@ async function updateDatabaseConfig(request, reply) {
   }
 }
 async function deleteDatabaseConfig(request, reply) {
-  const tenantId = getTenantId(request);
+  const tenantId = getTenantId5(request);
   const { keyOrId } = request.params;
   try {
-    const storeLattice = getStoreLattice6("default", "database");
+    const storeLattice = getStoreLattice5("default", "database");
     const store = storeLattice.store;
     console.log("Delete request - keyOrId:", keyOrId);
     let config = await store.getConfigByKey(tenantId, keyOrId);
@@ -2907,8 +3094,8 @@ async function deleteDatabaseConfig(request, reply) {
       };
     }
     try {
-      if (sqlDatabaseManager.hasDatabase(configKey)) {
-        await sqlDatabaseManager.removeDatabase(configKey);
+      if (sqlDatabaseManager.hasDatabase(tenantId, configKey)) {
+        await sqlDatabaseManager.removeDatabase(tenantId, configKey);
       }
     } catch (error) {
       console.warn("Failed to remove from SqlDatabaseManager:", error);
@@ -2926,10 +3113,10 @@ async function deleteDatabaseConfig(request, reply) {
   }
 }
 async function testDatabaseConnection(request, reply) {
-  const tenantId = getTenantId(request);
+  const tenantId = getTenantId5(request);
   const { key } = request.params;
   try {
-    const storeLattice = getStoreLattice6("default", "database");
+    const storeLattice = getStoreLattice5("default", "database");
     const store = storeLattice.store;
     const config = await store.getConfigByKey(tenantId, key);
     if (!config) {
@@ -2940,16 +3127,16 @@ async function testDatabaseConnection(request, reply) {
       };
     }
     const testKey = `__test_${key}_${Date.now()}`;
-    sqlDatabaseManager.registerDatabase(testKey, config.config);
+    sqlDatabaseManager.registerDatabase(tenantId, testKey, config.config);
     const startTime = Date.now();
-    const db = sqlDatabaseManager.getDatabase(testKey);
+    const db = sqlDatabaseManager.getDatabase(tenantId, testKey);
     try {
       await db.connect();
       await db.listTables();
       const latency = Date.now() - startTime;
       await new Promise((resolve) => setTimeout(resolve, 100));
       await db.disconnect();
-      await sqlDatabaseManager.removeDatabase(testKey);
+      await sqlDatabaseManager.removeDatabase(tenantId, testKey);
       return {
         success: true,
         message: "Connection test successful",
@@ -2961,7 +3148,7 @@ async function testDatabaseConnection(request, reply) {
     } catch (error) {
       try {
         await db.disconnect();
-        await sqlDatabaseManager.removeDatabase(testKey);
+        await sqlDatabaseManager.removeDatabase(tenantId, testKey);
       } catch {
       }
       return {
@@ -3014,18 +3201,22 @@ function registerDatabaseConfigRoutes(app2) {
 
 // src/controllers/metrics-configs.ts
 import {
-  getStoreLattice as getStoreLattice7,
+  getStoreLattice as getStoreLattice6,
   metricsServerManager,
   SemanticMetricsClient
 } from "@axiom-lattice/core";
 import { randomUUID as randomUUID4 } from "crypto";
-function getTenantId2(request) {
+function getTenantId6(request) {
+  const userTenantId = request.user?.tenantId;
+  if (userTenantId) {
+    return userTenantId;
+  }
   return request.headers["x-tenant-id"] || "default";
 }
 async function getMetricsServerConfigList(request, reply) {
-  const tenantId = getTenantId2(request);
+  const tenantId = getTenantId6(request);
   try {
-    const storeLattice = getStoreLattice7("default", "metrics");
+    const storeLattice = getStoreLattice6("default", "metrics");
     const store = storeLattice.store;
     const configs = await store.getAllConfigs(tenantId);
     return {
@@ -3049,10 +3240,10 @@ async function getMetricsServerConfigList(request, reply) {
   }
 }
 async function getMetricsServerConfig(request, reply) {
-  const tenantId = getTenantId2(request);
+  const tenantId = getTenantId6(request);
   const { key } = request.params;
   try {
-    const storeLattice = getStoreLattice7("default", "metrics");
+    const storeLattice = getStoreLattice6("default", "metrics");
     const store = storeLattice.store;
     const config = await store.getConfigByKey(tenantId, key);
     if (!config) {
@@ -3075,10 +3266,10 @@ async function getMetricsServerConfig(request, reply) {
   }
 }
 async function createMetricsServerConfig(request, reply) {
-  const tenantId = getTenantId2(request);
+  const tenantId = getTenantId6(request);
   const body = request.body;
   try {
-    const storeLattice = getStoreLattice7("default", "metrics");
+    const storeLattice = getStoreLattice6("default", "metrics");
     const store = storeLattice.store;
     const existing = await store.getConfigByKey(tenantId, body.key);
     if (existing) {
@@ -3107,7 +3298,7 @@ async function createMetricsServerConfig(request, reply) {
     };
     const config = await store.createConfig(tenantId, id, configData);
     try {
-      metricsServerManager.registerServer(config.key, config.config);
+      metricsServerManager.registerServer(tenantId, config.key, config.config);
     } catch (error) {
       console.warn("Failed to auto-register metrics server:", error);
     }
@@ -3126,11 +3317,11 @@ async function createMetricsServerConfig(request, reply) {
   }
 }
 async function updateMetricsServerConfig(request, reply) {
-  const tenantId = getTenantId2(request);
+  const tenantId = getTenantId6(request);
   const { key } = request.params;
   const updates = request.body;
   try {
-    const storeLattice = getStoreLattice7("default", "metrics");
+    const storeLattice = getStoreLattice6("default", "metrics");
     const store = storeLattice.store;
     const existing = await store.getConfigByKey(tenantId, key);
     if (!existing) {
@@ -3158,7 +3349,7 @@ async function updateMetricsServerConfig(request, reply) {
     }
     if (updates.config) {
       try {
-        metricsServerManager.registerServer(updated.key, updated.config);
+        metricsServerManager.registerServer(tenantId, updated.key, updated.config);
       } catch (error) {
         console.warn("Failed to re-register metrics server:", error);
       }
@@ -3177,10 +3368,10 @@ async function updateMetricsServerConfig(request, reply) {
   }
 }
 async function deleteMetricsServerConfig(request, reply) {
-  const tenantId = getTenantId2(request);
+  const tenantId = getTenantId6(request);
   const { keyOrId } = request.params;
   try {
-    const storeLattice = getStoreLattice7("default", "metrics");
+    const storeLattice = getStoreLattice6("default", "metrics");
     const store = storeLattice.store;
     let config = await store.getConfigByKey(tenantId, keyOrId);
     let configKey = keyOrId;
@@ -3205,8 +3396,8 @@ async function deleteMetricsServerConfig(request, reply) {
       };
     }
     try {
-      if (metricsServerManager.hasServer(configKey)) {
-        metricsServerManager.removeServer(configKey);
+      if (metricsServerManager.hasServer(tenantId, configKey)) {
+        metricsServerManager.removeServer(tenantId, configKey);
       }
     } catch (error) {
       console.warn("Failed to remove from MetricsServerManager:", error);
@@ -3224,10 +3415,10 @@ async function deleteMetricsServerConfig(request, reply) {
   }
 }
 async function testMetricsServerConnection(request, reply) {
-  const tenantId = getTenantId2(request);
+  const tenantId = getTenantId6(request);
   const { key } = request.params;
   try {
-    const storeLattice = getStoreLattice7("default", "metrics");
+    const storeLattice = getStoreLattice6("default", "metrics");
     const store = storeLattice.store;
     const config = await store.getConfigByKey(tenantId, key);
     if (!config) {
@@ -3238,11 +3429,11 @@ async function testMetricsServerConnection(request, reply) {
       };
     }
     const testKey = `__test_${key}_${Date.now()}`;
-    metricsServerManager.registerServer(testKey, config.config);
+    metricsServerManager.registerServer(tenantId, testKey, config.config);
     try {
-      const client = metricsServerManager.getClient(testKey);
+      const client = metricsServerManager.getClient(tenantId, testKey);
       const result = await client.testConnection();
-      metricsServerManager.removeServer(testKey);
+      metricsServerManager.removeServer(tenantId, testKey);
       return {
         success: true,
         message: result.connected ? "Connection test successful" : "Connection test failed",
@@ -3250,7 +3441,7 @@ async function testMetricsServerConnection(request, reply) {
       };
     } catch (error) {
       try {
-        metricsServerManager.removeServer(testKey);
+        metricsServerManager.removeServer(tenantId, testKey);
       } catch {
       }
       return {
@@ -3275,10 +3466,10 @@ async function testMetricsServerConnection(request, reply) {
   }
 }
 async function listAvailableMetrics(request, reply) {
-  const tenantId = getTenantId2(request);
+  const tenantId = getTenantId6(request);
   const { key } = request.params;
   try {
-    const storeLattice = getStoreLattice7("default", "metrics");
+    const storeLattice = getStoreLattice6("default", "metrics");
     const store = storeLattice.store;
     const config = await store.getConfigByKey(tenantId, key);
     if (!config) {
@@ -3288,10 +3479,10 @@ async function listAvailableMetrics(request, reply) {
         message: "Metrics server configuration not found"
       };
     }
-    if (!metricsServerManager.hasServer(key)) {
-      metricsServerManager.registerServer(key, config.config);
+    if (!metricsServerManager.hasServer(tenantId, key)) {
+      metricsServerManager.registerServer(tenantId, key, config.config);
     }
-    const client = metricsServerManager.getClient(key);
+    const client = metricsServerManager.getClient(tenantId, key);
     const metrics = await client.listMetrics();
     return {
       success: true,
@@ -3313,11 +3504,11 @@ async function listAvailableMetrics(request, reply) {
   }
 }
 async function queryMetricsData(request, reply) {
-  const tenantId = getTenantId2(request);
+  const tenantId = getTenantId6(request);
   const { key } = request.params;
   const { metricName, startTime, endTime, step, labels } = request.body;
   try {
-    const storeLattice = getStoreLattice7("default", "metrics");
+    const storeLattice = getStoreLattice6("default", "metrics");
     const store = storeLattice.store;
     const config = await store.getConfigByKey(tenantId, key);
     if (!config) {
@@ -3334,10 +3525,10 @@ async function queryMetricsData(request, reply) {
         message: "metricName is required"
       };
     }
-    if (!metricsServerManager.hasServer(key)) {
-      metricsServerManager.registerServer(key, config.config);
+    if (!metricsServerManager.hasServer(tenantId, key)) {
+      metricsServerManager.registerServer(tenantId, key, config.config);
     }
-    const client = metricsServerManager.getClient(key);
+    const client = metricsServerManager.getClient(tenantId, key);
     const result = await client.queryMetricData(metricName, {
       startTime,
       endTime,
@@ -3361,10 +3552,10 @@ async function queryMetricsData(request, reply) {
   }
 }
 async function getDataSources(request, reply) {
-  const tenantId = getTenantId2(request);
+  const tenantId = getTenantId6(request);
   const { key } = request.params;
   try {
-    const storeLattice = getStoreLattice7("default", "metrics");
+    const storeLattice = getStoreLattice6("default", "metrics");
     const store = storeLattice.store;
     const config = await store.getConfigByKey(tenantId, key);
     if (!config) {
@@ -3402,10 +3593,10 @@ async function getDataSources(request, reply) {
   }
 }
 async function getDatasourceMetrics(request, reply) {
-  const tenantId = getTenantId2(request);
+  const tenantId = getTenantId6(request);
   const { key, datasourceId } = request.params;
   try {
-    const storeLattice = getStoreLattice7("default", "metrics");
+    const storeLattice = getStoreLattice6("default", "metrics");
     const store = storeLattice.store;
     const config = await store.getConfigByKey(tenantId, key);
     if (!config) {
@@ -3439,11 +3630,11 @@ async function getDatasourceMetrics(request, reply) {
   }
 }
 async function querySemanticMetrics(request, reply) {
-  const tenantId = getTenantId2(request);
+  const tenantId = getTenantId6(request);
   const { key } = request.params;
   const body = request.body;
   try {
-    const storeLattice = getStoreLattice7("default", "metrics");
+    const storeLattice = getStoreLattice6("default", "metrics");
     const store = storeLattice.store;
     const config = await store.getConfigByKey(tenantId, key);
     if (!config) {
@@ -3470,14 +3661,32 @@ async function querySemanticMetrics(request, reply) {
     const semanticConfig = config.config;
     const client = new SemanticMetricsClient(semanticConfig);
     const result = await client.semanticQuery(body);
+    const allDataPoints = [];
+    const metricNames = [];
+    for (const metricResult of result.results) {
+      metricNames.push(metricResult.metricName);
+      for (const row of metricResult.rows) {
+        allDataPoints.push({
+          timestamp: row.timestamp ? new Date(row.timestamp).getTime() : void 0,
+          value: typeof row.value === "number" ? row.value : 0,
+          metricName: metricResult.metricName,
+          labels: Object.fromEntries(
+            Object.entries(row).filter(([k]) => k !== "value" && k !== "timestamp").map(([k, v]) => [k, String(v)])
+          )
+        });
+      }
+    }
     return {
       success: true,
       message: "Semantic query executed successfully",
       data: {
         datasourceId: result.datasourceId,
-        metrics: result.metrics,
-        dataPoints: result.dataPoints,
-        metadata: result.metadata
+        metrics: metricNames,
+        dataPoints: allDataPoints,
+        metadata: {
+          rowCount: allDataPoints.length,
+          queryTimeMs: result.totalExecutionTimeMs
+        }
       }
     };
   } catch (error) {
@@ -3575,18 +3784,22 @@ function registerMetricsServerConfigRoutes(app2) {
 
 // src/controllers/mcp-configs.ts
 import {
-  getStoreLattice as getStoreLattice8,
+  getStoreLattice as getStoreLattice7,
   mcpManager,
   toolLatticeManager as toolLatticeManager2
 } from "@axiom-lattice/core";
 import { randomUUID as randomUUID5 } from "crypto";
-function getTenantId3(request) {
+function getTenantId7(request) {
+  const userTenantId = request.user?.tenantId;
+  if (userTenantId) {
+    return userTenantId;
+  }
   return request.headers["x-tenant-id"] || "default";
 }
 async function getMcpServerConfigList(request, reply) {
-  const tenantId = getTenantId3(request);
+  const tenantId = getTenantId7(request);
   try {
-    const storeLattice = getStoreLattice8("default", "mcp");
+    const storeLattice = getStoreLattice7("default", "mcp");
     const store = storeLattice.store;
     const configs = await store.getAllConfigs(tenantId);
     return {
@@ -3610,10 +3823,10 @@ async function getMcpServerConfigList(request, reply) {
   }
 }
 async function getMcpServerConfig(request, reply) {
-  const tenantId = getTenantId3(request);
+  const tenantId = getTenantId7(request);
   const { key } = request.params;
   try {
-    const storeLattice = getStoreLattice8("default", "mcp");
+    const storeLattice = getStoreLattice7("default", "mcp");
     const store = storeLattice.store;
     const config = await store.getConfigByKey(tenantId, key);
     if (!config) {
@@ -3636,10 +3849,10 @@ async function getMcpServerConfig(request, reply) {
   }
 }
 async function createMcpServerConfig(request, reply) {
-  const tenantId = getTenantId3(request);
+  const tenantId = getTenantId7(request);
   const body = request.body;
   try {
-    const storeLattice = getStoreLattice8("default", "mcp");
+    const storeLattice = getStoreLattice7("default", "mcp");
     const store = storeLattice.store;
     const existing = await store.getConfigByKey(tenantId, body.key);
     if (existing) {
@@ -3675,11 +3888,11 @@ async function createMcpServerConfig(request, reply) {
   }
 }
 async function updateMcpServerConfig(request, reply) {
-  const tenantId = getTenantId3(request);
+  const tenantId = getTenantId7(request);
   const { key } = request.params;
   const updates = request.body;
   try {
-    const storeLattice = getStoreLattice8("default", "mcp");
+    const storeLattice = getStoreLattice7("default", "mcp");
     const store = storeLattice.store;
     const existing = await store.getConfigByKey(tenantId, key);
     if (!existing) {
@@ -3725,10 +3938,10 @@ async function updateMcpServerConfig(request, reply) {
   }
 }
 async function deleteMcpServerConfig(request, reply) {
-  const tenantId = getTenantId3(request);
+  const tenantId = getTenantId7(request);
   const { keyOrId } = request.params;
   try {
-    const storeLattice = getStoreLattice8("default", "mcp");
+    const storeLattice = getStoreLattice7("default", "mcp");
     const store = storeLattice.store;
     let config = await store.getConfigByKey(tenantId, keyOrId);
     let configKey = keyOrId;
@@ -3772,10 +3985,10 @@ async function deleteMcpServerConfig(request, reply) {
   }
 }
 async function testMcpServerConnection(request, reply) {
-  const tenantId = getTenantId3(request);
+  const tenantId = getTenantId7(request);
   const { key } = request.params;
   try {
-    const storeLattice = getStoreLattice8("default", "mcp");
+    const storeLattice = getStoreLattice7("default", "mcp");
     const store = storeLattice.store;
     const config = await store.getConfigByKey(tenantId, key);
     if (!config) {
@@ -3825,10 +4038,10 @@ async function testMcpServerConnection(request, reply) {
   }
 }
 async function listMcpServerTools(request, reply) {
-  const tenantId = getTenantId3(request);
+  const tenantId = getTenantId7(request);
   const { key } = request.params;
   try {
-    const storeLattice = getStoreLattice8("default", "mcp");
+    const storeLattice = getStoreLattice7("default", "mcp");
     const store = storeLattice.store;
     const config = await store.getConfigByKey(tenantId, key);
     if (!config) {
@@ -3858,10 +4071,10 @@ async function listMcpServerTools(request, reply) {
   }
 }
 async function connectMcpServer(request, reply) {
-  const tenantId = getTenantId3(request);
+  const tenantId = getTenantId7(request);
   const { key } = request.params;
   try {
-    const storeLattice = getStoreLattice8("default", "mcp");
+    const storeLattice = getStoreLattice7("default", "mcp");
     const store = storeLattice.store;
     const config = await store.getConfigByKey(tenantId, key);
     if (!config) {
@@ -3882,7 +4095,7 @@ async function connectMcpServer(request, reply) {
     };
   } catch (error) {
     console.error("Failed to connect MCP server:", error);
-    const storeLattice = getStoreLattice8("default", "mcp");
+    const storeLattice = getStoreLattice7("default", "mcp");
     const store = storeLattice.store;
     const config = await store.getConfigByKey(tenantId, key);
     if (config) {
@@ -3895,10 +4108,10 @@ async function connectMcpServer(request, reply) {
   }
 }
 async function disconnectMcpServer(request, reply) {
-  const tenantId = getTenantId3(request);
+  const tenantId = getTenantId7(request);
   const { key } = request.params;
   try {
-    const storeLattice = getStoreLattice8("default", "mcp");
+    const storeLattice = getStoreLattice7("default", "mcp");
     const store = storeLattice.store;
     const config = await store.getConfigByKey(tenantId, key);
     if (!config) {
@@ -4003,11 +4216,11 @@ function registerMcpServerConfigRoutes(app2) {
 }
 
 // src/controllers/users.ts
-import { getStoreLattice as getStoreLattice9 } from "@axiom-lattice/core";
+import { getStoreLattice as getStoreLattice8 } from "@axiom-lattice/core";
 import { v4 as uuidv42 } from "uuid";
 var UsersController = class {
   constructor() {
-    this.userStore = getStoreLattice9("default", "user").store;
+    this.userStore = getStoreLattice8("default", "user").store;
   }
   async listUsers(request, reply) {
     const { email } = request.query;
@@ -4085,11 +4298,11 @@ function registerUserRoutes(app2) {
 }
 
 // src/controllers/tenants.ts
-import { getStoreLattice as getStoreLattice10 } from "@axiom-lattice/core";
+import { getStoreLattice as getStoreLattice9 } from "@axiom-lattice/core";
 import { v4 as uuidv43 } from "uuid";
 var TenantsController = class {
   constructor() {
-    this.tenantStore = getStoreLattice10("default", "tenant").store;
+    this.tenantStore = getStoreLattice9("default", "tenant").store;
   }
   // ==================== Tenant CRUD ====================
   async listTenants(request, reply) {
@@ -4153,7 +4366,7 @@ function registerTenantRoutes(app2) {
 }
 
 // src/controllers/auth.ts
-import { getStoreLattice as getStoreLattice11 } from "@axiom-lattice/core";
+import { getStoreLattice as getStoreLattice10 } from "@axiom-lattice/core";
 import { v4 as uuidv44 } from "uuid";
 var defaultAuthConfig = {
   autoApproveUsers: true,
@@ -4162,9 +4375,9 @@ var defaultAuthConfig = {
 };
 var AuthController = class {
   constructor(config = {}) {
-    this.userStore = getStoreLattice11("default", "user").store;
-    this.tenantStore = getStoreLattice11("default", "tenant").store;
-    this.userTenantLinkStore = getStoreLattice11("default", "userTenantLink").store;
+    this.userStore = getStoreLattice10("default", "user").store;
+    this.tenantStore = getStoreLattice10("default", "tenant").store;
+    this.userTenantLinkStore = getStoreLattice10("default", "userTenantLink").store;
     this.config = { ...defaultAuthConfig, ...config };
   }
   async register(request, reply) {
@@ -4738,7 +4951,7 @@ var handleAgentTask = async (taskRequest, retryCount = 0) => {
         reader.releaseLock();
       }
       if (callback_event) {
-        const state = await agent_state({ assistant_id, thread_id });
+        const state = await agent_state({ assistant_id, thread_id, tenant_id });
         eventBus2.publish(callback_event, {
           success: true,
           state,
@@ -4752,7 +4965,7 @@ var handleAgentTask = async (taskRequest, retryCount = 0) => {
     } else {
       await response.text();
       if (callback_event) {
-        const state = await agent_state({ assistant_id, thread_id });
+        const state = await agent_state({ assistant_id, thread_id, tenant_id });
         eventBus2.publish(callback_event, {
           success: true,
           state,
@@ -4960,7 +5173,8 @@ var AgentTaskConsumer = _AgentTaskConsumer;
 import {
   registerLoggerLattice,
   getLoggerLattice,
-  loggerLatticeManager
+  loggerLatticeManager,
+  sandboxLatticeManager as sandboxLatticeManager2
 } from "@axiom-lattice/core";
 import {
   LoggerType
@@ -5072,6 +5286,13 @@ var start = async (config) => {
       logger = loggerLattice.client;
     }
     app.decorate("loggerLattice", loggerLattice);
+    if (!sandboxLatticeManager2.hasLattice("default")) {
+      const sandboxBaseURL = process.env.SANDBOX_BASE_URL || "http://localhost:8080";
+      sandboxLatticeManager2.registerLattice("default", {
+        baseURL: sandboxBaseURL
+      });
+      logger.info(`Registered sandbox manager with baseURL: ${sandboxBaseURL}`);
+    }
     const target_port = config?.port || Number(process.env.PORT) || 4001;
     await app.listen({ port: target_port, host: "0.0.0.0" });
     logger.info(`Lattice Gateway is running on port: ${target_port}`);