Skip to content

Commit 98a49ee

Browse files
authored
Merge branch 'main' into e2e-flow
2 parents f084773 + 0b23ae6 commit 98a49ee

92 files changed

Lines changed: 4557 additions & 4303 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.claude/memory.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,17 @@ Quick reference for anyone starting with Claude on this project. Updated by the
8888
- **Phased rollout** — Phase 1 = banners + limit modal + hook. Phase 2 = onboarding upsell + analytics. Phase 3 = remote config + A/B testing.
8989
- **"5-hour" label stragglers in Conversations.tsx** — `LimitPill` label and its hover tooltip still say "5h" / "5-hour". Commit 8c52236's "10-hour" terminology refactor missed those two spots.
9090

91+
## Settings & Skills Reorganization (Issue #396)
92+
93+
- **Settings is NOT a modal** — It's a full route (`/settings/*`) with nested `<Routes>`. The `.claude/rules/15-settings-modal-system.md` doc is outdated.
94+
- **SettingsHeader breadcrumbs** — All panels now receive `breadcrumbs` from `useSettingsNavigation()` hook. The hook derives breadcrumbs from the current route path. When adding a new settings panel, destructure `breadcrumbs` from the hook and pass to `<SettingsHeader>`.
95+
- **Standard settings padding** — All settings panel content areas use `p-4 space-y-4`. Don't deviate.
96+
- **Dead code removed** — `TauriCommandsPanel`, `useSettingsAnimation`, `SettingsPanelLayout`, `SettingsBackButton`, `ProfilePanel`, `AdvancedPanel`, `SkillsPanel`, `SkillsGrid` were all deleted. Don't re-create them.
97+
- **Skills page is the single management surface** — Browser Access toggle moved from SkillsPanel to the Skills page. There is no `/settings/skills` route anymore.
98+
- **Panel decomposition** — LocalModelPanel, AutocompletePanel, CronJobsPanel, ScreenIntelligencePanel were split into sub-components in subdirectories. Each orchestrator is ≤ ~300 lines.
99+
- **UnifiedSkillCard** — All skill types (built-in, channels, 3rd party) use `UnifiedSkillCard` from `app/src/components/skills/SkillCard.tsx`. Secondary actions use an overflow menu. `data-testid` attributes (`skill-sync-button-*`, `skill-debug-button-*`) must be preserved.
100+
- **SkillSearchBar + SkillCategoryFilter** — New components in `app/src/components/skills/` for search and category filtering on the Skills page.
101+
91102
## Environment
92103

93104
- **Core sidecar port** — `7788` (default). Check with `lsof -i :7788`.

‎.github/workflows/release.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,9 @@ jobs:
9595
id: bump
9696
run: node scripts/release/bump-version.js "${{ inputs.release_type }}"
9797

98+
- name: Verify release version sync
99+
run: node scripts/release/verify-version-sync.js "${{ steps.bump.outputs.version }}"
100+
98101
- name: Ensure tag does not already exist
99102
env:
100103
TAG: ${{ steps.bump.outputs.tag }}
@@ -115,7 +118,7 @@ jobs:
115118
VERSION: ${{ steps.bump.outputs.version }}
116119
TAG: ${{ steps.bump.outputs.tag }}
117120
run: |
118-
git add app/package.json app/src-tauri/tauri.conf.json app/src-tauri/Cargo.toml
121+
git add app/package.json app/src-tauri/tauri.conf.json app/src-tauri/Cargo.toml Cargo.toml
119122
git commit -m "chore(release): v${VERSION}"
120123
git push origin main
121124

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "openhuman"
3-
version = "0.49.17"
3+
version = "0.52.0"
44
edition = "2021"
55
description = "OpenHuman core business logic and RPC server"
66
autobins = false

‎app/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "openhuman-app",
3-
"version": "0.51.19",
3+
"version": "0.52.0",
44
"type": "module",
55
"scripts": {
66
"dev": "vite",

‎app/src-tauri/Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/src-tauri/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "OpenHuman"
3-
version = "0.51.19"
3+
version = "0.52.0"
44
description = "OpenHuman - AI-powered Super Assistant"
55
authors = ["OpenHuman"]
66
edition = "2021"

‎app/src-tauri/tauri.conf.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://schema.tauri.app/config/2",
33
"productName": "OpenHuman",
4-
"version": "0.51.19",
4+
"version": "0.52.0",
55
"identifier": "com.openhuman.app",
66
"build": {
77
"beforeDevCommand": "npm run core:stage && npm run dev",

‎app/src/components/SkillsGrid.tsx‎

Lines changed: 0 additions & 217 deletions
This file was deleted.

‎app/src/components/oauth/providerConfigs.tsx‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ const GoogleIcon = ({ className = '' }: { className?: string }) => (
2626
);
2727

2828
const TwitterIcon = ({ className = '' }: { className?: string }) => (
29-
<svg className={className} viewBox="0 0 24 24" fill="#fff">
29+
<svg className={className} viewBox="0 0 24 24" fill="#000">
3030
<path d="M18.244 2.25h3.308l-7.227 8.26 8.502 11.24H16.17l-5.214-6.817L4.99 21.75H1.68l7.73-8.835L1.254 2.25H8.08l4.713 6.231zm-1.161 17.52h1.833L7.084 4.126H5.117z" />
3131
</svg>
3232
);
3333

3434
const GitHubIcon = ({ className = '' }: { className?: string }) => (
35-
<svg className={className} viewBox="0 0 24 24" fill="#fff">
35+
<svg className={className} viewBox="0 0 24 24" fill="#24292f">
3636
<path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z" />
3737
</svg>
3838
);
@@ -56,17 +56,17 @@ export const oauthProviderConfigs: OAuthProviderConfig[] = [
5656
id: 'github',
5757
name: 'GitHub',
5858
icon: GitHubIcon,
59-
color: 'bg-gray-900 border border-gray-800',
60-
hoverColor: 'hover:bg-gray-800 hover:border-gray-700',
61-
textColor: 'text-white',
59+
color: 'bg-white border border-gray-200',
60+
hoverColor: 'hover:bg-gray-50 hover:border-gray-300',
61+
textColor: 'text-gray-900',
6262
},
6363
{
6464
id: 'twitter',
6565
name: 'Twitter',
6666
icon: TwitterIcon,
67-
color: 'bg-black border border-gray-800',
68-
hoverColor: 'hover:bg-gray-900 hover:border-gray-700',
69-
textColor: 'text-white',
67+
color: 'bg-white border border-gray-200',
68+
hoverColor: 'hover:bg-gray-50 hover:border-gray-300',
69+
textColor: 'text-gray-900',
7070
},
7171
{
7272
id: 'discord',

‎app/src/components/settings/SettingsSectionPage.tsx‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,16 @@ interface SettingsSectionPageProps {
1919
}
2020

2121
const SettingsSectionPage = ({ title, description, items }: SettingsSectionPageProps) => {
22-
const { navigateBack, navigateToSettings } = useSettingsNavigation();
22+
const { navigateBack, navigateToSettings, breadcrumbs } = useSettingsNavigation();
2323

2424
return (
2525
<div className="z-10 relative">
26-
<SettingsHeader title={title} showBackButton={true} onBack={navigateBack} />
26+
<SettingsHeader
27+
title={title}
28+
showBackButton={true}
29+
onBack={navigateBack}
30+
breadcrumbs={breadcrumbs}
31+
/>
2732

2833
<div>
2934
{description && <p className="mt-1 text-xs text-stone-500 px-5 pb-3">{description}</p>}

0 commit comments

Comments
 (0)