Skip to content

A desktop coding agent with free access to frontier models.

TypeScript

Merge #323: fix: complete Simplified Chinese strings

ogsamrat4c7f596e6acc
diff --cc apps/app/src/components/chat/message-list.tsx
index bde741dd,6ca180dc..873d2eb6
--- a/apps/app/src/components/chat/message-list.tsx
+++ b/apps/app/src/components/chat/message-list.tsx
@@@ -804,21 -791,8 +804,21 @@@ const UserMessage = React.memo
>
<MessageTimestamp message={message} className="mr-1.5" />
<CopyMessageButton messages={[message]} />
+ {messageText ? (
+ <MessageAction tooltip="Quote">
+ <Button
+ variant="ghost"
+ size="icon"
+ aria-label="Quote"
+ data-testid="quote-message"
+ onClick={() => quoteIntoComposer(sessionId, messageText)}
+ >
+ <TextQuote />
+ </Button>
+ </MessageAction>
+ ) : null}
{messageText ? (
- <MessageAction tooltip="Edit message">
+ <MessageAction tooltip={t("message.edit")}>
<Button
variant="ghost"
size="icon"
@@@ -858,15 -832,9 +858,15 @@@
{messageText ? (
<ContextMenuItem onClick={() => onEditUserMessage(message.id, messageText)}>
<Pencil className="size-4" />
- Edit message
+ {t("message.edit")}
</ContextMenuItem>
) : null}
+ {messageText ? (
+ <ContextMenuItem onClick={() => quoteIntoComposer(sessionId, window.getSelection()?.toString().trim() || messageText)}>
+ <TextQuote className="size-4" />
+ Quote
+ </ContextMenuItem>
+ ) : null}
{messageText ? (
<ContextMenuItem onClick={() => void navigator.clipboard.writeText(messageText)}>
<Copy className="size-4" />
@@@ -1503,20 -1460,9 +1503,20 @@@ function MessageGroup(
<div className="mx-auto flex w-full max-w-3xl flex-wrap items-center gap-2 px-2 opacity-0 transition-opacity duration-150 group-hover/message-group:opacity-100 max-lg:opacity-100 pointer-coarse:opacity-100 md:px-8">
<MessageActions className="flex gap-0">
<CopyMessageButton messages={renderableItems.map((item) => item.message)} />
+ <MessageAction tooltip="Quote">
+ <Button
+ variant="ghost"
+ size="icon"
+ aria-label="Quote"
+ data-testid="quote-reply"
+ onClick={() => quoteIntoComposer(sessionId, getMessagesText([lastTextMessage]))}
+ >
+ <TextQuote />
+ </Button>
+ </MessageAction>
{lastRealItem ? (
<>
- <MessageAction tooltip="Branch in new chat">
+ <MessageAction tooltip={t("message.branch")}>
<Button
variant="ghost"
size="icon"
diff --cc apps/app/src/react-app/domains/session/surface/composer/sandbox-status-chip.tsx
index b3f4d582,50dbd6e1..8db811e0
--- a/apps/app/src/react-app/domains/session/surface/composer/sandbox-status-chip.tsx
+++ b/apps/app/src/react-app/domains/session/surface/composer/sandbox-status-chip.tsx
@@@ -2,8 -2,8 +2,9 @@@
import { useState } from "react";
import { Box, X } from "lucide-react";
+import { toast } from "@/components/ui/sonner";
import { Tooltip, TooltipContent, TooltipTrigger } from "@/components/ui/tooltip";
+ import { t } from "@/i18n";
import { linuxSandboxView, useLinuxSandbox, type LinuxSandboxClient, type LinuxSandboxView } from "@/react-app/domains/settings/linux-sandbox";
type Props = {
diff --cc apps/app/src/react-app/domains/session/surface/composer/subagent-model-menu.tsx
index 9f342f5e,36dcb0e8..c3666193
--- a/apps/app/src/react-app/domains/session/surface/composer/subagent-model-menu.tsx
+++ b/apps/app/src/react-app/domains/session/surface/composer/subagent-model-menu.tsx
@@@ -15,12 -16,12 +16,11 @@@ import
} from "@/components/ui/dropdown-menu";
import { useDesktopRestriction } from "@/react-app/domains/cloud/desktop-config-provider";
import {
- SAME_AS_MAIN_LABEL,
-
+ SUBAGENT_MODEL_PINNED_HELP,
subagentEffortLabel,
subagentEffortOptions,
- subagentModelName,
- subagentModelUnavailable,
- subagentSummary,
+ subagentPinnedLabel,
+ subagentPinnedSummary,
useSubagentModel,
type SubagentModelClient,
} from "@/react-app/domains/settings/subagent-model";
@@@ -46,25 -46,25 +46,25 @@@ function SubagentModelPicker(props: { c
const [open, setOpen] = useState(false);
const { state, setting, saving, error, change, refetch } = useSubagentModel(props.client);
if (!state?.signedIn || state.models.length === 0) return null;
- const summary = subagentSummary(state, setting);
- const unavailable = subagentModelUnavailable(state, setting);
- const custom = Boolean(setting.model || setting.effort);
+ const pinned = subagentPinnedLabel(state, props.chatModel);
+ const summary = subagentPinnedSummary(setting.effort);
+ const custom = Boolean(setting.effort);
const locked = props.policyLocked || saving;
- const efforts = subagentEffortOptions(state, setting.model);
+ const efforts = subagentEffortOptions(state, props.chatModel);
- const save = (next: { model?: string | null; effort?: string | null }) => {
+ const save = (next: { effort?: string | null }) => {
if (locked) return;
void change(next)
- .then((saved) => toast.success(`Sub-agents: ${subagentPinnedSummary(saved.effort)}. Applies to new tasks.`))
- .catch((reason: unknown) => toast.error(reason instanceof Error ? reason.message : "The sub-agent setting could not be saved."));
- .then((saved) => toast.success(t("subagent.saved", { summary: subagentSummary(state, saved) })))
++ .then((saved) => toast.success(t("subagent.saved", { summary: subagentPinnedSummary(saved.effort) })))
+ .catch((reason: unknown) => toast.error(reason instanceof Error ? reason.message : t("subagent.save_failed")));
};
return (
<DropdownMenu open={open} onOpenChange={(next) => { setOpen(next); if (next) void refetch(); }}>
<DropdownMenuTrigger
data-testid="subagent-model-trigger"
- aria-label={`Sub-agents: ${summary}`}
- title={props.policyLocked ? SUBAGENT_MENU_POLICY_LOCK : `Sub-agents: ${summary}. ${pinned}.`}
+ aria-label={t("subagent.chip_label", { summary })}
- title={props.policyLocked ? t("subagent.policy_lock") : `${t("subagent.chip_label", { summary })}${unavailable ? t("subagent.unavailable_suffix") : ""}`}
++ title={props.policyLocked ? t("subagent.policy_lock") : `${t("subagent.chip_label", { summary })}. ${pinned}.`}
// An icon (the summary in its tooltip) until the composer is wide
// enough for the label, so it never squeezes the model selector.
className={`flex h-9 max-h-9 min-w-9 max-w-64 shrink-[4] items-center justify-center gap-1.5 overflow-hidden rounded-md px-2.5 text-sm transition-colors hover:bg-gray-3 @min-[720px]/composer:justify-start ${
@@@ -77,9 -77,33 +77,9 @@@
{/* Capped to the room the positioner measured, so a long menu scrolls inside the viewport instead of running off it. */}
<DropdownMenuContent side="top" sideOffset={10} className="max-h-[min(560px,var(--available-height))] w-[min(340px,calc(100vw-32px))] overflow-y-auto p-2">
<DropdownMenuGroup>
- <DropdownMenuLabel className="px-3 text-sm">Sub-agents: model</DropdownMenuLabel>
+ <DropdownMenuLabel className="px-3 text-sm">{t("subagent.model_label")}</DropdownMenuLabel>
- <DropdownMenuRadioGroup value={setting.model ?? SAME}>
- <DropdownMenuRadioItem value={SAME} disabled={locked} data-testid="subagent-model-same" onClick={() => save({ model: null })}>
- {t("subagent.same_as_main")}
- </DropdownMenuRadioItem>
- {state.models.map((model) => (
- <DropdownMenuRadioItem
- key={model.id}
- value={model.id}
- disabled={locked}
- data-testid={`subagent-model-${model.id}`}
- onClick={() => save({ model: model.id })}
- >
- <span className="min-w-0">
- <span className="block truncate">{model.name}</span>
- {model.family && model.family !== "OpenAI" ? (
- <span className="block text-xs font-normal text-muted-foreground">{model.family}</span>
- ) : null}
- </span>
- </DropdownMenuRadioItem>
- ))}
- {setting.model && unavailable ? (
- <DropdownMenuRadioItem value={setting.model} disabled>
- {subagentModelName(state, setting.model)} {t("subagent.not_available")}
- </DropdownMenuRadioItem>
- ) : null}
- </DropdownMenuRadioGroup>
+ {/* Not a choice: a chat keeps one model, its sub-agents' too. */}
+ <p data-testid="subagent-model-pinned" aria-disabled="true" className="px-3 py-1.5 text-sm text-muted-foreground">{pinned}</p>
</DropdownMenuGroup>
<DropdownMenuSeparator />
<DropdownMenuGroup>
@@@ -102,8 -126,8 +102,8 @@@
</DropdownMenuRadioGroup>
</DropdownMenuGroup>
<DropdownMenuSeparator />
- <p className="px-3 py-2 text-xs text-muted-foreground">{t("subagent.model_help")}</p>
+ <p className="px-3 py-2 text-xs text-muted-foreground">{SUBAGENT_MODEL_PINNED_HELP}</p>
- {props.policyLocked ? <p role="status" className="px-3 pb-2 text-xs text-muted-foreground">{SUBAGENT_MENU_POLICY_LOCK}</p> : null}
+ {props.policyLocked ? <p role="status" className="px-3 pb-2 text-xs text-muted-foreground">{t("subagent.policy_lock")}</p> : null}
{error ? <p role="alert" className="px-3 pb-2 text-xs text-destructive">{error}</p> : null}
</DropdownMenuContent>
</DropdownMenu>
diff --cc apps/app/src/react-app/domains/settings/subagent-model-settings.tsx
index fd049e90,ba9a587e..f85eac62
--- a/apps/app/src/react-app/domains/settings/subagent-model-settings.tsx
+++ b/apps/app/src/react-app/domains/settings/subagent-model-settings.tsx
@@@ -18,12 -19,11 +19,10 @@@ import
LayoutSectionItemTitle,
} from "./settings-layout";
import {
- SAME_AS_MAIN_LABEL,
- SUBAGENT_EFFORT_HELP,
+ SUBAGENT_MODEL_PINNED_HELP,
subagentEffortLabel,
subagentEffortOptions,
- subagentModelName,
- subagentModelUnavailable,
- subagentSummary,
+ subagentPinnedSummary,
useSubagentModel,
type SubagentModelClient,
} from "./subagent-model";
@@@ -40,30 -39,39 +39,30 @@@ export function SubagentModelSettings(p
const { state, setting, loading, saving, error, change } = useSubagentModel(props.client);
if (!props.client) return null;
const disabled = Boolean(props.busy) || policyLocked || saving || loading || !state;
- const unavailable = subagentModelUnavailable(state, setting);
- const models = state?.models ?? [];
- const modelItems = [
- { value: SAME, label: t("subagent.same_as_main") },
- ...models.map((model) => ({ value: model.id, label: model.family && model.family !== "OpenAI" ? `${model.name} (${model.family})` : model.name })),
- ...(setting.model && unavailable ? [{ value: setting.model, label: `${subagentModelName(state, setting.model)} ${t("subagent.not_available")}` }] : []),
- ];
const effortItems = [
- { value: SAME, label: SAME_AS_MAIN_LABEL },
+ { value: SAME, label: t("subagent.same_as_main") },
- ...subagentEffortOptions(state, setting.model).map((effort) => ({ value: effort, label: subagentEffortLabel(effort) })),
+ ...subagentEffortOptions(state, null).map((effort) => ({ value: effort, label: subagentEffortLabel(effort) })),
];
- const save = (next: { model?: string | null; effort?: string | null }) => {
+ const save = (next: { effort?: string | null }) => {
void change(next)
- .then((saved) => toast.success(`Sub-agents: ${subagentPinnedSummary(saved.effort)}. Applies to new tasks.`))
- .catch((reason: unknown) => toast.error(reason instanceof Error ? reason.message : "The sub-agent setting could not be saved."));
- .then((saved) => toast.success(t("subagent.saved", { summary: subagentSummary(state, saved) })))
++ .then((saved) => toast.success(t("subagent.saved", { summary: subagentPinnedSummary(saved.effort) })))
+ .catch((reason: unknown) => toast.error(reason instanceof Error ? reason.message : t("subagent.save_failed")));
};
const status = policyLocked
- ? "Locked by your organisation: its policy does not allow changing app settings."
+ ? t("subagent.policy_lock")
: state && !state.signedIn
- ? t("subagent.sign_in_hint")
- : unavailable
- ? t("subagent.model_unavailable")
- : error;
+ ? "Sign in to omnirush.ai to set the sub-agent effort."
+ : error;
return (
<>
<LayoutSectionItem>
<LayoutSectionItemHeader>
- <LayoutSectionItemTitle>Sub-agents: model</LayoutSectionItemTitle>
+ <LayoutSectionItemTitle>{t("subagent.model_label")}</LayoutSectionItemTitle>
<LayoutSectionItemDescription>
- {t("subagent.model_help")}
+ {SUBAGENT_MODEL_PINNED_HELP}
{status ? <span className="mt-1 block" data-testid="subagent-model-status">{status}</span> : null}
</LayoutSectionItemDescription>
<LayoutSectionItemHeaderActions>