Python
Merge branch 'main' into issue/ope-51-ask_user-upgrades
Rohit P53d5fc498f0b
diff --cc surfaces/gui/src/components/InboxItemCard.tsxindex efc19239,a4075636..9512b8e0--- a/surfaces/gui/src/components/InboxItemCard.tsx+++ b/surfaces/gui/src/components/InboxItemCard.tsx@@@ -1,8 -1,13 +1,14 @@@import { useState, type ReactNode } from "react";import type { InboxItem } from "../api";+import type { QuestionOption } from "../types";import { humanizeApprovalTitle } from "../humanize";- import { PreviewBlock, scopeNote, TitleText } from "./ApprovalCard";+ import {+ approvalActionLabels,+ PreviewBlock,+ SaveSkillPreview,+ scopeNote,+ TitleText,+ } from "./ApprovalCard";// One Inbox item, rendered identically in the Inbox list and inline in its own session view// (answer-in-context). Resolving either place hits the same item id — first responder wins.@@@ -355,11 -129,46 +364,11 @@@ export function InboxItemCard(className={item.data?.tool ? BTN_QUIET : BTN_BORDERED}onClick={() => onResolve(item.id, "deny")}>- Deny+ {item.data?.tool ? approvalActionLabels(item.data.tool).deny : "Deny"}</button></div>- ) : item.kind === "question" ? (- <>- {options.length > 0 && (- <div className="flex flex-wrap gap-2 mt-2.5">- {options.map((opt) => {- const on = selected.includes(opt);- return (- <button- key={opt}- className={OPT_BASE + " " + (on ? OPT_ON : OPT_OFF)}- onClick={() => {- if (multi)- setSelected((s) => (on ? s.filter((x) => x !== opt) : [...s, opt]));- else onResolve(item.id, opt); // single-select resolves immediately- }}- >- {multi && on && <span className="text-accent text-[11px] leading-none">✓</span>}- {opt}- </button>- );- })}- </div>- )}- {multi && options.length > 0 && (- <div className="mt-2.5">- <button- className={BTN_PRIMARY}- disabled={!selected.length}- onClick={() => onResolve(item.id, selected.join(", "))}- >- Send{selected.length ? ` (${selected.length})` : ""}- </button>- </div>- )}- {(allowText || options.length === 0) &&- textRow(options.length ? "Or type your own answer…" : "Your answer…")}- </>+ ) : isQuestion ? (+ <QuestionCard item={item} onResolve={onResolve} chip={chip} />) : item.kind === "directory" ? (<div className="flex items-center gap-2 mt-2.5"><button