Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Rotate the agent composer placeholder through input hints (#4737)

saraha55ed74d885a
diff --git a/.changeset/acp-composer-placeholder-hints.md b/.changeset/acp-composer-placeholder-hints.md
new file mode 100644
index 000000000..d9dfd5723
--- /dev/null
+++ b/.changeset/acp-composer-placeholder-hints.md
@@ -0,0 +1,5 @@
+---
+"@inkeep/open-knowledge": patch
+---
+
+The agent composer now cycles its placeholder through the two triggers it accepts, so typing `@` to mention a page and `/` to run a command are discoverable. Ask AI's example prompts now also cycle, with a fade, when reduced motion is on.
diff --git a/knip.config.ts b/knip.config.ts
index 5b8951125..659eef71e 100644
--- a/knip.config.ts
+++ b/knip.config.ts
@@ -143,11 +143,15 @@ export default {
'packages/server': {
entry: ['src/**/*.test.ts', 'src/parse-worker.ts'],
project: 'src/**',
- ignoreDependencies: ['@types/shell-quote'],
+ ignoreDependencies: [
+ '@types/shell-quote',
+ ],
},
'packages/cli': {
entry: ['src/**/*.test.ts', 'scripts/*.ts', 'tests/**/*.ts', 'src/parse-worker.ts'],
- ignoreDependencies: ['yjs'],
+ ignoreDependencies: [
+ 'yjs',
+ ],
},
'packages/desktop': {
entry: [
diff --git a/packages/app/src/components/BottomComposer.dom.test.tsx b/packages/app/src/components/BottomComposer.dom.test.tsx
index ed08599be..f123f670d 100644
--- a/packages/app/src/components/BottomComposer.dom.test.tsx
+++ b/packages/app/src/components/BottomComposer.dom.test.tsx
@@ -236,6 +236,13 @@ vi.doMock('@/comments/comment-chips', async () => {
});
const FIRST_SUGGESTION = /Research the extinction of flightless birds/i;
+
+function suggestionShown(): boolean {
+ const phrase = document
+ .querySelector('[data-testid="ask-ai-composer-placeholder"] [data-rotating-placeholder]')
+ ?.getAttribute('data-rotating-placeholder');
+ return FIRST_SUGGESTION.test(phrase ?? '');
+}
const DEFAULT_AGENT_NAME = VISIBLE_TARGETS[0]?.displayName;
const EXPECTED_COMPOSER_POPUP_LABELS = ['composer-mention', 'composer-slash'] as const;
@@ -472,7 +479,7 @@ describe('BottomComposer (shell behavior)', () => {
const restore = stubReducedMotion(true);
try {
await renderComposer();
- expect(screen.getByText(FIRST_SUGGESTION)).toBeTruthy();
+ expect(suggestionShown()).toBe(true);
expect(getInput()).toBeTruthy();
} finally {
restore();
@@ -495,11 +502,11 @@ describe('BottomComposer (shell behavior)', () => {
const restore = stubReducedMotion(true);
try {
await renderComposer();
- expect(screen.getByText(FIRST_SUGGESTION)).toBeTruthy();
+ expect(suggestionShown()).toBe(true);
fireEvent.change(getInput(), { target: { value: 'condense this doc' } });
- expect(screen.queryByText(FIRST_SUGGESTION)).toBeNull();
+ expect(suggestionShown()).toBe(false);
} finally {
restore();
}
diff --git a/packages/app/src/components/BottomComposer.tsx b/packages/app/src/components/BottomComposer.tsx
index 8f8707b44..a94b4dc7d 100644
--- a/packages/app/src/components/BottomComposer.tsx
+++ b/packages/app/src/components/BottomComposer.tsx
@@ -30,6 +30,7 @@ import {
useHandoffDispatch,
} from '@/components/handoff/useHandoffDispatch';
import { useInstalledAgents } from '@/components/handoff/useInstalledAgents';
+import { RotatingComposerPlaceholder } from '@/components/RotatingComposerPlaceholder';
import { Button } from '@/components/ui/button';
import { Spinner } from '@/components/ui/spinner';
import {
@@ -50,7 +51,6 @@ import {
import type { EditorSurface } from '@/editor/selection-stats';
import { useComposerAttachments } from '@/editor/use-composer-attachments';
import { useConflictComposerPrefill } from '@/hooks/use-conflict-composer-prefill';
-import { useReducedMotion } from '@/hooks/use-reduced-motion';
import { useSelectionContext } from '@/hooks/use-selection-context';
import { isDesktopTargetEnabled, isInAppAgentEnabled } from '@/lib/acp/agent-visibility';
import { useEnabledOverrides } from '@/lib/acp/enabled-agents';
@@ -89,8 +89,6 @@ import { nextTouchedFiles } from './composer-touched-files';
import { focusComposerInputOnCardPointer } from './focus-composer-on-card-pointer';
import { usePageList } from './PageListContext';
-const SUGGESTION_HOLD_MS = 5200;
-const SUGGESTION_FADE_MS = 500;
const MARKDOWN_RELATIVE_PATH_EXTENSION = /\.(md|mdx)$/i;
function docNameToComposerRelativePath(docName: string, docExt?: string): string {
@@ -104,31 +102,6 @@ function isNativeTextControl(target: EventTarget | null): boolean {
return tagName === 'INPUT' || tagName === 'TEXTAREA' || tagName === 'SELECT';
}
-function useRotatingSuggestion(
- phrases: readonly string[],
- enabled: boolean,
-): { text: string; visible: boolean } {
- const [index, setIndex] = useState(0);
- const [visible, setVisible] = useState(true);
-
- useEffect(() => {
- if (!enabled) return;
- if (visible) {
- const id = setTimeout(() => setVisible(false), SUGGESTION_HOLD_MS);
- return () => clearTimeout(id);
- }
- const id = setTimeout(() => {
- setIndex((i) => i + 1);
- setVisible(true);
- }, SUGGESTION_FADE_MS);
- return () => clearTimeout(id);
- }, [visible, enabled]);
-
- if (!enabled) return { text: phrases[0] ?? '', visible: true };
- const safeIndex = phrases.length > 0 ? index % phrases.length : 0;
- return { text: phrases[safeIndex] ?? '', visible };
-}
-
const COMPOSER_PORTAL_ATTRIBUTE = 'data-composer-portal';
const COMPOSER_PORTAL_ATTRIBUTES = { [COMPOSER_PORTAL_ATTRIBUTE]: '' } as const;
export const COMPOSER_SUGGESTION_POPUP_LABELS = [
@@ -161,7 +134,6 @@ export function BottomComposer({
const folderMode = folderPath !== undefined;
const activeDocOrNull = folderMode ? null : (docName ?? null);
const effectiveSurface: EditorSurface = surface ?? 'wysiwyg';
- const reduced = useReducedMotion();
const workspace = useWorkspace();
const { pageMeta } = usePageList();
const { states, refresh: refreshInstalledAgents } = useInstalledAgents();
@@ -472,10 +444,6 @@ export function BottomComposer({
t`Create a new spec file for my user story`,
t`Summarize everything I changed this week`,
];
- const suggestion = useRotatingSuggestion(
- suggestions,
- !reduced && isEmpty && !dismissed && !hasQueuedComments,
- );
const handleSelectAgent = (target: TargetData) => {
setSelectedId(target.id);
@@ -886,16 +854,12 @@ export function BottomComposer({
/>
{}
{isEmpty ? (
- <div
- aria-hidden
- className={cn(
- 'pointer-events-none absolute inset-0 flex items-center px-0 py-0 text-base text-muted-foreground/60 md:text-sm',
- !reduced && 'transition-opacity duration-500 ease-in-out',
- suggestion.visible ? 'opacity-100' : 'opacity-0',
- )}
- >
- <span className="min-w-0 truncate">{suggestion.text}</span>
- </div>
+ <RotatingComposerPlaceholder
+ phrases={suggestions}
+ rotating={!hasQueuedComments}
+ className="flex items-center px-0 py-0"
+ testId="ask-ai-composer-placeholder"
+ />
) : null}
</div>
<AgentSplitButton
diff --git a/packages/app/src/components/RotatingComposerPlaceholder.dom.test.tsx b/packages/app/src/components/RotatingComposerPlaceholder.dom.test.tsx
new file mode 100644
index 000000000..e59b688de
--- /dev/null
+++ b/packages/app/src/components/RotatingComposerPlaceholder.dom.test.tsx
@@ -0,0 +1,170 @@
+import { act, cleanup, render, screen } from '@testing-library/react';
+import { afterEach, describe, expect, test, vi } from 'vitest';
+import { SUGGESTION_FADE_MS, SUGGESTION_HOLD_MS } from '@/hooks/use-rotating-suggestion';
+import { expectVisualClassTokens } from '@/test-utils/visual-contract';
+import { RotatingComposerPlaceholder } from './RotatingComposerPlaceholder';
+
+const PHRASES = ['Message Claude', 'Type @ to mention a page'] as const;
+
+function stubReducedMotion(matches: boolean): () => void {
+ const original = window.matchMedia;
+ const stub = ((query: string) => ({
+ matches,
+ media: query,
+ onchange: null,
+ addEventListener: () => {},
+ removeEventListener: () => {},
+ addListener: () => {},
+ removeListener: () => {},
+ dispatchEvent: () => false,
+ })) as unknown as typeof window.matchMedia;
+ window.matchMedia = stub;
+ (globalThis as { matchMedia?: typeof window.matchMedia }).matchMedia = stub;
+ return () => {
+ window.matchMedia = original;
+ (globalThis as { matchMedia?: typeof window.matchMedia }).matchMedia = original;
+ };
+}
+
+function phraseOf(node: HTMLElement): string | null {
+ return (
+ node.querySelector('[data-rotating-placeholder]')?.getAttribute('data-rotating-placeholder') ??
+ null
+ );
+}
+
+afterEach(() => {
+ cleanup();
+ vi.useRealTimers();
+});
+
+describe('RotatingComposerPlaceholder', () => {
+ test('shows the first phrase and stays hidden from assistive tech', () => {
+ render(<RotatingComposerPlaceholder phrases={PHRASES} rotating testId="ph" />);
+
+ const node = screen.getByTestId('ph');
+ expect(phraseOf(node)).toBe('Message Claude');
+ expect(node.getAttribute('aria-hidden')).toBe('true');
+ });
+
+ test('renders nothing when there are no phrases', () => {
+ render(<RotatingComposerPlaceholder phrases={[]} rotating testId="ph" />);
+
+ expect(screen.queryByTestId('ph')).toBeNull();
+ });
+
+ test('advances to the next phrase while rotating', () => {
+ vi.useFakeTimers();
+ render(<RotatingComposerPlaceholder phrases={PHRASES} rotating testId="ph" />);
+
+ act(() => {
+ vi.advanceTimersByTime(SUGGESTION_HOLD_MS);
+ });
+ act(() => {
+ vi.advanceTimersByTime(SUGGESTION_FADE_MS);
+ });
+
+ expect(phraseOf(screen.getByTestId('ph'))).toBe('Type @ to mention a page');
+ });
+
+ test('holds the single phrase when rotating is off', () => {
+ vi.useFakeTimers();
+ render(<RotatingComposerPlaceholder phrases={PHRASES} rotating={false} testId="ph" />);
+
+ act(() => {
+ vi.advanceTimersByTime((SUGGESTION_HOLD_MS + SUGGESTION_FADE_MS) * 3);
+ });
+
+ expect(phraseOf(screen.getByTestId('ph'))).toBe('Message Claude');
+ });
+
+ test('crossfades under reduced motion rather than blanking between phrases', () => {
+ const restore = stubReducedMotion(true);
+ vi.useFakeTimers();
+ try {
+ render(<RotatingComposerPlaceholder phrases={PHRASES} rotating testId="ph" />);
+
+ expectVisualClassTokens(screen.getByTestId('ph').className, ['transition-opacity']);
+
+ act(() => {
+ vi.advanceTimersByTime(SUGGESTION_HOLD_MS);
+ });
+ act(() => {
+ vi.advanceTimersByTime(SUGGESTION_FADE_MS);
+ });
+
+ expect(phraseOf(screen.getByTestId('ph'))).toBe('Type @ to mention a page');
+ } finally {
+ restore();
+ }
+ });
+
+ test('ellipsizes a phrase wider than the composer', () => {
+ render(<RotatingComposerPlaceholder phrases={PHRASES} rotating testId="ph" />);
+
+ const text = screen.getByTestId('ph').querySelector<HTMLElement>('[data-rotating-placeholder]');
+ expect(text?.parentElement).toBe(screen.getByTestId('ph'));
+ expectVisualClassTokens(text?.className ?? '', ['block', 'truncate']);
+ });
+
+ test('restarts at the first phrase when the phrase list changes length', () => {
+ vi.useFakeTimers();
+ const view = render(<RotatingComposerPlaceholder phrases={PHRASES} rotating testId="ph" />);
+
+ act(() => {
+ vi.advanceTimersByTime(SUGGESTION_HOLD_MS);
+ });
+ act(() => {
+ vi.advanceTimersByTime(SUGGESTION_FADE_MS);
+ });
+ expect(phraseOf(screen.getByTestId('ph'))).toBe('Type @ to mention a page');
+
+ view.rerender(
+ <RotatingComposerPlaceholder
+ phrases={[...PHRASES, 'Type / for commands']}
+ rotating
+ testId="ph"
+ />,
+ );
+
+ expect(phraseOf(screen.getByTestId('ph'))).toBe('Message Claude');
+ });
+
+ test('keeps the phrase out of the DOM text so it matches the editor placeholder tone', () => {
+ render(<RotatingComposerPlaceholder phrases={PHRASES} rotating testId="ph" />);
+
+ const node = screen.getByTestId('ph');
+ expect(node.textContent).toBe('');
+ expectVisualClassTokens(node.className, ['text-muted-foreground/60']);
+ });
+
+ test('paints the phrase from its attribute and lets clicks reach the input', () => {
+ render(<RotatingComposerPlaceholder phrases={PHRASES} rotating testId="ph" />);
+
+ const node = screen.getByTestId('ph');
+ const text = node.querySelector<HTMLElement>('[data-rotating-placeholder]');
+ expectVisualClassTokens(node.className, ['pointer-events-none']);
+ expectVisualClassTokens(text?.className ?? '', [
+ 'before:content-[attr(data-rotating-placeholder)]',
+ ]);
+ });
+
+ test('pins the line-height to the composer so text origins align', () => {
+ render(<RotatingComposerPlaceholder phrases={PHRASES} rotating testId="ph" />);
+
+ expectVisualClassTokens(screen.getByTestId('ph').className, ['leading-[1.5]']);
+ });
+
+ test('merges the caller className onto the overlay', () => {
+ render(
+ <RotatingComposerPlaceholder
+ phrases={PHRASES}
+ rotating
+ className="px-2.5 pt-2"
+ testId="ph"
+ />,
+ );
+
+ expectVisualClassTokens(screen.getByTestId('ph').className, ['px-2.5']);
+ });
+});
diff --git a/packages/app/src/components/RotatingComposerPlaceholder.tsx b/packages/app/src/components/RotatingComposerPlaceholder.tsx
new file mode 100644
index 000000000..0a66c6a06
--- /dev/null
+++ b/packages/app/src/components/RotatingComposerPlaceholder.tsx
@@ -0,0 +1,34 @@
+import type { ReactNode } from 'react';
+import { useRotatingSuggestion } from '@/hooks/use-rotating-suggestion';
+import { cn } from '@/lib/utils';
+
+export function RotatingComposerPlaceholder({
+ phrases,
+ rotating,
+ className,
+ testId,
+}: {
+ phrases: readonly string[];
+ rotating: boolean;
+ className?: string;
+ testId?: string;
+}): ReactNode {
+ const { text, visible } = useRotatingSuggestion(phrases, rotating);
+ if (text === '') return null;
+ return (
+ <div
+ aria-hidden
+ data-testid={testId}
+ className={cn(
+ 'pointer-events-none absolute inset-0 text-base leading-[1.5] text-muted-foreground/60 transition-opacity duration-500 ease-in-out md:text-sm',
+ visible ? 'opacity-100' : 'opacity-0',
+ className,
+ )}
+ >
+ <span
+ data-rotating-placeholder={text}
+ className="block min-w-0 truncate before:content-[attr(data-rotating-placeholder)]"
+ />
+ </div>
+ );
+}
diff --git a/packages/app/src/components/acp/ThreadView.composer-placeholder.dom.test.tsx b/packages/app/src/components/acp/ThreadView.composer-placeholder.dom.test.tsx
new file mode 100644
index 000000000..8152b1ffa
--- /dev/null
+++ b/packages/app/src/components/acp/ThreadView.composer-placeholder.dom.test.tsx
@@ -0,0 +1,202 @@
+import type { ThreadInfo } from '@inkeep/open-knowledge-core/acp/thread-protocol';
+import { act, cleanup, render as rtlRender, screen } from '@testing-library/react';
+import { afterEach, describe, expect, test, vi } from 'vitest';
+import { TooltipProvider } from '@/components/ui/tooltip';
+import { SUGGESTION_FADE_MS, SUGGESTION_HOLD_MS } from '@/hooks/use-rotating-suggestion';
+import type { ThreadRenderModel } from '@/lib/acp/thread-event-model';
+import { MockComposerMentionInput } from './composer-mention-input.test-helper';
+
+const render = (ui: Parameters<typeof rtlRender>[0]) => rtlRender(ui, { wrapper: TooltipProvider });
+
+let model: ThreadRenderModel | null = null;
+
+vi.doMock('@/lib/acp/thread-client', () => ({
+ getAgentThreadClient: () => ({
+ respondPermission: () => {},
+ respondRuntimeConsent: () => {},
+ cancel: () => {},
+ prompt: () => {},
+ editQueued: () => {},
+ removeQueued: () => {},
+ setMode: () => {},
+ setConfigOption: () => {},
+ closeThread: () => {},
+ createThread: async () => {
+ throw new Error('unused');
+ },
+ resumeThread: async () => {
+ throw new Error('unused');
+ },
+ }),
+ ThreadChannelUnavailableError: class ThreadChannelUnavailableError extends Error {},
+ ThreadResumeError: class ThreadResumeError extends Error {
+ readonly code: string;
+ constructor(code: string, message: string) {
+ super(message);
+ this.code = code;
+ }
+ },
+ useAgentThread: () => ({ info: undefined, events: [], lastSeq: 5 }),
+ useAgentThreadModel: () => model,
+}));
+
+vi.doMock('@/editor/DocumentContext', () => ({
+ useDocumentContext: () => ({ systemProvider: null }),
+}));
+vi.doMock('@/lib/use-workspace', () => ({ useWorkspace: () => null }));
+vi.doMock('@/components/acp/AgentMarkdown', () => ({
+ AgentMarkdown: ({ text }: { text: string }) => <div>{text}</div>,
+}));
+vi.doMock('@/editor/ComposerMentionInput', () => ({
+ ComposerMentionInput: MockComposerMentionInput,
+}));
+vi.doMock('@/comments/queue-attachment', () => ({ prepareQueuedComments: async () => [] }));
+
+const { ThreadView } = await import('./ThreadView');
+
+function info(overrides?: Partial<ThreadInfo>): ThreadInfo {
+ return {
+ threadId: 'thread-1',
+ agent: { id: 'claude', name: 'Claude Agent', source: 'registry' },
+ title: 'Test thread',
+ status: 'ready',
+ createdAt: 1,
+ lastActivityAt: 2,
+ lastSeq: 5,
+ archived: false,
+ ...overrides,
+ };
+}
+
+function placeholderText(): string {
+ return (
+ screen
+ .getByTestId('agent-thread-composer-placeholder')
+ .querySelector('[data-rotating-placeholder]')
+ ?.getAttribute('data-rotating-placeholder') ?? ''
+ );
+}
+
+function composerDescription(): string | null {
+ const ids = screen.getByTestId('agent-thread-composer').getAttribute('aria-describedby');
+ if (ids === null) return null;
+ return ids
+ .split(' ')
+ .map((id) => document.getElementById(id)?.textContent ?? `<missing ${id}>`)
+ .join(' ');
+}
+
+function advanceOnePhrase(): void {
+ act(() => {
+ vi.advanceTimersByTime(SUGGESTION_HOLD_MS);
+ });
+ act(() => {
+ vi.advanceTimersByTime(SUGGESTION_FADE_MS);
+ });
+}
+
+function collectPhrases(count: number): string[] {
+ const seen = [placeholderText()];
+ for (let i = 1; i < count; i++) {
+ advanceOnePhrase();
+ seen.push(placeholderText());
+ }
+ return seen;
+}
+
+afterEach(() => {
+ cleanup();
+ model = null;
+ vi.useRealTimers();
+});
+
+describe('ACP composer placeholder', () => {
+ test('opens on the plain message prompt once the agent is ready', () => {
+ render(<ThreadView info={info()} />);
+
+ expect(placeholderText()).toBe('Message Claude');
+ });
+
+ test('rotates through the mention hint and back around', () => {
+ vi.useFakeTimers();
+ render(<ThreadView info={info()} />);
+
+ expect(collectPhrases(3)).toEqual([
+ 'Message Claude',
+ "Type '@' to mention a page",
+ 'Message Claude',
+ ]);
+ });
+
+ test('offers the slash hint only when the agent reports commands', () => {
+ vi.useFakeTimers();
+ render(
+ <ThreadView
+ info={info({ availableCommands: [{ name: 'review', description: 'Review the diff' }] })}
+ />,
+ );
+
+ expect(collectPhrases(4)).toEqual([
+ 'Message Claude',
+ "Type '@' to mention a page",
+ "Type '/' for commands",
+ 'Message Claude',
+ ]);
+ });
+
+ test('holds the sign-in prompt instead of rotating while auth is pending', () => {
+ vi.useFakeTimers();
+ render(<ThreadView info={info({ status: 'auth_required' })} />);
+
+ expect(placeholderText()).toBe('Sign in to Claude first');
+
+ advanceOnePhrase();
+
+ expect(placeholderText()).toBe('Sign in to Claude first');
+ });
+
+ test('holds the resume prompt on an archived thread', () => {
+ vi.useFakeTimers();
+ render(<ThreadView info={info({ archived: true })} />);
+
+ expect(placeholderText()).toBe('Pick up where you left off');
+
+ advanceOnePhrase();
+
+ expect(placeholderText()).toBe('Pick up where you left off');
+ });
+
+ test('holds a plain prompt while the agent is still starting', () => {
+ vi.useFakeTimers();
+ render(<ThreadView info={info({ status: 'spawning' })} />);
+
+ expect(placeholderText()).toBe('Message Claude');
+
+ advanceOnePhrase();
+
+ expect(placeholderText()).toBe('Message Claude');
+ });
+
+ test('describes both triggers to assistive tech when the agent reports commands', () => {
+ render(
+ <ThreadView
+ info={info({ availableCommands: [{ name: 'review', description: 'Review the diff' }] })}
+ />,
+ );
+
+ expect(composerDescription()).toBe("Type '@' to mention a page and Type '/' for commands");
+ });
+
+ test('describes only the mention trigger when the agent reports no commands', () => {
+ render(<ThreadView info={info()} />);
+
+ expect(composerDescription()).toBe("Type '@' to mention a page");
+ });
+
+ test('drops the description and its hint text while the composer is not accepting prompts', () => {
+ render(<ThreadView info={info({ status: 'auth_required' })} />);
+
+ expect(composerDescription()).toBeNull();
+ expect(screen.queryByText("Type '@' to mention a page")).toBeNull();
+ });
+});
diff --git a/packages/app/src/components/acp/ThreadView.tsx b/packages/app/src/components/acp/ThreadView.tsx
index 36c688295..2b952ae15 100644
--- a/packages/app/src/components/acp/ThreadView.tsx
+++ b/packages/app/src/components/acp/ThreadView.tsx
@@ -69,6 +69,7 @@ import { isExternalFileDrag } from '@/components/file-tree-adapter';
import { focusComposerInputOnCardPointer } from '@/components/focus-composer-on-card-pointer';
import { requestTerminalLaunch } from '@/components/handoff/terminal-launch-events';
import { useOptionalPageList } from '@/components/PageListContext';
+import { RotatingComposerPlaceholder } from '@/components/RotatingComposerPlaceholder';
import { Badge } from '@/components/ui/badge';
import { Button } from '@/components/ui/button';
import { Dialog, DialogContent, DialogTitle } from '@/components/ui/dialog';
@@ -159,7 +160,7 @@ import { docNameFromHash, filePathToDocName, hashFromDocName } from '@/lib/doc-h
import { dispatchExternalLinkClick } from '@/lib/external-link';
import { isOverlayLayerOpen } from '@/lib/overlay-layers';
import { scheduleClipboardWrite } from '@/lib/share/clipboard-adapter';
-import { formatUnitList } from '@/lib/tool-list-format';
+import { formatToolList, formatUnitList } from '@/lib/tool-list-format';
import { useWorkspace } from '@/lib/use-workspace';
import { cn } from '@/lib/utils';
import { AgentMarkdown } from './AgentMarkdown';
@@ -1547,7 +1548,7 @@ function AgentSettingsPopover({
<Button
type="button"
variant="ghost"
- className="h-6 max-w-48 gap-1 rounded-md pl-1.5 pr-1! text-xs"
+ className="h-7 max-w-48 gap-1 rounded-md pl-1.5 pr-1! text-xs"
aria-label={t`Agent settings`}
aria-disabled
aria-describedby={reasonId}
@@ -1613,7 +1614,7 @@ function AgentSettingsPopover({
<Button
type="button"
variant="ghost"
- className="h-6 min-w-0 max-w-sm shrink gap-1.5 rounded-md pl-1.5 pr-1! text-xs"
+ className="h-7 min-w-0 max-w-sm shrink gap-1.5 rounded-md pl-1.5 pr-1! text-xs"
aria-label={settingsLabel}
data-testid="agent-thread-settings"
>
@@ -3865,7 +3866,7 @@ function ThreadComposer({
onIngestAllFiles: (files: readonly File[]) => Promise<void>;
onRemovePendingAttachment: (index: number) => void;
}): ReactNode {
- const { t } = useLingui();
+ const { t, i18n } = useLingui();
const agentName = agentDisplayName(info.agent.name);
const [isEmpty, setIsEmpty] = useState(true);
@@ -3881,6 +3882,28 @@ function ThreadComposer({
const hasSendableContent = !isEmpty || hasQueuedComments || pendingAttachments.length > 0;
+ const agentHasCommands = (info.availableCommands ?? []).length > 0;
+ const composerHintId = useId();
+ const mentionHint = t`Type '@' to mention a page`;
+ const commandHint = t`Type '/' for commands`;
+ const composerHint = agentHasCommands
+ ? formatToolList([mentionHint, commandHint], i18n.locale)
+ : mentionHint;
+ const placeholderRotating = !archived && status === 'ready';
+ const placeholderPhrases = placeholderRotating
+ ? [t`Message ${agentName}`, mentionHint, ...(agentHasCommands ? [commandHint] : [])]
+ : [
+ archived
+ ? resumePending
+ ? t`Resuming the chat`
+ : t`Pick up where you left off`
+ : status === 'auth_required'
+ ? t`Sign in to ${agentName} first`
+ : status === 'authenticating'
+ ? t`Signing in to ${agentName}`
+ : t`Message ${agentName}`,
+ ];
+
const sendButton = (
<Button
type="button"
@@ -3941,37 +3964,41 @@ function ThreadComposer({
onRemove={onRemovePendingAttachment}
/>
) : null}
- <ComposerMentionInput
- ref={composerRef}
- ariaLabel={t`Message ${agentName}`}
- onEmptyChange={setIsEmpty}
- onSubmit={onSubmit}
- attachmentDrop={{ kind: 'host' }}
- onEscape={() => {
- if (turnActive && !cancelPending) onCancel();
- }}
- placeholder={
- archived
- ? resumePending
- ? t`Resuming the chat`
- : t`Pick up where you left off`
- : status === 'auth_required'
- ? t`Sign in to ${agentName} first`
- : status === 'authenticating'
- ? t`Signing in to ${agentName}`
- : t`Message ${agentName}`
- }
- disabled={composerDisabled}
- slashCommands={info.availableCommands ?? null}
- className={cn(
- 'max-h-40 overflow-y-auto px-2.5 pt-1 text-base md:text-sm',
- composerDisabled && 'opacity-50',
- )}
- testId="agent-thread-composer"
- />
+ <div className="relative">
+ <ComposerMentionInput
+ ref={composerRef}
+ ariaLabel={t`Message ${agentName}`}
+ ariaDescribedBy={placeholderRotating ? composerHintId : undefined}
+ onEmptyChange={setIsEmpty}
+ onSubmit={onSubmit}
+ attachmentDrop={{ kind: 'host' }}
+ onEscape={() => {
+ if (turnActive && !cancelPending) onCancel();
+ }}
+ disabled={composerDisabled}
+ slashCommands={info.availableCommands ?? null}
+ className={cn(
+ 'max-h-40 overflow-y-auto px-2.5 pt-1 text-base md:text-sm',
+ composerDisabled && 'opacity-50',
+ )}
+ testId="agent-thread-composer"
+ />
+ {placeholderRotating ? (
+ <span id={composerHintId} className="sr-only">
+ {composerHint}
+ </span>
+ ) : null}
+ {isEmpty ? (
+ <RotatingComposerPlaceholder
+ phrases={placeholderPhrases}
+ rotating={placeholderRotating}
+ className={cn('px-2.5 pt-2', composerDisabled && 'opacity-50')}
+ testId="agent-thread-composer-placeholder"
+ />
+ ) : null}
+ </div>
{}
- <div className="flex items-center gap-2 px-1.5 pt-1 pb-1.5">
- <AgentSettingsPopover info={info} hasStartedWork={hasStartedWork} onNewChat={onNewChat} />
+ <div className="flex items-center gap-0.5 px-1.5 pt-1 pb-1.5">
<AttachFilesButton
testId="agent-thread-attach-files"
onFiles={onIngestAllFiles}
@@ -3981,6 +4008,7 @@ function ThreadComposer({
info.promptCapabilities.embeddedContext !== true
}
/>
+ <AgentSettingsPopover info={info} hasStartedWork={hasStartedWork} onNewChat={onNewChat} />
<div className="ml-auto flex items-center gap-1.5">
{usagePercent !== null && usage?.used !== undefined && usage?.size !== undefined ? (
<ContextUsageRing used={usage.used} size={usage.size} percent={usagePercent} />
diff --git a/packages/app/src/components/acp/composer-mention-input.test-helper.tsx b/packages/app/src/components/acp/composer-mention-input.test-helper.tsx
index 25c2e3bac..6b3835f07 100644
--- a/packages/app/src/components/acp/composer-mention-input.test-helper.tsx
+++ b/packages/app/src/components/acp/composer-mention-input.test-helper.tsx
@@ -5,6 +5,7 @@ import type { ComposerMentionInputHandle } from '@/editor/ComposerMentionInput';
export function MockComposerMentionInput({
ref,
ariaLabel,
+ ariaDescribedBy,
onEmptyChange,
onContentChange,
onSubmit,
@@ -16,6 +17,7 @@ export function MockComposerMentionInput({
}: {
ref?: Ref<ComposerMentionInputHandle>;
ariaLabel: string;
+ ariaDescribedBy?: string;
onEmptyChange: (isEmpty: boolean) => void;
onContentChange?: (doc: JSONContent) => void;
onSubmit: () => void;
@@ -73,6 +75,7 @@ export function MockComposerMentionInput({
<textarea
ref={localRef}
aria-label={ariaLabel}
+ aria-describedby={ariaDescribedBy}
placeholder={placeholder}
disabled={disabled}
data-testid={testId}
diff --git a/packages/app/src/editor/ComposerMentionInput.dom.test.tsx b/packages/app/src/editor/ComposerMentionInput.dom.test.tsx
index 0a714b0cc..3ca48e44f 100644
--- a/packages/app/src/editor/ComposerMentionInput.dom.test.tsx
+++ b/packages/app/src/editor/ComposerMentionInput.dom.test.tsx
@@ -265,6 +265,41 @@ describe('ComposerMentionInput (component)', () => {
expect(mentions).toEqual(['notes.md']);
});
+ test('points the textbox at its description and drops the reference when it is cleared', () => {
+ const { rerender } = render(
+ <ComposerMentionInput
+ attachmentDrop={{ kind: 'host' }}
+ ariaLabel="Message Claude"
+ ariaDescribedBy="hint-a hint-b"
+ onEmptyChange={() => {}}
+ onSubmit={() => {}}
+ />,
+ );
+ const box = screen.getByRole('textbox', { name: 'Message Claude' });
+ expect(box.getAttribute('aria-describedby')).toBe('hint-a hint-b');
+
+ rerender(
+ <ComposerMentionInput
+ attachmentDrop={{ kind: 'host' }}
+ ariaLabel="Message Claude"
+ onEmptyChange={() => {}}
+ onSubmit={() => {}}
+ />,
+ );
+ expect(box.hasAttribute('aria-describedby')).toBe(false);
+
+ rerender(
+ <ComposerMentionInput
+ attachmentDrop={{ kind: 'host' }}
+ ariaLabel="Message Claude"
+ ariaDescribedBy="hint-a"
+ onEmptyChange={() => {}}
+ onSubmit={() => {}}
+ />,
+ );
+ expect(box.getAttribute('aria-describedby')).toBe('hint-a');
+ });
+
test('disabled turns off editing but keeps content, placeholder, and the handle', () => {
const ref = createRef<ComposerMentionInputHandle>();
const { rerender } = render(
diff --git a/packages/app/src/editor/ComposerMentionInput.tsx b/packages/app/src/editor/ComposerMentionInput.tsx
index 7b840761a..f4d65bc54 100644
--- a/packages/app/src/editor/ComposerMentionInput.tsx
+++ b/packages/app/src/editor/ComposerMentionInput.tsx
@@ -66,6 +66,7 @@ function textToParagraphs(text: string): JSONContent[] {
export function ComposerMentionInput({
ref,
ariaLabel,
+ ariaDescribedBy,
onEmptyChange,
onContentChange,
onMentionsChange,
@@ -81,6 +82,7 @@ export function ComposerMentionInput({
}: {
ref?: Ref<ComposerMentionInputHandle>;
ariaLabel: string;
+ ariaDescribedBy?: string;
onEmptyChange: (isEmpty: boolean) => void;
onContentChange?: (doc: JSONContent) => void;
onMentionsChange?: (mentions: string[]) => void;
@@ -130,6 +132,7 @@ export function ComposerMentionInput({
attributes: {
role: 'textbox',
'aria-label': ariaLabel,
+ ...(ariaDescribedBy !== undefined ? { 'aria-describedby': ariaDescribedBy } : {}),
'aria-multiline': 'true',
...(testId !== undefined ? { 'data-testid': testId } : {}),
class: cn('composer-prosemirror py-1 outline-none'),
@@ -177,8 +180,10 @@ export function ComposerMentionInput({
const view = (editor as unknown as { editorView?: ComposerEditorView }).editorView;
if (!view) return;
view.dom.setAttribute('aria-label', ariaLabel ?? '');
+ if (ariaDescribedBy === undefined) view.dom.removeAttribute('aria-describedby');
+ else view.dom.setAttribute('aria-describedby', ariaDescribedBy);
view.dispatch(editor.state.tr.setMeta('addToHistory', false));
- }, [editor, placeholder, ariaLabel]);
+ }, [editor, placeholder, ariaLabel, ariaDescribedBy]);
useEffect(() => {
if (!editor || editor.isDestroyed) return;
diff --git a/packages/app/src/hooks/use-rotating-suggestion.dom.test.tsx b/packages/app/src/hooks/use-rotating-suggestion.dom.test.tsx
new file mode 100644
index 000000000..10452dafb
--- /dev/null
+++ b/packages/app/src/hooks/use-rotating-suggestion.dom.test.tsx
@@ -0,0 +1,132 @@
+import { act, cleanup, render, screen } from '@testing-library/react';
+import { useLayoutEffect } from 'react';
+import { afterEach, describe, expect, test, vi } from 'vitest';
+import {
+ SUGGESTION_FADE_MS,
+ SUGGESTION_HOLD_MS,
+ useRotatingSuggestion,
+} from './use-rotating-suggestion';
+
+const PHRASES = ['first', 'second', 'third'] as const;
+
+function Probe({ phrases, enabled }: { phrases: readonly string[]; enabled: boolean }) {
+ const { text, visible } = useRotatingSuggestion(phrases, enabled);
+ return (
+ <span data-testid="probe" data-visible={visible ? 'yes' : 'no'}>
+ {text}
+ </span>
+ );
+}
+
+function CommitRecorder({ phrases, commits }: { phrases: readonly string[]; commits: string[] }) {
+ const { text } = useRotatingSuggestion(phrases, true);
+ useLayoutEffect(() => {
+ commits.push(text);
+ });
+ return null;
+}
+
+function probe(): HTMLElement {
+ return screen.getByTestId('probe');
+}
+
+function advance(ms: number): void {
+ act(() => {
+ vi.advanceTimersByTime(ms);
+ });
+}
+
+function advanceOneCycle(): void {
+ advance(SUGGESTION_HOLD_MS);
+ advance(SUGGESTION_FADE_MS);
+}
+
+afterEach(() => {
+ cleanup();
+ vi.useRealTimers();
+});
+
+describe('useRotatingSuggestion', () => {
+ test('holds the first phrase and never advances when disabled', () => {
+ vi.useFakeTimers();
+ render(<Probe phrases={PHRASES} enabled={false} />);
+
+ expect(probe().textContent).toBe('first');
+ expect(probe().dataset.visible).toBe('yes');
+
+ advance(SUGGESTION_HOLD_MS * 4);
+
+ expect(probe().textContent).toBe('first');
+ expect(probe().dataset.visible).toBe('yes');
+ });
+
+ test('fades out after the hold, then swaps to the next phrase', () => {
+ vi.useFakeTimers();
+ render(<Probe phrases={PHRASES} enabled />);
+
+ expect(probe().textContent).toBe('first');
+
+ advance(SUGGESTION_HOLD_MS);
+
+ expect(probe().dataset.visible).toBe('no');
+ expect(probe().textContent).toBe('first');
+
+ advance(SUGGESTION_FADE_MS);
+
+ expect(probe().dataset.visible).toBe('yes');
+ expect(probe().textContent).toBe('second');
+ });
+
+ test('wraps back to the first phrase past the end of the list', () => {
+ vi.useFakeTimers();
+ render(<Probe phrases={PHRASES} enabled />);
+
+ advanceOneCycle();
+ advanceOneCycle();
+
+ expect(probe().textContent).toBe('third');
+
+ advanceOneCycle();
+
+ expect(probe().textContent).toBe('first');
+ });
+
+ test('never commits a stale-index phrase when the list changes length', () => {
+ vi.useFakeTimers();
+ const commits: string[] = [];
+ const two = ['first', 'second'] as const;
+ const view = render(<CommitRecorder phrases={two} commits={commits} />);
+
+ advanceOneCycle();
+ expect(commits.at(-1)).toBe('second');
+
+ commits.length = 0;
+ view.rerender(<CommitRecorder phrases={PHRASES} commits={commits} />);
+
+ expect(commits).toEqual(['first']);
+ });
+
+ test('resumes from the first phrase after the component remounts', () => {
+ vi.useFakeTimers();
+ const view = render(<Probe phrases={PHRASES} enabled />);
+
+ advanceOneCycle();
+ expect(probe().textContent).toBe('second');
+
+ view.unmount();
+ render(<Probe phrases={PHRASES} enabled />);
+
+ expect(probe().textContent).toBe('first');
+ });
+
+ test('renders empty text for an empty phrase list', () => {
+ vi.useFakeTimers();
+ render(<Probe phrases={[]} enabled />);
+
+ expect(probe().textContent).toBe('');
+
+ advanceOneCycle();
+
+ expect(probe().textContent).toBe('');
+ });
+});
diff --git a/packages/app/src/hooks/use-rotating-suggestion.ts b/packages/app/src/hooks/use-rotating-suggestion.ts
new file mode 100644
index 000000000..b40b97fe0
--- /dev/null
+++ b/packages/app/src/hooks/use-rotating-suggestion.ts
@@ -0,0 +1,35 @@
+import { useEffect, useState } from 'react';
+
+export const SUGGESTION_HOLD_MS = 5200;
+export const SUGGESTION_FADE_MS = 500;
+
+export function useRotatingSuggestion(
+ phrases: readonly string[],
+ enabled: boolean,
+): { text: string; visible: boolean } {
+ const [index, setIndex] = useState(0);
+ const [visible, setVisible] = useState(true);
+ const [phraseCount, setPhraseCount] = useState(phrases.length);
+ if (phraseCount !== phrases.length) {
+ setPhraseCount(phrases.length);
+ setIndex(0);
+ setVisible(true);
+ }
+
+ useEffect(() => {
+ if (!enabled) return;
+ if (visible) {
+ const id = setTimeout(() => setVisible(false), SUGGESTION_HOLD_MS);
+ return () => clearTimeout(id);
+ }
+ const id = setTimeout(() => {
+ setIndex((i) => i + 1);
+ setVisible(true);
+ }, SUGGESTION_FADE_MS);
+ return () => clearTimeout(id);
+ }, [visible, enabled]);
+
+ if (!enabled) return { text: phrases[0] ?? '', visible: true };
+ const safeIndex = phrases.length > 0 ? index % phrases.length : 0;
+ return { text: phrases[safeIndex] ?? '', visible };
+}
diff --git a/packages/app/src/locales/ar/messages.json b/packages/app/src/locales/ar/messages.json
index 203788fd9..01f25df20 100644
--- a/packages/app/src/locales/ar/messages.json
+++ b/packages/app/src/locales/ar/messages.json
@@ -2099,6 +2099,7 @@
"LJeFU6": [
"شغّل OpenKnowledge من أي طرفية — <0>ok</0> يفتح مشروعًا، و<1>ok init</1> يربط وكلاءك."
],
+ "LK83k1": ["اكتب '@' للإشارة إلى صفحة"],
"LKIPzv": [
[
"laterEdits",
diff --git a/packages/app/src/locales/ar/messages.po b/packages/app/src/locales/ar/messages.po
index 497172dc6..241eff69c 100644
--- a/packages/app/src/locales/ar/messages.po
+++ b/packages/app/src/locales/ar/messages.po
@@ -15229,6 +15229,11 @@ msgstr "صفحتان (فردي)"
msgid "Type"
msgstr "النوع"
+#: src/components/acp/ThreadView.tsx
+msgid "Type '@' to mention a page"
+msgstr "اكتب '@' للإشارة إلى صفحة"
+
+#: src/components/acp/ThreadView.tsx
#: src/editor/TiptapEditor.tsx
msgid "Type '/' for commands"
msgstr "اكتب '/' لعرض الأوامر"
diff --git a/packages/app/src/locales/bn/messages.json b/packages/app/src/locales/bn/messages.json
index 15b1227f8..98c3c74f8 100644
--- a/packages/app/src/locales/bn/messages.json
+++ b/packages/app/src/locales/bn/messages.json
@@ -1781,6 +1781,7 @@
"LJeFU6": [
"যেকোনো টার্মিনাল থেকে OpenKnowledge চালু করুন — <0>ok</0> প্রকল্প খোলে, <1>ok init</1> আপনার এজেন্ট যুক্ত করে।"
],
+ "LK83k1": ["একটি পাতা উল্লেখ করতে '@' টাইপ করুন"],
"LKIPzv": [
[
"laterEdits",
diff --git a/packages/app/src/locales/bn/messages.po b/packages/app/src/locales/bn/messages.po
index e31cbed0a..ecca76559 100644
--- a/packages/app/src/locales/bn/messages.po
+++ b/packages/app/src/locales/bn/messages.po
@@ -15225,6 +15225,11 @@ msgstr "দুই পাতা (বিজোড়)"
msgid "Type"
msgstr "ধরন"
+#: src/components/acp/ThreadView.tsx
+msgid "Type '@' to mention a page"
+msgstr "একটি পাতা উল্লেখ করতে '@' টাইপ করুন"
+
+#: src/components/acp/ThreadView.tsx
#: src/editor/TiptapEditor.tsx
msgid "Type '/' for commands"
msgstr "কমান্ড দেখতে '/' টাইপ করুন"
diff --git a/packages/app/src/locales/en/messages.json b/packages/app/src/locales/en/messages.json
index f7d750f96..7e54739c4 100644
--- a/packages/app/src/locales/en/messages.json
+++ b/packages/app/src/locales/en/messages.json
@@ -1839,6 +1839,7 @@
"LJeFU6": [
"Launch OpenKnowledge from any terminal — <0>ok</0> opens a project, <1>ok init</1> connects your agents."
],
+ "LK83k1": ["Type '@' to mention a page"],
"LKIPzv": [
[
"laterEdits",
diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.po
index 65ee2ed55..c27b254c9 100644
--- a/packages/app/src/locales/en/messages.po
+++ b/packages/app/src/locales/en/messages.po
@@ -15229,6 +15229,11 @@ msgstr "Two-page (odd)"
msgid "Type"
msgstr "Type"
+#: src/components/acp/ThreadView.tsx
+msgid "Type '@' to mention a page"
+msgstr "Type '@' to mention a page"
+
+#: src/components/acp/ThreadView.tsx
#: src/editor/TiptapEditor.tsx
msgid "Type '/' for commands"
msgstr "Type '/' for commands"
diff --git a/packages/app/src/locales/es/messages.json b/packages/app/src/locales/es/messages.json
index dcf90ab37..fc2ee4cf8 100644
--- a/packages/app/src/locales/es/messages.json
+++ b/packages/app/src/locales/es/messages.json
@@ -2143,6 +2143,7 @@
"LJeFU6": [
"Inicia OpenKnowledge desde cualquier terminal: <0>ok</0> abre un proyecto y <1>ok init</1> conecta tus agentes."
],
+ "LK83k1": ["Escribe '@' para mencionar una página"],
"LKIPzv": [
[
"laterEdits",
diff --git a/packages/app/src/locales/es/messages.po b/packages/app/src/locales/es/messages.po
index 53e2a8423..58f3dc09e 100644
--- a/packages/app/src/locales/es/messages.po
+++ b/packages/app/src/locales/es/messages.po
@@ -15229,6 +15229,11 @@ msgstr "Dos páginas (impares)"
msgid "Type"
msgstr "Tipo"
+#: src/components/acp/ThreadView.tsx
+msgid "Type '@' to mention a page"
+msgstr "Escribe '@' para mencionar una página"
+
+#: src/components/acp/ThreadView.tsx
#: src/editor/TiptapEditor.tsx
msgid "Type '/' for commands"
msgstr "Escribe '/' para ver los comandos"
diff --git a/packages/app/src/locales/fr/messages.json b/packages/app/src/locales/fr/messages.json
index b53cdb0da..df023316c 100644
--- a/packages/app/src/locales/fr/messages.json
+++ b/packages/app/src/locales/fr/messages.json
@@ -2186,6 +2186,7 @@
"LJeFU6": [
"Lancez OpenKnowledge depuis n'importe quel terminal : <0>ok</0> ouvre un projet, <1>ok init</1> connecte vos agents."
],
+ "LK83k1": ["Tapez '@' pour mentionner une page"],
"LKIPzv": [
[
"laterEdits",
diff --git a/packages/app/src/locales/fr/messages.po b/packages/app/src/locales/fr/messages.po
index 0af55741b..04805371f 100644
--- a/packages/app/src/locales/fr/messages.po
+++ b/packages/app/src/locales/fr/messages.po
@@ -15229,6 +15229,11 @@ msgstr "Deux pages (impaires)"
msgid "Type"
msgstr "Type"
+#: src/components/acp/ThreadView.tsx
+msgid "Type '@' to mention a page"
+msgstr "Tapez '@' pour mentionner une page"
+
+#: src/components/acp/ThreadView.tsx
#: src/editor/TiptapEditor.tsx
msgid "Type '/' for commands"
msgstr "Tapez « / » pour afficher les commandes"
diff --git a/packages/app/src/locales/hi/messages.json b/packages/app/src/locales/hi/messages.json
index e230f831f..e585a8d6e 100644
--- a/packages/app/src/locales/hi/messages.json
+++ b/packages/app/src/locales/hi/messages.json
@@ -1784,6 +1784,7 @@
"LJeFU6": [
"OpenKnowledge को किसी भी टर्मिनल से चलाएँ — <0>ok</0> प्रोजेक्ट खोलता है, <1>ok init</1> आपके एजेंट जोड़ता है।"
],
+ "LK83k1": ["किसी पेज का उल्लेख करने के लिए '@' लिखें"],
"LKIPzv": [
[
"laterEdits",
diff --git a/packages/app/src/locales/hi/messages.po b/packages/app/src/locales/hi/messages.po
index 0ff61dacb..743a52097 100644
--- a/packages/app/src/locales/hi/messages.po
+++ b/packages/app/src/locales/hi/messages.po
@@ -15225,6 +15225,11 @@ msgstr "दो पेज (विषम)"
msgid "Type"
msgstr "प्रकार"
+#: src/components/acp/ThreadView.tsx
+msgid "Type '@' to mention a page"
+msgstr "किसी पेज का उल्लेख करने के लिए '@' लिखें"
+
+#: src/components/acp/ThreadView.tsx
#: src/editor/TiptapEditor.tsx
msgid "Type '/' for commands"
msgstr "कमांड देखने के लिए '/' टाइप करें"
diff --git a/packages/app/src/locales/id/messages.json b/packages/app/src/locales/id/messages.json
index 6c6c56760..8b26ad101 100644
--- a/packages/app/src/locales/id/messages.json
+++ b/packages/app/src/locales/id/messages.json
@@ -1878,6 +1878,7 @@
"LJeFU6": [
"Jalankan OpenKnowledge dari terminal mana pun — <0>ok</0> membuka proyek, <1>ok init</1> menghubungkan agen Anda."
],
+ "LK83k1": ["Ketik '@' untuk menyebut halaman"],
"LKIPzv": [
[
"laterEdits",
diff --git a/packages/app/src/locales/id/messages.po b/packages/app/src/locales/id/messages.po
index 2f74a7ec1..9911cb190 100644
--- a/packages/app/src/locales/id/messages.po
+++ b/packages/app/src/locales/id/messages.po
@@ -15225,6 +15225,11 @@ msgstr "Dua halaman (ganjil)"
msgid "Type"
msgstr "Tipe"
+#: src/components/acp/ThreadView.tsx
+msgid "Type '@' to mention a page"
+msgstr "Ketik '@' untuk menyebut halaman"
+
+#: src/components/acp/ThreadView.tsx
#: src/editor/TiptapEditor.tsx
msgid "Type '/' for commands"
msgstr "Ketik '/' untuk melihat perintah"
diff --git a/packages/app/src/locales/ko/messages.json b/packages/app/src/locales/ko/messages.json
index 915813f8c..92d523483 100644
--- a/packages/app/src/locales/ko/messages.json
+++ b/packages/app/src/locales/ko/messages.json
@@ -1798,6 +1798,7 @@
"LJeFU6": [
"어떤 터미널에서든 OpenKnowledge를 실행하세요 — <0>ok</0>는 프로젝트를 열고, <1>ok init</1>은 에이전트를 연결합니다."
],
+ "LK83k1": ["페이지를 언급하려면 '@' 입력"],
"LKIPzv": [
["laterEdits", "plural", { "other": ["이 파일의 최신 편집 ", "#", "개를 제거합니다."] }]
],
diff --git a/packages/app/src/locales/ko/messages.po b/packages/app/src/locales/ko/messages.po
index 98e3546ec..b57ea38e5 100644
--- a/packages/app/src/locales/ko/messages.po
+++ b/packages/app/src/locales/ko/messages.po
@@ -15229,6 +15229,11 @@ msgstr "두 페이지 (홀수)"
msgid "Type"
msgstr "유형"
+#: src/components/acp/ThreadView.tsx
+msgid "Type '@' to mention a page"
+msgstr "페이지를 언급하려면 '@' 입력"
+
+#: src/components/acp/ThreadView.tsx
#: src/editor/TiptapEditor.tsx
msgid "Type '/' for commands"
msgstr "명령을 사용하려면 '/' 입력"
diff --git a/packages/app/src/locales/pseudo/messages.json b/packages/app/src/locales/pseudo/messages.json
index 0d79148d6..da1f33814 100644
--- a/packages/app/src/locales/pseudo/messages.json
+++ b/packages/app/src/locales/pseudo/messages.json
@@ -1839,6 +1839,7 @@
"LJeFU6": [
"Ĺàũńćĥ ŌƥēńĶńōŵĺēďĝē ƒŕōḿ àńŷ ţēŕḿĩńàĺ — <0>ōķ</0> ōƥēńś à ƥŕōĴēćţ, <1>ōķ ĩńĩţ</1> ćōńńēćţś ŷōũŕ àĝēńţś."
],
+ "LK83k1": ["Ţŷƥē '@' ţō ḿēńţĩōń à ƥàĝē"],
"LKIPzv": [
[
"laterEdits",
diff --git a/packages/app/src/locales/pseudo/messages.po b/packages/app/src/locales/pseudo/messages.po
index dbedf75ac..654f8095f 100644
--- a/packages/app/src/locales/pseudo/messages.po
+++ b/packages/app/src/locales/pseudo/messages.po
@@ -15225,6 +15225,11 @@ msgstr ""
msgid "Type"
msgstr ""
+#: src/components/acp/ThreadView.tsx
+msgid "Type '@' to mention a page"
+msgstr ""
+
+#: src/components/acp/ThreadView.tsx
#: src/editor/TiptapEditor.tsx
msgid "Type '/' for commands"
msgstr ""
diff --git a/packages/app/src/locales/pt-BR/messages.json b/packages/app/src/locales/pt-BR/messages.json
index 2e8244b70..6a439cca2 100644
--- a/packages/app/src/locales/pt-BR/messages.json
+++ b/packages/app/src/locales/pt-BR/messages.json
@@ -2116,6 +2116,7 @@
"LJeFU6": [
"Inicie o OpenKnowledge de qualquer terminal: <0>ok</0> abre um projeto e <1>ok init</1> conecta seus agentes."
],
+ "LK83k1": ["Digite '@' para mencionar uma página"],
"LKIPzv": [
[
"laterEdits",
diff --git a/packages/app/src/locales/pt-BR/messages.po b/packages/app/src/locales/pt-BR/messages.po
index 88753edeb..5457c8986 100644
--- a/packages/app/src/locales/pt-BR/messages.po
+++ b/packages/app/src/locales/pt-BR/messages.po
@@ -15225,6 +15225,11 @@ msgstr "Duas páginas (ímpares)"
msgid "Type"
msgstr "Tipo"
+#: src/components/acp/ThreadView.tsx
+msgid "Type '@' to mention a page"
+msgstr "Digite '@' para mencionar uma página"
+
+#: src/components/acp/ThreadView.tsx
#: src/editor/TiptapEditor.tsx
msgid "Type '/' for commands"
msgstr "Digite '/' para ver os comandos"
diff --git a/packages/app/src/locales/ur/messages.json b/packages/app/src/locales/ur/messages.json
index 668128e69..483c7062b 100644
--- a/packages/app/src/locales/ur/messages.json
+++ b/packages/app/src/locales/ur/messages.json
@@ -1882,6 +1882,7 @@
"LJeFU6": [
"OpenKnowledge کو کسی بھی ٹرمینل سے چلائیں — <0>ok</0> پروجیکٹ کھولتا ہے، <1>ok init</1> آپ کے ایجنٹس کو جوڑتا ہے۔"
],
+ "LK83k1": ["کسی صفحہ کا حوالہ دینے کے لیے '@' ٹائپ کریں"],
"LKIPzv": [
[
"laterEdits",
diff --git a/packages/app/src/locales/ur/messages.po b/packages/app/src/locales/ur/messages.po
index e9232abb4..cccd8e317 100644
--- a/packages/app/src/locales/ur/messages.po
+++ b/packages/app/src/locales/ur/messages.po
@@ -15229,6 +15229,11 @@ msgstr "دو صفحے (طاق)"
msgid "Type"
msgstr "قسم"
+#: src/components/acp/ThreadView.tsx
+msgid "Type '@' to mention a page"
+msgstr "کسی صفحہ کا حوالہ دینے کے لیے '@' ٹائپ کریں"
+
+#: src/components/acp/ThreadView.tsx
#: src/editor/TiptapEditor.tsx
msgid "Type '/' for commands"
msgstr "کمانڈز دیکھنے کے لیے '/' ٹائپ کریں"
diff --git a/packages/app/src/locales/zh-Hans/messages.json b/packages/app/src/locales/zh-Hans/messages.json
index 4519035a9..3c8969b99 100644
--- a/packages/app/src/locales/zh-Hans/messages.json
+++ b/packages/app/src/locales/zh-Hans/messages.json
@@ -1608,6 +1608,7 @@
"LJeFU6": [
"在任意终端中启动 OpenKnowledge——<0>ok</0> 打开项目,<1>ok init</1> 连接你的智能体。"
],
+ "LK83k1": ["输入“@”提及页面"],
"LKIPzv": [
["laterEdits", "plural", { "other": ["会移除这个文件上 ", "#", " 处较新的编辑。"] }]
],
diff --git a/packages/app/src/locales/zh-Hans/messages.po b/packages/app/src/locales/zh-Hans/messages.po
index 64c82f9df..75adba2f0 100644
--- a/packages/app/src/locales/zh-Hans/messages.po
+++ b/packages/app/src/locales/zh-Hans/messages.po
@@ -15229,6 +15229,11 @@ msgstr "双页(奇数)"
msgid "Type"
msgstr "类型"
+#: src/components/acp/ThreadView.tsx
+msgid "Type '@' to mention a page"
+msgstr "输入“@”提及页面"
+
+#: src/components/acp/ThreadView.tsx
#: src/editor/TiptapEditor.tsx
msgid "Type '/' for commands"
msgstr "输入“/”打开命令"
diff --git a/packages/app/src/locales/zh-Hant/messages.json b/packages/app/src/locales/zh-Hant/messages.json
index d716b782e..7fe6c2e94 100644
--- a/packages/app/src/locales/zh-Hant/messages.json
+++ b/packages/app/src/locales/zh-Hant/messages.json
@@ -1620,6 +1620,7 @@
"LJeFU6": [
"在任何終端機中啟動 OpenKnowledge——<0>ok</0> 開啟專案,<1>ok init</1> 連接你的智慧代理。"
],
+ "LK83k1": ["輸入「@」提及頁面"],
"LKIPzv": [
["laterEdits", "plural", { "other": ["會移除這個檔案上 ", "#", " 處較新的編輯。"] }]
],
diff --git a/packages/app/src/locales/zh-Hant/messages.po b/packages/app/src/locales/zh-Hant/messages.po
index 56ebf7cdc..90d9155e3 100644
--- a/packages/app/src/locales/zh-Hant/messages.po
+++ b/packages/app/src/locales/zh-Hant/messages.po
@@ -15229,6 +15229,11 @@ msgstr "雙頁(奇數)"
msgid "Type"
msgstr "類型"
+#: src/components/acp/ThreadView.tsx
+msgid "Type '@' to mention a page"
+msgstr "輸入「@」提及頁面"
+
+#: src/components/acp/ThreadView.tsx
#: src/editor/TiptapEditor.tsx
msgid "Type '/' for commands"
msgstr "輸入「/」開啟命令"
diff --git a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
index 8a60e5826..a28cc2b18 100644
--- a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
+++ b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
@@ -1,3 +1,4 @@
+
import { readFileSync } from 'node:fs';
import { join } from 'node:path';
import { setTimeout as wait } from 'node:timers/promises';
diff --git a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
index 6fcdc23f2..4fc2c11f9 100644
--- a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
+++ b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
@@ -1,3 +1,4 @@
+
import { setTimeout as wait } from 'node:timers/promises';
import { normalizeBridge } from '@inkeep/open-knowledge-core';
import { updateYFragment } from '@tiptap/y-tiptap';
diff --git a/packages/app/tests/integration/interior-edit-freshness.test.ts b/packages/app/tests/integration/interior-edit-freshness.test.ts
index 40b5cdfd6..9f2f6feb6 100644
--- a/packages/app/tests/integration/interior-edit-freshness.test.ts
+++ b/packages/app/tests/integration/interior-edit-freshness.test.ts
@@ -1,3 +1,4 @@
+
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
index 93666af70..2a085742b 100644
--- a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
+++ b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
@@ -1,3 +1,4 @@
+
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/producer-guard-wiring.test.ts b/packages/app/tests/integration/producer-guard-wiring.test.ts
index 867598d34..878d5196b 100644
--- a/packages/app/tests/integration/producer-guard-wiring.test.ts
+++ b/packages/app/tests/integration/producer-guard-wiring.test.ts
@@ -1,3 +1,4 @@
+
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
index 0970ac12f..4ada3cf26 100644
--- a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
+++ b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
@@ -1,3 +1,4 @@
+
import { randomUUID } from 'node:crypto';
import { afterEach, describe, expect, test } from 'vitest';
import { agentWriteMd, createTestServer, type TestServer } from './test-harness';
diff --git a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
index b632185e1..cbe2b705f 100644
--- a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
+++ b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
@@ -1,3 +1,4 @@
+
import { execFileSync } from 'node:child_process';
import { randomUUID } from 'node:crypto';
import { join } from 'node:path';
diff --git a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
index c530ce4ba..89bc9b4d9 100644
--- a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
+++ b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
@@ -1,3 +1,4 @@
+
import { randomUUID } from 'node:crypto';
import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
import type * as Y from 'yjs';
diff --git a/packages/app/tests/integration/undo-after-rollback.test.ts b/packages/app/tests/integration/undo-after-rollback.test.ts
index d3767adc9..a78aeb0e4 100644
--- a/packages/app/tests/integration/undo-after-rollback.test.ts
+++ b/packages/app/tests/integration/undo-after-rollback.test.ts
@@ -1,3 +1,4 @@
+
import { ROLLBACK_ORIGIN } from '@inkeep/open-knowledge-server';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
import * as Y from 'yjs';
diff --git a/packages/app/tests/integration/undo-recycle-reset.test.ts b/packages/app/tests/integration/undo-recycle-reset.test.ts
index b076f955c..e7cc69c3f 100644
--- a/packages/app/tests/integration/undo-recycle-reset.test.ts
+++ b/packages/app/tests/integration/undo-recycle-reset.test.ts
@@ -1,3 +1,4 @@
+
import { writeFileSync } from 'node:fs';
import { join } from 'node:path';
import { setTimeout as wait } from 'node:timers/promises';
diff --git a/packages/app/tests/integration/undo-rederive-survival.test.ts b/packages/app/tests/integration/undo-rederive-survival.test.ts
index 7935e35f8..9ddcd0730 100644
--- a/packages/app/tests/integration/undo-rederive-survival.test.ts
+++ b/packages/app/tests/integration/undo-rederive-survival.test.ts
@@ -1,3 +1,4 @@
+
import { prependFrontmatter } from '@inkeep/open-knowledge-core';
import { Plugin, PluginKey } from '@tiptap/pm/state';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
diff --git a/packages/app/tests/stress/composer-control-alignment.e2e.ts b/packages/app/tests/stress/composer-control-alignment.e2e.ts
index af72e53b0..8581554d8 100644
--- a/packages/app/tests/stress/composer-control-alignment.e2e.ts
+++ b/packages/app/tests/stress/composer-control-alignment.e2e.ts
@@ -1,11 +1,13 @@
import { randomUUID } from 'node:crypto';
-import { acpCatalogBody, expect, test } from './_helpers';
+import type { Page } from '@playwright/test';
+import { type ApiHelpers, acpCatalogBody, expect, test } from './_helpers';
const WYSIWYG_BODY = '.editor-doc-scroll .ProseMirror:not(.composer-prosemirror)';
const COMPOSER_CARD = '[data-testid="bottom-composer"] > div';
const ATTACH = '[data-testid="ask-ai-attach-files"]';
const COMPOSER_INPUT = '.composer-prosemirror';
const PICKER = '[data-testid="ask-ai-agent-group"]';
+const SUGGESTION_PHRASE = '[data-testid="ask-ai-composer-placeholder"] [data-rotating-placeholder]';
const FIRST_PAINT_TIMEOUT_MS = 30_000;
const SETTLE_TIMEOUT_MS = 15_000;
@@ -28,35 +30,39 @@ const WHY = [
'stylesheet: the jsdom suite mocks the input and loads no CSS, so nothing there can see this.',
].join('\n');
+async function openAskAiComposer(page: Page, api: ApiHelpers): Promise<void> {
+ const docName = `composer-alignment-${randomUUID().slice(0, 8)}`;
+ await api.seedDocs([{ name: `${docName}.md`, markdown: 'Alignment fixture.\n' }]);
+ await page.route('**/api/installed-agents', (route) =>
+ route.fulfill({
+ status: 200,
+ contentType: 'application/json',
+ body: JSON.stringify({ claude: true }),
+ }),
+ );
+ await page.route('**/api/acp/catalog', (route) =>
+ route.fulfill({
+ status: 200,
+ contentType: 'application/json',
+ body: JSON.stringify(acpCatalogBody([{ id: 'alignment-agent', name: 'Alignment Agent' }])),
+ }),
+ );
+
+ await page.goto(`/#/${docName}`);
+ await expect(page.locator(WYSIWYG_BODY).first()).toBeVisible({
+ timeout: FIRST_PAINT_TIMEOUT_MS,
+ });
+ await expect(page.locator(COMPOSER_CARD).first()).toBeVisible({
+ timeout: FIRST_PAINT_TIMEOUT_MS,
+ });
+}
+
test.describe('Ask AI composer control alignment', () => {
test('the attach button, the prompt text and the agent picker share one centre line', async ({
page,
api,
}) => {
- const docName = `composer-alignment-${randomUUID().slice(0, 8)}`;
- await api.seedDocs([{ name: `${docName}.md`, markdown: 'Alignment fixture.\n' }]);
- await page.route('**/api/installed-agents', (route) =>
- route.fulfill({
- status: 200,
- contentType: 'application/json',
- body: JSON.stringify({ claude: true }),
- }),
- );
- await page.route('**/api/acp/catalog', (route) =>
- route.fulfill({
- status: 200,
- contentType: 'application/json',
- body: JSON.stringify(acpCatalogBody([{ id: 'alignment-agent', name: 'Alignment Agent' }])),
- }),
- );
-
- await page.goto(`/#/${docName}`);
- await expect(page.locator(WYSIWYG_BODY).first()).toBeVisible({
- timeout: FIRST_PAINT_TIMEOUT_MS,
- });
- await expect(page.locator(COMPOSER_CARD).first()).toBeVisible({
- timeout: FIRST_PAINT_TIMEOUT_MS,
- });
+ await openAskAiComposer(page, api);
await expect(
page.locator(ATTACH).first(),
'the composer rendered without its attach control, so the row this test measures is not the ' +
@@ -104,4 +110,32 @@ test.describe('Ask AI composer control alignment', () => {
)
.toBeLessThanOrEqual(CENTRE_TOLERANCE_PX);
});
+
+ test('the empty composer paints its suggestion through the overlay pseudo-element', async ({
+ page,
+ api,
+ }) => {
+ await openAskAiComposer(page, api);
+
+ await expect
+ .poll(
+ () =>
+ page.evaluate((selector) => {
+ const phrase = document.querySelector(selector);
+ if (!(phrase instanceof HTMLElement)) return 'no overlay phrase element';
+ const attribute = phrase.getAttribute('data-rotating-placeholder') ?? '';
+ const painted = getComputedStyle(phrase, '::before').content;
+ return attribute !== '' && painted === JSON.stringify(attribute)
+ ? 'painted'
+ : `painted ${painted} for ${JSON.stringify(attribute)}`;
+ }, SUGGESTION_PHRASE),
+ {
+ message:
+ 'the suggestion overlay painted no text: its ::before content no longer resolves to ' +
+ 'the phrase attribute, so the composer shows an empty placeholder',
+ timeout: SETTLE_TIMEOUT_MS,
+ },
+ )
+ .toBe('painted');
+ });
});
diff --git a/packages/core/src/bridge/compose.ts b/packages/core/src/bridge/compose.ts
index f4cc8a286..2a597ec3d 100644
--- a/packages/core/src/bridge/compose.ts
+++ b/packages/core/src/bridge/compose.ts
@@ -1,3 +1,4 @@
+
import { prependFrontmatter, stripFrontmatter } from '../extensions/frontmatter.ts';
export type ComposeAdjustment = 'none' | 'body' | 'frontmatter' | 'unresolved';
diff --git a/packages/core/src/bridge/doc-boundary-space.ts b/packages/core/src/bridge/doc-boundary-space.ts
index 8fb428b90..01ef76a9f 100644
--- a/packages/core/src/bridge/doc-boundary-space.ts
+++ b/packages/core/src/bridge/doc-boundary-space.ts
@@ -1,3 +1,4 @@
+
import { FRONTMATTER_RE, stripFrontmatter } from '../extensions/frontmatter.ts';
import { carriedEdgeEmpties, type DocEdgeEmpties } from '../markdown/doc-edge-blank-runs.ts';
diff --git a/packages/core/src/markdown/comment-promoter.ts b/packages/core/src/markdown/comment-promoter.ts
index fc267cbea..fb0ba5a7c 100644
--- a/packages/core/src/markdown/comment-promoter.ts
+++ b/packages/core/src/markdown/comment-promoter.ts
@@ -1,3 +1,4 @@
+
import type { Nodes, Paragraph, PhrasingContent, Root, RootContent, Text } from 'mdast';
import { SKIP, visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/merged-walker.ts b/packages/core/src/markdown/merged-walker.ts
index bfd7e3109..fa3cfcd86 100644
--- a/packages/core/src/markdown/merged-walker.ts
+++ b/packages/core/src/markdown/merged-walker.ts
@@ -1,3 +1,4 @@
+
import type { Nodes, Parent, Root } from 'mdast';
import { SKIP, visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/safe-url.ts b/packages/core/src/markdown/safe-url.ts
index 4d3250d3a..8be632ba4 100644
--- a/packages/core/src/markdown/safe-url.ts
+++ b/packages/core/src/markdown/safe-url.ts
@@ -1,3 +1,4 @@
+
export const SAFE_URL_SCHEMES = ['https', 'http', 'mailto', 'tel', 'ftp', 'sms'] as const;
const SCHEME_ALT = SAFE_URL_SCHEMES.map((s) => `${s}:`).join('|');