Merge branch 'master' into fix-bottom-bar

Aniket-Engg · web-flow · commit a9b45cf6b0a0 · 2025-08-28T17:56:05.000+05:30
diff --git a/apps/learneth/src/pages/Home/index.tsx b/apps/learneth/src/pages/Home/index.tsx
@@ -51,6 +51,7 @@ function HomePage(): JSX.Element {
                       }}
                     >
                       {selectedRepo.entities[item.id].name}
+                      {selectedRepo.entities[item.id].metadata.data.error? <p className="text-danger">{selectedRepo.entities[item.id].metadata.data.error} in {selectedRepo.entities[item.id].metadata.file}</p> : null}
                     </span>
                     <Link onClick={() => (window as any)._paq.push(['trackEvent', 'learneth', 'start_workshop', selectedRepo.entities[item.id].name])} to={`/list?id=${item.id}`} className="text-decoration-none float-end">
                       <i className="fas fa-play-circle fa-lg" />
diff --git a/apps/learneth/src/redux/models/workshop.ts b/apps/learneth/src/redux/models/workshop.ts
@@ -51,7 +51,56 @@ const Model: ModelType = {
       const { list, detail } = yield select((state) => state.workshop)
 
       const url = `${apiUrl}/clone/${encodeURIComponent(payload.name)}/${payload.branch}?${Math.random()}`
-      const { data } = yield axios.get(url)
+
+      let data
+      try {
+        const response = yield axios.get(url)
+        data = response.data
+      } catch (error) {
+        console.error('Failed to load workshop:', error)
+
+        // Dismiss loading toast and show error
+        toast.dismiss()
+
+        // Extract detailed error message from response
+        let errorMessage = 'Failed to load workshop'
+        if (error.response?.data) {
+          // If the response contains plain text error details (like in the screenshot)
+          if (typeof error.response.data === 'string') {
+            errorMessage = error.response.data
+          }
+          // If the response has a structured error message
+          else if (error.response.data.message) {
+            errorMessage = error.response.data.message
+          }
+          // If the response has error details
+          else if (error.response.data.error) {
+            errorMessage = error.response.data.error
+          }
+        }
+        // Fallback to axios error message or generic error
+        else if (error.message) {
+          errorMessage = error.message
+        } else {
+          errorMessage = 'Network error occurred'
+        }
+
+        toast.error(errorMessage)
+
+        // Clean up loading state
+        yield put({
+          type: 'loading/save',
+          payload: {
+            screen: false,
+          },
+        })
+
+        // Track error event
+        ;(<any>window)._paq?.push(['trackEvent', 'learneth', 'load_repo_error', `${payload.name}/${payload.branch}`])
+
+        return // Exit early on error
+      }
+
       const repoId = `${payload.name}-${payload.branch}`
 
       for (let i = 0; i < data.ids.length; i++) {
diff --git a/apps/remix-ide-e2e/src/tests/circom.test.ts b/apps/remix-ide-e2e/src/tests/circom.test.ts
@@ -57,6 +57,7 @@ module.exports = {
       .click('[data-id="compute_witness_btn"]')
       .frameParent()
       .clickLaunchIcon('filePanel')
+      .pause(5000)
       .openFile('circuits/.bin/simple_js/simple.wtn')
       .waitForElementPresent('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wtn"]')
       .waitForElementVisible('[data-id="treeViewLitreeViewItemcircuits/.bin/simple_js/simple.wtn"]')
diff --git a/apps/remix-ide-e2e/src/tests/contract_flattener.test.ts b/apps/remix-ide-e2e/src/tests/contract_flattener.test.ts
@@ -19,6 +19,7 @@ module.exports = {
   },
   'Should not be able to flatten contract without imports': function (browser: NightwatchBrowser) {
     browser.waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
+      .openFile('contracts')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts/3_Ballot.sol"]')
       .pause(1000)
       .click('*[data-id="treeViewLitreeViewItemcontracts/3_Ballot.sol"]')
diff --git a/apps/remix-ide-e2e/src/tests/file_explorer_multiselect.test.ts b/apps/remix-ide-e2e/src/tests/file_explorer_multiselect.test.ts
@@ -11,7 +11,6 @@ module.exports = {
     const selectedElements = []
     browser
       .openFile('contracts')
-      .click('*[data-id="treeViewDivtreeViewItemcontracts"]')
       .click({ selector: '//*[@data-id="treeViewDivtreeViewItemcontracts/1_Storage.sol"]', locateStrategy: 'xpath' })
       .findElement({ selector: '//*[@data-id="treeViewDivtreeViewItemcontracts/2_Owner.sol"]', locateStrategy: 'xpath' }, (el) => {
         selectedElements.push(el)
diff --git a/apps/remix-ide-e2e/src/tests/pinned_contracts.test.ts b/apps/remix-ide-e2e/src/tests/pinned_contracts.test.ts
@@ -17,7 +17,7 @@ module.exports = {
     browser
       .clickLaunchIcon('filePanel')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
-      // .click('*[data-id="treeViewLitreeViewItemcontracts"]')
+      .click('*[data-id="treeViewLitreeViewItemcontracts"]')
       .click('*[data-id="treeViewLitreeViewItemcontracts/1_Storage.sol"]')
       .waitForElementVisible('*[data-id="compile-action"]')
       .pause(3000)
diff --git a/apps/remix-ide-e2e/src/tests/script-runner.test.ts b/apps/remix-ide-e2e/src/tests/script-runner.test.ts
@@ -20,6 +20,7 @@ const tests = {
     browser
       .waitForElementVisible('*[data-id="verticalIconsKindfilePanel"]')
       .click('*[data-id="verticalIconsKindfilePanel"]')
+      .openFile('scripts/deploy_with_ethers.ts')
       .waitForElementVisible('*[data-id="treeViewDivtreeViewItemscripts/deploy_with_ethers.ts"]')
       // .click('*[data-id="treeViewDivtreeViewItemscripts"]')
       // .pause(3000)
diff --git a/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts b/apps/remix-ide-e2e/src/tests/staticAnalysis.test.ts
@@ -35,6 +35,7 @@ module.exports = {
     browser
       .clickLaunchIcon('filePanel')
       .waitForElementVisible('*[data-id="treeViewLitreeViewItemcontracts"]')
+      .openFile('contracts')
       .click('*[data-id="treeViewLitreeViewItemcontracts/2_Owner.sol"]')
       .clickLaunchIcon('solidity')
       .click('*[id="compileBtn"]')
diff --git a/apps/remix-ide/src/app/components/bottom-bar.tsx b/apps/remix-ide/src/app/components/bottom-bar.tsx
@@ -67,7 +67,7 @@ export const BottomBar = ({ plugin }: BottomBarProps) => {
       await plugin.call('menuicons', 'select', 'remixaiassistant')
       await new Promise((resolve) => setTimeout(resolve, 500))
       const content = await plugin.call('fileManager', 'readFile', currentFilePath)
-      await plugin.call('remixAI', 'chatPipe', 'code_explaining', content)
+      await plugin.call('remixAI', 'chatPipe', 'code_explaining', content + "\n\nExplain briefly the snipped above!")
     } catch (err) {
       console.error('Explain failed:', err)
     }
diff --git a/apps/remix-ide/src/app/tabs/locales/en/editor.json b/apps/remix-ide/src/app/tabs/locales/en/editor.json
@@ -27,7 +27,7 @@
   "editor.explainFunction2": "Explain the function \"{name}\"",
   "editor.explainFunctionByAI": "```\n{content}\n```\nExplain the function {currentFunction}",
   "editor.explainFunctionByAISol": "```\n{content}\n```\nExplain the function {currentFunction}",
-  "editor.ExplainPipeMessage": "```\n {content}\n```\nExplain the snipped above",
+  "editor.ExplainPipeMessage": "```\n {content}\n```\nExplain briefly the snipped above",
   "editor.PastedCodeSafety": "```\n {content}\n```\n\nReply in a short manner: Does this code contain major security vulnerabilities leading to a scam or loss of funds?",
   "editor.executeFreeFunction": "Run a free function",
   "editor.executeFreeFunction2": "Run the free function \"{name}\"",
diff --git a/libs/remix-ai-core/src/helpers/streamHandler.ts b/libs/remix-ai-core/src/helpers/streamHandler.ts
@@ -139,23 +139,21 @@ export const HandleMistralAIResponse = async (streamResponse, cb: (streamText: s
     buffer = decoder.decode(value, { stream: true });
 
     const lines = buffer.split("\n");
-    buffer = lines.pop() ?? ""; // Keep the unfinished line for next chunk
     for (const line of lines) {
       if (line.startsWith("data: ")) {
         const jsonStr = line.replace(/^data: /, "").trim();
+        if (jsonStr === "[DONE]") {
+          done_cb?.(resultText, threadId);
+          return;
+        }
+
         try {
           const json = JSON.parse(jsonStr);
-          threadId = json?.conversation_id || threadId;
+          threadId = json?.id || threadId;
 
-          if (json.type === 'conversation.response.done') {
-            done_cb?.(resultText, threadId);
-            return;
-          }
-
-          if (typeof json.content === "string") {
-            cb(json.content);
-            resultText += json.content;
-          }
+          const content = json.choices[0].delta.content
+          cb(content);
+          resultText += content;
         } catch (e) {
           console.error("⚠️ MistralAI Stream parse error:", e);
         }
diff --git a/libs/remix-ai-core/src/inferencers/remote/remoteInference.ts b/libs/remix-ai-core/src/inferencers/remote/remoteInference.ts
@@ -131,7 +131,7 @@ export class RemoteInferencer implements ICompletions, IGeneration {
   }
 
   async answer(prompt, options:IParams=GenerationParams): Promise<any> {
-    options.chatHistory = options.provider === 'anthropic' ? buildChatPrompt(prompt) : []
+    options.chatHistory = options.provider === 'anthropic' || options.provider === 'mistralai' ? buildChatPrompt() : []
     const payload = { 'prompt': prompt, "endpoint":"answer", ...options }
     if (options.stream_result) return this._streamInferenceRequest(payload, AIRequestType.GENERAL)
     else return this._makeRequest(payload, AIRequestType.GENERAL)
diff --git a/libs/remix-ai-core/src/prompts/promptBuilder.ts b/libs/remix-ai-core/src/prompts/promptBuilder.ts
@@ -1,11 +1,10 @@
 import { ChatHistory } from "./chat"
 
-export const buildChatPrompt = (userPrompt) => {
+export const buildChatPrompt = () => {
   const history = []
   for (const [question, answer] of ChatHistory.getHistory()) {
     history.push({ role:'user', content: question })
     history.push({ role:'assistant' , content: answer })
   }
-  history.push({ role: 'user', content: userPrompt })
   return history
 }
diff --git a/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx b/libs/remix-ui/editor/src/lib/remix-ui-editor.tsx
@@ -839,7 +839,7 @@ export const EditorUI = (props: EditorUIProps) => {
         if (changes.some(change => change.text === inlineCompletionProvider.currentCompletion.item.insertText)) {
           inlineCompletionProvider.currentCompletion.onAccepted()
           inlineCompletionProvider.currentCompletion.accepted = true
-          _paq.push(['trackEvent', 'ai', 'remixAI', inlineCompletionProvider.currentCompletion.task + '_accepted'])
+          _paq.push(['trackEvent', 'ai', 'remixAI', 'Copilot_Completion_Accepted'])
         }
       }
     });
diff --git a/libs/remix-ui/top-bar/src/components/WorkspaceDropdown.tsx b/libs/remix-ui/top-bar/src/components/WorkspaceDropdown.tsx
@@ -121,7 +121,7 @@ export const WorkspacesDropdown: React.FC<WorkspacesDropdownProps> = ({ menuItem
     try {
       setTimeout(async () => {
         workspaces = await getWorkspaces()
-        const updated = workspaces.map((workspace) => {
+        const updated = (workspaces || []).map((workspace) => {
           (workspace as any).submenu = subItems
           return workspace as any
         })
diff --git a/libs/remix-ui/top-bar/src/context/topbarContext.tsx b/libs/remix-ui/top-bar/src/context/topbarContext.tsx
@@ -5,7 +5,6 @@ import { createContext, SyntheticEvent } from 'react'
 export const TopbarContext = createContext<{
   fs: any,
   plugin: Topbar,
-  modal:(title: string | JSX.Element, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
-  dispatchInitWorkspace:() => Promise<void>,
+  modal:(title: string | JSX.Element, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void
     }>(null)
 
diff --git a/libs/remix-ui/top-bar/src/context/topbarProvider.tsx b/libs/remix-ui/top-bar/src/context/topbarProvider.tsx
@@ -76,14 +76,6 @@ export const TopbarProvider = (props: TopbarProviderProps) => {
   const [focusToaster, setFocusToaster] = useState<string>('')
   const [toasters, setToasters] = useState<string[]>([])
 
-  const dispatchInitWorkspace = async () => {
-    await initWorkspace(plugin.filePanel)(fsDispatch)
-  }
-
-  useEffect(() => {
-    dispatchInitWorkspace()
-  }, [])
-
   useEffect(() => {
     if (modals.length > 0) {
       setFocusModal(() => {
@@ -159,7 +151,6 @@ export const TopbarProvider = (props: TopbarProviderProps) => {
     plugin: plugin as unknown as Topbar,
     modal,
     toast,
-    dispatchInitWorkspace,
   }
 
   return (
diff --git a/libs/remix-ui/workspace/src/lib/contexts/index.ts b/libs/remix-ui/workspace/src/lib/contexts/index.ts
@@ -9,7 +9,6 @@ export const FileSystemContext = createContext<{
   fs: any,
   plugin: any,
   modal:(title: string | JSX.Element, message: string | JSX.Element, okLabel: string, okFn: () => void, cancelLabel?: string, cancelFn?: () => void) => void,
-  dispatchInitWorkspace:() => Promise<void>,
   dispatchFetchDirectory:(path: string) => Promise<void>,
   dispatchAddInputField:(path: string, type: 'file' | 'folder') => Promise<void>,
   dispatchRemoveInputField:(path: string) => Promise<void>,

Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ function HomePage(): JSX.Element {`
`51`	`51`	`}}`
`52`	`52`	`>`
`53`	`53`	`{selectedRepo.entities[item.id].name}`
	`54`	`+ {selectedRepo.entities[item.id].metadata.data.error? <p className="text-danger">{selectedRepo.entities[item.id].metadata.data.error} in {selectedRepo.entities[item.id].metadata.file}</p> : null}`
`54`	`55`	`</span>`
`55`	`56`	<Link onClick={() => (window as any)._paq.push(['trackEvent', 'learneth', 'start_workshop', selectedRepo.entities[item.id].name])} to={`/list?id=${item.id}`} className="text-decoration-none float-end">
`56`	`57`	`<i className="fas fa-play-circle fa-lg" />`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ export const BottomBar = ({ plugin }: BottomBarProps) => {`
`67`	`67`	`await plugin.call('menuicons', 'select', 'remixaiassistant')`
`68`	`68`	`await new Promise((resolve) => setTimeout(resolve, 500))`
`69`	`69`	`const content = await plugin.call('fileManager', 'readFile', currentFilePath)`
`70`		`- await plugin.call('remixAI', 'chatPipe', 'code_explaining', content)`
	`70`	`+ await plugin.call('remixAI', 'chatPipe', 'code_explaining', content + "\n\nExplain briefly the snipped above!")`
`71`	`71`	`} catch (err) {`
`72`	`72`	`console.error('Explain failed:', err)`
`73`	`73`	`}`