Compare commits
15 Commits
v0.3.5-bet
...
v0.3.5-bet
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b85ebb8e54 | ||
|
|
7cc206dc20 | ||
|
|
bf8c0fd380 | ||
|
|
08dc1fd53b | ||
|
|
13e937a11b | ||
|
|
3cf701b002 | ||
|
|
3a09e0e0c2 | ||
|
|
47fa2e01bb | ||
|
|
401292ec5b | ||
|
|
199a7e409a | ||
|
|
c91931f42f | ||
|
|
cbbb224725 | ||
|
|
8d10d2182e | ||
|
|
e9696ef82b | ||
|
|
1edd4f053a |
@@ -92,6 +92,8 @@ export default function App() {
|
|||||||
{ keys: `${layout.keys.shift}+${layout.keys.enter}`, desc: t('statusbar.newLine') },
|
{ keys: `${layout.keys.shift}+${layout.keys.enter}`, desc: t('statusbar.newLine') },
|
||||||
],
|
],
|
||||||
shell: [
|
shell: [
|
||||||
|
{ keys: `${layout.keys.ctrl}+${layout.keys.shift}+C`, desc: t('statusbar.copy') },
|
||||||
|
{ keys: `${layout.keys.ctrl}+${layout.keys.shift}+V`, desc: t('statusbar.paste') },
|
||||||
{ keys: layout.keys.enter, desc: t('statusbar.runCommand') },
|
{ keys: layout.keys.enter, desc: t('statusbar.runCommand') },
|
||||||
{ keys: `${layout.keys.up}/${layout.keys.down}`, desc: t('statusbar.commandHistory') },
|
{ keys: `${layout.keys.up}/${layout.keys.down}`, desc: t('statusbar.commandHistory') },
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
import { useState, useEffect, useCallback } from 'react'
|
import { useState, useEffect, useCallback } from 'react'
|
||||||
import { User, Brain, RefreshCw, Wrench, Monitor, AlertTriangle, X } from 'lucide-react'
|
import { User, Brain, RefreshCw, Wrench, Monitor, AlertTriangle } from 'lucide-react'
|
||||||
import { useI18n } from '../i18n'
|
import { useI18n } from '../i18n'
|
||||||
|
|
||||||
const PANELS = [
|
const PANELS = [
|
||||||
@@ -311,16 +311,6 @@ function PanelProviders({ providers, editProvider, providerForm, setProviderForm
|
|||||||
const [validating, setValidating] = useState(null)
|
const [validating, setValidating] = useState(null)
|
||||||
const [keyStatus, setKeyStatus] = useState({})
|
const [keyStatus, setKeyStatus] = useState({})
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
providers.forEach(p => {
|
|
||||||
if (p.apiKey && !keyStatus[p.name]) {
|
|
||||||
validateKey(p)
|
|
||||||
} else if (!p.apiKey) {
|
|
||||||
setKeyStatus(prev => ({ ...prev, [p.name]: { valid: false, checked: true, error: 'Aucune clé' } }))
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}, [providers])
|
|
||||||
|
|
||||||
const validateKey = async (p) => {
|
const validateKey = async (p) => {
|
||||||
setValidating(p.name)
|
setValidating(p.name)
|
||||||
try {
|
try {
|
||||||
@@ -332,6 +322,16 @@ function PanelProviders({ providers, editProvider, providerForm, setProviderForm
|
|||||||
setValidating(null)
|
setValidating(null)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
providers.forEach(p => {
|
||||||
|
if (p.apiKey && !keyStatus[p.name]) {
|
||||||
|
validateKey(p)
|
||||||
|
} else if (!p.apiKey) {
|
||||||
|
setKeyStatus(prev => ({ ...prev, [p.name]: { valid: false, checked: true, error: 'Aucune clé' } }))
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}, [providers])
|
||||||
|
|
||||||
const handleValidate = async (name, apiKey, model, baseUrl) => {
|
const handleValidate = async (name, apiKey, model, baseUrl) => {
|
||||||
setValidating(name)
|
setValidating(name)
|
||||||
try {
|
try {
|
||||||
@@ -412,7 +412,7 @@ function PanelUpdates({ updates, tools, checking, updating, needsUpdateCount, in
|
|||||||
window.dispatchEvent(new CustomEvent('ask-ai-terminal', { detail: { message: `Installe l'outil ${tool} sur mon système. Vérifie d'abord s'il est déjà installé, puis installe-le si nécessaire avec les commandes appropriées.` } }))
|
window.dispatchEvent(new CustomEvent('ask-ai-terminal', { detail: { message: `Installe l'outil ${tool} sur mon système. Vérifie d'abord s'il est déjà installé, puis installe-le si nécessaire avec les commandes appropriées.` } }))
|
||||||
}
|
}
|
||||||
|
|
||||||
const missingTools = tools.filter(t => !t.installed)
|
const missingTools = tools.filter(tool => !tool.installed)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
|
|||||||
@@ -43,7 +43,7 @@ export default function Dashboard({ api, refreshRef }) {
|
|||||||
const [recentCmds, setRecentCmds] = useState([])
|
const [recentCmds, setRecentCmds] = useState([])
|
||||||
const [processes, setProcesses] = useState([])
|
const [processes, setProcesses] = useState([])
|
||||||
const [metrics, setMetrics] = useState(null)
|
const [metrics, setMetrics] = useState(null)
|
||||||
const [copiedIdx, setCopiedIdx] = useState(-1)
|
const [copiedSet, setCopiedSet] = useState(new Set())
|
||||||
const cpuRef = useRef([])
|
const cpuRef = useRef([])
|
||||||
const memRef = useRef([])
|
const memRef = useRef([])
|
||||||
const netRxRef = useRef([])
|
const netRxRef = useRef([])
|
||||||
@@ -109,6 +109,32 @@ export default function Dashboard({ api, refreshRef }) {
|
|||||||
.map(([cmd, count]) => ({ cmd, count }))
|
.map(([cmd, count]) => ({ cmd, count }))
|
||||||
})()
|
})()
|
||||||
|
|
||||||
|
const maxCount = topCmds.length > 0 ? topCmds[0].count : 1
|
||||||
|
|
||||||
|
const copyCmd = (cmd, key) => {
|
||||||
|
navigator.clipboard.writeText(cmd)
|
||||||
|
setCopiedSet(prev => new Set(prev).add(key))
|
||||||
|
setTimeout(() => setCopiedSet(prev => { const next = new Set(prev); next.delete(key); return next }), 1500)
|
||||||
|
}
|
||||||
|
|
||||||
|
const relativeTime = (ts) => {
|
||||||
|
if (!ts) return ''
|
||||||
|
const diff = Math.floor((Date.now() - new Date(ts).getTime()) / 1000)
|
||||||
|
if (diff < 60) return `${diff}s`
|
||||||
|
if (diff < 3600) return `${Math.floor(diff / 60)}m`
|
||||||
|
if (diff < 86400) return `${Math.floor(diff / 3600)}h`
|
||||||
|
return `${Math.floor(diff / 86400)}d`
|
||||||
|
}
|
||||||
|
|
||||||
|
const recentUnique = (() => {
|
||||||
|
const seen = new Set()
|
||||||
|
return recentCmds.filter(c => {
|
||||||
|
if (seen.has(c.cmd)) return false
|
||||||
|
seen.add(c.cmd)
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
})()
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="dash-grid">
|
<div className="dash-grid">
|
||||||
{/* CPU */}
|
{/* CPU */}
|
||||||
@@ -197,26 +223,34 @@ export default function Dashboard({ api, refreshRef }) {
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Recent Commands */}
|
{/* Recent Commands */}
|
||||||
<div className="dash-card">
|
<div className="dash-card dash-cmd-card">
|
||||||
<div className="dash-card-head">
|
<div className="dash-card-head">
|
||||||
<span className="dash-label">Recent Commands</span>
|
<span className="dash-label">Recent Commands</span>
|
||||||
|
<span className="dash-count">{recentUnique.length}</span>
|
||||||
</div>
|
</div>
|
||||||
{topCmds.length > 0 && (
|
{topCmds.length > 0 && (
|
||||||
<div className="dash-cmd-top">
|
<div className="dash-cmd-freq">
|
||||||
|
<span className="dash-cmd-freq-title">Most used</span>
|
||||||
{topCmds.map((c, i) => (
|
{topCmds.map((c, i) => (
|
||||||
<div key={i} className={'dash-cmd-chip' + (copiedIdx === i ? ' dash-cmd-chip-copied' : '')} onClick={() => { navigator.clipboard.writeText(c.cmd); setCopiedIdx(i); setTimeout(() => setCopiedIdx(-1), 1200); }}>
|
<div key={i} className="dash-cmd-freq-row" onClick={() => copyCmd(c.cmd, `top-${i}`)} title={c.cmd}>
|
||||||
<span className="dash-cmd-chip-name">{copiedIdx === i ? '✓ Copié' : c.cmd}</span>
|
<span className="dash-cmd-freq-name">{copiedSet.has(`top-${i}`) ? '✓ Copié' : c.cmd}</span>
|
||||||
<span className="dash-cmd-chip-count">{c.count}×</span>
|
<div className="dash-cmd-freq-bar-wrap">
|
||||||
|
<div className="dash-cmd-freq-bar" style={{ width: `${(c.count / maxCount) * 100}%` }} />
|
||||||
|
</div>
|
||||||
|
<span className="dash-cmd-freq-count">{c.count}×</span>
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
<div className="dash-cmd-list">
|
<div className="dash-cmd-list">
|
||||||
{recentCmds.length === 0 && <span className="dash-empty">No history</span>}
|
{recentUnique.length === 0 && <span className="dash-empty">No history</span>}
|
||||||
{recentCmds.map((c, i) => (
|
{recentUnique.map((c, i) => (
|
||||||
<div key={i} className="dash-cmd-row" title={c.cmd}>
|
<div key={i} className="dash-cmd-row" onClick={() => copyCmd(c.cmd, `list-${i}`)} title={c.cmd + ' · click to copy'}>
|
||||||
<span className="dash-cmd-shell">{c.shell}</span>
|
<div className="dash-cmd-left">
|
||||||
<span className="dash-cmd-text">{c.cmd.length > 45 ? c.cmd.slice(0, 42) + '...' : c.cmd}</span>
|
<span className="dash-cmd-text">{c.cmd.length > 38 ? c.cmd.slice(0, 35) + '...' : c.cmd}</span>
|
||||||
|
<span className="dash-cmd-time">{relativeTime(c.ts)}</span>
|
||||||
|
</div>
|
||||||
|
<span className="dash-cmd-copy">{copiedSet.has(`list-${i}`) ? '✓' : '⎘'}</span>
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -143,6 +143,32 @@ function createTerminal(container, settings = {}) {
|
|||||||
const webLinksAddon = new WebLinksAddon()
|
const webLinksAddon = new WebLinksAddon()
|
||||||
term.loadAddon(fitAddon)
|
term.loadAddon(fitAddon)
|
||||||
term.loadAddon(webLinksAddon)
|
term.loadAddon(webLinksAddon)
|
||||||
|
|
||||||
|
term.attachCustomKeyEventHandler((e) => {
|
||||||
|
if (e.type !== 'keydown') return true
|
||||||
|
const ctrl = e.ctrlKey || e.metaKey
|
||||||
|
const shift = e.shiftKey
|
||||||
|
|
||||||
|
if (ctrl && shift && e.key === 'C') {
|
||||||
|
e.preventDefault()
|
||||||
|
e.stopPropagation()
|
||||||
|
const selection = term.getSelection()
|
||||||
|
if (selection) navigator.clipboard.writeText(selection)
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
if (ctrl && shift && e.key === 'V') {
|
||||||
|
e.preventDefault()
|
||||||
|
e.stopPropagation()
|
||||||
|
navigator.clipboard.readText().then(text => {
|
||||||
|
if (text) term.paste(text)
|
||||||
|
}).catch(() => {})
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
|
||||||
term.open(container)
|
term.open(container)
|
||||||
fitAddon.fit()
|
fitAddon.fit()
|
||||||
|
|
||||||
@@ -204,6 +230,7 @@ export default function Shell({ api }) {
|
|||||||
const tabsRef = useRef({})
|
const tabsRef = useRef({})
|
||||||
const nextIdRef = useRef(1)
|
const nextIdRef = useRef(1)
|
||||||
const settingsRef = useRef({ fontSize: 12, fontFamily: "'JetBrains Mono', 'Fira Code', monospace", theme: 'default' })
|
const settingsRef = useRef({ fontSize: 12, fontFamily: "'JetBrains Mono', 'Fira Code', monospace", theme: 'default' })
|
||||||
|
const pendingCommandsRef = useRef({})
|
||||||
|
|
||||||
const savedTabs = (() => {
|
const savedTabs = (() => {
|
||||||
try {
|
try {
|
||||||
@@ -227,6 +254,8 @@ export default function Shell({ api }) {
|
|||||||
}
|
}
|
||||||
return 1
|
return 1
|
||||||
})
|
})
|
||||||
|
const activeTabRef = useRef(activeTab)
|
||||||
|
useEffect(() => { activeTabRef.current = activeTab }, [activeTab])
|
||||||
const [sshConnections, setSshConnections] = useState([])
|
const [sshConnections, setSshConnections] = useState([])
|
||||||
const [systemTerminals, setSystemTerminals] = useState([])
|
const [systemTerminals, setSystemTerminals] = useState([])
|
||||||
const [showMenu, setShowMenu] = useState(false)
|
const [showMenu, setShowMenu] = useState(false)
|
||||||
@@ -396,10 +425,7 @@ export default function Shell({ api }) {
|
|||||||
})
|
})
|
||||||
|
|
||||||
const onResize = () => {
|
const onResize = () => {
|
||||||
const el = document.getElementById(`terminal-${tabId}`)
|
fitAddon.fit()
|
||||||
if (el && el.offsetParent !== null) {
|
|
||||||
fitAddon.fit()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const resizeObserver = new ResizeObserver(onResize)
|
const resizeObserver = new ResizeObserver(onResize)
|
||||||
@@ -408,30 +434,68 @@ export default function Shell({ api }) {
|
|||||||
|
|
||||||
const bufferSaveInterval = setInterval(() => { if (!disposed) saveBuffer() }, 5000)
|
const bufferSaveInterval = setInterval(() => { if (!disposed) saveBuffer() }, 5000)
|
||||||
|
|
||||||
console.log(`[Shell] initTerminal tab=${tabId} type=${tab.type} container=${!!container}`)
|
console.log(`[Shell] initTerminal tab=${tabId} type=${tab.type} name="${tab.name}" shell="${tab.shell || '(default)'}"`)
|
||||||
tabsRef.current[tabId] = { term, fitAddon, ws, resizeObserver, onResize, bufferSaveInterval, saveBuffer, disposed: () => disposed }
|
tabsRef.current[tabId] = { term, fitAddon, ws, resizeObserver, onResize, bufferSaveInterval, saveBuffer, disposed: () => disposed }
|
||||||
const origDispose = () => { disposed = true }
|
tabsRef.current[tabId]._markDisposed = () => { disposed = true }
|
||||||
tabsRef.current[tabId]._markDisposed = origDispose
|
|
||||||
console.log(`[Shell] initTerminal tab=${tabId} done, tabsRef keys:`, Object.keys(tabsRef.current))
|
console.log(`[Shell] initTerminal tab=${tabId} done, tabsRef keys:`, Object.keys(tabsRef.current))
|
||||||
|
|
||||||
|
const pending = pendingCommandsRef.current[tabId]
|
||||||
|
if (pending && pending.length > 0) {
|
||||||
|
console.log(`[Shell] Flushing ${pending.length} pending commands for tab ${tabId}`)
|
||||||
|
for (const cmd of pending) {
|
||||||
|
if (ws.readyState === WebSocket.OPEN) {
|
||||||
|
ws.send(JSON.stringify({ type: 'input', data: cmd + '\r' }))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
delete pendingCommandsRef.current[tabId]
|
||||||
|
}
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
useEffect(() => {
|
const initPendingTabs = useCallback(() => {
|
||||||
const tab = tabs.find(t => t.id === activeTab)
|
for (const tab of tabsRef.current._tabList || []) {
|
||||||
if (!tab) return
|
if (!tabsRef.current[tab.id]) {
|
||||||
|
const container = document.getElementById(`terminal-${tab.id}`)
|
||||||
|
if (container && container.offsetHeight > 0) {
|
||||||
|
initTerminal(tab.id, tab)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
requestAnimationFrame(() => {
|
||||||
|
for (const tab of tabsRef.current._tabList || []) {
|
||||||
|
const entry = tabsRef.current[tab.id]
|
||||||
|
if (entry) entry.fitAddon.fit()
|
||||||
|
}
|
||||||
|
setTimeout(() => {
|
||||||
|
for (const tab of tabsRef.current._tabList || []) {
|
||||||
|
const entry = tabsRef.current[tab.id]
|
||||||
|
if (entry) entry.fitAddon.fit()
|
||||||
|
}
|
||||||
|
}, 150)
|
||||||
|
})
|
||||||
|
}, [initTerminal])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
tabsRef.current._tabList = tabs
|
||||||
|
}, [tabs])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
let cancelled = false
|
let cancelled = false
|
||||||
const pending = []
|
const pending = []
|
||||||
|
|
||||||
const tryInit = (attempt) => {
|
const tryInitTab = (tab, attempt) => {
|
||||||
if (cancelled || attempt > 20) return
|
if (cancelled) return
|
||||||
const shellCol = document.querySelector('.shell-terminal-col')
|
const shellCol = document.querySelector('.shell-terminal-col')
|
||||||
if (!shellCol || shellCol.offsetParent === null) {
|
if (!shellCol || shellCol.offsetParent === null) {
|
||||||
pending.push(setTimeout(() => tryInit(attempt + 1), 150))
|
pending.push(setTimeout(() => tryInitTab(tab, attempt + 1), 200))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
const container = document.getElementById(`terminal-${tab.id}`)
|
const container = document.getElementById(`terminal-${tab.id}`)
|
||||||
if (!container || container.offsetHeight === 0) {
|
if (!container) {
|
||||||
pending.push(setTimeout(() => tryInit(attempt + 1), 100))
|
pending.push(setTimeout(() => tryInitTab(tab, attempt + 1), 100))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (container.offsetHeight === 0) {
|
||||||
|
pending.push(setTimeout(() => tryInitTab(tab, attempt + 1), 100))
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (!tabsRef.current[tab.id]) {
|
if (!tabsRef.current[tab.id]) {
|
||||||
@@ -440,27 +504,52 @@ export default function Shell({ api }) {
|
|||||||
requestAnimationFrame(() => {
|
requestAnimationFrame(() => {
|
||||||
if (cancelled) return
|
if (cancelled) return
|
||||||
const entry = tabsRef.current[tab.id]
|
const entry = tabsRef.current[tab.id]
|
||||||
if (entry) entry.fitAddon.fit()
|
if (entry) {
|
||||||
|
entry.fitAddon.fit()
|
||||||
|
setTimeout(() => { if (!cancelled) entry.fitAddon.fit() }, 100)
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
if (!tabsRef.current[tab.id]) {
|
||||||
|
tryInitTab(tab, 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const wrapper = document.querySelector('.shell-layout')?.parentElement
|
||||||
|
let observer
|
||||||
|
if (wrapper) {
|
||||||
|
observer = new MutationObserver(() => {
|
||||||
|
if (!wrapper.classList.contains('tab-hidden') && wrapper.offsetParent !== null) {
|
||||||
|
initPendingTabs()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
observer.observe(wrapper, { attributes: true, attributeFilter: ['class'] })
|
||||||
}
|
}
|
||||||
|
|
||||||
tryInit(0)
|
|
||||||
return () => {
|
return () => {
|
||||||
cancelled = true
|
cancelled = true
|
||||||
pending.forEach(clearTimeout)
|
pending.forEach(clearTimeout)
|
||||||
|
observer?.disconnect()
|
||||||
}
|
}
|
||||||
}, [activeTab, tabs, initTerminal])
|
}, [tabs, initTerminal, initPendingTabs])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const entry = tabsRef.current[activeTab]
|
||||||
|
if (entry) {
|
||||||
|
requestAnimationFrame(() => {
|
||||||
|
if (activeTabRef.current === activeTab) {
|
||||||
|
entry.fitAddon.fit()
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}, [activeTab])
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const iv = setInterval(() => {
|
const iv = setInterval(() => {
|
||||||
for (const tab of tabs) {
|
const wrapper = document.querySelector('.shell-layout')?.parentElement
|
||||||
const entry = tabsRef.current[tab.id]
|
if (wrapper && wrapper.classList.contains('tab-hidden')) return
|
||||||
if (entry) {
|
const entry = tabsRef.current[activeTabRef.current]
|
||||||
const el = document.getElementById(`terminal-${tab.id}`)
|
if (entry) {
|
||||||
if (el && el.offsetParent !== null) {
|
entry.fitAddon.fit()
|
||||||
entry.fitAddon.fit()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}, 2000)
|
}, 2000)
|
||||||
return () => clearInterval(iv)
|
return () => clearInterval(iv)
|
||||||
@@ -600,24 +689,28 @@ export default function Shell({ api }) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const sendToTerminal = useCallback((code, tabId) => {
|
const sendToTerminal = useCallback((code, tabId) => {
|
||||||
const targetId = tabId || activeTab
|
const targetId = tabId || activeTabRef.current
|
||||||
const entry = tabsRef.current[targetId]
|
const entry = tabsRef.current[targetId]
|
||||||
if (!entry) {
|
if (!entry) {
|
||||||
console.warn(`[Shell] sendToTerminal: tab ${targetId} not in tabsRef. Available:`, Object.keys(tabsRef.current), 'activeTab:', activeTab, 'requested tabId:', tabId)
|
console.warn(`[Shell] sendToTerminal: tab ${targetId} not ready. Queueing. tabsRef:`, Object.keys(tabsRef.current), 'activeTab:', activeTabRef.current, 'requested:', tabId)
|
||||||
|
if (!pendingCommandsRef.current[targetId]) pendingCommandsRef.current[targetId] = []
|
||||||
|
pendingCommandsRef.current[targetId].push(code)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (!entry.ws || entry.ws.readyState !== WebSocket.OPEN) {
|
if (!entry.ws || entry.ws.readyState !== WebSocket.OPEN) {
|
||||||
console.warn(`[Shell] sendToTerminal: WebSocket not ready for tab ${targetId}, state:`, entry.ws?.readyState)
|
console.warn(`[Shell] sendToTerminal: WS not open for tab ${targetId} (state=${entry.ws?.readyState}). Queueing.`)
|
||||||
|
if (!pendingCommandsRef.current[targetId]) pendingCommandsRef.current[targetId] = []
|
||||||
|
pendingCommandsRef.current[targetId].push(code)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
console.log(`[Shell] sendToTerminal: sending code to tab ${targetId} (${code.length} chars)`)
|
console.log(`[Shell] sendToTerminal: tab ${targetId} ← ${code.length} chars`)
|
||||||
entry.ws.send(JSON.stringify({ type: 'input', data: code + '\r' }))
|
entry.ws.send(JSON.stringify({ type: 'input', data: code + '\r' }))
|
||||||
}, [activeTab])
|
}, [])
|
||||||
|
|
||||||
const focusAiTerminal = useCallback(() => {
|
const focusAiTerminal = useCallback(() => {
|
||||||
const entry = tabsRef.current[activeTab]
|
const entry = tabsRef.current[activeTabRef.current]
|
||||||
if (entry) entry.term.focus()
|
if (entry) entry.term.focus()
|
||||||
}, [activeTab])
|
}, [])
|
||||||
|
|
||||||
const _sendAiMessage = useCallback(async (text, fromEvent = false) => {
|
const _sendAiMessage = useCallback(async (text, fromEvent = false) => {
|
||||||
if (!text || !text.trim() || aiLoadingRef.current || aiAtLimit) return
|
if (!text || !text.trim() || aiLoadingRef.current || aiAtLimit) return
|
||||||
@@ -626,7 +719,7 @@ export default function Shell({ api }) {
|
|||||||
|
|
||||||
if (!fromEvent) {
|
if (!fromEvent) {
|
||||||
setAiInput('')
|
setAiInput('')
|
||||||
focusAiTerminal()
|
setTimeout(() => focusAiTerminal(), 0)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (trimmed === '/clear') {
|
if (trimmed === '/clear') {
|
||||||
@@ -649,7 +742,8 @@ export default function Shell({ api }) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
const currentTab = activeTab
|
const currentTab = activeTabRef.current
|
||||||
|
console.log(`[Shell] _sendAiMessage: activeTab=${currentTab}, fromEvent=${fromEvent}, text="${trimmed.slice(0, 50)}"`)
|
||||||
setAiMessages(prev => [...prev, { role: 'user', content: trimmed, _tabId: currentTab }])
|
setAiMessages(prev => [...prev, { role: 'user', content: trimmed, _tabId: currentTab }])
|
||||||
setAiLoading(true)
|
setAiLoading(true)
|
||||||
|
|
||||||
@@ -820,8 +914,7 @@ export default function Shell({ api }) {
|
|||||||
<div
|
<div
|
||||||
key={tab.id}
|
key={tab.id}
|
||||||
id={`terminal-${tab.id}`}
|
id={`terminal-${tab.id}`}
|
||||||
className="shell-xterm-instance"
|
className={`shell-xterm-instance${activeTab === tab.id ? ' active' : ''}`}
|
||||||
style={{ display: activeTab === tab.id ? 'block' : 'none' }}
|
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
@@ -870,7 +963,7 @@ export default function Shell({ api }) {
|
|||||||
<input
|
<input
|
||||||
value={aiInput}
|
value={aiInput}
|
||||||
onChange={e => setAiInput(e.target.value)}
|
onChange={e => setAiInput(e.target.value)}
|
||||||
onKeyDown={e => e.key === 'Enter' && handleAiSend()}
|
onKeyDown={e => { if (e.key === 'Enter') { e.preventDefault(); e.stopPropagation(); handleAiSend() } }}
|
||||||
placeholder={aiAtLimit ? '/clear pour continuer' : t('shell.askAi')}
|
placeholder={aiAtLimit ? '/clear pour continuer' : t('shell.askAi')}
|
||||||
disabled={aiAtLimit && aiInput !== '/clear'}
|
disabled={aiAtLimit && aiInput !== '/clear'}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -197,7 +197,7 @@ function FeedItem({ msg }) {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
const cleanContent = displayContent.replace(/<think[^>]*>[\s\S]*?<\/think>/gi, '')
|
let cleanContent = displayContent.replace(/<think[^>]*>[\s\S]*?<\/think>/gi, '')
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={`feed-item ${msg.role}`}>
|
<div className={`feed-item ${msg.role}`}>
|
||||||
@@ -532,6 +532,8 @@ export default function Studio({ api }) {
|
|||||||
if (event && event.tool_call) {
|
if (event && event.tool_call) {
|
||||||
toolCalls = [...toolCalls, { call: event.tool_call, result: null }]
|
toolCalls = [...toolCalls, { call: event.tool_call, result: null }]
|
||||||
setStreamToolCalls([...toolCalls])
|
setStreamToolCalls([...toolCalls])
|
||||||
|
accumulated = ''
|
||||||
|
setStreaming('')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (event && event.tool_result) {
|
if (event && event.tool_result) {
|
||||||
@@ -558,6 +560,11 @@ export default function Studio({ api }) {
|
|||||||
aiMsg.content = JSON.stringify({
|
aiMsg.content = JSON.stringify({
|
||||||
content: finalContent,
|
content: finalContent,
|
||||||
tool_calls: toolCalls.map(tc => tc.call),
|
tool_calls: toolCalls.map(tc => tc.call),
|
||||||
|
tool_results: toolCalls.map(tc => ({
|
||||||
|
tool_call_id: tc.call?.tool_call_id,
|
||||||
|
result: tc.result?.content || '',
|
||||||
|
is_error: tc.result?.is_error || false,
|
||||||
|
})),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
setMessages(prev => [...prev, aiMsg])
|
setMessages(prev => [...prev, aiMsg])
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ const en = {
|
|||||||
switchWindow: 'Switch window',
|
switchWindow: 'Switch window',
|
||||||
sendMessage: 'Send message',
|
sendMessage: 'Send message',
|
||||||
newLine: 'New line',
|
newLine: 'New line',
|
||||||
|
copy: 'Copy',
|
||||||
|
paste: 'Paste',
|
||||||
runCommand: 'Run command',
|
runCommand: 'Run command',
|
||||||
commandHistory: 'Command history',
|
commandHistory: 'Command history',
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -16,6 +16,8 @@ const fr = {
|
|||||||
switchWindow: 'Changer de fen\u00eatre',
|
switchWindow: 'Changer de fen\u00eatre',
|
||||||
sendMessage: 'Envoyer le message',
|
sendMessage: 'Envoyer le message',
|
||||||
newLine: 'Nouvelle ligne',
|
newLine: 'Nouvelle ligne',
|
||||||
|
copy: 'Copier',
|
||||||
|
paste: 'Coller',
|
||||||
runCommand: 'Ex\u00e9cuter',
|
runCommand: 'Ex\u00e9cuter',
|
||||||
commandHistory: 'Historique',
|
commandHistory: 'Historique',
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -276,8 +276,8 @@ input::placeholder { color: var(--text-disabled); }
|
|||||||
.sidebar-tab:hover { background: var(--bg-card); color: var(--text-primary); }
|
.sidebar-tab:hover { background: var(--bg-card); color: var(--text-primary); }
|
||||||
.sidebar-tab.active { background: var(--accent); color: #fff; font-weight: 600; }
|
.sidebar-tab.active { background: var(--accent); color: #fff; font-weight: 600; }
|
||||||
|
|
||||||
.shell-layout { display: flex; height: 100%; }
|
.shell-layout { display: flex; height: 100%; overflow: hidden; }
|
||||||
.shell-terminal-col { flex: 1; display: flex; flex-direction: column; min-width: 0; min-height: 0; overflow: hidden; }
|
.shell-terminal-col { flex: 1; display: flex; flex-direction: column; min-width: 0; overflow: hidden; }
|
||||||
|
|
||||||
.shell-tabs-bar {
|
.shell-tabs-bar {
|
||||||
display: flex; align-items: center; background: var(--bg-surface);
|
display: flex; align-items: center; background: var(--bg-surface);
|
||||||
@@ -382,12 +382,18 @@ input::placeholder { color: var(--text-disabled); }
|
|||||||
}
|
}
|
||||||
.shell-menu-divider { height: 1px; background: var(--border); margin: 4px 6px; }
|
.shell-menu-divider { height: 1px; background: var(--border); margin: 4px 6px; }
|
||||||
|
|
||||||
.shell-xterm-wrapper { flex: 1; background: var(--bg); overflow: hidden; position: relative; }
|
.shell-xterm-wrapper { flex: 1; min-height: 0; background: var(--bg); overflow: hidden; position: relative; }
|
||||||
.shell-xterm-instance {
|
.shell-xterm-instance {
|
||||||
position: absolute; inset: 0; padding: 4px;
|
position: absolute;
|
||||||
display: block !important;
|
inset: 0;
|
||||||
|
visibility: hidden;
|
||||||
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
.shell-xterm-instance .xterm { height: 100%; padding: 4px; }
|
.shell-xterm-instance.active {
|
||||||
|
visibility: visible;
|
||||||
|
pointer-events: auto;
|
||||||
|
}
|
||||||
|
.shell-xterm-instance .xterm { height: 100%; }
|
||||||
|
|
||||||
.connection-dot { width: 8px; height: 8px; border-radius: 50%; display: inline-block; flex-shrink: 0; }
|
.connection-dot { width: 8px; height: 8px; border-radius: 50%; display: inline-block; flex-shrink: 0; }
|
||||||
.connection-dot.on { background: var(--success); box-shadow: 0 0 6px var(--success); }
|
.connection-dot.on { background: var(--success); box-shadow: 0 0 6px var(--success); }
|
||||||
@@ -396,7 +402,7 @@ input::placeholder { color: var(--text-disabled); }
|
|||||||
.shell-tab.ai-tab .shell-tab-name { color: var(--accent); }
|
.shell-tab.ai-tab .shell-tab-name { color: var(--accent); }
|
||||||
.shell-tab.ai-tab { border-bottom-color: var(--accent); }
|
.shell-tab.ai-tab { border-bottom-color: var(--accent); }
|
||||||
|
|
||||||
.shell-ai-col { width: 320px; border-left: 1px solid var(--border); background: var(--bg-surface); display: flex; flex-direction: column; flex-shrink: 0; }
|
.shell-ai-col { width: 320px; max-width: 320px; border-left: 1px solid var(--border); background: var(--bg-surface); display: flex; flex-direction: column; flex-shrink: 0; overflow: hidden; }
|
||||||
.ai-panel-header { padding: 12px 16px; border-bottom: 1px solid var(--border); font-weight: 700; font-size: 13px; color: var(--accent); display: flex; align-items: center; justify-content: space-between; }
|
.ai-panel-header { padding: 12px 16px; border-bottom: 1px solid var(--border); font-weight: 700; font-size: 13px; color: var(--accent); display: flex; align-items: center; justify-content: space-between; }
|
||||||
.shell-analyze-btn {
|
.shell-analyze-btn {
|
||||||
display: flex; align-items: center; gap: 4px;
|
display: flex; align-items: center; gap: 4px;
|
||||||
@@ -691,34 +697,38 @@ input::placeholder { color: var(--text-disabled); }
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Commands */
|
/* Commands */
|
||||||
.dash-cmd-list { display: flex; flex-direction: column; gap: 3px; max-height: 270px; overflow-y: auto; }
|
.dash-cmd-card .dash-cmd-list { max-height: 220px; }
|
||||||
|
.dash-cmd-list { display: flex; flex-direction: column; gap: 2px; overflow-y: auto; }
|
||||||
.dash-cmd-row {
|
.dash-cmd-row {
|
||||||
display: flex; align-items: center; gap: 6px;
|
display: flex; align-items: center; justify-content: space-between; gap: 8px;
|
||||||
padding: 3px 0; overflow: hidden;
|
padding: 5px 8px; border-radius: var(--radius-sm);
|
||||||
}
|
background: var(--bg-surface); cursor: pointer;
|
||||||
.dash-cmd-shell {
|
transition: background 0.12s;
|
||||||
font-size: 9px; font-family: var(--font-mono); color: var(--text-disabled);
|
|
||||||
background: var(--bg-input); padding: 1px 4px; border-radius: 3px;
|
|
||||||
text-transform: uppercase; flex-shrink: 0;
|
|
||||||
}
|
}
|
||||||
|
.dash-cmd-row:hover { background: var(--accent-bg); }
|
||||||
|
.dash-cmd-left { display: flex; flex-direction: column; gap: 2px; flex: 1; min-width: 0; }
|
||||||
.dash-cmd-text {
|
.dash-cmd-text {
|
||||||
font-size: 11px; font-family: var(--font-mono); color: var(--text-secondary);
|
font-size: 11px; font-family: var(--font-mono); color: var(--text-primary);
|
||||||
white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
|
white-space: nowrap; overflow: hidden; text-overflow: ellipsis;
|
||||||
flex: 1; min-width: 0;
|
|
||||||
}
|
}
|
||||||
|
.dash-cmd-time { font-size: 9px; color: var(--text-disabled); }
|
||||||
|
.dash-cmd-copy { font-size: 13px; color: var(--text-disabled); flex-shrink: 0; }
|
||||||
|
.dash-cmd-row:hover .dash-cmd-copy { color: var(--accent); }
|
||||||
|
|
||||||
|
.dash-cmd-freq { display: flex; flex-direction: column; gap: 6px; margin-bottom: 10px; padding-bottom: 10px; border-bottom: 1px solid var(--border); }
|
||||||
|
.dash-cmd-freq-title { font-size: 10px; font-weight: 700; text-transform: uppercase; color: var(--text-disabled); letter-spacing: 0.05em; margin-bottom: 2px; }
|
||||||
|
.dash-cmd-freq-row {
|
||||||
|
display: flex; align-items: center; gap: 8px; cursor: pointer;
|
||||||
|
padding: 3px 4px; border-radius: var(--radius-sm);
|
||||||
|
transition: background 0.12s;
|
||||||
|
}
|
||||||
|
.dash-cmd-freq-row:hover { background: var(--accent-bg); }
|
||||||
|
.dash-cmd-freq-name { font-size: 12px; font-weight: 600; font-family: var(--font-mono); color: var(--text-primary); width: 100px; flex-shrink: 0; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
|
||||||
|
.dash-cmd-freq-bar-wrap { flex: 1; height: 6px; background: var(--bg-input); border-radius: 3px; overflow: hidden; }
|
||||||
|
.dash-cmd-freq-bar { height: 100%; background: var(--accent); border-radius: 3px; transition: width 0.3s ease; }
|
||||||
|
.dash-cmd-freq-count { font-size: 10px; font-family: var(--font-mono); color: var(--accent); width: 28px; text-align: right; flex-shrink: 0; }
|
||||||
|
|
||||||
.dash-cmd-top { display: flex; flex-wrap: wrap; gap: 6px; margin-bottom: 8px; }
|
.dash-cmd-top { display: flex; flex-wrap: wrap; gap: 6px; margin-bottom: 8px; }
|
||||||
.dash-cmd-chip {
|
|
||||||
display: flex; align-items: center; gap: 6px;
|
|
||||||
padding: 6px 12px; border-radius: var(--radius);
|
|
||||||
background: var(--bg-surface); border: 1px solid var(--border);
|
|
||||||
cursor: pointer; transition: all 0.15s;
|
|
||||||
}
|
|
||||||
.dash-cmd-chip:hover { border-color: var(--accent-dim); background: var(--accent-bg); }
|
|
||||||
.dash-cmd-chip-copied { border-color: var(--accent) !important; background: var(--accent-bg) !important; }
|
|
||||||
.dash-cmd-chip-copied .dash-cmd-chip-name { color: var(--accent); }
|
|
||||||
.dash-cmd-chip-name { font-size: 13px; font-weight: 700; font-family: var(--font-mono); color: var(--text-primary); }
|
|
||||||
.dash-cmd-chip-count { font-size: 10px; font-family: var(--font-mono); color: var(--accent); }
|
|
||||||
|
|
||||||
/* Services */
|
/* Services */
|
||||||
.dash-services { display: flex; flex-direction: column; gap: 6px; }
|
.dash-services { display: flex; flex-direction: column; gap: 6px; }
|
||||||
|
|||||||
Reference in New Issue
Block a user