feat: Stop archives a session, Sleep keeps it; SSH keys per type (#82); update Auto fix
- Stop (a tab's or pane's X, Close tab) now archives the session it held (DELETE /api/run/:id?archive=1); the new Sleep (moon left of the X, and in the tab, pane and session right-click menus) stops the pane but keeps the session listed to resume later. Shared endRuns in client/src/lib/stopSession.ts. - Git identity (#82): an account keeps an ED25519 AND an RSA key (AWS CodeCommit takes only RSA), every ssh git offers both, and a member's ~/.gitconfig gets core.sshCommand so a git typed in a terminal uses them. - Update dialog: Auto fix starts a Claude Code session on the install folder with the failed update's error. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -8,8 +8,11 @@
|
||||
* prompt it started on, else its tool and number; a combo tab shows every
|
||||
* pane's icon and name. A tab carries a state dot (waiting for you / error /
|
||||
* running — a combo shows the most urgent, with screen-reader text). A tab's
|
||||
* X stops every session in it (`DELETE /api/run/:id`) — after a confirm when
|
||||
* one is an AI tool, since it may be mid-turn; a shell closes at once. Arrow
|
||||
* X stops every session in it AND archives them (`endRuns`,
|
||||
* `DELETE /api/run/:id?archive=1`); the moon beside it (and the tab menu's
|
||||
* Sleep) stops its AI sessions but keeps them listed, to resume later. Either
|
||||
* asks first when one is an AI tool, since it may be mid-turn; a shell closes
|
||||
* at once. Arrow
|
||||
* keys, Home and End move between tabs (one tab stop, APG). Errors are
|
||||
* toasts. The `+` menu opens a new tab in the free slot the server picks
|
||||
* (`slot: "auto"`) — a plain shell (`POST /api/lanes/:id/start {shell: true}`)
|
||||
@@ -48,13 +51,13 @@ import {
|
||||
} from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useNavigate } from "react-router-dom";
|
||||
import { House, Plus, Settings, Settings2, SquareTerminal, X } from "lucide-react";
|
||||
import { House, Moon, Plus, Settings, Settings2, SquareTerminal, X } from "lucide-react";
|
||||
import { api } from "../../lib/api";
|
||||
import { useSettingsHref } from "../../lib/settingsLink";
|
||||
import type { RunHandle } from "../../lib/api";
|
||||
import { isSessionAwaitingInput, type Lane, type Session } from "../../lib/types";
|
||||
import { toast } from "../../lib/toast";
|
||||
import { confirmDialog } from "../../lib/confirm";
|
||||
import { canSleep, endRuns } from "../../lib/stopSession";
|
||||
import { copyText } from "../../lib/clipboard";
|
||||
import { isSubmitEnter } from "../../lib/keys";
|
||||
import { useAiTools } from "../../hooks/useAiTools";
|
||||
@@ -432,30 +435,10 @@ export function ConsoleTabs({
|
||||
}
|
||||
};
|
||||
|
||||
// An AI session may be mid-turn: stopping a tab holding one asks first. A
|
||||
// shell holds no agent.
|
||||
const close = async (tab: Tab) => {
|
||||
if (
|
||||
tab.runs.some((r) => r.tool !== "shell") &&
|
||||
!(await confirmDialog({
|
||||
title:
|
||||
tab.runs.length > 1
|
||||
? t("tabs.stopGroupTitle", { count: tab.runs.length })
|
||||
: t("tabs.stopTitle", { name: label(tab.focus) }),
|
||||
message: t("tabs.stopBody"),
|
||||
confirmLabel: t("tabs.stopConfirm"),
|
||||
destructive: true,
|
||||
}))
|
||||
)
|
||||
return;
|
||||
for (const r of tab.runs) {
|
||||
try {
|
||||
await api.run.kill(r.id);
|
||||
onClosed(r.id);
|
||||
} catch (err) {
|
||||
toast.error(err);
|
||||
}
|
||||
}
|
||||
// Stop archives the tab's sessions; Sleep keeps them listed to resume
|
||||
// (`endRuns` asks first for an AI pane, which may be mid-turn).
|
||||
const close = async (tab: Tab, sleep = false) => {
|
||||
for (const id of await endRuns(tab.runs, { sleep, name: label(tab.focus), t })) onClosed(id);
|
||||
};
|
||||
|
||||
const startRename = (r: RunHandle) => {
|
||||
@@ -638,6 +621,20 @@ export function ConsoleTabs({
|
||||
<span className="truncate">{tabLabel(tab)}</span>
|
||||
{state && <RunDot state={state} />}
|
||||
</button>
|
||||
{tab.runs.some(canSleep) && (
|
||||
<button
|
||||
type="button"
|
||||
data-testid={`console-tab-sleep-${tab.key}`}
|
||||
onClick={() => void close(tab, true)}
|
||||
aria-label={t("tabs.sleep")}
|
||||
title={t("tabs.sleep")}
|
||||
className={`shrink-0 rounded p-0.5 hover:bg-surface-4 hover:text-fg-primary ${
|
||||
active ? "" : "opacity-0 group-hover:opacity-100 focus:opacity-100"
|
||||
}`}
|
||||
>
|
||||
<Moon className="h-3.5 w-3.5" />
|
||||
</button>
|
||||
)}
|
||||
<button
|
||||
type="button"
|
||||
data-testid={`console-tab-close-${tab.key}`}
|
||||
@@ -785,6 +782,14 @@ export function ConsoleTabs({
|
||||
</>
|
||||
)}
|
||||
<MenuSeparator />
|
||||
{ctxTab.runs.some(canSleep) && (
|
||||
<MenuItem
|
||||
testId="console-tab-menu-sleep"
|
||||
onSelect={pickTab((tab) => void close(tab, true))}
|
||||
>
|
||||
{t("tabs.sleep")}
|
||||
</MenuItem>
|
||||
)}
|
||||
<MenuItem danger onSelect={pickTab((tab) => void close(tab))}>
|
||||
{t("tabs.close")}
|
||||
</MenuItem>
|
||||
|
||||
@@ -10,7 +10,9 @@
|
||||
* there, on its middle to swap), pick another live session for it, split it
|
||||
* right or down, or take the pane OUT of this tab (its session keeps running
|
||||
* in a tab of its own — so its icon is not the tab's stop X), or stop its
|
||||
* session there (X, `onStop`) without taking it out first. The grid shows
|
||||
* session there (X, `onStop`, which archives it) or put an AI session to
|
||||
* sleep (the moon left of it, `onSleep`: stopped but kept to resume) without
|
||||
* taking it out first. The grid shows
|
||||
* one tab's panes; `onChange` applies through `updateActive`, so a session
|
||||
* dropped or swapped in from another tab leaves that tab. A header names the pane's session and
|
||||
* shows its state dot, as its tab does.
|
||||
@@ -40,11 +42,13 @@ import {
|
||||
GripVertical,
|
||||
MessageSquare,
|
||||
Minimize2,
|
||||
Moon,
|
||||
Rows2,
|
||||
SquareTerminal,
|
||||
X,
|
||||
} from "lucide-react";
|
||||
import type { RunHandle } from "../../lib/api";
|
||||
import { canSleep } from "../../lib/stopSession";
|
||||
import { ContextMenu, MenuItem, MenuSeparator, useContextMenu } from "../ContextMenu";
|
||||
import {
|
||||
EMPTY_GROUPS,
|
||||
@@ -402,6 +406,7 @@ export function PaneGrid({
|
||||
onNewSplit,
|
||||
stateOf,
|
||||
onStop,
|
||||
onSleep,
|
||||
keyOf = (slot) => slot,
|
||||
kept = [],
|
||||
}: {
|
||||
@@ -410,8 +415,10 @@ export function PaneGrid({
|
||||
keyOf?: (slot: number) => number;
|
||||
/** Panes kept mounted, always hidden — never in the layout. */
|
||||
kept?: { key: number; node: ReactNode }[];
|
||||
/** Stops the session in `slot` (the header's X). */
|
||||
/** Stops (and archives) the session in `slot` (the header's X). */
|
||||
onStop?: (slot: number) => void;
|
||||
/** Sleeps the AI session in `slot`: stopped, kept to resume (the moon). */
|
||||
onSleep?: (slot: number) => void;
|
||||
/** A live AI run's state for its header dot (none for a shell). */
|
||||
stateOf?: (r: RunHandle) => RunState | null;
|
||||
/** Every slot to keep mounted; those not in the layout are hidden. */
|
||||
@@ -641,6 +648,18 @@ export function PaneGrid({
|
||||
>
|
||||
<Minimize2 className="h-3.5 w-3.5" />
|
||||
</button>
|
||||
{run && onSleep && canSleep(run) && (
|
||||
<button
|
||||
type="button"
|
||||
data-testid={`pane-sleep-${slot}`}
|
||||
title={t("panes.sleep")}
|
||||
aria-label={t("panes.sleep")}
|
||||
onClick={() => onSleep(slot)}
|
||||
className="flex h-6 w-6 items-center justify-center rounded text-fg-muted hover:bg-surface-4 hover:text-fg-primary"
|
||||
>
|
||||
<Moon className="h-3.5 w-3.5" />
|
||||
</button>
|
||||
)}
|
||||
{run && onStop && (
|
||||
<button
|
||||
type="button"
|
||||
@@ -696,6 +715,11 @@ export function PaneGrid({
|
||||
<MenuItem onSelect={pickPane((slot) => onChange((l) => closeInLayout(l, slot)))}>
|
||||
{t("panes.closeShort")}
|
||||
</MenuItem>
|
||||
{onSleep && canSleep(runOf(paneCtx.menu.item)) && (
|
||||
<MenuItem testId="pane-menu-sleep" onSelect={pickPane(onSleep)}>
|
||||
{t("panes.sleep")}
|
||||
</MenuItem>
|
||||
)}
|
||||
{onStop && runOf(paneCtx.menu.item) && (
|
||||
<MenuItem testId="pane-menu-stop" onSelect={pickPane(onStop)}>
|
||||
{t("panes.stop")}
|
||||
|
||||
Reference in New Issue
Block a user