Skip to content

Dodaios is an open-source agent OS for your desktop: it runs your coding agents, browser and apps by voice or chat, on your own machine. Formerly Personal Jarvis.

merge: land the newest local main commits (appshot editor, Codex-style traces)

rubenluetke10-beepa2d816105217
diff --cc jarvis/cu/indicator/protocol.py
index 0fed2596a6,0c1cdddbf0..abee60acb8
--- a/jarvis/cu/indicator/protocol.py
+++ b/jarvis/cu/indicator/protocol.py
@@@ -55,7 -68,7 +68,7 @@@ def decode_command(line: str) -> dict[s
return None
try:
payload = json.loads(line)
-- except (ValueError, TypeError):
++ except (ValueError, TypeError): # a garbled sidecar line is no message
return None
if not isinstance(payload, dict):
return None
@@@ -68,11 -81,27 +81,27 @@@ def encode_ack(cmd: str) -> str
return json.dumps({"ok": cmd}) + "\n"
+ def encode_event(event: str, **fields: Any) -> str:
+ """Serialize one sidecar → controller event line."""
+ return json.dumps({"event": event, **fields}) + "\n"
+
+
+ def decode_event(line: str) -> dict[str, Any] | None:
+ """Parse one stdout line as a known event; ``None`` otherwise."""
+ try:
+ payload = json.loads(line.strip())
- except (ValueError, TypeError):
++ except (ValueError, TypeError): # a garbled line is no event
+ return None
+ if isinstance(payload, dict) and payload.get("event") in ALL_EVENTS:
+ return payload
+ return None
+
+
def decode_ack(line: str) -> str | None:
"""Parse one ack line from the sidecar; ``None`` if it isn't one."""
try:
payload = json.loads(line.strip())
-- except (ValueError, TypeError):
++ except (ValueError, TypeError): # a garbled line is no ack
return None
if isinstance(payload, dict) and isinstance(payload.get("ok"), str):
return payload["ok"]
diff --cc jarvis/ui/web/appshot_routes.py
index 4ba227ac6d,ff45cefd95..c6308ce0df
--- a/jarvis/ui/web/appshot_routes.py
+++ b/jarvis/ui/web/appshot_routes.py
@@@ -205,6 -206,45 +206,45 @@@ async def latest_image() -> Response
return Response(content=shot.image, media_type=shot.mime, headers=_NO_STORE)
+ #: Upper bound for an edited picture (a 4K PNG with annotations stays far below).
+ _MAX_EDIT_BYTES = 20 * 1024 * 1024
+
+
+ @router.put("/latest/image")
+ async def replace_latest_image(request: Request, id: str) -> dict[str, Any]: # noqa: A002
+ """Store the appshot editor's result in place of the last appshot.
+
+ Body: the PNG the editor rendered. In memory only, like every appshot; the
+ next message that takes the appshot gets the edited picture.
+ """
+ from jarvis.appshot.store import get_store # noqa: PLC0415
+
+ body = await request.body()
+ if not body or len(body) > _MAX_EDIT_BYTES:
+ raise HTTPException(status_code=413, detail="The edited picture is empty or too large.")
+ size = await asyncio.to_thread(_png_size, body)
+ if size is None:
+ raise HTTPException(status_code=400, detail="The edited picture is not a PNG.")
+ shot = await asyncio.to_thread(get_store().replace_image, id, body, "image/png", *size)
+ if shot is None:
+ raise HTTPException(status_code=404, detail="That appshot is no longer kept.")
+ return {"ok": True, "appshot": shot.meta()}
+
+
+ def _png_size(data: bytes) -> tuple[int, int] | None:
+ import io # noqa: PLC0415
+
+ from PIL import Image, UnidentifiedImageError # noqa: PLC0415
+
+ try:
+ with Image.open(io.BytesIO(data)) as image:
+ if image.format != "PNG":
+ return None
+ return int(image.width), int(image.height)
- except (UnidentifiedImageError, OSError):
++ except (UnidentifiedImageError, OSError): # not a readable PNG; the caller refuses it
+ return None
+
+
@router.get("/pending")
async def pending() -> dict[str, Any]:
from jarvis.appshot.store import get_store # noqa: PLC0415
diff --cc jarvis/ui/web/frontend/src/components/agentchat/WorkTrace.test.tsx
index 50d6d023b0,2ba949c748..a15d98109f
--- a/jarvis/ui/web/frontend/src/components/agentchat/WorkTrace.test.tsx
+++ b/jarvis/ui/web/frontend/src/components/agentchat/WorkTrace.test.tsx
@@@ -200,32 -204,6 +204,34 @@@ describe("work trace", () =>
expect(splitConversationTurn([tool("a"), reply("done", "Ready."), failed]).after).toEqual([failed]);
});
+ it("keeps a failed tool and its outcome visible after a conversation completes", () => {
+ const failed = tool("err", { isError: true, output: "Upload failed" });
+ const { container } = render(<WorkTrace {...props} conversation blocks={[tool("a"), failed, reply("done", "I prepared a draft.")]} />);
+ expect(screen.getByText("Upload failed")).toBeTruthy();
+ expect(container.querySelector('[data-trace-tool="err"]')).toBeTruthy();
+ expect(screen.getByTestId("tool-failure-warning").textContent).toContain("A tool action failed");
+ expect(screen.getByRole("status").textContent).toContain("A tool action failed");
+ expect(screen.getAllByRole("status").at(-1)?.textContent).toContain("Done");
+ const fold = screen.getByTestId("conversation-work-fold").querySelector("button")!;
+ fireEvent.click(fold);
- expect(screen.getAllByText(/Upload failed/).length).toBeGreaterThan(0);
++ // Open, the timeline takes over; its header and the warning still name the failure.
++ expect(fold.textContent).toContain("1 failed");
++ expect(screen.getByTestId("tool-failure-warning")).toBeTruthy();
+ });
+
+ it("keeps a failed question poll visible after a conversation completes", () => {
+ const failedPoll = tool("poll", {
+ name: "society_ask_user",
+ input: { wait_for: "closed-question" },
+ isError: true,
+ output: "The question is closed.",
+ });
+ const { container } = render(<WorkTrace {...props} conversation blocks={[tool("a"), failedPoll, reply("done", "I could not get an answer.")]} />);
+ expect(container.querySelector('[data-trace-tool="poll"]')).toBeTruthy();
+ expect(screen.getByText("The question is closed.")).toBeTruthy();
+ expect(screen.getByTestId("tool-failure-warning")).toBeTruthy();
+ });
+
it("treats a tool-only turn as work", () => {
expect(splitConversationTurn([tool("a")])).toEqual({ work: [tool("a")], answer: [], after: [] });
});
diff --cc jarvis/ui/web/frontend/src/components/agentchat/WorkTrace.tsx
index 0832f6a27f,62834d6683..3cae3ee2af
--- a/jarvis/ui/web/frontend/src/components/agentchat/WorkTrace.tsx
+++ b/jarvis/ui/web/frontend/src/components/agentchat/WorkTrace.tsx
@@@ -709,13 -707,12 +708,13 @@@ function WorkTraceBody({ blocks: rawBlo
const petState = companion && working ? livePetState(blocks) : null;
const statusLine = <div role="status" aria-live="polite" data-trace-status={outcome}
className={cn("flex min-w-0 flex-wrap items-start gap-x-3 text-xs leading-6 text-muted-foreground",
- statusOnRail ? "py-1" : "pb-2 pt-1", status === "error" && "text-destructive", pending && "text-foreground")}>
+ statusOnRail ? "py-1" : "pb-2 pt-1", failed && "text-destructive", pending && "text-foreground")}>
{petState
? <span aria-hidden className="trace-node trace-node-pet" data-trace-pet={petState}><PetMark size={32} state={petState} /></span>
- : <Node live={working}><Icon className={cn(nodeIcon, working && "motion-safe:animate-spin")} /></Node>}
+ : null}
<span className="inline-flex min-w-0 flex-1 flex-wrap items-center gap-x-2">
<span><Live on={working}>{outcomeLabel}</Live></span>
+ {toolFailed && !live && !failed ? <span className="sr-only">{t("work_trace.tool_failed")}</span> : null}
{(live || durationMs !== null) ? <span aria-live="off" className="tabular-nums">{traceDuration(live ? elapsed : durationMs ?? 0)}</span> : null}
{receiptNode ? <span aria-hidden className="text-muted-foreground/50">·</span> : null}
{receiptNode}
diff --cc jarvis/ui/web/frontend/src/components/society/chat/ChatActivity.test.tsx
index 52747f295a,7661b5125e..a6dfdd4aab
--- a/jarvis/ui/web/frontend/src/components/society/chat/ChatActivity.test.tsx
+++ b/jarvis/ui/web/frontend/src/components/society/chat/ChatActivity.test.tsx
@@@ -101,11 -103,13 +103,11 @@@ it("keeps failures and pending approval
base,
{ ...base, callId: "approval", isError: false, output: null, approval: { approvalId: "ap", summary: "Send this message?", decision: null } },
]} onDecide={() => undefined} />);
- expect(screen.getByText("Failed: Delivery failed")).toBeTruthy();
- expect(screen.queryByText("Delivery failed")).toBeNull();
++ expect(screen.getAllByText("Delivery failed").length).toBeGreaterThan(0);
expect(screen.getByText("Send this message?")).toBeTruthy();
expect(screen.getByRole("button", { name: "Approve" })).toBeTruthy();
- fireEvent.click(screen.getByRole("button", { name: /^Worked for 1\.0s/ }));
- expect(screen.getByText("Delivery failed")).toBeTruthy();
- // The approval card survives opening the fold — it still needs a tap.
- expect(screen.getByRole("button", { name: "Approve" })).toBeTruthy();
+ // With no other work to fold, both items stay in place and need no toggle.
+ expect(screen.queryByTestId("conversation-work-fold")).toBeNull();
});
it("shows agent message direction and truthful delivery state without preview clutter", () => {
@@@ -124,29 -128,29 +126,29 @@@ it("folds successful work while showin
const tool: ToolBlock = { kind: "tool", callId: "a", name: "read_file", input: { path: "report.csv" }, output: "Report contents", isError: false, durationMs: 100, approval: null, startedMs: 0 };
const blocks = [tool, { ...tool, callId: "b", name: "write_file" }, { kind: "text" as const, id: "reply", text: "Your report is ready." }, { ...tool, callId: "error", isError: true, output: "Upload failed" }];
const { rerender } = render(<WorkTrace conversation status="running" startedMs={0} durationMs={null} blocks={blocks} />);
- // While it runs, finished calls already read as their timeline lines.
- expect(screen.getByRole("button", { name: /^Explored/ })).toBeTruthy();
- expect(screen.getByRole("button", { name: /^Created report\.csv/ })).toBeTruthy();
+ // While it runs, finished calls already read as their timeline line.
+ expect(screen.getByRole("button", { name: /^Read a file, created a file/ })).toBeTruthy();
rerender(<WorkTrace conversation status="done" startedMs={0} durationMs={1000} blocks={blocks} />);
- expect(screen.queryByRole("button", { name: /^Explored/ })).toBeNull();
+ expect(screen.queryByRole("button", { name: /^Read a file, created a file/ })).toBeNull();
expect(screen.getByText("Your report is ready.")).toBeTruthy();
- expect(screen.queryByText("Upload failed")).toBeNull();
+ expect(screen.getByText("Upload failed")).toBeTruthy();
expect(screen.queryByText("Report contents")).toBeNull();
- const toggle = screen.getByRole("button", { name: /^Worked for 1\.0s/ });
- expect(toggle.textContent).toContain("Read 2 files and created a file");
+ const toggle = screen.getByRole("button", { name: /^Worked for 1\.0s.*1 failed/ });
fireEvent.click(toggle);
- // One tap opens the whole timeline: every call in order, the post-reply
- // error included, with the reply kept where it was.
- const text = screen.getByTestId("work-trace").textContent ?? "";
- expect(text.indexOf("Readreport.csv")).toBeGreaterThanOrEqual(0);
- expect(text.indexOf("Readreport.csv")).toBeLessThan(text.indexOf("Createdreport.csv"));
- expect(text).toContain("Failed: Upload failed");
+ // One tap opens the timeline: the post-reply error joins the stretch, the
+ // reply stays where it was.
+ const stretch = screen.getByRole("button", { name: /^Read files, created a file.*1 failed/ });
expect(screen.getAllByText("Your report is ready.")).toHaveLength(1);
- // Each line's raw call stays tappable on its own.
- const explored = screen.getByRole("button", { name: /^Explored/ });
- fireEvent.click(explored);
+ fireEvent.click(stretch);
+ const calls = Array.from(document.querySelectorAll<HTMLElement>("[data-trace-entry='call']")).map((c) => c.textContent);
+ expect(calls[0]).toContain("Read report.csv");
+ expect(calls[1]).toContain("Created report.csv");
+ expect(calls[2]).toContain("Upload failed");
+ // Each call's raw output stays tappable on its own.
+ const first = screen.getAllByRole("button", { name: /^Read report\.csv/ })[0];
+ fireEvent.click(first);
expect(screen.getAllByText("Report contents").length).toBeGreaterThan(0);
- fireEvent.click(explored);
+ fireEvent.click(first);
expect(screen.queryAllByText("Report contents")).toHaveLength(0);
});
diff --cc jarvis/ui/web/frontend/src/hooks/useWebSocket.ts
index c361417208,a58ac905af..b9ee261cef
--- a/jarvis/ui/web/frontend/src/hooks/useWebSocket.ts
+++ b/jarvis/ui/web/frontend/src/hooks/useWebSocket.ts
@@@ -24,8 -24,7 +24,9 @@@ import
useCommandActivityStore,
COMMAND_ACTIVITY_EVENTS,
} from "@/store/commandActivity";
+import { isDictationStartFailure } from "@/lib/dictationRefusal";
+import { usePermissionToast } from "@/hooks/usePermissionToast";
+ import { useAppshotEditor } from "@/store/appshotEditor";
import { useDeckStore } from "@/store/deck";
import { useHomeStore } from "@/store/home";
import { PANE_ACTIVITY_EVENT } from "@/store/workspacePanes";
diff --cc jarvis/ui/web/frontend/src/i18n/locales/de.json
index 3d914ad611,1304c98e80..405ca5d9c0
--- a/jarvis/ui/web/frontend/src/i18n/locales/de.json
+++ b/jarvis/ui/web/frontend/src/i18n/locales/de.json
@@@ -6103,145 -6042,34 +6082,171 @@@
"voice_hint": "Du kannst auch einfach sagen: \"Mach einen Appshot\".",
"save_error": "Speichern fehlgeschlagen: {0}",
"toast_refused": "Kein Appshot: {0}",
- "chip_label": "Appshot an deine Nachricht gehängt"
+ "chip_label": "Appshot an deine Nachricht gehängt",
+ "editor": {
+ "title": "Appshot bearbeiten",
+ "open": "Bearbeiten",
+ "tool_arrow": "Pfeil",
+ "tool_rect": "Rechteck",
+ "tool_ellipse": "Ellipse",
+ "tool_pen": "Stift",
+ "tool_highlight": "Textmarker",
+ "tool_text": "Text",
+ "tool_pixelate": "Verpixeln",
+ "tool_crop": "Zuschneiden",
+ "color": "Farbe",
+ "size": "Stärke",
+ "undo": "Rückgängig",
+ "redo": "Wiederholen",
+ "copy": "Kopieren",
+ "copied": "In die Zwischenablage kopiert",
+ "copy_failed": "Kopieren ging nicht: {0}",
+ "copy_timeout": "die Zwischenablage hat nicht geantwortet",
+ "save": "Speichern",
+ "apply": "Diese Version nutzen",
+ "applied": "Bearbeiteter Appshot gespeichert. Deine nächste Nachricht nutzt ihn.",
+ "close": "Schließen",
+ "gone": "Dieser Appshot wird nicht mehr aufbewahrt und kann nicht bearbeitet werden.",
+ "text_placeholder": "Text…"
+ }
},
+ "jarvisx": {
+ "title": "Jarvis X",
+ "subtitle": "Bildschirmfotos und Bildschirmaufnahmen, mit einem schnellen Editor zum Markieren.",
+ "tab_library": "Bibliothek",
+ "tab_settings": "Einstellungen",
+ "time_now": "Gerade eben",
+ "time_minutes": "vor {0} Min.",
+ "action_failed": "Das hat nicht geklappt.",
+ "deleted": "Gelöscht",
+ "copied": "In die Zwischenablage kopiert",
+ "copy_failed": "Kopieren fehlgeschlagen.",
+ "capture_region": "Bereich",
+ "capture_window": "Fenster",
+ "capture_fullscreen": "Ganzer Bildschirm",
+ "recording": "Aufnahme läuft",
+ "record_stop": "Stopp",
+ "record_region": "Bereich aufnehmen",
+ "record_fullscreen": "Bildschirm aufnehmen",
+ "recording_unavailable": "Bildschirmaufnahmen sind auf diesem Computer nicht verfügbar.",
+ "disabled_hint": "Jarvis X ist aus. Schalte es unter Einstellungen ein.",
+ "load_failed": "Deine Aufnahmen konnten nicht geladen werden: {0}",
+ "empty_title": "Noch keine Aufnahmen",
+ "empty_body": "Mach ein Bildschirmfoto per Tastenkürzel oder mit den Knöpfen oben. Es erscheint hier, bereit zum Bearbeiten.",
+ "delete_title": "Diese Aufnahme löschen?",
+ "delete_body": "Die Datei wird von deiner Festplatte entfernt. Das lässt sich nicht rückgängig machen.",
+ "delete": "Löschen",
+ "open_video": "{0} abspielen",
+ "open_editor": "{0} bearbeiten",
+ "mode_region": "Bereich",
+ "mode_window": "Fenster",
+ "mode_fullscreen": "Ganzer Bildschirm",
+ "edited": "Bearbeitet",
+ "kind_video": "Video",
+ "kind_image": "Bildschirmfoto",
+ "edit": "Bearbeiten",
+ "open_window": "In eigenem Fenster öffnen",
+ "copy": "Kopieren",
+ "reveal": "Im Ordner zeigen",
+ "editor": {
+ "title": "Jarvis-X-Editor",
+ "no_item": "Keine Aufnahme angegeben. Öffne den Editor aus der Jarvis-X-Bibliothek.",
+ "image_failed": "Das Bild konnte nicht geladen werden.",
+ "tools": "Werkzeuge",
+ "tool_select": "Auswählen und verschieben",
+ "tool_rect": "Rechteck",
+ "tool_highlight": "Markierungsfeld",
+ "tool_ellipse": "Ellipse",
+ "tool_arrow": "Pfeil",
+ "tool_line": "Linie",
+ "tool_pen": "Stift",
+ "tool_marker": "Textmarker",
+ "tool_text": "Text",
+ "tool_counter": "Nummerierter Schritt",
+ "tool_blur": "Verpixeln",
+ "tool_crop": "Zuschneiden",
+ "undo": "Rückgängig",
+ "redo": "Wiederholen",
+ "save": "Speichern",
+ "done": "Speichern & schließen",
+ "save_failed": "Speichern fehlgeschlagen: {0}",
+ "saved": "Gespeichert",
+ "color": "Farbe",
+ "stroke": "Linienstärke",
+ "font_size": "Textgröße",
+ "shadow": "Schatten",
+ "crop_hint": "Zieh über den Teil, den du behalten willst.",
+ "crop_reset": "Zuschnitt aufheben",
+ "crop_apply": "Fertig",
+ "select_hint": "Klick eine Markierung an, um sie zu verschieben. Doppelklick auf Text, um ihn zu ändern.",
+ "delete_shape": "Markierung löschen",
+ "base": "Ausgangsbild",
+ "base_edited": "Bearbeitet",
+ "base_original": "Original",
+ "zoom_out": "Verkleinern",
+ "zoom_in": "Vergrößern",
+ "zoom_fit": "An Fenster anpassen",
+ "load_failed": "Diese Aufnahme ließ sich nicht öffnen.",
+ "dev_hint": "Vorschau: Dieses Bild ist keine gespeicherte Aufnahme und kann nicht gespeichert werden.",
+ "discard_title": "Änderungen verwerfen?",
+ "discard_body": "Deine Markierungen seit dem letzten Speichern gehen verloren.",
+ "discard_confirm": "Verwerfen",
+ "switch_title": "Ausgangsbild wechseln?",
+ "switch_body": "Nicht gespeicherte Markierungen gehen verloren. Gespeicherte Änderungen bleiben in der bearbeiteten Version."
+ },
+ "settings": {
+ "load_failed": "Die Jarvis-X-Einstellungen konnten nicht geladen werden.",
+ "section_general": "Allgemein",
+ "enabled_label": "Jarvis X verwenden",
+ "enabled_hint": "Schaltet die Aufnahme-Tastenkürzel ein. Aus heißt: Die Kürzel tun nichts.",
+ "section_shortcuts": "Tastenkürzel",
+ "shortcuts_off": "Die Kürzel funktionieren nur, wenn Jarvis X eingeschaltet ist.",
+ "hotkey_region": "Bereich aufnehmen (Foto)",
+ "hotkey_window": "Fenster aufnehmen (Foto)",
+ "hotkey_fullscreen": "Ganzen Bildschirm aufnehmen (Foto)",
+ "hotkey_record_region": "Bereich als Video aufnehmen",
+ "hotkey_record_fullscreen": "Ganzen Bildschirm als Video aufnehmen",
+ "hotkey_stop_recording": "Videoaufnahme beenden",
+ "hotkey_armed": "Aktiv",
+ "hotkey_unarmed": "Nicht aktiv: {0}",
+ "hotkey_unarmed_plain": "Gerade nicht aktiv",
+ "save_error": "Speichern fehlgeschlagen: {0}",
+ "section_thumbnail": "Vorschaubild",
+ "persist_label": "Vorschaubild behalten, bis ich es schließe",
+ "persist_hint": "Nach einer Aufnahme erscheint eine kleine Vorschau in der Ecke deines Bildschirms.",
+ "dismiss_label": "Vorschaubild ausblenden nach",
+ "dismiss_hint": "Es verschwindet nach {0} Sekunden von selbst.",
+ "dismiss_seconds": "Sekunden",
+ "seconds_unit": "s",
+ "section_after": "Nach einer Aufnahme",
+ "save_dir_label": "Speicherordner",
+ "save_dir_hint": "Hier werden neue Bildschirmfotos und Aufnahmen abgelegt.",
+ "clipboard_label": "In die Zwischenablage kopieren",
+ "clipboard_hint": "Jedes neue Bildschirmfoto lässt sich sofort einfügen.",
+ "sound_label": "Auslöser-Geräusch abspielen",
+ "effect_label": "Animation zeigen",
+ "effect_hint": "Ein kurzer Blitz, dann fliegt das Vorschaubild in die Ecke.",
+ "recording_unavailable": "Bildschirmaufnahmen sind hier nicht verfügbar: {0}"
+ }
+ },
+ "shortcuts_view": {
+ "title": "Tastenkürzel",
+ "description": "Alle Tastenkombinationen, auf die Jarvis hört, an einem Ort. Drück eine Kombination und sieh, was sie tut.",
+ "tester_title": "Kombination ausprobieren",
+ "tester_hint": "Drück beliebige Tasten — sie erscheinen hier, zusammen mit dem, was sie in Jarvis tun.",
+ "tester_modifiers": "Halten und eine Taste dazunehmen.",
+ "tester_free": "Frei — nichts in Jarvis nutzt diese Kombination.",
+ "section_app": "In der App",
+ "section_app_hint": "Funktioniert, solange das Jarvis-Fenster vorne ist.",
+ "section_calls": "Anrufe",
+ "section_calls_hint": "Sprachanruf starten und beenden — aus jedem Programm auf diesem Computer.",
+ "section_dictation": "Diktat",
+ "section_dictation_hint": "In das Fenster sprechen, das gerade vorne ist. Geändert wird es im Sprachbereich.",
+ "edit_in_voice": "Ändern",
+ "section_workspace": "Terminals und Arbeitsbereich",
+ "section_workspace_hint": "Feste Tasten für die Agenten-Terminals und diese App.",
+ "footer": "Anruf-, Auflege- und Diktat-Tasten funktionieren überall auf diesem Computer. Die Schnellsuche und die Arbeitsbereich-Tasten nur im Jarvis-Fenster."
+ },
"pets": {
"title": "Meine Pets",
"subtitle": "Ein kleiner Pixel-Begleiter, der auf deinem Desktop schwebt und reagiert, während {name} zuhört, nachdenkt und spricht. Mit {0} blendest du ihn aus oder wieder ein.",
diff --cc jarvis/ui/web/frontend/src/i18n/locales/en.json
index fc7efc915b,69806c7dd3..8ea24e6539
--- a/jarvis/ui/web/frontend/src/i18n/locales/en.json
+++ b/jarvis/ui/web/frontend/src/i18n/locales/en.json
@@@ -6103,145 -6075,34 +6082,171 @@@
"voice_hint": "You can also just say \"take an appshot\".",
"save_error": "Could not save: {0}",
"toast_refused": "No appshot: {0}",
- "chip_label": "Appshot added to your message"
+ "chip_label": "Appshot added to your message",
+ "editor": {
+ "title": "Edit appshot",
+ "open": "Edit",
+ "tool_arrow": "Arrow",
+ "tool_rect": "Rectangle",
+ "tool_ellipse": "Ellipse",
+ "tool_pen": "Pen",
+ "tool_highlight": "Highlighter",
+ "tool_text": "Text",
+ "tool_pixelate": "Pixelate",
+ "tool_crop": "Crop",
+ "color": "Colour",
+ "size": "Size",
+ "undo": "Undo",
+ "redo": "Redo",
+ "copy": "Copy",
+ "copied": "Copied to the clipboard",
+ "copy_failed": "Could not copy: {0}",
+ "copy_timeout": "the clipboard did not answer",
+ "save": "Save",
+ "apply": "Use this version",
+ "applied": "Edited appshot saved. Your next message uses it.",
+ "close": "Close",
+ "gone": "This appshot is no longer kept, so it cannot be edited.",
+ "text_placeholder": "Type…"
+ }
},
+ "jarvisx": {
+ "title": "Jarvis X",
+ "subtitle": "Screenshots and screen recordings, with a quick editor to mark them up.",
+ "tab_library": "Library",
+ "tab_settings": "Settings",
+ "time_now": "Just now",
+ "time_minutes": "{0} min ago",
+ "action_failed": "That did not work.",
+ "deleted": "Deleted",
+ "copied": "Copied to the clipboard",
+ "copy_failed": "Could not copy.",
+ "capture_region": "Region",
+ "capture_window": "Window",
+ "capture_fullscreen": "Full screen",
+ "recording": "Recording",
+ "record_stop": "Stop",
+ "record_region": "Record region",
+ "record_fullscreen": "Record screen",
+ "recording_unavailable": "Screen recording is not available on this computer.",
+ "disabled_hint": "Jarvis X is off. Turn it on under Settings.",
+ "load_failed": "Could not load your captures: {0}",
+ "empty_title": "No captures yet",
+ "empty_body": "Take a screenshot with a shortcut or the buttons above. It shows up here, ready to edit.",
+ "delete_title": "Delete this capture?",
+ "delete_body": "The file is removed from your disk. This cannot be undone.",
+ "delete": "Delete",
+ "open_video": "Play {0}",
+ "open_editor": "Edit {0}",
+ "mode_region": "Region",
+ "mode_window": "Window",
+ "mode_fullscreen": "Full screen",
+ "edited": "Edited",
+ "kind_video": "Video",
+ "kind_image": "Screenshot",
+ "edit": "Edit",
+ "open_window": "Open in its own window",
+ "copy": "Copy",
+ "reveal": "Show in folder",
+ "editor": {
+ "title": "Jarvis X editor",
+ "no_item": "No capture was named. Open the editor from the Jarvis X library.",
+ "image_failed": "The picture could not be loaded.",
+ "tools": "Tools",
+ "tool_select": "Select and move",
+ "tool_rect": "Rectangle",
+ "tool_highlight": "Highlight box",
+ "tool_ellipse": "Ellipse",
+ "tool_arrow": "Arrow",
+ "tool_line": "Line",
+ "tool_pen": "Pen",
+ "tool_marker": "Highlighter",
+ "tool_text": "Text",
+ "tool_counter": "Numbered step",
+ "tool_blur": "Pixelate",
+ "tool_crop": "Crop",
+ "undo": "Undo",
+ "redo": "Redo",
+ "save": "Save",
+ "done": "Save & close",
+ "save_failed": "Could not save: {0}",
+ "saved": "Saved",
+ "color": "Colour",
+ "stroke": "Line width",
+ "font_size": "Text size",
+ "shadow": "Shadow",
+ "crop_hint": "Drag over the part you want to keep.",
+ "crop_reset": "Reset crop",
+ "crop_apply": "Done",
+ "select_hint": "Click a mark to move it. Double-click text to edit it.",
+ "delete_shape": "Delete mark",
+ "base": "Start from",
+ "base_edited": "Edited",
+ "base_original": "Original",
+ "zoom_out": "Zoom out",
+ "zoom_in": "Zoom in",
+ "zoom_fit": "Fit to window",
+ "load_failed": "This capture could not be opened.",
+ "dev_hint": "Preview mode: this picture is not a stored capture, so it cannot be saved.",
+ "discard_title": "Discard your changes?",
+ "discard_body": "Your marks since the last save will be lost.",
+ "discard_confirm": "Discard",
+ "switch_title": "Switch the starting picture?",
+ "switch_body": "Your unsaved marks will be lost. Saved edits stay in the edited version."
+ },
+ "settings": {
+ "load_failed": "The Jarvis X settings could not be loaded.",
+ "section_general": "General",
+ "enabled_label": "Use Jarvis X",
+ "enabled_hint": "Turns the capture shortcuts on. Off means the shortcuts do nothing.",
+ "section_shortcuts": "Keyboard shortcuts",
+ "shortcuts_off": "The shortcuts only work while Jarvis X is on.",
+ "hotkey_region": "Capture a region",
+ "hotkey_window": "Capture a window",
+ "hotkey_fullscreen": "Capture the full screen",
+ "hotkey_record_region": "Record a region",
+ "hotkey_record_fullscreen": "Record the full screen",
+ "hotkey_stop_recording": "Stop recording",
+ "hotkey_armed": "Active",
+ "hotkey_unarmed": "Not active: {0}",
+ "hotkey_unarmed_plain": "Not active right now",
+ "save_error": "Could not save: {0}",
+ "section_thumbnail": "Thumbnail",
+ "persist_label": "Keep the thumbnail until I close it",
+ "persist_hint": "After a capture, a small preview sits in the corner of your screen.",
+ "dismiss_label": "Hide the thumbnail after",
+ "dismiss_hint": "It disappears on its own after {0} seconds.",
+ "dismiss_seconds": "Seconds",
+ "seconds_unit": "s",
+ "section_after": "After a capture",
+ "save_dir_label": "Save folder",
+ "save_dir_hint": "Where new screenshots and recordings are stored.",
+ "clipboard_label": "Copy to the clipboard",
+ "clipboard_hint": "Every new screenshot is ready to paste right away.",
+ "sound_label": "Play the shutter sound",
+ "effect_label": "Show the animation",
+ "effect_hint": "A short flash, then the thumbnail flies into the corner.",
+ "recording_unavailable": "Screen recording is not available here: {0}"
+ }
+ },
+ "shortcuts_view": {
+ "title": "Keyboard shortcuts",
+ "description": "Every key combination Jarvis listens for, in one place. Press any combination to see what it does.",
+ "tester_title": "Try a combination",
+ "tester_hint": "Press any keys — they show up here with what they do in Jarvis.",
+ "tester_modifiers": "Keep holding and add a key.",
+ "tester_free": "Free — nothing in Jarvis uses this combination.",
+ "section_app": "In the app",
+ "section_app_hint": "Works while the Jarvis window is in front.",
+ "section_calls": "Calls",
+ "section_calls_hint": "Start and end a voice call — from any app on this computer.",
+ "section_dictation": "Dictation",
+ "section_dictation_hint": "Speak into whatever window is in front. Changed in the voice section.",
+ "edit_in_voice": "Change",
+ "section_workspace": "Terminals and workspace",
+ "section_workspace_hint": "Fixed keys for the agent terminals and this app.",
+ "footer": "Call, hang-up and dictation keys work everywhere on this computer. The quick switcher and the workspace keys only work inside the Jarvis window."
+ },
"pets": {
"title": "My Pets",
"subtitle": "A small pixel companion that floats on your desktop and reacts as {name} listens, thinks and talks. Press {0} to hide or show it.",
diff --cc jarvis/ui/web/frontend/src/i18n/locales/es.json
index aa2c5e8bad,1feb95956f..895deea4ee
--- a/jarvis/ui/web/frontend/src/i18n/locales/es.json
+++ b/jarvis/ui/web/frontend/src/i18n/locales/es.json
@@@ -6103,145 -6042,34 +6082,171 @@@
"voice_hint": "También puedes decir \"haz un appshot\".",
"save_error": "No se pudo guardar: {0}",
"toast_refused": "Sin appshot: {0}",
- "chip_label": "Appshot añadido a tu mensaje"
+ "chip_label": "Appshot añadido a tu mensaje",
+ "editor": {
+ "title": "Editar appshot",
+ "open": "Editar",
+ "tool_arrow": "Flecha",
+ "tool_rect": "Rectángulo",
+ "tool_ellipse": "Elipse",
+ "tool_pen": "Lápiz",
+ "tool_highlight": "Marcador",
+ "tool_text": "Texto",
+ "tool_pixelate": "Pixelar",
+ "tool_crop": "Recortar",
+ "color": "Color",
+ "size": "Grosor",
+ "undo": "Deshacer",
+ "redo": "Rehacer",
+ "copy": "Copiar",
+ "copied": "Copiado al portapapeles",
+ "copy_failed": "No se pudo copiar: {0}",
+ "copy_timeout": "el portapapeles no respondió",
+ "save": "Guardar",
+ "apply": "Usar esta versión",
+ "applied": "Appshot editado guardado. Tu próximo mensaje lo usará.",
+ "close": "Cerrar",
+ "gone": "Este appshot ya no se conserva, así que no se puede editar.",
+ "text_placeholder": "Escribe…"
+ }
},
+ "jarvisx": {
+ "title": "Jarvis X",
+ "subtitle": "Capturas y grabaciones de pantalla, con un editor rápido para marcarlas.",
+ "tab_library": "Biblioteca",
+ "tab_settings": "Ajustes",
+ "time_now": "Ahora mismo",
+ "time_minutes": "hace {0} min",
+ "action_failed": "No ha funcionado.",
+ "deleted": "Eliminado",
+ "copied": "Copiado al portapapeles",
+ "copy_failed": "No se pudo copiar.",
+ "capture_region": "Región",
+ "capture_window": "Ventana",
+ "capture_fullscreen": "Pantalla completa",
+ "recording": "Grabando",
+ "record_stop": "Detener",
+ "record_region": "Grabar región",
+ "record_fullscreen": "Grabar pantalla",
+ "recording_unavailable": "La grabación de pantalla no está disponible en este equipo.",
+ "disabled_hint": "Jarvis X está desactivado. Actívalo en Ajustes.",
+ "load_failed": "No se pudieron cargar tus capturas: {0}",
+ "empty_title": "Aún no hay capturas",
+ "empty_body": "Haz una captura con un atajo o con los botones de arriba. Aparece aquí, lista para editar.",
+ "delete_title": "¿Eliminar esta captura?",
+ "delete_body": "El archivo se borra de tu disco. No se puede deshacer.",
+ "delete": "Eliminar",
+ "open_video": "Reproducir {0}",
+ "open_editor": "Editar {0}",
+ "mode_region": "Región",
+ "mode_window": "Ventana",
+ "mode_fullscreen": "Pantalla completa",
+ "edited": "Editada",
+ "kind_video": "Vídeo",
+ "kind_image": "Captura",
+ "edit": "Editar",
+ "open_window": "Abrir en su propia ventana",
+ "copy": "Copiar",
+ "reveal": "Mostrar en la carpeta",
+ "editor": {
+ "title": "Editor de Jarvis X",
+ "no_item": "No se indicó ninguna captura. Abre el editor desde la biblioteca de Jarvis X.",
+ "image_failed": "No se pudo cargar la imagen.",
+ "tools": "Herramientas",
+ "tool_select": "Seleccionar y mover",
+ "tool_rect": "Rectángulo",
+ "tool_highlight": "Recuadro resaltado",
+ "tool_ellipse": "Elipse",
+ "tool_arrow": "Flecha",
+ "tool_line": "Línea",
+ "tool_pen": "Lápiz",
+ "tool_marker": "Rotulador",
+ "tool_text": "Texto",
+ "tool_counter": "Paso numerado",
+ "tool_blur": "Pixelar",
+ "tool_crop": "Recortar",
+ "undo": "Deshacer",
+ "redo": "Rehacer",
+ "save": "Guardar",
+ "done": "Guardar y cerrar",
+ "save_failed": "No se pudo guardar: {0}",
+ "saved": "Guardado",
+ "color": "Color",
+ "stroke": "Grosor",
+ "font_size": "Tamaño del texto",
+ "shadow": "Sombra",
+ "crop_hint": "Arrastra sobre la parte que quieres conservar.",
+ "crop_reset": "Quitar recorte",
+ "crop_apply": "Listo",
+ "select_hint": "Haz clic en una marca para moverla. Doble clic en un texto para editarlo.",
+ "delete_shape": "Eliminar marca",
+ "base": "Partir de",
+ "base_edited": "Editada",
+ "base_original": "Original",
+ "zoom_out": "Alejar",
+ "zoom_in": "Acercar",
+ "zoom_fit": "Ajustar a la ventana",
+ "load_failed": "No se pudo abrir esta captura.",
+ "dev_hint": "Vista previa: esta imagen no es una captura guardada y no se puede guardar.",
+ "discard_title": "¿Descartar los cambios?",
+ "discard_body": "Se perderán tus marcas desde el último guardado.",
+ "discard_confirm": "Descartar",
+ "switch_title": "¿Cambiar la imagen de partida?",
+ "switch_body": "Se perderán las marcas sin guardar. Las ediciones guardadas siguen en la versión editada."
+ },
+ "settings": {
+ "load_failed": "No se pudieron cargar los ajustes de Jarvis X.",
+ "section_general": "General",
+ "enabled_label": "Usar Jarvis X",
+ "enabled_hint": "Activa los atajos de captura. Desactivado, los atajos no hacen nada.",
+ "section_shortcuts": "Atajos de teclado",
+ "shortcuts_off": "Los atajos solo funcionan con Jarvis X activado.",
+ "hotkey_region": "Capturar una región",
+ "hotkey_window": "Capturar una ventana",
+ "hotkey_fullscreen": "Capturar la pantalla completa",
+ "hotkey_record_region": "Grabar una región",
+ "hotkey_record_fullscreen": "Grabar la pantalla completa",
+ "hotkey_stop_recording": "Detener la grabación",
+ "hotkey_armed": "Activo",
+ "hotkey_unarmed": "No activo: {0}",
+ "hotkey_unarmed_plain": "No activo ahora mismo",
+ "save_error": "No se pudo guardar: {0}",
+ "section_thumbnail": "Miniatura",
+ "persist_label": "Mantener la miniatura hasta que la cierre",
+ "persist_hint": "Tras una captura, una pequeña vista previa aparece en la esquina de la pantalla.",
+ "dismiss_label": "Ocultar la miniatura tras",
+ "dismiss_hint": "Desaparece sola a los {0} segundos.",
+ "dismiss_seconds": "Segundos",
+ "seconds_unit": "s",
+ "section_after": "Tras una captura",
+ "save_dir_label": "Carpeta de guardado",
+ "save_dir_hint": "Donde se guardan las nuevas capturas y grabaciones.",
+ "clipboard_label": "Copiar al portapapeles",
+ "clipboard_hint": "Cada captura nueva está lista para pegar al instante.",
+ "sound_label": "Reproducir el sonido del obturador",
+ "effect_label": "Mostrar la animación",
+ "effect_hint": "Un destello breve y la miniatura vuela a la esquina.",
+ "recording_unavailable": "La grabación de pantalla no está disponible aquí: {0}"
+ }
+ },
+ "shortcuts_view": {
+ "title": "Atajos de teclado",
+ "description": "Todas las combinaciones de teclas que Jarvis escucha, en un solo lugar. Pulsa una combinación para ver qué hace.",
+ "tester_title": "Prueba una combinación",
+ "tester_hint": "Pulsa cualquier tecla: aparece aquí junto con lo que hace en Jarvis.",
+ "tester_modifiers": "Mantén pulsado y añade una tecla.",
+ "tester_free": "Libre: nada en Jarvis usa esta combinación.",
+ "section_app": "En la app",
+ "section_app_hint": "Funciona mientras la ventana de Jarvis está delante.",
+ "section_calls": "Llamadas",
+ "section_calls_hint": "Empieza y termina una llamada de voz desde cualquier app de este ordenador.",
+ "section_dictation": "Dictado",
+ "section_dictation_hint": "Habla en la ventana que esté delante. Se cambia en la sección de voz.",
+ "edit_in_voice": "Cambiar",
+ "section_workspace": "Terminales y espacio de trabajo",
+ "section_workspace_hint": "Teclas fijas para los terminales de agentes y esta app.",
+ "footer": "Las teclas de llamada, colgar y dictado funcionan en todo este ordenador. El cambio rápido y las teclas del espacio de trabajo solo dentro de la ventana de Jarvis."
+ },
"pets": {
"title": "Mis mascotas",
"subtitle": "Un pequeño compañero de píxeles que flota en tu escritorio y reacciona mientras {name} escucha, piensa y habla. Pulsa {0} para ocultarlo o mostrarlo.",
diff --cc scripts/ci/silent-handlers-baseline.json
index 204029d073,1488afe1e6..6f49a987cb
--- a/scripts/ci/silent-handlers-baseline.json
+++ b/scripts/ci/silent-handlers-baseline.json
@@@ -1,6 -1,6 +1,6 @@@
{
"_comment": "Per-file count of exception handlers that neither log nor re-raise. Generated by scripts/ci/check_silent_exception_handlers.py --update. These numbers may go DOWN freely; an increase is a gate failure.",
- "total": 1471,
- "total": 1571,
++ "total": 1469,
"files": {
"jarvis/__main__.py": 9,
"jarvis/admin/executor.py": 9,
@@@ -122,7 -126,7 +122,6 @@@
"jarvis/cu/geometry.py": 1,
"jarvis/cu/indicator/capture_guard.py": 1,
"jarvis/cu/indicator/controller.py": 3,
-- "jarvis/cu/indicator/protocol.py": 2,
"jarvis/cu/verify.py": 5,
"jarvis/diagnostics/doctor.py": 4,
"jarvis/dictation/_locks.py": 1,