beast-agent 0.26.0 → 0.26.2

package/src/renderer/renderer.js

@@ -471,7 +471,9 @@ async function renderSessions(list) {
     tgSet = new Set(await beast.tgListSessions());
   } catch {}
   els.sessList.innerHTML = '';
-  /* aktif botun oturumları — botlar arası geçişte liste de o bota göre değişir */
+  /* aktif botun oturumları — botlar arası geçişte liste de o bota göre değişir.
+     KATI KURAL: her oturum yalnız BAĞLI OLDUĞU botun listesinde görünür;
+     bot kaydı olmayan (eski) oturumlar Beast (varsayılan sahip) altında görünür. */
   for (const s of list) {
     if ((s.botId || 'beast') !== activeBotId) continue;
     const row = document.createElement('div');
@@ -635,7 +637,7 @@ function switchTab(name) {
   document.querySelectorAll('#setTabs .tab').forEach((b) =>
     b.classList.toggle('active', b.dataset.tab === name)
   );
-  for (const p of ['provider', 'fallout', 'skills', 'agents', 'tts', 'email', 'integrations', 'websearch', 'events', 'cron', 'usage', 'logs', 'dash', 'limits', 'sec', 'proxy', 'update']) {
+  for (const p of ['provider', 'fallout', 'skills', 'agents', 'tts', 'email', 'integrations', 'websearch', 'events', 'cron', 'usage', 'logs', 'dash', 'limits', 'sec', 'update']) {
     const el = $('#tab-' + p);
     if (el) el.hidden = p !== name; // guard: eksik pane tüm sekmeleri kilitlemesin
   }
@@ -646,7 +648,6 @@ function switchTab(name) {
   if (name === 'dash') renderDashboardPane();
   if (name === 'limits') renderLimitsPane();
   if (name === 'sec') renderSecurityPane();
-  if (name === 'proxy') renderProxyPane();
   if (name === 'update') renderUpdatePane(true);
   if (name === 'agents') refreshAgentsPane();
   if (name === 'websearch') renderWebSearchPane();
@@ -816,7 +817,7 @@ async function renderProviderPane() {
 
   for (const m of state.models || []) {
     const row = document.createElement('div');
-    row.className = 'prov-row' + (state.activeModel && state.activeModel.sel === m.sel ? ' active' : '');
+    row.className = 'prov-row' + (effectiveModelSel() === m.sel ? ' active' : '');
     row.innerHTML =
       `<span class="prov-name">${escapeHtml(m.providerName)}</span>` +
       `<span class="prov-model">${escapeHtml(m.model)}</span>` +
@@ -824,6 +825,7 @@ async function renderProviderPane() {
       `<button class="prov-del" title="${_t('p_del_title')}">✕</button>`;
     row.addEventListener('click', async () => {
       state = await beast.setModel(m.sel);
+      await refreshBots().catch(() => {});
       applyState();
       renderProviderPane();
       toast(_t('p_model_toast') + m.providerName + ' · ' + m.model);
@@ -1536,6 +1538,35 @@ async function renderIntegrationsPane() {
         <button id="tgAllowAdd" class="btn ghost" style="margin-top:6px">${_t('it_add')}</button>
       </div>
       <div class="sub" style="margin-top:8px">${_t('it_tg_note')}</div>
+    </div>
+
+    <div class="wa-card" style="margin-top:14px">
+      <div class="wa-head">
+        <div class="wa-logo tg">D</div>
+        <div>
+          <div class="wa-title">Discord</div>
+          <div class="wa-sub">${_t('it_dc_sub')}</div>
+        </div>
+      </div>
+      <div class="wa-status"><span id="dcDot" class="wa-dot"></span><span id="dcStatText">—</span></div>
+      <div id="dcUser" class="wa-user" hidden></div>
+      <div class="form-grid" style="grid-template-columns:1fr auto;align-items:center">
+        <input id="dcTokenInp" class="inp" type="password" style="margin:6px 0 0" placeholder="${_t('it_dc_token_ph')}" autocomplete="off" />
+        <button id="dcSaveBtn" class="btn" style="margin-top:6px">${_t('it_tg_save')}</button>
+      </div>
+      <div class="wa-actions" style="margin-top:6px">
+        <button id="dcStopBtn" class="btn ghost">${_t('it_disconnect')}</button>
+      </div>
+      <div class="divider"></div>
+      <label class="mem-label" style="margin-top:0">${_t('it_allow_label')} — Discord</label>
+      <div id="dcAllowChips" class="chips-inline"></div>
+      <div class="form-grid" style="grid-template-columns:1.2fr 1fr 1fr auto;align-items:center">
+        <input id="dcAllowNameInp" class="inp" style="margin:6px 0 0" placeholder="${_t('it_name_ph')}" autocomplete="off" />
+        <input id="dcAllowIdInp" class="inp" style="margin:6px 0 0" placeholder="${_t('it_dc_id_ph')}" autocomplete="off" />
+        <select id="dcAllowBotSel" class="perm-select" style="margin:6px 0 0;min-width:105px" title="${_t('bot_bind_title')}"></select>
+        <button id="dcAllowAdd" class="btn ghost" style="margin-top:6px">${_t('it_add')}</button>
+      </div>
+      <div class="sub" style="margin-top:8px">${_t('it_dc_note')}</div>
     </div>`;
 
   const waGroupsOn = $('#waGroupsOn');
@@ -1598,6 +1629,29 @@ async function renderIntegrationsPane() {
     tgUI.user = ts.user || null;
     updateTgPane();
   } catch {}
+
+  /* DISCORD: token + allow list + durum */
+  $('#dcSaveBtn').addEventListener('click', async () => {
+    const tok = $('#dcTokenInp').value.trim();
+    if (!tok) { toast(_t('it_dc_token_ph')); return; }
+    toast(_t('it_dc_connecting'));
+    const r = await beast.dcSetToken(tok).catch((e) => ({ status: 'error', error: String(e) }));
+    $('#dcTokenInp').value = '';
+    updateDcPane();
+    toast(r.status === 'connected' ? 'Discord bağlı: ' + (r.user || '') : r.status === 'error' ? _t('it_dc_token_bad') : _t('it_dc_connecting'));
+  });
+  $('#dcStopBtn').addEventListener('click', async () => {
+    await beast.dcStop().catch(() => {});
+    updateDcPane();
+    toast('Kesildi');
+  });
+  await renderDcAllow();
+  try {
+    const ds = await beast.dcGetStatus();
+    dcUI.status = ds.status || 'disconnected';
+    dcUI.user = ds.user || null;
+    updateDcPane();
+  } catch {}
 }
 
 /* ---------------- Olay Merkezi (ayrı sekme) ---------------- */
@@ -1791,134 +1845,8 @@ async function renderSecurityPane() {
   }
 }
 
-/* ---------------- Proxy sekmesi ----------------
-   Kullanıcı yalnız IP/port/kullanıcı/şifre alanlarını doldurur; URL'i biz kurarız.
-   Eklenen her satır bir proxy — çoklu satır = Node tarafında round-robin rotasyon. */
-let proxyDraft = null; // { enabled, items:[line,...] } — sekme açıkken çalışma kopyası
-
-function parseProxyLine(line) {
-  const m = String(line || '').trim().match(/^(https?|socks5):\/\/(?:([^:@/]+):([^@/]*)@)?([^:/]+):(\d+)$/i);
-  if (!m) return null;
-  return { proto: m[1].toLowerCase(), user: decodeURIComponent(m[2] || ''), pass: decodeURIComponent(m[3] || ''), host: m[4], port: m[5] };
-}
-
-function proxyLineDisplay(line) {
-  const p = parseProxyLine(line);
-  if (!p) return escapeHtml(line);
-  const creds = p.user ? p.user + ':' + (p.pass ? '•••' : '') + '@' : '';
-  return `${p.proto}://${escapeHtml(creds)}${escapeHtml(p.host)}:${p.port}`;
-}
-
-async function renderProxyPane() {
-  const pane = $('#tab-proxy');
-  if (!pane) return;
-  if (!proxyDraft) {
-    const [cfg, ws] = await Promise.all([
-      beast.proxyGet().catch(() => ({ enabled: false, urls: '' })),
-      beast.warpGet().catch(() => ({ enabled: false, running: false, installed: false })),
-    ]);
-    proxyDraft = {
-      enabled: !!cfg.enabled,
-      items: String(cfg.urls || '').split(/[\n,;]+/).map((s) => s.trim()).filter(Boolean),
-      warp: ws || {},
-    };
-  }
-  const warp = proxyDraft.warp || {};
-  const warpState = warp.enabled ? (warp.running ? _t('warp_state_on') : _t('warp_state_starting')) : _t('warp_state_off');
-
-  const listHtml = proxyDraft.items.length
-    ? proxyDraft.items.map((line, i) =>
-        `<div class="px-row"><code>${proxyLineDisplay(line)}</code><button class="px-del" data-i="${i}" title="${_t('proxy_remove')}">✕</button></div>`
-      ).join('')
-    : `<div class="gh-empty" style="padding:10px">${_t('proxy_none')}</div>`;
-
-  pane.innerHTML =
-    '<h2>' + _t('proxy_h2') + '</h2>' +
-    '<div class="sub">' + _t('proxy_sub') + '</div>' +
-    '<div class="warp-card">' +
-    `<div class="warp-head"><span>☁ Cloudflare WARP</span><span class="warp-state">${escapeHtml(warpState)}</span></div>` +
-    `<button id="pxWarp" class="btn ${warp.enabled ? 'ghost' : ''}">${warp.enabled ? _t('warp_off') : _t('warp_on')}</button>` +
-    `<div class="sub" style="margin-top:6px">${_t('warp_note')}</div>` +
-    '</div>' +
-    '<div class="fo-toggles" style="margin-top:12px">' +
-    `<label class="lock-row"><input type="checkbox" id="pxOn" ${proxyDraft.enabled ? 'checked' : ''}/><span>${_t('proxy_enabled')}</span></label>` +
-    '</div>' +
-    `<label class="mem-label">${_t('proxy_urls')}</label>` +
-    `<div id="pxList">${listHtml}</div>` +
-    '<div class="px-add-row">' +
-    `<select id="pxProto"><option value="http">http</option><option value="socks5">socks5</option></select>` +
-    `<input id="pxHost" placeholder="${_t('proxy_host')}" spellcheck="false"/>` +
-    `<input id="pxPort" placeholder="${_t('proxy_port')}" inputmode="numeric"/>` +
-    `<input id="pxUser" placeholder="${_t('proxy_user')}" autocomplete="off" spellcheck="false"/>` +
-    `<input id="pxPass" placeholder="${_t('proxy_pass')}" type="password" autocomplete="off"/>` +
-    `<button id="pxAdd" class="btn" style="margin-top:0">${_t('proxy_add')}</button>` +
-    '</div>' +
-    '<div class="form-grid" style="grid-template-columns:auto auto;gap:8px;margin-top:10px">' +
-    `<button id="pxSave" class="btn">${_t('proxy_save')}</button>` +
-    `<button id="pxTest" class="btn ghost">${_t('proxy_test')}</button>` +
-    '</div>' +
-    `<div id="pxTestOut" class="sub" style="margin-top:8px"></div>` +
-    '<div class="sub" style="margin-top:10px">' + _t('proxy_note') + '</div>';
-
-  pane.querySelector('#pxOn').addEventListener('change', (e) => { proxyDraft.enabled = e.target.checked; });
-
-  pane.querySelector('#pxWarp').addEventListener('click', async () => {
-    const btn = pane.querySelector('#pxWarp');
-    const st = pane.querySelector('#pxWarpState');
-    const want = !warp.enabled;
-    btn.disabled = true;
-    st.textContent = want ? '⏳ ' + _t('warp_state_starting') : '⏳ ' + _t('warp_state_off');
-    const r = await beast.warpSet(want).catch((e) => ({ ok: false, error: String(e) }));
-    if (!(r && r.ok)) {
-      btn.disabled = false;
-      st.textContent = '⚠ ' + ((r && r.error) || 'hata');
-      return;
-    }
-    proxyDraft = null; // listeyi (socks satırı eklenmiş/çıkarılmış) tazele
-    renderProxyPane();
-  });
-
-  const collect = () => {
-    const host = pane.querySelector('#pxHost').value.trim();
-    const port = pane.querySelector('#pxPort').value.trim();
-    const user = pane.querySelector('#pxUser').value.trim();
-    const pass = pane.querySelector('#pxPass').value;
-    const proto = pane.querySelector('#pxProto').value || 'http';
-    if (!host || !/^\d{1,5}$/.test(port)) { toast(_t('proxy_invalid')); return null; }
-    const creds = user ? encodeURIComponent(user) + (pass ? ':' + encodeURIComponent(pass) : '') + '@' : '';
-    return `${proto}://${creds}${host}:${port}`;
-  };
-  pane.querySelector('#pxAdd').addEventListener('click', () => {
-    const line = collect();
-    if (!line) return;
-    if (proxyDraft.items.includes(line)) { toast(_t('proxy_dup')); return; }
-    proxyDraft.items.push(line);
-    renderProxyPane();
-  });
-  pane.querySelectorAll('.px-del').forEach((b) =>
-    b.addEventListener('click', () => {
-      proxyDraft.items.splice(Number(b.dataset.i), 1);
-      renderProxyPane();
-    })
-  );
-
-  pane.querySelector('#pxSave').addEventListener('click', async () => {
-    const r = await beast.proxySet({ enabled: proxyDraft.enabled, urls: proxyDraft.items.join('\n') }).catch(() => null);
-    if (r && r.ok) toast(_t('proxy_saved'));
-    else toast((r && r.error) || 'hata');
-  });
-  pane.querySelector('#pxTest').addEventListener('click', async () => {
-    const out = pane.querySelector('#pxTestOut');
-    out.textContent = '⏳ ' + _t('proxy_testing');
-    /* önce kaydet — test, kayıtlı ayarla çalışır */
-    await beast.proxySet({ enabled: proxyDraft.enabled, urls: proxyDraft.items.join('\n') }).catch(() => null);
-    const r = await beast.proxyTest().catch((e) => ({ ok: false, error: String(e) }));
-    if (r && r.ok) out.innerHTML = `✅ ${_t('proxy_test_ok')} <b>${escapeHtml(r.ip || '?')}</b> · ${escapeHtml(r.proxy || '')} · ${r.ms || '?'}ms`;
-    else out.innerHTML = `⚠ ${_t('proxy_test_fail')} ${escapeHtml((r && r.error) || '?')}`;
-  });
-}
-
 /* ---------------- Update: sürüm kontrol + otomatik güncelleme ---------------- */
+
 let updatePaneTimer = null;
 
 function renderUpdateStateHtml(st) {
@@ -2566,6 +2494,199 @@ async function renderTgAllow() {
   }
 }
 
+/* ---------------- Discord izin listesi + durum — TG ile aynı mantık ---------------- */
+
+const dcUI = { status: 'disconnected', user: null };
+const DC_STATUS_TEXT = {
+  disconnected: 'Bağlı değil',
+  connecting: 'Bağlanıyor…',
+  connected: 'Bağlı',
+  error: 'Hata — tokenı kontrol et',
+};
+
+function onDcEvent(ev) {
+  if (ev.type !== 'status') return;
+  dcUI.status = ev.status;
+  if (ev.user) dcUI.user = ev.user;
+  updateDcPane();
+}
+
+function updateDcPane() {
+  const pane = $('#tab-integrations');
+  const dot = pane && pane.querySelector('#dcDot');
+  if (!dot) return;
+  dot.className = 'wa-dot' + (dcUI.status === 'connected' ? ' on' : dcUI.status === 'error' ? ' qr' : '');
+  pane.querySelector('#dcStatText').textContent = DC_STATUS_TEXT[dcUI.status] || dcUI.status;
+  const u = pane.querySelector('#dcUser');
+  u.hidden = !(dcUI.status === 'connected' && dcUI.user);
+  u.textContent = dcUI.user ? '🤖 ' + dcUI.user : '';
+}
+
+async function renderDcAllow() {
+  const wrap = $('#dcAllowChips');
+  if (!wrap) return;
+  const list = await beast.dcGetAllow();
+  let botChoices = [];
+  try { botChoices = (await beast.botsList()) || []; } catch {}
+  const dcLabel = (e) => {
+    if (e === '*') return '* herkes';
+    if (typeof e === 'string') return e;
+    const name = String((e && e.name) || '').trim();
+    const id = String((e && e.id) || '');
+    const bot = e && e.bot_id ? botChoices.find((bb) => bb.id === e.bot_id) : null;
+    return (name ? name + ' ' : '') + id + (bot ? ' → ' + bot.name : '');
+  };
+  wrap.innerHTML = '';
+  if (!list.length) wrap.innerHTML = '<span class="sub">— boş —</span>';
+  list.forEach((entry, idx) => {
+    const curPerm = (typeof entry === 'object' && entry.perm) || (entry && entry.lockdown ? 'chat' : 'all');
+    const c = document.createElement('span');
+    c.className = 'chip';
+    c.style.margin = '0 6px 6px 0';
+    const txt = document.createElement('span');
+    txt.className = 'chip-txt';
+    txt.textContent = dcLabel(entry);
+    c.appendChild(txt);
+    if (entry !== '*') {
+      const selP = document.createElement('select');
+      selP.className = 'perm-select';
+      selP.title = _t('wa_perm_title');
+      const PERMS = [
+        ['all', _t('wa_perm_all')],
+        ['web', 'web'],
+        ['read', _t('wa_perm_read')],
+        ['chat', _t('wa_perm_chat')],
+      ];
+      for (const [v, lbl] of PERMS) {
+        const o = document.createElement('option');
+        o.value = v;
+        o.textContent = lbl;
+        if (curPerm === v) o.selected = true;
+        selP.appendChild(o);
+      }
+      selP.addEventListener('change', async () => {
+        const cur = await beast.dcGetAllow();
+        const next = cur.map((e, i) => {
+          if (i !== idx) return e;
+          const base = typeof e === 'string' ? { id: e, name: '' } : { ...e };
+          base.lockdown = selP.value === 'chat';
+          base.perm = selP.value;
+          return base;
+        });
+        await beast.dcSetAllow(next);
+        renderDcAllow();
+        toast(dcLabel(entry) + ': ' + selP.selectedOptions[0].textContent);
+      });
+      c.appendChild(selP);
+
+      if (botChoices.length) {
+        const sel = document.createElement('select');
+        sel.className = 'perm-select';
+        sel.title = _t('bot_bind_title');
+        const empty = document.createElement('option');
+        empty.value = '';
+        empty.textContent = _t('bot_sel_empty');
+        sel.appendChild(empty);
+        for (const bb of botChoices) {
+          const o = document.createElement('option');
+          o.value = bb.id;
+          o.textContent = `${bb.icon} ${bb.name}`;
+          if ((typeof entry === 'object' && entry.bot_id) === bb.id) o.selected = true;
+          sel.appendChild(o);
+        }
+        sel.addEventListener('change', async () => {
+          const cur = await beast.dcGetAllow();
+          const next = cur.map((e, i) => {
+            if (i !== idx) return e;
+            const base = typeof e === 'string' ? { id: e, name: '' } : { ...e };
+            base.bot_id = sel.value || undefined;
+            return base;
+          });
+          await beast.dcSetAllow(next);
+          renderDcAllow();
+          const bt = botChoices.find((bb) => bb.id === sel.value);
+          toast(dcLabel(entry) + ' → ' + (bt ? bt.name : '?'));
+        });
+        c.appendChild(sel);
+      }
+
+      const isOwnerEntry = typeof entry === 'object' && !!entry.owner;
+      const ownerBtn = document.createElement('span');
+      ownerBtn.className = 'lk';
+      ownerBtn.style.cssText = 'font-size:11px;padding:1px 6px;' + (isOwnerEntry ? 'color:#c9a227;font-weight:800' : '');
+      ownerBtn.title = isOwnerEntry ? _t('wa_owner_title_on') : _t('wa_owner_title_off');
+      ownerBtn.textContent = isOwnerEntry ? _t('wa_owner_on') : _t('wa_owner_off');
+      ownerBtn.addEventListener('click', async () => {
+        if (isOwnerEntry) return;
+        const cur = await beast.dcGetAllow();
+        const next = cur.map((e, i) => {
+          if (typeof e === 'object' && e && e.owner) return { ...e, owner: false };
+          if (i === idx) {
+            const obj = typeof e === 'string' ? { id: e, name: '' } : { ...e };
+            obj.owner = true;
+            return obj;
+          }
+          return e;
+        });
+        const tgt = next[idx];
+        await beast.dcSetAllow(next);
+        renderDcAllow();
+        toast('Sahip: ' + dcLabel(tgt));
+      });
+      c.appendChild(ownerBtn);
+    }
+    const x = document.createElement('span');
+    x.className = 'x';
+    x.textContent = '×';
+    x.addEventListener('click', async () => {
+      const next = (await beast.dcGetAllow()).filter((_v, i) => i !== idx);
+      await beast.dcSetAllow(next);
+      renderDcAllow();
+      toast('Kaldırıldı: ' + dcLabel(entry));
+    });
+    c.appendChild(x);
+    wrap.appendChild(c);
+  });
+
+  const inp = $('#dcAllowIdInp');
+  const nameInp = $('#dcAllowNameInp');
+  const add = $('#dcAllowAdd');
+  const botSel = $('#dcAllowBotSel');
+  if (botSel) {
+    const prev = botSel.value;
+    botSel.innerHTML =
+      `<option value="">${_t('bot_sel_empty')}</option>` +
+      botChoices
+        .map((bb) => `<option value="${bb.id}">${bb.icon} ${escapeHtml(bb.name)}${bb.admin ? ' (admin)' : ''}</option>`)
+        .join('');
+    if (prev) botSel.value = prev;
+  }
+  if (!add.dataset.bound) {
+    add.dataset.bound = '1';
+    const addEntry = async () => {
+      let v = inp.value.trim();
+      if (!v) return;
+      const name = nameInp.value.trim().slice(0, 40);
+      if (!name) { toast('İsim zorunlu — kimin yazdığını bilmek için'); nameInp.focus(); return; }
+      v = v.startsWith('@') ? '@' + v.slice(1).replace(/[^\w]/g, '') : v.replace(/[^\d]/g, '');
+      if (!v) { toast(_t('it_dc_id_ph')); return; }
+      const botId = botSel && botSel.value ? { bot_id: botSel.value } : {};
+      const next = [...(await beast.dcGetAllow()), { id: v, name, ...botId }];
+      if (!next.some((e) => e && typeof e === 'object' && e.owner)) {
+        if (next.length && typeof next[0] === 'object') next[0].owner = true;
+      }
+      await beast.dcSetAllow(next);
+      inp.value = '';
+      nameInp.value = '';
+      renderDcAllow();
+      toast('Eklendi: ' + name);
+    };
+    add.addEventListener('click', addEntry);
+    inp.addEventListener('keydown', (e) => { if (e.key === 'Enter') { e.preventDefault(); addEntry(); } });
+    nameInp.addEventListener('keydown', (e) => { if (e.key === 'Enter') { e.preventDefault(); addEntry(); } });
+  }
+}
+
 /* ---------------- BOT SİSTEMİ (BÖLÜM 2-3-4) ----------------
    Sol panel altında bot kartları; her bot için sohbet geçmişi + sekmeli yönetim.
    İlk bot hep Beast (admin, silinemez). Max 5 bot. */
@@ -2601,6 +2722,8 @@ async function refreshBots() {
   /* BOT PICKER SENKRONU: liste her yenilendiğinde üstteki rozet de aktif bota
      ayarlanır — startup yarışında (liste boşken çizilen) eski rozet düzelir */
   updateBotChip();
+  /* model picker da aktif botun kendi modelini göstersin */
+  if (state) applyState();
   if (!$('#botOverlay').hidden) renderBotPage();
 }
 
@@ -2664,6 +2787,8 @@ async function switchBot(id) {
     if (list.length) await openSession(list[0].id);
     else { const v = await beast.createSession(); await openSession(v.id); }
   } catch {}
+  /* picker, aktif botun kendi modelini göstersin */
+  applyState();
   toast((b.icon || '🤖') + ' ' + b.name + (b.admin ? '' : ' — ' + _t('bot_switched')));
 }
 
@@ -2894,6 +3019,15 @@ function renderBotSettings(pane, b) {
   const numRows = (b.numbers || [])
     .map((n) => `<div class="bot-num-row" data-num="${n.num}"><span class="n">+${escapeHtml(n.num)}${n.name ? ' · ' + escapeHtml(n.name) : ''}</span><span class="x" title="${_t('bot_num_del')}">×</span></div>`)
     .join('');
+  /* bot bazlı model seçenekleri: ana picker'daki listeyle aynı (state.models) */
+  const modelOpts = ['<option value="">' + escapeHtml(_t('bot_model_global')) + '</option>']
+    .concat(
+      (state.models || []).map((m) => {
+        const s = m.sel || (m.providerId || '') + '::' + (m.model || '');
+        return `<option value="${escapeHtml(s)}" ${b.model === s ? 'selected' : ''}>${escapeHtml(m.providerName || m.providerId || '')} · ${escapeHtml(m.model || '')}</option>`;
+      })
+    )
+    .join('');
   /* Numara ekleme KALDIRILDI — girişler yalnız Ayarlar → Entegrasyonlar (WhatsApp
      izin listesi) üzerinden yapılır. Bu bölüm salt-okunur bağlı-numara listesidir. */
   f.innerHTML = `
@@ -2916,7 +3050,10 @@ function renderBotSettings(pane, b) {
     <div class="bot-checks" id="bPerm">${permChecks}</div>
     <div class="sub" style="margin-top:4px">${_t('bot_perm_note')}</div>
     <label class="mem-label">${_t('bot_skills')}</label>
-    <div class="bot-checks" id="bSkills">${skillChecks}</div>`}
+    <div class="bot-checks" id="bSkills">${skillChecks}</div>
+    <label class="mem-label">${_t('bot_model')}</label>
+    <select id="bModel" class="inp">${modelOpts}</select>
+    <div class="sub" style="margin-top:4px">${_t('bot_model_note')}</div>`}
     <label class="mem-label">${_t('bot_browser')}</label>
     <div class="bot-checks" style="margin-bottom:6px">
       <label><input type="checkbox" id="bExtBrowser" ${b.extBrowser ? 'checked' : ''}/> ${_t('bot_ext_browser')}</label>
@@ -2991,6 +3128,8 @@ function renderBotSettings(pane, b) {
       const sk = {};
       f.querySelectorAll('#bSkills input').forEach((c) => { sk[c.dataset.skill] = c.checked; });
       patch.skills = sk;
+      const bm = $('#bModel');
+      if (bm) patch.model = bm.value;
     }
     const r = await beast.botsUpdate(b.id, patch);
     if (r.ok) { toast(_t('bot_saved')); await refreshBots(); renderBotPage(); }
@@ -3214,6 +3353,39 @@ function fmtAgo(iso) {
   return s >= 60 ? Math.floor(s / 60) + 'dk' : s + 'sn';
 }
 
+/* canlı süre sayacı: 0:43 · 2:05 · 1:02:15 biçimi (koşan ajan kartlarında) */
+function fmtElapsed(ms) {
+  const s = Math.max(0, Math.floor(ms / 1000));
+  const h = Math.floor(s / 3600);
+  const m = Math.floor((s % 3600) / 60);
+  const sec = s % 60;
+  const p = (n) => String(n).padStart(2, '0');
+  return h > 0 ? `${h}:${p(m)}:${p(sec)}` : `${m}:${p(sec)}`;
+}
+
+/* koşan ajanların ⏱ sayaçları — saniyede bir yalnızca sayaç span'leri güncellenir
+   (tüm rail yeniden çizilmez). Koşan kart kalmayınca interval kapanır. */
+let agentTimerInt = null;
+function ensureAgentTimers() {
+  const any = !!document.querySelector('.agent-timer[data-start]');
+  if (any && !agentTimerInt) {
+    agentTimerInt = setInterval(() => {
+      document.querySelectorAll('.agent-timer[data-start]').forEach((el) => {
+        const t0 = Date.parse(el.dataset.start || '');
+        if (t0) el.textContent = fmtElapsed(Date.now() - t0);
+      });
+    }, 1000);
+  } else if (!any && agentTimerInt) {
+    clearInterval(agentTimerInt);
+    agentTimerInt = null;
+  }
+}
+function agentTimerHtml(startedAt) {
+  const t0 = Date.parse(startedAt || '');
+  const val = t0 ? fmtElapsed(Date.now() - t0) : '0:00';
+  return `<span class="agent-timer" data-start="${escapeHtml(startedAt || '')}">⏱ ${val}</span>`;
+}
+
 /* sağ panel — paralel ajanların arka plan işleri */
 function renderAgentRail() {
   const list = els.railList;
@@ -3244,7 +3416,7 @@ function renderAgentRail() {
       `<span class="ag-dot"></span>` +
       `<span class="sess-title">${escapeHtml(j.title)}</span>` +
       (j.code ? `<span class="sess-code" title="Oturum kodu">${escapeHtml(j.code)}</span>` : ``) +
-       `<span class="rj-time">${j.status === 'running' ? when + ' · ' + _t('ag_working') : (agStText(j.status) === _t('ag_st_done') ? '\u2713' : (agStText(j.status) || j.status))}</span>` +
+       `<span class="rj-time">${j.status === 'running' ? when + ' · ' + agentTimerHtml(j.startedAt) + ' · ' + _t('ag_working') : (agStText(j.status) === _t('ag_st_done') ? '\u2713' : (agStText(j.status) || j.status))}</span>` +
        (j.status === 'running'
          ? `<button class="rj-cancel" title="${_t('ag_cancel')}">×</button>`
          : `<button class="rj-cancel" title="${_t('ag_delete')}"><svg viewBox="0 0 24 24" width="12" height="12" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 6h18"/><path d="M8 6V4a1 1 0 0 1 1-1h6a1 1 0 0 1 1 1v2"/><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6"/><path d="M10 11v6M14 11v6"/></svg></button>`) +
@@ -3289,6 +3461,7 @@ function renderAgentRail() {
     /* açık sohbet dökümünü re-render sonrası GERİ GETİR (kapanma bug'ının fix'i) */
     if (open && agentState.chatOpen.has(j.id)) maybeLoadRailChat(j.id);
   }
+  ensureAgentTimers();
 }
 
 /* re-render storm'da IPC fırtınası olmasın: döküm 2 sn'de bir tazelenir */
@@ -3374,7 +3547,7 @@ function renderAgentsPane() {
       `<span class="ag-dot"></span>` +
       `<span class="ag-title">${escapeHtml(j.title)}</span>` +
        `<span class="ag-st">${agStText(j.status) || j.status}</span>` +
-      `<span class="ag-time">${when}${j.endedAt ? ` · ${fmtAgo(j.endedAt)}` : ''}</span>` +
+      `<span class="ag-time">${when}${j.status === 'running' ? ' · ' + agentTimerHtml(j.startedAt) : j.endedAt ? ` · ${fmtAgo(j.endedAt)}` : ''}</span>` +
       (j.status === 'running'
          ? `<button class="ag-btn cancel" title="${_t('ag_cancel')}">${_t('ag_cancel')}</button>`
          : ``) +
@@ -3412,16 +3585,8 @@ function renderAgentsPane() {
     list.appendChild(card);
   }
 
-  /* canlı süre sayacı */
-  clearInterval(agentState.tick);
-  agentState.tick = setInterval(() => {
-    if (setTab !== 'agents') { clearInterval(agentState.tick); return; }
-    for (const el of document.querySelectorAll('.agent-card.st-running .ag-time')) {
-      /* sadece saati yenile */
-      const t = el.textContent.split(' ')[0];
-      el.textContent = `${t} · ${_t('ag_working')}…`;
-    }
-  }, 5000);
+  /* canlı süre sayacı — saniyede bir yalnız ⏱ sayaç span'leri güncellenir */
+  ensureAgentTimers();
 }
 
 /* ---------------- events from engine ---------------- */
@@ -3522,6 +3687,7 @@ function onEvent(ev) {
     case 'browser': {
       /* visible=false → ajan tarayıcıyı GİZLİ kullanıyor: UI yer açmaz */
       const shown = !!ev.open && ev.visible !== false;
+      const wasShown = document.body.classList.contains('browser-open');
       document.body.classList.toggle('browser-open', shown);
       if (shown && ev.width) document.body.style.setProperty('--bw', ev.width + 'px');
       els.browserBar.hidden = !shown;
@@ -3529,11 +3695,13 @@ function onEvent(ev) {
       /* terminal de sağ dock'u kullanır — tarayıcı açılınca yerini bırak */
       if (shown && termOpen) termSetOpen(false);
       /* #19 tarayıcı açılınca paralel ajan konsolu (sağ panel) yerini bırakır;
-         kapanınca önceki durumuna döner — istenirse railBtn ile elle açılır */
+         kapanınca önceki durumuna döner — istenirse railBtn ile elle açılır.
+         GİZLİ ajan gezinmeleri (shown=false, wasShown=false) rail'e DOKUNMAZ —
+         aksi halde paralel ajan konsolu kendi kendine kapanırdı */
       if (shown) {
         railPrefBeforeBrowser = !document.body.classList.contains('rail-hidden');
         toggleRail(true);
-      } else {
+      } else if (wasShown) {
         toggleRail(!railPrefBeforeBrowser);
       }
       /* IDE modunda tarayıcı açılır/kapanır/genişlik değişirse row yeniden bölünür —
@@ -3862,15 +4030,26 @@ async function openCronModal() {
 
 /* ---------------- state / controls ---------------- */
 
+/* AKTİF BOTUN etkili model seçimi: müşteri botun kendi modeli varsa o,
+   yoksa (ve admin bot daysa) global picker seçimi. */
+function effectiveModelSel() {
+  const b = botsCache.find((x) => x.id === activeBotId);
+  return b && !b.admin && b.model ? b.model : (state.activeModel && state.activeModel.sel) || '';
+}
+
 function applyState() {
   if (!state) return;
-  els.modelBtnLabel.textContent = state.activeModel
-    ? `${state.activeModel.providerName} · ${state.activeModel.model}`
-    : 'Model seçilmedi';
+  const botSel = activeBotId && botsCache.length ? effectiveModelSel() : (state.activeModel && state.activeModel.sel);
+  const bm = botSel ? (state.models || []).find((x) => x.sel === botSel) : null;
+  els.modelBtnLabel.textContent = bm
+    ? `${bm.providerName} · ${bm.model}`
+    : state.activeModel
+      ? `${state.activeModel.providerName} · ${state.activeModel.model}`
+      : 'Model seçilmedi';
   els.thinkBtnLabel.innerHTML =
-    '<svg viewBox="0 0 24 24" width="15" height="15" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M9.5 2A2.5 2.5 0 0 0 7 4.5v.55A3.5 3.5 0 0 0 4.5 8.5c0 .74.23 1.43.62 2A3.5 3.5 0 0 0 4 13.5 3.5 3.5 0 0 0 7 16.95v.55A2.5 2.5 0 0 0 9.5 20a2.5 2.5 0 0 0 2.5-2.5v-13A2.5 2.5 0 0 0 9.5 2z"/><path d="M14.5 2A2.5 2.5 0 0 1 17 4.5v.55a3.5 3.5 0 0 1 2.5 3.45c0 .74-.23 1.43-.62 2a3.5 3.5 0 0 1 1.12 3 3.5 3.5 0 0 1-3 3.45v.55A2.5 2.5 0 0 1 14.5 20 2.5 2.5 0 0 1 12 17.5v-13A2.5 2.5 0 0 1 14.5 2z"/></svg>';
+    '<svg viewBox="0 0 24 24" width="15" height="15" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M9.5 2A2.5 2.5 0 0 0 7 4.5v.55A3.5 3.5 0 0 0 4.5 8.5c0 .74.23 1.43.62 2A3.5 3.5 0 0 0 4 13.5 3.5 3.5 0 0 0 7 16.95v.55A2.5 2.5 0 0 0 9.5 20a2.5 2.5 0 0 0 2.5-2.5v-13A2.5 2.5 0 0 0 9.5 2z"/><path d="M14.5 2A2.5 2.5 0 0 1 17 4.5v.55a3.5 3.5 0 0 1 2.5 3.45c0 .74-.23 1.43-.62 2a3.5 3.5 0 0 1-1.12 3 3.5 3.5 0 0 1-3 3.45v.55A2.5 2.5 0 0 1 14.5 20 2.5 2.5 0 0 1 12 17.5v-13A2.5 2.5 0 0 1 14.5 2z"/></svg>';
   renderModelMenu();
-}
+}
 
 /* düşünme (reasoning) seviyesi picker — gerçek API değerleri */
 const THINK_UI_LEVELS = [
@@ -3927,7 +4106,7 @@ function renderModelMenu() {
   els.modelList.innerHTML = '';
   for (const m of list) {
     const item = document.createElement('div');
-    item.className = 'dd-item' + (state.activeModel && state.activeModel.sel === m.sel ? ' active' : '');
+    item.className = 'dd-item' + (effectiveModelSel() && effectiveModelSel() === m.sel ? ' active' : '');
     item.innerHTML =
       `<span class="dn">${escapeHtml(m.providerName)}</span>` +
       `<span class="dm">${escapeHtml(m.model)}</span>` +
@@ -3935,6 +4114,7 @@ function renderModelMenu() {
     item.addEventListener('click', async () => {
       state = await beast.setModel(m.sel);
       closeModelMenu();
+      await refreshBots().catch(() => {}); // bot modeli değiştiyse botsCache tazelensin
       applyState();
     });
     els.modelList.appendChild(item);
@@ -4386,6 +4566,7 @@ async function init() {
 
   beast.onWaEvent(onWaEvent);
   beast.onTgEvent(onTgEvent);
+  beast.onDcEvent(onDcEvent);
 
   els.gearBtn.addEventListener('click', openSettings);
   els.setClose.addEventListener('click', closeSettings);
@@ -4588,7 +4769,7 @@ async function init() {
   if ($('#botOverviewBack')) $('#botOverviewBack').addEventListener('click', () => openBotPage(null));
   if ($('#botChip')) $('#botChip').addEventListener('click', () => openBotPage(activeBotId));
   /* kalıcı aktif bot: restart sonrası aynı botun UI'ı açılır */
-  beast.botsActiveGet().then((r) => { activeBotId = (r && r.id) || 'beast'; updateBotChip(); renderBotCards(); }).catch(() => {});
+  beast.botsActiveGet().then((r) => { activeBotId = (r && r.id) || 'beast'; updateBotChip(); renderBotCards(); applyState(); }).catch(() => {});
   document.querySelectorAll('.btab').forEach((b) =>
     b.addEventListener('click', () => {
       document.querySelectorAll('.btab').forEach((x) => x.classList.remove('active'));
@@ -5101,7 +5282,7 @@ function ghCard(repo, isFav) {
       </div>
       ${repo.description ? `<div class="gh-desc" title="${escapeHtml(repo.description)}">${escapeHtml(repo.description)}</div>` : ''}
       <div class="gh-actions">
-        <button class="gh-fav ${isFav ? 'on' : ''}" data-act="fav">${isFav ? '★ Favoride' : '☆ Favorile'}</button>
+        <button class="gh-fav ${isFav ? 'on' : ''}" data-act="fav">${isFav ? '★ Favori' : '☆ Favorile'}</button>
         <button data-act="chat"><svg viewBox="0 0 24 24" width="11" height="11" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" style="vertical-align:-1px;margin-right:4px"><path d="M22 2 11 13"/><path d="M22 2 15 22l-4-9-9-4z"/></svg>Chate at</button>
         <button data-act="copy">⧉ Kopyala</button>
       </div>
@@ -5191,7 +5372,7 @@ $('#ghSearch').addEventListener('keydown', (e) => {
   updateGhSub();
   loadGhTrend();
 });
-/* sol sekme: Trend Depolar ⇄ Tüm Repolar (eşit bölünmüş, ortalanmış) */
+/* sol sekme: Trend Repolar ⇄ Tüm Repolar (eşit bölünmüş, ortalanmış) */
 document.querySelectorAll('.gh-tab').forEach((b) =>
   b.addEventListener('click', () => {
     ghState.ghTab = b.dataset.ghtab;