diff --git a/frontends/conductor.py b/frontends/conductor.py
index 8a15f4e2..25ac3dea 100644
--- a/frontends/conductor.py
+++ b/frontends/conductor.py
@@ -13,6 +13,7 @@ builtins.print = _filtered_print
from fastapi import FastAPI, WebSocket, WebSocketDisconnect
from fastapi.responses import FileResponse, PlainTextResponse, JSONResponse
+from fastapi.middleware.cors import CORSMiddleware
from pydantic import BaseModel
# allow: python frontends/conductor.py
@@ -27,6 +28,7 @@ PORT = 8900
HTML_PATH = os.path.join(os.path.dirname(os.path.abspath(__file__)), "conductor.html")
app = FastAPI(title="Conductor")
+app.add_middleware(CORSMiddleware, allow_origins=["*"], allow_methods=["*"], allow_headers=["*"])
class ChatIn(BaseModel):
msg: str
diff --git a/frontends/desktop/static/app.js b/frontends/desktop/static/app.js
index 6fb80c90..a6748770 100644
--- a/frontends/desktop/static/app.js
+++ b/frontends/desktop/static/app.js
@@ -221,9 +221,10 @@ const I18N = {
'app.title': 'GenericAgent 桌面版',
'brand.sub': '桌面终端',
'nav.chat': '聊天', 'nav.channels': '消息通道', 'nav.status': '状态面板',
- 'nav.collab': '协作动态', 'nav.token': 'Token 统计',
+ 'nav.collab': 'Agent 指挥', 'nav.token': 'Token 统计',
'foot.settings': '配置', 'foot.ver': 'GenericAgent · 桌面版',
'chat.startTitle': '开始对话', 'chat.startSub': '直接输入，或点预设功能一键启动',
+ 'preset.butler.t': 'Conductor', 'preset.butler.d': '复杂任务自动拆活，进度在 Conductor 查看',
'preset.goal.t': 'Goal 模式', 'preset.goal.d': '设定目标，自主完成',
'preset.explore.t': '自主探索', 'preset.explore.d': '自动浏览并周期汇总',
'preset.hive.t': 'Hive 协作', 'preset.hive.d': '多 worker 协同攻坚',
@@ -258,7 +259,41 @@ const I18N = {
'confirm.modelDelete': '确定删除该模型配置？',
'page.channels.title': '消息通道', 'page.channels.sub': '后台 IM 进程：列表、启停与日志（同 hub.pyw）',
'page.status.title': '状态面板', 'page.status.sub': 'hub.pyw 管理的后台进程/服务，集中查看与启停',
- 'page.collab.title': '协作动态', 'page.collab.sub': 'subagent / Hive worker 的实时状态与产出',
+ 'page.collab.title': 'Conductor', 'page.collab.sub': '交代目标，自动拆活与跟进',
+ 'collab.progressTitle': '分工进度',
+ 'collab.progressEmpty': '还没有任务在执行。告诉 Conductor 你的目标后，这里会显示拆分后的处理进度。',
+ 'collab.chatTitle': '与 Conductor 对话',
+ 'collab.placeholder': '描述你想完成的目标，Enter 发送…',
+ 'collab.guideTitle': '把要完成的事告诉 Conductor',
+ 'collab.guideWhen': '适合需要多步处理、要花一些时间才能完成的目标。日常聊天和快问快答，请用左侧「聊天」。',
+ 'collab.guideStep1t': '描述目标',
+ 'collab.guideStep1d': '在聊天框里写下你想做的事，发给 Conductor',
+ 'collab.guideStep2t': '自动拆解',
+ 'collab.guideStep2d': 'Conductor 自动拆解、分配任务，实时监督和调度',
+ 'collab.guideStep3t': '交付摘要',
+ 'collab.guideStep3d': 'Conductor 根据执行状态，呈上任务简报',
+ 'collab.guideStep4t': '随时调整',
+ 'collab.guideStep4d': '随时补充要求或细节，Conductor 都会处理',
+ 'collab.chipProgress': '现在进展如何？',
+ 'collab.chipPause': '先暂停当前任务',
+ 'collab.chipSummary': '总结一下目前的结果',
+ 'collab.showProgressTitle': '查看任务执行进度（窄屏）',
+ 'collab.progressStats': '{running} 进行中 · {done} 已完成 · {issue} 需关注',
+ 'collab.typing': 'Conductor 正在处理',
+ 'collab.offline': '无法连接 Conductor（8900）。请确认服务已启动且本地已穿透 8900 端口。',
+ 'collab.retry': '重试',
+ 'collab.reconnect': '连接断开，正在重连… 已保留上次任务进度。',
+ 'collab.reconnectIn': '{n} 秒后重试',
+ 'collab.sticky': '{n} 个任务进行中',
+ 'collab.stRunning': '执行中', 'collab.stReported': '已回报', 'collab.stPaused': '已暂停',
+ 'collab.stFailed': '遇到问题', 'collab.stTerminated': '已终止',
+ 'collab.summaryRunning': '正在处理中…', 'collab.summaryWait': '等待回报',
+ 'collab.taskFallback': '任务 {n}',
+ 'collab.timeJust': '刚刚',
+ 'collab.timeSec': '{n} 秒前',
+ 'collab.timeMin': '{n} 分钟前',
+ 'collab.timeHr': '{n} 小时前',
+ 'collab.timeDay': '{n} 天前',
'page.token.title': 'Token 统计', 'page.token.sub': '每会话与累计的 token 用量及估算成本',
'status.connecting': '连接中…', 'status.ready': '就绪', 'status.running': '运行中',
'status.disconnected': '未连接', 'status.stopped': '已停止', 'status.idle': '空闲',
@@ -327,9 +362,10 @@ const I18N = {
'app.title': 'GenericAgent Desktop',
'brand.sub': 'Desktop terminal',
'nav.chat': 'Chat', 'nav.channels': 'Channels', 'nav.status': 'Status',
- 'nav.collab': 'Collaboration', 'nav.token': 'Token usage',
+ 'nav.collab': 'Conductor', 'nav.token': 'Token usage',
'foot.settings': 'Settings', 'foot.ver': 'GenericAgent · Desktop',
'chat.startTitle': 'Start a conversation', 'chat.startSub': 'Type a message, or pick a preset',
+ 'preset.butler.t': 'Conductor', 'preset.butler.d': 'Delegate complex tasks; track progress in Conductor',
'preset.goal.t': 'Goal mode', 'preset.goal.d': 'Set a goal, run autonomously',
'preset.explore.t': 'Auto explore', 'preset.explore.d': 'Browse & summarize periodically',
'preset.hive.t': 'Hive', 'preset.hive.d': 'Multi-worker collaboration',
@@ -364,7 +400,41 @@ const I18N = {
'confirm.modelDelete': 'Delete this model profile?',
'page.channels.title': 'Channels', 'page.channels.sub': 'Background IM processes: list, start/stop, logs (hub.pyw style)',
'page.status.title': 'Status', 'page.status.sub': 'Background processes/services managed by hub.pyw',
- 'page.collab.title': 'Collaboration', 'page.collab.sub': 'Live state & output of subagents / Hive workers',
+ 'page.collab.title': 'Conductor', 'page.collab.sub': 'Describe a goal — split, delegate, and follow up',
+ 'collab.progressTitle': 'Progress',
+ 'collab.progressEmpty': 'No tasks running yet. After you describe a goal to Conductor, split tasks will appear here.',
+ 'collab.chatTitle': 'Chat with Conductor',
+ 'collab.placeholder': 'Describe your goal, Enter to send…',
+ 'collab.guideTitle': 'Tell Conductor what you want done',
+ 'collab.guideWhen': 'Best for multi-step goals that take a while. For everyday chat and quick questions, use Chat in the sidebar.',
+ 'collab.guideStep1t': 'Describe your goal',
+ 'collab.guideStep1d': 'Write what you want done in the chat box and send it to Conductor',
+ 'collab.guideStep2t': 'Auto breakdown',
+ 'collab.guideStep2d': 'Conductor breaks down, assigns, monitors, and coordinates',
+ 'collab.guideStep3t': 'Summary',
+ 'collab.guideStep3d': 'Conductor delivers a briefing based on execution status',
+ 'collab.guideStep4t': 'Adjust anytime',
+ 'collab.guideStep4d': 'Add requirements or details anytime — Conductor handles them',
+ 'collab.chipProgress': 'How is it going?',
+ 'collab.chipPause': 'Pause current tasks',
+ 'collab.chipSummary': 'Summarize progress so far',
+ 'collab.showProgressTitle': 'View task progress (narrow screens)',
+ 'collab.progressStats': '{running} running · {done} done · {issue} need attention',
+ 'collab.typing': 'Conductor is working',
+ 'collab.offline': 'Cannot reach Conductor (8900). Start the service and forward port 8900.',
+ 'collab.retry': 'Retry',
+ 'collab.reconnect': 'Disconnected — reconnecting… Your last progress is kept.',
+ 'collab.reconnectIn': 'Retry in {n}s',
+ 'collab.sticky': '{n} task(s) running',
+ 'collab.stRunning': 'Running', 'collab.stReported': 'Reported', 'collab.stPaused': 'Paused',
+ 'collab.stFailed': 'Issue', 'collab.stTerminated': 'Ended',
+ 'collab.summaryRunning': 'Working…', 'collab.summaryWait': 'Awaiting report',
+ 'collab.taskFallback': 'Task {n}',
+ 'collab.timeJust': 'just now',
+ 'collab.timeSec': '{n}s ago',
+ 'collab.timeMin': '{n}m ago',
+ 'collab.timeHr': '{n}h ago',
+ 'collab.timeDay': '{n}d ago',
'page.token.title': 'Token usage', 'page.token.sub': 'Per-session and total token usage & estimated cost',
'status.connecting': 'Connecting…', 'status.ready': 'Ready', 'status.running': 'Running',
'status.disconnected': 'Disconnected', 'status.stopped': 'Stopped', 'status.idle': 'Idle',
@@ -499,6 +569,14 @@ async function bridgeFetch(path, opts = {}) {
return data;
}
function t(key) { return (I18N[lang] && I18N[lang][key]) || (I18N.zh[key]) || key; }
+window.gaT = t;
+document.addEventListener('collab:running-count', e => {
+ const b = document.getElementById('collab-badge');
+ if (!b) return;
+ const n = e.detail?.count || 0;
+ b.hidden = !n;
+ b.textContent = n ? (n > 9 ? '9+' : String(n)) : '';
+});
function optionalPh(key) {
const sep = (lang === 'en') ? ', ' : '，';
return `${t('common.optional')}${sep}${t(key)}`;
@@ -513,6 +591,7 @@ function applyI18n() {
});
document.querySelectorAll('[data-i18n-title]').forEach(el => { el.setAttribute('title', t(el.dataset.i18nTitle)); });
renderLangList();
+ window.collabRetranslate?.();
}
// 语言对应国旗 SVG(en 用美国旗,按要求)
const FLAGS = {
@@ -665,12 +744,22 @@ function applyAppearance(nextApp, nextPlain, { persist } = { persist: true }) {
/* ═══════════════ 侧边栏导航 ═══════════════ */
const nav = document.getElementById('nav');
const pages = document.querySelectorAll('#pages .page');
+let currentPage = 'chat';
+function gaGoPage(key) {
+ const item = nav?.querySelector(`.nav-item[data-page="${key}"]`);
+ if (!item) return;
+ currentPage = key;
+ nav.querySelectorAll('.nav-item').forEach(n => n.classList.toggle('active', n === item));
+ pages.forEach(p => p.classList.toggle('active', p.dataset.page === key));
+ renderSessionList();
+ window.gaSetActiveFileComposer?.(key === 'collab' ? 'collab' : 'chat');
+ if (key === 'collab') window.collabInit?.();
+}
+window.gaGoPage = gaGoPage;
nav.addEventListener('click', (e) => {
const item = e.target.closest('.nav-item');
if (!item) return;
- const key = item.dataset.page;
- nav.querySelectorAll('.nav-item').forEach(n => n.classList.toggle('active', n === item));
- pages.forEach(p => p.classList.toggle('active', p.dataset.page === key));
+ gaGoPage(item.dataset.page);
});
/* ═══════════════ 弹窗开关 ═══════════════ */
@@ -1313,7 +1402,7 @@ function renderSessionList() {
const r = state.runtime.get(sess.id);
const busy = !!(r && r.busy);
const item = document.createElement('div');
- item.className = 'conv-item' + (sess.id === state.activeId ? ' active' : '') + (busy ? '' : ' idle');
+ item.className = 'conv-item' + (currentPage === 'chat' && sess.id === state.activeId ? ' active' : '') + (busy ? '' : ' idle');
item.dataset.id = sess.id;
const pinSvg = sess.pinned ? `` : '';
item.innerHTML =
@@ -1485,8 +1574,9 @@ async function pollSession(sess) {
function removeUsedPendingFiles(usedFiles) {
if (!usedFiles.length) return;
const usedSids = new Set(usedFiles.map(f => f.sid));
+ const touched = new Set(usedFiles.map(f => fileCtx(f)));
state.pendingFiles = state.pendingFiles.filter(f => !usedSids.has(f.sid));
- renderThumbStrip();
+ touched.forEach(ctx => renderThumbStrip(ctx));
}
function clearDraft(sess) {
@@ -1702,6 +1792,8 @@ document.querySelectorAll('.feature-grid').forEach(grid => {
return;
}
if (!key) { inputEl.focus(); closeModals(); return; }
+ const bp = BUILTIN_PRESETS.find(p => p.key === key);
+ if (bp?.navigate) { closeModals(); gaGoPage(bp.navigate); window.collabFocus?.(); return; }
const prompt = I18N[lang]['presetPrompt.' + key] || I18N.zh['presetPrompt.' + key];
closeModals();
if (prompt) sendPrompt(prompt);
@@ -2010,6 +2102,72 @@ const imgInput = document.getElementById('img-input');
const thumbStrip = document.getElementById('thumb-strip');
const uploadBtn = document.getElementById('upload-btn');
const chatPanel = document.querySelector('main.main');
+let activeFileComposer = 'chat';
+
+function fileCtx(f) { return f.ctx || 'chat'; }
+function filesForCtx(ctx) { return state.pendingFiles.filter(f => fileCtx(f) === ctx); }
+
+function composerCfg(ctx = activeFileComposer) {
+ if (ctx === 'collab') {
+ return {
+ input: document.getElementById('collab-input'),
+ strip: document.getElementById('collab-thumb-strip'),
+ uploadBtn: document.getElementById('collab-upload-btn'),
+ imgInput: document.getElementById('collab-img-input'),
+ dropZone: document.querySelector('.collab-chat'),
+ };
+ }
+ return { input: inputEl, strip: thumbStrip, uploadBtn, imgInput, dropZone: chatPanel };
+}
+
+function renderThumbStrip(ctx = activeFileComposer) {
+ const cfg = composerCfg(ctx);
+ if (!cfg.strip) return;
+ const files = filesForCtx(ctx);
+ if (files.length === 0) {
+ cfg.strip.innerHTML = '';
+ cfg.strip.hidden = true;
+ return;
+ }
+ cfg.strip.innerHTML = files.map(f => {
+ if (f.isImage && f.dataUrl) {
+ return `
';
+ list.appendChild(draftEl);
+ requestAnimationFrame(scrollMsgs);
+ }
+
+ function relTime(ts) {
+ if (!ts) return '';
+ const ms = typeof ts === 'number' ? (ts > 1e12 ? ts : ts * 1000) : Date.parse(ts);
+ if (!ms || Number.isNaN(ms)) return '';
+ const sec = Math.max(0, Math.floor((Date.now() - ms) / 1000));
+ if (sec < 10) return t('collab.timeJust');
+ if (sec < 60) return t('collab.timeSec').replace('{n}', sec);
+ const min = Math.floor(sec / 60);
+ if (min < 60) return t('collab.timeMin').replace('{n}', min);
+ const hr = Math.floor(min / 60);
+ return hr < 24 ? t('collab.timeHr').replace('{n}', hr) : t('collab.timeDay').replace('{n}', Math.floor(hr / 24));
+ }
+
+ function mapStatus(status, reply) {
+ const r = (reply || '').trim();
+ if (status === 'running') return 'running';
+ if (status === 'failed') return 'failed';
+ if (status === 'aborted') return 'terminated';
+ if (status === 'stopped') return r ? 'reported' : 'paused';
+ return 'paused';
+ }
+
+ function normalizeWorker(raw) {
+ if (!titleSeen.has(raw.id)) titleSeen.set(raw.id, ++titleSeq);
+ const ui = mapStatus(raw.status, raw.reply);
+ let title = String(raw.prompt ?? '').replace(/^[\s请帮我麻烦]+/u, '').trim();
+ if (!title) title = t('collab.taskFallback').replace('{n}', titleSeen.get(raw.id));
+ else {
+ title = (title.split(/[\n。！？.!?]/)[0] || '').trim();
+ if (title.length > 18) title = title.slice(0, 18) + '…';
+ }
+ const reply = String(raw.reply || '').replace(/\s+/g, ' ').trim();
+ let summary = reply ? (reply.length > 80 ? reply.slice(0, 80) + '…' : reply) : t(ui === 'running' ? 'collab.summaryRunning' : 'collab.summaryWait');
+ return { id: raw.id, title, status: ui, summary, fullReply: raw.reply || '', updatedAt: raw.updated_at };
+ }
+
+ function syncProgressToggle() {
+ const btn = $('collab-progress-toggle'), body = $('collab-body');
+ if (!btn || !body) return;
+ const split = body.classList.contains('collab-body--split');
+ btn.hidden = !split;
+ body.classList.toggle('collab-progress-open', split && S.progressOpen);
+ }
+
+ function setConnUi() {
+ const off = $('collab-offline'), recon = $('collab-reconnect'), inp = $('collab-input'), btn = $('collab-send');
+ const avail = S.serviceAvailable;
+ const trying = !avail && !S.everConnected && S.failCount < FAIL_MAX;
+ if (off) off.hidden = avail || S.reconnecting || trying;
+ if (recon) {
+ recon.hidden = !S.reconnecting;
+ recon.textContent = S.reconnecting && S.reconnectAt > Date.now()
+ ? t('collab.reconnect') + ' ' + t('collab.reconnectIn').replace('{n}', Math.ceil((S.reconnectAt - Date.now()) / 1000))
+ : t('collab.reconnect');
+ }
+ if (inp) inp.disabled = !avail;
+ if (btn) btn.disabled = !avail;
+ syncDraft();
+ syncProgressToggle();
+ }
+
+ let cardMenu = null;
+ function hideCardMenu() { if (cardMenu) { cardMenu.remove(); cardMenu = null; } }
+ function showCardMenu(x, y, sid) {
+ hideCardMenu();
+ cardMenu = document.createElement('div');
+ cardMenu.className = 'ctx-menu';
+ cardMenu.style.left = x + 'px';
+ cardMenu.style.top = y + 'px';
+ cardMenu.innerHTML = '';
+ cardMenu.querySelector('.ctx-item').onmousedown = (e) => {
+ e.stopPropagation();
+ fetch(`http://${location.hostname}:8900/subagent/${sid}`, { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ action: 'kill' }) });
+ hideCardMenu();
+ };
+ document.body.appendChild(cardMenu);
+ setTimeout(() => document.addEventListener('mousedown', hideCardMenu, { once: true }), 0);
+ }
+
+ let drawerEl = null;
+ function closeWorkerDrawer() { if (drawerEl) { drawerEl.remove(); drawerEl = null; } }
+ function openWorkerDrawer(w) {
+ closeWorkerDrawer();
+ drawerEl = document.createElement('div');
+ drawerEl.className = 'collab-drawer-wrap';
+ drawerEl.innerHTML = ``;
+ drawerEl.querySelector('.collab-drawer-backdrop').onclick = closeWorkerDrawer;
+ drawerEl.querySelector('.collab-drawer-close').onclick = closeWorkerDrawer;
+ document.body.appendChild(drawerEl);
+ }
+
+ function renderWorkers() {
+ const box = $('collab-workers'), empty = $('collab-progress-empty');
+ if (!box) return;
+ if (empty) empty.hidden = S.workers.length > 0;
+ box.innerHTML = S.workers.map(w => `
+
+ ${ST_ICONS[w.status] || ''}${esc(t(ST_KEYS[w.status] || 'collab.stPaused'))}${w.updatedAt ? `${esc(relTime(w.updatedAt))}` : ''}
+ ${esc(w.title)}
+ ${esc(w.summary)}
+ `).join('');
+ box.querySelectorAll('.collab-card').forEach(el => {
+ el.addEventListener('contextmenu', e => {
+ e.preventDefault();
+ showCardMenu(e.clientX, e.clientY, el.dataset.sid);
+ });
+ el.addEventListener('click', () => {
+ const w = S.workers.find(w => w.id === el.dataset.sid);
+ if (w) openWorkerDrawer(w);
+ });
+ });
+ const running = S.workers.filter(w => w.status === 'running').length;
+ S.runningCount = running;
+ document.dispatchEvent(new CustomEvent('collab:running-count', { detail: { count: running } }));
+ const sticky = $('collab-sticky');
+ if (sticky) { sticky.hidden = !running; sticky.textContent = t('collab.sticky').replace('{n}', running); }
+ const stats = $('collab-progress-stats');
+ if (stats) {
+ const has = S.workers.length > 0;
+ stats.hidden = !has;
+ if (has) stats.textContent = t('collab.progressStats')
+ .replace('{running}', running)
+ .replace('{done}', S.workers.filter(w => w.status === 'reported').length)
+ .replace('{issue}', S.workers.filter(w => w.status === 'failed' || w.status === 'terminated').length);
+ }
+ }
+
+ function renderUserMsg(item) {
+ const sub = n => (window.gaFileSubLabel && window.gaFileSubLabel(n)) || n;
+ const imgs = (item.images || []).map(im => `})
`).join('');
+ const files = (item.files || []).map(f => {
+ const name = f.name || 'file';
+ return `${FC_SVG}${esc(name)}${esc(sub(name))}
`;
+ }).join('');
+ const clean = stripAttach(item.msg);
+ const text = clean ? `${esc(clean).replace(/\n/g, '
')}
` : '';
+ return `${files ? `
${files}
` : ''}${imgs ? `
${imgs}
` : ''}${text}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -451,7 +508,7 @@
-
+