@pheem49/mint 1.17.0 → 1.18.0

package/src/renderer/shared/utils/workspaceDrag.ts

@@ -1,8 +1,150 @@
 import { normalizeWorkspacePath } from './workspaces'
 
 export const WORKSPACE_FILE_MIME = 'application/x-mint-workspace-file'
+export const WORKSPACE_PATH_MIME = 'application/x-mint-workspace-path'
+export const WORKSPACE_IMAGE_MIME = 'application/x-mint-workspace-image'
+
 export interface WorkspaceFileDrag { root: string; path: string; kind: 'file' }
 
+const IMAGE_EXT_RE = /\.(png|jpe?g|gif|webp|ico|svg|bmp|avif)$/i
+
+export function isImageFileName(path: string): boolean {
+  return IMAGE_EXT_RE.test(path.trim())
+}
+
+/**
+ * Format a reference token suitable for dragging into chat or prompt input.
+ * Ensures the result starts with '@' and prefers a workspace-relative path or clean filename.
+ */
+export function formatWorkspaceReference(path: string, workspaceRoot?: string | null): string {
+  const clean = path.replace(/\\/g, '/').trim()
+  if (!clean) return ''
+  if (clean.startsWith('@')) return clean
+
+  if (workspaceRoot) {
+    const rootNorm = workspaceRoot.replace(/\\/g, '/').replace(/\/+$/, '')
+    if (clean === rootNorm || clean.startsWith(`${rootNorm}/`)) {
+      const rel = clean.slice(rootNorm.length + 1)
+      if (rel) return `@${rel}`
+    }
+  }
+
+  // Strip leading slash if workspace reference
+  const trimmed = clean.startsWith('/') ? clean.slice(1) : clean
+  return `@${trimmed}`
+}
+
+export interface SetWorkspaceDragDataOptions {
+  path: string
+  root?: string | null
+  kind?: 'file' | 'directory'
+  url?: string | null
+}
+
+/**
+ * Populate DataTransfer with standard Mint workspace file / reference drag data.
+ * Sets both the proprietary MIME types and text/plain fallback so drop targets
+ * (Chat composer, form, conversation panel) receive the expected @reference.
+ */
+export function setWorkspaceDragData(
+  dataTransfer: DataTransfer,
+  options: SetWorkspaceDragDataOptions
+): void {
+  const dragText = formatWorkspaceReference(options.path, options.root)
+  if (!dragText) return
+
+  dataTransfer.setData(WORKSPACE_PATH_MIME, dragText)
+  dataTransfer.setData('text/plain', dragText)
+
+  const isImg =
+    isImageFileName(options.path) ||
+    Boolean(options.url?.startsWith('data:image/') || options.url?.startsWith('blob:'))
+  if (isImg && options.kind !== 'directory') {
+    const fileName = options.path.split(/[\\/]/).pop() || options.path
+    try {
+      dataTransfer.setData(
+        WORKSPACE_IMAGE_MIME,
+        JSON.stringify({
+          path: options.path,
+          root: options.root || '',
+          url: options.url || '',
+          name: fileName,
+        })
+      )
+    } catch {
+      // ignore
+    }
+  }
+
+  if (options.kind !== 'directory' && options.path) {
+    const root = options.root ? normalizeWorkspacePath(options.root) : ''
+    const relativePath = dragText.startsWith('@') ? dragText.slice(1) : options.path
+    try {
+      dataTransfer.setData(
+        WORKSPACE_FILE_MIME,
+        JSON.stringify({ root, path: relativePath, kind: 'file' })
+      )
+    } catch {
+      // ignore
+    }
+  }
+
+  dataTransfer.effectAllowed = 'copy'
+}
+
+/**
+ * Resolves a dragged image reference (data URI, blob URL, web URL, or workspace path)
+ * into a base64 dataUri that can be directly attached to a multimodal prompt.
+ */
+export async function resolveImageToDataUri(
+  target: string,
+  root?: string | null,
+  platformReader?: (path: string, workspacePath: string) => Promise<string>
+): Promise<string> {
+  const clean = target.trim()
+  if (!clean) return ''
+
+  if (clean.startsWith('data:image/')) {
+    return clean
+  }
+
+  if (
+    clean.startsWith('blob:') ||
+    clean.startsWith('http://') ||
+    clean.startsWith('https://') ||
+    clean.startsWith('/api/') ||
+    (clean.startsWith('/') && IMAGE_EXT_RE.test(clean))
+  ) {
+    try {
+      const res = await fetch(clean)
+      if (res.ok) {
+        const blob = await res.blob()
+        return await new Promise<string>((resolve, reject) => {
+          const reader = new FileReader()
+          reader.onload = () => resolve(reader.result as string)
+          reader.onerror = reject
+          reader.readAsDataURL(blob)
+        })
+      }
+    } catch {
+      // fallback
+    }
+  }
+
+  if (platformReader) {
+    try {
+      const res = await platformReader(clean, root || '')
+      if (res && res.startsWith('data:image/')) return res
+    } catch {
+      // ignore
+    }
+  }
+
+  return ''
+}
+
+
+
 /** Only explicit Workspace file drags are accepted; text mentions and folders stay separate. */
 export function parseWorkspaceFileDrag(raw: string): WorkspaceFileDrag {
   let value: Partial<WorkspaceFileDrag>

package/src/renderer/shared/utils/workspaceMedia.ts

@@ -11,12 +11,20 @@ export function createWorkspaceMediaReader(environment: {
   createObjectURL?: (blob: Blob) => string
 }) {
   return async (path: string, workspacePath: string): Promise<WorkspaceMediaSource> => {
+    let cleanPath = path
+    if (workspacePath) {
+      const normWorkspace = workspacePath.replace(/\\/g, '/').replace(/\/+$/, '')
+      const normPath = cleanPath.replace(/\\/g, '/')
+      if (normPath.startsWith(normWorkspace + '/')) {
+        cleanPath = normPath.slice(normWorkspace.length + 1)
+      }
+    }
     if (environment.isNative()) {
       const { invoke } = await import('@tauri-apps/api/core')
-      const source = await invoke<{ path: string; mimeType: string; byteLength: number }>('prepare_workspace_media', { path, workspacePath })
+      const source = await invoke<{ path: string; mimeType: string; byteLength: number }>('prepare_workspace_media', { path: cleanPath, workspacePath })
       return { url: environment.convertFileSrc(source.path), mimeType: source.mimeType, byteLength: source.byteLength, range: true }
     }
-    const response = await environment.fetch(`${environment.apiBase()}/file/media?${new URLSearchParams({ path, workspace: workspacePath })}`)
+    const response = await environment.fetch(`${environment.apiBase()}/file/media?${new URLSearchParams({ path: cleanPath, workspace: workspacePath })}`)
     if (!response.ok) { const value = await response.json().catch(() => ({})); throw Error(value.error || 'Could not read workspace media') }
     const mimeType = response.headers.get('Content-Type')?.split(';')[0] || ''
     if (!/^(application\/pdf|audio\/[\w.+-]+|video\/[\w.+-]+)$/.test(mimeType)) { await response.body?.cancel(); throw Error('Unsupported media response') }

package/src/renderer/src/App.tsx

@@ -2,10 +2,9 @@ import React, { lazy, Suspense, useEffect, useState } from 'react'
 import AuthGate from '../shared/components/app/AuthGate'
 import ChunkErrorBoundary from '../shared/components/app/ChunkErrorBoundary'
 import ModalErrorBoundary from '../shared/components/app/ModalErrorBoundary'
+import { ErrorRecovery } from '../shared/components/ui/error-recovery'
 import { lazyWithRetry, scheduleIdlePreload } from '../shared/utils/lazyWithRetry'
 import { listen } from './tauri'
-import BrowserShell from './components/BrowserShell'
-import BrowserSuggestionsPopup from './components/BrowserSuggestionsPopup'
 
 const SettingsWindow = lazyWithRetry(() => import('./components/SettingsWindow'))
 const SpotlightWindow = lazy(() => import('./components/SpotlightWindow'))
@@ -22,8 +21,6 @@ function getCurrentRoute(): string {
 }
 
 export default function App() {
-  const isBrowserShell = typeof window !== 'undefined' && new URLSearchParams(window.location.search).get('mint-browser-shell') === '1'
-  const isBrowserSuggestions = typeof window !== 'undefined' && new URLSearchParams(window.location.search).get('mint-browser-suggestions') === '1'
   const [route, setRoute] = useState(getCurrentRoute)
 
   useEffect(() => {
@@ -65,10 +62,6 @@ export default function App() {
     return () => window.removeEventListener('vite:preloadError', handlePreloadError)
   }, [])
 
-  if (isBrowserShell) return <BrowserShell />
-  if (isBrowserSuggestions) return <BrowserSuggestionsPopup />
-
-
   // Auxiliary overlay windows (spotlight/widget/proactive-glow/screen-picker)
   // belong to an already-running, already-authenticated main session, so
   // they render without their own login gate.
@@ -108,6 +101,19 @@ export default function App() {
     )
   }
 
+  if (route.startsWith('/error-preview') || route.startsWith('/error-recovery')) {
+    return (
+      <div style={{ width: '100%', height: '100vh', display: 'flex', flexDirection: 'column', background: 'var(--bg-canvas, #09090b)' }}>
+        <ErrorRecovery
+          onBackToChat={() => {
+            window.location.hash = '#/'
+          }}
+          onRefresh={() => window.location.reload()}
+        />
+      </div>
+    )
+  }
+
   const content = route.startsWith('/settings') ? (
     <>
       <MintDashboard />

package/src/renderer/src/agentProgress.ts

@@ -5,6 +5,7 @@ export {
   thoughtsFrom,
   trimAgentProgress,
   hasAgentToolActivity,
+  hasAgentDrawerActivity,
   mergeActivitySnapshots,
   parseAgentActivity,
   parseFileChangesFromProgress,

package/src/renderer/src/components/ScreenPicker.css

@@ -197,7 +197,7 @@
   position: absolute;
   z-index: 1;
   outline: 2px solid var(--accent);
-  border-radius: 4px;
+  border-radius: var(--radius-2xs, 4px);
   box-shadow: 0 0 16px color-mix(in srgb, var(--accent) 38%, transparent);
   pointer-events: none;
 }

package/src/renderer/src/components/WorkspacePanel.tsx

@@ -7,7 +7,7 @@ import { detectArtifactType } from '@shared/utils/artifacts'
 import { workspacePlatform } from '@shared/platform'
 import { announceWorkspaceChange, useWorkspaceUndo } from '@shared/workspaceUndo'
 import { normalizeWorkspacePath } from '@shared/utils/workspaces'
-import { WORKSPACE_FILE_MIME } from '@shared/utils/workspaceDrag'
+import { WORKSPACE_FILE_MIME, setWorkspaceDragData } from '@shared/utils/workspaceDrag'
 import type { WorkspaceSnapshot, WorkspaceTreeEntry } from '@shared/types'
 import {
   materialFolderIcon,
@@ -79,10 +79,11 @@ function TreeNode({ workspacePath, entry, level, expanded, onToggle, onContextMe
         title={entry.path}
         draggable
         onDragStart={(event) => {
-          event.dataTransfer.setData('application/x-mint-workspace-path', dragText)
-          event.dataTransfer.setData('text/plain', dragText)
-          if (!isDirectory) event.dataTransfer.setData(WORKSPACE_FILE_MIME, JSON.stringify({ root: workspacePath, path: entry.path, kind: 'file' }))
-          event.dataTransfer.effectAllowed = 'copy'
+          setWorkspaceDragData(event.dataTransfer, {
+            path: entry.path,
+            root: workspacePath,
+            kind: isDirectory ? 'directory' : 'file',
+          })
         }}
       >
         <span

package/src/renderer/src/css/app-shell.css

@@ -828,7 +828,7 @@ h1 {
 .preview-split-resizer-grip {
   width: 4px;
   height: 28px;
-  border-radius: 2px;
+  border-radius: var(--radius-2xs, 4px);
   background: var(--border);
   position: relative;
   z-index: 1;
@@ -1286,7 +1286,7 @@ h1 {
   backdrop-filter: blur(14px);
   -webkit-backdrop-filter: blur(14px);
   border: 1px solid var(--border, rgba(255, 255, 255, 0.12));
-  border-radius: 12px;
+  border-radius: var(--radius-xl, 12px);
   padding: 10px 16px;
   display: flex;
   align-items: center;
@@ -1337,7 +1337,7 @@ h1 {
   color: var(--interactive-fg);
   border: 1px solid color-mix(in srgb, var(--accent) 35%, transparent);
   padding: 5px 12px;
-  border-radius: 6px;
+  border-radius: var(--radius-sm, 6px);
   font-size: 12px;
   font-weight: 600;
   cursor: pointer;
@@ -1362,7 +1362,7 @@ h1 {
   cursor: pointer;
   padding: 4px;
   font-size: 12px;
-  border-radius: 4px;
+  border-radius: var(--radius-xs, 4px);
   display: flex;
   align-items: center;
   justify-content: center;