Merge pull request #15 from jaseci-labs/clean

SahanUday · web-flow · commit 5c9619a70375 · 2026-03-15T13:57:34.000+05:30
Clean
diff --git a/components/mcp/history_panel.cl.jac b/components/mcp/history_panel.cl.jac
@@ -5,7 +5,7 @@ cl import from ..ui.json_viewer { JsonViewer }
 cl import from ...store.mcp_store { useMcpStore }
 
 def HistoryEntry(props: Any) -> JsxElement {
-    `entry = props.entry;
+    hist_entry = props.entry;
 
     has expanded: bool = False;
 
@@ -21,21 +21,21 @@ def HistoryEntry(props: Any) -> JsxElement {
         "pending": "border-warning/10 hover:border-warning/20"
     };
 
-    entryStatus = `entry.status if `entry else "pending";
+    entryStatus = hist_entry.status if hist_entry else "pending";
     entryIcon = statusIcon.success if entryStatus == "success" else (statusIcon.error if entryStatus == "error" else statusIcon.pending);
     entryBgCls = statusBg.success if entryStatus == "success" else (statusBg.error if entryStatus == "error" else statusBg.pending);
     entryStatusCls = "text-success" if entryStatus == "success" else ("text-destructive" if entryStatus == "error" else "text-warning");
-    entryTimestamp = `entry.timestamp or "";
-    entryServerName = `entry.serverName or "";
-    entryDuration = `entry.durationMs;
+    entryTimestamp = hist_entry.timestamp or "";
+    entryServerName = hist_entry.serverName or "";
+    entryDuration = hist_entry.durationMs;
 
     return <div className={f"border rounded-lg overflow-hidden text-xs transition-colors {entryBgCls}"}>
         <button
             className="w-full flex items-center gap-2 px-3 py-2 bg-card/30 hover:bg-card/60 transition-colors text-left cursor-pointer"
             onClick={lambda -> None { expanded = not expanded; }}
         >
             {entryIcon}
-            <span className="flex-1 font-mono text-foreground/80 truncate">{`entry.method}</span>
+            <span className="flex-1 font-mono text-foreground/80 truncate">{hist_entry.method}</span>
             {entryDuration and <span className="flex items-center gap-0.5 text-muted-foreground/60"><Clock size={9}/>{entryDuration}ms</span>}
             {<ChevronDown size={11} className="text-muted-foreground/40 flex-shrink-0"/> if expanded else <ChevronRight size={11} className="text-muted-foreground/40 flex-shrink-0"/>}
         </button>
@@ -48,15 +48,15 @@ def HistoryEntry(props: Any) -> JsxElement {
 
             <div>
                 <p className="text-muted-foreground mb-1 font-medium text-xs">Request</p>
-                <JsonViewer data={`entry.request} maxHeight="150px"/>
+                <JsonViewer data={hist_entry.request} maxHeight="150px"/>
             </div>
 
-            {`entry.response and <div>
+            {hist_entry.response and <div>
                 <p className={f"mb-1 font-medium text-xs {entryStatusCls}"}>Response</p>
-                <JsonViewer data={`entry.response} maxHeight="200px"/>
+                <JsonViewer data={hist_entry.response} maxHeight="200px"/>
             </div>}
 
-            {`entry.status == "pending" and <p className="text-warning text-xs italic">Waiting for response...</p>}
+            {hist_entry.status == "pending" and <p className="text-warning text-xs italic">Waiting for response...</p>}
         </div>}
     </div>;
 }
@@ -107,8 +107,8 @@ def:pub HistoryPanel(props: Any) -> JsxElement {
                 <p className="text-xs font-medium text-muted-foreground/60">No logs yet</p>
                 <p className="text-xs text-muted-foreground/40">Requests will appear here</p>
             </div>}
-            {len(filtered) > 0 and filtered.map(lambda(`entry: Any) -> Any {
-                return <HistoryEntry key={`entry.id} entry={`entry}/>;
+            {len(filtered) > 0 and filtered.map(lambda(hist_entry: Any) -> Any {
+                return <HistoryEntry key={hist_entry.id} entry={hist_entry}/>;
             })}
         </div>
     </div>;
diff --git a/components/ui/primitives.cl.jac b/components/ui/primitives.cl.jac
@@ -155,29 +155,3 @@ def:pub Textarea(props: Any) -> JsxElement {
     </div>;
 }
 
-def:pub Panel(props: Any) -> JsxElement {
-    title = props.title;
-    children = props.children;
-    actions = props.actions;
-    extraClass = props.className or "";
-
-    return <div className={cn(["bg-card border border-border rounded-xl overflow-hidden", extraClass])}>
-        {title and <div className="flex items-center justify-between px-4 py-2.5 border-b border-border bg-muted/30">
-            <span className="text-sm font-semibold text-foreground">{title}</span>
-            {actions and <div className="flex items-center gap-2">{actions}</div>}
-        </div>}
-        <div className="p-4">{children}</div>
-    </div>;
-}
-
-def:pub Empty(props: Any) -> JsxElement {
-    icon = props.icon or "○";
-    message = props.message or "Nothing here";
-    sub = props.sub;
-
-    return <div className="flex flex-col items-center justify-center py-12 gap-2 text-muted-foreground">
-        <span className="text-3xl">{icon}</span>
-        <p className="text-sm font-medium">{message}</p>
-        {sub and <p className="text-xs text-muted-foreground/70">{sub}</p>}
-    </div>;
-}
diff --git a/components/ui/schema_form.cl.jac b/components/ui/schema_form.cl.jac
@@ -50,7 +50,8 @@ def RenderFieldForSchema(schema: Any, path: Any, value: Any, onChange: Any) -> A
         return <div className="pl-3 border-l border-border flex flex-col gap-3">
             {Object.keys(subProps).map(lambda(key: Any) -> Any {
                 subSchema = subProps[key] or {};
-                subValue = (value or {})[key];                    return <div key={key}>
+                subValue = (value or {})[key];
+                    return <div key={key}>
                     <label className="block text-xs font-medium text-muted-foreground mb-1">{key}</label>
                     <RenderFieldForSchema schema={subSchema} path={f"{path}.{key}"} value={subValue} onChange={onChange}/>
                 </div>;
@@ -168,9 +169,9 @@ def RenderFieldForSchema(schema: Any, path: Any, value: Any, onChange: Any) -> A
     />;
 }
 
-def setNestedValue(`obj: Any, path: Any, value: Any) -> Any {
+def setNestedValue(source: Any, path: Any, value: Any) -> Any {
     parts = path.split(".");
-    result = {**`obj};
+    result = {**source};
     current = result;
     i = 0;
     while i < len(parts) - 1 {
diff --git a/data/mcp_servers.cl.jac b/data/mcp_servers.cl.jac
@@ -1,6 +1,6 @@
 """Central MCP server registry – add new servers here."""
 
-def:pub getMcpServers -> Any {
+def:pub getMcpServers -> list {
     return [
         {
             "id": "jac-mcp",
diff --git a/hooks/useMcpClient.cl.jac b/hooks/useMcpClient.cl.jac
@@ -6,8 +6,9 @@ Routes all calls through the backend /api/mcp-proxy endpoint which handles CORS.
 cl import from ..store.mcp_store { useMcpStore }
 
 # Module-level session cache — updated synchronously, bypasses React state timing.
-# Keyed by connection ID, stores the mcp-session-id value.
-glob _sessions: Any = {};
+glob sessions: Any = {};
+
+glob MCP_PROXY_ENDPOINT: str = "/function/mcp_proxy";
 
 def buildRpcRequest(method: Any, params: Any = None) -> Any {
     req = {
@@ -48,7 +49,7 @@ def:pub useMcpClient -> Any {
             authHeaders = buildAuthHeaders(connection.auth);
 
             # Attach session ID from synchronous cache (not React state)
-            sid = _sessions[connection.id];
+            sid = sessions[connection.id];
             if sid {
                 authHeaders["mcp-session-id"] = sid;
             }
@@ -68,7 +69,7 @@ def:pub useMcpClient -> Any {
             addHistoryEntry(histEntry);
 
             try {
-                fetchResp = await fetch("/function/mcp_proxy", {
+                fetchResp = await fetch(MCP_PROXY_ENDPOINT, {
                     "method": "POST",
                     "headers": {"Content-Type": "application/json"},
                     "body": JSON.stringify({
@@ -102,7 +103,7 @@ def:pub useMcpClient -> Any {
 
                 # Save session ID synchronously in module-level cache
                 if resp.sessionId {
-                    _sessions[connection.id] = resp.sessionId;
+                    sessions[connection.id] = resp.sessionId;
                     updateConnection(connection.id, {"sessionId": resp.sessionId});
                 }
 
@@ -128,7 +129,7 @@ def:pub useMcpClient -> Any {
 
     async def initialize(connection: Any) -> Any {
         # Clear stale session synchronously before connecting
-        _sessions[connection.id] = None;
+        sessions[connection.id] = None;
         updateConnection(connection.id, {"status": "connecting", "sessionId": None});
 
         resp = await sendRpc(connection, "initialize", {
diff --git a/jac.toml b/jac.toml
@@ -28,8 +28,6 @@ jaclang = ">=0.12.0"
 [dependencies.npm]
 jac-client-node = "1.0.7"
 tailwindcss = "latest"
-zod = "^3.23.0"
-react-hook-form = "^7.53.0"
 "@uiw/react-json-view" = "^2.0.0-alpha.30"
 "@monaco-editor/react" = "^4.6.0"
 lucide-react = "^0.468.0"
diff --git a/pages/playground/[id].jac b/pages/playground/[id].jac
@@ -37,12 +37,7 @@ cl {
 
         setActiveConnection(connId);
 
-        connection = None;
-        for conn in connections {
-            if conn.id == connId {
-                connection = conn;
-            }
-        }
+        connection = connections.find(lambda(c: Any) -> Any { return c.id == connId; }) or None;
 
         if not connection {
             return <div className="flex flex-col items-center justify-center h-[calc(100vh-3.5rem)] gap-6 text-muted-foreground">
diff --git a/pages/playground/prompt/[name].jac b/pages/playground/prompt/[name].jac
@@ -23,25 +23,15 @@ cl {
         has argValues: Any = {};
         has copied: bool = False;
 
-        # Find active connection
-        activeConnection = None;
-        for conn in connections {
-            if conn.id == activeConnectionId {
-                activeConnection = conn;
-            }
-        }
+        activeConnection = connections.find(lambda(c: Any) -> Any { return c.id == activeConnectionId; }) or None;
 
         backPath = f"/playground/{activeConnectionId}" if activeConnectionId else "/playground";
 
-        # Find prompt
         prompt = selectedPrompt;
         if activeConnection and activeConnection.status == "connected" and activeConnection.capabilities {
             prompts = activeConnection.capabilities.prompts or [];
-            for p in prompts {
-                if p.name == promptName {
-                    prompt = p;
-                }
-            }
+            found = prompts.find(lambda(p: Any) -> Any { return p.name == promptName; });
+            if found { prompt = found; }
         }
 
         if not prompt {
diff --git a/pages/playground/resource/[uri].jac b/pages/playground/resource/[uri].jac
@@ -23,25 +23,15 @@ cl {
         has error: Any = None;
         has copied: bool = False;
 
-        # Find active connection
-        activeConnection = None;
-        for conn in connections {
-            if conn.id == activeConnectionId {
-                activeConnection = conn;
-            }
-        }
+        activeConnection = connections.find(lambda(c: Any) -> Any { return c.id == activeConnectionId; }) or None;
 
         backPath = f"/playground/{activeConnectionId}" if activeConnectionId else "/playground";
 
-        # Find resource
         resource = selectedResource;
         if activeConnection and activeConnection.status == "connected" and activeConnection.capabilities {
             resources = activeConnection.capabilities.resources or [];
-            for r in resources {
-                if r.uri == resourceUri {
-                    resource = r;
-                }
-            }
+            found = resources.find(lambda(r: Any) -> Any { return r.uri == resourceUri; });
+            if found { resource = found; }
         }
 
         if not resource {
diff --git a/pages/playground/tool/[name].jac b/pages/playground/tool/[name].jac
@@ -23,25 +23,15 @@ cl {
         has resultError: Any = None;
         has copied: bool = False;
 
-        # Find active connection
-        activeConnection = None;
-        for conn in connections {
-            if conn.id == activeConnectionId {
-                activeConnection = conn;
-            }
-        }
+        activeConnection = connections.find(lambda(c: Any) -> Any { return c.id == activeConnectionId; }) or None;
 
         backPath = f"/playground/{activeConnectionId}" if activeConnectionId else "/playground";
 
-        # Find tool from capabilities or store
         tool = selectedTool;
         if activeConnection and activeConnection.status == "connected" and activeConnection.capabilities {
             tools = activeConnection.capabilities.tools or [];
-            for t in tools {
-                if t.name == toolName {
-                    tool = t;
-                }
-            }
+            found = tools.find(lambda(t: Any) -> Any { return t.name == toolName; });
+            if found { tool = found; }
         }
 
         if not tool {
diff --git a/services/impl/mcp_server_launcher.impl.jac b/services/impl/mcp_server_launcher.impl.jac
@@ -34,7 +34,7 @@ impl _start_mcp_server() -> Any {
                     break;
                 }
             } except Exception {
-                0;
+                None;
             }
         }
 
diff --git a/store/mcp_store.cl.jac b/store/mcp_store.cl.jac
@@ -3,6 +3,7 @@
 cl import from "react" { createContext, useContext }
 
 glob McpCtx: Any = createContext(None);
+glob MAX_HISTORY: int = 200;
 
 def:pub McpProvider(props: Any) -> JsxElement {
     has connections: Any = [];
@@ -12,9 +13,7 @@ def:pub McpProvider(props: Any) -> JsxElement {
     has selectedTool: Any = None;
     has selectedPrompt: Any = None;
     has selectedResource: Any = None;
-    has logsPanelOpen: bool = True;
-    has sidebarOpen: bool = True;
-    has addModalOpen: bool = False;
+
 
     def addConnection(conn: Any) -> None {
         connections = lambda(prev: Any) -> Any { return prev.concat([conn]); };
@@ -34,8 +33,8 @@ def:pub McpProvider(props: Any) -> JsxElement {
             });
         };
     }
-    def addHistoryEntry(`entry: Any) -> None {
-        history = lambda(prev: Any) -> Any { return [`entry].concat(prev).slice(0, 200); };
+    def addHistoryEntry(hist_entry: Any) -> None {
+        history = lambda(prev: Any) -> Any { return [hist_entry].concat(prev).slice(0, MAX_HISTORY); };
     }
     def updateHistoryEntry(id: Any, patch: Any) -> None {
         history = lambda(prev: Any) -> Any {
@@ -46,10 +45,6 @@ def:pub McpProvider(props: Any) -> JsxElement {
         };
     }
     def clearHistory -> None { history = []; }
-    def toggleLogsPanel -> None { logsPanelOpen = lambda(prev: Any) -> Any { return not prev; }; }
-    def toggleSidebar -> None { sidebarOpen = lambda(prev: Any) -> Any { return not prev; }; }
-    def openAddModal -> None { addModalOpen = True; }
-    def closeAddModal -> None { addModalOpen = False; }
 
     store = {
         "connections": connections,
@@ -69,14 +64,7 @@ def:pub McpProvider(props: Any) -> JsxElement {
         "selectedPrompt": selectedPrompt,
         "setSelectedPrompt": lambda(p: Any) -> None { selectedPrompt = p; },
         "selectedResource": selectedResource,
-        "setSelectedResource": lambda(r: Any) -> None { selectedResource = r; },
-        "logsPanelOpen": logsPanelOpen,
-        "toggleLogsPanel": toggleLogsPanel,
-        "sidebarOpen": sidebarOpen,
-        "toggleSidebar": toggleSidebar,
-        "addModalOpen": addModalOpen,
-        "openAddModal": openAddModal,
-        "closeAddModal": closeAddModal
+        "setSelectedResource": lambda(r: Any) -> None { selectedResource = r; }
     };
 
     return <McpCtx.Provider value={store}>{props.children}</McpCtx.Provider>;
diff --git a/styles/globals.css b/styles/globals.css
@@ -159,12 +159,3 @@
 }
 .animate-float { animation: float 4s ease-in-out infinite; }
 
-@keyframes shimmer {
-    0% { background-position: -200% 0; }
-    100% { background-position: 200% 0; }
-}
-.animate-shimmer {
-    background: linear-gradient(90deg, transparent, color-mix(in oklch, var(--primary) 10%, transparent), transparent);
-    background-size: 200% 100%;
-    animation: shimmer 3s infinite;
-}

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`"""Central MCP server registry – add new servers here."""`
`2`	`2`
`3`		`-def:pub getMcpServers -> Any {`
	`3`	`+def:pub getMcpServers -> list {`
`4`	`4`	`return [`
`5`	`5`	`{`
`6`	`6`	`"id": "jac-mcp",`