dsh-coding-sidebar 1.0.7 → 1.0.8

package/src/client/TextEditor.tsx

@@ -26,6 +26,7 @@ import { languageForPath } from './lang.ts'
 import { cmSurfaceTheme, CmThemeCompartment } from './cm-themes.ts'
 import { isDarkScheme, subscribeColorScheme } from './theme.ts'
 import { appendToDraft } from './conversation-draft.ts'
+import { useSelectionPopup } from './selection-popup.ts'
 import { buildSelectionInsert } from './selection-payload.ts'
 import { t } from './locales.ts'
 import type { EditorToolbarControls, EditorToolbarState } from './service.ts'
@@ -50,13 +51,6 @@ export interface TextEditorProps {
   onToolbarControls?: (controls: EditorToolbarControls | null) => void
 }
 
-/** The floating "add to conversation" action: payload + viewport anchor. */
-interface SelectionPopup {
-  insert: string
-  left: number
-  top: number
-}
-
 export function TextEditor(props: TextEditorProps) {
   const { ctx, scope, path, content, truncated } = props
   const [dirty, setDirty] = useState(false)
@@ -68,34 +62,21 @@ export function TextEditor(props: TextEditorProps) {
   const themeCompRef = useRef<CmThemeCompartment | null>(null)
   /** The app's resolved color scheme; the editor re-themes in place on flips. */
   const [dark, setDark] = useState(() => isDarkScheme())
-  /** The floating "add to conversation" popup (viewport-anchored; null = hidden). */
-  const [popup, setPopup] = useState<SelectionPopup | null>(null)
-  /** Live mirror of the popup state for click-time reads (no re-render race). */
-  const popupRef = useRef<SelectionPopup | null>(null)
-
-  const hidePopup = (): void => {
-    popupRef.current = null
-    setPopup(null)
-  }
-
-  /** Anchor the popup above the selection center; clamp inside the viewport. */
-  const showPopup = (insert: string, left: number, top: number): void => {
-    const next: SelectionPopup = {
-      insert,
-      left: Math.min(Math.max(left, 80), window.innerWidth - 80),
-      top,
-    }
-    popupRef.current = next
-    setPopup(next)
-  }
-
-  /** The popup button's click: insert the stored payload into the draft. */
-  const commitPopup = (): void => {
-    const current = popupRef.current
-    if (current === null) return
-    appendToDraft(ctx, scope.sessionId, current.insert)
-    hidePopup()
-  }
+  /**
+   * The floating "add to conversation" popup (viewport-anchored; null =
+   * hidden). The hook owns show/hide/commit plus the global dismissal
+   * listeners (outside mousedown, Escape, hidden tab/window, and the editor
+   * surface leaving the viewport — the tab-switch/panel-collapse paths have
+   * no DOM events of their own) — see selection-popup.ts.
+   */
+  const selectionPopup = useSelectionPopup({
+    onCommit: (insert) => { appendToDraft(ctx, scope.sessionId, insert) },
+    // The surface that must stay on screen: the CodeMirror host. This
+    // component has no preview surface (file preview is retired); without
+    // the geometry signal a tab switch (display:none) or a panel collapse
+    // (translated off-screen) would leave the fixed portaled button behind.
+    getSurface: () => hostRef.current,
+  })
 
   useEffect(() => subscribeColorScheme(() => { setDark(isDarkScheme()) }), [])
 
@@ -103,7 +84,7 @@ export function TextEditor(props: TextEditorProps) {
   useEffect(() => {
     setDirty(false)
     setSaveState('idle')
-    hidePopup()
+    selectionPopup.hide()
   }, [content])
 
   // Create the CodeMirror editor once the content is loaded. The view owns
@@ -149,33 +130,33 @@ export function TextEditor(props: TextEditorProps) {
         // selection and hides it too.
         CodeMirrorView.updateListener.of((update) => {
           if (update.geometryChanged || update.viewportChanged) {
-            hidePopup()
+            selectionPopup.hide()
             return
           }
           if (!update.view.hasFocus) {
-            hidePopup()
+            selectionPopup.hide()
             return
           }
           if (!(update.selectionSet || update.docChanged || update.focusChanged)) return
           const sel = update.state.selection.main
           if (sel.empty) {
-            hidePopup()
+            selectionPopup.hide()
             return
           }
           const text = update.state.sliceDoc(sel.from, sel.to)
           if (text.trim() === '') {
-            hidePopup()
+            selectionPopup.hide()
             return
           }
           // Page coordinates (the document root may scroll); the popup is
           // position:fixed, so convert to viewport coordinates.
           const rect = update.view.coordsAtPos(sel.head)
           if (rect === null) {
-            hidePopup()
+            selectionPopup.hide()
             return
           }
           const doc = update.state.doc
-          showPopup(
+          selectionPopup.show(
             buildSelectionInsert(path, scope.cwd, {
               start: doc.lineAt(sel.from).number,
               end: doc.lineAt(sel.to).number,
@@ -272,15 +253,16 @@ export function TextEditor(props: TextEditorProps) {
           <div className={css.editorCm} ref={hostRef} />
         </>
       )}
-      {popup !== null && createPortal(
+      {selectionPopup.popup !== null && createPortal(
         <button
           type="button"
+          ref={selectionPopup.buttonRef}
           className={css.selectionPopup}
-          style={{ left: popup.left, top: popup.top }}
+          style={{ left: selectionPopup.popup.left, top: selectionPopup.popup.top }}
           // Keep the selection (and CodeMirror focus) alive until the click
           // commits — without this the popup unmounts before click lands.
           onMouseDown={(event) => { event.preventDefault() }}
-          onClick={commitPopup}
+          onClick={selectionPopup.commit}
         >
           {t('addToConversation')}
         </button>,

package/src/client/TreePanel.tsx

@@ -59,7 +59,7 @@ export function TreePanel(props: {
   openWithSsh?: boolean
   onOpenWith?: (targetId: string, path: string) => void
   onToggleOpenWithPin?: (targetId: string) => void
-  onReferenceFile: (path: string) => void
+  onReferenceFile: (path: string, isDir: boolean) => void
   /** Full-window presentation: the panel fills its host instead of docking
    *  at a fixed width. */
   full?: boolean
@@ -69,6 +69,21 @@ export function TreePanel(props: {
   const [results, setResults] = useState<{ matches: string[]; truncated: boolean } | null>(null)
   const [error, setError] = useState<string | null>(null)
   const [refreshTick, setRefreshTick] = useState(0)
+
+  // The tree caches loaded directories per refresh tick, so content changed
+  // outside DSH (another editor, a sync tool) stays stale until the manual
+  // refresh click. Re-focusing the window bumps the tick automatically, and
+  // integrations can force a refresh by dispatching a bubbling
+  // `dsh-sidebar:refresh-files` event on `window`.
+  useEffect(() => {
+    const bump = (): void => { setRefreshTick(tick => tick + 1) }
+    window.addEventListener('focus', bump)
+    window.addEventListener('dsh-sidebar:refresh-files', bump)
+    return () => {
+      window.removeEventListener('focus', bump)
+      window.removeEventListener('dsh-sidebar:refresh-files', bump)
+    }
+  }, [])
   /** One-line upload status under the search row ('' hides the hint). */
   const [uploadStatus, setUploadStatus] = useState('')
   /** Whether the status line is a failure/cancel (error color, stays visible). */

package/src/client/chunk-loader.ts

@@ -48,7 +48,7 @@
  * client.js); an edit that does land while a core HMR happens is caught by
  * the ETag comparison on the next activation.
  */
-export type ChunkName = 'terminal' | 'editor'
+export type ChunkName = 'terminal' | 'editor' | 'locale'
 
 /** The module exports a chunk factory provides (namespace-ish record). */
 export type ChunkExports = Record<string, unknown>

package/src/client/chunks/locale.tsx

@@ -0,0 +1,60 @@
+/**
+ * Lazy chunk entry: the 19 non-zh/en dictionaries (ja/de/fr/…/zh-HK/MO/TW —
+ * ~640KB of source). The sidebar's own `t()` only ever consults zh/en plus
+ * the better-locale override store, so these dicts are needed ONLY when
+ * @huanlin/dsh-plugin-better-locale is installed: they register into its
+ * override store from there (see the client apply's better-locale
+ * integration). Built as `lib/client-locale.js` and fetched from the
+ * plugin's /sidebar/bundle route on first need — never import this module
+ * from the core bundle: it would drag every language back into the startup
+ * path.
+ */
+import { ja } from '../locales-ja.ts'
+import { de } from '../locales-de.ts'
+import { fr } from '../locales-fr.ts'
+import { pt } from '../locales-pt.ts'
+import { ko } from '../locales-ko.ts'
+import { ar } from '../locales-ar.ts'
+import { hi } from '../locales-hi.ts'
+import { id } from '../locales-id.ts'
+import { tr } from '../locales-tr.ts'
+import { vi } from '../locales-vi.ts'
+import { th } from '../locales-th.ts'
+import { ru } from '../locales-ru.ts'
+import { it } from '../locales-it.ts'
+import { nl } from '../locales-nl.ts'
+import { sv } from '../locales-sv.ts'
+import { pl } from '../locales-pl.ts'
+import { zhHK } from '../locales-zh-HK.ts'
+import { zhTW } from '../locales-zh-TW.ts'
+import { zhMO } from '../locales-zh-MO.ts'
+import type { CopyKey } from '../locales.ts'
+
+/** Key-set check against zh (type-only import — erased before bundling, so
+ *  this adds no runtime tie to the core bundle): a dictionary missing or
+ *  adding a key fails the build instead of silently falling back to en. */
+const checked = (dict: Record<CopyKey, string>): Record<string, string> => dict
+
+/** Every non-zh/en dictionary keyed by its override id, ready for the
+ *  better-locale store's `register(ns, dicts)`. */
+export const localeDicts: Record<string, Record<string, string>> = {
+  ja: checked(ja),
+  de: checked(de),
+  fr: checked(fr),
+  pt: checked(pt),
+  ko: checked(ko),
+  ar: checked(ar),
+  hi: checked(hi),
+  id: checked(id),
+  tr: checked(tr),
+  vi: checked(vi),
+  th: checked(th),
+  ru: checked(ru),
+  it: checked(it),
+  nl: checked(nl),
+  sv: checked(sv),
+  pl: checked(pl),
+  'zh-HK': checked(zhHK),
+  'zh-TW': checked(zhTW),
+  'zh-MO': checked(zhMO),
+}

package/src/client/conversation-draft.ts

@@ -1,29 +1,255 @@
 /**
- * Append text to the current session's composer draft through the
+ * Insert text into the current session's composer draft through the
  * conversation service — the shared path behind the explorer's @-reference
  * button and the viewer selection popup. The service is resolved lazily
  * through `ctx.get` (the inject-free read the app's own plugins use); a
  * missing service or scope degrades to a logged no-op, never a crash.
+ *
+ * File references additionally use DSH's own structured insert event
+ * (`slash/input-insert-reference`, see `insertFileReference`) instead of
+ * plain draft text: the native `@file` picker emits this event, and the
+ * conversation input machine mints one occurrence whose chip covers the
+ * whole reference. Plain text `@folder/file.ts` only ever gets DSH's
+ * folder-ref decoration (`@folder/`) — the file name stays undecorated — so
+ * plain append is the fallback, not the primary path, for files.
+ *
+ * Insert position (upstream issue #425): the draft store only exposes the
+ * whole string (`getSnapshot().draft` + `setDraft(text)`) — there is no
+ * caret API on the conversation service. The composer's `<textarea>` keeps
+ * its last selection even while unfocused, so the live caret is probed from
+ * the DOM (guarded by a value-sync check), and the text is spliced at that
+ * position, replacing any live selection — with whitespace-aware joins, an
+ * insert into the middle of a sentence keeps single-space separation like
+ * the append path. An unknown/stale caret falls back to appending at the
+ * end (the pre-fix behavior).
+ *
+ * The caret is also *restored* after the insert: committing a programmatic
+ * draft change resets the controlled textarea's caret (observed landing at
+ * the start of the value), which would make every later insert probe the
+ * reset position and drift the stack (A|B + C + D ended up as |DACB). The
+ * placement (`placeComposerCaretAfterInsert`) puts the caret right after the
+ * inserted text once the value commit lands — the index accounts for the
+ * separating space on the left, so stacked inserts stay at their running
+ * position (A|B + C + D → ACD|B).
  */
 import type { Context, SidebarConversation } from '../context-types.ts'
 
+/** A resolved composer caret/selection in draft coordinates. */
+export interface DraftCaret {
+  start: number
+  end: number
+}
+
 /**
- * Append `text` to the session's composer draft (space-separated, like the
- * @-mentions). Returns false — and logs — when the conversation service or
- * the session scope is unavailable.
+ * The spliced draft plus the caret index (in that draft) right after the
+ * inserted text — the left-side separating space shifts the caret by one,
+ * which naive `start + text.length` misses (it would land before the tail).
+ */
+interface SpliceResult {
+  draft: string
+  caretAfter: number
+}
+
+/**
+ * Splice `text` into `draft` at `caret` (replacing any live selection) with
+ * whitespace-aware joins and report the caret position right after the
+ * inserted text. `caret === null` (position unknown) appends at the end,
+ * exactly like the original behavior.
+ */
+function spliceInsert(draft: string, text: string, caret: DraftCaret | null): SpliceResult {
+  if (caret === null || draft === '') {
+    const next = draft.trim() === '' ? text : `${draft} ${text}`
+    return { draft: next, caretAfter: next.length }
+  }
+  const prefix = draft.slice(0, caret.start)
+  const suffix = draft.slice(caret.end)
+  if (prefix === '' && suffix === '') return { draft: text, caretAfter: text.length }
+  // One separating space, but never doubled against adjacent whitespace
+  // (or the string edges) — mirrors how typing in the middle of a sentence
+  // behaves.
+  const left = prefix === '' || /\s$/.test(prefix) ? '' : ' '
+  const right = suffix === '' || /^\s/.test(suffix) ? '' : ' '
+  return {
+    draft: `${prefix}${left}${text}${right}${suffix}`,
+    caretAfter: prefix.length + left.length + text.length,
+  }
+}
+
+/**
+ * The spliced draft string (see {@link spliceInsert}); pure string math.
+ */
+export function insertAtCaret(draft: string, text: string, caret: DraftCaret | null): string {
+  return spliceInsert(draft, text, caret).draft
+}
+
+/**
+ * Locate the composer `<textarea>` in the conversation column: prefer the
+ * `data-phase`-tagged textarea (the composer's marker), falling back to any
+ * textarea in the column, then to a bare data-phase textarea (older host
+ * layouts without the column attribute). Null in jsdom-less hosts.
+ */
+function findComposerTextarea(): HTMLTextAreaElement | null {
+  if (typeof document === 'undefined') return null
+  const column = document.querySelector('#root [data-slot="conversation"]')
+  const find = (scope: ParentNode): HTMLTextAreaElement | null =>
+    scope.querySelector('textarea[data-phase]') ?? scope.querySelector('textarea')
+  return column !== null
+    ? find(column)
+    : document.querySelector<HTMLTextAreaElement>('textarea[data-phase]')
+}
+
+/**
+ * Resolve the composer's live caret from its DOM `<textarea>`. The draft
+ * store has no caret API, so the sidebar reads the composed input's selection
+ * directly; the value-sync check (`el.value === draft`) discards stale or
+ * wrong-composer reads — a caret must never be applied against a draft it
+ * was not measured on.
+ *
+ * Returns null when the composer is missing, disabled/read-only, out of
+ * sync with the store draft, or has no measurable selection (odd hosts
+ * report null selectionStart/End).
+ */
+export function probeComposerCaret(draft: string): DraftCaret | null {
+  const el = findComposerTextarea()
+  if (el === null || el.disabled || el.readOnly) return null
+  if (el.value !== draft) return null
+  let start = el.selectionStart
+  let end = el.selectionEnd
+  if (typeof start !== 'number' || typeof end !== 'number') return null
+  if (!Number.isFinite(start) || !Number.isFinite(end)) return null
+  start = Math.max(0, Math.min(start, draft.length))
+  end = Math.max(start, Math.min(end, draft.length))
+  return { start, end }
+}
+
+/**
+ * Restore the composer caret to `caretIndex` after a programmatic
+ * `setDraft` commit. A controlled textarea update resets the caret (React
+ * commits the value asynchronously and the browser moves the caret to the
+ * start/end), so the placement is scheduled and retried across at most two
+ * animation frames (setTimeout fallback), and only applied when the textarea
+ * still matches `expectedDraft` — a newer edit or a different composer wins
+ * the race untouched. The caret is clamped into the value bounds, mirroring
+ * how browsers clamp type-in positions.
+ */
+export function placeComposerCaretAfterInsert(expectedDraft: string, caretIndex: number): void {
+  let remaining = 2
+  let scheduled = false
+  const schedule = (fn: () => void): void => {
+    if (scheduled) return
+    scheduled = true
+    if (typeof requestAnimationFrame === 'function') requestAnimationFrame(fn)
+    else setTimeout(fn, 0)
+  }
+  const place = (): void => {
+    scheduled = false
+    if (remaining <= 0) return
+    remaining -= 1
+    const el = findComposerTextarea()
+    if (el === null || el.disabled || el.readOnly) return
+    if (el.value !== expectedDraft) {
+      // The commit has not landed yet (or a competing edit won) — one more
+      // frame before giving up.
+      schedule(place)
+      return
+    }
+    const clamped = Math.max(0, Math.min(caretIndex, el.value.length))
+    el.setSelectionRange(clamped, clamped)
+  }
+  schedule(place)
+}
+
+/**
+ * Insert `text` into the session's composer draft at the composer's live
+ * caret (see {@link probeComposerCaret}), falling back to appending at the
+ * end when the caret cannot be resolved. Returns false — and logs — when the
+ * conversation service or the session scope is unavailable.
  */
 export function appendToDraft(ctx: Context, sessionId: string, text: string): boolean {
   try {
     const actx = ctx.sessions.scope(sessionId)
-    if (actx === undefined) return false
+    if (actx === undefined) {
+      console.warn('[dsh-coding-sidebar] draft insert skipped: no session scope', sessionId)
+      return false
+    }
     const conversation = ctx.get('conversation') as SidebarConversation | undefined
-    if (conversation === undefined) return false
+    if (conversation === undefined) {
+      console.warn('[dsh-coding-sidebar] draft insert skipped: conversation service unavailable')
+      return false
+    }
     const input = conversation.input.for(actx)
     const draft = input.state.getSnapshot().draft
-    input.setDraft(draft.trim() === '' ? text : `${draft} ${text}`)
+    const caret = probeComposerCaret(draft)
+    const { draft: next, caretAfter } = spliceInsert(draft, text, caret)
+    input.setDraft(next)
+    // Put the caret right after the inserted text once the value commit
+    // lands — see the module doc for why this keeps stacked inserts at the
+    // running position.
+    placeComposerCaretAfterInsert(next, caretAfter)
     return true
   } catch (error) {
     console.warn('[dsh-coding-sidebar] draft insert failed:', error)
     return false
   }
 }
+
+/**
+ * The DSH `@file` spelling for one relative path, mirroring the host grammar
+ * (`formatFileMention` in `@deepseek-ai/dsh-file-reference`): plain when
+ * there is no whitespace, quoted when there is, and `undefined` when the
+ * path contains a control character or an embedded quote the editor grammar
+ * cannot represent.
+ */
+export function fileMention(relativePath: string): { mention: string; label: string } | undefined {
+  const path = relativePath.replace(/[\\/]+$/, '')
+  // eslint-disable-next-line no-control-regex -- rejecting control characters is the point of this guard
+  if (/[\u0000-\u001f\u007f-\u009f"]/u.test(path)) return undefined
+  const mention = /\s/u.test(path) ? `@"${path}"` : `@${path}`
+  const at = Math.max(path.lastIndexOf('/'), path.lastIndexOf('\\'))
+  const label = at === -1 ? path : path.slice(at + 1)
+  return { mention, label }
+}
+
+/**
+ * Insert one FILE reference as a structured chip (like DSH's own `@` picker).
+ * The chip displays `@<basename>` but serializes to `@<relative path>` on
+ * send, so the reference stays a single link from trigger to basename.
+ *
+ * Directories are NOT handled here: DSH's folder grammar wants the trailing
+ * slash as plain text (`@dir/`) so completion can descend, which
+ * `appendToDraft` already covers.
+ */
+export function insertFileReference(ctx: Context, sessionId: string, relativePath: string): boolean {
+  const reference = fileMention(relativePath)
+  if (reference === undefined) return false
+  try {
+    const actx = ctx.sessions.scope(sessionId)
+    if (actx === undefined) return false
+    const conversation = ctx.get('conversation') as SidebarConversation | undefined
+    if (conversation === undefined) return false
+    const input = conversation.input.for(actx)
+    const before = input.state.getSnapshot()
+    if (before.draftRev === undefined) return false
+    // The session-scope Context's typed `emit` is keyed to DSH's closed event
+    // map; this internal composer event is deliberately string-loose at runtime.
+    ;(actx as unknown as { emit(name: string, payload: unknown): void }).emit('slash/input-insert-reference', {
+      reference: {
+        source: 'reference',
+        ref: reference.mention,
+        label: reference.label,
+        appearance: 'file',
+        clipboardText: reference.mention,
+      },
+      span: {
+        draftRev: before.draftRev,
+        start: before.draft.length,
+        end: before.draft.length,
+      },
+    })
+    const after = input.state.getSnapshot()
+    return after.draftRev !== before.draftRev
+  } catch (error) {
+    console.warn('[dsh-coding-sidebar] file-reference insert failed:', error)
+    return false
+  }
+}

package/src/client/index.tsx

@@ -25,10 +25,8 @@ import { registerSettingsNavIcon } from './settings-nav-icon.ts'
 import { loadExternalDisable, loadPrefs } from './prefs.ts'
 import { SideCardSection } from './SideCardSection.tsx'
 import { api } from './api.ts'
-import { LOCALE_NS, attachLocale, attachBetterLocale, t, zh, en,
-  ja, de, fr, pt, ko, ar, hi, id, tr, vi, th, ru, it, nl, sv, pl,
-  zhHK, zhTW, zhMO,
-} from './locales.ts'
+import { LOCALE_NS, attachLocale, attachBetterLocale, t, zh, en } from './locales.ts'
+import { loadChunk } from './chunk-loader.ts'
 import css from './sidebar.module.css'
 import './layout.css'
 
@@ -87,7 +85,12 @@ export function apply(ctx: Context): void {
   // the ja dict once the store becomes available.
   ctx.effect(() => {
     let dispose: (() => void) | undefined
+    // Guards the async chunk registration below: a sync() re-run (or fiber
+    // disposal) that lands while the chunk is still in flight must render
+    // that registration moot.
+    let generation = 0
     const sync = (): void => {
+      generation += 1
       dispose?.()
       dispose = undefined
       const store = ctx.get('betterLocale') as
@@ -101,10 +104,17 @@ export function apply(ctx: Context): void {
         | undefined
       attachBetterLocale(store)
       if (store !== undefined) {
-        dispose = store.register(LOCALE_NS, {
-          ja, de, fr, pt, ko, ar, hi, id, tr, vi, th, ru, it, nl, sv, pl,
-          'zh-HK': zhHK, 'zh-TW': zhTW, 'zh-MO': zhMO,
-        })
+        // The 19 override dictionaries ride the lazy `locale` chunk: until
+        // it lands, the store has no betterSidebar entries and t() keeps
+        // the zh/en chain; the store's own revision bump on register
+        // re-renders the chrome once the dicts arrive.
+        const myGeneration = generation
+        void loadChunk('locale')
+          .then(mod => {
+            if (myGeneration !== generation) return
+            dispose = store.register(LOCALE_NS, mod.localeDicts as Record<string, Record<string, string>>)
+          })
+          .catch(() => { /* the dicts stay unregistered; the zh/en chain runs */ })
       }
     }
     // Initial check (picks up the store if better-locale activated first).
@@ -113,6 +123,7 @@ export function apply(ctx: Context): void {
     // activates with a persisted override, and when the user switches).
     const unsubscribe = ctx.locale.subscribe(sync)
     return () => {
+      generation += 1
       unsubscribe()
       dispose?.()
       attachBetterLocale(undefined)

package/src/client/locales-ar.ts

@@ -89,6 +89,7 @@ export const ar: Record<string, string> = {
   terminalDepsFailed: 'فشل تحميل تبعية الطرفية node-pty',
   terminalDepsHint: 'شغّل الأمر التالي في طرفية أو cmd على جهاز DSH للإصلاح، ثم أعد المحاولة (يبقى node-pty متزامناً مع إصدار نواة DSH):',
   terminalDepsProfile: ' (الملف الشخصي المكتشف: {profile})',
+  terminalShellNotFound: 'لم يتم العثور على الصدفة المُعدَّة: {name} — تحقق من مسار الصدفة في الإعدادات → Side card → Terminal',
   preview: 'معاينة',
   edit: 'تحرير',
   refresh: 'تحديث',
@@ -214,10 +215,10 @@ export const ar: Record<string, string> = {
   settingsConflict: 'تغيّر الإعداد في نافذة أخرى — يُرجى إعادة المحاولة',
   binaryNoPreview: 'لا يمكن معاينة هذا النوع من الملفات',
   downloadToView: 'تنزيل للعرض',
-  settingsSubagentTitle: 'فتح صفحة المهام تلقائياً عند ظهور وكيل فرعي',
-  settingsSubagentDesc: 'توسيع البطاقة الجانبية وفتح صفحة المهام عند توليد المحادثة الحالية لوكيل فرعي جديد؛ أوقفها للفتح يدوياً',
-  settingsJobsTitle: 'فتح صفحة المهام الخلفية تلقائياً عند مهمة خلفية جديدة',
-  settingsJobsDesc: 'توسيع البطاقة الجانبية وفتح صفحة المهام الخلفية عند ظهور مهمة خلفية جديدة للمحادثة الحالية (كل مهمة جديدة تُطلق ذلك)؛ أوقفها للفتح يدوياً',
+  settingsSubagentTitle: 'تفعيل صفحة المهام تلقائيًا عند ظهور وكيل فرعي',
+  settingsSubagentDesc: 'ينشّط صفحة المهام عندما تنشئ المحادثة الحالية وكيلًا فرعيًا جديدًا؛ على الشاشات الواسعة تتوسع البطاقة الجانبية أيضًا، ولا تفرض الشاشات الضيقة الدرج بملء الشاشة؛ أوقفه للفتح يدويًا',
+  settingsJobsTitle: 'تفعيل صفحة المهام الخلفية تلقائيًا عند مهمة خلفية جديدة',
+  settingsJobsDesc: 'ينشّط صفحة المهام الخلفية كلما ظهرت مهمة خلفية جديدة للمحادثة الحالية (كل مهمة جديدة تُفعّله)؛ على الشاشات الواسعة تتوسع البطاقة الجانبية أيضًا، ولا تفرض الشاشات الضيقة الدرج بملء الشاشة؛ أوقفه للفتح يدويًا',
   settingsToolsTitle: 'حقن أدوات الطرفية للنموذج',
   settingsToolsDesc: 'عند التفعيل، يمكن للنموذج إنشاء وتشغيل طرفيات الشريط الجانبي عبر أدوات terminal_* الثمانية (معطّل افتراضياً)',
   settingsFontFamilyTitle: 'عائلة خط الطرفية',

package/src/client/locales-de.ts

@@ -74,6 +74,7 @@ export const de: Record<string, string> = {
   terminalDepsFailed: 'Die Terminal-Abhängigkeit node-pty konnte nicht geladen werden',
   terminalDepsHint: 'Führen Sie den folgenden Befehl in einem Terminal oder in cmd auf dem DSH-System aus, um dies zu beheben, und klicken Sie dann auf „Erneut versuchen“ (node-pty bleibt mit der DSH-Core-Version synchron):',
   terminalDepsProfile: ' (erkanntes Profil: {profile})',
+  terminalShellNotFound: 'Konfigurierte Shell nicht gefunden: {name} — Shell-Pfad unter Einstellungen → Side card → Terminal prüfen',
   preview: 'Vorschau',
   edit: 'Bearbeiten',
   refresh: 'Aktualisieren',
@@ -199,10 +200,10 @@ export const de: Record<string, string> = {
   settingsConflict: 'Die Einstellung wurde in einem anderen Fenster geändert – bitte erneut versuchen',
   binaryNoPreview: 'Dieser Dateityp kann nicht in der Vorschau angezeigt werden',
   downloadToView: 'Zum Ansehen herunterladen',
-  settingsSubagentTitle: 'Aufgaben-Seite bei einem Subagenten automatisch öffnen',
-  settingsSubagentDesc: 'Die Seitenkarte wird ausgeklappt und die Aufgaben-Seite geöffnet, wenn die aktuelle Unterhaltung einen neuen Subagenten erzeugt; ausschalten, um sie manuell zu öffnen',
-  settingsJobsTitle: 'Aufgaben-Seite bei einer neuen Hintergrundaufgabe automatisch öffnen',
-  settingsJobsDesc: 'Die Seitenkarte wird ausgeklappt und die Aufgaben-Seite geöffnet, sobald für die aktuelle Unterhaltung eine neue Hintergrundaufgabe erscheint (jede neue Aufgabe löst dies aus); ausschalten, um sie manuell zu öffnen',
+  settingsSubagentTitle: 'Aufgabenseite bei neuen Subagenten automatisch aktivieren',
+  settingsSubagentDesc: 'Aktiviert die Aufgabenseite, wenn die aktuelle Konversation einen neuen Subagenten erzeugt; auf breiten Bildschirmen wird die Seitenkarte mit ausgeklappt, schmale Bildschirme erzwingen keine Vollbild-Schublade; zum manuellen Öffnen deaktivieren',
+  settingsJobsTitle: 'Aufgabenseite bei neuem Hintergrundjob automatisch aktivieren',
+  settingsJobsDesc: 'Aktiviert die Aufgabenseite, wenn ein neuer Hintergrundjob für die aktuelle Konversation erscheint (jeder neue Job löst aus); auf breiten Bildschirmen wird die Seitenkarte mit ausgeklappt, schmale Bildschirme erzwingen keine Vollbild-Schublade; zum manuellen Öffnen deaktivieren',
   settingsToolsTitle: 'Terminal-Werkzeuge für das Modell bereitstellen',
   settingsToolsDesc: 'Wenn aktiviert, kann das Modell über die 8 terminal_*-Werkzeuge Terminale in der Seitenleiste erstellen und steuern (standardmäßig deaktiviert)',
   settingsFontFamilyTitle: 'Terminal-Schriftart',

package/src/client/locales-fr.ts

@@ -81,6 +81,7 @@ export const fr: Record<string, string> = {
   terminalDepsFailed: 'Échec du chargement de la dépendance terminal node-pty',
   terminalDepsHint: 'Exécutez la commande suivante dans un terminal ou cmd de l’environnement DSH pour réparer, puis cliquez sur Réessayer (node-pty reste à la même version que le cœur DSH) :',
   terminalDepsProfile: ' (profil détecté : {profile})',
+  terminalShellNotFound: 'Shell configuré introuvable : {name} — vérifiez le chemin du shell dans Réglages → Side card → Terminal',
   preview: 'Aperçu',
   edit: 'Modifier',
   refresh: 'Actualiser',
@@ -206,10 +207,10 @@ export const fr: Record<string, string> = {
   settingsConflict: 'Les réglages ont été modifiés par une autre fenêtre, veuillez réessayer',
   binaryNoPreview: 'Ce type de fichier ne prend pas en charge l’aperçu',
   downloadToView: 'Télécharger pour consulter',
-  settingsSubagentTitle: 'Déployer automatiquement la page de gestion des tâches à la détection d’un sous-agent',
-  settingsSubagentDesc: 'Lorsque la session actuelle produit un nouveau sous-agent, déployer automatiquement la barre latérale et ouvrir la page de gestion des tâches ; une fois désactivé, l’ouverture est manuelle',
-  settingsJobsTitle: 'Déployer automatiquement la page des tâches d’arrière-plan sur nouvelle tâche',
-  settingsJobsDesc: 'Lorsque la session actuelle produit une nouvelle tâche d’arrière-plan, déployer automatiquement la barre latérale et ouvrir la page des tâches (déclenché à chaque nouvelle tâche) ; une fois désactivé, l’ouverture est manuelle',
+  settingsSubagentTitle: 'Activer automatiquement la page des tâches quand un sous-agent apparaît',
+  settingsSubagentDesc: 'Active la page des tâches quand la conversation actuelle crée un nouveau sous-agent ; sur les grands écrans la carte latérale se déploie aussi, les petits écrans ne forcent jamais le tiroir plein écran ; désactivez pour ouvrir manuellement',
+  settingsJobsTitle: 'Activer automatiquement la page des tâches d’arrière-plan pour une nouvelle tâche',
+  settingsJobsDesc: 'Active la page des tâches d’arrière-plan dès qu’une nouvelle tâche apparaît pour la conversation actuelle (chaque nouvelle tâche déclenche) ; sur les grands écrans la carte latérale se déploie aussi, les petits écrans ne forcent jamais le tiroir plein écran ; désactivez pour ouvrir manuellement',
   settingsToolsTitle: 'Injecter des outils de terminal au modèle',
   settingsToolsDesc: 'Une fois activé, le modèle peut créer et piloter des terminaux de la barre latérale via les 8 outils terminal_* (désactivé par défaut)',
   settingsFontFamilyTitle: 'Police du terminal',