Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion scripts/cmux-next/type-scale-baseline.tsv
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ webviews/src/agent-session/acpmux/keys.css size 1
webviews/src/agent-session/acpmux/mockFixture.ts size 2
webviews/src/agent-session/acpmux/newtab/screen.css size 10
webviews/src/agent-session/acpmux/prototype/prototype.css size 17
webviews/src/agent-session/acpmux/styles.css size 46
webviews/src/agent-session/acpmux/styles.css size 43
webviews/src/agent-session/acpmux/subagents/subagents.css size 2
webviews/src/agent-session/acpmux/threadMinimap/threadMinimap.css size 1
webviews/src/gallery/env.ts size 1
Expand Down
4 changes: 2 additions & 2 deletions webviews/scripts/design-tokens-baseline.jsonl
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
{"file":"agent-session/acpmux/prototype/prototype.css","kind":"spacing","property":"padding","values":{"44px 8px 0 4px":1,"0 9px":2,"2px":1,"14px 10px 6px 17px":1,"0 5px":2,"5px 8px 0":1,"14px 18px":1,"0 10px 0 12px":1,"40px max(32px, calc(50% - 320px)) 0":1,"0 14px":1,"0 10px 0 16px":1,"0 8px 0 11px":1}}
{"file":"agent-session/acpmux/prototype/prototype.css","kind":"spacing","property":"padding-left","values":{"34px":1,"9px":1}}
{"file":"agent-session/acpmux/prototype/prototype.css","kind":"spacing","property":"padding-top","values":{"44px":1}}
{"file":"agent-session/acpmux/question/QuestionEnded.gallery.css","kind":"spacing","property":"padding","values":{"7px 10px":1,"2px 0 2px 10px":1}}
{"file":"agent-session/acpmux/question/QuestionEnded.gallery.css","kind":"spacing","property":"padding","values":{"2px 0 2px 10px":1}}
{"file":"agent-session/acpmux/replay/replay.css","kind":"height","property":"height","values":{"6px":1}}
{"file":"agent-session/acpmux/replay/replay.css","kind":"spacing","property":"gap","values":{"6px":1}}
{"file":"agent-session/acpmux/replay/replay.css","kind":"spacing","property":"padding","values":{"2px 7px":1,"6px 8px":1}}
Expand Down Expand Up @@ -163,7 +163,7 @@
{"file":"agent-session/acpmux/styles.css","kind":"height","property":"height","values":{"16px":7,"7px":1,".5px":1,"48px":1,"18px":1,"12px":3,"22px":7,"31px":1,"40px":3,"56px":4,"42px":2,"1px":1,"26px":5,"34px":1,"30px":1,"8px":2,"14px":1,"36px":1,"180px":2,"360px":1,"6px":2,"164px":1,"68px":1,"max(var(--ui-row-height,28px),calc(96px * var(--cmux-interface-scale,1)))":1,"44px":1,"17px":1,"21px":1,"5px":1}}
{"file":"agent-session/acpmux/styles.css","kind":"height","property":"min-height","values":{"34px":2,"38px":1,"30px":1,"16px":1,"128px":1,"36px":1,"58px":1,"48px":1,"46px":1,"56px":1,"44px":1}}
{"file":"agent-session/acpmux/styles.css","kind":"spacing","property":"gap","values":{"7px":1,"6px":19,"10px":10,"2px":9,"14px":1,"5px":3,"3px":2,"6px 8px":1,"11px":1,"var(--acp-row-gap,7px)":1}}
{"file":"agent-session/acpmux/styles.css","kind":"spacing","property":"padding","values":{"16px var(--cv-inset,max(18px,calc((100% - 760px)/2)))":1,"9px 12px":2,"9px":1,"5px 0":2,"3px 0":1,"0 var(--cv-inset,max(18px,calc((100% - 760px)/2)))":1,"11px":1,"7px 12px":1,"0 var(--cv-inset,max(18px,calc((100% - 760px)/2))) 16px":1,"15px 16px 8px":1,"0 10px":6,"6px 6px 6px 12px":1,"0 8px 0 6px":2,"0 6px 0 8px":1,"2px 6px":3,"5px var(--ui-row-padding-inline)":1,"0 14px":1,"clamp(48px,16vh,168px) max(var(--cv-edge,18px),calc((100% - var(--cv-column,720px))/2)) 32px":1,"0 8px 0 18px":1,"3px":2,"0 8px 0 10px":1,"2px 0 4px":1,"3px 6px 3px 12px":1,"0 6px 0 12px":1,"6px":2,"5px 10px":2,"6px 10px 8px":1,"6px 8px":4,"7px 8px":2,"0 2px":1,"0 5px":3,"0 max(16px,calc((100% - 760px)/2)) 12px":1,"4px 10px 2px":1,"2.5px":1,"0 9px":1,"6px 16px":1,"0 6px 0 16px":1,"4px 6px 4px 12px":1,"0 6px":1,"var(--acp-row-pad-y,11px)":1,"var(--acp-row-pad-y,7px) 10px":1,"var(--acp-row-pad-y,5px) 0":1,"6px 8px 0":2,"4px 10px 6px":1,"12px 8px 2px 12px":1,"2px 5px 4px":1,"14px 76px 14px 28px":1,"0 var(--cv-inset,max(18px,calc((100% - 760px)/2))) 8px":1,"11px 12px":1,"6px 12px":1,"0 var(--cv-inset,max(18px,calc((100% - 760px)/2))) 6px":1,"0 7px 0 8px":1,"10px 14px":1,"0 7px":1,"8px 14px 0":2,"2px 9px":1,"0.5px 4px":1,"10px":1,"10px 0 0":1,"5px 6px 5px 12px":1,"7px 10px":1,"4px 2px":2,"0 3px":1,"4px 10px":1,"3px 6px":1,"2px 4px":1}}
{"file":"agent-session/acpmux/styles.css","kind":"spacing","property":"padding","values":{"16px var(--cv-inset,max(18px,calc((100% - 760px)/2)))":1,"9px 12px":2,"9px":1,"5px 0":2,"3px 0":1,"0 var(--cv-inset,max(18px,calc((100% - 760px)/2)))":1,"11px":1,"7px 12px":1,"0 var(--cv-inset,max(18px,calc((100% - 760px)/2))) 16px":1,"15px 16px 8px":1,"0 10px":6,"6px 6px 6px 12px":1,"0 8px 0 6px":2,"0 6px 0 8px":1,"2px 6px":3,"5px var(--ui-row-padding-inline)":1,"0 14px":1,"clamp(48px,16vh,168px) max(var(--cv-edge,18px),calc((100% - var(--cv-column,720px))/2)) 32px":1,"0 8px 0 18px":1,"3px":2,"0 8px 0 10px":1,"2px 0 4px":1,"3px 6px 3px 12px":1,"0 6px 0 12px":1,"6px":2,"5px 10px":2,"6px 10px 8px":1,"6px 8px":4,"7px 8px":2,"0 2px":1,"0 5px":3,"0 max(16px,calc((100% - 760px)/2)) 12px":1,"4px 10px 2px":1,"2.5px":1,"0 9px":1,"6px 16px":1,"0 6px 0 16px":1,"4px 6px 4px 12px":1,"0 6px":1,"var(--acp-row-pad-y,11px)":1,"var(--acp-row-pad-y,7px) 10px":1,"var(--acp-row-pad-y,5px) 0":1,"6px 8px 0":2,"4px 10px 6px":1,"12px 8px 2px 12px":1,"2px 5px 4px":1,"14px 76px 14px 28px":1,"0 var(--cv-inset,max(18px,calc((100% - 760px)/2))) 8px":1,"11px 12px":1,"6px 12px":1,"0 var(--cv-inset,max(18px,calc((100% - 760px)/2))) 6px":1,"0 7px 0 8px":1,"10px 14px":1,"0 7px":1,"8px 14px 0":2,"2px 9px":1,"0.5px 4px":1,"10px":1,"10px 0 0":1,"5px 6px 5px 12px":1,"4px 2px":1,"0 3px":1,"4px 10px":1,"3px 6px":1,"2px 4px":1}}
{"file":"agent-session/acpmux/styles.css","kind":"spacing","property":"padding-bottom","values":{"10px":1,"7px":1}}
{"file":"agent-session/acpmux/styles.css","kind":"spacing","property":"padding-top","values":{"6px":1,"7px":1}}
{"file":"agent-session/acpmux/styles.css","kind":"spacing","property":"row-gap","values":{"6px":1}}
Expand Down
5 changes: 3 additions & 2 deletions webviews/src/agent-session/acpmux/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ import { ComputerUsePreviewCard } from "./computerUse/ComputerUsePreviewCard";
import { PermissionCard } from "./PermissionCard";
import { cardTakesShortcuts } from "./permissionKeys";
import { QuestionCard } from "./question/QuestionCard";
import { PermissionQuestion } from "./question/PermissionQuestion";
import { QUESTION_RECORD } from "./question/record";
import { DECISION_TEXT, PERMISSION_RECORD } from "./permissions/record";
import type { QuestionReply } from "./question/model";
Expand Down Expand Up @@ -4245,7 +4246,7 @@ const answerPermission = (permission: AcpmuxPermission) => (optionId: string) =>

/// Sends a question card's reply: the harness's option (absent cancels) and its answers. The card
/// shows a refusal (the promise rejects) and takes input again for a retry.
const replyToQuestion = (permission: AcpmuxPermission) => (sent: QuestionReply) =>
const replyToQuestion = (permission: AcpmuxPermission, sent: QuestionReply) =>
callNative("chat.permission", {
permissionId: permission.permissionId,
...(sent.optionId === undefined ? {} : { optionId: sent.optionId }),
Expand Down Expand Up @@ -4293,7 +4294,7 @@ function PermissionAsk({
return (
<>
{waiting > 0 && <p className="acpmux-permission-waiting">{t("permission.moreWaiting", { n: waiting })}</p>}
<QuestionCard question={permission.question} onReply={replyToQuestion(permission)} />
<PermissionQuestion permission={permission} question={permission.question} send={replyToQuestion} />
</>
);
}
Expand Down
Loading
Loading