Skip to content

Merge Wes's token unification (conflicts resolved)#196

Merged
dgarson merged 122 commits intofeat/horizon-ui-phase1-cleanupfrom
luis/wes-merge-resolve
Mar 3, 2026
Merged

Merge Wes's token unification (conflicts resolved)#196
dgarson merged 122 commits intofeat/horizon-ui-phase1-cleanupfrom
luis/wes-merge-resolve

Conversation

@dgarson
Copy link
Owner

@dgarson dgarson commented Mar 3, 2026

Resolved 23 conflicts from Wes's PR #194 by accepting his token unification changes.

…, wave countdowns, 15 agents, Brave key alert
…coveryWaveResults, DiscoveryAgentCostTracker, ToolReliabilityDashboard)
…tructure

Agent: luis
Original branch: feat/horizon-post-merge
Working on: horizon-ux-views
Reason: restructuring workspace so git repos live at git/{reponame}/
All untracked config + code changes captured here.
…indingTrendChart, AgentSkillHeatmap) — batch 6PM
…penclaw#313)

- New AgentTopologyMap.tsx: pure SVG + React state, no external graph libs
- Static concentric layout: principals (r=210), crons (r=115), workers (r=65 from spawner)
- Node types: Principal (violet circle), Worker (blue circle), Cron (amber diamond)
- Interactive: click-to-inspect detail panel (280px), hover scale effect
- Toolbar: Live/Paused toggle, Reset View, session count badge, legend
- Mock data: 6 principals, 4 workers (from Luis), 2 crons
- Also fix pre-existing TS build errors to get 0-error build:
  - AgentOutputDiffViewer: remove invalid lucide icons + syntax error
  - APICredentialHealthDashboard: fix Badge/Alert variants, remove indicatorClassName
  - AgentSkillHeatmap, AgentSoulEditor, DiscoveryRunReplayControls,
    FindingTrendChart, ModelComparisonMatrix: pre-existing fixes
  - Add missing ui/alert badge card progress components
…penclaw#313)

- New AgentTopologyMap.tsx: pure SVG + React state, no external graph libs
- Static concentric layout: principals (r=210), crons (r=115), workers (r=65 from spawner)
- Node types: Principal (violet circle), Worker (blue circle), Cron (amber diamond)
- Interactive: click-to-inspect detail panel (280px), hover scale effect
- Toolbar: Live/Paused toggle, Reset View, session count badge, legend
- Mock data: 6 principals, 4 workers (from Luis), 2 crons
- Also fix pre-existing TS build errors to get 0-error build:
  - AgentOutputDiffViewer: remove invalid lucide icons + syntax error
  - APICredentialHealthDashboard: fix Badge/Alert variants, remove indicatorClassName
  - AgentSkillHeatmap, AgentSoulEditor, DiscoveryRunReplayControls,
    FindingTrendChart, ModelComparisonMatrix: pre-existing fixes
  - Add missing ui/alert badge card progress components
* security: redact PII in user-facing LLM error details

* add credential disclosure for skill command dispatch

* feat(web-next): add command registry store for command palette

- Add zustand dependency for state management
- Create commandRegistry store with add/remove/execute commands
- Include default navigation and action commands
- Supports NL Actions via keyword matching

* feat(web-next): integrate Skill Builder IDE component

- Add SkillBuilderEditor view that wraps the SkillBuilder component
- Connect save and test handlers with basic validation
- Add navigation entry and route for skill-builder
- Allows creating and editing skills from the UI

bs-ux-5-impl
…quirements' into feat/horizon-ui-complete

# Conflicts:
#	docs/start/onboarding-overview.md
…-ui-for-dashboard' into feat/horizon-ui-complete

# Conflicts:
#	apps/web-next/package.json
#	apps/web-next/src/App.tsx
#	apps/web-next/src/views/AgentDashboard.tsx
#	apps/web-next/src/views/AgentPerformanceBreakdown.tsx
#	apps/web-next/src/views/CronJobManager.tsx
#	apps/web-next/src/views/UsageDashboard.tsx
#	apps/web-next/src/views/WorkqueueDashboard.tsx
- Updated quiz questions to be friendlier and more conversational
- Enhanced level descriptions with more engaging copy
- Improved template descriptions with clearer value propositions
- Refreshed empty state messages for better user guidance
- Updated setup step descriptions for clarity

Part of bs-ux-1-copy
- Convert hardcoded zinc-* classes to named token utilities
- AgentTracer.tsx: 51 zinc refs → 0 (full conversion)
- Batch 1 views: 14 files converted

Token mappings applied:
- bg-zinc-950 → bg-surface-0
- bg-zinc-900 → bg-surface-1
- bg-zinc-800 → bg-surface-2
- bg-zinc-700 → bg-surface-3
- text-white/text-zinc-100/200/300 → text-fg-primary
- text-zinc-400 → text-fg-secondary
- text-zinc-500/600/700 → text-fg-muted
- border-zinc-800/700 → border-tok-border
- divide-zinc-800 → divide-tok-border
- ring-zinc-500/700/800 → ring-tok-border
- placeholder-zinc-500 → placeholder:text-fg-muted
- ring-offset-zinc-900 → ring-offset-surface-1
- fill-zinc-500 → fill-fg-muted

Note: Opacity variants (e.g., bg-zinc-400/10) retained pending
token system extension for opacity utilities.
@dgarson dgarson merged commit a860c92 into feat/horizon-ui-phase1-cleanup Mar 3, 2026
1 of 3 checks passed
@dgarson dgarson deleted the luis/wes-merge-resolve branch March 3, 2026 01:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants