@geminilight/mindos 0.5.22 → 0.5.24

package/app/app/api/ask/route.ts

@@ -13,7 +13,6 @@ import {
   createTransformContext,
 } from '@/lib/agent/context';
 import { logAgentOp } from '@/lib/agent/log';
-import { loadSkillRules } from '@/lib/agent/skill-rules';
 import { readSettings } from '@/lib/settings';
 import { MindOSError, apiError, ErrorCodes } from '@/lib/errors';
 import { metrics } from '@/lib/metrics';
@@ -179,17 +178,15 @@ export async function POST(req: NextRequest) {
   const contextStrategy = agentConfig.contextStrategy ?? 'auto';
 
   // Auto-load skill + bootstrap context for each request.
-  // 1. SKILL.md — static trigger + protocol (always loaded)
-  // 2. skill-rules.md — user's knowledge base operating rules (if exists)
-  // 3. user-rules.md — user's personalized rules (if exists)
+  // 1. SKILL.md — complete skill with operating rules (always loaded)
+  // 2. user-skill-rules.md — user's personalized rules from KB root (if exists)
   const isZh = serverSettings.disabledSkills?.includes('mindos') ?? false;
   const skillDirName = isZh ? 'mindos-zh' : 'mindos';
   const skillPath = path.resolve(process.cwd(), `data/skills/${skillDirName}/SKILL.md`);
   const skill = readAbsoluteFile(skillPath);
 
-  // Progressive skill loading: read skill-rules + user-rules from knowledge base
   const mindRoot = getMindRoot();
-  const { skillRules, userRules } = loadSkillRules(mindRoot, skillDirName);
+  const userSkillRules = readKnowledgeFile('user-skill-rules.md');
 
   const targetDir = dirnameOf(currentFile);
   const bootstrap = {
@@ -208,8 +205,7 @@ export async function POST(req: NextRequest) {
   const truncationWarnings: string[] = [];
   if (!skill.ok) initFailures.push(`skill.mindos: failed (${skill.error})`);
   if (skill.ok && skill.truncated) truncationWarnings.push('skill.mindos was truncated');
-  if (skillRules.ok && skillRules.truncated) truncationWarnings.push('skill-rules.md was truncated');
-  if (userRules.ok && userRules.truncated) truncationWarnings.push('user-rules.md was truncated');
+  if (userSkillRules.ok && userSkillRules.truncated) truncationWarnings.push('user-skill-rules.md was truncated');
   if (!bootstrap.instruction.ok) initFailures.push(`bootstrap.instruction: failed (${bootstrap.instruction.error})`);
   if (bootstrap.instruction.ok && bootstrap.instruction.truncated) truncationWarnings.push('bootstrap.instruction was truncated');
   if (!bootstrap.index.ok) initFailures.push(`bootstrap.index: failed (${bootstrap.index.error})`);
@@ -233,12 +229,9 @@ export async function POST(req: NextRequest) {
 
   const initContextBlocks: string[] = [];
   if (skill.ok) initContextBlocks.push(`## mindos_skill_md\n\n${skill.content}`);
-  // Progressive skill loading: inject skill-rules and user-rules after SKILL.md
-  if (skillRules.ok && !skillRules.empty) {
-    initContextBlocks.push(`## skill_rules\n\nOperating rules loaded from knowledge base (.agents/skills/${skillDirName}/skill-rules.md):\n\n${skillRules.content}`);
-  }
-  if (userRules.ok && !userRules.empty) {
-    initContextBlocks.push(`## user_rules\n\nUser personalization rules (.agents/skills/${skillDirName}/user-rules.md):\n\n${userRules.content}`);
+  // User personalization rules (from knowledge base root)
+  if (userSkillRules.ok && !userSkillRules.truncated && userSkillRules.content.trim()) {
+    initContextBlocks.push(`## user_skill_rules\n\nUser personalization rules (user-skill-rules.md):\n\n${userSkillRules.content}`);
   }
   if (bootstrap.instruction.ok) initContextBlocks.push(`## bootstrap_instruction\n\n${bootstrap.instruction.content}`);
   if (bootstrap.index.ok) initContextBlocks.push(`## bootstrap_index\n\n${bootstrap.index.content}`);

package/app/app/api/bootstrap/route.ts

@@ -21,6 +21,7 @@ export async function GET(req: NextRequest) {
       index: tryRead('README.md'),
       config_json: tryRead('CONFIG.json'),
       config_md: tryRead('CONFIG.md'),
+      user_skill_rules: tryRead('user-skill-rules.md'),
     };
 
     if (targetDir) {

package/app/app/globals.css

@@ -212,6 +212,20 @@ body {
 .prose img { max-width: 100%; border-radius: 6px; border: 1px solid var(--prose-code-border); }
 .prose hr { border: none; border-top: 1px solid var(--prose-border); margin: 2.5em 0; }
 
+/* Ask Panel — compact prose for side panel chat bubbles */
+.prose.prose-panel {
+  font-size: 0.8125rem !important;
+  line-height: 1.6;
+}
+.prose.prose-panel h1, .prose.prose-panel h2, .prose.prose-panel h3, .prose.prose-panel h4 {
+  font-size: 0.8125rem !important;
+  margin-top: 1em;
+  margin-bottom: 0.4em;
+}
+.prose.prose-panel p { margin-bottom: 0.6em; }
+.prose.prose-panel pre { padding: 0.6em 0.8em; margin: 0.8em 0; }
+.prose.prose-panel pre code { font-size: 0.78em; }
+
 :root {
   --prose-body: #3a3730;
   --prose-heading: #1c1a17;

package/app/app/setup/page.tsx

@@ -4,9 +4,10 @@ import SetupWizard from '@/components/SetupWizard';
 
 export const dynamic = 'force-dynamic';
 
-export default function SetupPage({ searchParams }: { searchParams: { force?: string } }) {
+export default async function SetupPage({ searchParams }: { searchParams: Promise<{ force?: string }> }) {
   const settings = readSettings();
-  const force = searchParams.force === '1';
+  const { force: forceParam } = await searchParams;
+  const force = forceParam === '1';
   if (!settings.setupPending && !force) redirect('/');
   return <SetupWizard />;
 }

package/app/components/ActivityBar.tsx

@@ -0,0 +1,183 @@
+'use client';
+
+import { useRef, useCallback } from 'react';
+import Link from 'next/link';
+import { FolderTree, Search, Settings, RefreshCw, Blocks, Bot, ChevronLeft, ChevronRight } from 'lucide-react';
+import { DOT_COLORS, getStatusLevel } from './SyncStatusBar';
+import type { SyncStatus } from './settings/SyncTab';
+import Logo from './Logo';
+
+export type PanelId = 'files' | 'search' | 'plugins' | 'agents';
+
+export const RAIL_WIDTH_COLLAPSED = 48;
+export const RAIL_WIDTH_EXPANDED = 180;
+
+interface ActivityBarProps {
+  activePanel: PanelId | null;
+  onPanelChange: (id: PanelId | null) => void;
+  syncStatus: SyncStatus | null;
+  expanded: boolean;
+  onExpandedChange: (expanded: boolean) => void;
+  onSettingsClick: () => void;
+  onSyncClick: (rect: DOMRect) => void;
+}
+
+interface RailButtonProps {
+  icon: React.ReactNode;
+  label: string;
+  shortcut?: string;
+  active?: boolean;
+  expanded: boolean;
+  onClick: () => void;
+  buttonRef?: React.Ref<HTMLButtonElement>;
+  /** Optional overlay badge (e.g. status dot) rendered inside the button */
+  badge?: React.ReactNode;
+}
+
+function RailButton({ icon, label, shortcut, active = false, expanded, onClick, buttonRef, badge }: RailButtonProps) {
+  return (
+    <button
+      ref={buttonRef}
+      onClick={onClick}
+      aria-pressed={active}
+      aria-label={label}
+      title={expanded ? undefined : (shortcut ? `${label} (${shortcut})` : label)}
+      className={`
+        relative flex items-center ${expanded ? 'justify-start px-3 w-full' : 'justify-center w-10'} h-10 rounded-md transition-colors
+        ${active
+          ? 'text-[var(--amber)] bg-[var(--amber-dim)]'
+          : 'text-muted-foreground hover:text-foreground hover:bg-muted'
+        }
+        focus-visible:ring-2 focus-visible:ring-ring
+      `}
+    >
+      {active && (
+        <span className="absolute left-0 top-1/2 -translate-y-1/2 w-[2px] h-[18px] rounded-r-full" style={{ background: 'var(--amber)' }} />
+      )}
+      <span className="shrink-0 flex items-center justify-center w-[18px]">{icon}</span>
+      {badge}
+      {expanded && (
+        <>
+          <span className="ml-2.5 text-sm whitespace-nowrap">{label}</span>
+          {shortcut && (
+            <span className="ml-auto text-2xs text-muted-foreground/60 font-mono shrink-0">{shortcut}</span>
+          )}
+        </>
+      )}
+    </button>
+  );
+}
+
+export default function ActivityBar({
+  activePanel,
+  onPanelChange,
+  syncStatus,
+  expanded,
+  onExpandedChange,
+  onSettingsClick,
+  onSyncClick,
+}: ActivityBarProps) {
+  const lastClickRef = useRef(0);
+  const syncBtnRef = useRef<HTMLButtonElement>(null);
+
+  /** Debounce rapid clicks (300ms) — shared across all Rail buttons */
+  const debounced = useCallback((fn: () => void) => {
+    const now = Date.now();
+    if (now - lastClickRef.current < 300) return;
+    lastClickRef.current = now;
+    fn();
+  }, []);
+
+  const toggle = useCallback((id: PanelId) => {
+    debounced(() => onPanelChange(activePanel === id ? null : id));
+  }, [activePanel, onPanelChange, debounced]);
+
+  const syncLevel = getStatusLevel(syncStatus, false);
+  const showSyncDot = syncLevel !== 'off' && syncLevel !== 'synced';
+
+  const railWidth = expanded ? RAIL_WIDTH_EXPANDED : RAIL_WIDTH_COLLAPSED;
+
+  // Sync dot badge — positioned differently in collapsed vs expanded
+  const syncBadge = showSyncDot ? (
+    <span className={`absolute ${expanded ? 'left-[26px] top-1.5' : 'top-1.5 right-1.5'} w-2 h-2 rounded-full ${DOT_COLORS[syncLevel]} ${syncLevel === 'error' || syncLevel === 'conflicts' ? 'animate-pulse' : ''}`} />
+  ) : undefined;
+
+  return (
+    <aside
+      className="group hidden md:flex fixed top-0 left-0 h-screen z-[31] flex-col bg-background border-r border-border transition-[width] duration-200 ease-out"
+      style={{ width: `${railWidth}px` }}
+      role="toolbar"
+      aria-label="Navigation"
+      aria-orientation="vertical"
+    >
+      {/* Content wrapper — overflow-hidden prevents text flash during width transitions */}
+      <div className="flex flex-col h-full w-full overflow-hidden">
+        {/* ── Top: Logo ── */}
+        <Link
+          href="/"
+          className={`flex items-center ${expanded ? 'px-3 gap-2' : 'justify-center'} w-full py-3 hover:opacity-80 transition-opacity`}
+          aria-label="MindOS Home"
+        >
+          <Logo id="rail" className="w-7 h-3.5 shrink-0" />
+          {expanded && <span className="text-sm font-semibold text-foreground font-display whitespace-nowrap">MindOS</span>}
+        </Link>
+
+        <div className={`${expanded ? 'mx-3' : 'mx-auto w-6'} border-t border-border`} />
+
+        {/* ── Middle: Core panel toggles ── */}
+        <div className={`flex flex-col ${expanded ? 'px-1.5' : 'items-center'} gap-1 py-2`}>
+          <RailButton icon={<FolderTree size={18} />} label="Files" active={activePanel === 'files'} expanded={expanded} onClick={() => toggle('files')} />
+          <RailButton icon={<Search size={18} />} label="Search" shortcut="⌘K" active={activePanel === 'search'} expanded={expanded} onClick={() => toggle('search')} />
+          <RailButton icon={<Blocks size={18} />} label="Plugins" active={activePanel === 'plugins'} expanded={expanded} onClick={() => toggle('plugins')} />
+          <RailButton icon={<Bot size={18} />} label="Agents" active={activePanel === 'agents'} expanded={expanded} onClick={() => toggle('agents')} />
+        </div>
+
+        {/* ── Spacer ── */}
+        <div className="flex-1" />
+
+        {/* ── Bottom: Action buttons (not panel toggles) ── */}
+        <div className={`${expanded ? 'mx-3' : 'mx-auto w-6'} border-t border-border`} />
+        <div className={`flex flex-col ${expanded ? 'px-1.5' : 'items-center'} gap-1 py-2`}>
+          <RailButton
+            icon={<Settings size={18} />}
+            label="Settings"
+            shortcut="⌘,"
+            expanded={expanded}
+            onClick={() => debounced(onSettingsClick)}
+          />
+          <RailButton
+            icon={<RefreshCw size={18} />}
+            label="Sync"
+            expanded={expanded}
+            buttonRef={syncBtnRef}
+            badge={syncBadge}
+            onClick={() => debounced(() => {
+              const rect = syncBtnRef.current?.getBoundingClientRect();
+              if (rect) onSyncClick(rect);
+            })}
+          />
+        </div>
+      </div>
+
+      {/* ── Hover expand/collapse button — vertically centered on right edge ── */}
+      {/* z-[32] ensures it paints above Panel (z-30). Shows on Rail hover OR self-hover. */}
+      <button
+        onClick={() => onExpandedChange(!expanded)}
+        className="
+          absolute right-0 top-1/2 -translate-y-1/2 translate-x-1/2 z-[32]
+          w-5 h-5 rounded-full
+          bg-card border border-border shadow-sm
+          flex items-center justify-center
+          opacity-0 group-hover:opacity-100 hover:!opacity-100
+          transition-opacity duration-200
+          text-muted-foreground hover:text-foreground hover:bg-muted
+          focus-visible:opacity-100 focus-visible:ring-2 focus-visible:ring-ring
+        "
+        aria-label={expanded ? 'Collapse sidebar' : 'Expand sidebar'}
+        title={expanded ? 'Collapse' : 'Expand'}
+      >
+        {expanded ? <ChevronLeft size={10} /> : <ChevronRight size={10} />}
+      </button>
+    </aside>
+  );
+}

package/app/components/AskFab.tsx

@@ -1,105 +1,47 @@
 'use client';
 
-import { useState, useEffect, useCallback } from 'react';
-import { usePathname } from 'next/navigation';
 import { Sparkles } from 'lucide-react';
-import AskModal from './AskModal';
-import { useAskModal } from '@/hooks/useAskModal';
 
-export default function AskFab() {
-  const [open, setOpen] = useState(false);
-  const pathname = usePathname();
-  const currentFile = pathname.startsWith('/view/')
-    ? pathname.slice('/view/'.length).split('/').map(decodeURIComponent).join('/')
-    : undefined;
-
-  // Listen to useAskModal store for cross-component open requests (e.g. from GuideCard)
-  const askModal = useAskModal();
-  const [initialMessage, setInitialMessage] = useState('');
-  const [openSource, setOpenSource] = useState<'user' | 'guide' | 'guide-next'>('user');
-
-  useEffect(() => {
-    if (askModal.open) {
-      setInitialMessage(askModal.initialMessage);
-      setOpenSource(askModal.source);
-      setOpen(true);
-      askModal.close(); // Reset store state after consuming
-    }
-  }, [askModal.open, askModal.initialMessage, askModal.source, askModal.close]);
-
-  const handleClose = useCallback(() => {
-    setOpen(false);
-    setInitialMessage('');
-    setOpenSource('user');
-  }, []);
-
-  // Dispatch correct PATCH based on how the modal was opened
-  const handleFirstMessage = useCallback(() => {
-    const notifyGuide = () => window.dispatchEvent(new Event('guide-state-updated'));
-
-    if (openSource === 'guide') {
-      // Task ② completion: mark askedAI
-      fetch('/api/setup', {
-        method: 'PATCH',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ guideState: { askedAI: true } }),
-      }).then(notifyGuide).catch(() => {});
-    } else if (openSource === 'guide-next') {
-      // Next-step advancement: GuideCard already PATCHed nextStepIndex optimistically.
-      // Just notify GuideCard to re-fetch for consistency; no additional PATCH needed.
-      notifyGuide();
-    }
-    // For 'user' source: no guide action needed
-  }, [openSource]);
+interface AskFabProps {
+  /** Toggle the right-side Ask AI panel */
+  onToggle: () => void;
+  /** Whether the right panel is currently open (FAB hides when open) */
+  askPanelOpen: boolean;
+}
 
+export default function AskFab({ onToggle, askPanelOpen }: AskFabProps) {
   return (
-    <>
-      <button
-        onClick={() => { setInitialMessage(''); setOpenSource('user'); setOpen(true); }}
-        className="
-          group
-          fixed z-40
-          bottom-5 right-5
-          md:bottom-5 md:right-5
-          flex items-center justify-center
-          gap-0 hover:gap-2
-          p-3 md:p-[11px] rounded-xl
-          text-white font-medium text-[13px]
-          shadow-md shadow-amber-900/15
-          transition-all duration-200 ease-out
-          hover:shadow-lg hover:shadow-amber-800/25
-          active:scale-95
-          cursor-pointer
-          overflow-hidden
-          font-display
-        "
-        style={{
-          background: 'linear-gradient(135deg, #b07c2e 0%, #c8873a 50%, #d4943f 100%)',
-          marginBottom: 'env(safe-area-inset-bottom, 0px)',
-        }}
-        title="MindOS Agent (⌘/)"
-        aria-label="MindOS Agent"
-      >
-        <Sparkles size={16} className="relative z-10 shrink-0" />
-
-        <span className="
-          relative z-10
-          max-w-0 group-hover:max-w-[120px]
-          opacity-0 group-hover:opacity-100
-          transition-all duration-200 ease-out
-          whitespace-nowrap overflow-hidden
-        ">
-          MindOS Agent
-        </span>
-      </button>
-
-      <AskModal
-        open={open}
-        onClose={handleClose}
-        currentFile={currentFile}
-        initialMessage={initialMessage}
-        onFirstMessage={handleFirstMessage}
-      />
-    </>
+    <button
+      onClick={onToggle}
+      className={`
+        group hidden md:flex
+        fixed z-40 bottom-5 right-5
+        items-center justify-center
+        gap-0 hover:gap-2
+        p-[11px] rounded-xl
+        text-white font-medium text-[13px]
+        shadow-md shadow-amber-900/15
+        transition-all duration-200 ease-out
+        hover:shadow-lg hover:shadow-amber-800/25
+        active:scale-95 cursor-pointer overflow-hidden font-display
+        ${askPanelOpen ? 'opacity-0 pointer-events-none translate-y-2' : 'opacity-100 translate-y-0'}
+      `}
+      style={{
+        background: 'linear-gradient(135deg, #b07c2e 0%, #c8873a 50%, #d4943f 100%)',
+      }}
+      title="MindOS Agent (⌘/)"
+      aria-label="MindOS Agent"
+    >
+      <Sparkles size={16} className="relative z-10 shrink-0" />
+      <span className="
+        relative z-10
+        max-w-0 group-hover:max-w-[120px]
+        opacity-0 group-hover:opacity-100
+        transition-all duration-200 ease-out
+        whitespace-nowrap overflow-hidden
+      ">
+        MindOS Agent
+      </span>
+    </button>
   );
 }