Merge branch 'main' into web-chat-approvals
Resolve C10 vs C11 in the shared shell: - keep both send hooks in the smoke's WebSocket shim (recording + scripted replies + synthetic approval acknowledgement) instead of the second assignment overwriting the first; - close the .chat-approval CSS rule so the C11 background-task rules are not swallowed by it (the list lost its 3-row cap and scrolling); - assert the folding invariant directly (no adjacent agent bubbles) instead of 'agent bubbles <= user prompts', which the growing operator session now legitimately breaks; - exercise the resource clamp by scroll overflow instead of a clone measurement that the clamped frame makes unreliable.
This commit is contained in:
@@ -1569,6 +1569,66 @@ code { background: var(--surface-2); padding: 1px 6px; border-radius: 6px; font-
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 10px;
|
||||
}
|
||||
/* Background tasks (C11): running shells only, three visible rows then scroll. */
|
||||
.chat-bg-tasks { display: grid; gap: 6px; }
|
||||
.chat-bg-tasks-head { display: flex; align-items: baseline; gap: 8px; }
|
||||
.chat-bg-tasks-title { font-size: 13px; font-weight: 600; }
|
||||
.chat-bg-tasks-count { font-size: 12px; }
|
||||
.chat-bg-tasks-list {
|
||||
display: grid;
|
||||
gap: 4px;
|
||||
/* Exactly BACKGROUND_TASK_VISIBLE_ROWS (3) rows of 40px + their 2 gaps of 4px
|
||||
(the Android derivation `(minTouch + SPACING_XS) * 3`); past that it scrolls. */
|
||||
max-height: 128px;
|
||||
overflow-y: auto;
|
||||
padding-right: 2px;
|
||||
}
|
||||
.chat-bg-task {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
width: 100%;
|
||||
min-height: 40px;
|
||||
padding: 4px 10px;
|
||||
text-align: left;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 8px;
|
||||
background: var(--surface);
|
||||
color: var(--text);
|
||||
font-size: 12px;
|
||||
cursor: pointer;
|
||||
}
|
||||
.chat-bg-task:hover { background: var(--surface-2); }
|
||||
.chat-bg-task.selected { border-color: var(--accent); }
|
||||
.chat-bg-task:focus-visible { outline: 2px solid var(--accent); outline-offset: -2px; }
|
||||
.chat-bg-task-glyph {
|
||||
flex: 0 0 auto;
|
||||
width: 0;
|
||||
height: 0;
|
||||
border-left: 7px solid var(--accent);
|
||||
border-top: 5px solid transparent;
|
||||
border-bottom: 5px solid transparent;
|
||||
}
|
||||
.chat-bg-task-status { flex: 0 0 auto; color: var(--accent); }
|
||||
.chat-bg-task-command {
|
||||
flex: 1 1 auto;
|
||||
min-width: 0;
|
||||
font-family: ui-monospace, SFMono-Regular, Menlo, monospace;
|
||||
color: var(--muted);
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.chat-bg-task-details { flex: 0 0 auto; font-size: 11px; }
|
||||
.chat-bg-task-detail {
|
||||
display: grid;
|
||||
gap: 4px;
|
||||
margin-top: 4px;
|
||||
padding: 10px;
|
||||
background: var(--surface-2);
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 10px;
|
||||
}
|
||||
.chat-approval-pending { border-color: color-mix(in srgb, var(--warn) 50%, var(--border)); }
|
||||
.chat-approval-head { display: flex; gap: 10px; align-items: center; }
|
||||
.chat-approval-shield { flex: 0 0 auto; width: 16px; height: 16px; color: var(--warn); }
|
||||
@@ -1630,6 +1690,28 @@ code { background: var(--surface-2); padding: 1px 6px; border-radius: 6px; font-
|
||||
border-color: color-mix(in srgb, var(--accent) 88%, white);
|
||||
}
|
||||
.chat-approval-jump { white-space: nowrap; font-size: 12px; border-color: var(--warn); color: var(--warn); }
|
||||
.chat-bg-task-label { font-size: 11px; }
|
||||
.chat-bg-task-command-full { font-size: 12px; overflow-wrap: anywhere; }
|
||||
.chat-bg-task-id { font-size: 12px; }
|
||||
.chat-bg-task-status-line { font-size: 12px; }
|
||||
.chat-bg-task-output {
|
||||
margin: 0;
|
||||
max-height: 220px;
|
||||
overflow: auto;
|
||||
padding: 8px;
|
||||
font: 12px/1.5 ui-monospace, SFMono-Regular, Menlo, monospace;
|
||||
white-space: pre-wrap;
|
||||
overflow-wrap: anywhere;
|
||||
background: var(--bg);
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 8px;
|
||||
}
|
||||
.chat-bg-task-note { font-size: 11px; }
|
||||
.chat-bg-task-spinner { width: 12px; height: 12px; border-width: 2px; }
|
||||
.chat-bg-task-error-row { display: flex; align-items: center; gap: 8px; }
|
||||
.chat-bg-task-error { font-size: 12px; color: var(--bad); }
|
||||
.chat-bg-task-retry,
|
||||
.chat-bg-task-refresh { align-self: flex-start; padding: 2px 10px; font-size: 12px; }
|
||||
|
||||
.chat-tool-panel {
|
||||
position: fixed;
|
||||
|
||||
Reference in New Issue
Block a user