' + esc(mcpStatusLine()) + '
'
- + (hint.startsWith('<') ? hint : '
' + esc(hint) + '
')
- + (MCP.lastError ? '
! ' + esc(MCP.lastError) + '
' : '')
- + (MCP.msg ? (MCP.msg.restart ? '
' + esc(MCP.msg.text) + ' Restart Agent Runtime
' : '
' + esc(MCP.msg.text) + '
') : '')
- + (!rows.length ? '
no MCP servers configured — add entries under `mcp.servers[]` in config.json
' : '')
- + (MCP.addModal ? mcpAddModalHTML() : (MCP.mode === 'list' ? mcpListHTML(rows) : mcpDetailHTML()) + (MCP.removeConfirm ? mcpRemoveModalHTML() : ''))
+ const dot = MCP.loading ? 'tk-dot--brand tk-dot--pulse' : MCP.auto ? 'tk-dot--green' : 'tk-dot--hollow';
+ const view = MCP.mode === 'list' ? mcpListHTML(rows) : mcpDetailHTML();
+ // ST-18: a modal sits over the dimmed (inert) list or detail it belongs to; its keys and buttons are its own.
+ const modal = MCP.addModal ? mcpAddModalHTML() : MCP.removeConfirm ? mcpRemoveModalHTML() : '';
+ return '
'
+ + '
' + esc(mcpStatusLine()) + ' ' + ic('plus') + 'Add server ' : '') + '
'
+ + (MCP.lastError ? '
' + ic('alert') + '' + esc(MCP.lastError) + '
' : '')
+ + (MCP.msg ? (MCP.msg.restart ? restartLine(MCP.msg.text) : '
' + ic('info') + '' + esc(MCP.msg.text) + '
') : '')
+ + (modal
+ ? '
' + view + '
' + modal + '
'
+ : view + (hint.startsWith('<') ? hint : ''))
+ '
';
}
function mcpPad(text, width) { text = String(text); return text.length >= width ? text.slice(0, width - 1) + ' ' : text.padEnd(width); }
+/* The server's mark: GitHub's when the name, command or URL says github, else the plug badge. */
+function mcpMark(cfg) {
+ const t = (cfg && cfg.transport) || {};
+ const hay = [cfg && cfg.name, t.command, Array.isArray(t.args) ? t.args.join(' ') : '', t.url].join(' ').toLowerCase();
+ return (/github/.test(hay) && logoHTML('github', '')) || '
' + ic('plug') + ' ';
+}
function mcpListHTML(rows) {
- if (!rows.length) return '
(no servers)
';
+ if (!rows.length) {
+ return '
' + ic('plug') + ' No MCP servers '
+ + '
no MCP servers configured — add entries under `mcp.servers[]` in config.json
' + sdTwin('(no servers)');
+ }
const cur = Math.max(0, Math.min(MCP.cursor, rows.length - 1));
const start = Math.max(0, Math.min(rows.length - MCP_MAX_ROWS, Math.max(0, cur - Math.floor(MCP_MAX_ROWS / 2))));
const slice = rows.slice(start, Math.min(rows.length, start + MCP_MAX_ROWS));
- const note = rows.some((r) => r.enabled) ? '
state not exposed — no MCP status route in this agent
' : '';
- return '
' + slice.map((r, idx) => {
+ const cfgs = mcpServers();
+ // ST-16: mark · name + honest state chip · description · transport · trust class · tool count.
+ const twin = slice.map((r, idx) => (idx + start === cur ? '>' : ' ') + ' ' + mcpPad(r.name, 18) + mcpPad('[' + r.state + ']', 11) + mcpPad(r.transportKind, 18) + mcpPad(r.trust, 16)
+ + r.toolCount + ' tools · — res · — prompts' + (r.description ? '\n ' + r.description : '')).join('\n');
+ return sdTwin(twin) + '
' + slice.map((r, idx) => {
const i = idx + start, sel = i === cur;
- // Row: `> name(18)[state](11)transport(18)trust(16) tools · — res · — prompts`, then the description
- return ''
- + '' + (sel ? '>' : ' ') + ' ' + esc(mcpPad(r.name, 18)) + ' '
- + '' + esc(mcpPad('[' + r.state + ']', 11)) + ' '
- + '' + esc(mcpPad(r.transportKind, 18) + mcpPad(r.trust, 16) + r.toolCount + ' tools · — res · — prompts') + ' '
- + (r.description ? ' ' + esc(r.description) + ' ' : '') + ' ';
- }).join('') + '
' + note;
+ const stateTitle = r.state === 'disabled' ? 'disabled in config.json' : 'state not exposed — no MCP status route in this agent';
+ return '
'
+ + mcpMark(cfgs.find((s) => s && s.name === r.name))
+ + '' + esc(r.name) + ' '
+ + '' + (r.state === 'disabled' ? 'disabled' : 'state —') + ' ' + esc(r.description) + ' ' : '') + '' + esc(r.transportKind) + ' '
+ + '' + esc(r.trust) + ' '
+ + '' + r.toolCount + (r.toolCount === 1 ? ' tool' : ' tools') + ' ';
+ }).join('') + '
'
+ + (rows.some((r) => r.enabled) ? '
' + ic('info') + 'state not exposed — no MCP status route in this agent
' : '');
}
function mcpDescribeTransport(cfg) {
const t = cfg.transport || {};
@@ -13542,52 +13674,62 @@ function mcpDescribeTransport(cfg) {
}
function mcpDetailHTML() {
const cfg = mcpServers().find((s) => s.name === MCP.detailName);
- if (!cfg) return '
(no server selected)
';
+ if (!cfg) return '
';
const row = mcpRows().find((r) => r.name === cfg.name);
const tools = mcpToolsFor(cfg.name);
const counts = {tools:String(tools.length), resources:'—', prompts:'—'};
- const bar = MCP_TAB_ORDER.map((tab, idx) => {
- const label = (idx + 1) + ':' + tab + '(' + counts[tab] + ')';
- return '
' + esc(tab === MCP.detailTab ? '[' + label + ']' : label) + ' ';
- }).join('
');
- let body;
- if (MCP.detailTab !== 'tools') body = '
not exposed by the agent\'s HTTP API
';
- else if (!tools.length) body = '
(empty)
';
+ const state = row ? row.state : '—', trust = row ? row.trust : 'approval_gated';
+ const stateTitle = state === 'disabled' ? 'disabled in config.json' : 'state not exposed — no MCP status route in this agent';
+ const twinBar = MCP_TAB_ORDER.map((tab, idx) => { const label = (idx + 1) + ':' + tab + '(' + counts[tab] + ')'; return tab === MCP.detailTab ? '[' + label + ']' : label; }).join(' ');
+ const seg = '
' + MCP_TAB_ORDER.map((tab) => ''
+ + esc(tab) + '' + esc(counts[tab]) + ' ').join('') + '
';
+ let body, twinBody = '';
+ if (MCP.detailTab !== 'tools') body = '
' + ic('eyeOff') + ' not exposed by the agent\'s HTTP API
';
+ else if (!tools.length) { body = '
' + ic('plug') + '
No tools '; twinBody = '(empty)'; }
else {
const cur = Math.max(0, Math.min(MCP.detailCursor, tools.length - 1));
const start = Math.max(0, Math.min(tools.length - MCP_MAX_ROWS, Math.max(0, cur - Math.floor(MCP_MAX_ROWS / 2))));
- body = tools.slice(start, start + MCP_MAX_ROWS).map((t, idx) => {
- const sel = idx + start === cur;
+ // ST-17: tool name in mono · description; the cursor row (j/k) carries .on.
+ body = '
' + tools.slice(start, start + MCP_MAX_ROWS).map((t, idx) => '
'
+ + '' + esc(t.rawName) + ' ' + esc(t.description) + '
').join('') + '
'
// mcp-detail.tsx formatTool prints `rawName (resourceClass)`; the resource class is not on /api/capabilities.
- return '
' + (sel ? '> ' : ' ') + esc(t.rawName) + '
' + (t.description ? '
' + esc(t.description) + '
' : '');
- }).join('') + '
(resource class is not exposed by the agent\'s HTTP API)
';
- }
- return '
' + esc(cfg.name) + ' [' + esc(row ? row.state : '—') + '] · trust: ' + esc(row ? row.trust : 'approval_gated') + '
'
- + (cfg.description ? '
' + esc(cfg.description) + '
' : '')
- + '
' + esc(mcpDescribeTransport(cfg)) + '
'
- + (row && row.enabled ? '
state not exposed — no MCP status route in this agent
' : '')
- + '
' + bar + '
'
- + '
' + body + '
';
+ + '
Resource class is not exposed by the agent\'s HTTP API.
';
+ }
+ return '
' + ic('chevL') + 'Servers Remove
'
+ + sdTwin(cfg.name + ' [' + state + '] · trust: ' + trust + '\n' + twinBar + (twinBody ? '\n' + twinBody : ''))
+ + '
' + mcpMark(cfg) + '
' + esc(cfg.name) + ' '
+ + '' + esc(trust) + ' '
+ + '' + (state === 'disabled' ? 'disabled' : 'state —') + ' '
+ + (cfg.description ? '
' + esc(cfg.description) + '
' : '')
+ + '
' + esc(mcpDescribeTransport(cfg)) + ' '
+ + (row && row.enabled ? '
' + ic('info') + 'state not exposed — no MCP status route in this agent
' : '')
+ + '
' + seg + '
' + body;
}
function mcpAddModalHTML() {
const m = MCP.addModal;
- return '
+ add MCP server '
- + '
Paste one MCP server config as JSON. Bare object, or the Claude Desktop / Cursor envelope `{ "mcpServers": { ... } }`.
'
- + '
Top-level `command` + `args` (no `transport` wrapper) is also accepted and auto-promoted to stdio.
'
- + '
'
- + (m.error ? '
! ' + esc(m.error) + '
' : '')
- + (m.submitting ? '
writing config…
' : '')
- + '
' + tuiBtn('Enter: submit', 'mcp:addSubmit', {disabled: m.submitting}) + '· Shift/Alt+Enter: newline · ' + tuiBtn('Esc: cancel', 'mcp:addCancel') + '· restart Atomic Agent for the new server to connect
'
- + '
';
+ return '
'
+ + '
' + ic('plug') + '
Add MCP server '
+ + '
Paste one MCP server config as JSON. Bare object, or the Claude Desktop / Cursor envelope { "mcpServers": { ... } } .
'
+ + '
'
+ + (m.error ? '
' + esc(m.error) + '
' : '')
+ + (m.submitting ? '
writing config…
' : '')
+ + '
Shift/Alt+Enter adds a line · restart Atomic Agent for the new server to connect '
+ + 'Cancel' + keycaps('esc') + ' '
+ + 'Add' + keycaps('↩') + '
'
+ // Secondary: under the actions, so the error and Add stay in view on a short window.
+ + '
Top-level command + args (no transport wrapper) is also accepted and auto-promoted to stdio.
';
}
function mcpRemoveModalHTML() {
const c = MCP.removeConfirm;
- return '
remove MCP server? '
- + '
name: ' + esc(c.name) + '
'
- + '
rewrites config.json; restart Atomic Agent to drop the live connection.
'
- + (c.error ? '
! ' + esc(c.error) + '
' : '')
- + (c.submitting ? '
working…
' : '
' + tuiBtn('y / Enter = confirm', 'mcp:removeConfirm') + '· ' + tuiBtn('n / Esc = keep', 'mcp:removeCancel') + '
')
- + '
';
+ return '
'
+ + '
' + ic('trash') + '
Remove MCP server? '
+ + '
name ' + esc(c.name) + ' '
+ + '
Rewrites config.json; restart Atomic Agent to drop the live connection.
'
+ + (c.error ? '
' + esc(c.error) + '
' : '')
+ + '
' + (c.submitting ? 'working… ' : '')
+ + 'Keep' + keycaps('N') + ' '
+ + 'Remove' + keycaps('Y') + '
';
}
/* persist-mcp-server.ts parseAddServerJson: the three accepted shapes —
a bare object, the `{ mcpServers: { name: {…} } }` envelope with exactly
@@ -15250,47 +15392,71 @@ function telegramTab() {
const owner = tgOwner();
let body = '';
if (TG.mode === 'tokenPrompt') body += tgTokenPromptHTML();
- else if (hasToken === null) body += '
reading .env…
';
+ else if (hasToken === null) body += '
';
else if (!hasToken) {
- // setup-state.ts not_connected (no token).
- body += '
Connect Telegram '
- + '
Create a bot with @BotFather, copy the token, and paste it here. The token is stored only on this machine.
'
- + '
Press Enter to paste a bot token
';
+ // setup-state.ts not_connected (no token). ST-28: one card, one action.
+ body += '
'
+ + '
' + ic('send') + ' '
+ + '
Connect Telegram '
+ + '
Create a bot with @BotFather, copy the token, and paste it here. The token is stored only on this machine.
'
+ + '
Paste a bot token' + keycaps('↩') + ' '
+ + sdTwin('Press Enter to paste a bot token') + '
';
} else if (owner === null) {
// setup-state.ts needs_pairing; the CTA would open the pairing window, which only the live channel can.
- body += '
One last step — confirm it\'s you '
- + '
Open Telegram, DM your bot any message. Atomic Agent will recognise you as the owner.
'
- + '
' + esc(TG_PAIRING_NOTE) + '
';
+ body += '
' + ic('user') + ' One last step — confirm it\'s you
'
+ + '
Open Telegram, DM your bot any message. Atomic Agent will recognise you as the owner.
'
+ + '
' + esc(TG_PAIRING_NOTE) + '
';
} else {
// Token + owner: the TUI would say "✅ Telegram is connected" only with the channel `up`, which the desktop cannot see.
- body += '
channel state is not exposed by the agent\'s HTTP API — the Telegram tab in `atag tui` shows it live
';
+ body += '
' + ic('info') + 'channel state is not exposed by the agent\'s HTTP API — the Telegram tab in `atag tui` shows it live
';
}
const advanced = TG.showAdvanced || (hasToken && owner !== null);
if (advanced && TG.mode !== 'tokenPrompt') body += tgAdvancedHTML(enabled, hasToken, owner);
- // telegram-panel.tsx keeps `·
` inside AdvancedControls; here it is always shown, because the desktop's message carries the restart the serve process needs.
- if (TG.message) body += '· ' + esc(TG.message) + (TG.restart ? ' (the agent loads .env and config.json at start) Restart Agent Runtime ' : '') + '
';
- return '' + body
- + '
' + (TG.showAdvanced ? 'a — hide advanced' : 'a — advanced') + '
` inside AdvancedControls; here it leads the tab, because the desktop's message carries the restart the serve process needs.
+ const msg = TG.message ? '' + ic('info') + '' + esc(TG.message)
+ + (TG.restart ? ' (the agent loads .env and config.json at start) ' : '') + ' '
+ + (TG.restart ? '' + ic('refresh') + 'Restart Agent Runtime ' : '') + '
' : '';
+ return '
' + msg + body + '
state unknown '
- + ' enabled ' + (enabled === null ? '—' : enabled ? 'yes' : 'no') + ' '
- + ' token ' + (hasToken === null ? '—' : hasToken ? 'set' : 'missing') + ' '
- + ' owner ' + (owner === null ? 'unset' : esc(String(owner))) + '
'
- + (TG.lastError ? '! ' + esc(TG.lastError) + '
' : '')
- + '' + tuiBtn('e — ' + (enabled ? 'disable' : 'enable'), 'telegram:enable', {disabled:TG.busy || enabled === null}) + '· ' + tuiBtn('r — restart', 'telegram:restart') + '· ' + tuiBtn('R — refresh', 'telegram:refresh') + '
'
- + '' + tuiBtn('T — clear token', 'telegram:clearToken', {disabled:TG.busy || !hasToken}) + '· ' + tuiBtn('O — clear owner', 'telegram:clearOwner', {disabled:TG.busy || owner === null}) + '· ' + tuiBtn('t — change token', 'telegram:token') + '· ' + tuiBtn('o — re-pair', 'telegram:pair', {disabled:true, title:TG_PAIRING_NOTE}) + '
'
- ;
+ const busy = TG.busy;
+ const facts = 'state unknown enabled ' + (enabled === null ? '—' : enabled ? 'yes' : 'no') + ' token ' + (hasToken === null ? '—' : hasToken ? 'set' : 'missing')
+ + ' owner ' + (owner === null ? 'unset' : String(owner));
+ const tokenChip = hasToken === null ? '— ' : hasToken ? 'set ' : 'missing ';
+ const ownerChip = owner === null ? 'unset ' : '' + esc(String(owner)) + ' ';
+ return sdTwin(facts)
+ + (TG.lastError ? '' + ic('alert') + '' + esc(TG.lastError) + '
' : '')
+ + ''
+ + '
State
The channel runs inside the agent; its live state is not readable here.
'
+ + '
unknown '
+ + '
'
+ + '
Token
TELEGRAM_BOT_TOKEN in .env
' + tokenChip
+ + '
Change token '
+ + '
Clear token '
+ + '
Owner
telegram.ownerUserId
' + ownerChip
+ + '
Re-pair '
+ + '
Clear owner '
+ + '
Channel
Restarts with the agent runtime.
'
+ + '
' + ic('refresh') + 'Refresh '
+ + '
Restart '
+ + '
bot token '
- + '
Paste the token issued by @BotFather. Saved to .env at mode 0600.
'
- + '
>
'
- + (t.error ? '
! ' + esc(t.error) + '
' : '')
- + '
Enter to save · Esc to cancel · Backspace to edit' + (t.submitting ? ' · saving…' : '') + '
'
+ + '
Bot token '
+ + '
Paste the token issued by @BotFather. Saved to .env at mode 0600.
'
+ + '
' + ic('key')
+ + ' '
+ + (t.error ? '
' + esc(t.error) + '
' : '')
+ + '
' + (t.submitting ? 'saving… ' : '') + 'Cancel' + keycaps('esc') + ' '
+ + 'Save' + keycaps('↩') + '
Import · ' + sourceLabel + ' → Atomic Agent ';
- if (IMP.notice) body += '! ' + esc(IMP.notice) + '
';
+ const report = (IMP.mode === 'preview' || IMP.mode === 'done') && IMP.report;
+ let body = report ? '' : '' + logoHTML(f.source === 'openclaw' ? 'openclaw' : 'hermes', 'sm') + '
' + sourceLabel + ' → Atomic Agent ';
+ if (IMP.notice) body += '' + ic('alert') + '' + esc(IMP.notice) + '
';
if (IMP.mode === 'configure') body += impFormHTML(f);
- else if (IMP.mode === 'running') body += 'importing… please wait
';
- else if ((IMP.mode === 'preview' || IMP.mode === 'done') && IMP.report) body += impReportHTML(IMP.report, IMP.mode === 'done');
- return '' + body + '
';
+ else if (IMP.mode === 'running') body += '';
+ else if (report) body += impReportHTML(IMP.report, IMP.mode === 'done');
+ return '' + sdTwin('Import · ' + sourceLabel + ' → Atomic Agent') + body + '
';
}
-function impLabel(label, focused) { return '' + esc((focused ? '▸' : ' ') + ' ' + label.padEnd(10) + ': ') + ' '; }
+/* The TUI's form label (`▸ source-of : `), kept for the terminal twin. */
+function impLabel(label, focused) { return (focused ? '▸' : ' ') + ' ' + label.padEnd(10) + ': '; }
function impFormHTML(f) {
const fc = f.focus;
- const text = (label, field, placeholder) => '' + impLabel(label, fc === field) + '
';
- const toggle = (label, field, hint) => '' + impLabel(label, fc === field) + '[' + (f[field] ? '✓' : ' ') + '] ' + (hint ? ' ' + esc(hint) + ' ' : '') + '
';
- return '';
-}
-/* import-panel.tsx ReportView / ReportRow / SummaryRow, over the parsed CLI report. */
+ const hermes = f.source === 'hermes';
+ // The agent's own option descriptions (src/import//import-options.ts).
+ const desc = hermes
+ ? {sessions:'Conversation history (state.db) → sessions.sqlite', cron:'Scheduled jobs (cron/jobs.json) → tasks.sqlite'}
+ : {sessions:'Transcript logs (agents//sessions/*.jsonl) → sessions.sqlite', cron:'Scheduled jobs (state/openclaw.sqlite cron_jobs) → tasks.sqlite'};
+ const sw = (field, title, d) => '';
+ const twin = [impLabel('source-of', fc === 'sourceType') + (hermes ? '‹hermes› / openclaw ' : ' hermes / ‹openclaw›'), impLabel('source', fc === 'source') + f.sourceDir,
+ impLabel('sessions', fc === 'sessions') + (f.sessions ? '[✓]' : '[ ]'), impLabel('cron', fc === 'cron') + (f.cron ? '[✓]' : '[ ]'),
+ hermes ? impLabel('secrets', fc === 'secrets') + (f.secrets ? '[✓]' : '[ ]') : null, impLabel('overwrite', fc === 'overwrite') + (f.overwrite ? '[✓]' : '[ ]'),
+ impLabel('limit', fc === 'limit') + (f.limit || '(no limit)')].filter((l) => l !== null).join('\n');
+ // ST-31. Only the two text inputs carry data-imp-focus: importKey's move() calls setSelectionRange on whatever does.
+ return '';
+}
+/* import-panel.tsx ReportView / ReportRow / SummaryRow, over the parsed CLI report. ST-32. */
function impReportHTML(report, executed) {
const items = report.items.slice(0, IMP_REPORT_ROWS);
const hidden = report.items.length - items.length;
const s = report.summary;
- const color = (st) => ({migrated:'sk-on', skipped:'ter', conflict:'sk-off', error:'tuierr'}[st] || 'ter');
- return '' + (executed ? 'result' : 'preview (dry-run)') + ' · ' + report.items.length + ' item' + (report.items.length === 1 ? '' : 's') + '
'
- + items.map((it) => {
- const arrow = it.source && it.destination ? it.source + ' → ' + it.destination : (it.source || it.destination || '');
- return '
' + esc(it.status.padEnd(8)) + ' [' + esc(it.kind) + '] ' + esc(arrow) + (it.reason ? ' (' + esc(it.reason) + ')' : '') + '
';
- }).join('')
- + (hidden > 0 ? '
… ' + hidden + ' more
' : '')
- + '
migrated=' + s.migrated + ' · skipped=' + s.skipped + ' · conflict=' + s.conflict + ' · error=' + s.error + '
'
- + (IMP.state === 'nothing' ? '
Nothing to import.
' : '')
+ const n = report.items.length, noun = n === 1 ? ' item' : ' items';
+ const tone = (st) => ({migrated:'tk-chip--green', conflict:'tk-chip--amber', error:'tk-chip--red'}[st] || '');
+ const arrowOf = (it) => (it.source && it.destination ? it.source + ' → ' + it.destination : (it.source || it.destination || ''));
+ const twin = [(executed ? 'result' : 'preview (dry-run)') + ' · ' + n + noun]
+ .concat(items.map((it) => it.status.padEnd(8) + ' [' + it.kind + '] ' + arrowOf(it) + (it.reason ? ' (' + it.reason + ')' : ''))).join('\n');
+ // The summary stays one line of text (`migrated=0 · skipped=2 · …`): the chips are inline, not flex items.
+ const sum = (label, v, t) => '
' + label + '=' + v + ' ';
+ return '
' + (executed ? 'Result' : 'Preview') + ' · ' + n + noun + ' '
+ + (executed ? (IMP.state === 'applied' ? 'applied ' : '') : 'dry run ')
+ + 'Back to form' + keycaps('↩') + ' '
+ : 'Edit' + keycaps('e') + ' Apply' + keycaps('↩') + ' ')
+ + ''
+ + '
' + sum('migrated', s.migrated, 'tk-chip--green') + ' · ' + sum('skipped', s.skipped, '')
+ + ' · ' + sum('conflict', s.conflict, 'tk-chip--amber') + ' · ' + sum('error', s.error, 'tk-chip--red') + '
'
+ + (items.length ? '
Outcome Kind Item '
+ + items.map((it) => '' + esc(it.status) + ' ' + esc(it.kind) + ' ' + esc(arrowOf(it)) + (it.reason ? ' (' + esc(it.reason) + ') ' : '') + '
' : '')
+ + (hidden > 0 ? '
… ' + hidden + ' more
' : '')
+ + (IMP.state === 'nothing' ? '
' + ic('info') + 'Nothing to import.
' : '')
+ (executed ? tuiHints([['Enter / Esc back to form', 'import:reset']]) : tuiHints([['y / Enter apply', 'import:apply', {disabled:IMP.busy}], ['e edit', 'import:reset'], ['Esc cancel', 'import:reset']]))
- + '