feat: kill session — DELETE endpoint, hover × button with confirmation
This commit is contained in:
@@ -406,6 +406,7 @@ function buildTileHTML(session, index, mobile) {
|
|||||||
`<span class="tile-meta">${bellHtml}<span class="tile-time">${escapeHtml(timeStr)}</span></span>` +
|
`<span class="tile-meta">${bellHtml}<span class="tile-time">${escapeHtml(timeStr)}</span></span>` +
|
||||||
`</div>` +
|
`</div>` +
|
||||||
`<div class="tile-body"><pre>${ansiToHtml(lastLines)}</pre></div>` +
|
`<div class="tile-body"><pre>${ansiToHtml(lastLines)}</pre></div>` +
|
||||||
|
`<button class="tile-delete" data-session="${escapedName}" aria-label="Kill session">×</button>` +
|
||||||
`</article>`
|
`</article>`
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -442,6 +443,7 @@ function buildSidebarHTML(session, currentSession) {
|
|||||||
`<div class="sidebar-item-header">` +
|
`<div class="sidebar-item-header">` +
|
||||||
`<span class="sidebar-item-name">${escapedName}</span>` +
|
`<span class="sidebar-item-name">${escapedName}</span>` +
|
||||||
`${bellHtml}` +
|
`${bellHtml}` +
|
||||||
|
`<button class="sidebar-delete" data-session="${escapedName}" aria-label="Kill session">×</button>` +
|
||||||
`</div>` +
|
`</div>` +
|
||||||
`<div class="sidebar-item-body"><pre>${ansiToHtml(lastLines)}</pre></div>` +
|
`<div class="sidebar-item-body"><pre>${ansiToHtml(lastLines)}</pre></div>` +
|
||||||
`</article>`
|
`</article>`
|
||||||
@@ -1446,11 +1448,37 @@ async function createNewSession(name) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Kill a tmux session by name via DELETE /api/sessions/{name}.
|
||||||
|
* Shows a confirmation dialog before killing. Refreshes the session list on success.
|
||||||
|
* @param {string} name - The session name to kill.
|
||||||
|
*/
|
||||||
|
function killSession(name) {
|
||||||
|
if (!confirm('Kill session "' + name + '"?')) return;
|
||||||
|
api('DELETE', '/api/sessions/' + name)
|
||||||
|
.then(function() {
|
||||||
|
showToast('Session \'' + name + '\' killed');
|
||||||
|
pollSessions();
|
||||||
|
})
|
||||||
|
.catch(function(err) {
|
||||||
|
showToast('Failed to kill session: ' + (err.message || 'unknown error'));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Bind all static (once-only) event listeners for the app UI.
|
* Bind all static (once-only) event listeners for the app UI.
|
||||||
* Called once after restoreState() resolves.
|
* Called once after restoreState() resolves.
|
||||||
*/
|
*/
|
||||||
function bindStaticEventListeners() {
|
function bindStaticEventListeners() {
|
||||||
|
// Delegated kill-session handler (tiles + sidebar items are re-rendered each poll)
|
||||||
|
document.addEventListener('click', function(e) {
|
||||||
|
var deleteBtn = e.target.closest && e.target.closest('.tile-delete, .sidebar-delete');
|
||||||
|
if (!deleteBtn) return;
|
||||||
|
e.stopPropagation();
|
||||||
|
var name = deleteBtn.dataset.session;
|
||||||
|
if (name) killSession(name);
|
||||||
|
});
|
||||||
|
|
||||||
on($('back-btn'), 'click', closeSession);
|
on($('back-btn'), 'click', closeSession);
|
||||||
var newSessionBtn = $('new-session-btn');
|
var newSessionBtn = $('new-session-btn');
|
||||||
if (newSessionBtn) on(newSessionBtn, 'click', function() { showNewSessionInput(newSessionBtn); });
|
if (newSessionBtn) on(newSessionBtn, 'click', function() { showNewSessionInput(newSessionBtn); });
|
||||||
@@ -1687,6 +1715,8 @@ if (typeof module !== 'undefined' && module.exports) {
|
|||||||
showNewSessionInput,
|
showNewSessionInput,
|
||||||
showFabSessionInput,
|
showFabSessionInput,
|
||||||
createNewSession,
|
createNewSession,
|
||||||
|
// Kill session
|
||||||
|
killSession,
|
||||||
// Test-only helpers
|
// Test-only helpers
|
||||||
_setCurrentSessions,
|
_setCurrentSessions,
|
||||||
_setViewMode,
|
_setViewMode,
|
||||||
|
|||||||
@@ -877,6 +877,63 @@ body {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
/* ============================================================
|
||||||
|
Delete (kill) session buttons — appear on hover
|
||||||
|
============================================================ */
|
||||||
|
|
||||||
|
.tile-delete {
|
||||||
|
position: absolute;
|
||||||
|
top: 4px;
|
||||||
|
right: 6px;
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
color: var(--text-dim);
|
||||||
|
font-size: 14px;
|
||||||
|
cursor: pointer;
|
||||||
|
padding: 2px 6px;
|
||||||
|
border-radius: 4px;
|
||||||
|
opacity: 0;
|
||||||
|
transition: opacity 150ms ease;
|
||||||
|
z-index: 2;
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.session-tile:hover .tile-delete,
|
||||||
|
.session-tile:focus-within .tile-delete {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tile-delete:hover {
|
||||||
|
color: #ef4444;
|
||||||
|
background: rgba(239, 68, 68, 0.1);
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar-delete {
|
||||||
|
background: none;
|
||||||
|
border: none;
|
||||||
|
color: var(--text-dim);
|
||||||
|
font-size: 13px;
|
||||||
|
cursor: pointer;
|
||||||
|
padding: 1px 5px;
|
||||||
|
border-radius: 3px;
|
||||||
|
opacity: 0;
|
||||||
|
transition: opacity 150ms ease;
|
||||||
|
flex-shrink: 0;
|
||||||
|
line-height: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar-item:hover .sidebar-delete,
|
||||||
|
.sidebar-item:focus-within .sidebar-delete {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
.sidebar-delete:hover {
|
||||||
|
color: #ef4444;
|
||||||
|
background: rgba(239, 68, 68, 0.1);
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
|
||||||
/* ============================================================
|
/* ============================================================
|
||||||
Header actions + settings buttons
|
Header actions + settings buttons
|
||||||
============================================================ */
|
============================================================ */
|
||||||
|
|||||||
@@ -2382,6 +2382,20 @@ test('app.js source uses 500ms debounce for template input and references new_se
|
|||||||
assert.ok(source.includes('new_session_template'), 'must reference new_session_template setting key');
|
assert.ok(source.includes('new_session_template'), 'must reference new_session_template setting key');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('buildTileHTML includes tile-delete button with data-session attribute', () => {
|
||||||
|
const session = { name: 'my-session', snapshot: '', bell: { unseen_count: 0, seen_at: null, last_fired_at: null } };
|
||||||
|
const html = app.buildTileHTML(session, 0, false);
|
||||||
|
assert.ok(html.includes('tile-delete'), 'buildTileHTML must include tile-delete button class');
|
||||||
|
assert.ok(html.includes('data-session="my-session"'), 'tile-delete button must have data-session attribute');
|
||||||
|
});
|
||||||
|
|
||||||
|
test('buildSidebarHTML includes sidebar-delete button with data-session attribute', () => {
|
||||||
|
const session = { name: 'my-session', snapshot: '', bell: { unseen_count: 0, seen_at: null, last_fired_at: null } };
|
||||||
|
const html = app.buildSidebarHTML(session, null);
|
||||||
|
assert.ok(html.includes('sidebar-delete'), 'buildSidebarHTML must include sidebar-delete button class');
|
||||||
|
assert.ok(html.includes('data-session="my-session"'), 'sidebar-delete button must have data-session attribute');
|
||||||
|
});
|
||||||
|
|
||||||
test('createNewSession polls for session before auto-opening (not immediate setTimeout openSession)', () => {
|
test('createNewSession polls for session before auto-opening (not immediate setTimeout openSession)', () => {
|
||||||
// The old behavior was: setTimeout(() => openSession(...), 500) immediately after POST.
|
// The old behavior was: setTimeout(() => openSession(...), 500) immediately after POST.
|
||||||
// The new behavior must use a polling interval to wait for the session to appear in
|
// The new behavior must use a polling interval to wait for the session to appear in
|
||||||
|
|||||||
@@ -404,6 +404,26 @@ async def delete_current_session() -> dict:
|
|||||||
return {"active_session": None}
|
return {"active_session": None}
|
||||||
|
|
||||||
|
|
||||||
|
@app.delete("/api/sessions/{name}")
|
||||||
|
async def delete_session(name: str) -> dict:
|
||||||
|
"""Kill a tmux session by name.
|
||||||
|
|
||||||
|
Runs `tmux kill-session -t {name}`. Returns {ok: True, name: name}.
|
||||||
|
404 if session is not in the known session list (when non-empty).
|
||||||
|
Must be declared after DELETE /api/sessions/current so "current" routes correctly.
|
||||||
|
"""
|
||||||
|
known = get_session_list()
|
||||||
|
if known and name not in known:
|
||||||
|
raise HTTPException(status_code=404, detail=f"Session '{name}' not found")
|
||||||
|
|
||||||
|
try:
|
||||||
|
await run_tmux("kill-session", "-t", name)
|
||||||
|
except RuntimeError:
|
||||||
|
raise HTTPException(status_code=500, detail=f"Failed to kill session '{name}'")
|
||||||
|
|
||||||
|
return {"ok": True, "name": name}
|
||||||
|
|
||||||
|
|
||||||
@app.post("/api/heartbeat")
|
@app.post("/api/heartbeat")
|
||||||
async def heartbeat(payload: HeartbeatPayload) -> dict:
|
async def heartbeat(payload: HeartbeatPayload) -> dict:
|
||||||
"""Register or update a device heartbeat.
|
"""Register or update a device heartbeat.
|
||||||
|
|||||||
@@ -1020,3 +1020,49 @@ def test_create_session_rejects_missing_name(client):
|
|||||||
"""POST /api/sessions with missing name returns 422."""
|
"""POST /api/sessions with missing name returns 422."""
|
||||||
response = client.post("/api/sessions", json={})
|
response = client.post("/api/sessions", json={})
|
||||||
assert response.status_code == 422
|
assert response.status_code == 422
|
||||||
|
|
||||||
|
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
# DELETE /api/sessions/{name}
|
||||||
|
# ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
def test_delete_session_success(client, monkeypatch):
|
||||||
|
"""DELETE /api/sessions/{name} returns 200 with {ok: True, name: name} when session exists."""
|
||||||
|
from unittest.mock import AsyncMock
|
||||||
|
|
||||||
|
monkeypatch.setattr(
|
||||||
|
"muxplex.main.get_session_list", lambda: ["my-session", "other"]
|
||||||
|
)
|
||||||
|
monkeypatch.setattr("muxplex.main.run_tmux", AsyncMock(return_value=""))
|
||||||
|
|
||||||
|
response = client.delete("/api/sessions/my-session")
|
||||||
|
assert response.status_code == 200
|
||||||
|
data = response.json()
|
||||||
|
assert data["ok"] is True
|
||||||
|
assert data["name"] == "my-session"
|
||||||
|
|
||||||
|
|
||||||
|
def test_delete_session_calls_kill_session(client, monkeypatch):
|
||||||
|
"""DELETE /api/sessions/{name} calls tmux kill-session -t {name}."""
|
||||||
|
from unittest.mock import AsyncMock
|
||||||
|
|
||||||
|
monkeypatch.setattr("muxplex.main.get_session_list", lambda: ["my-session"])
|
||||||
|
mock_run_tmux = AsyncMock(return_value="")
|
||||||
|
monkeypatch.setattr("muxplex.main.run_tmux", mock_run_tmux)
|
||||||
|
|
||||||
|
client.delete("/api/sessions/my-session")
|
||||||
|
|
||||||
|
assert mock_run_tmux.called
|
||||||
|
args = mock_run_tmux.call_args[0]
|
||||||
|
assert args[0] == "kill-session"
|
||||||
|
assert "-t" in args
|
||||||
|
assert "my-session" in args
|
||||||
|
|
||||||
|
|
||||||
|
def test_delete_session_not_found(client, monkeypatch):
|
||||||
|
"""DELETE /api/sessions/{name} returns 404 when session is not in list."""
|
||||||
|
monkeypatch.setattr("muxplex.main.get_session_list", lambda: ["alpha", "beta"])
|
||||||
|
|
||||||
|
response = client.delete("/api/sessions/nonexistent")
|
||||||
|
assert response.status_code == 404
|
||||||
|
|||||||
Reference in New Issue
Block a user