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 remote-tracking branch 'origin/main' into claude/land-local-main-2026-10-05

rubenluetke10-beep4930ea61aa5c
diff --cc NOTICE
index cab44ada5c,36cb55c1b0..d230a7952b
--- a/NOTICE
+++ b/NOTICE
@@@ -10,17 -10,6 +10,19 @@@ License, Version 2.0
Bundled third-party components keep their own licenses and notices - see
docs/licensing.md and the license files shipped beside them, for example
- jarvis/assets/vad/LICENSE for the Silero VAD model.
+ jarvis/assets/vad/LICENSE for the Silero VAD model, and
+ third_party/hermes-agent/LICENSE for portions adapted from
+ NousResearch/hermes-agent (MIT, Copyright (c) 2025 Nous Research).
+
+The Agentic IDE thread work log (jarvis/ui/web/frontend/src/components/agentic/threads/
+threadWork.ts, ThreadTimeline.tsx and the live-tool-shine rule in src/index.css)
+contains portions adapted from T3 Code (https://github.com/pingdotgg/t3code),
+Copyright (c) 2026 T3 Tools Inc., used under the MIT License - see
+third_party/t3code/LICENSE.
+
+The Agentic IDE explorer's file-type icons (jarvis/ui/web/frontend/src/components/
+agentic/sidePanel/explorer/fileIconSprite.ts and fileIcon.ts) contain SVG symbols
+and file-name rules from @pierre/trees (https://www.npmjs.com/package/@pierre/trees),
+Copyright 2025 Pierre Computer Company, used under the Apache License, Version 2.0 -
+see third_party/pierre-trees/LICENSE - and a colour table adapted from T3 Code under
+the MIT License.
diff --cc docs/licensing.md
index 7cca126a86,d0ad97202a..0d629c5fda
--- a/docs/licensing.md
+++ b/docs/licensing.md
@@@ -69,20 -69,11 +69,25 @@@ The bundled Silero VAD model (`jarvis/a
from its own authors and keeps it — the switch does not touch it, and no
dependency's terms change either. Nothing is relicensed by being included here.
+The Agentic IDE thread work log contains portions adapted from
+[T3 Code](https://github.com/pingdotgg/t3code) @ `e22c880`, MIT License,
+Copyright (c) 2026 T3 Tools Inc. The full text ships in
+[`third_party/t3code/LICENSE`](../third_party/t3code/LICENSE), and every adapted
+file names its source in a header comment.
+
+The Agentic IDE explorer's coloured file-type icons
+(`jarvis/ui/web/frontend/src/components/agentic/sidePanel/explorer/fileIconSprite.ts`
+and `fileIcon.ts`) contain SVG symbols and file-name rules copied from
+[@pierre/trees](https://www.npmjs.com/package/@pierre/trees) 1.0.0-beta.6,
+Apache License 2.0, Copyright 2025 Pierre Computer Company, full text in
+[`third_party/pierre-trees/LICENSE`](../third_party/pierre-trees/LICENSE), plus a
+colour table adapted from T3 Code @ `31f9d83` under the MIT license above.
+
+ A few well-separated portions of NousResearch/hermes-agent (MIT, Copyright (c)
+ 2025 Nous Research) are adapted into the agent code. Each adapted block names
+ its upstream file and commit in a header comment; the license text and the list
+ of adapted files live in [`third_party/hermes-agent/`](../third_party/hermes-agent/).
+
## Still to do at the 2.0 release
- [ ] `homebrew-tap/Formula/personal-jarvis-installer.rb` and
diff --cc jarvis/society/companion.py
index 9fc01e76c0,db1c02db8a..2f482aa0c5
--- a/jarvis/society/companion.py
+++ b/jarvis/society/companion.py
@@@ -1,14 -1,19 +1,24 @@@
"""Validated visual companion settings inside the existing avatar JSON envelope."""
- from typing import Annotated, Any, Literal
+ import secrets
-from typing import Any, Final, Literal
++from typing import Annotated, Any, Final, Literal
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field, StringConstraints
+
+# Mirrors ACCESSORY_SLOTS in the frontend catalog (parity test pins it). Item ids
+# stay open-ended so a look saved by a newer build survives an older one.
+AccessorySlot = Literal["back", "outfit", "neck", "mouth", "face", "head", "held"]
+AccessoryId = Annotated[str, StringConstraints(pattern=r"^[a-z0-9_]{1,40}$")]
+ #: Mirrors ``COMPANION_SHAPES`` / ``COMPANION_COLORS`` in the frontend's
+ #: ``components/society/companion/appearance.ts`` (parity test pins both).
+ COMPANION_SHAPES: Final[tuple[str, ...]] = (
+ "circle", "squircle", "pill", "triangle", "hexagon", "cloud", "drop",
+ )
+ COMPANION_COLORS: Final[tuple[str, ...]] = (
+ "#8b5cf6", "#c5dfd4", "#f2a65a", "#7ab6ef", "#ed91aa", "#b7cb78", "#bba7ed", "#79c7c4",
+ )
+
class CompanionAppearance(BaseModel):
"""One identity for the profile and its presentation-only world follower."""
@@@ -24,6 -28,16 +34,20 @@@
followDistanceM: float = Field(default=1.0, ge=0.5, le=2.0)
+ def random_companion() -> dict[str, Any]:
+ """A random, valid companion look for a newly created agent."""
+ rng = secrets.SystemRandom()
- return CompanionAppearance(
++ look = CompanionAppearance(
+ shape=rng.choice(COMPANION_SHAPES), # type: ignore[arg-type]
+ color=rng.choice(COMPANION_COLORS),
+ eyes=rng.choice(("dots", "lines")), # type: ignore[arg-type]
+ ).model_dump()
++ # A new agent wears nothing yet; store it the way a bare look is stored.
++ if not look.get("accessories"):
++ look.pop("accessories", None)
++ return look
+
+
def validate_avatar_companion(avatar: dict[str, Any]) -> dict[str, Any]:
"""Preserve character/import fields verbatim; validate only our namespace."""
if "companion" not in avatar:
diff --cc jarvis/ui/web/frontend/src/components/society/office/OfficeStage.tsx
index 245970ca85,844d460e45..3a245beff0
--- a/jarvis/ui/web/frontend/src/components/society/office/OfficeStage.tsx
+++ b/jarvis/ui/web/frontend/src/components/society/office/OfficeStage.tsx
@@@ -53,15 -52,8 +53,14 @@@ import { OfficeMinimap } from "./Office
import { OfficeCompass } from "./OfficeCompass";
import { OfficeFullMap } from "./OfficeFullMap";
import { OfficeFrameDriver } from "./OfficeFrameDriver";
+import { useProgressionSync } from "../progression/useProgressionSync";
+import { useProgression } from "../progression/progressionStore";
+import { LevelHud, LevelToasts } from "../progression/LevelHud";
+import { LevelUpBanner } from "../progression/LevelUpBanner";
+import { LevelHallScreen } from "../progression/hall/LevelHallScreen";
+import "../progression/progression.css";
// Only loaded when a host without its own create dialog (the IDE's side panel) spawns an agent.
- const CreateAgentDialog = lazy(() => import("../create/CreateAgentDialog").then((m) => ({ default: m.CreateAgentDialog })));
// Only loaded when someone plays a retro cabinet on the arcade floor.
const RetroArcadeOverlay = lazy(() => import("../arcade/RetroArcadeOverlay").then((m) => ({ default: m.RetroArcadeOverlay })));
@@@ -508,14 -474,6 +514,9 @@@ export function OfficeStage({ onOpenLed
<OfficeFullMap open={mapOpen} onOpen={() => setMapOpen(true)} onClose={() => setMapOpen(false)}
layout={layout} agents={agents} selectedId={selection?.kind === "agent" ? selection.id : null} />
{!compact && showHintBar && <p className="office-hud office-help" data-office-ui>{t("society.office.help")}</p>}
+ <LevelToasts names={agentNames} agents={jarvisAgents} />
+ <LevelHallScreen agents={jarvisAgents} playerName={playerName} petName={petName} playerLook={playerToyLook} />
+ <LevelUpBanner playerName={playerName} petName={petName} />
- {creating && (
- <Suspense fallback={null}>
- <CreateAgentDialog open onClose={() => setCreating(false)} onCreated={() => setCreating(false)} />
- </Suspense>
- )}
</section>
);
}
diff --cc jarvis/ui/web/frontend/src/views/society/SocietyView.tsx
index 7b7ff278df,f02a430935..b22ba626d4
--- a/jarvis/ui/web/frontend/src/views/society/SocietyView.tsx
+++ b/jarvis/ui/web/frontend/src/views/society/SocietyView.tsx
@@@ -131,7 -113,24 +124,22 @@@ export function SocietyView()
if (inDesktopShell()) void setMapFullscreen(next === "world").catch(() => setFullscreenError(true));
}, []);
+ // One click creates the agent and opens its chat: no form first. The agent
+ // introduces itself there and proposes its own name and role.
+ const createAgent = useCallback(() => {
+ if (creating) return;
+ setCreating(true);
+ setCreateError("");
+ void quickCreate()
+ .then((agent) => {
+ selectAgent(agent.agentId);
+ switchMode("agents");
+ })
+ .catch((error) => setCreateError(error instanceof Error ? error.message : String(error)))
+ .finally(() => setCreating(false));
+ }, [creating, quickCreate, selectAgent, switchMode]);
+
useEffect(() => {
- const reset = useSocietyShell.getState().reset;
- reset();
// A reload starts in Agents; restore a native window left fullscreen by it.
if (inDesktopShell()) void setMapFullscreen(false).catch(() => setFullscreenError(true));
return () => {