Signed-off-by: Douwe M Osinga <douwe@sidewalklabs.com>
Co-authored-by: Douwe M Osinga <douwe@sidewalklabs.com>
This commit is contained in:
Douwe Osinga
2026-06-16 22:30:09 -04:00
committed by GitHub
parent 5adaebb867
commit 9804a8c782
11 changed files with 597 additions and 18 deletions
+2 -2
View File
@@ -1,6 +1,6 @@
import { describe, it, expect } from 'vitest';
import { shouldShowNewChatTitle } from '../sessions';
import { getSessionDisplayName, prependUnique } from '../hooks/useNavigationSessions';
import { getSessionDisplayName, shouldShowNewChatTitle } from '../sessions';
import { prependUnique } from '../hooks/useNavigationSessions';
import type { Session } from '../api';
import type { SessionListItem } from '../acp/sessions';
+5 -2
View File
@@ -39,6 +39,7 @@ import { Recipe } from '../recipe';
import { useAutoSubmit } from '../hooks/useAutoSubmit';
import { Goose } from './icons';
import EnvironmentBadge from './GooseSidebar/EnvironmentBadge';
import SessionActionsHeader from './SessionActionsHeader';
const i18n = defineMessages({
failedToLoadSession: {
@@ -99,7 +100,7 @@ export default function BaseChat({
const navContext = useNavigationContextSafe();
const setView = useNavigation();
const isNavCollapsed = !navContext?.isNavExpanded;
const contentClassName = cn('pr-1 pb-10 pt-10', (isMobile || isNavCollapsed) && 'pt-14');
const contentClassName = cn('pr-1 pb-10 pt-12', (isMobile || isNavCollapsed) && 'pt-16');
const { droppedFiles, setDroppedFiles, handleDrop, handleDragOver } = useFileDrop();
const onStreamFinish = useCallback(() => {}, []);
const [isCreateRecipeModalOpen, setIsCreateRecipeModalOpen] = useState(false);
@@ -406,7 +407,7 @@ export default function BaseChat({
{/* Chat container with sticky recipe header */}
<div className="flex flex-col flex-1 min-h-0 relative">
{/* Goose watermark - top right */}
<div className="absolute top-3 right-4 z-[60] flex flex-row items-center gap-1">
<div className="absolute top-[14px] right-4 z-[60] flex flex-row items-center gap-1">
<a
href="https://goose-docs.ai"
target="_blank"
@@ -421,6 +422,8 @@ export default function BaseChat({
<EnvironmentBadge className="translate-y-px" />
</div>
<SessionActionsHeader session={session} />
<ScrollArea
ref={scrollRef}
className={`flex-1 min-h-0 relative ${contentClassName}`}
@@ -0,0 +1,395 @@
import { useCallback, useMemo, useState } from 'react';
import { ChevronDown, ChevronRight, FileJson, LoaderCircle } from 'lucide-react';
import { toast } from 'react-toastify';
import { defineMessages, useIntl } from '../i18n';
import { acpExportSession } from '../acp/sessions';
import type { Session } from '../api';
import { getSessionDisplayName } from '../sessions';
import { errorMessage } from '../utils/conversionUtils';
import { cn } from '../utils';
import { Button } from './ui/button';
import { Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle } from './ui/dialog';
const i18n = defineMessages({
viewJson: {
id: 'sessionActionsHeader.viewJson',
defaultMessage: 'View session JSON',
},
jsonTitle: {
id: 'sessionActionsHeader.jsonTitle',
defaultMessage: 'Session JSON',
},
loadingJson: {
id: 'sessionActionsHeader.loadingJson',
defaultMessage: 'Loading JSON...',
},
jsonFailed: {
id: 'sessionActionsHeader.jsonFailed',
defaultMessage: 'Failed to load session JSON: {error}',
},
close: {
id: 'sessionActionsHeader.close',
defaultMessage: 'Close',
},
copyJson: {
id: 'sessionActionsHeader.copyJson',
defaultMessage: 'Copy JSON',
},
copiedJson: {
id: 'sessionActionsHeader.copiedJson',
defaultMessage: 'Session JSON copied',
},
fullTextTitle: {
id: 'sessionActionsHeader.fullTextTitle',
defaultMessage: 'Text value',
},
copyText: {
id: 'sessionActionsHeader.copyText',
defaultMessage: 'Copy text',
},
copiedText: {
id: 'sessionActionsHeader.copiedText',
defaultMessage: 'Text copied',
},
});
const LONG_STRING_THRESHOLD = 180;
const STRING_PREVIEW_START = 96;
const STRING_PREVIEW_END = 56;
interface SessionActionsHeaderProps {
session?: Session;
className?: string;
}
interface ParsedSessionJson {
value: unknown;
pretty: string;
}
interface FullTextSelection {
path: string;
value: string;
}
function parseSessionJson(json: string): ParsedSessionJson {
const value = JSON.parse(json) as unknown;
return {
value,
pretty: JSON.stringify(value, null, 2),
};
}
function isJsonRecord(value: unknown): value is Record<string, unknown> {
return typeof value === 'object' && value !== null && !Array.isArray(value);
}
function getNodePath(parentPath: string, key: string, isArrayItem: boolean): string {
if (isArrayItem) {
return `${parentPath}[${key}]`;
}
return /^[A-Za-z_$][\w$]*$/.test(key)
? `${parentPath}.${key}`
: `${parentPath}[${JSON.stringify(key)}]`;
}
function getStringPreview(value: string): string {
if (value.length <= LONG_STRING_THRESHOLD) {
return JSON.stringify(value);
}
return JSON.stringify(
`${value.slice(0, STRING_PREVIEW_START)} ... ${value.slice(-STRING_PREVIEW_END)}`
);
}
function JsonPrimitiveValue({
value,
path,
onOpenText,
}: {
value: unknown;
path: string;
onOpenText: (selection: FullTextSelection) => void;
}) {
if (typeof value === 'string') {
const isLong = value.length > LONG_STRING_THRESHOLD;
const preview = getStringPreview(value);
if (isLong) {
return (
<button
type="button"
className="min-w-0 rounded-sm text-left text-blue-600 underline-offset-2 hover:underline focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border-active dark:text-blue-300 break-all"
onClick={() => onOpenText({ path, value })}
title={path}
>
{preview}
</button>
);
}
return (
<span className="min-w-0 text-emerald-700 dark:text-emerald-300 break-all">{preview}</span>
);
}
if (typeof value === 'number') {
return <span className="text-purple-700 dark:text-purple-300">{value}</span>;
}
if (typeof value === 'boolean') {
return <span className="text-amber-700 dark:text-amber-300">{String(value)}</span>;
}
if (value === null) {
return <span className="text-text-secondary">null</span>;
}
return <span className="text-text-secondary">{String(value)}</span>;
}
function JsonTreeNode({
label,
value,
depth,
path,
isArrayItem = false,
onOpenText,
}: {
label?: string;
value: unknown;
depth: number;
path: string;
isArrayItem?: boolean;
onOpenText: (selection: FullTextSelection) => void;
}) {
const isArray = Array.isArray(value);
const isRecord = isJsonRecord(value);
const isContainer = isArray || isRecord;
const [isOpen, setIsOpen] = useState(depth < 3);
const labelNode =
label === undefined ? null : (
<span className="text-text-secondary">{isArrayItem ? label : JSON.stringify(label)}:</span>
);
if (!isContainer) {
return (
<div className="flex min-w-0 flex-wrap items-baseline gap-x-1 px-1 py-0.5">
{labelNode}
<JsonPrimitiveValue value={value} path={path} onOpenText={onOpenText} />
</div>
);
}
const entries = isArray
? value.map((item, index) => [String(index), item] as const)
: Object.entries(value);
const openToken = isArray ? '[' : '{';
const closeToken = isArray ? ']' : '}';
const countLabel = isArray
? `${entries.length} ${entries.length === 1 ? 'item' : 'items'}`
: `${entries.length} ${entries.length === 1 ? 'key' : 'keys'}`;
return (
<div className="min-w-0">
<button
type="button"
className="flex max-w-full items-baseline gap-1 rounded-sm px-1 py-0.5 text-left transition-colors hover:bg-background-primary focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border-active"
onClick={() => entries.length > 0 && setIsOpen((open) => !open)}
>
{entries.length > 0 ? (
isOpen ? (
<ChevronDown className="mt-0.5 size-3.5 shrink-0 text-text-secondary" />
) : (
<ChevronRight className="mt-0.5 size-3.5 shrink-0 text-text-secondary" />
)
) : (
<span className="size-3.5 shrink-0" />
)}
<span className="min-w-0 flex flex-wrap items-baseline gap-x-1">
{labelNode}
<span>{openToken}</span>
{!isOpen && entries.length > 0 && (
<span className="text-text-secondary">{countLabel}</span>
)}
{(!isOpen || entries.length === 0) && <span>{closeToken}</span>}
</span>
</button>
{isOpen && entries.length > 0 && (
<div className="ml-3 border-l border-border-primary/70 pl-3">
{entries.map(([key, childValue]) => (
<JsonTreeNode
key={`${path}.${key}`}
label={key}
value={childValue}
depth={depth + 1}
path={getNodePath(path, key, isArray)}
isArrayItem={isArray}
onOpenText={onOpenText}
/>
))}
<div className="px-1 py-0.5">{closeToken}</div>
</div>
)}
</div>
);
}
function JsonTree({
value,
onOpenText,
}: {
value: unknown;
onOpenText: (selection: FullTextSelection) => void;
}) {
return (
<div className="min-w-0 font-mono text-xs leading-5 text-text-primary">
<JsonTreeNode value={value} depth={0} path="root" onOpenText={onOpenText} />
</div>
);
}
export default function SessionActionsHeader({ session, className }: SessionActionsHeaderProps) {
const intl = useIntl();
const [isJsonOpen, setIsJsonOpen] = useState(false);
const [jsonValue, setJsonValue] = useState<unknown>(null);
const [jsonText, setJsonText] = useState('');
const [isJsonLoading, setIsJsonLoading] = useState(false);
const [fullTextSelection, setFullTextSelection] = useState<FullTextSelection | null>(null);
const title = useMemo(() => (session ? getSessionDisplayName(session) : ''), [session]);
const handleViewJson = useCallback(async () => {
if (!session) return;
setIsJsonOpen(true);
setJsonValue(null);
setJsonText('');
setIsJsonLoading(true);
try {
const json = await acpExportSession(session.id);
const parsed = parseSessionJson(json);
setJsonValue(parsed.value);
setJsonText(parsed.pretty);
} catch (error) {
setIsJsonOpen(false);
toast.error(
intl.formatMessage(i18n.jsonFailed, {
error: errorMessage(error, 'Unknown error'),
})
);
} finally {
setIsJsonLoading(false);
}
}, [intl, session]);
const handleCopyJson = useCallback(async () => {
if (!jsonText) return;
await navigator.clipboard.writeText(jsonText);
toast.success(intl.formatMessage(i18n.copiedJson));
}, [intl, jsonText]);
const handleCopyFullText = useCallback(async () => {
if (!fullTextSelection) return;
await navigator.clipboard.writeText(fullTextSelection.value);
toast.success(intl.formatMessage(i18n.copiedText));
}, [fullTextSelection, intl]);
const handleJsonOpenChange = useCallback((open: boolean) => {
setIsJsonOpen(open);
if (!open) {
setFullTextSelection(null);
}
}, []);
if (!session) {
return null;
}
return (
<>
<div
className={cn(
'no-drag absolute top-[14px] left-1/2 z-30 max-w-[min(36rem,calc(100vw-13rem))] -translate-x-1/2',
className
)}
>
<button
type="button"
className="flex h-7 max-w-full items-center gap-1 rounded-md px-2.5 text-text-primary transition-colors hover:bg-background-secondary focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-border-active"
aria-label={intl.formatMessage(i18n.viewJson)}
title={intl.formatMessage(i18n.viewJson)}
onClick={() => void handleViewJson()}
>
<span className="truncate text-xs font-medium">{title}</span>
{isJsonLoading ? (
<LoaderCircle className="size-3.5 shrink-0 animate-spin text-text-secondary" />
) : (
<FileJson className="size-3.5 shrink-0 text-text-secondary" />
)}
</button>
</div>
<Dialog open={isJsonOpen} onOpenChange={handleJsonOpenChange}>
<DialogContent className="grid max-h-[85vh] grid-rows-[auto_minmax(0,1fr)_auto] sm:max-w-4xl">
<DialogHeader>
<DialogTitle>{intl.formatMessage(i18n.jsonTitle)}</DialogTitle>
</DialogHeader>
<div className="min-h-0 overflow-hidden rounded-lg border border-border-primary bg-background-secondary">
{isJsonLoading ? (
<div className="flex h-64 items-center justify-center gap-2 text-sm text-text-secondary">
<LoaderCircle className="size-4 animate-spin" />
{intl.formatMessage(i18n.loadingJson)}
</div>
) : (
<div className="max-h-[60vh] overflow-auto p-3">
<JsonTree value={jsonValue} onOpenText={setFullTextSelection} />
</div>
)}
</div>
<DialogFooter>
<Button variant="outline" onClick={() => setIsJsonOpen(false)}>
{intl.formatMessage(i18n.close)}
</Button>
<Button onClick={() => void handleCopyJson()} disabled={!jsonText || isJsonLoading}>
{intl.formatMessage(i18n.copyJson)}
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
<Dialog
open={!!fullTextSelection}
onOpenChange={(open) => !open && setFullTextSelection(null)}
>
<DialogContent className="grid max-h-[80vh] grid-rows-[auto_minmax(0,1fr)_auto] sm:max-w-3xl">
<DialogHeader>
<DialogTitle>{intl.formatMessage(i18n.fullTextTitle)}</DialogTitle>
</DialogHeader>
{fullTextSelection && (
<div className="min-h-0 space-y-3">
<code className="block truncate rounded-md bg-background-secondary px-3 py-2 text-xs text-text-secondary">
{fullTextSelection.path}
</code>
<pre className="max-h-[55vh] overflow-auto whitespace-pre-wrap break-words rounded-lg border border-border-primary bg-background-secondary p-4 text-xs leading-5 text-text-primary">
{fullTextSelection.value}
</pre>
</div>
)}
<DialogFooter>
<Button variant="outline" onClick={() => setFullTextSelection(null)}>
{intl.formatMessage(i18n.close)}
</Button>
<Button onClick={() => void handleCopyFullText()} disabled={!fullTextSelection}>
{intl.formatMessage(i18n.copyText)}
</Button>
</DialogFooter>
</DialogContent>
</Dialog>
</>
);
}
+1 -14
View File
@@ -2,7 +2,7 @@ import { useState, useEffect, useRef, useCallback } from 'react';
import { useNavigate, useLocation, useSearchParams } from 'react-router-dom';
import { getSession } from '../api';
import { useChatContext } from '../contexts/ChatContext';
import { shouldShowNewChatTitle } from '../sessions';
import { getSessionDisplayName } from '../sessions';
import { AppEvents } from '../constants/events';
import type { Session } from '../api';
import { acpListRecentSessions, type SessionListItem } from '../acp/sessions';
@@ -200,16 +200,3 @@ export function useNavigationSessions() {
handleSessionClick,
};
}
export function getSessionDisplayName(session: Session): string {
if (session.user_set_name) {
return session.name;
}
if (session.recipe?.title) {
return session.recipe.title;
}
if (shouldShowNewChatTitle(session)) {
return 'New Chat';
}
return session.name;
}
+30
View File
@@ -3746,6 +3746,36 @@
"securityToggle.warpNotice": {
"defaultMessage": "Command injection detection works best when connected to WARP (required to reach the classification service)."
},
"sessionActionsHeader.close": {
"defaultMessage": "Close"
},
"sessionActionsHeader.copiedJson": {
"defaultMessage": "Session JSON copied"
},
"sessionActionsHeader.copiedText": {
"defaultMessage": "Text copied"
},
"sessionActionsHeader.copyJson": {
"defaultMessage": "Copy JSON"
},
"sessionActionsHeader.copyText": {
"defaultMessage": "Copy text"
},
"sessionActionsHeader.fullTextTitle": {
"defaultMessage": "Text value"
},
"sessionActionsHeader.jsonFailed": {
"defaultMessage": "Failed to load session JSON: {error}"
},
"sessionActionsHeader.jsonTitle": {
"defaultMessage": "Session JSON"
},
"sessionActionsHeader.loadingJson": {
"defaultMessage": "Loading JSON..."
},
"sessionActionsHeader.viewJson": {
"defaultMessage": "View session JSON"
},
"sessionHistory.cancel": {
"defaultMessage": "Cancel"
},
+30
View File
@@ -3746,6 +3746,36 @@
"securityToggle.warpNotice": {
"defaultMessage": "WARP से कनेक्ट होने पर कमांड इंजेक्शन डिटेक्शन सबसे अच्छा काम करता है (वर्गीकरण सेवा तक पहुंचने के लिए आवश्यक)।"
},
"sessionActionsHeader.close": {
"defaultMessage": "Close"
},
"sessionActionsHeader.copiedJson": {
"defaultMessage": "Session JSON copied"
},
"sessionActionsHeader.copiedText": {
"defaultMessage": "Text copied"
},
"sessionActionsHeader.copyJson": {
"defaultMessage": "Copy JSON"
},
"sessionActionsHeader.copyText": {
"defaultMessage": "Copy text"
},
"sessionActionsHeader.fullTextTitle": {
"defaultMessage": "Text value"
},
"sessionActionsHeader.jsonFailed": {
"defaultMessage": "Failed to load session JSON: {error}"
},
"sessionActionsHeader.jsonTitle": {
"defaultMessage": "Session JSON"
},
"sessionActionsHeader.loadingJson": {
"defaultMessage": "Loading JSON..."
},
"sessionActionsHeader.viewJson": {
"defaultMessage": "View session JSON"
},
"sessionHistory.cancel": {
"defaultMessage": "रद्द करें"
},
+30
View File
@@ -3746,6 +3746,36 @@
"securityToggle.warpNotice": {
"defaultMessage": "コマンドインジェクション検出は、WARPに接続していると最も効果的です(分類サービスに到達するために必要です)。"
},
"sessionActionsHeader.close": {
"defaultMessage": "Close"
},
"sessionActionsHeader.copiedJson": {
"defaultMessage": "Session JSON copied"
},
"sessionActionsHeader.copiedText": {
"defaultMessage": "Text copied"
},
"sessionActionsHeader.copyJson": {
"defaultMessage": "Copy JSON"
},
"sessionActionsHeader.copyText": {
"defaultMessage": "Copy text"
},
"sessionActionsHeader.fullTextTitle": {
"defaultMessage": "Text value"
},
"sessionActionsHeader.jsonFailed": {
"defaultMessage": "Failed to load session JSON: {error}"
},
"sessionActionsHeader.jsonTitle": {
"defaultMessage": "Session JSON"
},
"sessionActionsHeader.loadingJson": {
"defaultMessage": "Loading JSON..."
},
"sessionActionsHeader.viewJson": {
"defaultMessage": "View session JSON"
},
"sessionHistory.cancel": {
"defaultMessage": "キャンセル"
},
+30
View File
@@ -3746,6 +3746,36 @@
"securityToggle.warpNotice": {
"defaultMessage": "Обнаружение внедрения команд работает лучше всего при подключении к WARP (требуется для доступа к сервису классификации)."
},
"sessionActionsHeader.close": {
"defaultMessage": "Close"
},
"sessionActionsHeader.copiedJson": {
"defaultMessage": "Session JSON copied"
},
"sessionActionsHeader.copiedText": {
"defaultMessage": "Text copied"
},
"sessionActionsHeader.copyJson": {
"defaultMessage": "Copy JSON"
},
"sessionActionsHeader.copyText": {
"defaultMessage": "Copy text"
},
"sessionActionsHeader.fullTextTitle": {
"defaultMessage": "Text value"
},
"sessionActionsHeader.jsonFailed": {
"defaultMessage": "Failed to load session JSON: {error}"
},
"sessionActionsHeader.jsonTitle": {
"defaultMessage": "Session JSON"
},
"sessionActionsHeader.loadingJson": {
"defaultMessage": "Loading JSON..."
},
"sessionActionsHeader.viewJson": {
"defaultMessage": "View session JSON"
},
"sessionHistory.cancel": {
"defaultMessage": "Отмена"
},
+30
View File
@@ -3746,6 +3746,36 @@
"securityToggle.warpNotice": {
"defaultMessage": "Komut enjeksiyonu algılama, WARP bağlantısı olduğunda en iyi şekilde çalışır (sınıflandırma hizmetine erişmek için gereklidir)."
},
"sessionActionsHeader.close": {
"defaultMessage": "Close"
},
"sessionActionsHeader.copiedJson": {
"defaultMessage": "Session JSON copied"
},
"sessionActionsHeader.copiedText": {
"defaultMessage": "Text copied"
},
"sessionActionsHeader.copyJson": {
"defaultMessage": "Copy JSON"
},
"sessionActionsHeader.copyText": {
"defaultMessage": "Copy text"
},
"sessionActionsHeader.fullTextTitle": {
"defaultMessage": "Text value"
},
"sessionActionsHeader.jsonFailed": {
"defaultMessage": "Failed to load session JSON: {error}"
},
"sessionActionsHeader.jsonTitle": {
"defaultMessage": "Session JSON"
},
"sessionActionsHeader.loadingJson": {
"defaultMessage": "Loading JSON..."
},
"sessionActionsHeader.viewJson": {
"defaultMessage": "View session JSON"
},
"sessionHistory.cancel": {
"defaultMessage": "İptal"
},
+30
View File
@@ -3746,6 +3746,36 @@
"securityToggle.warpNotice": {
"defaultMessage": "连接到 WARP 时,命令注入检测效果最佳(访问分类服务需要 WARP)。"
},
"sessionActionsHeader.close": {
"defaultMessage": "Close"
},
"sessionActionsHeader.copiedJson": {
"defaultMessage": "Session JSON copied"
},
"sessionActionsHeader.copiedText": {
"defaultMessage": "Text copied"
},
"sessionActionsHeader.copyJson": {
"defaultMessage": "Copy JSON"
},
"sessionActionsHeader.copyText": {
"defaultMessage": "Copy text"
},
"sessionActionsHeader.fullTextTitle": {
"defaultMessage": "Text value"
},
"sessionActionsHeader.jsonFailed": {
"defaultMessage": "Failed to load session JSON: {error}"
},
"sessionActionsHeader.jsonTitle": {
"defaultMessage": "Session JSON"
},
"sessionActionsHeader.loadingJson": {
"defaultMessage": "Loading JSON..."
},
"sessionActionsHeader.viewJson": {
"defaultMessage": "View session JSON"
},
"sessionHistory.cancel": {
"defaultMessage": "取消"
},
+14
View File
@@ -1,4 +1,5 @@
import { Session, startAgent, ExtensionConfig } from './api';
import { DEFAULT_CHAT_TITLE } from './contexts/ChatContext';
import type { setViewType } from './hooks/useNavigation';
import {
getExtensionConfigsWithOverrides,
@@ -16,6 +17,19 @@ export function shouldShowNewChatTitle(session: Session): boolean {
return !session.user_set_name && session.message_count === 0;
}
export function getSessionDisplayName(session: Session): string {
if (session.user_set_name) {
return session.name;
}
if (session.recipe?.title) {
return session.recipe.title;
}
if (shouldShowNewChatTitle(session)) {
return DEFAULT_CHAT_TITLE;
}
return session.name;
}
export function resumeSession(session: Session, setView: setViewType) {
const eventDetail = {
sessionId: session.id,