Skip to content

Self-improving AI Employees for everyone

feat: refresh OpenCompany branding, orb, and model catalog

trohitg3b84a0845c3d
diff --git a/.dockerignore b/.dockerignore
index b9953b0a..bad183a7 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -49,6 +49,11 @@ desktop
# node_modules, rendered audio and video output).
marketing
+# Generated artwork (output/) and local scratch space (tmp/); the image uses
+# neither. Both patterns match only at the context root.
+output
+tmp
+
# Terraform providers and state (state files carry secrets).
**/.terraform
**/*.tfstate*
@@ -67,3 +72,8 @@ marketing
!.opencompany/workflows
.machina
data
+# A source-dev backend resolves a relative DATA_DIR against its own cwd, so
+# the Mobile workspace's phone runtime (emulator images, JDK, engine; several
+# GB) can sit under server/.opencompany. The runtime stage copies all of
+# server/, so leaving it in would put it in the image.
+server/.opencompany
diff --git a/.gitattributes b/.gitattributes
index fce745de..d44d584b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -7,8 +7,3 @@ bin/cli.js text eol=lf
*.tftpl text eol=lf
*.service text eol=lf
docker/Dockerfile text eol=lf
-
-# Signed brand assets (C2PA manifest over the exact bytes): never normalise
-# line endings, or the signature and the pinned sha256 in
-# client/src/components/brand/__tests__/favicon.test.ts break on checkout.
-client/public/opencompany-icon.svg -text
diff --git a/client/public/opencompany-icon.svg b/client/public/opencompany-icon.svg
index e29744f2..e44c5beb 100644
--- a/client/public/opencompany-icon.svg
+++ b/client/public/opencompany-icon.svg
@@ -1,15 +1,4 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" width="1024" height="1024" xmlns:c2pa="http://c2pa.org/manifest"><metadata><c2pa:manifest>AAAWgmp1bWIAAAAeanVtZGMycGEAEQAQgAAAqgA4m3EDYzJwYQAAABZcanVtYgAAAEdqdW1kYzJtYQARABCAAACqADibcQN1cm46YzJwYTpkYzczMmM5Ny0wMmVlLTRlMGYtYWU2NC1mZmZkMjVlOTY1YjkAAAADl2p1bWIAAAApanVtZGMyYXMAEQAQgAAAqgA4m3EDYzJwYS5hc3NlcnRpb25zAAAAALxqdW1iAAAARGp1bWRjYm9yABEAEIAAAKoAOJtxE2MycGEuaW5ncmVkaWVudC52MwAAAAAYYzJzaGHFLtfmFZFqdJKQHuyPEK0AAABwY2JvcqNpZGM6Zm9ybWF0bWltYWdlL3N2Zyt4bWxqaW5zdGFuY2VJRHgseG1wOmlpZDozMmM5ODQ1OS0yYmZmLTQxMzgtYWQzOC01OTRmNTQyMWYwNzJscmVsYXRpb25zaGlwaHBhcmVudE9mAAAB4mp1bWIAAABBanVtZGNib3IAEQAQgAAAqgA4m3ETYzJwYS5hY3Rpb25zLnYyAAAAABhjMnNoQrbTfii6vxJSWEaO0fX16QAAAZljYm9yomdhY3Rpb25zgqJmYWN0aW9ua2MycGEub3BlbmVkanBhcmFtZXRlcnOha2luZ3JlZGllbnRzgaJjdXJseC1zZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmluZ3JlZGllbnQudjNkaGFzaFgg4+CK/iN/aVbTUQVE9Qgyjm+JV4ebN0BesmRxii0FCTykZmFjdGlvbngdY29tLmFudGhyb3BpYy5jbGF1ZGUucHJvdmlkZWRqcGFyYW1ldGVyc6F4H2NvbS5hbnRocm9waWMub3JpZ2luLWNvbmZpZGVuY2VndW5rbm93bmtkZXNjcmlwdGlvbnhmQ2xhdWRlIHByb3ZpZGVkIHRoaXMgZmlsZSBhdCB0aGUgcmVxdWVzdCBvZiBhIHVzZXIgYW5kIG1heSBoYXZlIGNyZWF0ZWQgb3IgbW9kaWZpZWQgdGhlIGZpbGUgY29udGVudHMubXNvZnR3YXJlQWdlbnShZG5hbWVmQ2xhdWRlcmFsbEFjdGlvbnNJbmNsdWRlZPUAAADIanVtYgAAAEBqdW1kY2JvcgARABCAAACqADibcRNjMnBhLmhhc2guZGF0YQAAAAAYYzJzaBfjxwq3XURgBlVjGwSM5GQAAACAY2JvcqVjYWxnZnNoYTI1NmNwYWRNAAAAAAAAAAAAAAAAAGRoYXNoWCBPWVx6GGfsE/xAeP2gY88cg4McXJ94C1lUUDZKKBVfkmRuYW1lbmp1bWJmIG1hbmlmZXN0amV4Y2x1c2lvbnOBomVzdGFydBiaZmxlbmd0aBkeBAAAAj5qdW1iAAAAJ2p1bWRjMmNsABEAEIAAAKoAOJtxA2MycGEuY2xhaW0udjIAAAACD2Nib3KlY2FsZ2ZzaGEyNTZpc2lnbmF0dXJleE1zZWxmI2p1bWJmPS9jMnBhL3VybjpjMnBhOmRjNzMyYzk3LTAyZWUtNGUwZi1hZTY0LWZmZmQyNWU5NjViOS9jMnBhLnNpZ25hdHVyZWppbnN0YW5jZUlEeCx4bXA6aWlkOjE1MGUwOGJjLTQ1YTktNGQ2My1iMzgwLTZkYWFlNzRjZTIxMHJjcmVhdGVkX2Fzc2VydGlvbnODomN1cmx4LXNlbGYjanVtYmY9YzJwYS5hc3NlcnRpb25zL2MycGEuaW5ncmVkaWVudC52M2RoYXNoWCDj4Ir+I39pVtNRBUT1CDKOb4lXh5s3QF6yZHGKLQUJPKJjdXJseCpzZWxmI2p1bWJmPWMycGEuYXNzZXJ0aW9ucy9jMnBhLmFjdGlvbnMudjJkaGFzaFggyCMrxrKtIOaAPEXKOiW9pOyqyrcAAC8u+Ua8aMuwetqiY3VybHgpc2VsZiNqdW1iZj1jMnBhLmFzc2VydGlvbnMvYzJwYS5oYXNoLmRhdGFkaGFzaFggEuQ7eZRsZmC8y2E2Gbkxjaxi9yUSk9ls+wP6J6Etak10Y2xhaW1fZ2VuZXJhdG9yX2luZm+jZG5hbWVvQW50aHJvcGljIEZpbGVzZ3ZlcnNpb25lMS4wLjBrc3BlY1ZlcnNpb25lMi40LjAAABA4anVtYgAAAChqdW1kYzJjcwARABCAAACqADibcQNjMnBhLnNpZ25hdHVyZQAAABAIY2JvctKEWQISogEmGCFZAgowggIGMIIBjaADAgECAhRA5aAK7sI50L64g/oGQgU9Z1UTADAKBggqhkjOPQQDAzBJMRcwFQYDVQQKEw5BbnRocm9waWMsIFBCQzEuMCwGA1UEAxMlQW50aHJvcGljIENvbnRlbnQgQ3JlZGVudGlhbHMgUm9vdCBDQTAeFw0yNjA4MDcxODQzNTZaFw0yODA4MDYxOTQzNTZaMEQxFzAVBgNVBAoTDkFudGhyb3BpYywgUEJDMSkwJwYDVQQDEyBBbnRocm9waWMgQ2xhdWRlIENvbnRlbnQgU2lnbmluZzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABJh6CmvLUBgFFNU0vUKlOVtE6djd17L5SuwX0LemFisBM3dkd/3cyjxFA3Qo5S46fX0/ihY0VZ7mfb9KF703t5OjWDBWMA4GA1UdDwEB/wQEAwIHgDAVBgNVHSUEDjAMBgorBgEEAYPoXgIBMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUzlHiBIFOZFsj+OPEz5o+nMHXXMIwCgYIKoZIzj0EAwMDZwAwZAIwMXMdFJ4BetLLVY7ORuE9noqbbAZOZn/aArXyTwFAZfKrPzxF2vPoJNf1+UCdg1XGAjBwX1zd9WGqYkqmL5SFqw1QySjr1zJfpJM9+1rdDwSPLMOPOjKuiXjoU/pUUeG9RwmhY3BhZFkNngAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPZYQEQqrkS1LFkT10X21R/1GgxA54QjmJDoQM9iaAUQkndsg3qWqvSSBZC8o9a9rauUNuk+ksEkfHARy7susPW29X8=</c2pa:manifest></metadata>
- <defs>
- <linearGradient id="bg" x1="0" y1="0" x2="1" y2="1"><stop offset="0" stop-color="#1f2340"></stop><stop offset="1" stop-color="#0e1020"></stop></linearGradient>
- <linearGradient id="o" x1="0" y1="0" x2="1" y2="1"><stop offset="0" stop-color="#bd93f9"></stop><stop offset="1" stop-color="#8be9fd"></stop></linearGradient>
- <linearGradient id="c" x1="0" y1="1" x2="1" y2="0"><stop offset="0" stop-color="#8be9fd"></stop><stop offset="1" stop-color="#50fa7b"></stop></linearGradient>
- </defs>
- <rect x="64" y="64" width="896" height="896" rx="200" fill="url(#bg)"></rect>
- <g transform="translate(512 512) scale(5.2) translate(-70 -48)">
- <path d="M 113.8 28.2 A 28 28 0 1 0 113.8 67.8" fill="none" stroke="url(#c)" stroke-width="14" stroke-linecap="round"></path>
- <circle cx="44" cy="48" r="28" fill="none" stroke="url(#o)" stroke-width="14"></circle>
- <circle cx="44" cy="48" r="8" fill="#f8f8f2"></circle>
- <circle cx="113.8" cy="28.2" r="9" fill="#ff79c6"></circle>
- <circle cx="113.8" cy="67.8" r="9" fill="#f1fa8c"></circle>
- </g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="-380 -448 760 760">
+<style>path{fill:#000}@media (prefers-color-scheme:dark){path{fill:#fff}}</style>
+<path d="M252.4 -55.9A258.5 258.5 0 1 0 252.4 55.9L172.8 38.3A177 177 0 1 1 172.8 -38.3ZM-91 0A91 91 0 1 0 91 0A91 91 0 1 0 -91 0ZM165.5 -220.5A192 192 0 0 0 67.4 -369.2A72 72 0 0 1 43.3 -286.6A141.5 141.5 0 0 1 165.5 -220.5ZM-62 -344A62 62 0 1 0 62 -344A62 62 0 1 0 -62 -344ZM108.2 253.6A192 192 0 0 0 286 243A72 72 0 0 1 226.5 180.8A141.5 141.5 0 0 1 108.2 253.6ZM235.9 172A62 62 0 1 0 359.9 172A62 62 0 1 0 235.9 172ZM-273.7 -33.1A192 192 0 0 0 -353.4 126.2A72 72 0 0 1 -269.8 105.7A141.5 141.5 0 0 1 -273.7 -33.1ZM-359.9 172A62 62 0 1 0 -235.9 172A62 62 0 1 0 -359.9 172Z"/>
+</svg>
diff --git a/client/src/components/brand/Logo.tsx b/client/src/components/brand/Logo.tsx
index e7102d1d..4cb70feb 100644
--- a/client/src/components/brand/Logo.tsx
+++ b/client/src/components/brand/Logo.tsx
@@ -1,134 +1,119 @@
/**
- * OpenCompany logo: the OC mark and the wordmark.
+ * OpenCompany logo: the Open Council mark and the wordmark.
*
- * The mark is an O (the orb's ring: a purple-to-cyan gradient stroke with a
- * core dot) linked to a C (a cyan-to-green arc) with two employee nodes at the
- * C's ends. It is inline SVG that reads the `--lg-*` palette (themes/light.css,
- * themes/dark.css), so it switches with the theme family. Geometry and motion
- * come from design_handoff_opencompany_home (README "Logo",
- * reference/OpenCompany Logo.dc.html).
- *
- * Standalone assets (favicon, desktop icon) are the handoff's signed SVG files
- * in client/public, copied byte for byte; this component re-draws the mark,
- * it never embeds those files.
+ * The mark is a C (an open ring) around a core, with three members at it:
+ * each a head and a crescent sweeping clockwise along the ring. The wordmark
+ * is "OpenCompany" in a serif, drawn as outlines. Both are one colour, the
+ * text colour, so they are black on light themes and white on dark ones.
+ * The paths live in ./geometry.ts, which the favicon and the desktop icon
+ * embed too.
*/
-import { useEffect, useId, useLayoutEffect, useRef, type Ref } from 'react';
+import { useEffect, useLayoutEffect, useRef } from 'react';
import { animate } from '@/lib/motion';
-import { claimLogoIntro } from './logoIntro';
import { cn } from '@/lib/utils';
+import {
+ MARK_CORE,
+ MARK_HEIGHT,
+ MARK_MEMBERS,
+ MARK_RING,
+ MARK_VIEWBOX,
+ MARK_WIDTH,
+ WORDMARK_HEIGHT_EM,
+ WORDMARK_PATH,
+ WORDMARK_VIEWBOX,
+ WORDMARK_WIDTH_EM,
+} from './geometry';
+import { claimLogoIntro } from './logoIntro';
-/** Mark heights from the handoff. Below 16px use the app icon instead. */
+/** Mark heights and wordmark em sizes (px). Below 16px use the app icon instead. */
const SIZES = {
- sidebar: { mark: 23, word: 'text-md', gap: 'gap-2.25' },
- header: { mark: 20, word: 'text-lead', gap: 'gap-2' },
- settings: { mark: 16, word: 'text-sm', gap: 'gap-2' },
+ sidebar: { mark: 23, em: 16, gap: 'gap-2.25' },
+ header: { mark: 20, em: 15, gap: 'gap-2' },
+ settings: { mark: 16, em: 13, gap: 'gap-2' },
} as const;
export type LogoSize = keyof typeof SIZES;
-const VIEWBOX_W = 140;
-const VIEWBOX_H = 96;
-
-/** Intro and pulse timings from the handoff's logo spec (ms). */
+/** Intro and pulse timings (ms). */
const MOTION = {
ring: 780,
- cDraw: 760,
- cDrawDelay: 220,
- nodePop: 520,
- nodeDelays: [820, 930],
+ headPop: 520,
+ headDelays: [760, 860, 960],
+ bodyFade: 420,
+ bodyLag: 80,
wordmark: 520,
wordmarkDelay: 300,
- pulseNode: 560,
+ pulseHead: 560,
pulseStagger: 90,
pulseRing: 900,
} as const;
+/** The C spins about the ring's centre, which sits this far from its box's
+ * top left corner (the box of a C open on the right: outer radius, twice). */
+const RING_ORIGIN = 'origin-[258.5px_258.5px] [transform-box:fill-box]';
+
interface MarkShapesProps {
- uid: string;
- ringRef?: Ref<SVGCircleElement>;
- arcRef?: Ref<SVGPathElement>;
- topNodeRef?: Ref<SVGCircleElement>;
- bottomNodeRef?: Ref<SVGCircleElement>;
+ ringRef?: (el: SVGPathElement | null) => void;
+ headRef?: (i: number) => (el: SVGPathElement | null) => void;
+ bodyRef?: (i: number) => (el: SVGPathElement | null) => void;
}
-/** The mark's gradients and shapes, shared by the logo and the static mark. */
-function MarkShapes({ uid, ringRef, arcRef, topNodeRef, bottomNodeRef }: MarkShapesProps) {
- const ringGradient = `oc-o-${uid}`;
- const arcGradient = `oc-c-${uid}`;
+/** The mark's shapes, shared by the logo and the static mark. */
+function MarkShapes({ ringRef, headRef, bodyRef }: MarkShapesProps) {
return (
<>
- <defs>
- <linearGradient id={ringGradient} x1="0" y1="0" x2="1" y2="1">
- <stop offset="0" className="[stop-color:var(--lg-ring-a)]" />
- <stop offset="1" className="[stop-color:var(--lg-ring-b)]" />
- </linearGradient>
- <linearGradient id={arcGradient} x1="0" y1="1" x2="1" y2="0">
- <stop offset="0" className="[stop-color:var(--lg-ring-b)]" />
- <stop offset="1" className="[stop-color:var(--lg-green)]" />
- </linearGradient>
- </defs>
- {/* Paint order matters: the C arc sits under the ring where they meet. */}
- <path
- ref={arcRef}
- d="M 113.8 28.2 A 28 28 0 1 0 113.8 67.8"
- fill="none"
- stroke={`url(#${arcGradient})`}
- strokeWidth={14}
- strokeLinecap="round"
- pathLength={1}
- strokeDasharray="1"
- />
- <circle
- ref={ringRef}
- cx="44"
- cy="48"
- r="28"
- fill="none"
- stroke={`url(#${ringGradient})`}
- strokeWidth={14}
- className="origin-center [transform-box:fill-box]"
- />
- <circle cx="44" cy="48" r="8" className="fill-lg-core" />
- <circle
- ref={topNodeRef}
- cx="113.8"
- cy="28.2"
- r="9"
- className="origin-center fill-lg-pink [transform-box:fill-box]"
- />
- <circle
- ref={bottomNodeRef}
- cx="113.8"
- cy="67.8"
- r="9"
- className="origin-center fill-lg-yellow [transform-box:fill-box]"
- />
+ <path ref={ringRef} d={MARK_RING} className={RING_ORIGIN} />
+ <path d={MARK_CORE} />
+ {MARK_MEMBERS.map((member, i) => (
+ <g key={member.head}>
+ <path ref={bodyRef?.(i)} d={member.body} />
+ <path ref={headRef?.(i)} d={member.head} className="origin-center [transform-box:fill-box]" />
+ </g>
+ ))}
</>
);
}
-/** useId output is not guaranteed to be a valid url(#...) fragment. */
-function useGradientUid(): string {
- return useId().replace(/[^a-zA-Z0-9_-]/g, '');
-}
-
/** The mark alone, filling the width of its box and never animated: the
* orb's stand-in where WebGL or motion is unavailable. Decorative. */
export function OcMark({ className }: { className?: string }) {
- const uid = useGradientUid();
return (
<svg
- viewBox={`0 0 ${VIEWBOX_W} ${VIEWBOX_H}`}
- className={cn('block h-auto overflow-visible', className)}
+ viewBox={MARK_VIEWBOX}
+ fill="currentColor"
+ className={cn('block h-auto text-fg-default', className)}
aria-hidden
focusable="false"
>
- <MarkShapes uid={uid} />
+ <MarkShapes />
</svg>
);
}
+/** The wordmark alone at `em` px, labelled as the product name. */
+function Wordmark({ em, svgRef }: { em: number; svgRef?: (el: SVGSVGElement | null) => void }) {
+ return (
+ <svg
+ ref={svgRef}
+ viewBox={WORDMARK_VIEWBOX}
+ width={round1(em * WORDMARK_WIDTH_EM)}
+ height={round1(em * WORDMARK_HEIGHT_EM)}
+ fill="currentColor"
+ className="shrink-0"
+ role="img"
+ aria-label="OpenCompany"
+ focusable="false"
+ >
+ <path d={WORDMARK_PATH} />
+ </svg>
+ );
+}
+
+function round1(value: number): number {
+ return Math.round(value * 10) / 10;
+}
+
export interface OcLogoProps {
size?: LogoSize;
/** Draw the wordmark next to the mark. When hidden, the mark itself is labelled. */
@@ -143,15 +128,12 @@ export interface OcLogoProps {
export function OcLogo({ size = 'sidebar', wordmark = true, intro = false, pulseNonce = 0, className }: OcLogoProps) {
const spec = SIZES[size];
const height = spec.mark;
- const width = Math.round((height * VIEWBOX_W) / VIEWBOX_H);
-
- const uid = useGradientUid();
+ const width = Math.round((height * MARK_WIDTH) / MARK_HEIGHT);
- const ringRef = useRef<SVGCircleElement>(null);
- const arcRef = useRef<SVGPathElement>(null);
- const topNodeRef = useRef<SVGCircleElement>(null);
- const bottomNodeRef = useRef<SVGCircleElement>(null);
- const wordRef = useRef<HTMLSpanElement>(null);
+ const ringRef = useRef<SVGPathElement | null>(null);
+ const heads = useRef<(SVGPathElement | null)[]>([]);
+ const bodies = useRef<(SVGPathElement | null)[]>([]);
+ const wordRef = useRef<SVGSVGElement | null>(null);
useLayoutEffect(() => {
if (!intro || !claimLogoIntro()) return;
@@ -163,17 +145,17 @@ export function OcLogo({ size = 'sidebar', wordmark = true, intro = false, pulse
],
{ duration: MOTION.ring, easing: 'overshoot' },
);
- animate(arcRef.current, [{ strokeDashoffset: 1 }, { strokeDashoffset: 0 }], {
- duration: MOTION.cDraw,
- delay: MOTION.cDrawDelay,
- easing: 'reveal',
- });
- [topNodeRef.current, bottomNodeRef.current].forEach((node, i) => {
- animate(node, [{ transform: 'scale(0)' }, { transform: 'scale(1)' }], {
- duration: MOTION.nodePop,
- delay: MOTION.nodeDelays[i],
+ MOTION.headDelays.forEach((delay, i) => {
+ animate(heads.current[i], [{ transform: 'scale(0)' }, { transform: 'scale(1)' }], {
+ duration: MOTION.headPop,
+ delay,
easing: 'overshoot',
});
+ animate(bodies.current[i], [{ opacity: 0 }, { opacity: 1 }], {
+ duration: MOTION.bodyFade,
+ delay: delay + MOTION.bodyLag,
+ easing: 'reveal',
+ });
});
animate(
wordRef.current,
@@ -187,11 +169,11 @@ export function OcLogo({ size = 'sidebar', wordmark = true, intro = false, pulse
useEffect(() => {
if (!pulseNonce) return;
- [topNodeRef.current, bottomNodeRef.current].forEach((node, i) => {
+ heads.current.forEach((head, i) => {
animate(
- node,
- [{ transform: 'scale(1)' }, { transform: 'scale(1.45)', offset: 0.4 }, { transform: 'scale(1)' }],
- { duration: MOTION.pulseNode, delay: MOTION.pulseStagger * i, easing: 'spring', fill: 'none' },
+ head,
+ [{ transform: 'scale(1)' }, { transform: 'scale(1.3)', offset: 0.4 }, { transform: 'scale(1)' }],
+ { duration: MOTION.pulseHead, delay: MOTION.pulseStagger * i, easing: 'spring', fill: 'none' },
);
});
animate(
@@ -208,11 +190,12 @@ export function OcLogo({ size = 'sidebar', wordmark = true, intro = false, pulse
const labelled = !wordmark;
return (
- <span className={cn('inline-flex shrink-0 items-center', spec.gap, className)}>
+ <span className={cn('inline-flex shrink-0 items-center text-fg-default', spec.gap, className)}>
<svg
- viewBox={`0 0 ${VIEWBOX_W} ${VIEWBOX_H}`}
+ viewBox={MARK_VIEWBOX}
width={width}
height={height}
+ fill="currentColor"
className="shrink-0 overflow-visible"
role={labelled ? 'img' : undefined}
aria-label={labelled ? 'OpenCompany' : undefined}
@@ -220,18 +203,24 @@ export function OcLogo({ size = 'sidebar', wordmark = true, intro = false, pulse
focusable="false"
>
<MarkShapes
- uid={uid}
- ringRef={ringRef}
- arcRef={arcRef}
- topNodeRef={topNodeRef}
- bottomNodeRef={bottomNodeRef}
+ ringRef={(el) => {
+ ringRef.current = el;
+ }}
+ headRef={(i) => (el) => {
+ heads.current[i] = el;
+ }}
+ bodyRef={(i) => (el) => {
+ bodies.current[i] = el;
+ }}
/>
</svg>
{wordmark && (
- <span ref={wordRef} className={cn('font-body tracking-wordmark whitespace-nowrap', spec.word)}>
- <span className="font-semibold text-fg-default">Open</span>
- <span className="font-medium text-fg-muted">Company</span>
- </span>
+ <Wordmark
+ em={spec.em}
+ svgRef={(el) => {
+ wordRef.current = el;
+ }}
+ />
)}
</span>
);
diff --git a/client/src/components/brand/__tests__/Logo.test.tsx b/client/src/components/brand/__tests__/Logo.test.tsx
index 7ce74eed..03603cfd 100644
--- a/client/src/components/brand/__tests__/Logo.test.tsx
+++ b/client/src/components/brand/__tests__/Logo.test.tsx
@@ -1,77 +1,70 @@
import { afterEach, beforeEach, describe, expect, it } from 'vitest';
import { render, screen } from '@testing-library/react';
import { OcLogo, OcMark } from '../Logo';
+import { MARK_CORE, MARK_MEMBERS, MARK_PATH, MARK_RING, MARK_VIEWBOX, WORDMARK_PATH } from '../geometry';
import { resetLogoIntroForTests } from '../logoIntro';
import { installWaapiStub } from '../../../test/waapi';
-function gradientRefs(container: HTMLElement): string[] {
- return Array.from(container.querySelectorAll('[stroke]'))
- .map((el) => /^url\(#(.+)\)$/.exec(el.getAttribute('stroke') ?? '')?.[1])
- .filter((id): id is string => Boolean(id));
+function markPaths(svg: Element): string[] {
+ return Array.from(svg.querySelectorAll('path')).map((path) => path.getAttribute('d') ?? '');
}
describe('OcLogo', () => {
it('reads as one "OpenCompany" label with the wordmark shown', () => {
const { container } = render(<OcLogo />);
- expect(container.textContent).toBe('OpenCompany');
- expect(container.querySelector('svg')).toHaveAttribute('aria-hidden', 'true');
- expect(screen.queryByRole('img')).toBeNull();
+ const [mark, word] = Array.from(container.querySelectorAll('svg'));
+ expect(mark).toHaveAttribute('aria-hidden', 'true');
+ expect(screen.getAllByRole('img')).toEqual([word]);
+ expect(word).toHaveAccessibleName('OpenCompany');
+ expect(word.querySelector('path')).toHaveAttribute('d', WORDMARK_PATH);
});
it('labels the mark itself when the wordmark is hidden', () => {
- render(<OcLogo wordmark={false} />);
- expect(screen.getByRole('img', { name: 'OpenCompany' })).toBeInTheDocument();
+ const { container } = render(<OcLogo wordmark={false} />);
+ expect(container.querySelectorAll('svg')).toHaveLength(1);
+ expect(screen.getByRole('img', { name: 'OpenCompany' })).toBe(container.querySelector('svg'));
});
it.each([
- ['sidebar', 34, 23],
- ['header', 29, 20],
- ['settings', 23, 16],
- ] as const)('%s size draws the mark at %dx%d', (size, width, height) => {
+ ['sidebar', 24, 23, 99.6, 19.2],
+ ['header', 21, 20, 93.4, 18],
+ ['settings', 17, 16, 80.9, 15.6],
+ ] as const)('%s size draws the mark at %dx%d and the wordmark at %sx%s', (size, width, height, wordW, wordH) => {
const { container } = render(<OcLogo size={size} />);
- const svg = container.querySelector('svg')!;
- expect(svg).toHaveAttribute('width', String(width));
- expect(svg).toHaveAttribute('height', String(height));
- expect(svg).toHaveAttribute('viewBox', '0 0 140 96');
+ const [mark, word] = Array.from(container.querySelectorAll('svg'));
+ expect(mark).toHaveAttribute('width', String(width));
+ expect(mark).toHaveAttribute('height', String(height));
+ expect(mark).toHaveAttribute('viewBox', MARK_VIEWBOX);
+ expect(word).toHaveAttribute('width', String(wordW));
+ expect(word).toHaveAttribute('height', String(wordH));
});
- it('gives every instance its own gradients, each resolvable in the document', () => {
- const { container } = render(
- <>
- <OcLogo />
- <OcLogo size="header" />
- </>,
- );
- const refs = gradientRefs(container);
- expect(refs).toHaveLength(4);
- expect(new Set(refs).size).toBe(4);
- for (const id of refs) {
- expect(id).toMatch(/^[a-zA-Z0-9_-]+$/);
- // By id alone: selector engines disagree on camelCase SVG type selectors.
- expect(container.querySelector(`[id="${id}"]`)?.tagName.toLowerCase()).toBe('lineargradient');
- }
+ it('is one colour, the text colour', () => {
+ const { container } = render(<OcLogo />);
+ expect(container.firstElementChild).toHaveClass('text-fg-default');
+ for (const svg of container.querySelectorAll('svg')) expect(svg).toHaveAttribute('fill', 'currentColor');
+ expect(container.querySelector('[fill]:not([fill="currentColor"]), [stroke], linearGradient')).toBeNull();
});
- it('shares the mark with the static OcMark, whose gradients stay unique too', () => {
+ it('draws the ring, the core, then each member body and head, as the icons do', () => {
+ const { container } = render(<OcLogo />);
+ const paths = markPaths(container.querySelector('svg')!);
+ expect(paths).toEqual([MARK_RING, MARK_CORE, ...MARK_MEMBERS.flatMap((m) => [m.body, m.head])]);
+ expect(paths.join('')).toBe(MARK_PATH);
+ });
+
+ it('shares the mark with the static OcMark, which is decorative and sized by its box', () => {
const { container } = render(
<>
- <OcMark />
- <OcLogo />
+ <OcMark className="w-3/5" />
+ <OcLogo wordmark={false} />
</>,
);
- const refs = gradientRefs(container);
- expect(refs).toHaveLength(4);
- expect(new Set(refs).size).toBe(4);
- const mark = container.querySelector('svg')!;
+ const [mark, logo] = Array.from(container.querySelectorAll('svg'));
expect(mark).toHaveAttribute('aria-hidden', 'true');
expect(mark).not.toHaveAttribute('width');
- });
-
- it('keeps the handoff paint order: C arc, ring, core, then the two end nodes', () => {
- const { container } = render(<OcLogo />);
- const shapes = Array.from(container.querySelectorAll('svg > path, svg > circle'));
- expect(shapes.map((el) => el.tagName.toLowerCase())).toEqual(['path', 'circle', 'circle', 'circle', 'circle']);
- expect(shapes[0]).toHaveAttribute('d', 'M 113.8 28.2 A 28 28 0 1 0 113.8 67.8');
+ expect(mark).toHaveClass('w-3/5', 'text-fg-default');
+ expect(markPaths(mark)).toEqual(markPaths(logo));
});
});
@@ -89,18 +82,22 @@ describe('OcLogo motion', () => {
it('plays the intro once per page load, on the mark and the wordmark', () => {
const first = render(<OcLogo intro />);
- const svg = first.container.querySelector('svg')!;
- const wordmark = first.container.querySelector('svg + span');
+ const [mark, word] = Array.from(first.container.querySelectorAll('svg'));
const targets = waapi.calls.map((c) => c.target);
- // Ring, C arc, two nodes, wordmark.
- expect(waapi.calls).toHaveLength(5);
- expect(targets).toContain(wordmark);
- expect(targets.every((t) => svg.contains(t) || t === wordmark)).toBe(true);
- const draw = waapi.calls.find((c) => c.target.tagName.toLowerCase() === 'path');
- expect(draw?.keyframes).toEqual([{ strokeDashoffset: 1 }, { strokeDashoffset: 0 }]);
+ // Ring, three heads, three bodies, wordmark.
+ expect(waapi.calls).toHaveLength(8);
+ expect(targets).toContain(word);
+ expect(targets.every((t) => mark.contains(t) || t === word)).toBe(true);
+ const ring = waapi.calls.find((c) => c.target.getAttribute('d') === MARK_RING);
+ expect(ring?.keyframes).toEqual([
+ { transform: 'scale(0.2) rotate(-180deg)', opacity: 0 },
+ { transform: 'none', opacity: 1 },
+ ]);
+ const heads = waapi.calls.filter((c) => MARK_MEMBERS.some((m) => m.head === c.target.getAttribute('d')));
+ expect(heads.map((c) => c.options.delay)).toEqual([760, 860, 960]);
render(<OcLogo intro />);
- expect(waapi.calls).toHaveLength(5);
+ expect(waapi.calls).toHaveLength(8);
});
it('does not animate without intro', () => {
@@ -108,15 +105,15 @@ describe('OcLogo motion', () => {
expect(waapi.calls).toHaveLength(0);
});
- it('pulses the nodes and spins the ring when the nonce changes', () => {
+ it('pulses the heads and spins the ring when the nonce changes', () => {
const { rerender } = render(<OcLogo pulseNonce={0} />);
expect(waapi.calls).toHaveLength(0);
rerender(<OcLogo pulseNonce={1} />);
- expect(waapi.calls).toHaveLength(3);
+ expect(waapi.calls).toHaveLength(4);
expect(waapi.calls.every((c) => c.options.fill === 'none')).toBe(true);
rerender(<OcLogo pulseNonce={1} />);
- expect(waapi.calls).toHaveLength(3);
+ expect(waapi.calls).toHaveLength(4);
rerender(<OcLogo pulseNonce={2} />);
- expect(waapi.calls).toHaveLength(6);
+ expect(waapi.calls).toHaveLength(8);
});
});
diff --git a/client/src/components/brand/__tests__/appIcons.test.ts b/client/src/components/brand/__tests__/appIcons.test.ts
new file mode 100644
index 00000000..f49c83c7
--- /dev/null
+++ b/client/src/components/brand/__tests__/appIcons.test.ts
@@ -0,0 +1,32 @@
+/**
+ * The app icons draw the logo's mark: the favicon (black, white under a dark
+ * colour scheme) and the desktop icon (white on a dark tile, rendered to
+ * build/icon.png by desktop/scripts/gen-icons.ts). Both embed MARK_PATH from
+ * ../geometry.ts verbatim; after changing the mark, paste the new path into
+ * both files.
+ */
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import { describe, expect, it } from 'vitest';
+import { MARK_PATH } from '../geometry';
+
+const CLIENT_DIR = join(__dirname, '..', '..', '..', '..');
+const FAVICON = join(CLIENT_DIR, 'public', 'opencompany-icon.svg');
+const DESKTOP_ICON = join(CLIENT_DIR, '..', 'desktop', 'build', 'icon.svg');
+
+describe('app icons', () => {
+ it('the favicon draws the mark, black and white under a dark scheme', () => {
+ const svg = readFileSync(FAVICON, 'utf-8');
+ expect(svg).toContain(`d="${MARK_PATH}"`);
+ expect(svg).toContain('path{fill:#000}@media (prefers-color-scheme:dark){path{fill:#fff}}');
+ });
+
+ it('the desktop icon draws the mark', () => {
+ expect(readFileSync(DESKTOP_ICON, 'utf-8')).toContain(`d="${MARK_PATH}"`);
+ });
+
+ it('the favicon is the page icon', () => {
+ const html = readFileSync(join(CLIENT_DIR, 'index.html'), 'utf-8');
+ expect(html).toContain('<link rel="icon" type="image/svg+xml" href="/opencompany-icon.svg" />');
+ });
+});
diff --git a/client/src/components/brand/__tests__/favicon.test.ts b/client/src/components/brand/__tests__/favicon.test.ts
deleted file mode 100644
index f46f91ae..00000000
--- a/client/src/components/brand/__tests__/favicon.test.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * The app icon is the design handoff's signed SVG (a C2PA manifest covers its
- * exact bytes). It must ship unmodified: no SVGO, no formatter, no line-ending
- * conversion (.gitattributes marks it -text). A changed hash means the file
- * was rewritten; restore it from the handoff instead of updating the pin.
- */
-import { createHash } from 'node:crypto';
-import { existsSync, readFileSync } from 'node:fs';
-import { join } from 'node:path';
-import { describe, expect, it } from 'vitest';
-
-const CLIENT_DIR = join(__dirname, '..', '..', '..', '..');
-const ICON = join(CLIENT_DIR, 'public', 'opencompany-icon.svg');
-const ICON_SHA256 = 'f3f3726e4cffb167439b2800e172108954d667a7c54b72929beb5906cc10110f';
-
-describe('app icon', () => {
- it('ships byte-for-byte as signed', () => {
- const bytes = readFileSync(ICON);
- expect(createHash('sha256').update(bytes).digest('hex')).toBe(ICON_SHA256);
- expect(bytes.includes(Buffer.from('\r\n'))).toBe(false);
- });
-
- it('is the page favicon', () => {
- const html = readFileSync(join(CLIENT_DIR, 'index.html'), 'utf-8');
- expect(html).toContain('<link rel="icon" type="image/svg+xml" href="/opencompany-icon.svg" />');
- expect(existsSync(join(CLIENT_DIR, 'public', 'vite.svg'))).toBe(false);
- });
-});
diff --git a/client/src/components/brand/geometry.ts b/client/src/components/brand/geometry.ts
new file mode 100644
index 00000000..944c69cd
--- /dev/null
+++ b/client/src/components/brand/geometry.ts
@@ -0,0 +1,127 @@
+/**
+ * The logo's geometry: the Open Council mark and the wordmark, as SVG paths.
+ *
+ * The mark is the chosen "Open Council Three" artwork
+ * (output/imagegen/opencompany-selected/open-council-three.png), measured and
+ * redrawn with exact three-fold symmetry. Units are the artwork's pixels
+ * (1254 px wide), with the ring's centre at the origin:
+ * - the C: a ring (radii 177 and 258.5) open 12.5 degrees either side of the
+ * right, cut radially;
+ * - the core: radius 91;
+ * - three members, one every 120 degrees starting at the top: a head
+ * (radius 62, 344 from the centre) and a crescent that sweeps clockwise
+ * from it along the ring, 10 clear of the head.
+ *
+ * The favicon (client/public/opencompany-icon.svg) and the desktop icon
+ * (desktop/build/icon.svg) embed MARK_PATH verbatim; brand/__tests__/appIcons
+ * holds them to it, so a change here means pasting the new MARK_PATH there.
+ *
+ * The wordmark is "OpenCompany" set in Newsreader (SIL Open Font License 1.1,
+ * The Newsreader Project Authors) at weight 650, optical size 18, kerned,
+ * with -0.029 em tracking, the fit to the artwork's lettering, and
+ * converted to outlines. 100 units per em, baseline at y 0; its viewBox is
+ * centred on the middle of the capitals, so a centred row lines the mark up
+ * with them.
+ */
+
+/** The mark's box: its ink, 720 by 677. */
+export const MARK_VIEWBOX = '-360 -406 720 677';
+export const MARK_WIDTH = 720;
+export const MARK_HEIGHT = 677;
+
+/** The numbers the mark is drawn from (artwork pixels). */
+export const MARK_METRICS = {
+ ringInner: 177,
+ ringOuter: 258.5,
+ gapDeg: 12.5,
+ coreRadius: 91,
+ headRadius: 62,
+ headDistance: 344,
+} as const;
+
+export const MARK_RING = 'M252.4 -55.9A258.5 258.5 0 1 0 252.4 55.9L172.8 38.3A177 177 0 1 1 172.8 -38.3Z';
+
+export const MARK_CORE = 'M-91 0A91 91 0 1 0 91 0A91 91 0 1 0 -91 0Z';
+
+/** Top, bottom right, bottom left. */
+export const MARK_MEMBERS = [
+ {
+ head: 'M-62 -344A62 62 0 1 0 62 -344A62 62 0 1 0 -62 -344Z',
+ body: 'M165.5 -220.5A192 192 0 0 0 67.4 -369.2A72 72 0 0 1 43.3 -286.6A141.5 141.5 0 0 1 165.5 -220.5Z',
+ },
+ {
+ head: 'M235.9 172A62 62 0 1 0 359.9 172A62 62 0 1 0 235.9 172Z',
+ body: 'M108.2 253.6A192 192 0 0 0 286 243A72 72 0 0 1 226.5 180.8A141.5 141.5 0 0 1 108.2 253.6Z',
+ },
+ {
+ head: 'M-359.9 172A62 62 0 1 0 -235.9 172A62 62 0 1 0 -359.9 172Z',
+ body: 'M-273.7 -33.1A192 192 0 0 0 -353.4 126.2A72 72 0 0 1 -269.8 105.7A141.5 141.5 0 0 1 -273.7 -33.1Z',
+ },
+] as const;
+
+/** The whole mark as one path, for single-colour icons. */
+export const MARK_PATH = [MARK_RING, MARK_CORE, ...MARK_MEMBERS.flatMap((m) => [m.body, m.head])].join('');
+
+export const WORDMARK_VIEWBOX = '0 -93.5 622.5 120';
+/** The wordmark's box in em: 6.225 wide, 1.2 high. */
+export const WORDMARK_WIDTH_EM = 6.225;
+export const WORDMARK_HEIGHT_EM = 1.2;
+
+export const WORDMARK_PATH = [
+ 'm35.5-68.2q7.7 0 14 2.4q6.3 2.5 10.8 7.1q4.6 4.5 7.1 10.9q2.4 6.4 2.4 14.2q0 7.7-2.6 14.1',
+ 'q-2.6 6.4-7.3 11q-4.7 4.7-11.2 7.2q-6.5 2.5-14.3 2.5q-7.7 0-14-2.4q-6.3-2.5-10.9-7.1',
+ 'q-4.6-4.6-7-10.9q-2.5-6.5-2.5-14.2q0-7.8 2.6-14.1q2.6-6.4 7.3-11.1q4.8-4.6 11.3-7.1',
+ 'q6.5-2.5 14.3-2.5zm-0.1 63.2q5.8 0 10.2-2.9q4.4-2.9 6.9-8.7q2.5-5.8 2.5-14.3q0-10.2-2.6-17.1',
+ 'q-2.6-7-7.3-10.5q-4.6-3.5-10.6-3.5q-5.8 0-10.3 2.9q-4.4 2.9-6.9 8.6q-2.5 5.8-2.5 14.4',
+ 'q0 10.1 2.7 17.1q2.6 6.9 7.3 10.5q4.6 3.5 10.6 3.5zm75.2-16q0-7.9-3.1-11.9q-3-4-8.1-4',
+ 'q-1.9 0-3.8 0.4q-1.9 0.3-3.6 1q-1.8 0.7-3.3 1.9l-1.1-3.9q2.6-1.6 5-2.9q2.4-1.2 4.6-2.1',
+ 'q2.2-1 4.3-1.4q2-0.5 3.9-0.5q6.1 0 10.2 2.6q4.2 2.7 6.3 7.3q2.1 4.6 2.1 10.4q0 8-3.3 13.7',
+ 'q-3.4 5.6-9 8.6q-5.5 3-12.1 3q-2.6 0-5-0.4q-2.4-0.3-4.9-1.2q-2.5-0.8-5.5-2.2h7.2v23.1l7.4 2.7v2',
+ 'h-26.5v-2l6.4-2.5v-53.6q-0.7-0.9-1.7-1.6q-1-0.7-2.2-1.4q-1.3-0.7-2.8-1.3v-1.8l16.3-5.7h1.5',
+ 'l1.6 6.6v25.1q0 2.7 1.1 4.8q1 2.1 3 3.3q2 1.2 4.7 1.2q3.3 0 5.6-1.8q2.3-1.9 3.6-5.7',
+ 'q1.2-3.9 1.2-9.8zm38.3-23.4q5.7 0 9.6 2.4q4 2.3 6.3 6.8q2.2 4.5 2.8 10.8h-31.4v-4.1l25.1-1.4',
+ 'l-6 2.7q-0.2-4.1-1.1-6.9q-0.8-2.8-2.4-4.2q-1.6-1.5-4-1.5q-2.4 0-4.4 1.5q-1.9 1.4-3 4.8',
+ 'q-1.2 3.3-1.2 8.9q0 5.4 2 9.1q2 3.8 5.5 5.8q3.5 1.9 8.2 1.9q2.1 0 3.9-0.3q1.9-0.4 3.7-1.3',
+ 'q1.8-0.8 3.6-2.2l1.7 2.3q-2.7 3.1-5.6 5.5q-3 2.4-6.3 3.7q-3.3 1.3-7.2 1.3q-6.5 0-11.3-2.8',
+ 'q-4.8-2.9-7.5-8q-2.7-5-2.7-11.3q0-6.4 2.6-11.7q2.5-5.4 7.4-8.6q4.8-3.2 11.7-3.2zm40.1 9.9v30.2',
+ 'l5.8 2.3v2h-24.9v-2l6.4-2.5v-28.1q-1.1-1.5-2.6-2.5q-1.6-1-4.1-1.9v-1.7l15.5-5.7h1.5zm10.6 32.5',
+ 'l5.8-2.3v-23.7q0-2.2-0.9-3.8q-0.8-1.6-2.6-2.3q-1.7-0.8-4.3-0.8q-3.1 0-5.8 1q-2.6 1-4.1 2.4l-2-2',
+ 'q3.1-3.3 5.6-5.5q2.6-2.1 4.8-3.3q2.3-1.2 4.5-1.6q2.3-0.5 4.7-0.5q6.5 0 9.7 4q3.1 4 3.1 12.4v23.5',
+ 'l6.5 2.5v2h-25zm67.6-2.9q3.3 0 6.3-0.5q2.9-0.6 6.5-2l-3.2 2.3l8.7-14.8h2.8l-2.1 17.3',
+ 'q-4.3 1.8-10 2.8q-5.6 1-12.1 1q-9 0-16.1-2.2q-7.1-2.2-12.1-6.6q-5-4.4-7.7-10.8q-2.6-6.3-2.6-14.5',
+ 'q0-10.6 4.9-18.5q4.9-8 13.9-12.4q9.1-4.4 21.6-4.4q3.2 0 6.4 0.3q3.1 0.4 7.5 1.4l-3.7 0.8l6.6-4.8',
+ 'h1.7l3.4 24.7l-3 0.6l-10.1-16.4l3.8 4.1q-4-2.7-7.5-3.7q-3.5-1-7.4-1q-5.7 0-10 1.6',
+ 'q-4.4 1.6-7.3 4.7q-3 3.1-4.5 7.8q-1.5 4.6-1.5 10.6q0 8.2 1.9 14.3q2 6.1 5.6 10.2q3.7 4 8.6 6.1',
+ 'q4.9 2 10.7 2zm48.3 1.3q2.7 0 4.9-1.5q2.1-1.6 3.2-5.1q1.2-3.5 1.2-9.4q0-6.5-1.2-11',
+ 'q-1.1-4.4-3.3-6.7q-2.2-2.3-5.3-2.3q-2.8 0-4.9 1.6q-2.1 1.5-3.3 5q-1.1 3.5-1.1 9.4q0 6.5 1.1 11',
+ 'q1.2 4.4 3.4 6.7q2.2 2.3 5.3 2.3zm-0.6 4.8q-7 0-12.1-2.8q-5.1-2.8-7.9-7.8q-2.7-5-2.7-11.6',
+ 'q0-6.8 2.9-12.1q3-5.3 8.3-8.3q5.3-3 12.2-3q7 0 12.1 2.8q5.1 2.8 7.9 7.8q2.7 5 2.7 11.6',
+ 'q0 6.8-3 12.1q-3 5.3-8.3 8.3q-5.2 3-12.1 3zm45-35.7v30.2l5.2 2.3v2h-24.3v-2l6.4-2.5v-28.1',
+ 'q-1.1-1.5-2.6-2.5q-1.6-1-4.1-1.9v-1.7l15.5-5.7h1.5zm27.5 4.2v26l5.2 2.3v2h-23.1v-2l5.2-2.3v-24.5',
+ 'q0-2.2-0.8-3.6q-0.9-1.4-2.5-2q-1.6-0.7-3.8-0.7q-2.8 0-5.3 0.9q-2.4 0.8-3.8 2.2l-1.9-2',
+ 'q2.9-3.1 5.3-5.2q2.4-2 4.6-3.2q2.2-1.1 4.3-1.6q2.1-0.4 4.4-0.4q4.3 0 6.9 1.7q2.7 1.8 4 5',
+ 'q1.3 3.1 1.3 7.4zm27.5 1.3v24.5l6.5 2.5v2h-24.4v-2l5.2-2.3v-24.5q0-2.2-0.8-3.6q-0.9-1.4-2.5-2',
+ 'q-1.6-0.7-3.8-0.7q-2.8 0-5.3 0.9q-2.4 0.8-3.8 2.2l-1.9-2q2.9-3.1 5.3-5.2q2.4-2 4.6-3.2',
+ 'q2.2-1.1 4.3-1.6q2.1-0.4 4.4-0.4q6.3 0 9.2 3.9q3 3.9 3 11.5zm44.1 8q0-7.9-3.1-11.9q-3-4-8.1-4',
+ 'q-1.9 0-3.8 0.4q-1.9 0.3-3.6 1q-1.8 0.7-3.3 1.9l-1.1-3.9q2.6-1.6 5-2.9q2.4-1.2 4.6-2.1',
+ 'q2.2-1 4.3-1.4q2-0.5 3.9-0.5q6.1 0 10.2 2.6q4.1 2.7 6.3 7.3q2.1 4.6 2.1 10.4q0 8-3.4 13.7',
+ 'q-3.3 5.6-8.9 8.6q-5.5 3-12.2 3q-2.5 0-4.9-0.4q-2.4-0.3-4.9-1.2q-2.5-0.8-5.5-2.2h7.2v23.1',
+ 'l7.4 2.7v2h-26.5v-2l6.4-2.5v-53.6q-0.7-0.9-1.7-1.6q-1-0.7-2.3-1.4q-1.2-0.7-2.7-1.3v-1.8l16.2-5.7',
+ 'h1.6l1.6 6.6v25.1q0 2.7 1.1 4.8q1 2.1 3 3.3q2 1.2 4.7 1.2q3.3 0 5.6-1.8q2.3-1.9 3.6-5.7',
+ 'q1.2-3.9 1.2-9.8zm42.8-6.1l0.4 4.2q-4.5 1-7.3 2.2q-2.7 1.1-4.3 2.3q-1.5 1.2-2.1 2.6',
+ 'q-0.5 1.3-0.5 2.9q0 3.2 1.5 4.8q1.5 1.5 3.8 1.5q1.7 0 3.1-0.9q1.4-1 2.2-2.5q0.9-1.5 0.9-3.2',
+ 'v-18.9q0-3-1.7-4.8q-1.6-1.8-5.3-1.8q-1.4 0-3.1 0.3q-1.6 0.3-3 1l1.9-3.2q-0.3 2.6-0.7 4.4',
+ 'q-0.4 1.7-0.7 2.7q-0.4 1.1-1 1.7q-0.8 0.9-2.3 1.4q-1.4 0.6-2.9 0.6q-2 0-3.2-0.8q-1.1-0.8-1.1-2.2',
+ 'q0-2.1 1.8-4.1q1.9-2 4.9-3.6q3.1-1.7 6.9-2.7q3.9-1 7.9-1q5.5 0 8.6 1.7q3.1 1.6 4.4 4.6',
+ 'q1.2 3 1.2 7.1v21.7q0 1.3 0.4 2.2q0.4 0.8 1.1 1.3q0.8 0.4 1.8 0.4q1 0 2.2-0.3q1.2-0.4 2.4-1.2',
+ 'v3.1q-2.5 2.2-5.4 3.5q-2.9 1.3-5.4 1.3q-3.2 0-5.2-1.2q-2.1-1.3-3.1-3.6q-0.9-2.3-1-5.2l0.5-0.3',
+ 'q-0.9 3.4-2.8 5.7q-1.8 2.3-4.4 3.5q-2.5 1.1-5.5 1.1q-5.3 0-8.6-2.8q-3.4-2.8-3.4-8.5q0-2.8 1.1-5',
+ 'q1.2-2.3 4-4.3q2.9-2.1 8-3.9q5.1-1.9 13-3.8zm36.2-7.4v30.2l5.8 2.3v2h-24.9v-2l6.4-2.5v-28.1',
+ 'q-1.1-1.5-2.6-2.5q-1.6-1-4.1-1.9v-1.7l15.5-5.7h1.5zm10.6 32.5l5.8-2.3v-23.7q0-2.2-0.9-3.8',
+ 'q-0.8-1.6-2.6-2.3q-1.7-0.8-4.3-0.8q-3.1 0-5.8 1q-2.6 1-4.1 2.4l-2-2q3.1-3.3 5.6-5.5',
+ 'q2.6-2.1 4.8-3.3q2.3-1.2 4.5-1.6q2.3-0.5 4.7-0.5q6.5 0 9.7 4q3.1 4 3.1 12.4v23.5l6.5 2.5v2h-25z',
+ 'm54-7.1l-6.2 14.9l-21.5-44.2l-6-2.6v-2.2h25.7v2.3l-5.7 2zm-21.2 35.6q-3.2 0-5.2-1.7q-2-1.7-2-4.6',
+ 'q0-1.6 0.7-2.8q0.6-1.2 1.6-1.8q1-0.6 2-0.6q0.9 0 1.8 0.4q0.8 0.4 2 0.8q1.2 0.4 2.7 0.4',
+ 'q1.6 0 2.8-0.5q1.2-0.5 2.4-1.9q1.2-1.5 2.4-4.2l5.9-13.2l2.5-6l10.6-30l-5.5-1.7v-2.3h16.4v2.3',
+ 'l-5 1.8l-19.9 49.3q-2.7 6.6-5.1 10.1q-2.4 3.6-5 4.9q-2.6 1.3-6.1 1.3z',
+].join('');
diff --git a/client/src/features/home/orb/orbEngine.ts b/client/src/features/home/orb/orbEngine.ts
index a8f87eba..1604d9a4 100644
--- a/client/src/features/home/orb/orbEngine.ts
+++ b/client/src/features/home/orb/orbEngine.ts
@@ -3,6 +3,12 @@
* `initScene` (design_handoff_opencompany_home, reference/OpenCompany
* Home.dc.html; spec in orb/ORB.md). Loaded only through orb.ts.
*
+ * Its shapes are the logo's mark in 3D (brand/geometry.ts): the C, a ring
+ * open on one side, around the core, and the council, three heads each
+ * trailing a crescent that tapers along the ring. The ring spins, the
+ * council turns more slowly the same way (heads first), and a line from the
+ * core to each head carries a packet. It keeps its own colours.
+ *
* Changes from the prototype's three r149 for current three:
* - colour management off and sRGB output, so colours read as authored;
* - lights are physically based now: intensities x PI, and the point
@@ -18,9 +24,11 @@ import {
BufferAttribute,
BufferGeometry,
CanvasTexture,
+ CircleGeometry,
Color,
ColorManagement,
DirectionalLight,
+ Float32BufferAttribute,
Group,
Line,
LineBasicMaterial,
@@ -32,6 +40,7 @@ import {
Points,
PointsMaterial,
QuadraticBezierCurve3,
+ Quaternion,
SRGBColorSpace,
Scene,
SphereGeometry,
@@ -49,6 +58,71 @@ ColorManagement.enabled = false;
const PI = Math.PI;
const POINT = 0.8 * PI;
+/** The mark in world units (its ring's outer edge at 1.44). */
+const RING_R = 1.2;
+const TUBE = 0.24;
+const GAP = (12.5 * PI) / 180;
+const CORE_R = 0.46;
+const HEAD_R = 0.3;
+const HEAD_D = 1.916;
+/** A crescent runs from 16 to 37 degrees clockwise of its head: its centre
+ * line closes in on the ring and its thickness falls to a point, the mark's
+ * profile. It starts later than in the mark, so the round tube clears the
+ * head, and rounds off over its first 4 degrees. */
+const CRESCENT = { from: (16 * PI) / 180, to: (37 * PI) / 180, dome: 4 / 21, r0: 1.83, dr: 0.28, thick: 0.26 };
+
+/** The C's open end: a flat disc across the tube at `angle`, facing out of it. */
+function ringCap(angle: number, facing: 1 | -1): BufferGeometry {
+ const out = new Vector3(Math.sin(angle), -Math.cos(angle), 0).multiplyScalar(facing);
+ return new CircleGeometry(TUBE, 48)
+ .applyQuaternion(new Quaternion().setFromUnitVectors(new Vector3(0, 0, 1), out))
+ .translate(Math.cos(angle) * RING_R, Math.sin(angle) * RING_R, 0);
+}
+
+/** A member's crescent: a tube sweeping clockwise from the head at
+ * `headAngle`, closed at both ends. */
+function crescentGeometry(headAngle: number): BufferGeometry {
+ const ALONG = 48;
+ const AROUND = 20;
+ const { from, to, dome, r0, dr, thick } = CRESCENT;
+ const at = (f: number, out: Vector3) => {
+ const a = headAngle - (from + (to - from) * f);
+ const r = r0 - dr * f ** 1.5;
+ return out.set(Math.cos(a) * r, Math.sin(a) * r, 0);
+ };
+ const centre = new Vector3();
+ const ahead = new Vector3();
+ const side = new Vector3();
+ const positions: number[] = [];
+ for (let i = 0; i <= ALONG; i++) {
+ const f = i / ALONG;
+ at(f, centre);
+ // Along the tube (clockwise); `side` is the outward normal in the ring's plane.
+ const step = 1 / ALONG / 2;
+ at(Math.min(1, f + step), ahead).sub(at(Math.max(0, f - step), side));
+ side.set(-ahead.y, ahead.x, 0).normalize();
+ const d = Math.min(1, f / dome);
+ const h = thick * (1 - f) * Math.sqrt(1 - (1 - d) ** 2);
+ for (let j = 0; j < AROUND; j++) {
+ const psi = (j / AROUND) * 2 * PI;
+ positions.push(centre.x + side.x * h * Math.cos(psi), centre.y + side.y * h * Math.cos(psi), h * Math.sin(psi));
+ }
+ }
+ const index: number[] = [];
+ for (let i = 0; i < ALONG; i++) {
+ for (let j = 0; j < AROUND; j++) {
+ const a = i * AROUND + j;
+ const b = i * AROUND + ((j + 1) % AROUND);
+ index.push(a, b, a + AROUND, b, b + AROUND, a + AROUND);
+ }
+ }
+ const geometry = new BufferGeometry();
+ geometry.setAttribute('position', new Float32BufferAttribute(positions, 3));
+ geometry.setIndex(index);
+ geometry.computeVertexNormals();
+ return geometry;
+}
+
export function createOrbEngine(onLost: () => void) {
const R = new WebGLRenderer({ antialias: true, alpha: true });
R.setPixelRatio(Math.min(window.devicePixelRatio || 1, 2));
@@ -104,24 +178,31 @@ export function createOrbEngine(onLost: () => void) {
orb.add(tilt);
scene.add(orb);
- // Ring: vertex colours purple -> cyan by angle; the light theme's near-blacks kept beside them.
- const rg = new TorusGeometry(1.2, 0.24, 48, 220);
- const pos = rg.attributes.position;
- const ringDark = new Float32Array(pos.count * 3);
- const ringLight = new Float32Array(pos.count * 3);
+ // The C: a torus open GAP either side of +x, with flat caps on its ends.
+ // Vertex colours purple -> cyan by angle; the light theme's near-blacks kept beside them.
const tmp = new Color();
- const pairs = [
- [new Color(0xbd93f9), new Color(0x8be9fd), ringDark],
- [new Color(0x050506), new Color(0x16181c), ringLight],
+ const ringStops = [
+ [new Color(0xbd93f9), new Color(0x8be9fd)],
+ [new Color(0x050506), new Color(0x16181c)],
] as const;
- for (let i = 0; i < pos.count; i++) {
- const t = (Math.sin(Math.atan2(pos.getY(i), pos.getX(i)) - 0.8) + 1) / 2;
- for (const [a, b, out] of pairs) {
- tmp.copy(a).lerp(b, t);
- out.set([tmp.r, tmp.g, tmp.b], i * 3);
+ const ringParts = [
+ new TorusGeometry(RING_R, TUBE, 48, 200, 2 * PI - 2 * GAP).rotateZ(GAP),
+ ringCap(GAP, 1),
+ ringCap(2 * PI - GAP, -1),
+ ].map((geometry) => {
+ const pos = geometry.attributes.position;
+ const dark = new Float32Array(pos.count * 3);
+ const light = new Float32Array(pos.count * 3);
+ for (let i = 0; i < pos.count; i++) {
+ const t = (Math.sin(Math.atan2(pos.getY(i), pos.getX(i)) - 0.8) + 1) / 2;
+ ringStops.forEach(([a, b], k) => {
+ tmp.copy(a).lerp(b, t);
+ (k ? light : dark).set([tmp.r, tmp.g, tmp.b], i * 3);
+ });
}
- }
- rg.setAttribute('color', new BufferAttribute(Float32Array.from(ringDark), 3));
+ geometry.setAttribute('color', new BufferAttribute(Float32Array.from(dark), 3));
+ return { geometry, dark, light };
+ });
const ringMat = new MeshPhysicalMaterial({
vertexColors: true,
metalness: 0.25,
@@ -132,28 +213,36 @@ export function createOrbEngine(onLost: () => void) {
emissive: 0x2a1d4a,
emissiveIntensity: 0.5,
});
- const ring = new Mesh(rg, ringMat);
+ const ring = new Group();
+ ringParts.forEach(({ geometry }) => ring.add(new Mesh(geometry, ringMat)));
tilt.add(ring);
const coreMat = new MeshPhysicalMaterial({ color: 0xf8f8f2, emissive: 0xf8f8f2, emissiveIntensity: 0.55, roughness: 0.3, clearcoat: 1 });
- const core = new Mesh(new SphereGeometry(0.38, 64, 64), coreMat);
+ const core = new Mesh(new SphereGeometry(CORE_R, 64, 64), coreMat);
orb.add(core);
const coreGlow = glow(0xf8f8f2, 2.2, 0.35);
const ringGlow = glow(0xbd93f9, 5, 0.12);
orb.add(coreGlow, ringGlow);
- const nodes = [0x50fa7b, 0xffb86c, 0xff79c6, 0xf1fa8c].map((col, i) => {
+ // The council: a head and its crescent every 120 degrees from the top, one
+ // material each. The lines and packets sit beside it in the tilted plane.
+ const council = new Group();
+ tilt.add(council);
+ const members = [0xff79c6, 0xf1fa8c, 0x50fa7b].map((col, i) => {
+ const angle = PI / 2 + (i * 2 * PI) / 3;
const mat = new MeshPhysicalMaterial({ color: col, emissive: col, emissiveIntensity: 0.35, roughness: 0.25, clearcoat: 1 });
- const m = new Mesh(new SphereGeometry(0.2, 32, 32), mat);
- const halo = glow(col, 1.1, 0.5);
- m.add(halo);
+ const head = new Mesh(new SphereGeometry(HEAD_R, 32, 32), mat);
+ head.position.set(Math.cos(angle) * HEAD_D, Math.sin(angle) * HEAD_D, 0);
+ const halo = glow(col, 1.2, 0.5);
+ head.add(halo);
+ council.add(head, new Mesh(crescentGeometry(angle), mat));
const lg = new BufferGeometry();
lg.setAttribute('position', new BufferAttribute(new Float32Array(33 * 3), 3));
const line = new Line(lg, new LineBasicMaterial({ color: 0x6272a4, transparent: true, opacity: 0.7 }));
const pk = glow(col, 0.45, 0.9);
- orb.add(m, line, pk);
+ tilt.add(line, pk);
const cd = new Color(col);
const cl = new Color([0x060607, 0x0e0f12][i % 2]);
- return { m, mat, halo, line, pk, cd, cl, phase: (i * PI) / 2 + PI / 4, r: 2.0 + (i % 2) * 0.15, off: Math.random() };
+ return { angle, mat, halo, line, pk, cd, cl, off: Math.random() };
});
const N = 900;
@@ -269,16 +358,15 @@ export function createOrbEngine(onLost: () => void) {
tilt.rotation.x = 0.3 + Math.sin(t * 0.5) * 0.18;
tilt.rotation.y = Math.cos(t * 0.4) * 0.22;
ring.rotation.z += dt * mot * (0.25 + e * 2.4);
+ council.rotation.z += dt * mot * (0.12 + e * 0.5);
core.scale.setScalar(1 + Math.sin(now * 0.004 * (1 + e * 2)) * 0.04 * (1 + e * 3));
coreGlow.material.opacity = 0.25 + e * 0.5;
coreGlow.scale.setScalar(2 + e * 1.6);
ringGlow.material.opacity = 0.08 + e * 0.18;
- nodes.forEach((n, i) => {
- const a = n.phase + t * 0.5;
- n.m.position.set(Math.cos(a) * n.r, Math.sin(a) * n.r * 0.62, Math.sin(a + (i % 2 ? 0.4 : -0.4)) * 0.9);
- const p = n.m.position;
- bez.v1.set(p.x * 0.5 - p.y * 0.25, p.y * 0.5 + p.x * 0.25, p.z * 0.5 + 0.6);
- bez.v2.copy(p);
+ members.forEach((n) => {
+ const a = n.angle + council.rotation.z;
+ const p = bez.v2.set(Math.cos(a) * HEAD_D, Math.sin(a) * HEAD_D, 0);
+ bez.v1.set(p.x * 0.5 - p.y * 0.25, p.y * 0.5 + p.x * 0.25, 0.6);
const arr = n.line.geometry.attributes.position.array as Float32Array;
bez.getPoints(32).forEach((v, j) => arr.set([v.x, v.y, v.z], j * 3));
n.line.geometry.attributes.position.needsUpdate = true;
@@ -293,7 +381,7 @@ export function createOrbEngine(onLost: () => void) {
pts.rotation.y += dt * 0.02 * mot * (1 + e * 3);
pts.rotation.x = rx * 0.3;
lf += ((light ? 1 : 0) - lf) * Math.min(1, dt * 3.2);
- nodes.forEach((n) => n.line.material.color.copy(tc.lD).lerp(tc.lL, lf));
+ members.forEach((n) => n.line.material.color.copy(tc.lD).lerp(tc.lL, lf));
ringMat.emissive.copy(tc.eD).lerp(tc.black, lf);
coreGlow.material.color.copy(tc.gD).lerp(tc.black, lf);
ringMat.iridescence = 0.7 * (1 - lf);
@@ -304,10 +392,12 @@ export function createOrbEngine(onLost: () => void) {
coreMat.emissiveIntensity = 0.55 - 0.3 * lf;
if (Math.abs(lf - lfApplied) > 0.002) {
lfApplied = lf;
- const ca = rg.attributes.color.array as Float32Array;
- for (let i = 0; i < ca.length; i++) ca[i] = ringDark[i] + (ringLight[i] - ringDark[i]) * lf;
- rg.attributes.color.needsUpdate = true;
- nodes.forEach((n) => {
+ for (const { geometry, dark, light: lit } of ringParts) {
+ const ca = geometry.attributes.color.array as Float32Array;
+ for (let i = 0; i < ca.length; i++) ca[i] = dark[i] + (lit[i] - dark[i]) * lf;
+ geometry.attributes.color.needsUpdate = true;
+ }
+ members.forEach((n) => {
n.mat.color.copy(n.cd).lerp(n.cl, lf);
n.mat.emissive.copy(n.cd).lerp(tc.black, lf);
n.pk.material.color.setScalar(1 - lf);
@@ -324,7 +414,7 @@ export function createOrbEngine(onLost: () => void) {
ringMat.clearcoatRoughness = 0.1 - 0.06 * lf;
ringMat.roughness = 0.18 - 0.08 * lf;
coreMat.roughness = 0.3 - 0.2 * lf;
- nodes.forEach((n) => {
+ members.forEach((n) => {
n.mat.emissiveIntensity = 0.35 * (1 - lf);
n.mat.roughness = 0.25 - 0.15 * lf;
n.halo.material.opacity = 0.5 - 0.35 * lf;
diff --git a/client/src/index.css b/client/src/index.css
index be8ab869..49e73ad8 100644
--- a/client/src/index.css
+++ b/client/src/index.css
@@ -238,15 +238,6 @@
--color-node-workflow-edge: var(--node-workflow-edge);
--color-node-workflow-ink: var(--node-workflow-ink);
- --color-lg-ring-a: var(--lg-ring-a);
- --color-lg-ring-b: var(--lg-ring-b);
- --color-lg-green: var(--lg-green);
- --color-lg-orange: var(--lg-orange);
- --color-lg-pink: var(--lg-pink);
- --color-lg-yellow: var(--lg-yellow);
- --color-lg-link: var(--lg-link);
- --color-lg-core: var(--lg-core);
-
--text-2xs: var(--text-2xs);
--text-md: var(--text-md);
--text-meta: var(--text-meta);
@@ -296,7 +287,6 @@
--tracking-label: var(--tracking-label);
--tracking-hero: var(--tracking-hero);
- --tracking-wordmark: var(--tracking-wordmark);
--leading-hero: var(--leading-hero);
/* Code & syntax tokens -> Tailwind utilities (text-code-tag, bg-code-bg, …).
diff --git a/client/src/themes/base.css b/client/src/themes/base.css
index f15f495f..5f146b79 100644
--- a/client/src/themes/base.css
+++ b/client/src/themes/base.css
@@ -166,7 +166,6 @@
--text-title: 22px;
--text-hero: 36px;
--tracking-hero: -0.025em;
- --tracking-wordmark: -0.025em;
--leading-hero: 1.15;
/* ── Home layout constants ─────────────────────────────────────────── */
diff --git a/client/src/themes/dark.css b/client/src/themes/dark.css
index 442d3195..8400ed31 100644
--- a/client/src/themes/dark.css
+++ b/client/src/themes/dark.css
@@ -116,16 +116,6 @@
--node-trigger-ink: var(--dracula-pink);
--node-workflow-ink: var(--dracula-orange);
- /* Logo palette (OC mark), dark values from the design handoff. */
- --lg-ring-a: var(--dracula-purple);
- --lg-ring-b: var(--dracula-cyan);
- --lg-green: var(--dracula-green);
- --lg-orange: var(--dracula-orange);
- --lg-pink: var(--dracula-pink);
- --lg-yellow: var(--dracula-yellow);
- --lg-link: var(--dracula-comment);
- --lg-core: #f8f8f2;
-
/* Shadows — deeper on dark surfaces (overrides base.css). */
--shadow-card: 0 4px 12px rgb(0 0 0 / 0.3);
--shadow-card-hover: 0 6px 18px rgb(0 0 0 / 0.4);
diff --git a/client/src/themes/light.css b/client/src/themes/light.css
index 1e1a6ac0..711adc47 100644
--- a/client/src/themes/light.css
+++ b/client/src/themes/light.css
@@ -206,17 +206,6 @@
--node-workflow-edge: color-mix(in srgb, var(--dracula-orange) var(--tint-action-border), transparent);
--node-workflow-ink: #c2410c;
- /* ── Logo palette (OC mark) — the mark is inline SVG that reads these, so
- * it switches with the theme family. Values from the design handoff. ── */
- --lg-ring-a: #8b5cf6;
- --lg-ring-b: #06b6d4;
- --lg-green: #22c55e;
- --lg-orange: #f59e0b;
- --lg-pink: #ec4899;
- --lg-yellow: #eab308;
- --lg-link: #a3aab5;
- --lg-core: #1a1d21;
-
/* ── Floating-surface shadows (composer, employee card, popovers, the
* Settings dialog). The colour differs per family, so they live here
* rather than in base.css; dark.css overrides them. ────────────────── */
diff --git a/desktop/build/icon.svg b/desktop/build/icon.svg
index 14e6c4c8..8d8279d4 100644
--- a/desktop/build/icon.svg
+++ b/desktop/build/icon.svg
@@ -1,29 +1,6 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1024 1024" width="1024" height="1024">
- <defs>
- <linearGradient id="bg" x1="0" y1="0" x2="1" y2="1">
- <stop offset="0" stop-color="#1f2340"/>
- <stop offset="1" stop-color="#0e1020"/>
- </linearGradient>
- <linearGradient id="ring" x1="0" y1="0" x2="1" y2="1">
- <stop offset="0" stop-color="#bd93f9"/>
- <stop offset="1" stop-color="#8be9fd"/>
- </linearGradient>
- </defs>
<!-- rounded app tile -->
- <rect x="64" y="64" width="896" height="896" rx="200" fill="url(#bg)"/>
- <!-- workflow edges -->
- <g stroke="#6272a4" stroke-width="22" stroke-linecap="round" fill="none" opacity="0.9">
- <path d="M300 420 C 380 420, 400 512, 480 512"/>
- <path d="M300 604 C 380 604, 400 512, 480 512"/>
- <path d="M544 512 C 620 512, 640 420, 724 420"/>
- <path d="M544 512 C 620 512, 640 604, 724 604"/>
- </g>
- <!-- nodes -->
- <circle cx="300" cy="420" r="58" fill="#50fa7b"/>
- <circle cx="300" cy="604" r="58" fill="#ffb86c"/>
- <circle cx="724" cy="420" r="58" fill="#ff79c6"/>
- <circle cx="724" cy="604" r="58" fill="#f1fa8c"/>
- <!-- central agent ring: the "O" -->
- <circle cx="512" cy="512" r="118" fill="none" stroke="url(#ring)" stroke-width="44"/>
- <circle cx="512" cy="512" r="40" fill="#f8f8f2"/>
+ <rect x="64" y="64" width="896" height="896" rx="200" fill="#0d0f13"/>
+ <!-- the Open Council mark (client/src/components/brand/geometry.ts MARK_PATH) -->
+ <path fill="#ffffff" transform="translate(512 566.2) scale(0.8)" d="M252.4 -55.9A258.5 258.5 0 1 0 252.4 55.9L172.8 38.3A177 177 0 1 1 172.8 -38.3ZM-91 0A91 91 0 1 0 91 0A91 91 0 1 0 -91 0ZM165.5 -220.5A192 192 0 0 0 67.4 -369.2A72 72 0 0 1 43.3 -286.6A141.5 141.5 0 0 1 165.5 -220.5ZM-62 -344A62 62 0 1 0 62 -344A62 62 0 1 0 -62 -344ZM108.2 253.6A192 192 0 0 0 286 243A72 72 0 0 1 226.5 180.8A141.5 141.5 0 0 1 108.2 253.6ZM235.9 172A62 62 0 1 0 359.9 172A62 62 0 1 0 235.9 172ZM-273.7 -33.1A192 192 0 0 0 -353.4 126.2A72 72 0 0 1 -269.8 105.7A141.5 141.5 0 0 1 -273.7 -33.1ZM-359.9 172A62 62 0 1 0 -235.9 172A62 62 0 1 0 -359.9 172Z"/>
</svg>
diff --git a/docs-internal/frontend_architecture.md b/docs-internal/frontend_architecture.md
index f3ce7f9c..3484a772 100644
--- a/docs-internal/frontend_architecture.md
+++ b/docs-internal/frontend_architecture.md
@@ -141,7 +141,8 @@ client/src/
│ │ └── steps/ # WelcomeStep / HowItWorksStep / ConnectAIStep / TryItStep
│ │
│ ├── icons/ # AI provider icons (SVG data URIs)
-│ ├── brand/Logo.tsx # OcMark / OcWordmark / OcLogo (inline SVG, --lg-* palette, intro + pulse)
+│ ├── brand/Logo.tsx # OcMark / OcLogo (inline SVG in the text colour, intro + pulse)
+│ ├── brand/geometry.ts # Mark + wordmark paths; the favicon and desktop icon embed MARK_PATH
│ ├── shell/ModeToggle.tsx # The Normal / Dev switch (editor toolbar + Home header)
│ ├── auth/ # Login page + protected route
│ ├── SquareNode.tsx, StartNode.tsx, TriggerNode.tsx, AIAgentNode.tsx, ToolkitNode.tsx, TeamMonitorNode.tsx
diff --git a/docs-internal/normal_mode.md b/docs-internal/normal_mode.md
index 4c007ecf..8fc629eb 100644
--- a/docs-internal/normal_mode.md
+++ b/docs-internal/normal_mode.md
@@ -97,21 +97,26 @@ and never starts loops then. Toasts are a second sonner toaster
A 3D version of the logo drawn behind Home's content
([orb/orbEngine.ts](../client/src/features/home/orb/orbEngine.ts), a port of
the design prototype's scene on current three.js; loaded in its own chunk the
-first time it runs). [orb/orb.ts](../client/src/features/home/orb/orb.ts) holds
-what the engine reads each frame (the slot to fill, an energy target, a spike)
-and its lifecycle: leaving Home keeps the renderer, the app shell disposes it.
+first time it runs). Its shapes are the mark's: the C, a ring open on one
+side, around the core, and three heads each trailing a crescent that tapers
+along the ring. The ring spins, the heads turn more slowly the same way, and a
+line from the core to each head carries a packet.
+[orb/orb.ts](../client/src/features/home/orb/orb.ts) holds what the engine
+reads each frame (the slot to fill, an energy target, a spike) and its
+lifecycle: leaving Home keeps the renderer, the app shell disposes it.
`OrbStage` is the canvas host below the header; each view's `OrbSlot` reserves
the square the orb glides into (`--size-orb-hire`, `--size-orb-employee`:
large on the hire view, small on an employee's page, where the conversation
-needs the room). The composer sets the energy target (focused, holding text,
-a setup being written). These spike it: a hire, a theme or mode
-switch, a connect, a task change, opening Settings or the Workspace, a setup
-arriving or failing, and saving the profile (`SPIKE` in orb.ts). In dark the orb keeps the
-logo's colours with white particles and packets; in light it is glossy
-piano-black under a white rim light. Its glows and particles blend additively
-in dark and normally in light (additive glow vanishes on white), fading through
-zero at the midpoint of a theme change. Without WebGL, under reduced motion, or
-after a lost WebGL context, the slot shows the static mark.
+needs the room). The composer sets the energy target (focused, holding text, a
+setup being written). These spike it: a hire, a theme or mode switch, a
+connect, a task change, opening Settings or the Workspace, a setup arriving or
+failing, and saving the profile (`SPIKE` in orb.ts). The logo itself is one
+colour; in dark the orb keeps colours of its own (a purple-to-cyan ring; pink,
+yellow and green heads) with white particles and packets; in light it is
+glossy piano-black under a white rim light. Its glows and particles blend
+additively in dark and normally in light (additive glow vanishes on white),
+fading through zero at the midpoint of a theme change. Without WebGL, under
+reduced motion, or after a lost WebGL context, the slot shows the static mark.
## The Workspace
diff --git a/docs-internal/theme_system.md b/docs-internal/theme_system.md
index 8d684d1d..865623bc 100644
--- a/docs-internal/theme_system.md
+++ b/docs-internal/theme_system.md
@@ -155,14 +155,14 @@ tokens are used directly, as `w-(--w-home-sidebar)` or `duration-(--dur-slow)`):
keeps the paused dot at the design's mid grey.
- **Per family** (light.css / dark.css): `--shadow-float | popover | dialog |
dock` (`dock` is the Workspace's left shadow when it lies over the page),
- the logo palette `--lg-*`, the node-role `-fill / -edge / -hover / -ink`
- variants, and Home's glows: `--glow-connect | hire | hire-settle | refine |
- refine-out | task` plus the working pip's `--tint-pip-ring`. Dark keeps the
- neon; light swaps each neon for its ink at .75 of the alpha and .6 of the
- blur, the design's rule for white surfaces. The Web Animations that play
- them name the token (`boxShadow: 'var(--glow-hire)'`), so the colour follows
- the theme with no script. dark.css restates each one, because light.css's
- bare `:root` also matches the dark family.
+ the node-role `-fill / -edge / -hover / -ink` variants, and Home's glows:
+ `--glow-connect | hire | hire-settle | refine | refine-out | task` plus the
+ working pip's `--tint-pip-ring`. Dark keeps the neon; light swaps each neon
+ for its ink at .75 of the alpha and .6 of the blur, the design's rule for
+ white surfaces. The Web Animations that play them name the token
+ (`boxShadow: 'var(--glow-hire)'`), so the colour follows the theme with no
+ script. dark.css restates each one, because light.css's bare `:root` also
+ matches the dark family.
Home shows only the two base themes: `ThemeProvider`'s `baseOnly` (set by
`app/ShellThemeProvider.tsx` while Home is showing) renders a chosen stylized
diff --git a/server/config/model_registry.json b/server/config/model_registry.json
index 0347ec52..8fcdcb90 100644
--- a/server/config/model_registry.json
+++ b/server/config/model_registry.json
@@ -1,8 +1,122 @@
{
- "_generated": "2026-09-29T06:46:41.936995+00:00",
+ "_generated": "2026-09-30T07:27:08.882517+00:00",
"_source": "openrouter",
- "_model_count": 460,
+ "_model_count": 464,
"models": {
+ "openai/gpt-6.1-sol-pro": {
+ "id": "openai/gpt-6.1-sol-pro",
+ "name": "OpenAI: GPT-6.1 Sol Pro",
+ "provider": "openai",
+ "local_id": "gpt-6.1-sol-pro",
+ "context_length": 1050000,
+ "max_output_tokens": 128000,
+ "input_price_per_mtok": 2.0,
+ "output_price_per_mtok": 10.0,
+ "supports_thinking": true,
+ "thinking_type": "effort",
+ "temperature_range": [
+ 0.0,
+ 2.0
+ ],
+ "is_reasoning_model": false,
+ "supported_parameters": [
+ "include_reasoning",
+ "max_completion_tokens",
+ "max_tokens",
+ "reasoning",
+ "reasoning_effort",
+ "response_format",
+ "seed",
+ "structured_outputs",
+ "tool_choice",
+ "tools"
+ ]
+ },
+ "openai/gpt-6.1-sol-pro:batch": {
+ "id": "openai/gpt-6.1-sol-pro:batch",
+ "name": "OpenAI: GPT-6.1 Sol Pro (batch)",
+ "provider": "openai",
+ "local_id": "gpt-6.1-sol-pro:batch",
+ "context_length": 1050000,
+ "max_output_tokens": 128000,
+ "input_price_per_mtok": 1.0,
+ "output_price_per_mtok": 5.0,
+ "supports_thinking": true,
+ "thinking_type": "effort",
+ "temperature_range": [
+ 0.0,
+ 2.0
+ ],
+ "is_reasoning_model": false,
+ "supported_parameters": [
+ "include_reasoning",
+ "max_tokens",
+ "reasoning",
+ "reasoning_effort",
+ "response_format",
+ "seed",
+ "structured_outputs",
+ "tool_choice",
+ "tools"
+ ]
+ },
+ "openai/gpt-6.1-sol": {
+ "id": "openai/gpt-6.1-sol",
+ "name": "OpenAI: GPT-6.1 Sol",
+ "provider": "openai",
+ "local_id": "gpt-6.1-sol",
+ "context_length": 1050000,
+ "max_output_tokens": 128000,
+ "input_price_per_mtok": 2.0,
+ "output_price_per_mtok": 10.0,
+ "supports_thinking": true,
+ "thinking_type": "effort",
+ "temperature_range": [
+ 0.0,
+ 2.0
+ ],
+ "is_reasoning_model": false,
+ "supported_parameters": [
+ "include_reasoning",
+ "max_completion_tokens",
+ "max_tokens",
+ "reasoning",
+ "reasoning_effort",
+ "response_format",
+ "seed",
+ "structured_outputs",
+ "tool_choice",
+ "tools"
+ ]
+ },
+ "openai/gpt-6.1-sol:batch": {
+ "id": "openai/gpt-6.1-sol:batch",
+ "name": "OpenAI: GPT-6.1 Sol (batch)",
+ "provider": "openai",
+ "local_id": "gpt-6.1-sol:batch",
+ "context_length": 1050000,
+ "max_output_tokens": 128000,
+ "input_price_per_mtok": 1.0,
+ "output_price_per_mtok": 5.0,
+ "supports_thinking": true,
+ "thinking_type": "effort",
+ "temperature_range": [
+ 0.0,
+ 2.0
+ ],
+ "is_reasoning_model": false,
+ "supported_parameters": [
+ "include_reasoning",
+ "max_tokens",
+ "reasoning",
+ "reasoning_effort",
+ "response_format",
+ "seed",
+ "structured_outputs",
+ "tool_choice",
+ "tools"
+ ]
+ },
"anthropic/claude-sonnet-5.5": {
"id": "anthropic/claude-sonnet-5.5",
"name": "Anthropic: Claude Sonnet 5.5",
@@ -910,6 +1024,7 @@
"is_reasoning_model": false,
"supported_parameters": [
"max_tokens",
+ "response_format",
"temperature",
"tool_choice",
"tools",
@@ -922,9 +1037,9 @@
"provider": "deepseek",
"local_id": "deepseek-pro-latest",
"context_length": 1048576,
- "max_output_tokens": 943718,
- "input_price_per_mtok": 0.1581,
- "output_price_per_mtok": 1.9584,
+ "max_output_tokens": 393216,
+ "input_price_per_mtok": 0.2,
+ "output_price_per_mtok": 3.5,
"supports_thinking": false,
"thinking_type": "none",
"temperature_range": [
@@ -1911,7 +2026,7 @@
"name": "Z.ai: GLM Flash Latest",
"provider": "z-ai",
"local_id": "glm-flash-latest",
- "context_length": 1310720,
+ "context_length": 1048576,
"max_output_tokens": 943718,
"input_price_per_mtok": 0.02,
"output_price_per_mtok": 0.3,
@@ -1986,7 +2101,7 @@
"name": "Z.ai: GLM 5.3 Flash",
"provider": "z-ai",
"local_id": "glm-5.3-flash",
- "context_length": 1310720,
+ "context_length": 1048576,
"max_output_tokens": 943717,
"input_price_per_mtok": 0.15,
"output_price_per_mtok": 0.5,
@@ -2181,9 +2296,9 @@
"name": "Z.ai: GLM Latest",
"provider": "z-ai",
"local_id": "glm-latest",
- "context_length": 1310720,
+ "context_length": 1048576,
"max_output_tokens": 131072,
- "input_price_per_mtok": 0.19,
+ "input_price_per_mtok": 0.12,
"output_price_per_mtok": 4.0,
"supports_thinking": false,
"thinking_type": "none",
@@ -2246,7 +2361,7 @@
"name": "Z.ai: GLM 5.3",
"provider": "z-ai",
"local_id": "glm-5.3",
- "context_length": 1310720,
+ "context_length": 1048576,
"max_output_tokens": 943717,
"input_price_per_mtok": 1.4,
"output_price_per_mtok": 4.4,
@@ -2324,9 +2439,9 @@
"provider": "qwen",
"local_id": "qwen3.8-27b",
"context_length": 1000000,
- "max_output_tokens": 235929,
- "input_price_per_mtok": 0.0647,
- "output_price_per_mtok": 4.4,
+ "max_output_tokens": 131072,
+ "input_price_per_mtok": 0.42,
+ "output_price_per_mtok": 3.0,
"supports_thinking": false,
"thinking_type": "none",
"temperature_range": [
@@ -2584,9 +2699,9 @@
"provider": "deepseek",
"local_id": "deepseek-v4-pro-0813",
"context_length": 1048576,
- "max_output_tokens": 943718,
- "input_price_per_mtok": 0.4,
- "output_price_per_mtok": 4.2,
+ "max_output_tokens": 393216,
+ "input_price_per_mtok": 1.32,
+ "output_price_per_mtok": 3.96,
"supports_thinking": false,
"thinking_type": "none",
"temperature_range": [
@@ -2694,7 +2809,7 @@
"name": "NVIDIA: Nemotron 3.5 Lightning",
"provider": "nvidia",
"local_id": "nemotron-3.5-lightning",
- "context_length": 1000000,
+ "context_length": 262144,
"max_output_tokens": 32768,
"input_price_per_mtok": 0.06,
"output_price_per_mtok": 0.16,
@@ -2818,9 +2933,9 @@
"provider": "meta",
"local_id": "muse-glimmer-30b",
"context_length": 131072,
- "max_output_tokens": 16384,
- "input_price_per_mtok": 0.3,
- "output_price_per_mtok": 1.2,
+ "max_output_tokens": 117964,
+ "input_price_per_mtok": 0.35,
+ "output_price_per_mtok": 1.5,
"supports_thinking": false,
"thinking_type": "none",
"temperature_range": [
@@ -2885,10 +3000,10 @@
"name": "DeepSeek: DeepSeek V4 Flash Latest",
"provider": "deepseek",
"local_id": "deepseek-v4-flash-latest",
- "context_length": 1310720,
+ "context_length": 1048576,
"max_output_tokens": 943718,
- "input_price_per_mtok": 0.012,
- "output_price_per_mtok": 0.7,
+ "input_price_per_mtok": 0.01,
+ "output_price_per_mtok": 1.28,
"supports_thinking": false,
"thinking_type": "none",
"temperature_range": [
@@ -2926,10 +3041,10 @@
"name": "DeepSeek: DeepSeek V4 Flash 0731",
"provider": "deepseek",
"local_id": "deepseek-v4-flash-0731",
- "context_length": 1310720,
+ "context_length": 1048576,
"max_output_tokens": 943718,
- "input_price_per_mtok": 0.018,
- "output_price_per_mtok": 0.32,
+ "input_price_per_mtok": 0.01,
+ "output_price_per_mtok": 1.28,
"supports_thinking": false,
"thinking_type": "none",
"temperature_range": [
@@ -4363,8 +4478,8 @@
"local_id": "glm-5.2",
"context_length": 1048576,
"max_output_tokens": 943718,
- "input_price_per_mtok": 0.3249,
- "output_price_per_mtok": 4.4,
+ "input_price_per_mtok": 0.25,
+ "output_price_per_mtok": 3.99,
"supports_thinking": false,
"thinking_type": "none",
"temperature_range": [
@@ -4421,8 +4536,8 @@
"local_id": "kimi-k2.7-code",
"context_length": 262144,
"max_output_tokens": 235929,
- "input_price_per_mtok": 0.6562,
- "output_price_per_mtok": 3.3,
+ "input_price_per_mtok": 0.6712,
+ "output_price_per_mtok": 3.35,
"supports_thinking": false,
"thinking_type": "none",
"temperature_range": [
@@ -5335,7 +5450,7 @@
"context_length": 1048576,
"max_output_tokens": 943718,
"input_price_per_mtok": 0.4,
- "output_price_per_mtok": 10.0,
+ "output_price_per_mtok": 9.0,
"supports_thinking": false,
"thinking_type": "none",
"temperature_range": [
@@ -5850,10 +5965,8 @@
"supported_parameters": [
"frequency_penalty",
"include_reasoning",
- "logit_bias",
"logprobs",
"max_tokens",
- "min_p",
"presence_penalty",
"reasoning",
"repetition_penalty",
@@ -5888,9 +6001,7 @@
"supported_parameters": [
"frequency_penalty",
"include_reasoning",
- "logit_bias",
"max_tokens",
- "min_p",
"presence_penalty",
"reasoning",
"repetition_penalty",
@@ -6129,8 +6240,8 @@
"local_id": "gemma-4-26b-a4b-it",
"context_length": 262144,
"max_output_tokens": 235929,
- "input_price_per_mtok": 0.0765,
- "output_price_per_mtok": 0.255,
+ "input_price_per_mtok": 0.09,
+ "output_price_per_mtok": 0.3,
"supports_thinking": false,
"thinking_type": "none",
"temperature_range": [
@@ -7183,7 +7294,7 @@
"provider": "qwen",
"local_id": "qwen3.5-122b-a10b",
"context_length": 262144,
- "max_output_tokens": 235929,
+ "max_output_tokens": 65536,
"input_price_per_mtok": 0.26,
"output_price_per_mtok": 2.08,
"supports_thinking": false,
@@ -10511,9 +10622,9 @@
"provider": "openai",
"local_id": "gpt-oss-120b",
"context_length": 131072,
- "max_output_tokens": 65536,
- "input_price_per_mtok": 0.15,
- "output_price_per_mtok": 0.6,
+ "max_output_tokens": 117964,
+ "input_price_per_mtok": 0.037,
+ "output_price_per_mtok": 0.17,
"supports_thinking": true,
"thinking_type": "effort",
"temperature_range": [
@@ -12201,15 +12312,10 @@
"is_reasoning_model": false,
"supported_parameters": [
"frequency_penalty",
- "logit_bias",
"logprobs",
"max_tokens",
- "min_p",
- "presence_penalty",
- "repetition_penalty",
"response_format",
"seed",
- "stop",
"structured_outputs",
"temperature",
"tool_choice",