Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d43ffe4f8a | ||
|
|
ecbd2b0bb9 | ||
|
|
168cad7470 | ||
|
|
ce28d95bcf | ||
|
|
70977bad84 | ||
|
|
fdd63b27a9 | ||
|
|
bdd7d5e866 | ||
|
|
1c6ae6b2e2 | ||
|
|
d2d9fcd09e | ||
|
|
a65867fc39 | ||
|
|
8c564946ef | ||
|
|
f8ce0f21ef | ||
|
|
2da091d6e9 | ||
|
|
674d4bd8c6 | ||
|
|
a50ca4b867 | ||
|
|
b277ee3e0f | ||
|
|
9171a4f49c | ||
|
|
7fb9a1505c | ||
|
|
3cc598ded5 | ||
|
|
55a6501a09 | ||
|
|
d6e317c6fe | ||
|
|
0a9dabfdc2 | ||
|
|
5cf4e589be | ||
|
|
671d2c8bb7 | ||
|
|
e8c81faad9 | ||
|
|
480a29aaea | ||
|
|
c549494488 | ||
|
|
74b0c65843 | ||
|
|
04037e98d6 | ||
|
|
36338b3b55 | ||
|
|
8946209f98 | ||
|
|
624c91a437 | ||
|
|
24d1dda07d | ||
|
|
50a2db775d | ||
|
|
6788a01add | ||
|
|
102aa6f7ae | ||
|
|
42abeb65ae | ||
|
|
8691470d03 | ||
|
|
b8abad2b4f | ||
|
|
0fc6d4ab94 | ||
|
|
ae2fad56c4 | ||
|
|
b6bc9edcda | ||
|
|
480064b19e | ||
|
|
7fb891389d | ||
|
|
4bd20be529 | ||
|
|
6cba9c8c5a | ||
|
|
cc657faa93 | ||
|
|
6685b3d09a | ||
|
|
b15db907ab | ||
|
|
93017d767e | ||
|
|
388addff3e | ||
|
|
c36c1c6b4d | ||
|
|
a67366005a | ||
|
|
2d67376b76 | ||
|
|
aef01c44a0 | ||
|
|
261a9b9927 | ||
|
|
1c5024c8c2 | ||
|
|
01e7b17fcd | ||
|
|
c4c15b8fd2 | ||
|
|
7f95753cf2 |
@@ -0,0 +1,59 @@
|
||||
name: Linux desktop release
|
||||
|
||||
# Manual until a native Linux runner is registered. The current 0.6.0
|
||||
# packages are built locally using the identical gates documented below.
|
||||
on:
|
||||
workflow_dispatch:
|
||||
inputs:
|
||||
tag:
|
||||
description: Existing stable version tag to package (for example v0.6.0)
|
||||
required: true
|
||||
type: string
|
||||
|
||||
permissions:
|
||||
contents: read
|
||||
releases: write
|
||||
|
||||
concurrency:
|
||||
group: gitea-release-${{ inputs.tag }}
|
||||
cancel-in-progress: false
|
||||
|
||||
jobs:
|
||||
linux:
|
||||
runs-on: ubuntu-24.04
|
||||
timeout-minutes: 60
|
||||
env:
|
||||
NEXT_TELEMETRY_DISABLED: "1"
|
||||
steps:
|
||||
- uses: https://github.com/actions/checkout@v7
|
||||
with:
|
||||
ref: ${{ inputs.tag }}
|
||||
persist-credentials: false
|
||||
- uses: https://github.com/actions/setup-node@v7
|
||||
with:
|
||||
node-version: "26"
|
||||
cache: npm
|
||||
- name: Tag must match package.json
|
||||
env:
|
||||
RELEASE_TAG: ${{ inputs.tag }}
|
||||
run: node --input-type=module -e 'import fs from "node:fs"; if (process.env.RELEASE_TAG !== `v${JSON.parse(fs.readFileSync("package.json")).version}`) process.exit(1)'
|
||||
- run: npm ci
|
||||
- run: npm run typecheck
|
||||
- run: npm test
|
||||
- run: npm run lint
|
||||
- name: Native PDF and SVG renderers
|
||||
run: npx electron --import tsx --test tests/pdf-native-render.test.ts tests/pdf-ops.test.ts tests/svg-native-render.test.ts tests/browser-service.test.ts
|
||||
env:
|
||||
NODE_ENV: test
|
||||
ELECTRON_RUN_AS_NODE: "1"
|
||||
- name: Build, smoke, package, and verify Linux installers
|
||||
run: npm run desktop:release:linux
|
||||
- name: Verify the packaged provider and demo runtimes
|
||||
run: |
|
||||
node scripts/smoke-provider-runtime.mjs --standalone dist/linux-unpacked/resources/server/standalone
|
||||
node scripts/smoke-provider-runtime.mjs --standalone dist/linux-unpacked/resources/server/standalone --runtime dist/linux-unpacked/learnharness
|
||||
xvfb-run -a node scripts/smoke-demo-runtime.mjs --standalone dist/linux-unpacked/resources/server/standalone --runtime dist/linux-unpacked/learnharness --browser
|
||||
- name: Upload and verify the draft (never publish)
|
||||
run: node scripts/gitea-release.mjs upload dist
|
||||
env:
|
||||
GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
|
||||
@@ -63,5 +63,7 @@ jobs:
|
||||
NODE_ENV: test
|
||||
ELECTRON_RUN_AS_NODE: "1"
|
||||
- run: npm run build
|
||||
# Check the fresh trace before any static copying/curation.
|
||||
- run: node scripts/smoke-provider-runtime.mjs
|
||||
- run: node scripts/build-server.mjs
|
||||
- run: node scripts/smoke-server.mjs --electron
|
||||
|
||||
@@ -0,0 +1,49 @@
|
||||
name: Notify website of public desktop release
|
||||
|
||||
on:
|
||||
release:
|
||||
types: [published]
|
||||
|
||||
# Use only the separately scoped website token; no app token or checkout is needed.
|
||||
permissions: {}
|
||||
|
||||
jobs:
|
||||
notify-website:
|
||||
if: >-
|
||||
github.repository == 'amosblomqvist/learnharness' &&
|
||||
!github.event.release.draft && !github.event.release.prerelease
|
||||
runs-on: ubuntu-latest
|
||||
timeout-minutes: 5
|
||||
steps:
|
||||
- name: Queue the website update for the published tag
|
||||
env:
|
||||
WEBSITE_DISPATCH_TOKEN: ${{ secrets.WEBSITE_DISPATCH_TOKEN }}
|
||||
RELEASE_TAG: ${{ github.event.release.tag_name }}
|
||||
shell: bash
|
||||
run: |
|
||||
set -euo pipefail
|
||||
if [[ -z "$WEBSITE_DISPATCH_TOKEN" ]]; then
|
||||
echo '::error::Missing WEBSITE_DISPATCH_TOKEN.'
|
||||
exit 1
|
||||
fi
|
||||
if [[ -z "$RELEASE_TAG" ]]; then
|
||||
echo '::error::The published release has no tag.'
|
||||
exit 1
|
||||
fi
|
||||
payload=$(jq -cn --arg tag "$RELEASE_TAG" \
|
||||
'{event_type:"desktop-release-published",client_payload:{tag:$tag}}')
|
||||
status=$(curl --fail-with-body --silent --show-error \
|
||||
--connect-timeout 15 --max-time 60 \
|
||||
--request POST \
|
||||
--header 'Accept: application/vnd.github+json' \
|
||||
--header "Authorization: Bearer $WEBSITE_DISPATCH_TOKEN" \
|
||||
--header 'X-GitHub-Api-Version: 2022-11-28' \
|
||||
--header 'Content-Type: application/json' \
|
||||
--data "$payload" \
|
||||
--output /dev/null --write-out '%{http_code}' \
|
||||
https://api.github.com/repos/amosblomqvist/learnharness-web/dispatches)
|
||||
if [[ "$status" != '204' ]]; then
|
||||
printf '::error::Expected dispatch HTTP 204, received %s.\n' "$status"
|
||||
exit 1
|
||||
fi
|
||||
echo 'Website update queued. This does not confirm website deployment.'
|
||||
@@ -129,6 +129,8 @@ jobs:
|
||||
NODE_ENV: test
|
||||
ELECTRON_RUN_AS_NODE: "1"
|
||||
- run: npm run build
|
||||
# Check the fresh trace before any static copying/curation.
|
||||
- run: node scripts/smoke-provider-runtime.mjs
|
||||
- run: node scripts/build-server.mjs
|
||||
- run: node scripts/smoke-server.mjs --electron
|
||||
- name: Validate macOS release secrets
|
||||
@@ -169,6 +171,25 @@ jobs:
|
||||
- name: Windows/Linux rehearsal (no publish)
|
||||
if: github.event_name == 'workflow_dispatch' && runner.os != 'macOS'
|
||||
run: npx electron-builder ${{ matrix.builder_args }} --publish never
|
||||
- name: Initialize packaged providers offline (host and packaged Electron Node)
|
||||
run: |
|
||||
case "$RUNNER_OS" in
|
||||
macOS)
|
||||
app="dist/mac-arm64/LearnHarness.app/Contents"
|
||||
payload="$app/Resources/server/standalone"
|
||||
runtime="$app/MacOS/LearnHarness"
|
||||
;;
|
||||
Windows)
|
||||
payload="dist/win-unpacked/resources/server/standalone"
|
||||
runtime="dist/win-unpacked/LearnHarness.exe"
|
||||
;;
|
||||
Linux)
|
||||
payload="dist/linux-unpacked/resources/server/standalone"
|
||||
runtime="dist/linux-unpacked/learnharness"
|
||||
;;
|
||||
esac
|
||||
node scripts/smoke-provider-runtime.mjs --standalone "$payload"
|
||||
node scripts/smoke-provider-runtime.mjs --standalone "$payload" --runtime "$runtime"
|
||||
- name: Exercise packaged demo runtime (own Electron, no system Chrome)
|
||||
run: |
|
||||
case "$RUNNER_OS" in
|
||||
|
||||
+2
-1
@@ -4,7 +4,8 @@ data/
|
||||
*.log
|
||||
.DS_Store
|
||||
*.tsbuildinfo
|
||||
.env.local
|
||||
.env
|
||||
.env.*
|
||||
.memory/
|
||||
SCOPE.md
|
||||
# raw real-data import sources (user directive 2026-09-13: never commit)
|
||||
|
||||
@@ -48,7 +48,7 @@ Future teaching sessions can read the graph instead of starting from scratch. Pr
|
||||
- **Windows (x64):** run the installer. It is currently unsigned; Windows may show an “unknown publisher” or SmartScreen warning.
|
||||
- **Linux (x64):** make the AppImage executable and open it, or install the Debian/Ubuntu `.deb`.
|
||||
|
||||
Add your provider API key and choose your models, then start a session with what you want to understand. LearnHarness supports 30+ provider options, including OpenAI, Anthropic, Google, DeepSeek, and OpenRouter. Optional dictation and web search use separate service keys.
|
||||
Add your provider API key and choose your models, then start a session with what you want to understand. LearnHarness supports 30+ provider options, including OpenAI, Anthropic, Google, DeepSeek, and OpenRouter. Optional web search uses a separate service key. Dictation supports direct Deepgram Nova-3 streaming or MAI-Transcribe-2 using your OpenRouter API key; choose the speech recognition model in Settings → Speech recognition.
|
||||
|
||||
All three platforms support in-app updates.
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
/**
|
||||
* GET /api/activity — the dock's one poll: every running background
|
||||
* process, every view (chat, home, everywhere). Composition only — the
|
||||
* feed lives in server/observability.ts; cost folds client-side via
|
||||
* core/prices.ts. See that module's header for why /api/jobs stays
|
||||
* feed lives in server/observability.ts; costs are projected server-side
|
||||
* through Pi's catalog and public calculator. See that module's header for why /api/jobs stays
|
||||
* chat-scoped and untouched.
|
||||
*/
|
||||
import { activityFeed } from "@/src/server";
|
||||
|
||||
@@ -11,14 +11,14 @@
|
||||
* markers are invisible by the engine's law).
|
||||
*/
|
||||
import { sessionMarkdown } from "@/src/core";
|
||||
import { getChat } from "@/src/server";
|
||||
import { getChat, applicationLanguage } from "@/src/server";
|
||||
|
||||
/** Filename-safe title (own module scope on purpose: tiny + pure). */
|
||||
function slugify(title: string): string {
|
||||
const slug = title
|
||||
.toLowerCase()
|
||||
.normalize("NFKD")
|
||||
.replace(/[^a-z0-9]+/g, "-")
|
||||
.replace(/[^\p{L}\p{N}]+/gu, "-")
|
||||
.replace(/^-+|-+$/g, "");
|
||||
return slug.length > 0 ? slug : "session";
|
||||
}
|
||||
@@ -27,11 +27,11 @@ export async function GET(_req: Request, ctx: { params: Promise<{ id: string }>
|
||||
const { id } = await ctx.params;
|
||||
const record = getChat(id);
|
||||
if (!record) return Response.json({ error: "Unknown chat" }, { status: 404 });
|
||||
const markdown = sessionMarkdown(record.messages, { title: record.title, anchors: false });
|
||||
const markdown = sessionMarkdown(record.messages, { title: record.title, anchors: false, language: applicationLanguage(_req.headers.get("accept-language")) });
|
||||
return new Response(markdown, {
|
||||
headers: {
|
||||
"content-type": "text/markdown; charset=utf-8",
|
||||
"content-disposition": `attachment; filename="${slugify(record.title)}.md"`,
|
||||
"content-disposition": `attachment; filename="${/^[a-z0-9-]+$/.test(slugify(record.title)) ? slugify(record.title) : "session"}.md"; filename*=UTF-8''${encodeURIComponent(slugify(record.title))}.md`,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { compactionInFlight, deleteChatSession, getChat, isTurnRunning, sessionCoverage, stores, type ChatDeleteMode } from "@/src/server";
|
||||
import { compactionInFlight, deleteChatSession, getChat, isTurnRunning, sessionCoverage, sessionCost, stores, type ChatDeleteMode } from "@/src/server";
|
||||
|
||||
export async function GET(_req: Request, { params }: { params: Promise<{ id: string }> }) {
|
||||
const { id } = await params;
|
||||
@@ -17,6 +17,7 @@ export async function GET(_req: Request, { params }: { params: Promise<{ id: str
|
||||
return Response.json({
|
||||
...chat,
|
||||
messages: chat.messages,
|
||||
pricing: sessionCost(chat),
|
||||
turnInFlight: isTurnRunning(id),
|
||||
compacting: compactionInFlight(id),
|
||||
coverage: sessionCoverage(id),
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
* three usage channels (chat extraction runs, notes-source runs,
|
||||
* cluster-naming runs). Thin transport over src/server's graphCosts();
|
||||
* the fold itself is pure core (core/cost-summary.ts). Dollars are
|
||||
* inferred from PRICES at read time — never stored, so a price sync
|
||||
* inferred from Pi's catalog/calculator at read time — never stored, so a catalog update
|
||||
* re-prices the whole history for free.
|
||||
*
|
||||
* Scope (user-decided): the graph pipeline ONLY — teaching turns and
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
* healthy. The dock's chips + graph refetch track progress live through
|
||||
* /api/graph/status, as with session runs.
|
||||
*/
|
||||
import { extraction } from "@/src/server";
|
||||
import { extraction, NotesImportError, applicationLanguage } from "@/src/server";
|
||||
import {
|
||||
ModelsNotConfiguredError,
|
||||
PROVIDER_KEY_MISSING_CODE,
|
||||
@@ -24,6 +24,8 @@ import {
|
||||
export const dynamic = "force-dynamic";
|
||||
|
||||
interface ImportResult {
|
||||
requestIndex: number;
|
||||
outcome: "completed" | "failed" | "partial" | "aborted" | "busy";
|
||||
filePath: string;
|
||||
ok: boolean;
|
||||
stats?: EmissionStats;
|
||||
@@ -46,20 +48,22 @@ export async function POST(request: Request) {
|
||||
}
|
||||
|
||||
const results: ImportResult[] = [];
|
||||
const queue = [...files];
|
||||
const queue = files.map((file, requestIndex) => ({ file, requestIndex }));
|
||||
const workers = Array.from({ length: Math.min(3, files.length) }, async () => {
|
||||
for (;;) {
|
||||
const file = queue.shift();
|
||||
if (!file) return;
|
||||
const next = queue.shift();
|
||||
if (!next) return;
|
||||
const { file, requestIndex } = next;
|
||||
try {
|
||||
const text = await file.text();
|
||||
const stats = await extraction.importNotes({ filePath: file.name, text });
|
||||
results.push({ filePath: file.name, ok: true, stats });
|
||||
const stats = await extraction.importNotes({ filePath: file.name, text, language: applicationLanguage(request.headers.get("accept-language")) });
|
||||
results.push({ filePath: file.name, requestIndex, outcome: "completed", ok: true, stats });
|
||||
} catch (err) {
|
||||
if (err instanceof ModelsNotConfiguredError) {
|
||||
results.push({
|
||||
filePath: file.name,
|
||||
ok: false,
|
||||
requestIndex, outcome: "failed",
|
||||
error: err.envelope.error,
|
||||
code: "models_not_configured",
|
||||
missing: err.envelope.missing,
|
||||
@@ -70,6 +74,7 @@ export async function POST(request: Request) {
|
||||
results.push({
|
||||
filePath: file.name,
|
||||
ok: false,
|
||||
requestIndex, outcome: "failed",
|
||||
error: err.envelope.error,
|
||||
code: PROVIDER_KEY_MISSING_CODE,
|
||||
provider: err.envelope.provider,
|
||||
@@ -77,7 +82,12 @@ export async function POST(request: Request) {
|
||||
});
|
||||
continue;
|
||||
}
|
||||
results.push({ filePath: file.name, ok: false, error: err instanceof Error ? err.message : String(err) });
|
||||
results.push({
|
||||
filePath: file.name, requestIndex, ok: false,
|
||||
outcome: err instanceof NotesImportError ? err.outcome : "failed",
|
||||
...(err instanceof NotesImportError ? { stats: err.partialStats } : {}),
|
||||
error: err instanceof Error ? err.message : String(err),
|
||||
});
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { modelCatalog } from "@/src/server";
|
||||
import { modelCatalog, refreshConnectionCatalog } from "@/src/server";
|
||||
|
||||
/**
|
||||
* The model picker's data (model-control wave): pi-ai's configured-provider
|
||||
@@ -7,5 +7,6 @@ import { modelCatalog } from "@/src/server";
|
||||
* catalog: no network, stable within a pi-ai version.
|
||||
*/
|
||||
export async function GET() {
|
||||
return Response.json(modelCatalog());
|
||||
await refreshConnectionCatalog();
|
||||
return Response.json(modelCatalog(), { headers: { "Cache-Control": "no-store" } });
|
||||
}
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
import { keyValue, openRouterTranscription } from "@/src/server";
|
||||
|
||||
export const runtime = "nodejs";
|
||||
|
||||
/** Check availability before recording; the token stays on the server. */
|
||||
export function GET() {
|
||||
return Response.json({ configured: Boolean(keyValue("OPENROUTER_API_KEY")) }, { headers: { "Cache-Control": "no-store" } });
|
||||
}
|
||||
|
||||
export async function POST(request: Request) {
|
||||
return openRouterTranscription(request);
|
||||
}
|
||||
@@ -598,3 +598,6 @@ body {
|
||||
outline: 1px solid var(--border);
|
||||
border-radius: 0.25rem;
|
||||
}
|
||||
|
||||
/* Source Sans 3 lacks Cyrillic; Russian prose uses the bundled Noto Sans subset. */
|
||||
html[lang="ru"] { --font-sans3: var(--font-russian-prose); }
|
||||
|
||||
+22
-9
@@ -1,5 +1,9 @@
|
||||
import { headers } from "next/headers";
|
||||
import { readSettingsRecord } from "@/src/server";
|
||||
import { resolveLanguage, systemLanguage, translate } from "@/src/core";
|
||||
import { I18nProvider } from "@/components/i18n";
|
||||
import type { Metadata } from "next";
|
||||
import { JetBrains_Mono, Source_Sans_3 } from "next/font/google";
|
||||
import { JetBrains_Mono, Source_Sans_3, Noto_Sans } from "next/font/google";
|
||||
import "katex/dist/katex.min.css";
|
||||
import "./globals.css";
|
||||
import { AppShell, SidebarProvider } from "@/components/sidebar";
|
||||
@@ -10,21 +14,29 @@ import UpdateBanner from "@/components/update-banner";
|
||||
|
||||
// Chrome = JetBrains Mono, teaching prose = Source Sans 3, titles = CMU
|
||||
// Serif (the bundled lh-cmu @font-face in globals.css — no CDN).
|
||||
const ui = JetBrains_Mono({ subsets: ["latin"], variable: "--font-jetbrains" });
|
||||
const ui = JetBrains_Mono({ subsets: ["latin", "cyrillic"], variable: "--font-jetbrains" });
|
||||
const prose = Source_Sans_3({ subsets: ["latin"], variable: "--font-sans3" });
|
||||
|
||||
export const metadata: Metadata = {
|
||||
title: "Learning Harness",
|
||||
description: "A teacher agent with a memory — sessions, quizzes, and a knowledge graph of what you know.",
|
||||
};
|
||||
const russianProse = Noto_Sans({ subsets: ["latin", "cyrillic"], variable: "--font-russian-prose" });
|
||||
|
||||
export default function RootLayout({ children }: { children: React.ReactNode }) {
|
||||
export async function generateMetadata(): Promise<Metadata> {
|
||||
const language = resolveLanguage(readSettingsRecord()?.general?.language, (await headers()).get("accept-language"));
|
||||
return {
|
||||
title: "Learning Harness",
|
||||
description: translate(language, "A teacher agent with a memory — sessions, quizzes, and a knowledge graph of what you know."),
|
||||
};
|
||||
}
|
||||
|
||||
export default async function RootLayout({ children }: { children: React.ReactNode }) {
|
||||
const general = readSettingsRecord()?.general ?? {};
|
||||
const system = systemLanguage((await headers()).get("accept-language"));
|
||||
const language = resolveLanguage(general.language, system);
|
||||
return (
|
||||
<html lang="en" className={`dark ${ui.variable} ${prose.variable}`}>
|
||||
<html lang={language} className={`dark ${ui.variable} ${prose.variable} ${russianProse.variable}`}>
|
||||
<body className="min-h-dvh antialiased">
|
||||
{/* The notification channel rides OUTSIDE everything: sidebar, dock,
|
||||
and pages all subscribe as the polls retire (push S3, 2026-10-02). */}
|
||||
<ServerEventsProvider>
|
||||
<I18nProvider initialGeneral={general} system={system}><ServerEventsProvider>
|
||||
<AppearanceProvider>
|
||||
<SidebarProvider>
|
||||
<ActivityProvider>
|
||||
@@ -35,6 +47,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
|
||||
</ServerEventsProvider>
|
||||
{/* Auto-update banner (Wave C): fixed card, Electron-only pushes. */}
|
||||
<UpdateBanner />
|
||||
</I18nProvider>
|
||||
</body>
|
||||
</html>
|
||||
);
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useEffect } from "react";
|
||||
import { createPortal } from "react-dom";
|
||||
@@ -60,13 +62,14 @@ export function AbortTurnBody({
|
||||
* (owner, 2026-10-04): the line says so. */
|
||||
busy?: boolean;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const backdropDismiss = useBackdropDismiss(onClose);
|
||||
const copy = COPY[mode];
|
||||
return (
|
||||
<div
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-label={copy.title}
|
||||
aria-label={t(copy.title)}
|
||||
data-testid="abort-turn-dialog"
|
||||
className="fixed inset-0 z-50 flex items-center justify-center bg-background/80 backdrop-blur-sm"
|
||||
// A genuine click on the scrim cancels — the cautious default, like Esc.
|
||||
@@ -77,11 +80,11 @@ export function AbortTurnBody({
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
>
|
||||
<h2 className="text-sm font-semibold text-card-foreground" data-testid="abort-turn-title">
|
||||
{copy.title}
|
||||
{t(copy.title)}
|
||||
</h2>
|
||||
<p className="mt-1.5 text-xs text-muted-foreground" data-testid="abort-turn-line">
|
||||
{copy.line}
|
||||
{busy && mode !== "turn" ? " The working turn stops too." : ""}
|
||||
{t(copy.line)}
|
||||
{busy && mode !== "turn" ? t(" The working turn stops too.") : ""}
|
||||
</p>
|
||||
<div className="mt-4 flex justify-end gap-2">
|
||||
<button
|
||||
@@ -90,8 +93,7 @@ export function AbortTurnBody({
|
||||
onClick={onClose}
|
||||
className="rounded-sm px-3 py-1.5 text-xs text-muted-foreground transition-colors hover:text-foreground"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
{t("Cancel")}</button>
|
||||
<button
|
||||
type="button"
|
||||
data-testid="abort-turn-confirm"
|
||||
@@ -99,7 +101,7 @@ export function AbortTurnBody({
|
||||
// Destructive red — the app's established destructive pair.
|
||||
className="rounded-sm border border-destructive/50 bg-destructive/10 px-3 py-1.5 text-xs text-destructive transition-colors hover:bg-destructive/20"
|
||||
>
|
||||
{copy.action}
|
||||
{t(copy.action)}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,11 +1,14 @@
|
||||
"use client";
|
||||
import { translator, type Language } from "@/src/core";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
|
||||
import { ActivityIcon, BotIcon, FileTextIcon, PenToolIcon, PlayIcon, SearchIcon, SquareIcon, WaypointsIcon } from "lucide-react";
|
||||
import { cn } from "@/lib/utils";
|
||||
import type { CallUsage, JobKind, JobRecord } from "@/src/core";
|
||||
import { isModelsRefusal, isProviderKeyRefusal, jobCost } from "@/src/core";
|
||||
import { formatTokens, formatUsd } from "@/components/usage-format";
|
||||
import { isModelsRefusal, isProviderKeyRefusal, subscriptionLabel, subscriptionLabels } from "@/src/core";
|
||||
import { formatTokens, planCostLabel } from "@/components/usage-format";
|
||||
import { useServerEvent, useServerResync } from "@/components/server-events";
|
||||
|
||||
/**
|
||||
@@ -20,7 +23,7 @@ import { useServerEvent, useServerResync } from "@/components/server-events";
|
||||
* Data: ONE feed of GET /api/activity (jobs across ALL chats, title-joined,
|
||||
* oldest-first + extraction runs), fetched when truth moves (events
|
||||
* channel, S5) and folded client-side with core/prices.ts.
|
||||
* Cost is INFERRED (jobCost); the context line is the LAST model call's
|
||||
* Cost is INFERRED server-side through Pi; the context line is the LAST model call's
|
||||
* input+output against the model's limit (JobUsage.lastStep — pending
|
||||
* contract) — never a cumulative sum, which would be the wrong number.
|
||||
* Absent data renders "—", never zero (the doctrine).
|
||||
@@ -48,6 +51,8 @@ interface FeedUsage extends NonNullable<JobRecord["usage"]> {
|
||||
}
|
||||
|
||||
export interface FeedJob extends JobRecord {
|
||||
/** Read-time server estimate; absent on older transport payloads. */
|
||||
costUsd?: number | null;
|
||||
title: string;
|
||||
usage?: FeedUsage;
|
||||
/** Server-joined live catalog limit (owner amendment 2026-09-23) —
|
||||
@@ -200,7 +205,7 @@ export function toBlobs(feed: ActivityFeed): ActivityBlob[] {
|
||||
// blob shape's call — here the line simply hides).
|
||||
const limit = job.contextLimit;
|
||||
if (usage && lastStep && limit !== null && lastStep.inputTokens !== undefined) {
|
||||
// Same metric as the session meter (prices.ts stepFootprint — the
|
||||
// Same metric as the session meter (four normalized buckets — the
|
||||
// context-meter audit, owner 2026-09-23): all four directions.
|
||||
// Provider "input" EXCLUDES cacheRead/cacheWrite, so input+output
|
||||
// alone reads wildly low on cache-heavy jobs.
|
||||
@@ -220,7 +225,7 @@ export function toBlobs(feed: ActivityFeed): ActivityBlob[] {
|
||||
title: job.title,
|
||||
chatId: job.chatId,
|
||||
startedAt: Date.parse(job.createdAt) || 0,
|
||||
cost: jobCost(job),
|
||||
cost: job.costUsd ?? null,
|
||||
context,
|
||||
// BYOK (owner, 2026-09-22): a refusal is info, not failure —
|
||||
// the honest line the runner left ("failed") reads as setup
|
||||
@@ -255,12 +260,13 @@ export function toBlobs(feed: ActivityFeed): ActivityBlob[] {
|
||||
}
|
||||
|
||||
/** Elapsed as a compact ticking string: 45s / 3m 04s / 1h 12m. */
|
||||
export function formatElapsed(ms: number): string {
|
||||
export function formatElapsed(ms: number, language: Language = "en"): string {
|
||||
const t = translator(language);
|
||||
const s = Math.max(0, Math.floor(ms / 1000));
|
||||
if (s < 60) return `${s}s`;
|
||||
if (s < 60) return t("{v0}s", { v0: s });
|
||||
const m = Math.floor(s / 60);
|
||||
if (m < 60) return `${m}m ${String(s % 60).padStart(2, "0")}s`;
|
||||
return `${Math.floor(m / 60)}h ${String(m % 60).padStart(2, "0")}m`;
|
||||
if (m < 60) return t("{v0}m {v1}s", { v0: m, v1: String(s % 60).padStart(2, "0") });
|
||||
return t("{v0}h {v1}m", { v0: Math.floor(m / 60), v1: String(m % 60).padStart(2, "0") });
|
||||
}
|
||||
|
||||
// ─── The section (the sidebar's bottom strip) ─────────────────────────────────
|
||||
@@ -287,6 +293,7 @@ const KIND_ICON: Record<JobKind, typeof SearchIcon> = {
|
||||
type AbortState = "pending" | "failed";
|
||||
|
||||
export function ActivitySection({ feed: feedProp }: { feed?: ActivityFeed }) {
|
||||
const { t } = useI18n();
|
||||
const ctx = useContext(ActivityContext);
|
||||
const feed = feedProp ?? ctx.feed;
|
||||
const refresh = ctx.refresh;
|
||||
@@ -345,10 +352,9 @@ export function ActivitySection({ feed: feedProp }: { feed?: ActivityFeed }) {
|
||||
<section data-testid="activity-section" className="border-t border-border px-3 pb-3 pt-2">
|
||||
<div className="mb-1 flex items-center gap-1.5 text-xs uppercase tracking-widest text-muted-foreground/70">
|
||||
<ActivityIcon className="size-3" />
|
||||
Background agents
|
||||
{blobs.length > 0 && (
|
||||
<span className="ml-auto tabular-nums" data-testid="activity-total-cost" title="Total running cost (inferred)">
|
||||
{totalCost === null ? "—" : formatUsd(totalCost)}
|
||||
{t("Background agents")}{blobs.length > 0 && (
|
||||
<span className="ml-auto tabular-nums" data-testid="activity-total-cost" title={t("Total running cost (inferred)")}>
|
||||
{planCostLabel(totalCost, subscriptionLabels(blobs.map((blob) => blob.model)))}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
@@ -387,19 +393,20 @@ function ActivityBlobRow({
|
||||
abortState: AbortState | undefined;
|
||||
onAbort: () => void;
|
||||
}) {
|
||||
const { t, language } = useI18n();
|
||||
const Icon = blob.process === "extraction" ? WaypointsIcon : (blob.jobKind && KIND_ICON[blob.jobKind]) || BotIcon;
|
||||
const label =
|
||||
blob.process === "extraction"
|
||||
? `Extraction — ${blob.phase ?? "running"}`
|
||||
? t("Extraction — {v0}", { v0: t(blob.phase ?? "running") })
|
||||
: blob.jobKind === "research"
|
||||
? "Researcher"
|
||||
? t("Researcher")
|
||||
: blob.jobKind === "demo"
|
||||
? "Demo builder"
|
||||
? t("Demo builder")
|
||||
: blob.jobKind === "visual"
|
||||
? "Figure maker"
|
||||
? t("Figure maker")
|
||||
: blob.jobKind === "pdf"
|
||||
? "PDF reader"
|
||||
: "Sub-agent";
|
||||
? t("PDF reader")
|
||||
: t("Sub-agent");
|
||||
return (
|
||||
<div
|
||||
data-testid={`activity-blob-${blob.process}`}
|
||||
@@ -415,16 +422,16 @@ function ActivityBlobRow({
|
||||
<span className="min-w-0 flex-1">
|
||||
<span className="block truncate font-medium text-card-foreground">{blob.title}</span>
|
||||
{blob.activity ? (
|
||||
<span className="block truncate text-muted-foreground" title={blob.activity}>
|
||||
{blob.activity}
|
||||
<span className="block truncate text-muted-foreground" title={t(blob.activity)}>
|
||||
{t(blob.activity)}
|
||||
</span>
|
||||
) : (
|
||||
<span className="block truncate text-muted-foreground/80">{label}</span>
|
||||
)}
|
||||
</span>
|
||||
<span className="flex shrink-0 items-center gap-2 tabular-nums text-muted-foreground">
|
||||
<span data-testid="activity-blob-cost">{blob.cost === null ? "—" : formatUsd(blob.cost)}</span>
|
||||
<span data-testid="activity-blob-elapsed">{formatElapsed(now - blob.startedAt)}</span>
|
||||
<span data-testid="activity-blob-cost">{planCostLabel(blob.cost, subscriptionLabel(blob.model))}</span>
|
||||
<span data-testid="activity-blob-elapsed">{formatElapsed(now - blob.startedAt, language)}</span>
|
||||
</span>
|
||||
</button>
|
||||
{/* The explicit END always on the blob's face (SCOPE) — the popover
|
||||
@@ -435,8 +442,8 @@ function ActivityBlobRow({
|
||||
data-testid="activity-abort"
|
||||
onClick={onAbort}
|
||||
disabled={abortState !== undefined}
|
||||
title={abortState === "failed" ? "Abort failed — try again" : "End this background process"}
|
||||
aria-label={`End ${label} in ${blob.title}`}
|
||||
title={abortState === "failed" ? t("Abort failed — try again") : t("End this background process")}
|
||||
aria-label={t("End {v0} in {v1}", { v0: label, v1: blob.title })}
|
||||
className="absolute right-1 top-1/2 -translate-y-1/2 rounded-md p-1 text-muted-foreground/70 transition-colors hover:bg-destructive/10 hover:text-destructive disabled:opacity-50"
|
||||
>
|
||||
<SquareIcon className="size-3" />
|
||||
@@ -451,47 +458,46 @@ function ActivityBlobRow({
|
||||
<Icon className="size-3.5 text-muted-foreground" />
|
||||
<span className="font-medium">{label}</span>
|
||||
<span className="ml-auto tabular-nums text-muted-foreground">
|
||||
{formatElapsed(now - blob.startedAt)}
|
||||
{formatElapsed(now - blob.startedAt, language)}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex flex-col gap-1 text-muted-foreground">
|
||||
<div className="truncate text-card-foreground" title={blob.title}>
|
||||
{blob.title}
|
||||
</div>
|
||||
{blob.activity && <div className="break-words">{blob.activity}</div>}
|
||||
{blob.activity && <div className="break-words">{t(blob.activity)}</div>}
|
||||
<div className="flex justify-between gap-2">
|
||||
<span>Cost</span>
|
||||
<span>{t("Cost")}</span>
|
||||
<span className="tabular-nums text-card-foreground">
|
||||
{blob.cost === null ? "—" : formatUsd(blob.cost)}
|
||||
{planCostLabel(blob.cost, subscriptionLabel(blob.model))}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex justify-between gap-2">
|
||||
<span>Context</span>
|
||||
<span>{t("Context")}</span>
|
||||
<span className="tabular-nums text-card-foreground" data-testid="activity-blob-context">
|
||||
{blob.context === null
|
||||
? "—"
|
||||
: `${formatTokens(blob.context.used)} / ${formatTokens(blob.context.limit)}`}
|
||||
: `${formatTokens(blob.context.used, language)} / ${formatTokens(blob.context.limit, language)}`}
|
||||
</span>
|
||||
</div>
|
||||
{blob.model && (
|
||||
<div className="flex justify-between gap-2">
|
||||
<span>Model</span>
|
||||
<span>{t("Model")}</span>
|
||||
<span className="truncate text-card-foreground">{blob.model}</span>
|
||||
</div>
|
||||
)}
|
||||
{blob.steps !== undefined && (
|
||||
<div className="flex justify-between gap-2">
|
||||
<span>Steps</span>
|
||||
<span>{t("Steps")}</span>
|
||||
<span className="tabular-nums text-card-foreground">{blob.steps}</span>
|
||||
</div>
|
||||
)}
|
||||
<a href={`/chat/${blob.chatId}`} className="text-primary hover:underline">
|
||||
Open session →
|
||||
</a>
|
||||
{t("Open session →")}</a>
|
||||
</div>
|
||||
<div className="mt-2 text-muted-foreground/80">
|
||||
{abortState === "failed" && "Abort failed — try again"}
|
||||
{abortState === "pending" && "Stopping…"}
|
||||
{abortState === "failed" && t("Abort failed — try again")}
|
||||
{abortState === "pending" && t("Stopping…")}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { Button } from "@/components/ui/button";
|
||||
import {
|
||||
@@ -31,6 +33,8 @@ import {
|
||||
import remarkBreaks from "remark-breaks";
|
||||
import {
|
||||
Streamdown,
|
||||
defaultTranslations,
|
||||
type StreamdownTranslations,
|
||||
type PluginConfig,
|
||||
} from "streamdown";
|
||||
import { mdComponents } from "@/components/md-blocks";
|
||||
@@ -264,11 +268,12 @@ export const MessageBranchPrevious = ({
|
||||
children,
|
||||
...props
|
||||
}: MessageBranchPreviousProps) => {
|
||||
const { t } = useI18n();
|
||||
const { goToPrevious, totalBranches } = useMessageBranch();
|
||||
|
||||
return (
|
||||
<Button
|
||||
aria-label="Previous branch"
|
||||
aria-label={t("Previous branch")}
|
||||
disabled={totalBranches <= 1}
|
||||
onClick={goToPrevious}
|
||||
size="icon-sm"
|
||||
@@ -287,11 +292,12 @@ export const MessageBranchNext = ({
|
||||
children,
|
||||
...props
|
||||
}: MessageBranchNextProps) => {
|
||||
const { t } = useI18n();
|
||||
const { goToNext, totalBranches } = useMessageBranch();
|
||||
|
||||
return (
|
||||
<Button
|
||||
aria-label="Next branch"
|
||||
aria-label={t("Next branch")}
|
||||
disabled={totalBranches <= 1}
|
||||
onClick={goToNext}
|
||||
size="icon-sm"
|
||||
@@ -310,6 +316,7 @@ export const MessageBranchPage = ({
|
||||
className,
|
||||
...props
|
||||
}: MessageBranchPageProps) => {
|
||||
const { t } = useI18n();
|
||||
const { currentBranch, totalBranches } = useMessageBranch();
|
||||
|
||||
return (
|
||||
@@ -320,7 +327,7 @@ export const MessageBranchPage = ({
|
||||
)}
|
||||
{...props}
|
||||
>
|
||||
{currentBranch + 1} of {totalBranches}
|
||||
{currentBranch + 1}{" "}{t("of")}{" "}{totalBranches}
|
||||
</ButtonGroupText>
|
||||
);
|
||||
};
|
||||
@@ -357,6 +364,8 @@ export const streamdownPlugins = {
|
||||
|
||||
export const MessageResponse = memo(
|
||||
({ className, children, ...props }: MessageResponseProps) => {
|
||||
const { t } = useI18n();
|
||||
const translations = Object.fromEntries(Object.entries(defaultTranslations).map(([key, text]) => [key, t(text)])) as Partial<StreamdownTranslations>;
|
||||
// Legacy backslash delimiters are converted in a single linear scan;
|
||||
// native dollar math passes through to Streamdown unchanged. Incomplete
|
||||
// legacy spans are left for a later render when their closer arrives.
|
||||
@@ -373,6 +382,7 @@ export const MessageResponse = memo(
|
||||
"lh-prose size-full [&>*:first-child]:mt-0 [&>*:last-child]:mb-0",
|
||||
className
|
||||
)}
|
||||
translations={translations}
|
||||
components={mdComponents}
|
||||
plugins={streamdownPlugins}
|
||||
{...props}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
import { useControllableState } from "@radix-ui/react-use-controllable-state";
|
||||
import { blurAfterPointerClick } from "@/components/focus-hygiene";
|
||||
@@ -134,20 +135,22 @@ export type ReasoningTriggerProps = ComponentProps<
|
||||
for a few seconds"), bookkeeping for information we knowingly lose. The
|
||||
label pairs with the user's collapsed "Your thinking" rows — one
|
||||
language; motion (spinner + shimmer) stays the working signal. */
|
||||
const defaultGetThinkingMessage = (isStreaming: boolean) => {
|
||||
const DefaultThinkingMessage = ({ isStreaming }: { isStreaming: boolean }) => {
|
||||
const { t } = useI18n();
|
||||
if (isStreaming) {
|
||||
return <Shimmer duration={1}>Thinking...</Shimmer>;
|
||||
return <Shimmer duration={1}>{t("Thinking...")}</Shimmer>;
|
||||
}
|
||||
return <p>AGENT’S THINKING</p>;
|
||||
return <p>{t("AGENT’S THINKING")}</p>;
|
||||
};
|
||||
|
||||
export const ReasoningTrigger = memo(
|
||||
({
|
||||
className,
|
||||
children,
|
||||
getThinkingMessage = defaultGetThinkingMessage,
|
||||
getThinkingMessage = (isStreaming) => <DefaultThinkingMessage isStreaming={isStreaming} />,
|
||||
...props
|
||||
}: ReasoningTriggerProps) => {
|
||||
const { t } = useI18n();
|
||||
const { isStreaming, isOpen } = useReasoning();
|
||||
|
||||
return (
|
||||
@@ -175,7 +178,7 @@ export const ReasoningTrigger = memo(
|
||||
the component default (h-3) — IDENTICAL to the placeholder
|
||||
spinner (owner, 2026-10-02): the handoff between the two
|
||||
states must be visually seamless, one size everywhere. */}
|
||||
{isStreaming && <BrailleSpinner label="Thinking" />}
|
||||
{isStreaming && <BrailleSpinner label={t("Thinking")} />}
|
||||
{getThinkingMessage(isStreaming)}
|
||||
<ChevronDownIcon
|
||||
className={cn(
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useState } from "react";
|
||||
import { ConfidenceRail } from "@/components/confidence-rail";
|
||||
@@ -20,12 +22,12 @@ import { parseAskInput, parseQuizInput } from "@/src/core";
|
||||
* the explanation, with NO verdict chips (owner ruling 2026-09-27).
|
||||
*/
|
||||
export function AnsweredCard({ answer, input }: { answer: QuestionAnswerData; input?: unknown }) {
|
||||
const { t } = useI18n();
|
||||
const [whyOpen, setWhyOpen] = useState(false); // the tucked explanation (predictions, owner 2026-10-03)
|
||||
if (answer.dismissed) {
|
||||
return (
|
||||
<div className="rounded-xl border bg-card p-4 text-sm text-muted-foreground">
|
||||
<span className="font-medium">{answer.questionText}</span> — skipped
|
||||
</div>
|
||||
<span className="font-medium">{answer.questionText}</span> {" "}{t("— skipped")}</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -51,7 +53,7 @@ export function AnsweredCard({ answer, input }: { answer: QuestionAnswerData; in
|
||||
ThinkingBlock, instead of an inset inside the answer. Same muted
|
||||
rail as before; the label is now plain "Your thinking". */}
|
||||
{answer.readingThinking && (
|
||||
<ThinkingBlock testId="reading-thinking-block" label="YOUR THINKING" text={answer.readingThinking} defaultOpen />
|
||||
<ThinkingBlock testId="reading-thinking-block" label={t("YOUR THINKING")} text={answer.readingThinking} defaultOpen />
|
||||
)}
|
||||
{/* [&>*:last-child]:mb-0 (owner round, 2026-10-07): on ask cards the
|
||||
thinking row is the last child — its my-3 stacked with the card's
|
||||
@@ -66,23 +68,23 @@ export function AnsweredCard({ answer, input }: { answer: QuestionAnswerData; in
|
||||
cards label Probe/Recall — the phase boundary visible in the
|
||||
transcript. No `tool` on old records: kind labels as before. */}
|
||||
{answer.tool === "probe"
|
||||
? "Probe"
|
||||
? t("Probe")
|
||||
: answer.tool === "recall"
|
||||
? "Recall"
|
||||
? t("Recall")
|
||||
: isQuiz
|
||||
? answer.questionType === "predict"
|
||||
? "Prediction"
|
||||
: "Check"
|
||||
? t("Prediction")
|
||||
: t("Check")
|
||||
: isExplain
|
||||
? "Explain"
|
||||
: "Question"}
|
||||
? t("Explain")
|
||||
: t("Question")}
|
||||
{isQuiz &&
|
||||
(answer.dontKnow ? (
|
||||
<span className="rounded bg-muted px-1.5 py-0.5">didn't know</span>
|
||||
<span className="rounded bg-muted px-1.5 py-0.5">{t("didn't know")}</span>
|
||||
) : answer.correct ? (
|
||||
<span className="rounded bg-green-500/15 px-1.5 py-0.5 text-green-500">correct</span>
|
||||
<span className="rounded bg-green-500/15 px-1.5 py-0.5 text-green-500">{t("correct")}</span>
|
||||
) : (
|
||||
<span className="rounded bg-red-500/15 px-1.5 py-0.5 text-red-500">incorrect</span>
|
||||
<span className="rounded bg-red-500/15 px-1.5 py-0.5 text-red-500">{t("incorrect")}</span>
|
||||
))}
|
||||
</div>
|
||||
<div className="mb-3 font-medium">
|
||||
@@ -176,7 +178,7 @@ export function AnsweredCard({ answer, input }: { answer: QuestionAnswerData; in
|
||||
</div>
|
||||
)}
|
||||
{answer.dontKnow && isQuiz && (
|
||||
<div className="mt-2 text-sm text-muted-foreground">Answered “I don't know”.</div>
|
||||
<div className="mt-2 text-sm text-muted-foreground">{t("Answered “I don't know”.")}</div>
|
||||
)}
|
||||
|
||||
{(answer.thinking ?? answer.note) && (
|
||||
@@ -186,7 +188,7 @@ export function AnsweredCard({ answer, input }: { answer: QuestionAnswerData; in
|
||||
the accent lift read too light); rail only, heights identical. */
|
||||
<ThinkingBlock
|
||||
testId="your-thinking"
|
||||
label="YOUR THINKING"
|
||||
label={t("YOUR THINKING")}
|
||||
text={answer.thinking ?? answer.note ?? ""}
|
||||
inCard
|
||||
/>
|
||||
@@ -206,11 +208,11 @@ export function AnsweredCard({ answer, input }: { answer: QuestionAnswerData; in
|
||||
onClick={() => setWhyOpen((v) => !v)}
|
||||
className="text-xs font-medium text-muted-foreground transition-colors hover:text-foreground"
|
||||
>
|
||||
{whyOpen ? "Hide why" : "Why"}
|
||||
{whyOpen ? t("Hide why") : t("Why")}
|
||||
</button>
|
||||
{whyOpen && (
|
||||
<div className="mt-1.5 rounded-lg bg-muted py-2 text-sm text-foreground/50">
|
||||
<span className="font-medium text-muted-foreground">Why: </span>
|
||||
<span className="font-medium text-muted-foreground">{t("Why:")}{" "}</span>
|
||||
{/* The markdown wrapper must go truly inline — a block <p> after the
|
||||
"Why:" label created the oversized leading gap (owner's fix list). */}
|
||||
<MessageResponse className="inline [&_p]:inline [&_p]:m-0">{answer.explanation}</MessageResponse>
|
||||
@@ -224,7 +226,7 @@ export function AnsweredCard({ answer, input }: { answer: QuestionAnswerData; in
|
||||
the model's next reply IS the grading. */}
|
||||
{isExplain && answer.committed && (
|
||||
<div className="mt-3 rounded-lg bg-muted py-2 text-sm text-muted-foreground">
|
||||
<span className="font-medium text-foreground">The answer: </span>
|
||||
<span className="font-medium text-foreground">{t("The answer:")}{" "}</span>
|
||||
<MessageResponse className="inline [&_p]:inline [&_p]:m-0">{answer.committed}</MessageResponse>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useContext, useEffect, useMemo, useRef, useState } from "react";
|
||||
import { DownloadIcon } from "lucide-react";
|
||||
@@ -100,12 +102,12 @@ export function DemoOutputCard({
|
||||
messageId?: string;
|
||||
initialInverted?: boolean;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const result = output as DemoResult | undefined;
|
||||
if (!result || typeof result.html !== "string" || typeof result.title !== "string") {
|
||||
return (
|
||||
<div className="rounded-xl border bg-card p-4 text-sm text-muted-foreground">
|
||||
Demo completed, but the result could not be displayed.
|
||||
</div>
|
||||
{t("Demo completed, but the result could not be displayed.")}</div>
|
||||
);
|
||||
}
|
||||
const failed = result.html.length === 0;
|
||||
@@ -113,10 +115,9 @@ export function DemoOutputCard({
|
||||
return (
|
||||
<div className="rounded-xl border bg-card p-4 text-card-foreground" data-testid="demo-card-failed">
|
||||
<div className="flex items-center gap-2 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
Interactive demo
|
||||
<span className="rounded bg-red-500/15 px-1.5 py-0.5 text-red-500">failed</span>
|
||||
{t("Interactive demo")}<span className="rounded bg-red-500/15 px-1.5 py-0.5 text-red-500">{t("failed")}</span>
|
||||
</div>
|
||||
<p className="mt-2 text-sm text-muted-foreground">{result.notes ?? "The demo could not be built."}</p>
|
||||
<p className="mt-2 text-sm text-muted-foreground">{result.notes ?? t("The demo could not be built.")}</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -136,6 +137,7 @@ function DemoFrame({
|
||||
messageId?: string;
|
||||
initialInverted?: boolean;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const actions = useContext(ChatActionsContext);
|
||||
const iframeRef = useRef<HTMLIFrameElement | null>(null);
|
||||
const [state, setState] = useState<DemoBridgeState>(INITIAL_DEMO_BRIDGE_STATE);
|
||||
@@ -177,22 +179,21 @@ function DemoFrame({
|
||||
<div className="flex items-center justify-between gap-2">
|
||||
<div className="flex min-w-0 items-baseline gap-2">
|
||||
<span className="shrink-0 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
interactive demo
|
||||
</span>
|
||||
{t("interactive demo")}</span>
|
||||
<span className="truncate text-xs font-medium tracking-wide text-foreground">{title}</span>
|
||||
</div>
|
||||
<div className="flex shrink-0 items-center gap-1.5">
|
||||
<Toggle
|
||||
checked={inverted}
|
||||
onChange={toggleInverted}
|
||||
label="Invert demo brightness"
|
||||
title="Invert colors"
|
||||
label={t("Invert demo brightness")}
|
||||
title={t("Invert colors")}
|
||||
discIcon={<InvertDiscIcon className="size-3" />}
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Download demo as HTML"
|
||||
title="Download as HTML"
|
||||
aria-label={t("Download demo as HTML")}
|
||||
title={t("Download as HTML")}
|
||||
onClick={() => downloadFile(`${slugFilename(title)}.html`, html, "text/html")}
|
||||
data-testid="demo-download"
|
||||
className="rounded-md p-1.5 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
|
||||
@@ -205,7 +206,7 @@ function DemoFrame({
|
||||
<DemoErrorChip
|
||||
title={title}
|
||||
message={state.error}
|
||||
onSend={actions ? () => actions.sendText(`The demo "${title}" threw an error: ${state.error}`) : undefined}
|
||||
onSend={actions ? () => actions.sendText(t("The demo \"{v0}\" threw an error: {v1}", { v0: title, v1: state.error })) : undefined}
|
||||
/>
|
||||
)}
|
||||
<iframe
|
||||
@@ -245,12 +246,13 @@ export function DemoErrorChip({
|
||||
message: string;
|
||||
onSend?: () => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<div
|
||||
className="mt-2 flex flex-wrap items-center gap-2 rounded-lg bg-red-500/10 px-3 py-2 text-sm text-red-500"
|
||||
data-testid="demo-error-chip"
|
||||
>
|
||||
<span className="font-medium">This demo threw an error</span>
|
||||
<span className="font-medium">{t("This demo threw an error")}</span>
|
||||
<span className="min-w-0 flex-1 truncate font-mono text-xs" title={message}>
|
||||
{message}
|
||||
</span>
|
||||
@@ -261,8 +263,7 @@ export function DemoErrorChip({
|
||||
className="rounded-md border border-red-500/40 px-2 py-1 text-xs font-medium hover:bg-red-500/15"
|
||||
data-testid="demo-error-send"
|
||||
>
|
||||
Send to teacher
|
||||
</button>
|
||||
{t("Send to teacher")}</button>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useContext } from "react";
|
||||
import { CheckIcon, SettingsIcon, XIcon } from "lucide-react";
|
||||
@@ -27,12 +29,13 @@ const KIND_LABEL: Record<JobKind, string> = {
|
||||
};
|
||||
|
||||
export function DispatchCard({ toolCallId, kind }: { toolCallId: string; kind: JobKind }) {
|
||||
const { t } = useI18n();
|
||||
const jobs = useContext(JobsContext);
|
||||
const job = jobs.find((j) => j.toolCallId === toolCallId) ?? null;
|
||||
const label = KIND_LABEL[kind];
|
||||
|
||||
if (!job || job.status === "running") {
|
||||
return <DispatchActivityCard job={job} label={label} />;
|
||||
return <DispatchActivityCard job={job} label={t(label)} />;
|
||||
}
|
||||
// BYOK (owner, 2026-09-22): a job refused for missing models is INFO,
|
||||
// not scary-error — gray glyph + "needs model setup" + the deep-link
|
||||
@@ -41,10 +44,10 @@ export function DispatchCard({ toolCallId, kind }: { toolCallId: string; kind: J
|
||||
// whose key is gone reads as the key being needed — the deep-link
|
||||
// lands on the SetupDialog's first-key stage on its own.
|
||||
if (isModelsRefusal(job.error)) {
|
||||
return <DispatchRefusedCard label={label} line="needs model setup" button="Set up models" />;
|
||||
return <DispatchRefusedCard label={t(label)} line={t("needs model setup")} button={t("Set up models")} />;
|
||||
}
|
||||
if (isProviderKeyRefusal(job.error)) {
|
||||
return <DispatchRefusedCard label={label} line="needs a provider key" button="Add a key" />;
|
||||
return <DispatchRefusedCard label={t(label)} line={t("needs a provider key")} button={t("Add a key")} />;
|
||||
}
|
||||
const failed = job.status === "error";
|
||||
return (
|
||||
@@ -53,14 +56,15 @@ export function DispatchCard({ toolCallId, kind }: { toolCallId: string; kind: J
|
||||
data-testid="dispatch-settled"
|
||||
>
|
||||
{failed ? <XIcon className="size-3.5 text-red-500" /> : <CheckIcon className="size-3.5" />}
|
||||
<span className="font-medium uppercase tracking-wide">{label}</span>
|
||||
<span>{failed ? "failed" : "delivered"}</span>
|
||||
<span className="font-medium uppercase tracking-wide">{t(label)}</span>
|
||||
<span>{failed ? t("failed") : t("delivered")}</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
/** The refused card: quiet info tone — nothing red, nothing "failed". */
|
||||
function DispatchRefusedCard({ label, line, button }: { label: string; line: string; button: string }) {
|
||||
const { t } = useI18n();
|
||||
const ctx = useContext(ChatActionsContext);
|
||||
return (
|
||||
<div
|
||||
@@ -68,7 +72,7 @@ function DispatchRefusedCard({ label, line, button }: { label: string; line: str
|
||||
data-testid="dispatch-refused"
|
||||
>
|
||||
<SettingsIcon className="size-3.5" />
|
||||
<span className="font-medium uppercase tracking-wide">{label}</span>
|
||||
<span className="font-medium uppercase tracking-wide">{t(label)}</span>
|
||||
<span>{line}</span>
|
||||
{ctx && (
|
||||
<button
|
||||
@@ -85,6 +89,7 @@ function DispatchRefusedCard({ label, line, button }: { label: string; line: str
|
||||
}
|
||||
|
||||
function DispatchActivityCard({ job, label }: { job: JobRecord | null; label: string }) {
|
||||
const { t } = useI18n();
|
||||
// Elapsed from createdAt — jobs appear here only via the jobs feed (post-mount),
|
||||
// so no SSR/hydration mismatch.
|
||||
const elapsed =
|
||||
@@ -99,19 +104,18 @@ function DispatchActivityCard({ job, label }: { job: JobRecord | null; label: st
|
||||
the Braille spinner replaces the pulsing dot — one indicator
|
||||
everywhere. This is the ONLY dispatch-card change; the card's
|
||||
shape is untouched. */}
|
||||
<BrailleSpinner label={`${label} running`} />
|
||||
{label}
|
||||
{elapsed !== null && <span className="font-normal">· {elapsed}s</span>}
|
||||
<BrailleSpinner label={t("{v0} running", { v0: label })} />
|
||||
{t(label)}
|
||||
{elapsed !== null && <span className="font-normal">· {t("{v0}s", { v0: elapsed })}</span>}
|
||||
</div>
|
||||
{job?.activity && (
|
||||
<div className="mt-1 truncate text-sm text-muted-foreground" data-testid="dispatch-activity-line">
|
||||
{job.activity}
|
||||
{t(job.activity)}
|
||||
</div>
|
||||
)}
|
||||
{!job && (
|
||||
<div className="mt-1 text-sm text-muted-foreground" data-testid="dispatch-pending">
|
||||
Dispatched…
|
||||
</div>
|
||||
{t("Dispatched…")}</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -13,7 +13,7 @@ export function slugFilename(title: string): string {
|
||||
.toLowerCase()
|
||||
.normalize("NFKD")
|
||||
.replace(/[\u0300-\u036f]/g, "")
|
||||
.replace(/[^a-z0-9]+/g, "-")
|
||||
.replace(/[^\p{L}\p{N}]+/gu, "-")
|
||||
.replace(/^-+|-+$/g, "")
|
||||
.slice(0, 64);
|
||||
return slug || "demo";
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { DispatchCard } from "@/components/artifacts/dispatch-card";
|
||||
import { MessageResponse } from "@/components/ai-elements/message";
|
||||
@@ -35,15 +37,15 @@ export function PdfJobCard({ part }: ArtifactPartProps) {
|
||||
* the same expand-on-demand idiom as research.
|
||||
*/
|
||||
export function PdfBriefCard({ output }: { output: unknown }) {
|
||||
const { t } = useI18n();
|
||||
const result = output as PdfResult | undefined;
|
||||
if (!result || typeof result.brief !== "string") {
|
||||
return (
|
||||
<div className="rounded-xl border bg-card p-4 text-sm text-muted-foreground">
|
||||
PDF reading completed, but the result could not be displayed.
|
||||
</div>
|
||||
{t("PDF reading completed, but the result could not be displayed.")}</div>
|
||||
);
|
||||
}
|
||||
const failed = result.brief.startsWith("PDF failed");
|
||||
const failed = result.brief.startsWith(t("PDF failed"));
|
||||
// Read = extract/render output entered the loop; consulted = every page
|
||||
// incl. search hits (the full audit set — the brief's citations may point
|
||||
// there). The ?? fallbacks tolerate pre-split persisted records.
|
||||
@@ -52,20 +54,19 @@ export function PdfBriefCard({ output }: { output: unknown }) {
|
||||
return (
|
||||
<div className="rounded-xl border bg-card p-4 text-card-foreground" data-testid="pdf-brief-card">
|
||||
<div className="mb-1 flex items-center gap-2 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
PDF brief
|
||||
{failed && <span className="rounded bg-red-500/15 px-1.5 py-0.5 text-red-500">failed</span>}
|
||||
{t("PDF brief")}{failed && <span className="rounded bg-red-500/15 px-1.5 py-0.5 text-red-500">{t("failed")}</span>}
|
||||
</div>
|
||||
<div className="text-sm [&_p:first-child]:mt-0 [&_p:last-child]:mb-0">
|
||||
<MessageResponse>{result.brief}</MessageResponse>
|
||||
</div>
|
||||
{!failed && readList.length > 0 && (
|
||||
<div className="mt-3 border-t pt-2 text-xs text-muted-foreground">
|
||||
Pages read: {readList.join(", ")}
|
||||
{t("Pages read:")}{" "}{readList.join(", ")}
|
||||
</div>
|
||||
)}
|
||||
{!failed && consultedList.length > readList.length && (
|
||||
<div className="mt-3 border-t pt-2 text-xs text-muted-foreground">
|
||||
Pages consulted: {consultedList.join(", ")}
|
||||
{t("Pages consulted:")}{" "}{consultedList.join(", ")}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
@@ -77,27 +78,26 @@ export function PdfBriefCard({ output }: { output: unknown }) {
|
||||
* the steer card (sub-agent result delivery) renders the same artifact.
|
||||
*/
|
||||
export function ResearchBriefCard({ output }: { output: unknown }) {
|
||||
const { t } = useI18n();
|
||||
const result = output as ResearchResult | undefined;
|
||||
if (!result || typeof result.brief !== "string") {
|
||||
return (
|
||||
<div className="rounded-xl border bg-card p-4 text-sm text-muted-foreground">
|
||||
Research completed, but the result could not be displayed.
|
||||
</div>
|
||||
{t("Research completed, but the result could not be displayed.")}</div>
|
||||
);
|
||||
}
|
||||
const failed = result.brief.startsWith("Research failed");
|
||||
const failed = result.brief.startsWith(t("Research failed"));
|
||||
return (
|
||||
<div className="rounded-xl border bg-card p-4 text-card-foreground" data-testid="research-brief-card">
|
||||
<div className="mb-1 flex items-center gap-2 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
Research brief
|
||||
{failed && <span className="rounded bg-red-500/15 px-1.5 py-0.5 text-red-500">failed</span>}
|
||||
{t("Research brief")}{failed && <span className="rounded bg-red-500/15 px-1.5 py-0.5 text-red-500">{t("failed")}</span>}
|
||||
</div>
|
||||
<div className="text-sm [&_p:first-child]:mt-0 [&_p:last-child]:mb-0">
|
||||
<MessageResponse>{result.brief}</MessageResponse>
|
||||
</div>
|
||||
{result.sources.length > 0 && (
|
||||
<div className="mt-3 border-t pt-2">
|
||||
<div className="mb-1 text-xs font-medium uppercase tracking-wide text-muted-foreground">Sources</div>
|
||||
<div className="mb-1 text-xs font-medium uppercase tracking-wide text-muted-foreground">{t("Sources")}</div>
|
||||
<ul className="flex flex-col gap-0.5 text-xs">
|
||||
{result.sources.map((s) => (
|
||||
<li key={s.url} className="truncate">
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { ChevronRight } from "lucide-react";
|
||||
import { BrailleSpinner } from "@/components/braille-spinner";
|
||||
@@ -28,6 +30,7 @@ interface StreamingToolPart {
|
||||
}
|
||||
|
||||
export function LiveToolCard({ part }: ArtifactPartProps) {
|
||||
const { t } = useI18n();
|
||||
const p = part as StreamingToolPart;
|
||||
const tool = p.type.replace(/^tool-/, "");
|
||||
const inp = (p.input ?? {}) as Record<string, unknown>;
|
||||
@@ -47,7 +50,7 @@ export function LiveToolCard({ part }: ArtifactPartProps) {
|
||||
className="group my-1 w-full max-w-2xl select-none"
|
||||
>
|
||||
<summary className="flex cursor-pointer list-none items-center gap-2 text-xs text-muted-foreground [&::-webkit-details-marker]:hidden">
|
||||
<BrailleSpinner label={`${toolActivityLabel(tool)} — live`} />
|
||||
<BrailleSpinner label={t("{v0} — live", { v0: toolActivityLabel(tool) })} />
|
||||
<Shimmer duration={1} className="text-xs">
|
||||
{toolActivityLabel(tool)}
|
||||
</Shimmer>
|
||||
@@ -55,7 +58,7 @@ export function LiveToolCard({ part }: ArtifactPartProps) {
|
||||
<ChevronRight className="size-3 shrink-0 opacity-50 transition-transform group-open:rotate-90" />
|
||||
</summary>
|
||||
<div className="mt-2 rounded-xl border bg-card p-3 text-xs">
|
||||
<div className="mb-1 font-medium uppercase tracking-wide text-muted-foreground">Input (streaming)</div>
|
||||
<div className="mb-1 font-medium uppercase tracking-wide text-muted-foreground">{t("Input (streaming)")}</div>
|
||||
<pre className="max-h-32 overflow-auto whitespace-pre-wrap break-all font-mono text-[11px] leading-relaxed">
|
||||
{hasInput ? JSON.stringify(p.input, null, 2) : "…"}
|
||||
</pre>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { ClipboardCheckIcon } from "lucide-react";
|
||||
import { parseProbeDoneInput, type ProbeDoneResult } from "@/src/core";
|
||||
@@ -22,6 +24,7 @@ import { parseProbeDoneInput, type ProbeDoneResult } from "@/src/core";
|
||||
* the UI wave; this card just guarantees the data is never invisible.
|
||||
*/
|
||||
export function ProbeDoneCard({ part }: { part: { input?: unknown; output?: unknown; state?: unknown } }) {
|
||||
const { t } = useI18n();
|
||||
const output = part.output as ProbeDoneResult | undefined;
|
||||
const state = typeof part.state === "string" ? part.state : "";
|
||||
|
||||
@@ -43,14 +46,12 @@ export function ProbeDoneCard({ part }: { part: { input?: unknown; output?: unkn
|
||||
<div data-testid="probe-done-card" className="my-3 rounded-xl border bg-card/60 p-3">
|
||||
<div className="mb-2 flex items-center gap-2 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
<ClipboardCheckIcon className="size-3.5 text-primary" />
|
||||
Probe concluded — your assessment
|
||||
</div>
|
||||
{t("Probe concluded — your assessment")}</div>
|
||||
{output && !output.ok ? (
|
||||
<p className="text-sm text-muted-foreground">The prober retried: {output.error}</p>
|
||||
<p className="text-sm text-muted-foreground">{t("The prober retried:")}{" "}{output.error}</p>
|
||||
) : state === "output-error" ? (
|
||||
<p className="text-sm text-muted-foreground">
|
||||
The assessment was malformed — the prober retried with a corrected one.
|
||||
</p>
|
||||
{t("The assessment was malformed — the prober retried with a corrected one.")}</p>
|
||||
) : strands ? (
|
||||
<div className="space-y-2">
|
||||
{strands.map((s, i) => (
|
||||
@@ -64,7 +65,7 @@ export function ProbeDoneCard({ part }: { part: { input?: unknown; output?: unkn
|
||||
)}
|
||||
</div>
|
||||
) : (
|
||||
<p className="text-sm text-muted-foreground">Writing the assessment…</p>
|
||||
<p className="text-sm text-muted-foreground">{t("Writing the assessment…")}</p>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { CheckIcon, CircleX } from "lucide-react";
|
||||
import type { PdfResult, ResearchResult, SubagentArtifactData } from "@/src/core";
|
||||
@@ -26,6 +28,7 @@ import { VisualOutputCard } from "@/components/artifacts/visual-card";
|
||||
* render; only a failure note does.
|
||||
*/
|
||||
export function SubagentSteerCard({ message }: { message: LhViewMessage }) {
|
||||
const { t } = useI18n();
|
||||
const artifactPart = message.parts.find((p) => p.type === "data-subagent-artifact");
|
||||
const data = artifactPart?.data as SubagentArtifactData | undefined;
|
||||
// The abort steer (2026-09 dock semantics): its message-type part is
|
||||
@@ -38,8 +41,7 @@ export function SubagentSteerCard({ message }: { message: LhViewMessage }) {
|
||||
if (aborted?.data) return <AbortedBadge kind={aborted.data.kind ?? "job"} />;
|
||||
return (
|
||||
<div className="rounded-xl border bg-card p-4 text-sm text-muted-foreground">
|
||||
A sub-agent finished, but its result could not be displayed.
|
||||
</div>
|
||||
{t("A sub-agent finished, but its result could not be displayed.")}</div>
|
||||
);
|
||||
}
|
||||
switch (data.kind) {
|
||||
@@ -66,11 +68,12 @@ export function SubagentSteerCard({ message }: { message: LhViewMessage }) {
|
||||
* teacher's wake turn acknowledges the abort in the lesson itself,
|
||||
* this just marks what happened. */
|
||||
function AbortedBadge({ kind }: { kind: string }) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<div data-testid="job-aborted-badge" className="flex items-center gap-2 text-xs text-muted-foreground">
|
||||
<CircleX className="size-3.5" />
|
||||
<span className="font-medium uppercase tracking-wide">{kind}</span>
|
||||
<span>aborted by the learner</span>
|
||||
<span>{t("aborted by the learner")}</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -80,6 +83,7 @@ function AbortedBadge({ kind }: { kind: string }) {
|
||||
* the badge marks delivery, the collapsed details carries the full text
|
||||
* + consulted pages. */
|
||||
function PdfCompleteBadge({ result }: { result: PdfResult }) {
|
||||
const { t } = useI18n();
|
||||
// The honest count is READ pages (extract/render — sources v1 split);
|
||||
// the ?? is runtime tolerance for pre-split persisted steers.
|
||||
const readPages = result.pagesRead ?? result.pagesConsulted;
|
||||
@@ -88,14 +92,14 @@ function PdfCompleteBadge({ result }: { result: PdfResult }) {
|
||||
<summary className="flex cursor-pointer select-none list-none items-center gap-2 [&::-webkit-details-marker]:hidden">
|
||||
<CheckIcon className="size-3.5" />
|
||||
<span className="font-medium uppercase tracking-wide">PDF</span>
|
||||
<span>reading complete</span>
|
||||
<span>{t("reading complete")}</span>
|
||||
{readPages.length > 0 && (
|
||||
<span>
|
||||
· read {readPages.length} page{readPages.length === 1 ? "" : "s"}
|
||||
{t("· read {count} pages", { count: readPages.length })}
|
||||
</span>
|
||||
)}
|
||||
<span className="ml-1 text-xs text-muted-foreground/70 group-open:hidden">view brief</span>
|
||||
<span className="ml-1 hidden text-xs text-muted-foreground/70 group-open:inline">hide brief</span>
|
||||
<span className="ml-1 text-xs text-muted-foreground/70 group-open:hidden">{t("view brief")}</span>
|
||||
<span className="ml-1 hidden text-xs text-muted-foreground/70 group-open:inline">{t("hide brief")}</span>
|
||||
</summary>
|
||||
<div className="mt-2">
|
||||
<PdfBriefCard output={result} />
|
||||
@@ -110,15 +114,16 @@ function PdfCompleteBadge({ result }: { result: PdfResult }) {
|
||||
* affordance): full markdown + sources, one click away, no extra fetch —
|
||||
* the artifact part in the record is the single source of truth. */
|
||||
function ResearchCompleteBadge({ result }: { result: ResearchResult }) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<details data-testid="research-complete-badge" className="group w-full text-xs text-muted-foreground">
|
||||
<summary className="flex cursor-pointer select-none list-none items-center gap-2 [&::-webkit-details-marker]:hidden">
|
||||
<CheckIcon className="size-3.5" />
|
||||
<span className="font-medium uppercase tracking-wide">Research</span>
|
||||
<span>complete</span>
|
||||
{result.sources.length > 0 && <span>· {result.sources.length} sources</span>}
|
||||
<span className="ml-1 text-xs text-muted-foreground/70 group-open:hidden">view brief</span>
|
||||
<span className="ml-1 hidden text-xs text-muted-foreground/70 group-open:inline">hide brief</span>
|
||||
<span className="font-medium uppercase tracking-wide">{t("Research")}</span>
|
||||
<span>{t("complete")}</span>
|
||||
{result.sources.length > 0 && <span>· {t("{count} sources", { count: result.sources.length })}</span>}
|
||||
<span className="ml-1 text-xs text-muted-foreground/70 group-open:hidden">{t("view brief")}</span>
|
||||
<span className="ml-1 hidden text-xs text-muted-foreground/70 group-open:inline">{t("hide brief")}</span>
|
||||
</summary>
|
||||
<div className="mt-2">
|
||||
<ResearchBriefCard output={result} />
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { ChevronRight } from "lucide-react";
|
||||
import type { ArtifactPartProps } from "@/src/core";
|
||||
@@ -62,6 +64,7 @@ function outputText(output: unknown): string | null {
|
||||
}
|
||||
|
||||
export function ToolCallCard({ part }: ArtifactPartProps) {
|
||||
const { t } = useI18n();
|
||||
const p = part as ToolCallPart;
|
||||
const tool = p.type.replace(/^tool-/, "");
|
||||
const arg = headlineArg(tool, p.input);
|
||||
@@ -84,8 +87,7 @@ export function ToolCallCard({ part }: ArtifactPartProps) {
|
||||
{p.input != null && (
|
||||
<div>
|
||||
<div className="mb-1 font-medium uppercase tracking-wide text-muted-foreground">
|
||||
Input
|
||||
</div>
|
||||
{t("Input")}</div>
|
||||
<pre className="max-h-32 overflow-auto whitespace-pre-wrap break-all font-mono text-[11px] leading-relaxed">
|
||||
{JSON.stringify(p.input, null, 2)}
|
||||
</pre>
|
||||
@@ -94,24 +96,22 @@ export function ToolCallCard({ part }: ArtifactPartProps) {
|
||||
{typeof p.errorText === "string" ? (
|
||||
<div>
|
||||
<div className="mb-1 font-medium uppercase tracking-wide text-muted-foreground">
|
||||
Error
|
||||
</div>
|
||||
{t("Error")}</div>
|
||||
<pre className="whitespace-pre-wrap break-all font-mono text-[11px] text-red-500">
|
||||
{p.errorText}
|
||||
{t(p.errorText)}
|
||||
</pre>
|
||||
</div>
|
||||
) : out != null ? (
|
||||
<div>
|
||||
<div className="mb-1 font-medium uppercase tracking-wide text-muted-foreground">
|
||||
Output
|
||||
</div>
|
||||
{t("Output")}</div>
|
||||
<pre className="max-h-64 overflow-auto whitespace-pre-wrap break-all font-mono text-[11px] leading-relaxed">
|
||||
{out}
|
||||
</pre>
|
||||
</div>
|
||||
) : (
|
||||
p.state !== "output-available" && (
|
||||
<div className="text-muted-foreground italic">running…</div>
|
||||
<div className="text-muted-foreground italic">{t("running…")}</div>
|
||||
)
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useContext, useState } from "react";
|
||||
import { ChatActionsContext } from "@/components/chat";
|
||||
@@ -61,6 +63,7 @@ export function VisualOutputCard({
|
||||
messageId?: string;
|
||||
initialInverted?: boolean;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const result = output as VisualResult | undefined;
|
||||
const overlay = useSessionMermaid();
|
||||
const actions = useContext(ChatActionsContext);
|
||||
@@ -83,8 +86,7 @@ export function VisualOutputCard({
|
||||
if (!result || typeof result.svg !== "string") {
|
||||
return (
|
||||
<div className="rounded-xl border bg-card p-4 text-sm text-muted-foreground">
|
||||
Figure completed, but the result could not be displayed.
|
||||
</div>
|
||||
{t("Figure completed, but the result could not be displayed.")}</div>
|
||||
);
|
||||
}
|
||||
const failed = result.svg.length === 0;
|
||||
@@ -92,10 +94,9 @@ export function VisualOutputCard({
|
||||
return (
|
||||
<div className="rounded-xl border bg-card p-4 text-card-foreground" data-testid="visual-card-failed">
|
||||
<div className="flex items-center gap-2 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
Figure
|
||||
<span className="rounded bg-red-500/15 px-1.5 py-0.5 text-red-500">failed</span>
|
||||
{t("Figure")}<span className="rounded bg-red-500/15 px-1.5 py-0.5 text-red-500">{t("failed")}</span>
|
||||
</div>
|
||||
<p className="mt-2 text-sm text-muted-foreground">{result.notes ?? "The figure could not be drawn."}</p>
|
||||
<p className="mt-2 text-sm text-muted-foreground">{result.notes ?? t("The figure could not be drawn.")}</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -130,21 +131,21 @@ export function VisualOutputCard({
|
||||
data-testid="visual-svg"
|
||||
/>
|
||||
<div className="mt-2 flex items-center justify-between gap-2">
|
||||
<div className="text-xs font-medium uppercase tracking-wide text-muted-foreground">Figure</div>
|
||||
<div className="text-xs font-medium uppercase tracking-wide text-muted-foreground">{t("Figure")}</div>
|
||||
<div className="flex items-center gap-1.5">
|
||||
{/* The invert affordance (owner round, 2026-10-07): the disc IS
|
||||
the half-filled contrast circle; the tooltip names it. */}
|
||||
<Toggle
|
||||
checked={inverted}
|
||||
onChange={toggleInverted}
|
||||
label="Invert figure brightness"
|
||||
title="Invert colors"
|
||||
label={t("Invert figure brightness")}
|
||||
title={t("Invert colors")}
|
||||
discIcon={<InvertDiscIcon className="size-3" />}
|
||||
/>
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Download figure as SVG"
|
||||
title="Download as SVG"
|
||||
aria-label={t("Download figure as SVG")}
|
||||
title={t("Download as SVG")}
|
||||
onClick={() => downloadFile("figure.svg", result.svg, "image/svg+xml")}
|
||||
data-testid="visual-download"
|
||||
className="rounded-md p-1.5 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
|
||||
@@ -154,8 +155,8 @@ export function VisualOutputCard({
|
||||
{overlay && (
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Open figure fullscreen"
|
||||
title="Open fullscreen"
|
||||
aria-label={t("Open figure fullscreen")}
|
||||
title={t("Open fullscreen")}
|
||||
onClick={() => overlay.openFigure(result.svg, inverted)}
|
||||
data-testid="visual-open"
|
||||
className="rounded-md p-1.5 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
"use client";
|
||||
|
||||
import { useI18n } from "@/components/i18n";
|
||||
import { cn } from "@/lib/utils";
|
||||
|
||||
/**
|
||||
@@ -43,12 +46,13 @@ export function BrailleSpinner({
|
||||
/** The accessible name of the state this spinner announces. */
|
||||
label?: string;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<svg
|
||||
viewBox="0 0 4 8"
|
||||
data-testid="braille-spinner"
|
||||
role="status"
|
||||
aria-label={label}
|
||||
aria-label={t(label)}
|
||||
className={cn("h-3 w-auto shrink-0 text-foreground", className)}
|
||||
>
|
||||
{FRAMES.map((frame, k) => (
|
||||
|
||||
+26
-26
@@ -1,4 +1,7 @@
|
||||
"use client";
|
||||
import { countLabel } from "@/src/core";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
/**
|
||||
* THE CHAIN TABLE (chains overlay; owner refinements round 2, 2026-09-29):
|
||||
@@ -143,6 +146,7 @@ export function ChainTableBody({
|
||||
selectMode?: boolean;
|
||||
onSelect?: () => void;
|
||||
}) {
|
||||
const { t, language } = useI18n();
|
||||
const byId = useMemo(() => new Map(nodes.map((n) => [n.id, n])), [nodes]);
|
||||
const chains = useMemo(() => chainsForSelection(nodes, storedChains), [nodes, storedChains]);
|
||||
const searching = query.trim() !== "";
|
||||
@@ -246,7 +250,7 @@ export function ChainTableBody({
|
||||
law: later in the DOM). */}
|
||||
<TopBar>
|
||||
<span className="min-w-0 flex-1 truncate text-xs text-muted-foreground">
|
||||
{chains.length} {chains.length === 1 ? "chain" : "chains"} · {nodes.length} {nodes.length === 1 ? "node" : "nodes"}
|
||||
{countLabel(language, chains.length, "chain", "chains")} · {countLabel(language, nodes.length, "node", "nodes")}
|
||||
</span>
|
||||
<div className="relative shrink-0">
|
||||
<SearchIcon className="absolute left-2.5 top-1/2 size-3.5 -translate-y-1/2 text-muted-foreground" />
|
||||
@@ -254,8 +258,8 @@ export function ChainTableBody({
|
||||
value={query}
|
||||
data-testid="chain-table-search"
|
||||
onChange={(e) => onQuery(e.target.value)}
|
||||
placeholder="Search nodes…"
|
||||
aria-label="Search nodes"
|
||||
placeholder={t("Search nodes…")}
|
||||
aria-label={t("Search nodes")}
|
||||
spellCheck={false}
|
||||
className="lh-no-drag h-8 w-56 rounded-lg border bg-background pl-8 pr-3 text-xs outline-none placeholder:text-muted-foreground focus:border-ring"
|
||||
/>
|
||||
@@ -264,7 +268,7 @@ export function ChainTableBody({
|
||||
type="button"
|
||||
data-testid="chain-table-close"
|
||||
onClick={onClose}
|
||||
aria-label="Close chains"
|
||||
aria-label={t("Close chains")}
|
||||
className="lh-no-drag flex size-8 shrink-0 items-center justify-center rounded-lg border border-border/70 bg-card/80 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
|
||||
>
|
||||
<XIcon className="size-4" />
|
||||
@@ -288,7 +292,7 @@ export function ChainTableBody({
|
||||
aria-sort={sort.col === "name" ? (sort.dir === 1 ? "ascending" : "descending") : "none"}
|
||||
className="flex flex-1 items-center gap-1 text-left transition-colors hover:text-foreground"
|
||||
>
|
||||
Name {dirIcon("name")}
|
||||
{t("Name")}{" "}{dirIcon("name")}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
@@ -297,7 +301,7 @@ export function ChainTableBody({
|
||||
aria-sort={sort.col === "props" ? (sort.dir === 1 ? "ascending" : "descending") : "none"}
|
||||
className="flex w-14 shrink-0 items-center justify-end gap-1 text-right transition-colors hover:text-foreground"
|
||||
>
|
||||
Props {dirIcon("props")}
|
||||
{t("Props")}{" "}{dirIcon("props")}
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
@@ -306,14 +310,13 @@ export function ChainTableBody({
|
||||
aria-sort={sort.col === "created" ? (sort.dir === 1 ? "ascending" : "descending") : "none"}
|
||||
className="flex w-20 shrink-0 items-center justify-end gap-1 text-right transition-colors hover:text-foreground"
|
||||
>
|
||||
Created {dirIcon("created")}
|
||||
{t("Created")}{" "}{dirIcon("created")}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
{groups.length === 0 && (
|
||||
<div data-testid="chain-table-nomatch" className="px-4 pt-3 text-xs text-muted-foreground">
|
||||
No matching chains.
|
||||
</div>
|
||||
{t("No matching chains.")}</div>
|
||||
)}
|
||||
|
||||
{groups.map((group) => {
|
||||
@@ -348,15 +351,15 @@ export function ChainTableBody({
|
||||
indeterminate={selectedCount > 0 && selectedCount < group.nodeIds.length}
|
||||
onToggle={(next) => onToggleNodes(group.nodeIds, next)}
|
||||
testid={`cluster-checkbox-${group.key}`}
|
||||
label={`Select everything born in ${group.label ?? "unlabeled"}`}
|
||||
label={t("Select everything born in {v0}", { v0: group.label ?? "unlabeled" })}
|
||||
/>
|
||||
<Expander open={open} onClick={() => onToggleCluster(group.key)} testid={`cluster-toggle-${group.key}`} label={`Expand cluster ${group.label ?? "unlabeled"}`} />
|
||||
<Expander open={open} onClick={() => onToggleCluster(group.key)} testid={`cluster-toggle-${group.key}`} label={t("Expand cluster {v0}", { v0: group.label ?? "unlabeled" })} />
|
||||
<span className="flex shrink-0 items-center justify-center text-muted-foreground">
|
||||
{open ? <FolderOpenIcon className="size-3.5" /> : <FolderIcon className="size-3.5" />}
|
||||
</span>
|
||||
<span className="min-w-0 flex-1 truncate text-sm font-medium">
|
||||
{group.label ?? <span className="text-muted-foreground/60">unlabeled</span>}
|
||||
{group.kind === "notes" && <span className="ml-2 text-[11px] uppercase tracking-widest text-muted-foreground/60">notes</span>}
|
||||
{group.label ?? <span className="text-muted-foreground/60">{t("unlabeled")}</span>}
|
||||
{group.kind === "notes" && <span className="ml-2 text-[11px] uppercase tracking-widest text-muted-foreground/60">{t("notes")}</span>}
|
||||
</span>
|
||||
<span className="w-14 shrink-0 text-right text-xs tabular-nums text-muted-foreground">
|
||||
{group.nodeIds.length}
|
||||
@@ -397,9 +400,9 @@ export function ChainTableBody({
|
||||
indeterminate={selectedInChain > 0 && selectedInChain < memberIds.length}
|
||||
onToggle={(next) => onToggleNodes(memberIds, next)}
|
||||
testid={`chain-checkbox-${chain.id}`}
|
||||
label={`Select chain ${nameOf(chain.conclusion)}`}
|
||||
label={t("Select chain {v0}", { v0: nameOf(chain.conclusion) })}
|
||||
/>
|
||||
<Expander open={chainOpen} onClick={() => onToggleChain(chain.id)} testid={`chain-toggle-${chain.id}`} label={`Expand chain ${nameOf(chain.conclusion)}`} />
|
||||
<Expander open={chainOpen} onClick={() => onToggleChain(chain.id)} testid={`chain-toggle-${chain.id}`} label={t("Expand chain {v0}", { v0: nameOf(chain.conclusion) })} />
|
||||
{/* The chain line: proposition names as faint-outlined
|
||||
chips. THE LOGIC IS THE PAYLOAD (owner rulings,
|
||||
2026-09-30): premises join with the LaTeX LAND (∧),
|
||||
@@ -465,7 +468,7 @@ export function ChainTableBody({
|
||||
checked={selection.has(id)}
|
||||
onToggle={(next) => onToggleNodes([id], next)}
|
||||
testid={`prop-checkbox-${id}`}
|
||||
label={`Select node ${node.name}`}
|
||||
label={t("Select node {v0}", { v0: node.name })}
|
||||
/>
|
||||
<span className="min-w-0 flex-1 text-xs leading-relaxed text-muted-foreground">
|
||||
{node.statement}
|
||||
@@ -493,8 +496,8 @@ export function ChainTableBody({
|
||||
className="pointer-events-auto flex items-center gap-3 rounded-full border bg-card px-4 py-2 shadow-lg"
|
||||
>
|
||||
<span data-testid="chain-selected-summary" className="text-xs font-medium">
|
||||
{selection.size} {selection.size === 1 ? "node" : "nodes"} →{" "}
|
||||
{derived.length} {derived.length === 1 ? "chain" : "chains"}
|
||||
{countLabel(language, selection.size, "node", "nodes")} →{" "}
|
||||
{countLabel(language, derived.length, "chain", "chains")}
|
||||
</span>
|
||||
<button
|
||||
type="button"
|
||||
@@ -502,19 +505,17 @@ export function ChainTableBody({
|
||||
onClick={onClear}
|
||||
className="rounded-full px-2.5 py-1 text-xs text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
|
||||
>
|
||||
Clear
|
||||
</button>
|
||||
{t("Clear")}</button>
|
||||
{selectMode ? (
|
||||
<button
|
||||
type="button"
|
||||
data-testid="chain-practice-done"
|
||||
onClick={onSelect}
|
||||
aria-label={`Done picking — ${selection.size} ${selection.size === 1 ? "proposition" : "propositions"} selected`}
|
||||
aria-label={t("Done picking — {v0} {v1} selected", { v0: selection.size, v1: selection.size === 1 ? "proposition" : "propositions" })}
|
||||
className="flex items-center gap-1.5 rounded-full bg-primary px-3 py-1.5 text-xs font-medium text-primary-foreground transition-colors hover:bg-primary/80"
|
||||
>
|
||||
<DumbbellIcon aria-hidden="true" className="size-3.5" />
|
||||
Done
|
||||
</button>
|
||||
{t("Done")}</button>
|
||||
) : (
|
||||
<>
|
||||
{/* The danger fence (owner ruling): a divider quarantines
|
||||
@@ -526,12 +527,11 @@ export function ChainTableBody({
|
||||
type="button"
|
||||
data-testid="chain-delete"
|
||||
onClick={onDelete}
|
||||
aria-label={`Delete ${selection.size} selected ${selection.size === 1 ? "node" : "nodes"}`}
|
||||
aria-label={t("Delete {v0} selected {v1}", { v0: selection.size, v1: selection.size === 1 ? "node" : "nodes" })}
|
||||
className="flex items-center gap-1.5 rounded-full border border-destructive/50 bg-destructive/10 px-3 py-1.5 text-xs font-medium text-destructive transition-colors hover:bg-destructive/20"
|
||||
>
|
||||
<Trash2Icon aria-hidden="true" className="size-3.5" />
|
||||
Delete
|
||||
</button>
|
||||
{t("Delete")}</button>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
+40
-31
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { createContext, Fragment, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
|
||||
import { useChatSession } from "@/components/session";
|
||||
@@ -57,7 +59,7 @@ import { PracticeDock } from "@/components/practice-dock";
|
||||
import { ThinkingCard, type PracticeThinkingData } from "@/components/practice-cards";
|
||||
import { GraphContextCard, type GraphContextData } from "@/components/graph-context-card";
|
||||
import { TopBar } from "@/components/top-bar";
|
||||
import type { ArtifactPartProps, JobRecord, Phase3, QuestionAnswerData, TurnUsage } from "@/src/core";
|
||||
import type { ArtifactPartProps, JobRecord, Phase3, QuestionAnswerData, TurnUsage, SessionPricing } from "@/src/core";
|
||||
import type { LhViewMessage } from "@/src/core";
|
||||
import { PhaseChip, PhaseDivider } from "@/components/phase-divider";
|
||||
import {
|
||||
@@ -225,6 +227,7 @@ export function Chat({
|
||||
* only decides whether the pill rides the composer. */
|
||||
initialConfigured?: boolean;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
// Reattach plumbing (background-turn runner wave): the hook holds the
|
||||
// settled terminal's callback — a stable ref assigned below, once
|
||||
// syncFromServer exists (refs, not closures: no stale capture).
|
||||
@@ -236,7 +239,7 @@ export function Chat({
|
||||
// (core/view.ts projectView); sends are ONE explicit input event each
|
||||
// ({chatId, input} — the stash indirection died with the SDK), and the
|
||||
// turn stream is the VERBATIM AgentEvent passthrough the server emits.
|
||||
const { messages, nativeMessages, send, steer, steerQueue, submitAnswer, dismissQuestion, dismissProblem, setMessages, adoptRecord, status, error, stop, clearError, resumeStream, setReattachSettled } =
|
||||
const { messages, nativeMessages, contextTokens, send, steer, steerQueue, submitAnswer, dismissQuestion, dismissProblem, setMessages, adoptRecord, status, error, stop, clearError, resumeStream, setReattachSettled } =
|
||||
useChatSession({ chatId, initialMessages, initiallyInFlight });
|
||||
|
||||
const sessionFindScopeRef = useRef<HTMLDivElement | null>(null);
|
||||
@@ -717,8 +720,9 @@ export function Chat({
|
||||
const syncFromServer = useCallback(async () => {
|
||||
const res = await fetch(`/api/chats/${chatId}`);
|
||||
if (!res.ok) return;
|
||||
const record = (await res.json()) as { messages?: LhMessage[]; turns?: TurnUsage[] };
|
||||
const record = (await res.json()) as { messages?: LhMessage[]; turns?: TurnUsage[]; pricing?: SessionPricing };
|
||||
if (Array.isArray(record.turns)) setTurns(record.turns);
|
||||
setPricing(record.pricing);
|
||||
if (!Array.isArray(record.messages)) return;
|
||||
setMessages(record.messages);
|
||||
// The continuation seam (contracts.ts protocol §4): a job result
|
||||
@@ -845,12 +849,13 @@ export function Chat({
|
||||
const planTree = useMemo(() => latestTree(messages), [messages]);
|
||||
|
||||
// ── Session usage (wave-4 stats bar) ──
|
||||
// The money channel: the record's turns log, folded client-side by
|
||||
// core/prices.ts. Seeded once on mount (the page doesn't carry turns),
|
||||
// The money channel: the record's turns log and read-time server Pi
|
||||
// pricing projection. Seeded once on mount (the page doesn't carry turns),
|
||||
// refreshed when the local stream settles (each turn appends to the log
|
||||
// server-side), and kept fresh by syncFromServer whenever it already
|
||||
// fetches the record. No turns yet → the bar renders "—" everywhere.
|
||||
const [turns, setTurns] = useState<TurnUsage[]>([]);
|
||||
const [pricing, setPricing] = useState<SessionPricing | undefined>();
|
||||
// The per-chat model control state (model-picker writes via PUT; the
|
||||
// record is the source of truth, lifted here so the stats bar re-renders).
|
||||
// The dock's reserved tail height (DockOverlay reports it; the spacer at
|
||||
@@ -864,8 +869,9 @@ export function Chat({
|
||||
try {
|
||||
const res = await fetch(`/api/chats/${chatId}`);
|
||||
if (!res.ok) return;
|
||||
const record = (await res.json()) as { turns?: TurnUsage[] };
|
||||
const record = (await res.json()) as { turns?: TurnUsage[]; pricing?: SessionPricing };
|
||||
if (Array.isArray(record.turns)) setTurns(record.turns);
|
||||
setPricing(record.pricing);
|
||||
} catch {
|
||||
// transient blip: stats stay on the last known figures
|
||||
}
|
||||
@@ -1233,8 +1239,8 @@ export function Chat({
|
||||
}}
|
||||
onBlur={() => void commitRename(titleDraft)}
|
||||
spellCheck={false}
|
||||
aria-label="Session title"
|
||||
title="Rename this session"
|
||||
aria-label={t("Session title")}
|
||||
title={t("Rename this session")}
|
||||
className="lh-no-drag min-w-[8ch] max-w-[70%] shrink-0 bg-transparent font-title text-3xl tracking-tight caret-current outline-none [field-sizing:content]"
|
||||
/>
|
||||
{/* flex-1 spacer during rename too, so the chips stay at
|
||||
@@ -1246,7 +1252,7 @@ export function Chat({
|
||||
<>
|
||||
<Hint
|
||||
// F2 renames (registry) — surfaced on the hover.
|
||||
label="Rename session"
|
||||
label={t("Rename session")}
|
||||
action="rename-session"
|
||||
side="bottom"
|
||||
>
|
||||
@@ -1270,7 +1276,7 @@ export function Chat({
|
||||
structure beside the phase chip — access to the full-DAG popup
|
||||
at every width; the marginalia is the wide-screen glance view. */}
|
||||
{planTree && (
|
||||
<Hint label="Open the full plan" side="bottom">
|
||||
<Hint label={t("Open the full plan")} side="bottom">
|
||||
<button
|
||||
type="button"
|
||||
data-testid="plan-chip"
|
||||
@@ -1281,8 +1287,7 @@ export function Chat({
|
||||
className="lh-no-drag flex shrink-0 cursor-pointer items-center gap-1.5 rounded-full border border-border/80 px-2 py-0.5 text-xs font-medium uppercase tracking-wide text-muted-foreground transition-colors hover:border-border hover:text-foreground"
|
||||
>
|
||||
<WaypointsIcon className="size-3.5 text-primary" aria-hidden />
|
||||
Plan
|
||||
</button>
|
||||
{t("Plan")}</button>
|
||||
</Hint>
|
||||
)}
|
||||
{/* The extraction ring (owner-locked redesign, 2026-09-24): fills
|
||||
@@ -1303,8 +1308,7 @@ export function Chat({
|
||||
className="pointer-events-none flex shrink-0 select-none items-center gap-1 text-xs font-medium uppercase tracking-wide text-muted-foreground"
|
||||
>
|
||||
<DumbbellIcon className="size-3" />
|
||||
Practice
|
||||
</span>
|
||||
{t("Practice")}</span>
|
||||
) : (
|
||||
<PhaseChip phase={phases.at(-1) ?? "probe"} />
|
||||
)}
|
||||
@@ -1318,8 +1322,8 @@ export function Chat({
|
||||
<div data-session-find-root="" className={`${COLUMN} flex flex-1 flex-col gap-4 pt-4`}>
|
||||
{messages.length === 0 && !busy && (
|
||||
<ConversationEmptyState
|
||||
title="New session"
|
||||
description="The teacher will open by probing what you already know."
|
||||
title={t("New session")}
|
||||
description={t("The teacher will open by probing what you already know.")}
|
||||
/>
|
||||
)}
|
||||
|
||||
@@ -1370,8 +1374,7 @@ export function Chat({
|
||||
className="my-4 flex items-center justify-center gap-1.5 font-ui text-xs font-medium uppercase tracking-wide text-muted-foreground"
|
||||
>
|
||||
<ArrowRightIcon className="size-3" />
|
||||
Next problem
|
||||
</div>
|
||||
{t("Next problem")}</div>
|
||||
);
|
||||
default:
|
||||
return null;
|
||||
@@ -1429,7 +1432,7 @@ export function Chat({
|
||||
{/* The rail GROUPS (owner round 4, 2026-10-05): the YOU heading
|
||||
sits INSIDE the rail, same mono-xs register and same 1ch
|
||||
rail as the thinking rows — one quote geometry. */}
|
||||
<div className="font-medium uppercase tracking-wide text-muted-foreground">You</div>
|
||||
<div className="font-medium uppercase tracking-wide text-muted-foreground">{t("You")}</div>
|
||||
<div className="lh-prose whitespace-pre-wrap text-foreground">
|
||||
{m.parts.filter((p) => p.type === "text").map((p) => p.text).join("\n")}
|
||||
</div>
|
||||
@@ -1462,8 +1465,7 @@ export function Chat({
|
||||
) {
|
||||
return (
|
||||
<SystemLine key={`retry-${pi}`} testId="tool-retry">
|
||||
Retrying…
|
||||
</SystemLine>
|
||||
{t("Retrying…")}</SystemLine>
|
||||
);
|
||||
}
|
||||
switch (part.type) {
|
||||
@@ -1559,21 +1561,20 @@ export function Chat({
|
||||
BEFORE beginTurn; the settle kick runs after endTurn). */}
|
||||
{compacting && (
|
||||
<span className="flex items-center gap-2 font-ui text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
<BrailleSpinner label="Compacting context" />
|
||||
<Shimmer duration={1}>COMPACTING CONTEXT…</Shimmer>
|
||||
<BrailleSpinner label={t("Compacting context")} />
|
||||
<Shimmer duration={1}>{t("COMPACTING CONTEXT…")}</Shimmer>
|
||||
</span>
|
||||
)}
|
||||
{(status === "submitted" || turnInFlight) && (
|
||||
<span className="flex items-center gap-2 font-ui text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
<BrailleSpinner label="Thinking" />
|
||||
<BrailleSpinner label={t("Thinking")} />
|
||||
<Shimmer duration={1}>
|
||||
THINKING…
|
||||
</Shimmer>
|
||||
{t("THINKING…")}</Shimmer>
|
||||
</span>
|
||||
)}
|
||||
{error && (
|
||||
<div className="rounded-lg border border-destructive/50 bg-destructive/10 px-3 py-2 text-sm">
|
||||
Something went wrong: {error.message}
|
||||
{t("Something went wrong:")}{" "}{t(error.message)}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
@@ -1604,6 +1605,8 @@ export function Chat({
|
||||
onReadingThinking={applyReadingThinking}
|
||||
phase={phases.at(-1) ?? "probe"}
|
||||
turns={turns}
|
||||
contextTokens={contextTokens}
|
||||
pricing={pricing}
|
||||
onReserve={setDockReserve}
|
||||
dictationSlot={<DictationBar dictation={dictation} />}
|
||||
dictationCancel={dictation.cancel}
|
||||
@@ -1620,8 +1623,7 @@ export function Chat({
|
||||
onClick={() => setSetupOpen(true)}
|
||||
className="rounded-sm border border-border bg-card px-3 py-1.5 font-ui text-xs text-foreground transition-colors hover:border-muted-foreground/50 hover:bg-accent cursor-pointer"
|
||||
>
|
||||
Set up your models
|
||||
</button>
|
||||
{t("Set up your models")}</button>
|
||||
</div>
|
||||
)
|
||||
)
|
||||
@@ -1645,7 +1647,7 @@ export function Chat({
|
||||
// applies.
|
||||
nextProblem={nextReady}
|
||||
onNext={sendNext}
|
||||
placeholder={nextReady ? "Ask anything, or press Enter for the next one." : undefined}
|
||||
placeholder={nextReady ? t("Ask anything, or press Enter for the next one.") : undefined}
|
||||
/>
|
||||
}
|
||||
onSubmitAnswer={(output) => {
|
||||
@@ -1824,6 +1826,8 @@ function DockOverlay({
|
||||
onReadingThinking,
|
||||
phase,
|
||||
turns,
|
||||
contextTokens,
|
||||
pricing,
|
||||
composer,
|
||||
onSubmitAnswer,
|
||||
chatId,
|
||||
@@ -1855,6 +1859,8 @@ function DockOverlay({
|
||||
phase: Phase3;
|
||||
/** The session's usage log — the stats bar beneath the composer folds it. */
|
||||
turns: TurnUsage[];
|
||||
contextTokens: number | null;
|
||||
pricing?: SessionPricing;
|
||||
composer: React.ReactNode;
|
||||
onSubmitAnswer: (output: QuestionAnswerData) => void;
|
||||
/** The model control's pass-through (the stats bar hosts it). */
|
||||
@@ -1880,6 +1886,7 @@ function DockOverlay({
|
||||
* home and /chat/new carry, above the composer while slots are unset. */
|
||||
setupCta?: React.ReactNode;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const { isAtBottom, scrollToBottom, scrollRef } = useStickToBottomContext();
|
||||
// Render-fresh bottom state (flicker round): the arrival block below reads
|
||||
// it DURING RENDER — the same value the after-paint effect used to read a
|
||||
@@ -2327,6 +2334,8 @@ function DockOverlay({
|
||||
morphing shell so it never joins a height animation. */}
|
||||
<StatsBar
|
||||
turns={turns}
|
||||
contextTokens={contextTokens}
|
||||
pricing={pricing}
|
||||
dictationSlot={dictationSlot}
|
||||
chatId={chatId}
|
||||
/>
|
||||
@@ -2354,7 +2363,7 @@ function DockOverlay({
|
||||
mid-question unmount), and widening past the floor fades it
|
||||
back in. */}
|
||||
{pending && plan && (
|
||||
<Hint label="Open the full plan" side="bottom">
|
||||
<Hint label={t("Open the full plan")} side="bottom">
|
||||
<button
|
||||
type="button"
|
||||
data-testid="plan-marginalia"
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import type { CompactionDetails } from "@/src/core";
|
||||
|
||||
@@ -19,11 +21,11 @@ export interface CompactionDividerData {
|
||||
* history was just summarized; the cut divider below carries the seam.
|
||||
* Inert since release polish 2026-10-06 — plain text, no affordance. */
|
||||
export function CompactionMomentDivider({ data: _data }: { data: CompactionDividerData }) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<div className="flex w-full items-center justify-center py-1">
|
||||
<span data-testid="compaction-divider" className="px-1.5 text-xs text-muted-foreground/70">
|
||||
Context compacted
|
||||
</span>
|
||||
{t("Context compacted")}</span>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -35,12 +37,13 @@ export function CompactionMomentDivider({ data: _data }: { data: CompactionDivid
|
||||
* since release polish 2026-10-06 — the token count stays, the summary
|
||||
* is inspectable only in provider logs. */
|
||||
export function CompactionCutDivider({ data }: { data: CompactionDividerData }) {
|
||||
const kTok = data.details.tokensBefore > 0 ? ` · ${Math.round(data.details.tokensBefore / 1000)}k tok` : "";
|
||||
const { t } = useI18n();
|
||||
const kTok = data.details.tokensBefore > 0 ? t(" · {v0}k tok", { v0: Math.round(data.details.tokensBefore / 1000) }) : "";
|
||||
return (
|
||||
<div data-testid="compaction-cut-divider" className="my-4 flex w-full items-center gap-3">
|
||||
<span className="h-0 flex-1 border-t-2 border-dotted border-border/50" aria-hidden />
|
||||
<span className="rounded-full border border-border/80 px-2.5 py-0.5 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
History compacted{kTok}
|
||||
{t("History compacted")}{kTok}
|
||||
</span>
|
||||
<span className="h-0 flex-1 border-t-2 border-dotted border-border/50" aria-hidden />
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import type { ReactNode } from "react";
|
||||
import { DumbbellIcon } from "lucide-react";
|
||||
@@ -25,6 +27,7 @@ export function NodePickerControl({ count, onOpen, onClear }: {
|
||||
onOpen?: () => void;
|
||||
onClear?: () => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<div className="flex items-center gap-1.5">
|
||||
<button
|
||||
@@ -39,7 +42,7 @@ export function NodePickerControl({ count, onOpen, onClear }: {
|
||||
}
|
||||
>
|
||||
<DumbbellIcon aria-hidden="true" className="size-3.5 text-muted-foreground" />
|
||||
{count > 0 ? `${count} ${count === 1 ? "node" : "nodes"} selected` : "Pick nodes"}
|
||||
{count > 0 ? t("{v0} {v1} selected", { v0: count, v1: count === 1 ? "node" : "nodes" }) : t("Pick nodes")}
|
||||
</button>
|
||||
{count > 0 && (
|
||||
<button
|
||||
@@ -48,8 +51,7 @@ export function NodePickerControl({ count, onOpen, onClear }: {
|
||||
onClick={onClear}
|
||||
className="cursor-pointer rounded-full px-2 py-1 font-ui text-xs text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
|
||||
>
|
||||
Clear
|
||||
</button>
|
||||
{t("Clear")}</button>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { ArrowRightIcon, CornerDownLeftIcon, SquareIcon } from "lucide-react";
|
||||
import { cn } from "@/lib/utils";
|
||||
@@ -75,6 +77,7 @@ export function Composer({
|
||||
* empty-Enter share it. */
|
||||
onNext?: () => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const act = () => {
|
||||
const action = enterAction({ busy, canSend, nextProblem });
|
||||
if (action === "stop") onStop();
|
||||
@@ -113,7 +116,7 @@ export function Composer({
|
||||
act();
|
||||
}
|
||||
}}
|
||||
placeholder={placeholder}
|
||||
placeholder={t(placeholder)}
|
||||
autoFocus={autoFocus}
|
||||
rows={1}
|
||||
className="field-sizing-content lh-input max-h-48 min-h-10 flex-1 resize-none bg-transparent px-2.5 py-2 outline-none placeholder:text-muted-foreground"
|
||||
@@ -136,16 +139,15 @@ export function Composer({
|
||||
<button
|
||||
type="submit"
|
||||
data-testid="next-problem-button"
|
||||
aria-label="Next problem"
|
||||
aria-label={t("Next problem")}
|
||||
className="flex h-10 shrink-0 items-center justify-center gap-1.5 rounded-[10px] bg-green-600 px-4 font-ui text-xs font-medium uppercase tracking-wide text-white transition-colors hover:bg-green-500"
|
||||
>
|
||||
Next problem
|
||||
<ArrowRightIcon className="size-4" />
|
||||
{t("Next problem")}<ArrowRightIcon className="size-4" />
|
||||
</button>
|
||||
) : (
|
||||
<button
|
||||
type="submit"
|
||||
aria-label={busy && !canSend ? "Stop" : "Send"}
|
||||
aria-label={busy && !canSend ? t("Stop") : t("Send")}
|
||||
disabled={!busy && !canSend}
|
||||
className={cn(
|
||||
"flex size-10 shrink-0 items-center justify-center rounded-[10px] transition-colors",
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useEffect, useState } from "react";
|
||||
import { createPortal } from "react-dom";
|
||||
@@ -45,17 +47,18 @@ export function DeleteNodeBody({
|
||||
onClose: () => void;
|
||||
onRun: () => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<div
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-label="Delete node"
|
||||
aria-label={t("Delete node")}
|
||||
data-testid="delete-node-dialog"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
className="w-[32rem] max-w-[calc(100vw-2rem)] rounded-xl border bg-card p-5 shadow-xl"
|
||||
>
|
||||
<h2 className="text-sm font-semibold text-destructive">
|
||||
{nodes.length === 1 ? "Delete node?" : `Delete ${nodes.length} nodes?`}
|
||||
{nodes.length === 1 ? t("Delete node?") : t("Delete {v0} nodes?", { v0: nodes.length })}
|
||||
</h2>
|
||||
{/* The node name(s) below the title in JetBrains Mono (owner,
|
||||
2026-09-24): the name is the payload — mono suits it, and
|
||||
@@ -74,14 +77,14 @@ export function DeleteNodeBody({
|
||||
) : (
|
||||
<code data-testid="node-names-code" className="font-mono text-sm text-foreground">
|
||||
{nodes.slice(0, 8).map((n) => n.name).join(", ")}
|
||||
{nodes.length > 8 ? `, and ${nodes.length - 8} more` : ""}
|
||||
{nodes.length > 8 ? t(", and {v0} more", { v0: nodes.length - 8 }) : ""}
|
||||
</code>
|
||||
)}
|
||||
</div>
|
||||
<p className="mt-2 text-sm text-muted-foreground" data-testid="node-permanence-line">
|
||||
{nodes.length === 1
|
||||
? "This permanently deletes the node — this cannot be undone."
|
||||
: `This permanently deletes all ${nodes.length} nodes — this cannot be undone.`}
|
||||
? t("This permanently deletes the node — this cannot be undone.")
|
||||
: t("This permanently deletes all {v0} nodes — this cannot be undone.", { v0: nodes.length })}
|
||||
</p>
|
||||
{failure && (
|
||||
<div
|
||||
@@ -90,7 +93,7 @@ export function DeleteNodeBody({
|
||||
className="mt-3 rounded-sm border border-border/60 px-3 py-2 text-xs"
|
||||
>
|
||||
<span className="text-foreground">
|
||||
{failure.code === "extraction_running" ? EXTRACTION_RETRY_LINE : failure.error}
|
||||
{t(failure.code === "extraction_running" ? EXTRACTION_RETRY_LINE : failure.error)}
|
||||
</span>
|
||||
<button
|
||||
type="button"
|
||||
@@ -99,8 +102,7 @@ export function DeleteNodeBody({
|
||||
disabled={busy}
|
||||
className="ml-3 text-xs text-foreground underline-offset-2 hover:underline disabled:opacity-40"
|
||||
>
|
||||
Try again
|
||||
</button>
|
||||
{t("Try again")}</button>
|
||||
</div>
|
||||
)}
|
||||
<div className="mt-4 flex justify-end gap-2">
|
||||
@@ -111,8 +113,7 @@ export function DeleteNodeBody({
|
||||
disabled={busy}
|
||||
className="rounded-sm px-3 py-1.5 text-xs text-muted-foreground transition-colors hover:text-foreground disabled:opacity-40"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
{t("Cancel")}</button>
|
||||
<button
|
||||
type="button"
|
||||
data-testid="node-delete-confirm"
|
||||
@@ -123,7 +124,7 @@ export function DeleteNodeBody({
|
||||
// refusal banner): border + text, fill on hover.
|
||||
className="rounded-sm border border-destructive/50 bg-destructive/10 px-3 py-1.5 text-xs text-destructive transition-colors hover:bg-destructive/20 disabled:opacity-40"
|
||||
>
|
||||
{busy ? "Deleting…" : "Delete"}
|
||||
{busy ? t("Deleting…") : t("Delete")}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
@@ -146,6 +147,7 @@ export function DeleteNodeDialog({
|
||||
* selection-side callers can prune. */
|
||||
onDeleted: (nodeIds: string[], graphRevision: number) => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const [busy, setBusy] = useState(false);
|
||||
const backdropDismiss = useBackdropDismiss(() => {
|
||||
if (!busy) onClose();
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useEffect, useState } from "react";
|
||||
import { createPortal } from "react-dom";
|
||||
@@ -50,6 +52,7 @@ export function DeleteSessionDialog({
|
||||
/** Success path — the sidebar owns navigation + list patching. */
|
||||
onDeleted: (id: string, mode: ChatDeleteMode, graphRevision: number) => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const [traces, setTraces] = useState(false);
|
||||
const [busy, setBusy] = useState(false);
|
||||
const backdropDismiss = useBackdropDismiss(() => {
|
||||
@@ -155,16 +158,17 @@ export function DeleteSessionBody({
|
||||
onClose: () => void;
|
||||
onRun: () => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<div
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-label="Delete session"
|
||||
aria-label={t("Delete session")}
|
||||
data-testid="delete-session-dialog"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
className="w-[32rem] max-w-[calc(100vw-2rem)] rounded-xl border bg-card p-5 shadow-xl"
|
||||
>
|
||||
<h2 className="text-sm font-semibold text-destructive">Delete session?</h2>
|
||||
<h2 className="text-sm font-semibold text-destructive">{t("Delete session?")}</h2>
|
||||
{/* The session name below the title in JetBrains Mono (owner,
|
||||
2026-09-24): no code-block chrome — the font already says
|
||||
code. Owner, 2026-10-13 polish: normal text-sm size (was
|
||||
@@ -176,9 +180,7 @@ export function DeleteSessionBody({
|
||||
</code>
|
||||
</div>
|
||||
<p className="mt-2 text-sm text-muted-foreground">
|
||||
This permanently removes the session — its messages, background jobs, and extraction records. Everything
|
||||
it added to the graph stays unless you check below. This cannot be undone.
|
||||
</p>
|
||||
{t("This permanently removes the session — its messages, background jobs, and extraction records. Everything it added to the graph stays unless you check below. This cannot be undone.")}</p>
|
||||
<label
|
||||
data-testid={TRACES_COPY.testid}
|
||||
className="mt-4 flex cursor-pointer items-start gap-2.5 rounded-lg border border-border/60 px-4 py-3"
|
||||
@@ -192,8 +194,8 @@ export function DeleteSessionBody({
|
||||
className="mt-0.5 size-4 shrink-0 accent-primary"
|
||||
/>
|
||||
<span className="min-w-0">
|
||||
<span className="block text-sm text-foreground">{TRACES_COPY.title}</span>
|
||||
<span className="mt-1 block text-xs text-muted-foreground">{TRACES_COPY.body}</span>
|
||||
<span className="block text-sm text-foreground">{t(TRACES_COPY.title)}</span>
|
||||
<span className="mt-1 block text-xs text-muted-foreground">{t(TRACES_COPY.body)}</span>
|
||||
</span>
|
||||
</label>
|
||||
{failure && (
|
||||
@@ -202,7 +204,7 @@ export function DeleteSessionBody({
|
||||
data-testid="delete-failure"
|
||||
className="mt-3 rounded-sm border border-border/60 px-3 py-2 text-xs"
|
||||
>
|
||||
<span className="text-foreground">{failure.error}</span>
|
||||
<span className="text-foreground">{t(failure.error)}</span>
|
||||
<button
|
||||
type="button"
|
||||
data-testid="delete-retry"
|
||||
@@ -210,8 +212,7 @@ export function DeleteSessionBody({
|
||||
disabled={busy}
|
||||
className="ml-3 text-xs text-foreground underline-offset-2 hover:underline disabled:opacity-40"
|
||||
>
|
||||
Try again
|
||||
</button>
|
||||
{t("Try again")}</button>
|
||||
</div>
|
||||
)}
|
||||
{/* The node dialog's exact bottom row: quiet Cancel, destructive
|
||||
@@ -225,8 +226,7 @@ export function DeleteSessionBody({
|
||||
disabled={busy}
|
||||
className="rounded-sm px-3 py-1.5 text-xs text-muted-foreground transition-colors hover:text-foreground disabled:opacity-40"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
{t("Cancel")}</button>
|
||||
<button
|
||||
type="button"
|
||||
data-testid="delete-confirm"
|
||||
@@ -234,7 +234,7 @@ export function DeleteSessionBody({
|
||||
disabled={busy}
|
||||
className="rounded-sm border border-destructive/50 bg-destructive/10 px-3 py-1.5 text-xs text-destructive transition-colors hover:bg-destructive/20 disabled:opacity-40"
|
||||
>
|
||||
{busy ? "Deleting…" : "Delete"}
|
||||
{busy ? t("Deleting…") : t("Delete")}
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
+134
-30
@@ -3,12 +3,17 @@
|
||||
import { useCallback, useEffect, useRef, useState } from "react";
|
||||
import { Loader2Icon, MicIcon } from "lucide-react";
|
||||
import { useSettingsDialog } from "@/components/settings/settings-dialog";
|
||||
import { DEFAULT_STT_MODEL, OPENROUTER_STT_MODEL, STT_MAX_AUDIO_BYTES, WAV_HEADER_BYTES, dictationUrl, dictationWav, type SttModel, type SttLanguage } from "@/src/core";
|
||||
import { LanguageSelect, useI18n } from "@/components/i18n";
|
||||
import { Hint } from "@/components/ui/hint";
|
||||
|
||||
/**
|
||||
* Voice dictation — the cloud engine (STT wave 1, 2026-09-17).
|
||||
* Voice dictation — direct Deepgram streaming or whole-recording OpenRouter STT.
|
||||
* MAI-Transcribe-2 records locally, drains the final PCM frame on Stop, then
|
||||
* sends one WAV through /api/stt/transcribe. That route holds the API key.
|
||||
* Both engines buffer text and append once when dictation finishes.
|
||||
*
|
||||
* Architecture (docs/research/stt.md): the renderer captures mic audio in
|
||||
* Deepgram architecture: the renderer captures mic audio in
|
||||
* an AudioWorklet (public/worklets/pcm-capture.js → linear16 16kHz mono),
|
||||
* opens the Deepgram streaming WebSocket DIRECTLY (audio never loops
|
||||
* through our server) with a short-lived token minted by /api/stt/token
|
||||
@@ -86,15 +91,7 @@ import { Hint } from "@/components/ui/hint";
|
||||
* endpointing=300, no interims. Silence streams too (the worklet never
|
||||
* pauses), so the socket never idles — no KeepAlive needed.
|
||||
*/
|
||||
const DG_URL =
|
||||
"wss://api.deepgram.com/v1/listen" +
|
||||
"?model=nova-3" +
|
||||
"&encoding=linear16" +
|
||||
"&sample_rate=16000" +
|
||||
"&channels=1" +
|
||||
"&smart_format=true" +
|
||||
"&punctuate=true" +
|
||||
"&endpointing=300";
|
||||
|
||||
|
||||
/** Meter tuning — the owner's tested values, see the file header. */
|
||||
const METER_FLOOR_DB = -50;
|
||||
@@ -113,6 +110,7 @@ export const DEEPGRAM_KEY_ID = "DEEPGRAM_API_KEY";
|
||||
* instead. Exported for pins; the errored idle button's click recognizes
|
||||
* it and deep-links Settings → Keys → the Deepgram row. */
|
||||
export const DICTATION_KEYLESS = "Dictation needs a Deepgram key";
|
||||
export const OPENROUTER_DICTATION_KEYLESS = "Dictation needs an OpenRouter key";
|
||||
|
||||
/** Mint a fresh short-lived token (the route holds the real key
|
||||
* server-side). Module-level: the start path's warm cache and the
|
||||
@@ -245,7 +243,7 @@ export function useDictationTarget(append: (text: string) => void, claimed: bool
|
||||
}, [append, claimed]);
|
||||
}
|
||||
|
||||
export type DictationPhase = "idle" | "connecting" | "recording" | "stopping";
|
||||
export type DictationPhase = "idle" | "connecting" | "recording" | "stopping" | "transcribing";
|
||||
|
||||
export type Dictation = {
|
||||
phase: DictationPhase;
|
||||
@@ -285,6 +283,18 @@ export type Dictation = {
|
||||
* question waits.
|
||||
*/
|
||||
export function useDictation({ append }: { append: (text: string) => void }): Dictation {
|
||||
const { sttLanguage, general, setDictating } = useI18n();
|
||||
const selectedUrl = useRef("");
|
||||
selectedUrl.current = dictationUrl(sttLanguage, general.sttPreferredLanguages);
|
||||
const recordingUrl = useRef(selectedUrl.current);
|
||||
const selected = useRef({ model: general.sttModel ?? DEFAULT_STT_MODEL, language: sttLanguage });
|
||||
selected.current = { model: general.sttModel ?? DEFAULT_STT_MODEL, language: sttLanguage };
|
||||
const recordingConfig = useRef<{ model: SttModel; language: SttLanguage }>(selected.current);
|
||||
const audioFrames = useRef<Uint8Array[]>([]);
|
||||
const audioBytes = useRef(0);
|
||||
const upload = useRef<AbortController | null>(null);
|
||||
const drain = useRef<(() => void) | null>(null);
|
||||
const stopping = useRef(false);
|
||||
const [phase, setPhase] = useState<DictationPhase>("idle");
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
/** Latest RMS from the worklet — the meter samples this (dictate pattern). */
|
||||
@@ -305,7 +315,7 @@ export function useDictation({ append }: { append: (text: string) => void }): Di
|
||||
/** Frames captured before the socket is OPEN (mitigation A): flushed in
|
||||
* order on open; capped at 256 frames (≈32s) with the oldest dropped;
|
||||
* cleared at teardown so a dead run's audio can't leak into the next. */
|
||||
const pendingRef = useRef<ArrayBuffer[]>([]);
|
||||
const pendingRef = useRef<Array<ArrayBuffer | Int16Array>>([]);
|
||||
const genRef = useRef(0); // stale-handler guard (dictate pattern)
|
||||
const safetyRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
||||
const reconnectsRef = useRef(0);
|
||||
@@ -329,7 +339,15 @@ export function useDictation({ append }: { append: (text: string) => void }): Di
|
||||
/** Full teardown of one run's machinery. Idempotent; generation-guarded by callers. */
|
||||
const cleanup = useCallback(() => {
|
||||
genRef.current++;
|
||||
upload.current?.abort();
|
||||
upload.current = null;
|
||||
drain.current?.();
|
||||
drain.current = null;
|
||||
audioFrames.current = [];
|
||||
audioBytes.current = 0;
|
||||
stopping.current = false;
|
||||
dictationActiveFlag = false;
|
||||
setDictating(false);
|
||||
flush(); // the deferred transcript appears when the run ends (owner round 2)
|
||||
if (safetyRef.current) {
|
||||
clearTimeout(safetyRef.current);
|
||||
@@ -357,7 +375,7 @@ export function useDictation({ append }: { append: (text: string) => void }): Di
|
||||
for (const w of waitersRef.current.splice(0)) w();
|
||||
// Pre-mint for the next run (mitigation D) — best-effort; a keyless
|
||||
// page just doesn't warm.
|
||||
warmTokens.refresh();
|
||||
if (selected.current.model === DEFAULT_STT_MODEL) warmTokens.refresh();
|
||||
}, []);
|
||||
|
||||
/** Open the Deepgram socket and wire its messages. `gen` guards staleness. */
|
||||
@@ -366,7 +384,7 @@ export function useDictation({ append }: { append: (text: string) => void }): Di
|
||||
// Minted JWTs authenticate via the "bearer" subprotocol — ["token",
|
||||
// jwt] is rejected at the handshake (verified live; "token" is for
|
||||
// raw API keys only, as in the owner's pi dictate extension).
|
||||
const ws = new WebSocket(DG_URL, ["bearer", token]);
|
||||
const ws = new WebSocket(recordingUrl.current, ["bearer", token]);
|
||||
wsRef.current = ws;
|
||||
|
||||
ws.addEventListener("open", () => {
|
||||
@@ -426,6 +444,14 @@ export function useDictation({ append }: { append: (text: string) => void }): Di
|
||||
);
|
||||
|
||||
const start = useCallback(async () => {
|
||||
// Pin the complete configuration once; reconnects must retain both language and hints.
|
||||
recordingUrl.current = selectedUrl.current;
|
||||
recordingConfig.current = { ...selected.current };
|
||||
const batch = recordingConfig.current.model === OPENROUTER_STT_MODEL;
|
||||
audioFrames.current = [];
|
||||
audioBytes.current = 0;
|
||||
stopping.current = false;
|
||||
setDictating(true);
|
||||
dictationActiveFlag = true;
|
||||
setError(null);
|
||||
setPhase("connecting");
|
||||
@@ -440,7 +466,17 @@ export function useDictation({ append }: { append: (text: string) => void }): Di
|
||||
// the token runs concurrently with it. 127.0.0.1 is a secure
|
||||
// context, so getUserMedia works without TLS; macOS TCC prompts on
|
||||
// first use.
|
||||
const tokenPromise = warmTokens.mint();
|
||||
const controller = new AbortController();
|
||||
upload.current = controller;
|
||||
const tokenPromise = batch ? fetch("/api/stt/transcribe", { signal: controller.signal }).then(async (response) => {
|
||||
if (!response.ok) throw new Error("OpenRouter transcription is unavailable");
|
||||
const status = await response.json() as { configured?: boolean };
|
||||
if (!status.configured) throw new Error(OPENROUTER_DICTATION_KEYLESS);
|
||||
return "";
|
||||
}).catch((error: unknown) => {
|
||||
if (error instanceof Error && error.message === OPENROUTER_DICTATION_KEYLESS) throw error;
|
||||
throw new Error("OpenRouter transcription is unavailable");
|
||||
}) : warmTokens.mint();
|
||||
tokenPromise.catch(() => {}); // surfaced below; no unhandled rejection
|
||||
const micPromise = navigator.mediaDevices.getUserMedia({
|
||||
audio: { channelCount: 1, echoCancellation: true, noiseSuppression: true, autoGainControl: true },
|
||||
@@ -464,10 +500,26 @@ export function useDictation({ append }: { append: (text: string) => void }): Di
|
||||
const worklet = new AudioWorkletNode(ctx, "pcm-capture");
|
||||
workletRef.current = worklet;
|
||||
worklet.port.onmessage = (e) => {
|
||||
const msg = e.data as { type: string; rms?: number; buffer?: ArrayBuffer };
|
||||
if (gen !== genRef.current) return;
|
||||
const msg = e.data as { type: string; rms?: number; buffer?: ArrayBuffer | Int16Array };
|
||||
if (msg.type === "level") {
|
||||
levelRef.current = msg.rms ?? 0; // never reset to zero (dictate pattern)
|
||||
} else if (msg.type === "flushed") {
|
||||
drain.current?.();
|
||||
drain.current = null;
|
||||
} else if (msg.type === "audio") {
|
||||
if (batch) {
|
||||
const raw = msg.buffer!;
|
||||
const bytes = raw instanceof ArrayBuffer ? new Uint8Array(raw) : new Uint8Array(raw.buffer, raw.byteOffset, raw.byteLength);
|
||||
if (audioBytes.current + bytes.byteLength + WAV_HEADER_BYTES > STT_MAX_AUDIO_BYTES) {
|
||||
setError("Recording exceeds OpenRouter's 25 MB audio limit");
|
||||
cleanup();
|
||||
return;
|
||||
}
|
||||
audioFrames.current.push(bytes);
|
||||
audioBytes.current += bytes.byteLength;
|
||||
return;
|
||||
}
|
||||
const ws = wsRef.current;
|
||||
if (ws && ws.readyState === WebSocket.OPEN) ws.send(msg.buffer!);
|
||||
// Mitigation A: not OPEN yet (handshake or reconnect gap) —
|
||||
@@ -509,12 +561,15 @@ export function useDictation({ append }: { append: (text: string) => void }): Di
|
||||
if (gen !== genRef.current) return;
|
||||
// Mitigation B: the handshake fires the moment the graph is live,
|
||||
// overlapping any remaining token wait — mic-gated, never before it.
|
||||
openSocket(gen, token);
|
||||
if (batch) { if (!stopping.current) setPhase("recording"); }
|
||||
else openSocket(gen, token);
|
||||
}, [openSocket, cleanup]);
|
||||
|
||||
const stop = useCallback(() => {
|
||||
const gen = genRef.current;
|
||||
if (phase !== "recording" && phase !== "connecting") return;
|
||||
if (stopping.current) return;
|
||||
stopping.current = true;
|
||||
setPhase("stopping");
|
||||
|
||||
// Mic dies FIRST — no more audio enqueues (dictate pattern). The
|
||||
@@ -523,6 +578,43 @@ export function useDictation({ append }: { append: (text: string) => void }): Di
|
||||
streamRef.current = null;
|
||||
sourceRef.current?.disconnect();
|
||||
sourceRef.current = null;
|
||||
if (recordingConfig.current.model === OPENROUTER_STT_MODEL) {
|
||||
const worklet = workletRef.current;
|
||||
if (!worklet) { cleanup(); return; }
|
||||
void (async () => {
|
||||
try {
|
||||
// Source is disconnected; drain its last partial PCM frame before wrapping the WAV.
|
||||
await new Promise<void>((resolve, reject) => {
|
||||
const timer = setTimeout(() => { drain.current = null; reject(new Error("Could not finish microphone capture")); }, 2000);
|
||||
drain.current = () => { clearTimeout(timer); resolve(); };
|
||||
worklet.port.postMessage({ type: "flush" });
|
||||
});
|
||||
if (gen !== genRef.current) return;
|
||||
worklet.disconnect();
|
||||
workletRef.current = null;
|
||||
if (audioBytes.current === 0) { cleanup(); return; }
|
||||
setPhase("transcribing");
|
||||
const wav = dictationWav(audioFrames.current);
|
||||
audioFrames.current = [];
|
||||
const params = new URLSearchParams(recordingConfig.current);
|
||||
const response = await fetch(`/api/stt/transcribe?${params}`, {
|
||||
method: "POST", headers: { "Content-Type": "audio/wav" }, body: wav,
|
||||
signal: AbortSignal.any([upload.current!.signal, AbortSignal.timeout(75_000)]),
|
||||
});
|
||||
const body = await response.json() as { text?: string; message?: string };
|
||||
if (gen !== genRef.current) return;
|
||||
if (!response.ok) throw new Error(body.message ?? "OpenRouter transcription is unavailable");
|
||||
if (typeof body.text !== "string") throw new Error("OpenRouter returned an invalid transcript");
|
||||
if (body.text.trim()) bufferRef.current.push(body.text.trim());
|
||||
cleanup();
|
||||
} catch (error) {
|
||||
if (gen !== genRef.current) return;
|
||||
setError(error instanceof Error && error.name === "TimeoutError" ? "OpenRouter transcription timed out" : error instanceof Error && error.name === "Error" ? error.message : "OpenRouter transcription is unavailable");
|
||||
cleanup();
|
||||
}
|
||||
})();
|
||||
return;
|
||||
}
|
||||
workletRef.current?.disconnect();
|
||||
workletRef.current = null;
|
||||
|
||||
@@ -585,8 +677,13 @@ export function useDictation({ append }: { append: (text: string) => void }): Di
|
||||
// page owns ONE hook instance, and only the mounted page's listener is
|
||||
// attached.
|
||||
useEffect(() => {
|
||||
warmTokens.refresh(); // pre-mint at mount (mitigation D) — silent if keyless
|
||||
}, []);
|
||||
if ((general.sttModel ?? DEFAULT_STT_MODEL) === DEFAULT_STT_MODEL) warmTokens.refresh();
|
||||
}, [general.sttModel]);
|
||||
useEffect(() => () => {
|
||||
// Navigation cancels a pending upload and releases the microphone without inserting text.
|
||||
bufferRef.current = [];
|
||||
cleanup();
|
||||
}, [cleanup]);
|
||||
useEffect(() => {
|
||||
window.addEventListener("lh:kbd-toggle-dictation", toggle);
|
||||
return () => window.removeEventListener("lh:kbd-toggle-dictation", toggle);
|
||||
@@ -622,15 +719,15 @@ export function useDictation({ append }: { append: (text: string) => void }): Di
|
||||
* (full text in the tooltip), cleared on the next click.
|
||||
*/
|
||||
export function DictationBar({ dictation }: { dictation: Dictation }) {
|
||||
const { t } = useI18n();
|
||||
const { phase, error, levelRef, toggle, active, clearError } = dictation;
|
||||
const { open: openSettings } = useSettingsDialog();
|
||||
/** The keyless click (zero-keys wave, owner dictation trio): the errored
|
||||
* idle button deep-links Settings → Keys → the Deepgram row and clears
|
||||
* the error — the surface is clean when the user returns. Any other
|
||||
* error keeps the old behavior (click = retry, which clears). */
|
||||
const keyless = error === DICTATION_KEYLESS;
|
||||
const keyless = error === DICTATION_KEYLESS || error === OPENROUTER_DICTATION_KEYLESS;
|
||||
const [levels, setLevels] = useState<number[]>(() => new Array(METER_CELLS).fill(0));
|
||||
const recording = phase === "recording" || phase === "stopping";
|
||||
/** Adaptive cell count (owner round 2): derived from the meter's
|
||||
* measured width — narrow rows show fewer bars instead of
|
||||
* overflowing under neighbors. */
|
||||
@@ -673,12 +770,13 @@ export function DictationBar({ dictation }: { dictation: Dictation }) {
|
||||
|
||||
if (!active) {
|
||||
return (
|
||||
<div className="flex w-full min-w-0 items-center gap-1.5">
|
||||
<Hint
|
||||
// Errored: the button span truncates the line — the tooltip is its
|
||||
// full reveal (the keyless line KEEPS "Deepgram" — owner overrule:
|
||||
// it's the Keys row label, the truth the user needs). Otherwise the
|
||||
// quiet label + the live ⌘D binding.
|
||||
label={error ?? "Dictate"}
|
||||
label={error ? t(error) : t("Dictate")}
|
||||
action={error ? undefined : "toggle-dictation"}
|
||||
side="top"
|
||||
>
|
||||
@@ -687,37 +785,43 @@ export function DictationBar({ dictation }: { dictation: Dictation }) {
|
||||
onClick={() => {
|
||||
if (keyless) {
|
||||
clearError();
|
||||
openSettings("keys", DEEPGRAM_KEY_ID);
|
||||
openSettings("keys", error === OPENROUTER_DICTATION_KEYLESS ? "OPENROUTER_API_KEY" : DEEPGRAM_KEY_ID);
|
||||
} else {
|
||||
toggle();
|
||||
}
|
||||
}}
|
||||
aria-label={error ? `Dictation failed: ${error}` : "Start dictation"}
|
||||
aria-label={error ? t("Dictation failed: {v0}", { v0: t(error) }) : t("Start dictation")}
|
||||
data-testid="dictation-toggle"
|
||||
// Same blurring as the floating chrome (owner, fix wave round 3),
|
||||
// but lower opacity — the mic stays quieter than the model pills.
|
||||
className="flex h-7 w-full items-center justify-center gap-1.5 rounded-md border border-border/50 bg-card/50 text-xs text-muted-foreground/70 shadow-lg backdrop-blur transition-colors hover:border-border hover:text-muted-foreground"
|
||||
>
|
||||
<MicIcon className="size-3.5" />
|
||||
<span className="max-w-full truncate">{error ?? "Dictate"}</span>
|
||||
<span className="max-w-full truncate">{error ? t(error) : t("Dictate")}</span>
|
||||
</button>
|
||||
</Hint>
|
||||
<LanguageSelect field="sttLanguage" compact />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
if (phase === "transcribing") return <div className="flex h-7 w-full min-w-0 items-center gap-2 text-xs text-muted-foreground" role="status" data-testid="dictation-transcribing">
|
||||
<Loader2Icon className="size-3.5 shrink-0 animate-spin" /><span className="min-w-0 flex-1 truncate">{t("Transcribing…")}</span>
|
||||
<button type="button" onClick={dictation.cancel} className="shrink-0 rounded-sm border border-border px-1.5 py-1 hover:bg-muted">{t("Cancel")}</button>
|
||||
</div>;
|
||||
|
||||
return (
|
||||
<div className="flex w-full min-w-0 items-center gap-2" data-testid="dictation-bar">
|
||||
<Hint
|
||||
// The owner flagged this copy good ("Stop dictation (Esc)") —
|
||||
// kept verbatim; only the machinery moved to the styled tooltip.
|
||||
label="Stop dictation (Esc)"
|
||||
label={t("Stop dictation (Esc)")}
|
||||
side="top"
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
onClick={toggle}
|
||||
disabled={phase === "stopping"}
|
||||
aria-label="Stop dictation"
|
||||
aria-label={t("Stop dictation")}
|
||||
data-testid="dictation-toggle"
|
||||
className="flex h-7 shrink-0 items-center gap-1.5 rounded-md bg-destructive/10 px-2 text-xs font-medium text-destructive transition-colors hover:bg-destructive/20"
|
||||
>
|
||||
@@ -726,13 +830,13 @@ export function DictationBar({ dictation }: { dictation: Dictation }) {
|
||||
) : (
|
||||
<MicIcon className="size-3.5" />
|
||||
)}
|
||||
Stop
|
||||
</button>
|
||||
{t("Stop")}</button>
|
||||
</Hint>
|
||||
<span className="size-1.5 shrink-0 animate-pulse rounded-full bg-destructive" aria-hidden />
|
||||
{/* Fixed width while recording — nothing ever appends text beside it
|
||||
(no interims, owner round 1). Cells carry no minimum width; the
|
||||
COUNT adapts to the measured row space (owner round 2). */}
|
||||
<LanguageSelect field="sttLanguage" compact disabled />
|
||||
<div ref={meterRef} className="flex h-4 min-w-0 flex-1 items-center gap-[2px]" data-testid="dictation-meter">
|
||||
{levels.slice(-cellCount).map((v, i) => (
|
||||
<span
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useCallback, useEffect, useRef, useState } from "react";
|
||||
import { useActivity } from "@/components/activity-dock";
|
||||
@@ -183,6 +185,7 @@ export function CoverageMenuBody({
|
||||
extracting: boolean;
|
||||
onExtract: () => void;
|
||||
}) {
|
||||
const { t, language } = useI18n();
|
||||
const busy = coverage.running || extracting;
|
||||
const complete = coverage.uncoveredTokens === 0 && coverage.uncoveredCount === 0;
|
||||
return (
|
||||
@@ -190,17 +193,15 @@ export function CoverageMenuBody({
|
||||
{busy ? (
|
||||
<span className="flex items-center gap-1.5 text-muted-foreground" data-testid="ctx-coverage-running">
|
||||
<span className="size-1.5 animate-pulse rounded-full bg-foreground/70" aria-hidden />
|
||||
extracting…
|
||||
</span>
|
||||
{t("extracting…")}</span>
|
||||
) : complete ? (
|
||||
<span className="text-muted-foreground">fully extracted</span>
|
||||
<span className="text-muted-foreground">{t("fully extracted")}</span>
|
||||
) : (
|
||||
<span className="flex flex-col">
|
||||
<span className="tabular-nums text-foreground">
|
||||
{formatTokens(coverage.uncoveredTokens)} tok uncovered
|
||||
</span>
|
||||
{formatTokens(coverage.uncoveredTokens, language)}{" "}{t("tok uncovered")}</span>
|
||||
<span className="tabular-nums text-muted-foreground">
|
||||
{coverage.uncoveredCount} message{coverage.uncoveredCount === 1 ? "" : "s"} unextracted
|
||||
{t("{count} messages unextracted", { count: coverage.uncoveredCount })}
|
||||
</span>
|
||||
</span>
|
||||
)}
|
||||
@@ -211,7 +212,7 @@ export function CoverageMenuBody({
|
||||
disabled={busy || complete}
|
||||
className="flex items-center justify-center rounded-lg border px-2 py-1 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground disabled:opacity-40 disabled:hover:bg-transparent"
|
||||
>
|
||||
{busy ? "Running" : "Extract"}
|
||||
{busy ? t("Running") : t("Extract")}
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
@@ -241,6 +242,7 @@ export function ringFill(uncoveredTokens: number, chunkTokens: number): number {
|
||||
* threshold/kill-switch re-read live).
|
||||
*/
|
||||
export function CoverageRing({ chatId, refreshKey = 0 }: { chatId: string; refreshKey?: number }) {
|
||||
const { t } = useI18n();
|
||||
const [graph, setGraph] = useState<GraphRead | null>(null);
|
||||
const [coverage, setCoverage] = useState<SessionCoverage | null>(null);
|
||||
const [open, setOpen] = useState(false);
|
||||
@@ -301,7 +303,7 @@ export function CoverageRing({ chatId, refreshKey = 0 }: { chatId: string; refre
|
||||
<div ref={rootRef} className="lh-no-drag relative shrink-0">
|
||||
<Hint
|
||||
// Trimmed (owner, subtlety round 2026-09-25).
|
||||
label="How much of this session isn't mapped yet"
|
||||
label={t("How much of this session isn't mapped yet")}
|
||||
side="bottom"
|
||||
>
|
||||
<button
|
||||
@@ -359,46 +361,43 @@ export function CoverageRingGlyph({ fill, running }: { fill: number; running: bo
|
||||
* covered/uncovered tokens, message coverage, the threshold, the last
|
||||
* fold's age. */
|
||||
export function CoverageRingDetail({ coverage, chunkTokens }: { coverage: SessionCoverage; chunkTokens: number }) {
|
||||
const { t, language } = useI18n();
|
||||
return (
|
||||
<>
|
||||
<div className="mb-2 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
Extraction coverage
|
||||
</div>
|
||||
{t("Extraction coverage")}</div>
|
||||
<div className="flex flex-col gap-1 text-muted-foreground">
|
||||
<div className="flex justify-between gap-2">
|
||||
<span>Uncovered</span>
|
||||
<span>{t("Uncovered")}</span>
|
||||
<span className="tabular-nums text-card-foreground">
|
||||
{formatTokens(coverage.uncoveredTokens)} tokens
|
||||
</span>
|
||||
{formatTokens(coverage.uncoveredTokens, language)}{" "}{t("tokens")}</span>
|
||||
</div>
|
||||
<div className="flex justify-between gap-2">
|
||||
<span>Covered</span>
|
||||
<span>{t("Covered")}</span>
|
||||
<span className="tabular-nums text-card-foreground">
|
||||
{formatTokens(coverage.coveredTokens)} tokens
|
||||
</span>
|
||||
{formatTokens(coverage.coveredTokens, language)}{" "}{t("tokens")}</span>
|
||||
</div>
|
||||
<div className="flex justify-between gap-2">
|
||||
<span>Messages</span>
|
||||
<span>{t("Messages")}</span>
|
||||
<span className="tabular-nums text-card-foreground">
|
||||
{coverage.coveredCount} / {coverage.totalMessages}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex justify-between gap-2">
|
||||
<span>Chunk threshold</span>
|
||||
<span>{t("Chunk threshold")}</span>
|
||||
<span className="tabular-nums text-card-foreground">
|
||||
{formatTokens(chunkTokens)} tokens
|
||||
</span>
|
||||
{formatTokens(chunkTokens, language)}{" "}{t("tokens")}</span>
|
||||
</div>
|
||||
<div className="flex justify-between gap-2">
|
||||
<span>Last extraction</span>
|
||||
<span>{t("Last extraction")}</span>
|
||||
<span className="tabular-nums text-card-foreground">
|
||||
{coverage.lastFoldedAt ? timeAgo(coverage.lastFoldedAt) : "—"}
|
||||
</span>
|
||||
</div>
|
||||
{coverage.running && (
|
||||
<div className="flex justify-between gap-2" data-testid="coverage-ring-running">
|
||||
<span>Status</span>
|
||||
<span className="text-card-foreground">extracting…</span>
|
||||
<span>{t("Status")}</span>
|
||||
<span className="text-card-foreground">{t("extracting…")}</span>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
"use client";
|
||||
import { countLabel } from "@/src/core";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useState } from "react";
|
||||
import { ChevronRightIcon } from "lucide-react";
|
||||
@@ -21,9 +24,10 @@ export interface GraphContextData {
|
||||
}
|
||||
|
||||
export function GraphContextCard({ data }: { data: GraphContextData }) {
|
||||
const { t, language } = useI18n();
|
||||
const [open, setOpen] = useState(false);
|
||||
const { propositions = [], chains = [] } = data ?? {};
|
||||
const noun = (n: number, one: string, many: string) => `${n} ${n === 1 ? one : many}`;
|
||||
const noun = (n: number, one: string, many: string) => countLabel(language, n, one, many);
|
||||
return (
|
||||
<div data-testid="graph-context-card" className="my-1">
|
||||
<button
|
||||
@@ -33,7 +37,7 @@ export function GraphContextCard({ data }: { data: GraphContextData }) {
|
||||
className="flex w-full cursor-pointer items-center gap-2 rounded-lg border border-dashed border-border/70 px-3 py-2 text-left text-xs text-muted-foreground transition-colors hover:text-foreground"
|
||||
>
|
||||
<ChevronRightIcon aria-hidden="true" className={cn("size-3.5 shrink-0 transition-transform", open && "rotate-90")} />
|
||||
<span className="font-medium">Graph context</span>
|
||||
<span className="font-medium">{t("Graph context")}</span>
|
||||
<span className="min-w-0 flex-1 truncate">
|
||||
{noun(propositions.length, "proposition", "propositions")}
|
||||
{chains.length > 0 ? ` · ${noun(chains.length, "chain", "chains")}` : ""}
|
||||
|
||||
+97
-92
@@ -1,4 +1,7 @@
|
||||
"use client";
|
||||
import { translator, countLabel, type Language } from "@/src/core";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
/**
|
||||
* The home knowledge-graph view (W4; vision §1 "Rendering (DECIDED)").
|
||||
@@ -64,9 +67,11 @@
|
||||
*/
|
||||
|
||||
import { useCallback, useDeferredValue, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
|
||||
import { NotesImportErrors, useNotesImport } from "@/components/notes-import.tsx";
|
||||
import Link from "next/link";
|
||||
import { FileTextIcon, ListTreeIcon, Loader2Icon, SearchIcon, SettingsIcon, UploadIcon, WaypointsIcon } from "lucide-react";
|
||||
import { incrementalLayout, propositionSessionHref, type GraphCostSummary, type GraphNode, type GraphSnapshot } from "@/src/core";
|
||||
import { planCostLabel } from "@/components/usage-format";
|
||||
import { GraphCanvasRenderer, type GraphRenderSettings } from "./graph-canvas.ts";
|
||||
import { usePopoverDismiss } from "@/components/popover-dismiss";
|
||||
import { useActivity } from "@/components/activity-dock";
|
||||
@@ -274,7 +279,8 @@ function SettingSlider({
|
||||
}
|
||||
|
||||
/** Compact token display: 45231 → "45.2k"; absent → "—". */
|
||||
function fmtTokens(n: number | undefined): string {
|
||||
function fmtTokens(n: number | undefined, language: Language = "en"): string {
|
||||
if (language === "ru" && n !== undefined) return new Intl.NumberFormat("ru-RU", { notation: "compact", maximumFractionDigits: 1 }).format(n);
|
||||
if (n === undefined) return "—";
|
||||
if (n < 1000) return String(Math.round(n));
|
||||
if (n < 1_000_000) return `${(n / 1000).toFixed(1)}k`;
|
||||
@@ -282,19 +288,30 @@ function fmtTokens(n: number | undefined): string {
|
||||
}
|
||||
|
||||
/** Relative time for run rows: "now", "12m", "3h", "2d". */
|
||||
function timeAgo(startedAt: number): string {
|
||||
function timeAgo(startedAt: number, language: Language = "en"): string {
|
||||
const t = translator(language);
|
||||
const mins = Math.round((Date.now() - startedAt) / 60_000);
|
||||
if (mins < 1) return "now";
|
||||
if (mins < 60) return `${mins}m`;
|
||||
if (mins < 1) return t("now");
|
||||
if (mins < 60) return t("{v0}m", { v0: mins });
|
||||
const hours = Math.round(mins / 60);
|
||||
if (hours < 24) return `${hours}h`;
|
||||
return `${Math.round(hours / 24)}d`;
|
||||
if (hours < 24) return t("{v0}h", { v0: hours });
|
||||
return t("{v0}d", { v0: Math.round(hours / 24) });
|
||||
}
|
||||
|
||||
/** Run/stage cost at 3 decimals (pipeline pennies are real money at this
|
||||
* scale); headline totals use 2. Null (unpriced model) renders "—". */
|
||||
function fmtRunCost(dollars: number | null): string {
|
||||
return dollars === null ? "—" : `$${dollars.toFixed(3)}`;
|
||||
function fmtRunCost(dollars: number | null, providers: readonly string[] = [], language: Language = "en"): string {
|
||||
return planCostLabel(dollars, providers, (value) => language === "ru" ? `${value.toLocaleString("ru-RU", { minimumFractionDigits: 3, maximumFractionDigits: 3 })} $` : `$${value.toFixed(3)}`);
|
||||
}
|
||||
function graphProviders(value: { subscriptionRuns?: number; subscriptionProviders?: string[] }): string[] {
|
||||
return value.subscriptionProviders ?? ((value.subscriptionRuns ?? 0) > 0 ? ["ChatGPT"] : []);
|
||||
}
|
||||
function graphUsageLabel(costs: Pick<GraphCostSummary, "stages">, language: Language = "en"): string {
|
||||
const stages = [costs.stages.extraction, costs.stages.audit];
|
||||
const providers = [...new Set(stages.flatMap(graphProviders))];
|
||||
const priced = stages.some((stage) => stage.runs - stage.unpricedRuns - (stage.subscriptionRuns ?? 0) > 0);
|
||||
const dollars = displayCostTotals(costs).totalDollars;
|
||||
return planCostLabel(priced ? dollars : null, providers, (value) => language === "ru" ? `${value.toLocaleString("ru-RU", { minimumFractionDigits: 2, maximumFractionDigits: 2 })} $` : `$${value.toFixed(2)}`);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -328,6 +345,7 @@ export function displayCostTotals(costs: Pick<GraphCostSummary, "stages">): {
|
||||
/** Exported for the chains home (graph rendering off, owner
|
||||
* 2026-10-06): the same bare cumulative-dollars pill + panel. */
|
||||
export function GraphCostControl({ costs }: { costs: GraphCostSummary }) {
|
||||
const { t, language } = useI18n();
|
||||
const [open, setOpen] = useState(false);
|
||||
// Click anywhere outside (or Escape) closes the panel — the root
|
||||
// wraps button + panel, so the toggle itself keeps working.
|
||||
@@ -337,7 +355,7 @@ export function GraphCostControl({ costs }: { costs: GraphCostSummary }) {
|
||||
<div ref={rootRef} className="relative">
|
||||
<Hint
|
||||
// Trimmed (owner, subtlety round 2026-09-25).
|
||||
label="Graph costs — click for details"
|
||||
label={t("Graph costs — click for details")}
|
||||
side="bottom"
|
||||
>
|
||||
<button
|
||||
@@ -348,7 +366,7 @@ export function GraphCostControl({ costs }: { costs: GraphCostSummary }) {
|
||||
open ? "text-foreground" : "text-muted-foreground hover:text-foreground"
|
||||
}`}
|
||||
>
|
||||
${displayCostTotals(costs).totalDollars.toFixed(2)}
|
||||
{graphUsageLabel(costs, language)}
|
||||
</button>
|
||||
</Hint>
|
||||
{open && (
|
||||
@@ -371,23 +389,23 @@ export function GraphCostControl({ costs }: { costs: GraphCostSummary }) {
|
||||
* naming-kind runs never reach the list.
|
||||
*/
|
||||
function GraphCostPanel({ costs }: { costs: GraphCostSummary }) {
|
||||
const { t, language } = useI18n();
|
||||
const stageRows: [string, GraphCostSummary["stages"]["extraction"]][] = [
|
||||
["Extraction", costs.stages.extraction],
|
||||
["Audit", costs.stages.audit],
|
||||
[t("Extraction"), costs.stages.extraction],
|
||||
[t("Audit"), costs.stages.audit],
|
||||
];
|
||||
// The displayed figures come from displayCostTotals (naming excluded —
|
||||
// the pill and this panel must agree).
|
||||
const { totalDollars, unpricedRuns } = displayCostTotals(costs);
|
||||
const { unpricedRuns } = displayCostTotals(costs);
|
||||
return (
|
||||
<div className="w-80 max-w-[calc(100vw-1.5rem)] rounded-xl border bg-card/95 p-3 text-xs shadow-lg backdrop-blur">
|
||||
<div className="mb-2 flex items-baseline justify-between">
|
||||
<span className="text-[10px] font-medium uppercase tracking-wide text-muted-foreground">
|
||||
Graph pipeline costs
|
||||
</span>
|
||||
{t("Graph pipeline costs")}</span>
|
||||
<span className="text-foreground tabular-nums">
|
||||
${totalDollars.toFixed(2)}
|
||||
{graphUsageLabel(costs, language)}
|
||||
{unpricedRuns > 0 && (
|
||||
<span className="text-muted-foreground"> · {unpricedRuns} unpriced</span>
|
||||
<span className="text-muted-foreground"> · {unpricedRuns}{" "}{t("unpriced")}</span>
|
||||
)}
|
||||
</span>
|
||||
</div>
|
||||
@@ -396,14 +414,13 @@ function GraphCostPanel({ costs }: { costs: GraphCostSummary }) {
|
||||
<div key={label} className="flex items-baseline justify-between gap-2 text-[11px]">
|
||||
<span className="shrink-0 text-muted-foreground">{label}</span>
|
||||
<span className="min-w-0 text-right tabular-nums">
|
||||
{fmtRunCost(stage.runs === 0 || (stage.unpricedRuns > 0 && stage.dollars === 0) ? null : stage.dollars)}
|
||||
{stage.unpricedRuns > 0 && stage.dollars > 0 && (
|
||||
<span className="text-muted-foreground"> +{stage.unpricedRuns} unpriced</span>
|
||||
{fmtRunCost(stage.runs - stage.unpricedRuns - (stage.subscriptionRuns ?? 0) <= 0 ? null : stage.dollars, graphProviders(stage), language)}
|
||||
{stage.unpricedRuns > 0 && (stage.runs - stage.unpricedRuns - (stage.subscriptionRuns ?? 0) > 0 || (stage.subscriptionRuns ?? 0) > 0) && (
|
||||
<span className="text-muted-foreground"> +{stage.unpricedRuns}{" "}{t("unpriced")}</span>
|
||||
)}
|
||||
<span className="text-muted-foreground">
|
||||
{" "}
|
||||
· {fmtTokens(stage.tokens.inputTokens)} in / {fmtTokens(stage.tokens.outputTokens)} out
|
||||
</span>
|
||||
· {fmtTokens(stage.tokens.inputTokens, language)}{" "}{t("in /")}{" "}{fmtTokens(stage.tokens.outputTokens, language)}{" "}{t("out")}</span>
|
||||
</span>
|
||||
</div>
|
||||
))}
|
||||
@@ -412,16 +429,16 @@ function GraphCostPanel({ costs }: { costs: GraphCostSummary }) {
|
||||
{costs.runs.map((run) => (
|
||||
<div key={run.startedAt} className="flex items-baseline justify-between gap-2 text-[11px]">
|
||||
<span className="min-w-0 flex-1 truncate text-muted-foreground">
|
||||
<span className="text-foreground/70">{timeAgo(run.startedAt)}</span>{" "}
|
||||
<span className="text-foreground/70">{timeAgo(run.startedAt, language)}</span>{" "}
|
||||
{run.title}
|
||||
{run.merged && (
|
||||
<span className="text-muted-foreground">
|
||||
{" "}
|
||||
+{run.merged.nodes}n
|
||||
+{language === "ru" ? countLabel(language, run.merged.nodes, "node", "nodes") : `${run.merged.nodes}n`}
|
||||
</span>
|
||||
)}
|
||||
</span>
|
||||
<span className="shrink-0 tabular-nums">{fmtRunCost(run.dollars)}</span>
|
||||
<span className="shrink-0 tabular-nums">{fmtRunCost(run.dollars, graphProviders(run), language)}{run.dollars === null && run.subscriptionRuns === 1 ? t(" +1 unpriced") : ""}</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
@@ -442,6 +459,7 @@ function GraphSettingsControl({
|
||||
settings: GraphRenderSettings;
|
||||
changeSettings: (update: (cur: RenderSettings) => RenderSettings) => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const [open, setOpen] = useState(false);
|
||||
// Click anywhere outside (or Escape) closes the panel (2026-09-17) —
|
||||
// the root wraps button + panel, so the toggle itself keeps working.
|
||||
@@ -453,7 +471,7 @@ function GraphSettingsControl({
|
||||
<div ref={rootRef} className="relative">
|
||||
<Hint
|
||||
// User language (tooltip wave) — "rendering" is internal.
|
||||
label="Graph display settings"
|
||||
label={t("Graph display settings")}
|
||||
side="bottom"
|
||||
>
|
||||
<button
|
||||
@@ -486,7 +504,7 @@ function GraphSettingsControl({
|
||||
number — src/core/render-settings.ts). Physics keeps the
|
||||
fine-grained log sliders (step 5). */}
|
||||
<SettingSlider
|
||||
label="Node size"
|
||||
label={t("Node size")}
|
||||
min={0}
|
||||
max={100}
|
||||
step={10}
|
||||
@@ -496,7 +514,7 @@ function GraphSettingsControl({
|
||||
changeSettings((cur) => ({ ...cur, nodeSize: fromLadderPosition(p, NODE_SIZE_LADDER) }))}
|
||||
/>
|
||||
<SettingSlider
|
||||
label="Edge width"
|
||||
label={t("Edge width")}
|
||||
min={0}
|
||||
max={100}
|
||||
step={10}
|
||||
@@ -506,7 +524,7 @@ function GraphSettingsControl({
|
||||
changeSettings((cur) => ({ ...cur, edgeWidth: fromLadderPosition(p, EDGE_WIDTH_LADDER) }))}
|
||||
/>
|
||||
<SettingSlider
|
||||
label="Arrowhead size"
|
||||
label={t("Arrowhead size")}
|
||||
min={0}
|
||||
max={100}
|
||||
step={10}
|
||||
@@ -516,7 +534,7 @@ function GraphSettingsControl({
|
||||
changeSettings((cur) => ({ ...cur, arrowLength: fromLadderPosition(p, ARROW_LENGTH_LADDER) }))}
|
||||
/>
|
||||
<SettingSlider
|
||||
label="Label size"
|
||||
label={t("Label size")}
|
||||
min={0}
|
||||
max={100}
|
||||
step={10}
|
||||
@@ -527,7 +545,7 @@ function GraphSettingsControl({
|
||||
/>
|
||||
{/* Display is absolute (ratio / 0.5): "1×" is the default, dead-center (owner, 2026-10-07). */}
|
||||
<SettingSlider
|
||||
label="Labels until zoom"
|
||||
label={t("Labels until zoom")}
|
||||
min={0}
|
||||
max={100}
|
||||
step={10}
|
||||
@@ -545,10 +563,9 @@ function GraphSettingsControl({
|
||||
the paint. */}
|
||||
<div className="mt-1.5 flex flex-col gap-1.5 border-t pt-1.5">
|
||||
<span className="text-[10px] font-medium uppercase tracking-wide text-muted-foreground">
|
||||
Regions
|
||||
</span>
|
||||
{t("Regions")}</span>
|
||||
<label className="flex cursor-pointer items-center justify-between text-[11px] text-muted-foreground">
|
||||
<span>Background colors</span>
|
||||
<span>{t("Background colors")}</span>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={settings.regions.enabled}
|
||||
@@ -561,7 +578,7 @@ function GraphSettingsControl({
|
||||
/>
|
||||
</label>
|
||||
<SettingSlider
|
||||
label="Dilation"
|
||||
label={t("Dilation")}
|
||||
disabled={!regionTuning.enabled}
|
||||
min={0}
|
||||
max={100}
|
||||
@@ -575,7 +592,7 @@ function GraphSettingsControl({
|
||||
}))}
|
||||
/>
|
||||
<SettingSlider
|
||||
label="Blur"
|
||||
label={t("Blur")}
|
||||
disabled={!regionTuning.enabled}
|
||||
min={0}
|
||||
max={100}
|
||||
@@ -590,7 +607,7 @@ function GraphSettingsControl({
|
||||
}
|
||||
/>
|
||||
<SettingSlider
|
||||
label="Edge alpha"
|
||||
label={t("Edge alpha")}
|
||||
disabled={!regionTuning.enabled}
|
||||
min={0}
|
||||
max={100}
|
||||
@@ -606,7 +623,7 @@ function GraphSettingsControl({
|
||||
<label
|
||||
className={`flex items-center justify-between gap-2 text-[11px] text-muted-foreground${!regionTuning.enabled ? " opacity-40" : ""}`}
|
||||
>
|
||||
<span>Bitmap resolution</span>
|
||||
<span>{t("Bitmap resolution")}</span>
|
||||
<select
|
||||
disabled={!regionTuning.enabled}
|
||||
className="rounded-md border bg-background px-1.5 py-0.5 text-xs tabular-nums text-foreground"
|
||||
@@ -631,7 +648,7 @@ function GraphSettingsControl({
|
||||
their own clusterLabels toggle. Size is screen px
|
||||
(constant at any zoom, unlike node labels). */}
|
||||
<label className="flex cursor-pointer items-center justify-between text-[11px] text-muted-foreground">
|
||||
<span>Cluster labels</span>
|
||||
<span>{t("Cluster labels")}</span>
|
||||
<input
|
||||
type="checkbox"
|
||||
checked={settings.clusterLabels}
|
||||
@@ -640,7 +657,7 @@ function GraphSettingsControl({
|
||||
/>
|
||||
</label>
|
||||
<SettingSlider
|
||||
label="Cluster label size"
|
||||
label={t("Cluster label size")}
|
||||
disabled={!settings.clusterLabels}
|
||||
min={0}
|
||||
max={100}
|
||||
@@ -666,10 +683,9 @@ function GraphSettingsControl({
|
||||
anchor + its gray-out-able controls last. */}
|
||||
<div className="mt-1.5 flex flex-col gap-1.5 border-t pt-1.5">
|
||||
<span className="text-[10px] font-medium uppercase tracking-wide text-muted-foreground">
|
||||
Physics
|
||||
</span>
|
||||
{t("Physics")}</span>
|
||||
<SettingSlider
|
||||
label="Node repulsion"
|
||||
label={t("Node repulsion")}
|
||||
min={0}
|
||||
max={100}
|
||||
step={5}
|
||||
@@ -682,7 +698,7 @@ function GraphSettingsControl({
|
||||
}))}
|
||||
/>
|
||||
<SettingSlider
|
||||
label="Edge attraction"
|
||||
label={t("Edge attraction")}
|
||||
min={0}
|
||||
max={100}
|
||||
step={5}
|
||||
@@ -695,7 +711,7 @@ function GraphSettingsControl({
|
||||
}))}
|
||||
/>
|
||||
<SettingSlider
|
||||
label="Edge length"
|
||||
label={t("Edge length")}
|
||||
min={0}
|
||||
max={100}
|
||||
step={5}
|
||||
@@ -708,7 +724,7 @@ function GraphSettingsControl({
|
||||
}))}
|
||||
/>
|
||||
<SettingSlider
|
||||
label="Central pull"
|
||||
label={t("Central pull")}
|
||||
min={0}
|
||||
max={100}
|
||||
step={5}
|
||||
@@ -721,12 +737,12 @@ function GraphSettingsControl({
|
||||
}))}
|
||||
/>
|
||||
<SettingSlider
|
||||
label="Cluster pull"
|
||||
label={t("Cluster pull")}
|
||||
min={0}
|
||||
max={100}
|
||||
step={5}
|
||||
value={toOffSliderPosition(physicsTuning.clusterPull, CLUSTER_PULL_RANGE.min, CLUSTER_PULL_RANGE.max)}
|
||||
display={physicsTuning.clusterPull <= 0 ? "off" : sizeDisplay(physicsTuning.clusterPull)}
|
||||
display={physicsTuning.clusterPull <= 0 ? t("off") : sizeDisplay(physicsTuning.clusterPull)}
|
||||
onChange={(p) =>
|
||||
changeSettings((cur) => ({
|
||||
...cur,
|
||||
@@ -734,7 +750,7 @@ function GraphSettingsControl({
|
||||
}))}
|
||||
/>
|
||||
<SettingSlider
|
||||
label="Friction"
|
||||
label={t("Friction")}
|
||||
min={0}
|
||||
max={100}
|
||||
step={5}
|
||||
@@ -751,8 +767,7 @@ function GraphSettingsControl({
|
||||
controls at the very bottom — the grayed group reads
|
||||
as a self-contained sub-section. */}
|
||||
<label className="flex items-center justify-between gap-2 text-xs">
|
||||
Depth anchor
|
||||
<select
|
||||
{t("Depth anchor")}<select
|
||||
className="rounded border bg-background px-1 py-0.5 text-xs"
|
||||
value={physicsTuning.depthMode}
|
||||
onChange={(e) =>
|
||||
@@ -762,13 +777,13 @@ function GraphSettingsControl({
|
||||
}))
|
||||
}
|
||||
>
|
||||
<option value="off">Off</option>
|
||||
<option value="vertical">Vertical (up)</option>
|
||||
<option value="radial">Radial (outward)</option>
|
||||
<option value="off">{t("Off")}</option>
|
||||
<option value="vertical">{t("Vertical (up)")}</option>
|
||||
<option value="radial">{t("Radial (outward)")}</option>
|
||||
</select>
|
||||
</label>
|
||||
<SettingSlider
|
||||
label="Depth strength"
|
||||
label={t("Depth strength")}
|
||||
disabled={physicsTuning.depthMode === "off"}
|
||||
min={0}
|
||||
max={100}
|
||||
@@ -782,7 +797,7 @@ function GraphSettingsControl({
|
||||
}))}
|
||||
/>
|
||||
<SettingSlider
|
||||
label="Depth spacing"
|
||||
label={t("Depth spacing")}
|
||||
disabled={physicsTuning.depthMode === "off"}
|
||||
min={0}
|
||||
max={100}
|
||||
@@ -796,7 +811,7 @@ function GraphSettingsControl({
|
||||
}))}
|
||||
/>
|
||||
<SettingSlider
|
||||
label="Base ring radius"
|
||||
label={t("Base ring radius")}
|
||||
disabled={physicsTuning.depthMode !== "radial"}
|
||||
min={0}
|
||||
max={100}
|
||||
@@ -854,13 +869,14 @@ export function GraphChromeRow({
|
||||
* 2026-09-29). */
|
||||
onOpenChains: () => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<>
|
||||
{!isEmpty && (
|
||||
<div className="graph-chrome-fade-in w-56 min-w-0 shrink rounded-xl border bg-card/85 px-1 py-[3px] shadow-lg backdrop-blur">
|
||||
<Hint
|
||||
// ⌘F focuses node search (surface-scoped registry action).
|
||||
label="Search nodes"
|
||||
label={t("Search nodes")}
|
||||
action="find"
|
||||
side="bottom"
|
||||
>
|
||||
@@ -870,15 +886,15 @@ export function GraphChromeRow({
|
||||
ref={searchInputRef}
|
||||
value={query}
|
||||
onChange={(e) => onQuery(e.target.value)}
|
||||
placeholder="Search nodes…"
|
||||
aria-label="Search nodes"
|
||||
placeholder={t("Search nodes…")}
|
||||
aria-label={t("Search nodes")}
|
||||
spellCheck={false}
|
||||
className="h-7 w-full rounded-lg border bg-background pl-8 text-xs outline-none placeholder:text-muted-foreground focus:border-ring"
|
||||
/>
|
||||
</div>
|
||||
</Hint>
|
||||
{noMatch && (
|
||||
<div className="px-1.5 pt-1 text-[11px] text-muted-foreground">No matching nodes.</div>
|
||||
<div className="px-1.5 pt-1 text-[11px] text-muted-foreground">{t("No matching nodes.")}</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
@@ -886,7 +902,7 @@ export function GraphChromeRow({
|
||||
container (36px band), between the search and Import. */}
|
||||
{!isEmpty && (
|
||||
<div className="graph-chrome-fade-in shrink-0 rounded-xl border bg-card/85 px-1 py-[3px] shadow-lg backdrop-blur">
|
||||
<Hint label="Every reasoning chain" side="bottom">
|
||||
<Hint label={t("Every reasoning chain")} side="bottom">
|
||||
<button
|
||||
type="button"
|
||||
onClick={onOpenChains}
|
||||
@@ -894,8 +910,7 @@ export function GraphChromeRow({
|
||||
className="flex h-7 items-center gap-1.5 rounded-lg px-2.5 text-xs text-muted-foreground transition-colors hover:bg-accent"
|
||||
>
|
||||
<ListTreeIcon className="size-3" />
|
||||
Chains
|
||||
</button>
|
||||
{t("Chains")}</button>
|
||||
</Hint>
|
||||
</div>
|
||||
)}
|
||||
@@ -917,7 +932,7 @@ export function GraphChromeRow({
|
||||
// The one button whose action isn't obvious from its label:
|
||||
// the missing fact is where imports go (owner, subtlety
|
||||
// round 2026-09-25).
|
||||
label="Import notes into the graph"
|
||||
label={t("Import notes into the graph")}
|
||||
side="bottom"
|
||||
>
|
||||
<button
|
||||
@@ -928,7 +943,7 @@ export function GraphChromeRow({
|
||||
className="flex h-7 items-center gap-1.5 rounded-lg px-2.5 text-xs text-muted-foreground transition-colors hover:bg-accent disabled:opacity-50"
|
||||
>
|
||||
<UploadIcon className="size-3" />
|
||||
{importing ? "Importing…" : "Import notes…"}
|
||||
{importing ? t("Importing…") : t("Import notes…")}
|
||||
</button>
|
||||
</Hint>
|
||||
</div>
|
||||
@@ -962,6 +977,7 @@ export function GraphView({
|
||||
onPracticeSelectionChange?: (nodes: { id: string; name: string; statement: string }[]) => void;
|
||||
onChainSelectClose?: () => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const containerRef = useRef<HTMLDivElement | null>(null);
|
||||
const canvasRef = useRef<HTMLCanvasElement | null>(null);
|
||||
const cardRef = useRef<HTMLDivElement | null>(null);
|
||||
@@ -1088,29 +1104,19 @@ export function GraphView({
|
||||
// /api/graph/import; the runs surface in the status chips below, and the
|
||||
// graph refetches when they finish (the runs-empty transition).
|
||||
const fileInputRef = useRef<HTMLInputElement>(null);
|
||||
const [importing, setImporting] = useState(false);
|
||||
// The dock's start-site nudge (accuracy wave, 2026-09-19): the import
|
||||
// POST awaits the WHOLE pipeline server-side, so the run registers long
|
||||
// before the response — nudge at click and again at +600ms to catch the
|
||||
// start; from its first setPhase the run announces itself on the events
|
||||
// channel (S5), and the dock rides those announcements thereafter.
|
||||
const refreshActivity = useActivity().refresh;
|
||||
const onImportFiles = (files: FileList | null) => {
|
||||
if (!files || files.length === 0) return;
|
||||
setImporting(true);
|
||||
refreshActivity();
|
||||
setTimeout(() => refreshActivity(), 600);
|
||||
const form = new FormData();
|
||||
for (const file of Array.from(files)) form.append("files", file);
|
||||
fetch("/api/graph/import", { method: "POST", body: form })
|
||||
.then(async (res) => {
|
||||
const body = (await res.json()) as { results: { filePath: string; ok: boolean }[] };
|
||||
const failed = body.results.filter((r) => !r.ok);
|
||||
if (failed.length > 0) console.error("notes import failed for:", failed);
|
||||
})
|
||||
.catch((err) => console.error("import failed:", err))
|
||||
.finally(() => setImporting(false));
|
||||
};
|
||||
const notesImport = useNotesImport({
|
||||
onStart: () => {
|
||||
refreshActivity();
|
||||
setTimeout(() => refreshActivity(), 600);
|
||||
},
|
||||
});
|
||||
const { importing, onImportFiles } = notesImport;
|
||||
|
||||
// Background pipeline status: read /api/graph/status; whenever a run
|
||||
// LEAVES the feed (finished / aborted / failed), refetch the graph.
|
||||
@@ -1496,10 +1502,9 @@ export function GraphView({
|
||||
<div className="flex h-full w-full items-center justify-center px-4">
|
||||
<div className="flex flex-col items-center gap-3 text-center text-muted-foreground">
|
||||
<WaypointsIcon className="size-10 opacity-40" strokeWidth={1.25} />
|
||||
<div className="text-lg font-medium text-foreground">Knowledge graph</div>
|
||||
<div className="text-lg font-medium text-foreground">{t("Knowledge graph")}</div>
|
||||
<p className="max-w-sm text-sm">
|
||||
Start a session or import notes to build your graph.
|
||||
</p>
|
||||
{t("Start a session or import notes to build your graph.")}</p>
|
||||
</div>
|
||||
</div>
|
||||
) : (
|
||||
@@ -1539,8 +1544,7 @@ export function GraphView({
|
||||
}}
|
||||
className="flex items-center rounded-lg px-2.5 py-1.5 text-left text-muted-foreground/80 transition-colors hover:bg-accent hover:text-foreground"
|
||||
>
|
||||
Delete
|
||||
</button>
|
||||
{t("Delete")}</button>
|
||||
</MenuShell>
|
||||
)}
|
||||
|
||||
@@ -1614,6 +1618,7 @@ export function GraphView({
|
||||
/>
|
||||
</div>
|
||||
|
||||
<NotesImportErrors errors={notesImport.errors} />
|
||||
{/* Top-right tail (owner, 2026-09-20): the pipeline cost number —
|
||||
just a number, hover-highlighted, dropdown breakdown — then
|
||||
the running-pipeline pills under it. Lives BELOW the actions
|
||||
@@ -1627,9 +1632,9 @@ export function GraphView({
|
||||
className="flex items-center gap-2 rounded-full border bg-card/85 px-3 py-1.5 text-xs text-muted-foreground shadow-lg backdrop-blur"
|
||||
>
|
||||
<Loader2Icon className="size-3.5 shrink-0 animate-spin" />
|
||||
<span className="capitalize">{run.phase}</span>
|
||||
<span className="capitalize">{t(run.phase)}</span>
|
||||
<span className="max-w-48 truncate text-foreground">{run.title}</span>
|
||||
<span className="tabular-nums">{Math.max(0, Math.round((Date.now() - run.startedAt) / 1000))}s</span>
|
||||
<span className="tabular-nums">{t("{v0}s", { v0: Math.max(0, Math.round((Date.now() - run.startedAt) / 1000)) })}</span>
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
@@ -1649,7 +1654,7 @@ export function GraphView({
|
||||
<div className="mt-1 text-xs leading-relaxed text-muted-foreground">{selected.node.statement}</div>
|
||||
{selected.sourceIds.length > 0 ? (
|
||||
<div className="mt-3 flex flex-col gap-1">
|
||||
<div className="text-xs text-muted-foreground">Sessions</div>
|
||||
<div className="text-xs text-muted-foreground">{t("Sessions")}</div>
|
||||
{selected.sourceIds.map((sourceId) => {
|
||||
// An imported-notes file: a STATIC entry — the path,
|
||||
// plain text, never a link (no session to open).
|
||||
@@ -1678,7 +1683,7 @@ export function GraphView({
|
||||
})}
|
||||
</div>
|
||||
) : (
|
||||
<div className="mt-3 text-xs text-muted-foreground">No sessions recorded.</div>
|
||||
<div className="mt-3 text-xs text-muted-foreground">{t("No sessions recorded.")}</div>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
+7
-5
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
@@ -30,6 +32,7 @@ export function Home({
|
||||
* changing the setting applies on the next visit home. */
|
||||
rendering?: boolean;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const router = useRouter();
|
||||
const [topic, setTopic] = useState("");
|
||||
/* The topic MIRROR ("nothing gets lost" round, 2026-10-01 — same
|
||||
@@ -236,8 +239,7 @@ export function Home({
|
||||
onClick={() => setSetupOpen(true)}
|
||||
className="rounded-sm border border-border bg-card px-3 py-1.5 font-ui text-xs text-foreground transition-colors hover:border-muted-foreground/50 hover:bg-accent cursor-pointer"
|
||||
>
|
||||
Set up your models
|
||||
</button>
|
||||
{t("Set up your models")}</button>
|
||||
)
|
||||
)}
|
||||
/>
|
||||
@@ -270,7 +272,7 @@ export function Home({
|
||||
void start();
|
||||
}
|
||||
}}
|
||||
placeholder={mode === "practice" ? "What do you want to practice?" : "What do you want to learn?"}
|
||||
placeholder={mode === "practice" ? t("What do you want to practice?") : t("What do you want to learn?")}
|
||||
autoFocus
|
||||
rows={1}
|
||||
className="field-sizing-content lh-input max-h-48 min-h-10 flex-1 resize-none bg-transparent px-2.5 py-2 outline-none placeholder:text-muted-foreground"
|
||||
@@ -279,7 +281,7 @@ export function Home({
|
||||
affordance (owner, subtlety round 2026-09-25). */}
|
||||
<button
|
||||
type="submit"
|
||||
aria-label="Start session"
|
||||
aria-label={t("Start session")}
|
||||
disabled={(!topic.trim() && !dictation.active) || busy}
|
||||
className="flex size-10 shrink-0 items-center justify-center rounded-[10px] bg-primary text-primary-foreground transition-colors hover:opacity-90 disabled:opacity-40"
|
||||
>
|
||||
@@ -309,7 +311,7 @@ export function Home({
|
||||
}
|
||||
>
|
||||
{m === "practice" ? <DumbbellIcon aria-hidden="true" className="size-3" /> : null}
|
||||
{m === "teach" ? "Teach" : "Practice"}
|
||||
{m === "teach" ? t("Teach") : t("Practice")}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
|
||||
@@ -0,0 +1,212 @@
|
||||
"use client";
|
||||
|
||||
import { createContext, useCallback, useContext, useEffect, useId, useMemo, useRef, useState, type ReactNode } from "react";
|
||||
import { DEFAULT_STT_MODEL, OPENROUTER_STT_MODEL, STT_MODELS, resolveLanguage, resolveSttLanguage, translator, type GeneralSettings, type Language, type SttLanguage, type SttModel, type Translator } from "@/src/core";
|
||||
import { notifySettingsSaved, useSettingsSaved } from "./settings-signal";
|
||||
import { MENU_CLOSE_EVENT, MENU_OPEN_EVENT, MenuShell } from "./menu-shell";
|
||||
import { CheckIcon } from "lucide-react";
|
||||
import { DropdownMenu } from "radix-ui";
|
||||
|
||||
type LanguageField = "language" | "sttLanguage";
|
||||
type I18nValue = {
|
||||
language: Language;
|
||||
sttLanguage: SttLanguage;
|
||||
general: GeneralSettings;
|
||||
dictating: boolean;
|
||||
setDictating: (active: boolean) => void;
|
||||
t: Translator;
|
||||
saveGeneral: (patch: Partial<GeneralSettings>) => Promise<void>;
|
||||
saveLanguage: <Field extends LanguageField>(field: Field, value: GeneralSettings[Field]) => Promise<void>;
|
||||
};
|
||||
const I18nContext = createContext<I18nValue>({ language: "en", sttLanguage: "en", general: {}, dictating: false, setDictating: () => {}, t: translator("en"), saveGeneral: async () => {}, saveLanguage: async () => {} });
|
||||
export function useI18n(): I18nValue { return useContext(I18nContext); }
|
||||
|
||||
/** Initial settings and locale come from the server, so hydration preserves the first frame. */
|
||||
export function I18nProvider({ children, initialGeneral = {}, system = "en" }: { children: ReactNode; initialGeneral?: GeneralSettings; system?: Language }) {
|
||||
const [general, setGeneral] = useState(initialGeneral);
|
||||
const [dictating, setDictating] = useState(false);
|
||||
const [detected, setDetected] = useState<Language>(system);
|
||||
const pending = useRef<Promise<void>>(Promise.resolve());
|
||||
const sequence = useRef(0);
|
||||
const latest = useRef(general);
|
||||
latest.current = general;
|
||||
const language = resolveLanguage(general.language, detected);
|
||||
const sttLanguage = resolveSttLanguage(general.sttLanguage, detected);
|
||||
const t = useMemo(() => translator(language), [language]);
|
||||
useEffect(() => {
|
||||
const detect = () => setDetected(resolveLanguage(undefined, navigator.languages));
|
||||
detect();
|
||||
window.addEventListener("languagechange", detect);
|
||||
return () => window.removeEventListener("languagechange", detect);
|
||||
}, []);
|
||||
useEffect(() => {
|
||||
document.documentElement.lang = language;
|
||||
document.title = "Learning Harness";
|
||||
const description = document.querySelector('meta[name="description"]');
|
||||
if (description) description.setAttribute("content", t("A teacher agent with a memory — sessions, quizzes, and a knowledge graph of what you know."));
|
||||
window.lh?.setLanguage?.(language);
|
||||
}, [language, t]);
|
||||
useSettingsSaved((section) => {
|
||||
if (section !== "general") return;
|
||||
const request = ++sequence.current;
|
||||
void fetch("/api/settings").then((r) => { if (!r.ok) throw new Error("settings"); return r.json(); })
|
||||
.then((body: { settings?: { general?: GeneralSettings } }) => { if (request === sequence.current) setGeneral(body.settings?.general ?? {}); }).catch(() => {});
|
||||
});
|
||||
// Serialize writes and re-read before replacing the section: simultaneous selectors cannot lose each other's changes.
|
||||
const saveGeneral = useCallback((patch: Partial<GeneralSettings>) => {
|
||||
const write = pending.current.catch(() => {}).then(async () => {
|
||||
const current = await fetch("/api/settings");
|
||||
if (!current.ok) throw new Error("Could not load language settings");
|
||||
const body = await current.json() as { settings?: { general?: GeneralSettings } };
|
||||
const next = { ...(body.settings?.general ?? latest.current) };
|
||||
for (const field of ["language", "sttLanguage", "sttModel", "sttPreferredLanguages", "autoUpdate"] as const) {
|
||||
if (!Object.hasOwn(patch, field)) continue;
|
||||
if (patch[field] === undefined) delete next[field];
|
||||
else Object.assign(next, { [field]: patch[field] });
|
||||
}
|
||||
const res = await fetch("/api/settings/general", { method: "PUT", headers: { "Content-Type": "application/json" }, body: JSON.stringify(next) });
|
||||
if (!res.ok) throw new Error("Could not save language settings");
|
||||
sequence.current++;
|
||||
setGeneral(next);
|
||||
notifySettingsSaved("general");
|
||||
});
|
||||
pending.current = write;
|
||||
return write;
|
||||
}, []);
|
||||
const saveLanguage = useCallback(<Field extends LanguageField,>(field: Field, value: GeneralSettings[Field]) => saveGeneral({ [field]: value }), [saveGeneral]);
|
||||
const value = useMemo(() => ({ language, sttLanguage, general, dictating, setDictating, t, saveGeneral, saveLanguage }), [language, sttLanguage, general, dictating, t, saveGeneral, saveLanguage]);
|
||||
return <I18nContext.Provider value={value}>{children}</I18nContext.Provider>;
|
||||
}
|
||||
|
||||
export function LanguageSelect(props: { field: LanguageField; disabled?: boolean; compact?: boolean }) {
|
||||
return <GeneralSelect {...props} />;
|
||||
}
|
||||
|
||||
export function SttModelSelect() { return <GeneralSelect field="sttModel" />; }
|
||||
|
||||
function GeneralSelect({ field, disabled = false, compact = false }: { field: LanguageField | "sttModel"; disabled?: boolean; compact?: boolean }) {
|
||||
const { general, t, saveGeneral, sttLanguage, dictating } = useI18n();
|
||||
const [saving, setSaving] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [open, setOpen] = useState(false);
|
||||
const trigger = useRef<HTMLButtonElement>(null);
|
||||
const menuId = useId();
|
||||
const locked = disabled || saving || (field !== "language" && dictating);
|
||||
const menuOpen = open && !locked;
|
||||
const compactStt = compact && field === "sttLanguage";
|
||||
const saved = general[field] ?? (field === "sttModel" ? DEFAULT_STT_MODEL : "auto");
|
||||
const selected = compactStt && saved === "auto" ? sttLanguage : saved;
|
||||
const label = t(field === "language" ? "Interface language" : field === "sttModel" ? "Speech recognition model" : "Speech recognition language");
|
||||
const testid = field === "sttModel" ? "stt-model-select" : `language-select-${field}${compact ? "-compact" : ""}`;
|
||||
const options: readonly { value: string; label: string }[] = field === "sttModel" ? STT_MODELS.map((model) => ({ value: model.id, label: model.name })) : [
|
||||
...(!compactStt ? [{ value: "auto", label: t("System default") } as const] : []),
|
||||
{ value: "en", label: "English" },
|
||||
{ value: "ru", label: "Русский" },
|
||||
...(field === "sttLanguage" ? [{ value: "multi", label: t("Multilingual") } as const] : []),
|
||||
] as const;
|
||||
useEffect(() => { if (locked) setOpen(false); }, [locked]);
|
||||
useEffect(() => {
|
||||
if (!menuOpen) return;
|
||||
const outside = (event: PointerEvent) => {
|
||||
const target = event.target as Node;
|
||||
if (!trigger.current?.contains(target) && !document.getElementById(menuId)?.contains(target)) setOpen(false);
|
||||
};
|
||||
const escape = (event: KeyboardEvent) => {
|
||||
if (event.key !== "Escape") return;
|
||||
event.preventDefault();
|
||||
event.stopPropagation();
|
||||
setOpen(false);
|
||||
trigger.current?.focus();
|
||||
};
|
||||
document.addEventListener("pointerdown", outside);
|
||||
// Claim Escape before the settings dialog or dictation's outer layer.
|
||||
document.addEventListener("keydown", escape, true);
|
||||
return () => {
|
||||
document.removeEventListener("pointerdown", outside);
|
||||
document.removeEventListener("keydown", escape, true);
|
||||
};
|
||||
}, [menuOpen, menuId]);
|
||||
const pick = (value: string) => {
|
||||
if (locked) return;
|
||||
setOpen(false);
|
||||
trigger.current?.focus();
|
||||
if (value === saved) return;
|
||||
setSaving(true); setError(null);
|
||||
const patch = field === "sttModel" ? { sttModel: value as SttModel } : { [field]: value === "auto" ? undefined : value };
|
||||
void saveGeneral(patch).catch((e: unknown) => setError(e instanceof Error ? e.message : "Could not save language settings")).finally(() => setSaving(false));
|
||||
};
|
||||
return <span className={compact ? "flex shrink-0 items-center gap-1" : "flex max-w-full shrink-0 flex-col items-end gap-1"}>
|
||||
<button ref={trigger} type="button" aria-label={label} title={label} aria-haspopup="menu" aria-expanded={menuOpen} aria-controls={menuOpen ? menuId : undefined} disabled={locked} data-testid={testid}
|
||||
className={`flex h-7 max-w-full items-center gap-1 rounded-sm border border-border bg-background px-1.5 font-ui text-xs text-foreground transition-colors hover:border-muted-foreground/50 disabled:cursor-not-allowed disabled:opacity-50 ${compact ? "w-24" : field === "sttModel" ? "w-64" : "w-36"}`}
|
||||
onClick={() => setOpen(!menuOpen)}
|
||||
onKeyDown={(event) => {
|
||||
if (event.key !== "ArrowDown" && event.key !== "ArrowUp") return;
|
||||
event.preventDefault(); event.stopPropagation(); setOpen(true);
|
||||
}}>
|
||||
<span className="min-w-0 flex-1 truncate text-left">{compact && selected === "multi" ? t("Multi") : options.find((option) => option.value === selected)?.label}</span>
|
||||
<span aria-hidden className="text-muted-foreground">▾</span>
|
||||
</button>
|
||||
{menuOpen && <MenuShell anchorRef={trigger} testid={`${testid}-menu`} preferredSide={compact ? "up" : "down"} menuClass={`flex ${field === "sttModel" ? "w-72" : "w-44"} flex-col gap-0.5 rounded-xl border border-border bg-card p-2 text-xs shadow-xl`}>
|
||||
<div id={menuId} role="menu" aria-label={label} className="flex flex-col gap-0.5">
|
||||
{options.map((option) => <button key={option.value} type="button" role="menuitemradio" aria-checked={selected === option.value} onClick={() => pick(option.value)}
|
||||
className={`flex items-center justify-between rounded-lg px-2 py-1.5 text-left transition-colors hover:bg-muted ${selected === option.value ? "bg-muted/60 text-card-foreground" : "text-card-foreground"}`}>
|
||||
<span>{option.label}</span>{selected === option.value && <span aria-hidden>✓</span>}
|
||||
</button>)}
|
||||
</div>
|
||||
</MenuShell>}
|
||||
{error && <span role="alert" className="max-w-56 text-xs text-destructive">{t(error)}</span>}
|
||||
</span>;
|
||||
}
|
||||
|
||||
/** Preferred languages guide multilingual recognition; they are saved independently of its mode. */
|
||||
export function SttPreferredLanguages() {
|
||||
const { general, sttLanguage, dictating, saveGeneral, t } = useI18n();
|
||||
const [saving, setSaving] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [open, setOpen] = useState(false);
|
||||
const busy = useRef(false);
|
||||
const preferred = general.sttPreferredLanguages ?? [];
|
||||
const unavailable = sttLanguage !== "multi" || general.sttModel === OPENROUTER_STT_MODEL || dictating;
|
||||
const menuOpen = open && !unavailable;
|
||||
const summary = (["en", "ru"] as const).filter((language) => preferred.includes(language)).map((language) => language === "en" ? "English" : "Русский").join(", ") || t("No preference");
|
||||
useEffect(() => { if (unavailable) setOpen(false); }, [unavailable]);
|
||||
useEffect(() => {
|
||||
if (!menuOpen) return;
|
||||
window.dispatchEvent(new CustomEvent(MENU_OPEN_EVENT));
|
||||
return () => { window.dispatchEvent(new CustomEvent(MENU_CLOSE_EVENT)); };
|
||||
}, [menuOpen]);
|
||||
const toggle = (language: Language) => {
|
||||
if (unavailable || busy.current) return;
|
||||
const next = (["en", "ru"] as const).filter((code) => code === language ? !preferred.includes(code) : preferred.includes(code));
|
||||
busy.current = true;
|
||||
setSaving(true); setError(null);
|
||||
void saveGeneral({ sttPreferredLanguages: next })
|
||||
.catch(() => setError("Could not save preferred languages"))
|
||||
.finally(() => { busy.current = false; setSaving(false); });
|
||||
};
|
||||
return <span className="flex max-w-full shrink-0 flex-col items-end gap-1">
|
||||
<DropdownMenu.Root open={menuOpen} onOpenChange={setOpen} modal={false}>
|
||||
<DropdownMenu.Trigger asChild>
|
||||
<button type="button" data-testid="stt-preferred-select" aria-label={t("Preferred languages")} title={summary} disabled={unavailable || saving}
|
||||
className={`flex h-7 w-44 max-w-full items-center gap-1 rounded-sm border border-border bg-background px-1.5 font-ui text-xs text-foreground transition-colors hover:border-muted-foreground/50 ${unavailable ? "disabled:cursor-not-allowed disabled:opacity-50" : "disabled:cursor-default"}`}
|
||||
onKeyDown={(event) => { if (event.key === "ArrowUp" && !unavailable && !saving) { event.preventDefault(); event.stopPropagation(); setOpen(true); } }}>
|
||||
<span className="min-w-0 flex-1 truncate text-left">{summary}</span><span aria-hidden className="text-muted-foreground">▾</span>
|
||||
</button>
|
||||
</DropdownMenu.Trigger>
|
||||
<DropdownMenu.Portal>
|
||||
<DropdownMenu.Content data-testid="stt-preferred-menu" data-lh-menu="" aria-label={t("Preferred languages")} side="bottom" align="end" sideOffset={4} collisionPadding={8} loop
|
||||
className="z-60 flex w-44 max-h-[min(60vh,var(--radix-dropdown-menu-content-available-height))] flex-col gap-0.5 overflow-y-auto rounded-xl border border-border bg-card p-2 text-xs shadow-xl outline-none"
|
||||
onKeyDown={(event) => event.stopPropagation()}
|
||||
onEscapeKeyDown={(event) => event.stopPropagation()}>
|
||||
{(["en", "ru"] as const).map((language) => <DropdownMenu.CheckboxItem key={language} data-testid={`stt-preferred-${language}`} checked={preferred.includes(language)} disabled={saving}
|
||||
onCheckedChange={() => toggle(language)} onSelect={(event) => event.preventDefault()}
|
||||
className={`flex cursor-default select-none items-center gap-2 rounded-lg px-2 py-1.5 text-left text-card-foreground outline-none transition-colors data-highlighted:bg-muted ${preferred.includes(language) ? "bg-muted/60" : ""}`}>
|
||||
<span aria-hidden className="flex size-3.5 shrink-0 items-center justify-center rounded-xs border border-border"><DropdownMenu.ItemIndicator><CheckIcon className="size-3" /></DropdownMenu.ItemIndicator></span>
|
||||
{language === "en" ? "English" : "Русский"}
|
||||
</DropdownMenu.CheckboxItem>)}
|
||||
</DropdownMenu.Content>
|
||||
</DropdownMenu.Portal>
|
||||
</DropdownMenu.Root>
|
||||
{error && <span role="alert" className="max-w-56 text-xs text-destructive">{t(error)}</span>}
|
||||
</span>;
|
||||
}
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
/**
|
||||
* Keyboard shortcuts (shortcut wave A, 2026-09-17) — the single document-level
|
||||
@@ -151,13 +153,14 @@ export function KeyboardShortcuts() {
|
||||
* Until the settings milestone ships an editor, this is how shortcuts
|
||||
* stay discoverable. */
|
||||
function CheatSheet({ open, onClose }: { open: boolean; onClose: () => void }) {
|
||||
const { t } = useI18n();
|
||||
const backdropDismiss = useBackdropDismiss(onClose);
|
||||
if (!open) return null;
|
||||
const scopes = ["global", "chat", "graph"] as const;
|
||||
const scopeLabels: Record<(typeof scopes)[number], string> = {
|
||||
global: "Global",
|
||||
chat: "Chat",
|
||||
graph: "Graph view",
|
||||
global: t("Global"),
|
||||
chat: t("Chat"),
|
||||
graph: t("Graph view"),
|
||||
};
|
||||
return (
|
||||
<div
|
||||
@@ -170,8 +173,8 @@ function CheatSheet({ open, onClose }: { open: boolean; onClose: () => void }) {
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
>
|
||||
<div className="mb-4 flex items-baseline justify-between">
|
||||
<span className="text-sm font-medium text-card-foreground">Keyboard shortcuts</span>
|
||||
<span className="text-xs text-muted-foreground">Esc to close</span>
|
||||
<span className="text-sm font-medium text-card-foreground">{t("Keyboard shortcuts")}</span>
|
||||
<span className="text-xs text-muted-foreground">{t("Esc to close")}</span>
|
||||
</div>
|
||||
{scopes.map((scope) => {
|
||||
const actions = KEYBOARD_ACTIONS.filter((a) => a.scope === scope);
|
||||
@@ -184,9 +187,9 @@ function CheatSheet({ open, onClose }: { open: boolean; onClose: () => void }) {
|
||||
<div className="flex flex-col gap-1">
|
||||
{actions.map((a) => (
|
||||
<div key={a.id} className="flex items-center justify-between gap-4 text-sm">
|
||||
<span className="text-muted-foreground">{a.label}</span>
|
||||
<span className="text-muted-foreground">{t(a.label)}</span>
|
||||
<kbd className="rounded-md border border-border bg-background px-1.5 py-0.5 font-mono text-xs text-card-foreground">
|
||||
{formatBinding(bindingForAction(a.id))}
|
||||
{t(formatBinding(bindingForAction(a.id)))}
|
||||
</kbd>
|
||||
</div>
|
||||
))}
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
/**
|
||||
* MARKDOWN BLOCKS, MELTED INTO THE MESSAGE (owner wave, 2026-09-19): the
|
||||
@@ -139,6 +141,7 @@ export function codeSource(children: ReactNode): string {
|
||||
* still streaming (the trailing open fence), a quiet skeleton instead of a
|
||||
* doomed parse. */
|
||||
function MermaidInline({ chart }: { chart: string }) {
|
||||
const { t } = useI18n();
|
||||
const [svg, setSvg] = useState<string | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [attempt, setAttempt] = useState(0);
|
||||
@@ -199,17 +202,17 @@ function MermaidInline({ chart }: { chart: string }) {
|
||||
dangerouslySetInnerHTML={{ __html: svg ?? "" }}
|
||||
/>
|
||||
<div className="absolute top-0 right-0 flex items-start gap-0.5">
|
||||
<CopyCorner getText={() => chart} label="Copy diagram source" />
|
||||
<CopyCorner getText={() => chart} label={t("Copy diagram source")} />
|
||||
{overlay && (
|
||||
<Hint
|
||||
// Full-screen overlay copy (tooltip wave) — "session view" was
|
||||
// internal direction-speak for the same thing.
|
||||
label="Open full-screen"
|
||||
label={t("Open full-screen")}
|
||||
side="bottom"
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Expand diagram"
|
||||
aria-label={t("Expand diagram")}
|
||||
data-testid="md-mermaid-expand"
|
||||
className="flex size-6 items-center justify-center rounded-md text-muted-foreground/70 opacity-0 transition-opacity hover:bg-accent hover:text-foreground group-hover/md:opacity-100"
|
||||
onClick={(e) => {
|
||||
@@ -234,6 +237,7 @@ function MermaidInline({ chart }: { chart: string }) {
|
||||
* mounts. The container/look is CSS-melted in globals.css
|
||||
* (data-streamdown="code-block"…). */
|
||||
export function MarkdownCode(props: ComponentProps<"code"> & ExtraProps) {
|
||||
const { t } = useI18n();
|
||||
const incomplete = useIsCodeFenceIncomplete();
|
||||
const { children, className, node, ...rest } = props;
|
||||
|
||||
@@ -257,7 +261,7 @@ export function MarkdownCode(props: ComponentProps<"code"> & ExtraProps) {
|
||||
const lineNumbers = !/\bnoLineNumbers\b/.test(meta);
|
||||
return (
|
||||
<div className="group/md relative" data-testid="md-code">
|
||||
<CopyCorner className="absolute top-1.5 right-2 z-10" getText={() => source} label="Copy code" />
|
||||
<CopyCorner className="absolute top-1.5 right-2 z-10" getText={() => source} label={t("Copy code")} />
|
||||
<CodeBlock
|
||||
code={source}
|
||||
language={language}
|
||||
@@ -374,6 +378,7 @@ export function MarkdownBlockquote(props: ComponentProps<"blockquote"> & ExtraPr
|
||||
* horizontal-scroller for wide ones, with the corner copy. The copy
|
||||
* serializes the REAL DOM table (the library's own extractor → Markdown). */
|
||||
export function MarkdownTable(props: ComponentProps<"table"> & ExtraProps) {
|
||||
const { t } = useI18n();
|
||||
const { children, node, ...rest } = props;
|
||||
const ref = useRef<HTMLTableElement>(null);
|
||||
return (
|
||||
@@ -385,7 +390,7 @@ export function MarkdownTable(props: ComponentProps<"table"> & ExtraProps) {
|
||||
// cells it hovers over; the scroll container stays under it (the
|
||||
// corner is fixed to the wrapper, not the scrolling table).
|
||||
className="absolute top-1 right-1 z-10"
|
||||
label="Copy table"
|
||||
label={t("Copy table")}
|
||||
getText={() => (ref.current ? tableDataToMarkdown(extractTableDataFromElement(ref.current)) : "")}
|
||||
/>
|
||||
<div className="overflow-x-auto">
|
||||
@@ -414,6 +419,7 @@ export function MarkdownTable(props: ComponentProps<"table"> & ExtraProps) {
|
||||
* in the MathML <annotation>; read from the DOM on click, no re-parse).
|
||||
* Every other span passes through untouched. */
|
||||
export function MathDisplay(props: ComponentProps<"span"> & ExtraProps) {
|
||||
const { t } = useI18n();
|
||||
const { children, className, node, ...rest } = props;
|
||||
const ref = useRef<HTMLSpanElement>(null);
|
||||
if (!className?.includes("katex-display")) {
|
||||
@@ -434,7 +440,7 @@ export function MathDisplay(props: ComponentProps<"span"> & ExtraProps) {
|
||||
<span className="group/md relative block z-0" data-testid="md-math">
|
||||
<CopyCorner
|
||||
className="absolute top-0 right-0 z-10"
|
||||
label="Copy equation source"
|
||||
label={t("Copy equation source")}
|
||||
getText={() => ref.current?.querySelector("annotation")?.textContent ?? ""}
|
||||
/>
|
||||
<span ref={ref} className={className} {...rest}>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { cn } from "@/lib/utils";
|
||||
@@ -15,7 +16,9 @@ export const MermaidError = ({
|
||||
error,
|
||||
retry,
|
||||
className,
|
||||
}: MermaidErrorComponentProps & { className?: string }) => (
|
||||
}: MermaidErrorComponentProps & { className?: string }) => {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<div
|
||||
className={cn(
|
||||
"my-4 rounded-xl border border-destructive/40 bg-destructive/5 p-4",
|
||||
@@ -24,21 +27,22 @@ export const MermaidError = ({
|
||||
data-streamdown="mermaid-error"
|
||||
>
|
||||
<p className="text-sm font-medium text-destructive">
|
||||
Diagram failed to render
|
||||
{t("Diagram failed to render")}
|
||||
</p>
|
||||
<p className="mt-1 font-mono text-xs break-words text-muted-foreground">
|
||||
{error}
|
||||
</p>
|
||||
<details className="mt-3">
|
||||
<summary className="cursor-pointer text-xs text-muted-foreground">
|
||||
Show diagram source
|
||||
{t("Show diagram source")}
|
||||
</summary>
|
||||
<pre className="mt-2 overflow-x-auto rounded-lg bg-muted p-3 font-mono text-xs text-foreground">
|
||||
{chart}
|
||||
</pre>
|
||||
</details>
|
||||
<Button className="mt-3" onClick={retry} size="sm" variant="outline">
|
||||
Retry
|
||||
{t("Retry")}
|
||||
</Button>
|
||||
</div>
|
||||
);
|
||||
};
|
||||
|
||||
+20
-32
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
/**
|
||||
* THE MINIMAL HOME (owner, 2026-10-06 — the no-graph home, take two):
|
||||
@@ -22,7 +24,9 @@ import { useCallback, useEffect, useRef, useState } from "react";
|
||||
import { ListTreeIcon, UploadIcon } from "lucide-react";
|
||||
import { ChainTableOverlay } from "@/components/chain-table.tsx";
|
||||
import { GraphCostControl } from "@/components/graph-view.tsx";
|
||||
import { NotesImportErrors, useNotesImport } from "@/components/notes-import.tsx";
|
||||
import { Hint } from "@/components/ui/hint";
|
||||
import { countLabel } from "@/src/core";
|
||||
import type { ChatSummary, GraphCostSummary, GraphSnapshot } from "@/src/core";
|
||||
|
||||
/** The quiet centered summary — a pure body (props in, markup out) so
|
||||
@@ -41,6 +45,7 @@ export function KnowledgeSummary({
|
||||
practiceSessions: number;
|
||||
importedNotes: number;
|
||||
}) {
|
||||
const { t, language } = useI18n();
|
||||
const empty =
|
||||
propositions === 0 && chains === 0 && teachSessions === 0 && practiceSessions === 0 && importedNotes === 0;
|
||||
return (
|
||||
@@ -51,29 +56,28 @@ export function KnowledgeSummary({
|
||||
list) rides after the same parting. */}
|
||||
<div className="flex flex-col gap-1">
|
||||
<p className="font-ui text-sm text-muted-foreground">
|
||||
{propositions} {propositions === 1 ? "proposition" : "propositions"}
|
||||
{countLabel(language, propositions, "proposition", "propositions")}
|
||||
</p>
|
||||
<p className="font-ui text-sm text-muted-foreground">
|
||||
{chains} {chains === 1 ? "chain" : "chains"}
|
||||
{countLabel(language, chains, "chain", "chains")}
|
||||
</p>
|
||||
</div>
|
||||
<div className="h-4" aria-hidden="true" />
|
||||
<div className="flex flex-col gap-1">
|
||||
<p className="font-ui text-sm text-muted-foreground">
|
||||
{teachSessions} {teachSessions === 1 ? "teaching session" : "teaching sessions"}
|
||||
{countLabel(language, teachSessions, "teaching session", "teaching sessions")}
|
||||
</p>
|
||||
<p className="font-ui text-sm text-muted-foreground">
|
||||
{practiceSessions} {practiceSessions === 1 ? "practice session" : "practice sessions"}
|
||||
{countLabel(language, practiceSessions, "practice session", "practice sessions")}
|
||||
</p>
|
||||
</div>
|
||||
<div className="h-4" aria-hidden="true" />
|
||||
<p className="font-ui text-sm text-muted-foreground">
|
||||
{importedNotes} {importedNotes === 1 ? "imported note" : "imported notes"}
|
||||
{countLabel(language, importedNotes, "imported note", "imported notes")}
|
||||
</p>
|
||||
{empty && (
|
||||
<p className="pt-2 font-ui text-xs text-muted-foreground/70">
|
||||
Nothing here yet — import notes to begin building the graph.
|
||||
</p>
|
||||
{t("Nothing here yet — import notes to begin building the graph.")}</p>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
@@ -92,11 +96,11 @@ export function MinimalHome({
|
||||
onPracticeSelectionChange?: (nodes: { id: string; name: string; statement: string }[]) => void;
|
||||
onChainSelectClose?: () => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const [snapshot, setSnapshot] = useState<GraphSnapshot | null>(null);
|
||||
const [costs, setCosts] = useState<GraphCostSummary | null>(null);
|
||||
const [chats, setChats] = useState<ChatSummary[]>([]);
|
||||
const [chainsOpen, setChainsOpen] = useState(false);
|
||||
const [importing, setImporting] = useState(false);
|
||||
const fileInputRef = useRef<HTMLInputElement>(null);
|
||||
|
||||
const readState = useCallback(() => {
|
||||
@@ -123,25 +127,9 @@ export function MinimalHome({
|
||||
if (chainSelectOpen) setChainsOpen(true);
|
||||
}, [chainSelectOpen]);
|
||||
|
||||
// Notes import — the same front door as the graph home: POST awaits
|
||||
// the whole pipeline server-side, then one refetch lands the numbers.
|
||||
const onImportFiles = (files: FileList | null) => {
|
||||
if (!files || files.length === 0) return;
|
||||
setImporting(true);
|
||||
const form = new FormData();
|
||||
for (const file of Array.from(files)) form.append("files", file);
|
||||
fetch("/api/graph/import", { method: "POST", body: form })
|
||||
.then(async (res) => {
|
||||
const body = (await res.json()) as { results: { filePath: string; ok: boolean }[] };
|
||||
const failed = body.results.filter((r) => !r.ok);
|
||||
if (failed.length > 0) console.error("notes import failed for:", failed);
|
||||
})
|
||||
.catch((err) => console.error("import failed:", err))
|
||||
.finally(() => {
|
||||
setImporting(false);
|
||||
readState();
|
||||
});
|
||||
};
|
||||
// Refetch even after incomplete imports: earlier writes and spend remain.
|
||||
const notesImport = useNotesImport({ onFinish: readState });
|
||||
const { importing, onImportFiles } = notesImport;
|
||||
|
||||
const teachSessions = chats.filter((c) => c.kind === "teach").length;
|
||||
const practiceSessions = chats.filter((c) => c.kind === "practice").length;
|
||||
@@ -183,7 +171,7 @@ export function MinimalHome({
|
||||
<div className="lh-no-drag lh-wco-floating absolute right-2 top-2 z-10 flex max-w-[calc(100%-5.5rem)] flex-col items-end gap-2">
|
||||
<div className="flex min-w-0 items-start gap-2">
|
||||
<div className="graph-chrome-fade-in shrink-0 rounded-xl border bg-card/85 px-1 py-[3px] shadow-lg backdrop-blur">
|
||||
<Hint label="Every reasoning chain" side="bottom">
|
||||
<Hint label={t("Every reasoning chain")} side="bottom">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => setChainsOpen(true)}
|
||||
@@ -191,12 +179,11 @@ export function MinimalHome({
|
||||
className="flex h-7 items-center gap-1.5 rounded-lg px-2.5 text-xs text-muted-foreground transition-colors hover:bg-accent"
|
||||
>
|
||||
<ListTreeIcon className="size-3" />
|
||||
Chains
|
||||
</button>
|
||||
{t("Chains")}</button>
|
||||
</Hint>
|
||||
</div>
|
||||
<div className="shrink-0 rounded-xl border bg-card/85 px-1 py-[3px] shadow-lg backdrop-blur">
|
||||
<Hint label="Import notes into the graph" side="bottom">
|
||||
<Hint label={t("Import notes into the graph")} side="bottom">
|
||||
<button
|
||||
type="button"
|
||||
disabled={importing}
|
||||
@@ -205,11 +192,12 @@ export function MinimalHome({
|
||||
className="flex h-7 items-center gap-1.5 rounded-lg px-2.5 text-xs text-muted-foreground transition-colors hover:bg-accent disabled:opacity-50"
|
||||
>
|
||||
<UploadIcon className="size-3" />
|
||||
{importing ? "Importing…" : "Import notes…"}
|
||||
{importing ? t("Importing…") : t("Import notes…")}
|
||||
</button>
|
||||
</Hint>
|
||||
</div>
|
||||
</div>
|
||||
<NotesImportErrors errors={notesImport.errors} />
|
||||
{costs && costs.runs.length > 0 && <GraphCostControl costs={costs} />}
|
||||
</div>
|
||||
|
||||
|
||||
+46
-51
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useCallback, useEffect, useRef, useState } from "react";
|
||||
import type { ChatSettings, ModelCatalogEntry, ModelCatalogResponse, ModelsSettings, UserSettings } from "@/src/core";
|
||||
@@ -8,7 +10,7 @@ import { ModelMenuList, ThinkingMenuList } from "@/components/settings/model-men
|
||||
import { composeSlotModel } from "@/components/settings/agent-section";
|
||||
import { MenuShell } from "@/components/menu-shell";
|
||||
import { Hint } from "@/components/ui/hint";
|
||||
import { notifySettingsSaved, useSettingsSaved } from "@/components/settings-signal";
|
||||
import { notifySettingsSaved, onSettingsSaved, useSettingsSaved } from "@/components/settings-signal";
|
||||
import { defaultOrderLevel, populateLevel, THINKING_LABEL } from "@/components/thinking-default";
|
||||
|
||||
/** GET /api/models is cached per page load for instant menu opens, but
|
||||
@@ -17,51 +19,40 @@ import { defaultOrderLevel, populateLevel, THINKING_LABEL } from "@/components/t
|
||||
* every model-menu open (stale-while-revalidate: the cached list shows
|
||||
* instantly, the fresh one swaps in while the menu is open). */
|
||||
let catalogCache: ModelCatalogResponse | undefined;
|
||||
let catalogInflight: Promise<ModelCatalogResponse> | undefined;
|
||||
|
||||
function fetchCatalog(force = false): Promise<ModelCatalogResponse> {
|
||||
if (force) {
|
||||
catalogCache = undefined;
|
||||
catalogInflight = undefined;
|
||||
}
|
||||
catalogInflight ??= fetch("/api/models")
|
||||
.then((r) => {
|
||||
if (!r.ok) throw new Error(`catalog request failed: ${r.status}`);
|
||||
return r.json() as Promise<ModelCatalogResponse>;
|
||||
})
|
||||
.then((c) => {
|
||||
catalogCache = c;
|
||||
return c;
|
||||
})
|
||||
.catch((err) => {
|
||||
catalogInflight = undefined; // retry on next mount/open
|
||||
throw err;
|
||||
});
|
||||
return catalogInflight;
|
||||
let catalogInflight: Promise<void> | undefined;
|
||||
let catalogGeneration = 0;
|
||||
let stopCatalogSignals: (() => void) | undefined;
|
||||
const catalogReaders = new Set<() => void>();
|
||||
const publishCatalog = () => { for (const reader of catalogReaders) reader(); };
|
||||
function fetchCatalog(revalidate = false): void {
|
||||
if (revalidate) { catalogGeneration++; catalogInflight = undefined; }
|
||||
if (catalogInflight) return;
|
||||
const generation = catalogGeneration;
|
||||
catalogInflight = fetch("/api/models")
|
||||
.then((r) => { if (!r.ok) throw new Error(`catalog request failed: ${r.status}`); return r.json() as Promise<ModelCatalogResponse>; })
|
||||
.then((c) => { if (generation === catalogGeneration) { catalogCache = c; publishCatalog(); } })
|
||||
.catch(() => { /* existing unavailable/usage-only posture, no retry timer */ })
|
||||
.finally(() => { if (generation === catalogGeneration) catalogInflight = undefined; });
|
||||
}
|
||||
|
||||
export function useModelCatalog(): { catalog: ModelCatalogResponse | undefined; refresh: () => void } {
|
||||
const [catalog, setCatalog] = useState(catalogCache);
|
||||
useEffect(() => {
|
||||
if (catalogCache) return;
|
||||
let alive = true;
|
||||
fetchCatalog()
|
||||
.then((c) => alive && setCatalog(c))
|
||||
.catch(() => {
|
||||
/* the picker stays closed on failure; the buttons still
|
||||
display the strong slot from the record fetch */
|
||||
});
|
||||
return () => {
|
||||
alive = false;
|
||||
};
|
||||
}, []);
|
||||
const refresh = useCallback(() => {
|
||||
fetchCatalog(true)
|
||||
.then(setCatalog)
|
||||
.catch(() => {
|
||||
/* refresh is best-effort: the cached list stays on failure */
|
||||
const first = catalogReaders.size === 0;
|
||||
const read = () => setCatalog(catalogCache);
|
||||
catalogReaders.add(read);
|
||||
if (first) {
|
||||
stopCatalogSignals = onSettingsSaved((section) => {
|
||||
if (section === "keys") {
|
||||
catalogGeneration++; catalogInflight = undefined; catalogCache = undefined;
|
||||
publishCatalog(); fetchCatalog();
|
||||
} else if (section === "models") fetchCatalog(true);
|
||||
});
|
||||
fetchCatalog(true);
|
||||
} else fetchCatalog();
|
||||
read();
|
||||
return () => { catalogReaders.delete(read); if (!catalogReaders.size) { stopCatalogSignals?.(); stopCatalogSignals = undefined; } };
|
||||
}, []);
|
||||
const refresh = useCallback(() => fetchCatalog(true), []);
|
||||
return { catalog, refresh };
|
||||
}
|
||||
|
||||
@@ -92,7 +83,8 @@ export function catalogLimits(catalog: Pick<ModelCatalogResponse, "models">): Ma
|
||||
* changing the new-session default. Unpicked reads "—" (the
|
||||
* no-factory-fallback language: the UI never presents a default model).
|
||||
*/
|
||||
export function ModelControl({ chatId }: { chatId?: string }) {
|
||||
export function ModelControl({ chatId, onModelChange }: { chatId?: string; onModelChange?: (model: string | undefined) => void }) {
|
||||
const { t } = useI18n();
|
||||
const { catalog, refresh } = useModelCatalog();
|
||||
const [models, setModels] = useState<ModelsSettings | undefined>();
|
||||
const [session, setSession] = useState<ChatSettings | undefined>();
|
||||
@@ -147,6 +139,9 @@ export function ModelControl({ chatId }: { chatId?: string }) {
|
||||
: strong;
|
||||
const effectiveId = override?.model?.id;
|
||||
const effectiveProvider = override?.model?.provider;
|
||||
useEffect(() => {
|
||||
onModelChange?.(effectiveProvider && effectiveId ? `${effectiveProvider}:${effectiveId}` : undefined);
|
||||
}, [effectiveProvider, effectiveId, onModelChange]);
|
||||
const storedLevel = override?.thinkingLevel;
|
||||
const entry = catalog?.models.find(
|
||||
(m) => m.id === effectiveId && m.provider === effectiveProvider,
|
||||
@@ -326,7 +321,7 @@ export function ModelControl({ chatId }: { chatId?: string }) {
|
||||
// Trimmed (owner, subtlety round 2026-09-25): "Model selector"
|
||||
// — the long sentence was way too much. ⌘K opens this same
|
||||
// menu (registry, override-aware).
|
||||
label="Model selector"
|
||||
label={t("Model selector")}
|
||||
action="open-model-picker"
|
||||
side="bottom"
|
||||
>
|
||||
@@ -349,7 +344,7 @@ export function ModelControl({ chatId }: { chatId?: string }) {
|
||||
// "Thinking" + its real shortcut via the registry (owner interlude
|
||||
// 2026-09-25): ⇧⇥ cycles the level, so "Thinking (⇧⇥)" —
|
||||
// rebind-live like every Hint suffix.
|
||||
label="Thinking"
|
||||
label={t("Thinking")}
|
||||
action="cycle-thinking"
|
||||
side="bottom"
|
||||
>
|
||||
@@ -372,7 +367,7 @@ export function ModelControl({ chatId }: { chatId?: string }) {
|
||||
{/* Just the level — the button reads like the model button reads
|
||||
the model name (owner, stats-control round 1). */}
|
||||
<span className="text-card-foreground">
|
||||
{effectiveLevel === undefined ? "—" : (THINKING_LABEL[effectiveLevel] ?? effectiveLevel)}
|
||||
{effectiveLevel === undefined ? "—" : t(THINKING_LABEL[effectiveLevel] ?? effectiveLevel)}
|
||||
</span>
|
||||
<span aria-hidden className="text-xs text-muted-foreground">▾</span>
|
||||
</button>
|
||||
@@ -388,7 +383,7 @@ export function ModelControl({ chatId }: { chatId?: string }) {
|
||||
preferredSide="up"
|
||||
menuClass="flex w-[22rem] flex-col rounded-xl border bg-card p-2 text-xs shadow-xl"
|
||||
>
|
||||
{error && <div className="mb-1.5 text-destructive">{error}</div>}
|
||||
{error && <div className="mb-1.5 text-destructive">{t(error)}</div>}
|
||||
<ModelMenuList
|
||||
models={catalog?.models}
|
||||
effectiveId={effectiveId}
|
||||
@@ -396,10 +391,10 @@ export function ModelControl({ chatId }: { chatId?: string }) {
|
||||
onPick={pickModel}
|
||||
footer={
|
||||
catalog && catalog.models.length === 0
|
||||
? "No models — add a provider key in Keys"
|
||||
? t("No models — add a provider key in Keys")
|
||||
: chatId
|
||||
? "This session's model"
|
||||
: "Strong tier — the default for new sessions"
|
||||
? t("This session's model")
|
||||
: t("Strong tier — the default for new sessions")
|
||||
}
|
||||
/>
|
||||
</MenuShell>
|
||||
@@ -416,10 +411,10 @@ export function ModelControl({ chatId }: { chatId?: string }) {
|
||||
levels={catalog ? levels : []}
|
||||
effectiveLevel={effectiveLevel}
|
||||
onPick={(level) => apply(effectiveProvider ?? "", effectiveId ?? "", level as ThinkingLevel)}
|
||||
empty={catalog ? (effectiveId ? `${prettyModel(effectiveId)} has no thinking levels.` : "Pick a model first.") : "Loading…"}
|
||||
footer="Levels this model actually supports"
|
||||
empty={catalog ? (effectiveId ? t("{v0} has no thinking levels.", { v0: prettyModel(effectiveId) }) : t("Pick a model first.")) : t("Loading…")}
|
||||
footer={t("Levels this model actually supports")}
|
||||
/>
|
||||
{error && <div className="mt-1 text-destructive">{error}</div>}
|
||||
{error && <div className="mt-1 text-destructive">{t(error)}</div>}
|
||||
</MenuShell>
|
||||
)}
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useCallback, useEffect, useRef, useState, type ReactNode } from "react";
|
||||
import { useRouter } from "next/navigation";
|
||||
@@ -110,6 +112,7 @@ export function DraftShell({
|
||||
* Passed as a node so the pick state stays in NewSession. */
|
||||
overlay?: ReactNode;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
// Voice dictation (STT wave, 2026-09-17): finals append at the end of the
|
||||
// draft text (via the parent's onChange — the truth lives there); the
|
||||
// strip lives in the stats bar's middle slot.
|
||||
@@ -172,11 +175,11 @@ export function DraftShell({
|
||||
<Conversation className="h-full min-w-0 flex-1" initial="instant">
|
||||
<ConversationContent className="min-h-full gap-0 p-0">
|
||||
<ConversationEmptyState
|
||||
title={mode === "practice" ? "New practice session" : "New session"}
|
||||
title={mode === "practice" ? t("New practice session") : t("New session")}
|
||||
description={
|
||||
mode === "practice"
|
||||
? "Pick nodes from your knowledge graph, describe what you want to practice, or bring your own problem."
|
||||
: "The teacher will open by probing what you already know."
|
||||
? t("Pick nodes from your knowledge graph, describe what you want to practice, or bring your own problem.")
|
||||
: t("The teacher will open by probing what you already know.")
|
||||
}
|
||||
/>
|
||||
</ConversationContent>
|
||||
@@ -205,7 +208,7 @@ export function DraftShell({
|
||||
// input (owner refinement round, 2026-09-24) — no lesson has
|
||||
// started yet, so the composer must not read like one is in
|
||||
// flight.
|
||||
placeholder={mode === "practice" ? "What do you want to practice?" : "What do you want to learn?"}
|
||||
placeholder={mode === "practice" ? t("What do you want to practice?") : t("What do you want to learn?")}
|
||||
/>
|
||||
</div>
|
||||
<StatsBar
|
||||
@@ -231,6 +234,7 @@ export function DraftShell({
|
||||
}
|
||||
|
||||
export function NewSession({ initialConfigured, mode = "teach" }: { initialConfigured: boolean; mode?: "teach" | "practice" }) {
|
||||
const { t } = useI18n();
|
||||
const router = useRouter();
|
||||
const [text, setText] = useState("");
|
||||
/* The draft MIRROR ("nothing gets lost" round, 2026-10-01): the shell's
|
||||
@@ -357,8 +361,7 @@ export function NewSession({ initialConfigured, mode = "teach" }: { initialConfi
|
||||
onClick={() => setSetupOpen(true)}
|
||||
className="rounded-sm border border-border bg-card px-3 py-1.5 font-ui text-xs text-foreground transition-colors hover:border-muted-foreground/50 hover:bg-accent cursor-pointer"
|
||||
>
|
||||
Set up your models
|
||||
</button>
|
||||
{t("Set up your models")}</button>
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
import { useRef, useState } from "react";
|
||||
|
||||
// Transport-only types: never import the server's extraction/agent module here.
|
||||
export interface NotesImportResult {
|
||||
requestIndex: number;
|
||||
filePath: string;
|
||||
ok: boolean;
|
||||
outcome: "completed" | "failed" | "partial" | "aborted" | "busy";
|
||||
stats?: { nodes: number; chains?: number; droppedChains?: number };
|
||||
error?: string;
|
||||
code?: string;
|
||||
missing?: string[];
|
||||
provider?: string;
|
||||
slots?: string[];
|
||||
}
|
||||
|
||||
/** Validate the entire response before applying any row: a malformed index
|
||||
* must never attribute another file's success to this file (same names included). */
|
||||
export function parseNotesImportResults(body: unknown, files: readonly File[]): NotesImportResult[] {
|
||||
const invalid = () => new Error("Invalid import response. Please retry the file.");
|
||||
if (!body || typeof body !== "object" || !("results" in body) || !Array.isArray(body.results) || body.results.length !== files.length) throw invalid();
|
||||
const seen = new Set<number>();
|
||||
for (const raw of body.results) {
|
||||
if (!raw || typeof raw !== "object") throw invalid();
|
||||
const r = raw as NotesImportResult;
|
||||
if (!Number.isInteger(r.requestIndex) || r.requestIndex < 0 || r.requestIndex >= files.length || seen.has(r.requestIndex) || r.filePath !== files[r.requestIndex]!.name) throw invalid();
|
||||
seen.add(r.requestIndex);
|
||||
if (!["completed", "failed", "partial", "aborted", "busy"].includes(r.outcome) || typeof r.ok !== "boolean" || r.ok !== (r.outcome === "completed")) throw invalid();
|
||||
if (r.stats !== undefined && (!r.stats || typeof r.stats !== "object" || !Number.isFinite(r.stats.nodes) || r.stats.nodes < 0 || (r.stats.chains !== undefined && (!Number.isFinite(r.stats.chains) || r.stats.chains < 0)))) throw invalid();
|
||||
if (r.ok && !r.stats) throw invalid();
|
||||
if (!r.ok && typeof r.error !== "string") throw invalid();
|
||||
for (const field of ["error", "code", "provider"] as const) if (r[field] !== undefined && typeof r[field] !== "string") throw invalid();
|
||||
for (const field of ["missing", "slots"] as const) if (r[field] !== undefined && (!Array.isArray(r[field]) || !r[field]!.every((v) => typeof v === "string"))) throw invalid();
|
||||
}
|
||||
return body.results as NotesImportResult[];
|
||||
}
|
||||
|
||||
export async function postNotesImport(files: readonly File[]): Promise<NotesImportResult[]> {
|
||||
const form = new FormData();
|
||||
for (const file of files) form.append("files", file);
|
||||
const response = await fetch("/api/graph/import", { method: "POST", body: form });
|
||||
let body: unknown;
|
||||
try { body = await response.json(); }
|
||||
catch { throw new Error("Invalid import response. Please retry the file."); }
|
||||
if (!response.ok) {
|
||||
const detail = body && typeof body === "object" && "error" in body && typeof body.error === "string" ? `: ${body.error}` : "";
|
||||
throw new Error(`Import request failed (HTTP ${response.status})${detail}. Please retry the file.`);
|
||||
}
|
||||
return parseNotesImportResults(body, files);
|
||||
}
|
||||
|
||||
/** Only error text survives a request; selected Files stay request-local. */
|
||||
export function useNotesImport(callbacks: { onStart?: () => void; onFinish?: () => void } = {}) {
|
||||
const { t } = useI18n();
|
||||
const [failures, setFailures] = useState<Array<{ file: string; message: string; detail?: string }>>([]);
|
||||
const errors = failures.map((failure) => `${failure.file}: ${t(failure.message)}${failure.detail ?? ""}`);
|
||||
const [importing, setImporting] = useState(false);
|
||||
const pending = useRef(false);
|
||||
const submit = async (files: File[]) => {
|
||||
if (pending.current || files.length === 0) return;
|
||||
pending.current = true;
|
||||
setImporting(true);
|
||||
setFailures([]);
|
||||
try {
|
||||
callbacks.onStart?.();
|
||||
const results = await postNotesImport(files);
|
||||
setFailures(results
|
||||
.filter((result) => !result.ok)
|
||||
.sort((a, b) => a.requestIndex - b.requestIndex)
|
||||
.map((r) => ({ file: r.filePath, message: r.error ?? "", detail: r.code ? `\n${r.code}${r.provider ? ` — ${r.provider}` : ""}${r.missing?.length ? ` — ${r.missing.join(", ")}` : ""}${r.slots?.length ? ` — ${r.slots.join(", ")}` : ""}` : "" })));
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
setFailures(files.map((file) => ({ file: file.name, message })));
|
||||
} finally {
|
||||
pending.current = false;
|
||||
setImporting(false);
|
||||
callbacks.onFinish?.();
|
||||
}
|
||||
};
|
||||
return {
|
||||
errors, importing,
|
||||
onImportFiles: (files: FileList | null) => { if (files) void submit(Array.from(files)); },
|
||||
};
|
||||
}
|
||||
|
||||
export function NotesImportErrors({ errors }: { errors: readonly string[] }) {
|
||||
return <>{errors.map((error, i) => (
|
||||
<p key={i} role="alert" className="max-w-full whitespace-pre-wrap break-words text-xs text-red-400">{error}</p>
|
||||
))}</>;
|
||||
}
|
||||
@@ -1,3 +1,6 @@
|
||||
"use client";
|
||||
|
||||
import { useI18n } from "@/components/i18n";
|
||||
import type { Phase3 } from "@/src/core";
|
||||
|
||||
/**
|
||||
@@ -39,6 +42,7 @@ const CHIP_LABEL: Record<Phase3, string> = {
|
||||
* at all, so it is part of the drag surface instead of a carved-out
|
||||
* target. */
|
||||
export function PhaseChip({ phase }: { phase: Phase3 }) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<span
|
||||
data-testid="phase-chip"
|
||||
@@ -46,7 +50,7 @@ export function PhaseChip({ phase }: { phase: Phase3 }) {
|
||||
aria-hidden="true"
|
||||
className="pointer-events-none flex shrink-0 select-none items-center text-xs font-medium uppercase tracking-wide text-muted-foreground"
|
||||
>
|
||||
{CHIP_LABEL[phase]}
|
||||
{t(CHIP_LABEL[phase])}
|
||||
</span>
|
||||
);
|
||||
}
|
||||
@@ -60,11 +64,12 @@ export function PhaseChip({ phase }: { phase: Phase3 }) {
|
||||
* after the start).
|
||||
*/
|
||||
export function PhaseDivider({ phase, nodeCount }: { phase: Phase3; nodeCount?: number }) {
|
||||
const { t } = useI18n();
|
||||
if (phase === "probe") return null;
|
||||
const label =
|
||||
phase === "plan" && nodeCount
|
||||
? `Plan · ${nodeCount} node${nodeCount === 1 ? "" : "s"}`
|
||||
: CHIP_LABEL[phase];
|
||||
? t("Plan · {v0} node{v1}", { v0: nodeCount, v1: nodeCount === 1 ? "" : "s" })
|
||||
: t(CHIP_LABEL[phase]);
|
||||
return (
|
||||
<div className="my-4 flex w-full items-center gap-3" data-testid={`phase-divider-${phase}`}>
|
||||
<span className="h-0 flex-1 border-t-2 border-dotted border-border/50" aria-hidden />
|
||||
|
||||
+21
-17
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useEffect, useId, useMemo, useRef, useState } from "react";
|
||||
import { MaximizeIcon, MinusIcon, PlusIcon, XIcon } from "lucide-react";
|
||||
@@ -509,6 +511,7 @@ export function PlanDiagram({
|
||||
* flank's width and the band's height rather than run width-first. */
|
||||
fill?: boolean;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const layout = useMemo(() => blockLayout(nodes, edges), [nodes, edges]);
|
||||
// Pad only the full-extent render — the plan window's override viewBox is
|
||||
// a deliberate viewport crop, and the popup keeps its own fit margins.
|
||||
@@ -540,7 +543,7 @@ export function PlanDiagram({
|
||||
: {}),
|
||||
}}
|
||||
role="img"
|
||||
aria-label="Plan diagram"
|
||||
aria-label={t("Plan diagram")}
|
||||
>
|
||||
<defs>
|
||||
<marker
|
||||
@@ -676,15 +679,16 @@ export function PlanDiagram({
|
||||
* future DAG window).
|
||||
*/
|
||||
export function PlanBlock({ data, onOpen }: { data: PlanBlockData; onOpen: () => void }) {
|
||||
const { t } = useI18n();
|
||||
const markerId = useId().replace(/[^a-zA-Z0-9-]/g, "");
|
||||
const statusMap = useMemo(() => new Map(data.nodes.map((n) => [n.id, n.status] as const)), [data]);
|
||||
const statusOf = (id: string): PlanNodeStatus => statusMap.get(id) ?? "upcoming";
|
||||
return (
|
||||
<Hint label="Open the full plan" side="bottom">
|
||||
<Hint label={t("Open the full plan")} side="bottom">
|
||||
<button
|
||||
type="button"
|
||||
data-testid="plan-block-full"
|
||||
aria-label="Open the full plan"
|
||||
aria-label={t("Open the full plan")}
|
||||
onClick={onOpen}
|
||||
className="block w-full text-left"
|
||||
>
|
||||
@@ -749,6 +753,7 @@ const POPUP_PAD = GLOW_REACH;
|
||||
* through while the focus owns the session area.
|
||||
*/
|
||||
export function PlanPopup({ messages, onClose }: { messages: readonly PopupMessage[]; onClose: () => void }) {
|
||||
const { t } = useI18n();
|
||||
const tree = useMemo(() => latestTree(messages), [messages]);
|
||||
const statuses = useMemo(
|
||||
() => (tree ? derivePlanStatuses(tree, messages as Parameters<typeof derivePlanStatuses>[1]) : null),
|
||||
@@ -887,19 +892,19 @@ export function PlanPopup({ messages, onClose }: { messages: readonly PopupMessa
|
||||
className="absolute inset-0 z-40 flex flex-col bg-background/80 p-4 backdrop-blur-sm"
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-label="The full plan"
|
||||
aria-label={t("The full plan")}
|
||||
onClick={(e) => {
|
||||
if (e.target === e.currentTarget) onClose();
|
||||
}}
|
||||
>
|
||||
<div className="mb-2 flex items-center gap-2">
|
||||
<span className="text-sm font-medium">The plan</span>
|
||||
<span className="text-xs text-muted-foreground">live — statuses derive from your check outcomes</span>
|
||||
<Hint label="Close" binding="escape" side="left">
|
||||
<span className="text-sm font-medium">{t("The plan")}</span>
|
||||
<span className="text-xs text-muted-foreground">{t("live — statuses derive from your check outcomes")}</span>
|
||||
<Hint label={t("Close")} binding="escape" side="left">
|
||||
<button
|
||||
type="button"
|
||||
onClick={onClose}
|
||||
aria-label="Close"
|
||||
aria-label={t("Close")}
|
||||
data-testid="plan-popup-close"
|
||||
className="ml-auto rounded-lg p-1.5 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
|
||||
>
|
||||
@@ -947,22 +952,22 @@ export function PlanPopup({ messages, onClose }: { messages: readonly PopupMessa
|
||||
/>
|
||||
</div>
|
||||
<div className="pointer-events-none absolute inset-x-0 bottom-0 flex items-end justify-between p-2">
|
||||
<span className="text-xs text-muted-foreground/60">Drag to pan · scroll to zoom</span>
|
||||
<span className="text-xs text-muted-foreground/60">{t("Drag to pan · scroll to zoom")}</span>
|
||||
<div className="flex gap-1">
|
||||
<Hint label="Zoom out" side="bottom">
|
||||
<Hint label={t("Zoom out")} side="bottom">
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Zoom out"
|
||||
aria-label={t("Zoom out")}
|
||||
onClick={() => stepZoom(1 / 1.25)}
|
||||
className="pointer-events-auto flex size-7 items-center justify-center rounded-md border border-border/70 bg-card/80 text-muted-foreground backdrop-blur transition-colors hover:bg-accent hover:text-foreground"
|
||||
>
|
||||
<MinusIcon className="size-3.5" />
|
||||
</button>
|
||||
</Hint>
|
||||
<Hint label="Fit plan to screen" side="bottom">
|
||||
<Hint label={t("Fit plan to screen")} side="bottom">
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Fit plan to screen"
|
||||
aria-label={t("Fit plan to screen")}
|
||||
onClick={fitView}
|
||||
data-testid="plan-popup-fit"
|
||||
className="pointer-events-auto flex size-7 items-center justify-center rounded-md border border-border/70 bg-card/80 text-muted-foreground backdrop-blur transition-colors hover:bg-accent hover:text-foreground"
|
||||
@@ -970,10 +975,10 @@ export function PlanPopup({ messages, onClose }: { messages: readonly PopupMessa
|
||||
<MaximizeIcon className="size-3.5" />
|
||||
</button>
|
||||
</Hint>
|
||||
<Hint label="Zoom in" side="bottom">
|
||||
<Hint label={t("Zoom in")} side="bottom">
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Zoom in"
|
||||
aria-label={t("Zoom in")}
|
||||
onClick={() => stepZoom(1.25)}
|
||||
className="pointer-events-auto flex size-7 items-center justify-center rounded-md border border-border/70 bg-card/80 text-muted-foreground backdrop-blur transition-colors hover:bg-accent hover:text-foreground"
|
||||
>
|
||||
@@ -985,8 +990,7 @@ export function PlanPopup({ messages, onClose }: { messages: readonly PopupMessa
|
||||
</>
|
||||
) : (
|
||||
<div className="flex h-full items-center justify-center text-sm text-muted-foreground">
|
||||
No plan in this session yet.
|
||||
</div>
|
||||
{t("No plan in this session yet.")}</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { MessageResponse } from "@/components/ai-elements/message";
|
||||
import { cn } from "@/lib/utils";
|
||||
import type { ArtifactPartProps } from "@/src/core";
|
||||
import { repairMathForDisplay, type ArtifactPartProps } from "@/src/core";
|
||||
|
||||
/**
|
||||
* The practice transcript cards (practice sessions, owner design
|
||||
@@ -56,6 +58,7 @@ export interface PracticeThinkingData {
|
||||
}
|
||||
|
||||
export function ProblemCard({ part }: ArtifactPartProps) {
|
||||
const { t } = useI18n();
|
||||
// Always open, no chevron (owner round, 2026-10-05): the record IS the
|
||||
// statement — same container + eyebrow discipline as the answered card
|
||||
// and the dock (which mirrors this in Slice D). The commitment never
|
||||
@@ -64,9 +67,9 @@ export function ProblemCard({ part }: ArtifactPartProps) {
|
||||
const statement = typeof input.statement === "string" ? input.statement : "";
|
||||
return (
|
||||
<div data-testid="problem-card" className="lh-card-enter my-1 rounded-xl border bg-card p-4">
|
||||
<div className="mb-1 text-xs font-medium uppercase tracking-wide text-muted-foreground">Problem</div>
|
||||
<div className="mb-1 text-xs font-medium uppercase tracking-wide text-muted-foreground">{t("Problem")}</div>
|
||||
<div className="lh-prose text-[15px]">
|
||||
<MessageResponse>{statement}</MessageResponse>
|
||||
<MessageResponse>{repairMathForDisplay(statement)}</MessageResponse>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
@@ -94,6 +97,7 @@ const OUTCOME_CHIP: Record<string, string> = {
|
||||
};
|
||||
|
||||
export function ConcludeCard({ part }: ArtifactPartProps) {
|
||||
const { t } = useI18n();
|
||||
// The conclusion redesigned (owner round, 2026-10-05): the SOLUTION is
|
||||
// the hero — the modelSolution committed at pose time (part.reveal, the
|
||||
// view-seam join), shown verbatim, never re-authored. The verdict sits
|
||||
@@ -111,8 +115,7 @@ export function ConcludeCard({ part }: ArtifactPartProps) {
|
||||
if (outcome === "dismissed") {
|
||||
return (
|
||||
<div data-testid="conclude-card" className="my-1 px-1 text-sm text-muted-foreground/70">
|
||||
Problem dismissed.
|
||||
</div>
|
||||
{t("Problem dismissed.")}</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -122,10 +125,9 @@ export function ConcludeCard({ part }: ArtifactPartProps) {
|
||||
eyebrow + the outcome in the quiz cards' EXACT chip register —
|
||||
no more two same-weight headings stacked. */}
|
||||
<div className="mb-1 flex items-center gap-2 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
Concluded
|
||||
{(OUTCOME_LABEL[outcome] ?? "") !== "" && outcome !== "dismissed" && (
|
||||
{t("Concluded")}{(OUTCOME_LABEL[outcome] ?? "") !== "" && outcome !== "dismissed" && (
|
||||
<span className={cn("rounded px-1.5 py-0.5", OUTCOME_CHIP[outcome] ?? OUTCOME_CHIP.movedOn)}>
|
||||
{OUTCOME_LABEL[outcome]}
|
||||
{t(OUTCOME_LABEL[outcome] ?? outcome)}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
@@ -133,7 +135,7 @@ export function ConcludeCard({ part }: ArtifactPartProps) {
|
||||
(owner round 3): the same quiet 50% register as quiz explanations. */}
|
||||
{verdict.length > 0 && (
|
||||
<div className="text-sm text-foreground/50">
|
||||
<MessageResponse>{verdict}</MessageResponse>
|
||||
<MessageResponse>{repairMathForDisplay(verdict)}</MessageResponse>
|
||||
</div>
|
||||
)}
|
||||
{/* Then the divider, then the labeled model solution (Slice G: the
|
||||
@@ -142,9 +144,9 @@ export function ConcludeCard({ part }: ArtifactPartProps) {
|
||||
<>
|
||||
<div className="my-3 border-t" />
|
||||
<div>
|
||||
<div className="mb-0.5 text-xs font-medium uppercase tracking-wide text-muted-foreground">Model solution</div>
|
||||
<div className="mb-0.5 text-xs font-medium uppercase tracking-wide text-muted-foreground">{t("Model solution")}</div>
|
||||
<div className="lh-prose text-[15px]">
|
||||
<MessageResponse>{reveal}</MessageResponse>
|
||||
<MessageResponse>{repairMathForDisplay(reveal)}</MessageResponse>
|
||||
</div>
|
||||
</div>
|
||||
</>
|
||||
@@ -177,6 +179,7 @@ function MetadataPopover({
|
||||
concludeInput: { outcome?: string; rung?: unknown; missClass?: unknown; retest?: unknown };
|
||||
problemInput: { mode?: unknown; target?: unknown };
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const [open, setOpen] = useState(false);
|
||||
const triggerRef = useRef<HTMLButtonElement | null>(null);
|
||||
const rootRef = useRef<HTMLDivElement | null>(null);
|
||||
@@ -239,8 +242,7 @@ function MetadataPopover({
|
||||
aria-expanded={open}
|
||||
className="flex items-center gap-1 text-xs font-medium uppercase tracking-wide text-muted-foreground transition-colors hover:text-foreground"
|
||||
>
|
||||
Metadata
|
||||
</button>
|
||||
{t("Metadata")}</button>
|
||||
{open &&
|
||||
anchor &&
|
||||
createPortal(
|
||||
@@ -256,12 +258,12 @@ function MetadataPopover({
|
||||
className="z-50 w-80 max-w-[calc(100vw-1rem)] rounded-xl border bg-card p-4 text-left shadow-lg"
|
||||
>
|
||||
<dl className="grid grid-cols-[auto_1fr] gap-x-4 gap-y-1 text-xs">
|
||||
<dt className="text-muted-foreground">Mode</dt>
|
||||
<dd className="font-mono">{mode || "—"}</dd>
|
||||
<dt className="text-muted-foreground">Targets</dt>
|
||||
<dt className="text-muted-foreground">{t("Mode")}</dt>
|
||||
<dd className="font-mono">{t(mode || "—")}</dd>
|
||||
<dt className="text-muted-foreground">{t("Targets")}</dt>
|
||||
<dd className="font-mono">
|
||||
{targets.length === 0 ? (
|
||||
"untagged"
|
||||
t("untagged")
|
||||
) : (
|
||||
<span>
|
||||
{targets.map((t, i) => (
|
||||
@@ -273,14 +275,14 @@ function MetadataPopover({
|
||||
</span>
|
||||
)}
|
||||
</dd>
|
||||
<dt className="text-muted-foreground">Outcome</dt>
|
||||
<dd className="font-mono">{outcome || "—"}</dd>
|
||||
<dt className="text-muted-foreground">Hint rung</dt>
|
||||
<dd className="font-mono">{rung || "none"}</dd>
|
||||
<dt className="text-muted-foreground">Miss class</dt>
|
||||
<dd className="font-mono">{miss || "none"}</dd>
|
||||
<dt className="text-muted-foreground">Retest</dt>
|
||||
<dd className="font-mono">{retest === undefined ? "—" : retest ? "yes" : "no"}</dd>
|
||||
<dt className="text-muted-foreground">{t("Outcome")}</dt>
|
||||
<dd className="font-mono">{t(outcome || "—")}</dd>
|
||||
<dt className="text-muted-foreground">{t("Hint rung")}</dt>
|
||||
<dd className="font-mono">{t(rung || "none")}</dd>
|
||||
<dt className="text-muted-foreground">{t("Miss class")}</dt>
|
||||
<dd className="font-mono">{t(miss || "none")}</dd>
|
||||
<dt className="text-muted-foreground">{t("Retest")}</dt>
|
||||
<dd className="font-mono">{retest === undefined ? "—" : retest ? t("yes") : t("no")}</dd>
|
||||
</dl>
|
||||
</div>,
|
||||
document.body,
|
||||
@@ -290,9 +292,10 @@ function MetadataPopover({
|
||||
}
|
||||
|
||||
export function ThinkingCard({ data }: { data: PracticeThinkingData }) {
|
||||
const { t } = useI18n();
|
||||
// The unified row (owner rounds, 2026-10-05): one style, one label —
|
||||
// 50%-italic quote block on expand. Legacy records' commit flag is
|
||||
// deliberately unread (one lane now). A TRANSCRIPT row (owner round,
|
||||
// 2026-10-07): full-width band + rail, arriving expanded.
|
||||
return <ThinkingBlock testId="thinking-card" label="YOUR THINKING" text={data.text} defaultOpen />;
|
||||
return <ThinkingBlock testId="thinking-card" label={t("YOUR THINKING")} text={data.text} defaultOpen />;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useCallback, useRef, useState } from "react";
|
||||
import { ChevronRightIcon } from "lucide-react";
|
||||
@@ -7,6 +9,7 @@ import { Button } from "@/components/ui/button";
|
||||
import { joinDictation, useDictationTarget } from "@/components/dictation";
|
||||
import { useEnterSubmits } from "@/components/enter-submits";
|
||||
import { cn } from "@/lib/utils";
|
||||
import { repairMathForDisplay } from "@/src/core";
|
||||
|
||||
/**
|
||||
* The practice dock (practice sessions, owner design 2026-10-04): an
|
||||
@@ -49,6 +52,7 @@ export interface PracticeDockProps {
|
||||
}
|
||||
|
||||
export function PracticeDock({ problemCallId, input, expanded, onExpand, onSubmit, onEscape, compactionRunning = false }: PracticeDockProps) {
|
||||
const { t } = useI18n();
|
||||
const [thinking, setThinking] = useState("");
|
||||
// Ref MIRRORS the field ("nothing gets lost", the question-dock
|
||||
// discipline): a submit resuming after `await finishDictation()` reads
|
||||
@@ -92,7 +96,7 @@ export function PracticeDock({ problemCallId, input, expanded, onExpand, onSubmi
|
||||
className="flex w-full cursor-pointer items-center gap-2 px-4 py-3 text-left text-sm text-muted-foreground transition-colors hover:text-foreground"
|
||||
>
|
||||
<ChevronRightIcon className="size-4 shrink-0 rotate-90" />
|
||||
<span className="font-medium">Problem</span>
|
||||
<span className="font-medium">{t("Problem")}</span>
|
||||
<span className="min-w-0 flex-1 truncate">{input.statement}</span>
|
||||
</button>
|
||||
);
|
||||
@@ -106,9 +110,9 @@ export function PracticeDock({ problemCallId, input, expanded, onExpand, onSubmi
|
||||
markdown + LaTeX rendered, capped by the measured column
|
||||
(--dock-max-h; the old fixed 40vh cut long problems short). */}
|
||||
<div className="max-h-[var(--dock-max-h,40vh)] overflow-y-auto px-4 pt-3 pb-2">
|
||||
<div className="mb-1 text-xs font-medium uppercase tracking-wide text-muted-foreground">Problem</div>
|
||||
<div className="mb-1 text-xs font-medium uppercase tracking-wide text-muted-foreground">{t("Problem")}</div>
|
||||
<div className="lh-prose text-[15px]">
|
||||
<MessageResponse>{input.statement}</MessageResponse>
|
||||
<MessageResponse>{typeof input.statement === "string" ? repairMathForDisplay(input.statement) : input.statement}</MessageResponse>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -119,8 +123,7 @@ export function PracticeDock({ problemCallId, input, expanded, onExpand, onSubmi
|
||||
className="m-1.5 rounded-[10px] border border-border/70 bg-background/60 transition-colors focus-within:border-primary/50"
|
||||
>
|
||||
<div className="px-2.5 pt-2 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
YOUR THINKING
|
||||
</div>
|
||||
{t("YOUR THINKING")}</div>
|
||||
<textarea
|
||||
value={thinking}
|
||||
onChange={(e) => {
|
||||
@@ -143,7 +146,7 @@ export function PracticeDock({ problemCallId, input, expanded, onExpand, onSubmi
|
||||
submit();
|
||||
}
|
||||
}}
|
||||
placeholder="Work here, think out loud."
|
||||
placeholder={t("Work here, think out loud.")}
|
||||
rows={4}
|
||||
className={cn(
|
||||
"field-sizing-content lh-input max-h-64 min-h-16 w-full resize-none bg-transparent px-2.5 pb-2 outline-none placeholder:text-muted-foreground",
|
||||
@@ -155,7 +158,7 @@ export function PracticeDock({ problemCallId, input, expanded, onExpand, onSubmi
|
||||
field 10 − p-1 (4) = button 6. */}
|
||||
<div className="flex items-center justify-between gap-2 p-1">
|
||||
<span aria-hidden className="pl-1.5 text-xs text-muted-foreground">
|
||||
{compactionRunning ? "compacting session…" : "↵ submits · ⇧↵ newline"}
|
||||
{compactionRunning ? t("compacting session…") : t("↵ submits · ⇧↵ newline")}
|
||||
</span>
|
||||
<Button
|
||||
type="button"
|
||||
@@ -164,8 +167,7 @@ export function PracticeDock({ problemCallId, input, expanded, onExpand, onSubmi
|
||||
onClick={() => submit()}
|
||||
className="ml-auto h-9 rounded-[6px] px-3.5 text-sm font-medium"
|
||||
>
|
||||
Submit thinking
|
||||
</Button>
|
||||
{t("Submit thinking")}</Button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from "react";
|
||||
import { ArrowDownIcon, ChevronRightIcon, PlayIcon } from "lucide-react";
|
||||
@@ -105,6 +107,7 @@ export function QuestionDock({
|
||||
dictationClaim = true,
|
||||
compactionRunning = false,
|
||||
}: QuestionDockProps) {
|
||||
const { t } = useI18n();
|
||||
// The probe-phase names (owner, 2026-10-09) canonicalize onto their
|
||||
// teach twins for every dock concern — parse dispatch, labels, kinds:
|
||||
// the probe quiz ("probe") is quiz-shaped, the probe free-recall
|
||||
@@ -114,7 +117,7 @@ export function QuestionDock({
|
||||
// The chip's display name carries the tool's OWN name (owner
|
||||
// 2026-10-09): probe-phase questions label Probe/Recall in the
|
||||
// composer; teach tools keep the standing labels.
|
||||
const toolLabel = toolName === "probe" ? "Probe" : toolName === "recall" ? "Recall" : undefined;
|
||||
const toolLabel = toolName === "probe" ? t("Probe") : toolName === "recall" ? t("Recall") : undefined;
|
||||
// Parse, don't cast (src/core/tool-parts.ts): the model authored this
|
||||
// input, and only the schema the tool declared vouches for its shape.
|
||||
// The dock mounts on input-available parts (already validated at the
|
||||
@@ -126,8 +129,7 @@ export function QuestionDock({
|
||||
if (!parsed) {
|
||||
return (
|
||||
<div data-testid="malformed-question" className="rounded-xl border border-dashed bg-card/60 p-3 text-sm text-muted-foreground">
|
||||
This question arrived malformed — the transcript keeps the retry.
|
||||
</div>
|
||||
{t("This question arrived malformed — the transcript keeps the retry.")}</div>
|
||||
);
|
||||
}
|
||||
return (
|
||||
@@ -142,7 +144,7 @@ export function QuestionDock({
|
||||
label={
|
||||
(canonical === "quiz" || canonical === "explain") &&
|
||||
normalizeQuizType((parsed as { type?: unknown }).type) === "predict"
|
||||
? "Prediction"
|
||||
? t("Prediction")
|
||||
: undefined
|
||||
}
|
||||
/>
|
||||
@@ -201,6 +203,7 @@ export function QuestionDockBar({
|
||||
* label Probe/Recall — the phase boundary visible in the composer. */
|
||||
toolLabel?: string;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
if (variant === "reveal") {
|
||||
return (
|
||||
<button
|
||||
@@ -213,11 +216,11 @@ export function QuestionDockBar({
|
||||
<PlayIcon className="size-3.5" />
|
||||
</span>
|
||||
<span className="min-w-0 flex-1">
|
||||
<span className="block text-sm font-medium">Check your understanding</span>
|
||||
<span className="block text-sm font-medium">{t("Check your understanding")}</span>
|
||||
<span className="block truncate text-xs text-muted-foreground">{teaserText(question)}</span>
|
||||
</span>
|
||||
<span className="flex shrink-0 items-center gap-1 text-xs font-medium text-primary">
|
||||
Open <ChevronRightIcon className="size-3.5" />
|
||||
{t("Open")}{" "}<ChevronRightIcon className="size-3.5" />
|
||||
</span>
|
||||
</button>
|
||||
);
|
||||
@@ -232,11 +235,11 @@ export function QuestionDockBar({
|
||||
<span className="shrink-0 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
{label ??
|
||||
toolLabel ??
|
||||
(toolName === "quiz" ? "Check" : toolName === "explain" ? "Explain" : "Question")}
|
||||
(toolName === "quiz" ? t("Check") : toolName === "explain" ? t("Explain") : t("Question"))}
|
||||
</span>
|
||||
<span className="min-w-0 flex-1 truncate text-muted-foreground">{teaserText(question)}</span>
|
||||
<span className="flex shrink-0 items-center gap-1 text-xs font-medium">
|
||||
Answer <ArrowDownIcon className="size-3.5" />
|
||||
{t("Answer")}{" "}<ArrowDownIcon className="size-3.5" />
|
||||
</span>
|
||||
</button>
|
||||
);
|
||||
@@ -254,6 +257,7 @@ function QuestionDockForm({
|
||||
dictationClaim = true,
|
||||
compactionRunning = false,
|
||||
}: Omit<QuestionDockProps, "expanded" | "onExpand" | "reveal">) {
|
||||
const { t } = useI18n();
|
||||
const kind = toolQuestionKind(toolName);
|
||||
|
||||
// Canonical QuestionData, built once per question. Quiz options are
|
||||
@@ -547,17 +551,17 @@ function QuestionDockForm({
|
||||
<div data-session-find-root="" className="max-h-[var(--dock-max-h,55dvh)] overflow-y-auto px-4 pt-3">
|
||||
<div className="mb-1 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
{toolName === "probe"
|
||||
? "Probe"
|
||||
? t("Probe")
|
||||
: toolName === "recall"
|
||||
? "Recall"
|
||||
? t("Recall")
|
||||
: kind === "quiz"
|
||||
? qd.questionType === "predict"
|
||||
? "Prediction"
|
||||
: "Check"
|
||||
? t("Prediction")
|
||||
: t("Check")
|
||||
: kind === "explain"
|
||||
? "Explain"
|
||||
: "Question"}
|
||||
{qd.mode === "multi-select" && " · select all that apply"}
|
||||
? t("Explain")
|
||||
: t("Question")}
|
||||
{qd.mode === "multi-select" && t(" · select all that apply")}
|
||||
</div>
|
||||
<div className="mb-3 font-medium">
|
||||
<MessageResponse>{qd.question}</MessageResponse>
|
||||
@@ -644,7 +648,7 @@ function QuestionDockForm({
|
||||
>
|
||||
{sel.dontKnow && <span className="size-1.5 rounded-full bg-current" />}
|
||||
</span>
|
||||
<span>I don't know</span>
|
||||
<span>{t("I don't know")}</span>
|
||||
</button>
|
||||
)}
|
||||
|
||||
@@ -710,7 +714,7 @@ function QuestionDockForm({
|
||||
submit();
|
||||
}
|
||||
}}
|
||||
placeholder="Type your own answer…"
|
||||
placeholder={t("Type your own answer…")}
|
||||
className="lh-input w-full min-w-0 flex-1 bg-transparent outline-none placeholder:text-muted-foreground"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
/>
|
||||
@@ -742,8 +746,7 @@ function QuestionDockForm({
|
||||
sel.dontKnow ? "text-muted-foreground/50" : "text-muted-foreground",
|
||||
)}
|
||||
>
|
||||
Confidence
|
||||
</span>
|
||||
{t("Confidence")}</span>
|
||||
<div
|
||||
className={cn("relative h-4 min-w-0 flex-1", sel.dontKnow && "opacity-40")}
|
||||
data-testid="confidence-track"
|
||||
@@ -771,9 +774,9 @@ function QuestionDockForm({
|
||||
step={1}
|
||||
value={CONFIDENCE_STOPS[confIdx]}
|
||||
disabled={sel.dontKnow}
|
||||
aria-label="Confidence — the probability your selected answer is correct"
|
||||
aria-valuetext={`${CONFIDENCE_STOPS[confIdx]} percent`}
|
||||
title="The probability your selected answer is correct — 50% is a coin flip. Adjust with ←/→."
|
||||
aria-label={t("Confidence — the probability your selected answer is correct")}
|
||||
aria-valuetext={t("{v0} percent", { v0: CONFIDENCE_STOPS[confIdx] })}
|
||||
title={t("The probability your selected answer is correct — 50% is a coin flip. Adjust with ←/→.")}
|
||||
data-testid="confidence-slider"
|
||||
onChange={(e) => {
|
||||
// Snap to the nearest stop; the rendered VALUE is the stop's own
|
||||
@@ -828,7 +831,7 @@ function QuestionDockForm({
|
||||
className="rounded-[10px] border border-border/70 bg-background/60 transition-colors focus-within:border-primary/50"
|
||||
>
|
||||
<div className="px-2.5 pt-2 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
{qd.mode === "text" ? "Your answer" : "YOUR THINKING"}
|
||||
{qd.mode === "text" ? t("Your answer") : t("YOUR THINKING")}
|
||||
</div>
|
||||
{qd.mode === "text" ? (
|
||||
<textarea
|
||||
@@ -854,7 +857,7 @@ function QuestionDockForm({
|
||||
submit();
|
||||
}
|
||||
}}
|
||||
placeholder="Type your answer…"
|
||||
placeholder={t("Type your answer…")}
|
||||
rows={1}
|
||||
className="field-sizing-content lh-input max-h-48 min-h-10 w-full resize-none bg-transparent px-2.5 py-2 outline-none placeholder:text-muted-foreground"
|
||||
/>
|
||||
@@ -884,7 +887,7 @@ function QuestionDockForm({
|
||||
submit();
|
||||
}
|
||||
}}
|
||||
placeholder="Why this answer? Whatever comes to mind."
|
||||
placeholder={t("Why this answer? Whatever comes to mind.")}
|
||||
rows={1}
|
||||
className={cn(
|
||||
"field-sizing-content lh-input max-h-48 w-full resize-none bg-transparent px-2.5 py-2 outline-none placeholder:text-muted-foreground/70",
|
||||
@@ -896,15 +899,14 @@ function QuestionDockForm({
|
||||
)}
|
||||
<div className="flex items-center justify-between gap-2 p-1">
|
||||
<span aria-hidden className="pl-1.5 text-xs text-muted-foreground">
|
||||
{compactionRunning ? "compacting session…" : "↵ submits · ⇧↵ newline"}
|
||||
{compactionRunning ? t("compacting session…") : t("↵ submits · ⇧↵ newline")}
|
||||
</span>
|
||||
<Button
|
||||
type="submit"
|
||||
disabled={!canSubmit || compactionRunning}
|
||||
className="ml-auto h-9 rounded-[6px] px-3.5 text-sm font-medium"
|
||||
>
|
||||
Submit answer
|
||||
</Button>
|
||||
{t("Submit answer")}</Button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useCallback } from "react";
|
||||
import { joinDictation, useDictationTarget } from "@/components/dictation";
|
||||
@@ -37,6 +39,7 @@ export function ReadingThinkingField({
|
||||
/** Primary dictation claim — true while the check is behind its reveal. */
|
||||
claim: boolean;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
useDictationTarget(
|
||||
useCallback(
|
||||
(t: string) => {
|
||||
@@ -52,8 +55,7 @@ export function ReadingThinkingField({
|
||||
className="pointer-events-auto mb-2 rounded-2xl border bg-card/60 px-3 py-2 transition-colors focus-within:border-primary/50"
|
||||
>
|
||||
<div className="pb-1 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
Thinking while reading
|
||||
</div>
|
||||
{t("Thinking while reading")}</div>
|
||||
<textarea
|
||||
value={value}
|
||||
onChange={(e) => onChange(e.target.value)}
|
||||
@@ -94,7 +96,7 @@ export function ReadingThinkingField({
|
||||
e.currentTarget.blur();
|
||||
}
|
||||
}}
|
||||
placeholder="Whatever comes to mind as you read."
|
||||
placeholder={t("Whatever comes to mind as you read.")}
|
||||
rows={1}
|
||||
className="field-sizing-content lh-input max-h-40 w-full resize-none bg-transparent py-0.5 outline-none placeholder:text-muted-foreground/70"
|
||||
/>
|
||||
|
||||
+50
-19
@@ -17,6 +17,7 @@ import type { AgentEvent } from "@earendil-works/pi-agent-core";
|
||||
import type { ToolResultMessage } from "@earendil-works/pi-ai";
|
||||
import {
|
||||
needsContinuation,
|
||||
measuredContextTokens,
|
||||
newAnswerResult,
|
||||
newNextMessage,
|
||||
newProblemDismissedMarker,
|
||||
@@ -163,6 +164,8 @@ function sameDetails(a: unknown, b: unknown): boolean {
|
||||
export interface SessionState {
|
||||
messages: LhViewMessage[];
|
||||
nativeMessages: LhMessage[];
|
||||
/** Completed conversation usage; null after compaction or before first usage. */
|
||||
contextTokens: number | null;
|
||||
status: SessionStatus;
|
||||
error: { message: string } | null;
|
||||
/** Steers sent but not yet drained (composer steering, 2026-10-03):
|
||||
@@ -220,10 +223,14 @@ export class SessionModel {
|
||||
// The live turn's execution layer (view model mid-turn states):
|
||||
private executions = new Map<string, LiveExecution>();
|
||||
private streamingIds = new Set<string>();
|
||||
private incompleteUsageIds = new Set<string>();
|
||||
/** The in-flight assistant message's client id (see applyWireEvent). */
|
||||
private streamingMessageId: string | null = null;
|
||||
private statusValue: SessionStatus = "ready";
|
||||
/** Request/loop failures are transient; provider failures derive from messages. */
|
||||
private errorValue: { message: string } | null = null;
|
||||
/** A completed failure from THIS consume, not the previous attempt's record. */
|
||||
private liveFailureId: string | null = null;
|
||||
// The single live consume (POST response or reattach stream): a newer
|
||||
// consume cancels the older — one reader at a time.
|
||||
private consumeAbort: AbortController | null = null;
|
||||
@@ -254,11 +261,22 @@ export class SessionModel {
|
||||
this.statusValue === "submitted" || this.statusValue === "streaming"
|
||||
? { executions: this.executions, inFlight: true, streamingIds: this.streamingIds }
|
||||
: undefined;
|
||||
const messages = [...this.base, ...this.tail];
|
||||
const latest = messages.at(-1);
|
||||
// One rule for live and restored failures: only the final completed
|
||||
// assistant can own the banner. While trying again, hide the old
|
||||
// failure from the first Thinking frame, but show a new failure at end.
|
||||
const providerError =
|
||||
latest?.role === "assistant" && latest.stopReason === "error" &&
|
||||
!this.incompleteUsageIds.has(latest.id) && (!live || latest.id === this.liveFailureId)
|
||||
? { message: latest.errorMessage ?? "An error occurred." }
|
||||
: null;
|
||||
return {
|
||||
messages: projectView([...this.base, ...this.tail], live),
|
||||
nativeMessages: [...this.base, ...this.tail],
|
||||
messages: projectView(messages, live),
|
||||
nativeMessages: messages,
|
||||
contextTokens: measuredContextTokens(messages, this.incompleteUsageIds),
|
||||
status: this.statusValue,
|
||||
error: this.errorValue,
|
||||
error: this.errorValue ?? providerError,
|
||||
steerQueue: this.steerQueueValue,
|
||||
};
|
||||
}
|
||||
@@ -274,6 +292,7 @@ export class SessionModel {
|
||||
}
|
||||
|
||||
private setStatus(status: SessionStatus): void {
|
||||
if (status === "submitted") this.liveFailureId = null;
|
||||
this.statusValue = status;
|
||||
this.readyRef = status === "ready";
|
||||
this.onChange?.();
|
||||
@@ -364,6 +383,15 @@ export class SessionModel {
|
||||
// the wire) still wins.
|
||||
const id = message.id ?? this.streamingMessageId ?? localId();
|
||||
const withId = { ...message, id } as LhMessage;
|
||||
if (agent.type === "message_end") {
|
||||
this.incompleteUsageIds.delete(id);
|
||||
if (message.role === "assistant" && message.stopReason === "error") {
|
||||
this.liveFailureId = id;
|
||||
// A newer provider failure replaces an earlier connection/loop
|
||||
// error, just as the live message_end did before restoration.
|
||||
this.errorValue = null;
|
||||
}
|
||||
} else this.incompleteUsageIds.add(id);
|
||||
if (agent.type === "message_start") {
|
||||
this.streamingMessageId = id;
|
||||
this.streamingIds.add(id);
|
||||
@@ -378,15 +406,6 @@ export class SessionModel {
|
||||
}
|
||||
if (agent.type === "message_end") {
|
||||
this.streamingMessageId = null; // slot done — next start mints fresh
|
||||
// (fallthrough: returns true below — the message landed)
|
||||
const stop = (message as { stopReason?: string }).stopReason;
|
||||
if (stop === "error") {
|
||||
// Provider error, verbatim (owner ruling) — the record
|
||||
// persists the same message; no masking anywhere.
|
||||
this.setError(
|
||||
String((message as { errorMessage?: string }).errorMessage ?? "An error occurred."),
|
||||
);
|
||||
}
|
||||
}
|
||||
return true; // a message event is view work, even empty content
|
||||
}
|
||||
@@ -426,17 +445,18 @@ export class SessionModel {
|
||||
|
||||
/** Consume one SSE body to its [DONE] terminal. The turn-settled
|
||||
* terminal (stream-route only) fires the settle hook and ends. */
|
||||
async consumeStream(res: Response): Promise<void> {
|
||||
async consumeStream(res: Response, controller = this.consumeAbort): Promise<void> {
|
||||
if (!res.body) throw new Error("The turn stream body is empty.");
|
||||
const reader = res.body.getReader();
|
||||
let sawEvent = false;
|
||||
try {
|
||||
for await (const event of sseEvents(reader)) {
|
||||
if (this.consumeAbort !== controller) return;
|
||||
if (event.type === "turn-settled") {
|
||||
// The raced-settle terminal: no turn to attach to — the
|
||||
// record is current; the settle hook refetches.
|
||||
await reader.cancel().catch(() => {});
|
||||
this.onReattachSettled?.();
|
||||
if (this.consumeAbort === controller) this.onReattachSettled?.();
|
||||
return;
|
||||
}
|
||||
const acted = this.applyWireEvent(event);
|
||||
@@ -446,9 +466,13 @@ export class SessionModel {
|
||||
}
|
||||
}
|
||||
} finally {
|
||||
this.streamingIds = new Set();
|
||||
this.executions = new Map();
|
||||
if (this.statusValue !== "error") this.setStatus("ready");
|
||||
// A cancelled consume may finish after its replacement has entered
|
||||
// Thinking. Only the current owner can settle shared state.
|
||||
if (this.consumeAbort === controller) {
|
||||
this.streamingIds = new Set();
|
||||
this.executions = new Map();
|
||||
if (this.statusValue !== "error") this.setStatus("ready");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -487,6 +511,7 @@ export class SessionModel {
|
||||
// every path that actually replays onto a stale tail).
|
||||
if (!refetchRecordFirst) {
|
||||
this.mutate(() => {
|
||||
this.incompleteUsageIds.clear();
|
||||
this.tail = [];
|
||||
this.streamingMessageId = null;
|
||||
});
|
||||
@@ -497,11 +522,14 @@ export class SessionModel {
|
||||
const recordRes = await this.fetch(`/api/chats/${encodeURIComponent(this.chatId)}`, {
|
||||
signal: controller.signal,
|
||||
});
|
||||
if (this.consumeAbort !== controller) return;
|
||||
if (recordRes.ok) {
|
||||
const record = (await recordRes.json()) as { messages?: LhMessage[] };
|
||||
if (this.consumeAbort !== controller) return;
|
||||
if (Array.isArray(record.messages)) {
|
||||
this.mutate(() => {
|
||||
this.base = record.messages!;
|
||||
this.incompleteUsageIds.clear();
|
||||
this.tail = [];
|
||||
});
|
||||
}
|
||||
@@ -509,6 +537,7 @@ export class SessionModel {
|
||||
// The record did not land — restore the clean-slate guard
|
||||
// before the replay (no atomic swap is coming).
|
||||
this.mutate(() => {
|
||||
this.incompleteUsageIds.clear();
|
||||
this.tail = [];
|
||||
this.streamingMessageId = null;
|
||||
});
|
||||
@@ -517,10 +546,11 @@ export class SessionModel {
|
||||
const res = await this.fetch(`/api/chats/${encodeURIComponent(this.chatId)}/stream`, {
|
||||
signal: controller.signal,
|
||||
});
|
||||
if (this.consumeAbort !== controller) return;
|
||||
if (!res.ok) throw new Error((await res.text()) || "Failed to attach to the running turn.");
|
||||
await this.consumeStream(res);
|
||||
await this.consumeStream(res, controller);
|
||||
} catch (err) {
|
||||
if ((err as Error).name === "AbortError") return; // a newer consume won
|
||||
if (this.consumeAbort !== controller || (err as Error).name === "AbortError") return; // a newer consume won
|
||||
this.setError((err as Error).message);
|
||||
this.setStatus("error");
|
||||
}
|
||||
@@ -714,6 +744,7 @@ export class SessionModel {
|
||||
setMessages(record: LhMessage[]): void {
|
||||
this.mutate(() => {
|
||||
this.base = record;
|
||||
this.incompleteUsageIds.clear();
|
||||
this.tail = [];
|
||||
this.streamingMessageId = null; // the tail (and its slot) is gone
|
||||
});
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useCallback, useEffect, useRef, useState, type RefObject } from "react";
|
||||
import { ChevronDownIcon, ChevronUpIcon, SearchIcon, XIcon } from "lucide-react";
|
||||
@@ -66,6 +68,7 @@ export function SessionFind({ scopeRef, scrollContextRef }: {
|
||||
scopeRef: RefObject<HTMLDivElement | null>;
|
||||
scrollContextRef: RefObject<SessionScrollContext | null>;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const [open, setOpen] = useState(false);
|
||||
const [query, setQuery] = useState("");
|
||||
const [result, setResult] = useState({ index: -1, count: 0 });
|
||||
@@ -163,7 +166,7 @@ export function SessionFind({ scopeRef, scrollContextRef }: {
|
||||
return (
|
||||
<div
|
||||
role="search"
|
||||
aria-label="Session Find"
|
||||
aria-label={t("Session Find")}
|
||||
data-testid="session-find"
|
||||
className="lh-no-drag flex h-10 shrink-0 items-center gap-2 border-b border-border px-6 font-ui text-sm"
|
||||
onKeyDown={(event) => {
|
||||
@@ -182,8 +185,8 @@ export function SessionFind({ scopeRef, scrollContextRef }: {
|
||||
<SearchIcon className="size-4 shrink-0 text-muted-foreground" aria-hidden />
|
||||
<input
|
||||
ref={inputRef}
|
||||
aria-label="Find in session"
|
||||
placeholder="Find in session…"
|
||||
aria-label={t("Find in session")}
|
||||
placeholder={t("Find in session…")}
|
||||
value={query}
|
||||
onChange={(event) => setQuery(event.target.value)}
|
||||
spellCheck={false}
|
||||
@@ -192,15 +195,15 @@ export function SessionFind({ scopeRef, scrollContextRef }: {
|
||||
<output aria-live="polite" data-testid="session-find-count" className="shrink-0 text-xs tabular-nums text-muted-foreground">
|
||||
{query ? `${result.index + 1}/${result.count}` : ""}
|
||||
</output>
|
||||
<button type="button" aria-label="Previous match" title="Previous match (Shift+Enter)" className={buttonClass}
|
||||
<button type="button" aria-label={t("Previous match")} title={t("Previous match (Shift+Enter)")} className={buttonClass}
|
||||
disabled={!result.count} onMouseDown={(event) => event.preventDefault()} onClick={() => step(-1)}>
|
||||
<ChevronUpIcon className="size-4" aria-hidden />
|
||||
</button>
|
||||
<button type="button" aria-label="Next match" title="Next match (Enter)" className={buttonClass}
|
||||
<button type="button" aria-label={t("Next match")} title={t("Next match (Enter)")} className={buttonClass}
|
||||
disabled={!result.count} onMouseDown={(event) => event.preventDefault()} onClick={() => step(1)}>
|
||||
<ChevronDownIcon className="size-4" aria-hidden />
|
||||
</button>
|
||||
<button type="button" aria-label="Close Find" title="Close Find (Esc)" className={buttonClass} onClick={close}>
|
||||
<button type="button" aria-label={t("Close Find")} title={t("Close Find (Esc)")} className={buttonClass} onClick={close}>
|
||||
<XIcon className="size-4" aria-hidden />
|
||||
</button>
|
||||
</div>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { createContext, useContext, useEffect, useMemo, useRef, useState } from "react";
|
||||
import { MaximizeIcon, MinusIcon, PlusIcon, XIcon } from "lucide-react";
|
||||
@@ -83,6 +85,7 @@ export function MermaidOverlay({
|
||||
inverted?: boolean;
|
||||
onClose: () => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
// ── chart render (own instance, own ids); figure mode uses the raw svg ──
|
||||
const [svg, setSvg] = useState<string | null>(rawSvg ?? null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
@@ -218,16 +221,16 @@ export function MermaidOverlay({
|
||||
className="absolute inset-0 z-40 flex flex-col bg-background/80 p-4 backdrop-blur-sm"
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-label="Diagram focus"
|
||||
aria-label={t("Diagram focus")}
|
||||
>
|
||||
<div className="mb-2 flex items-center gap-2">
|
||||
<span className="text-sm font-medium">Diagram</span>
|
||||
<span className="text-xs text-muted-foreground">from this lesson</span>
|
||||
<Hint label="Close" binding="escape" side="left">
|
||||
<span className="text-sm font-medium">{t("Diagram")}</span>
|
||||
<span className="text-xs text-muted-foreground">{t("from this lesson")}</span>
|
||||
<Hint label={t("Close")} binding="escape" side="left">
|
||||
<button
|
||||
type="button"
|
||||
onClick={onClose}
|
||||
aria-label="Close"
|
||||
aria-label={t("Close")}
|
||||
data-testid="mermaid-overlay-close"
|
||||
className="ml-auto rounded-lg p-1.5 text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
|
||||
>
|
||||
@@ -287,32 +290,32 @@ export function MermaidOverlay({
|
||||
/>
|
||||
</div>
|
||||
<div className="pointer-events-none absolute inset-x-0 bottom-0 flex items-end justify-between p-2">
|
||||
<span className="text-xs text-muted-foreground/60">Drag to pan · scroll to zoom</span>
|
||||
<span className="text-xs text-muted-foreground/60">{t("Drag to pan · scroll to zoom")}</span>
|
||||
<div className="flex gap-1">
|
||||
<Hint label="Zoom out" side="bottom">
|
||||
<Hint label={t("Zoom out")} side="bottom">
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Zoom out"
|
||||
aria-label={t("Zoom out")}
|
||||
onClick={() => stepZoom(1 / 1.25)}
|
||||
className="pointer-events-auto flex size-7 items-center justify-center rounded-md border border-border/70 bg-card/80 text-muted-foreground backdrop-blur transition-colors hover:bg-accent hover:text-foreground"
|
||||
>
|
||||
<MinusIcon className="size-3.5" />
|
||||
</button>
|
||||
</Hint>
|
||||
<Hint label="Fit diagram to view" side="bottom">
|
||||
<Hint label={t("Fit diagram to view")} side="bottom">
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Fit diagram to view"
|
||||
aria-label={t("Fit diagram to view")}
|
||||
onClick={fitView}
|
||||
className="pointer-events-auto flex size-7 items-center justify-center rounded-md border border-border/70 bg-card/80 text-muted-foreground backdrop-blur transition-colors hover:bg-accent hover:text-foreground"
|
||||
>
|
||||
<MaximizeIcon className="size-3.5" />
|
||||
</button>
|
||||
</Hint>
|
||||
<Hint label="Zoom in" side="bottom">
|
||||
<Hint label={t("Zoom in")} side="bottom">
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Zoom in"
|
||||
aria-label={t("Zoom in")}
|
||||
onClick={() => stepZoom(1.25)}
|
||||
className="pointer-events-auto flex size-7 items-center justify-center rounded-md border border-border/70 bg-card/80 text-muted-foreground backdrop-blur transition-colors hover:bg-accent hover:text-foreground"
|
||||
>
|
||||
@@ -325,8 +328,7 @@ export function MermaidOverlay({
|
||||
) : (
|
||||
<div className="flex h-full items-center justify-center gap-2 text-sm text-muted-foreground">
|
||||
<span className="inline-block size-4 animate-spin rounded-full border border-current border-b-2" />
|
||||
Rendering diagram…
|
||||
</div>
|
||||
{t("Rendering diagram…")}</div>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -124,6 +124,7 @@ export function useChatSession({ chatId, initialMessages, initiallyInFlight }: U
|
||||
return {
|
||||
messages: state.messages,
|
||||
nativeMessages: state.nativeMessages,
|
||||
contextTokens: state.contextTokens,
|
||||
status: state.status,
|
||||
error: state.error,
|
||||
steerQueue: state.steerQueue,
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
/**
|
||||
* The Agent section (settings-app wave): the THREE MODEL SLOTS, the tool
|
||||
* toggles + the search-engine preference, and the prompt override
|
||||
@@ -70,8 +72,12 @@ import {
|
||||
import type { ThinkingLevel } from "@earendil-works/pi-agent-core";
|
||||
import { prettyModel } from "@/components/usage-format";
|
||||
import { cn } from "@/lib/utils";
|
||||
import { ZapIcon } from "lucide-react";
|
||||
import { Hint } from "@/components/ui/hint";
|
||||
import { SettingsGroup, SettingsRow, Toggle, CommitInput } from "./controls.tsx";
|
||||
import { ModelMenuList, ThinkingMenuList } from "./model-menu";
|
||||
import { ChatGPTBackgroundAccess } from "./chatgpt-connection";
|
||||
import { NativeSubscriptionBackgroundAccess } from "./subscription-connections";
|
||||
|
||||
/** One slot's display identity — the tier's roster as the row hint rides
|
||||
* with the resolved default (owner: the hint ALWAYS names the default). */
|
||||
@@ -131,19 +137,6 @@ export function composeGraphTools(agent: AgentSettings | undefined, on: boolean)
|
||||
return { ...agent, graphTools: { enabled: on } };
|
||||
}
|
||||
|
||||
/** The research tool runs on the search port — the teacher registry DROPS
|
||||
* it when no engine is live (chat-handler's searchAvailable, the same
|
||||
* /api/search signal the section fetches). Pure — exported for tests.
|
||||
* Teacher-stream flag 2026-09-22: the settings row grays on the SAME
|
||||
* signal, so the row and the actual registry availability can never
|
||||
* disagree. `search === null` (loading/failed) grays NOTHING. */
|
||||
export function researchToolUnavailable(
|
||||
toolId: string,
|
||||
search: { available: boolean } | null,
|
||||
): boolean {
|
||||
return toolId === "research" && search !== null && !search.available;
|
||||
}
|
||||
|
||||
/** Compose: one slot's model/thinking override. Empty model = absent
|
||||
* override (Default — falls to the factory pin); empty thinking = the
|
||||
* tier keeps its resolved thinking budget. Per-field independence, same
|
||||
@@ -161,13 +154,22 @@ export function composeSlotModel(
|
||||
delete next[slot];
|
||||
return next;
|
||||
}
|
||||
const model = provider && id ? { provider, id } : prev?.model;
|
||||
next[slot] = {
|
||||
...(provider && id ? { model: { provider, id } } : prev?.model ? { model: prev.model } : {}),
|
||||
...(model ? { model } : {}),
|
||||
...(thinking ? { thinkingLevel: thinking as ThinkingLevel } : {}),
|
||||
...(model?.provider === "chatgpt" && prev?.fastMode !== undefined ? { fastMode: prev.fastMode } : {}),
|
||||
};
|
||||
return next;
|
||||
}
|
||||
|
||||
/** Speed belongs to the tier, independently of its reasoning budget. */
|
||||
export function composeSlotFast(models: ModelsSettings | undefined, slot: ModelSlotName, enabled: boolean): ModelsSettings {
|
||||
const current = models?.[slot];
|
||||
if (current?.model?.provider !== "chatgpt") return { ...models };
|
||||
return { ...models, [slot]: { ...current, fastMode: enabled } };
|
||||
}
|
||||
|
||||
/** Compose: the search-engine preference. null = the explicit pin is
|
||||
* REMOVED (auto-activation takes over — the schema's resting state).
|
||||
* Pure — exported for tests. */
|
||||
@@ -261,20 +263,22 @@ function MenuTrigger({
|
||||
/** The no-key search state grays the whole row; the trigger follows. */
|
||||
disabled?: boolean;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
aria-label={ariaLabel}
|
||||
aria-expanded={open}
|
||||
disabled={disabled}
|
||||
data-testid={testid}
|
||||
onClick={() => {
|
||||
if (!disabled) onClick();
|
||||
}}
|
||||
className={`flex h-7 items-center gap-1 rounded-sm border border-border bg-background px-1.5 font-ui text-xs text-foreground transition-colors ${
|
||||
className={`flex h-7 max-w-full items-center gap-1 rounded-sm border border-border bg-background px-1.5 font-ui text-xs text-foreground transition-colors ${
|
||||
disabled ? "cursor-not-allowed" : "hover:border-muted-foreground/50"
|
||||
} ${widthClass}`}
|
||||
>
|
||||
<span className="min-w-0 flex-1 truncate">{value || emptyLabel}</span>
|
||||
<span className="min-w-0 flex-1 truncate">{t(value || emptyLabel)}</span>
|
||||
<span aria-hidden className="text-muted-foreground">
|
||||
▾
|
||||
</span>
|
||||
@@ -310,11 +314,21 @@ export function AgentSection({
|
||||
/** Writes the composed WHOLE agent section (replace-PUT discipline). */
|
||||
onSectionChange: (next: AgentSettings) => void;
|
||||
/** Writes the composed models section (slots — replace-PUT discipline). */
|
||||
onModelsChange: (next: ModelsSettings) => void;
|
||||
onModelsChange: (next: ModelsSettings) => void | Promise<void>;
|
||||
/** Writes the whole compaction section (replace-PUT discipline). */
|
||||
onCompactionChange: (next: CompactionSettings) => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const [catalog, setCatalog] = useState<ModelCatalogEntry[] | null>(null);
|
||||
const [savingModels, setSavingModels] = useState(false);
|
||||
const [modelsError, setModelsError] = useState<string | null>(null);
|
||||
const updateModels = async (next: ModelsSettings) => {
|
||||
if (savingModels) return;
|
||||
setSavingModels(true); setModelsError(null);
|
||||
try { await onModelsChange(next); }
|
||||
catch { setModelsError("Could not save model settings"); }
|
||||
finally { setSavingModels(false); }
|
||||
};
|
||||
/** The three tiers' resolved pins — GET /api/models `slots`. The rows'
|
||||
* Default hints and thinking lists resolve from it. */
|
||||
const [slots, setSlots] = useState<ModelsBody["slots"] | null>(null);
|
||||
@@ -357,18 +371,23 @@ export function AgentSection({
|
||||
// fetch each per section mount. The models read ALSO re-runs on the
|
||||
// cross-surface signal (fix wave: another surface's write re-reads
|
||||
// into the slot rows live).
|
||||
const readModels = useCallback(() => {
|
||||
const modelsRequest = useRef(0);
|
||||
const modelsMounted = useRef(false);
|
||||
const readModels = useCallback((connectionChanged = false) => {
|
||||
const request = ++modelsRequest.current;
|
||||
if (connectionChanged) setCatalog(null);
|
||||
fetch("/api/models")
|
||||
.then((r) => r.json())
|
||||
.then((r) => { if (!r.ok) throw new Error("Catalog unavailable"); return r.json(); })
|
||||
.then((body: ModelsBody) => {
|
||||
if (!modelsMounted.current || request !== modelsRequest.current) return;
|
||||
setCatalog(body.models);
|
||||
setSlots(body.slots);
|
||||
})
|
||||
.catch(() => setCatalog(null));
|
||||
.catch(() => { if (modelsMounted.current && request === modelsRequest.current) setCatalog(null); });
|
||||
}, []);
|
||||
|
||||
useSettingsSaved((section) => {
|
||||
if (section === "models") readModels();
|
||||
if (section === "models" || section === "keys") readModels(section === "keys");
|
||||
// THE state-echo root cause: the prompt switches write through the
|
||||
// agent section, but this view (the toggles' truth) never re-read —
|
||||
// the settings-saved law (every reader re-reads) was missing this
|
||||
@@ -377,6 +396,7 @@ export function AgentSection({
|
||||
});
|
||||
|
||||
useEffect(() => {
|
||||
modelsMounted.current = true;
|
||||
readModels();
|
||||
fetch("/api/settings/prompts")
|
||||
.then((r) => r.json())
|
||||
@@ -393,6 +413,7 @@ export function AgentSection({
|
||||
setEngineKeys(present);
|
||||
})
|
||||
.catch(() => {});
|
||||
return () => { modelsMounted.current = false; modelsRequest.current++; };
|
||||
}, []);
|
||||
|
||||
// The reason line re-reads /api/search AFTER an engine write lands —
|
||||
@@ -496,7 +517,7 @@ export function AgentSection({
|
||||
>
|
||||
<span>{label}</span>
|
||||
<span className="text-muted-foreground">
|
||||
{live === null ? (active && <span aria-hidden>✓</span>) : live ? <span aria-hidden>✓ key</span> : <span aria-hidden>· no key</span>}
|
||||
{live === null ? (active && <span aria-hidden>✓</span>) : live ? <span aria-hidden>{t("✓ key")}</span> : <span aria-hidden>{t("· no key")}</span>}
|
||||
</span>
|
||||
</button>
|
||||
);
|
||||
@@ -531,7 +552,7 @@ export function AgentSection({
|
||||
<Toggle
|
||||
checked={info.enabled}
|
||||
disabled={!fileExists}
|
||||
label={`prompt ${info.path}`}
|
||||
label={t("prompt {v0}", { v0: info.path })}
|
||||
onChange={(on) => onSectionChange(composePromptSwitch(agent, info.path, on))}
|
||||
/>
|
||||
</span>
|
||||
@@ -544,26 +565,26 @@ export function AgentSection({
|
||||
}}
|
||||
className="text-xs text-muted-foreground/70 underline-offset-2 hover:text-foreground hover:underline"
|
||||
>
|
||||
{open ? "Hide text" : "Show text"}
|
||||
{open ? t("Hide text") : t("Show text")}
|
||||
</button>
|
||||
{open && (
|
||||
<div className="mt-1 flex flex-col gap-2">
|
||||
<div>
|
||||
<p className="mb-1 text-xs uppercase tracking-widest text-muted-foreground/70">Source</p>
|
||||
<p className="mb-1 text-xs uppercase tracking-widest text-muted-foreground/70">{t("Source")}</p>
|
||||
<textarea
|
||||
readOnly
|
||||
value={info.sourceText}
|
||||
aria-label="The original instructions"
|
||||
aria-label={t("The original instructions")}
|
||||
className="h-24 w-full resize-y rounded-sm border border-border bg-muted p-2 font-ui text-xs text-muted-foreground"
|
||||
/>
|
||||
</div>
|
||||
<div>
|
||||
<p className="mb-1 text-xs uppercase tracking-widest text-muted-foreground/70">Override</p>
|
||||
<p className="mb-1 text-xs uppercase tracking-widest text-muted-foreground/70">{t("Override")}</p>
|
||||
<textarea
|
||||
value={segmentDraft[info.path] ?? info.overrideText ?? ""}
|
||||
onChange={(e) => setSegmentDraft({ ...segmentDraft, [info.path]: e.target.value })}
|
||||
aria-label="Your version of the instructions"
|
||||
placeholder="Add your own instructions…"
|
||||
aria-label={t("Your version of the instructions")}
|
||||
placeholder={t("Add your own instructions…")}
|
||||
className="h-24 w-full resize-y rounded-sm border border-border bg-background p-2 font-ui text-xs text-foreground outline-none"
|
||||
/>
|
||||
</div>
|
||||
@@ -578,16 +599,14 @@ export function AgentSection({
|
||||
: "cursor-not-allowed text-xs text-muted-foreground/40 underline-offset-2"
|
||||
}
|
||||
>
|
||||
Save
|
||||
</button>
|
||||
{t("Save")}</button>
|
||||
{fileExists && (
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => void deleteSegment(info.path)}
|
||||
className="text-xs text-muted-foreground/70 underline-offset-2 hover:text-red-500 hover:underline"
|
||||
>
|
||||
Delete
|
||||
</button>
|
||||
{t("Delete")}</button>
|
||||
)}
|
||||
{/* The quiet inline confirmation — next to the
|
||||
action, not the old path-echoing line at the
|
||||
@@ -597,7 +616,7 @@ export function AgentSection({
|
||||
status reads unambiguously. */}
|
||||
{segmentStatus && (
|
||||
<p className="text-xs text-muted-foreground/70" data-testid="segment-status">
|
||||
{segmentStatus}
|
||||
{t(segmentStatus)}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
@@ -618,7 +637,8 @@ export function AgentSection({
|
||||
|
||||
return (
|
||||
<>
|
||||
<SettingsGroup label="Models" testid="group-models">
|
||||
<SettingsGroup label={t("Models")} testid="group-models">
|
||||
{modelsError && <p role="alert" className="text-xs text-destructive">{t(modelsError)}</p>}
|
||||
{MODEL_SLOTS.map((slot) => {
|
||||
const override = models?.[slot];
|
||||
const modelId = override?.model?.id ?? "";
|
||||
@@ -646,34 +666,52 @@ export function AgentSection({
|
||||
label={SLOT_META[slot].label}
|
||||
hint={SLOT_META[slot].roster}
|
||||
testid={`slot-row-${slot}`}
|
||||
className="flex-wrap items-start gap-y-2 [&>span:first-child]:flex-[1_1_12rem]"
|
||||
>
|
||||
{/* The anchor for the outside-click contract is the
|
||||
span holding BOTH triggers of the open menu. */}
|
||||
span holding the tier's controls. */}
|
||||
<span
|
||||
ref={thisMenuOpen ? menuAnchorRef : undefined}
|
||||
className="relative flex items-center gap-2"
|
||||
className="relative flex w-68 max-w-full shrink-0 flex-col items-start gap-2"
|
||||
>
|
||||
<MenuTrigger
|
||||
value={modelId ? prettyModel(modelId) : ""}
|
||||
emptyLabel="—"
|
||||
ariaLabel={`${SLOT_META[slot].label} model`}
|
||||
testid={`slot-model-${slot}`}
|
||||
open={thisMenuOpen === "model"}
|
||||
onClick={() => setOpenMenu(thisMenuOpen === "model" ? null : { target: slot, kind: "model" })}
|
||||
widthClass="min-w-20"
|
||||
/>
|
||||
<MenuTrigger
|
||||
// Legacy display (chunk 2 item 4): no stored level + a known
|
||||
// model → the RESOLVED level (the ordering's first supported —
|
||||
// what the engine build runs). Display-only until a pick writes.
|
||||
value={thinking || (chosen ? defaultOrderLevel(levels) : "")}
|
||||
emptyLabel="—"
|
||||
ariaLabel={`${SLOT_META[slot].label} thinking`}
|
||||
testid={`slot-thinking-${slot}`}
|
||||
open={thisMenuOpen === "thinking"}
|
||||
onClick={() => setOpenMenu(thisMenuOpen === "thinking" ? null : { target: slot, kind: "thinking" })}
|
||||
widthClass="w-20"
|
||||
/>
|
||||
<span data-testid={`slot-controls-${slot}`} className="grid w-full grid-cols-[minmax(0,1fr)_5rem_auto] items-center gap-2">
|
||||
<MenuTrigger
|
||||
value={modelId ? prettyModel(modelId) : ""}
|
||||
emptyLabel="—"
|
||||
ariaLabel={t("{v0} model", { v0: t(SLOT_META[slot].label) })}
|
||||
testid={`slot-model-${slot}`}
|
||||
open={thisMenuOpen === "model"}
|
||||
onClick={() => setOpenMenu(thisMenuOpen === "model" ? null : { target: slot, kind: "model" })}
|
||||
widthClass="w-full min-w-0"
|
||||
disabled={savingModels}
|
||||
/>
|
||||
<MenuTrigger
|
||||
// Legacy display (chunk 2 item 4): no stored level + a known
|
||||
// model → the RESOLVED level (the ordering's first supported —
|
||||
// what the engine build runs). Display-only until a pick writes.
|
||||
value={thinking || (chosen ? defaultOrderLevel(levels) : "")}
|
||||
emptyLabel="—"
|
||||
ariaLabel={t("{v0} thinking", { v0: t(SLOT_META[slot].label) })}
|
||||
testid={`slot-thinking-${slot}`}
|
||||
open={thisMenuOpen === "thinking"}
|
||||
onClick={() => setOpenMenu(thisMenuOpen === "thinking" ? null : { target: slot, kind: "thinking" })}
|
||||
widthClass="w-20"
|
||||
disabled={savingModels}
|
||||
/>
|
||||
<Hint label={t(provider === "chatgpt" ? "Fast mode uses more ChatGPT allowance." : "Fast mode is available only for ChatGPT models.")}>
|
||||
<span className="inline-flex">
|
||||
<button type="button" data-testid={`slot-fast-${slot}`} aria-label={t("{v0} fast mode", { v0: t(SLOT_META[slot].label) })}
|
||||
aria-pressed={provider === "chatgpt" && override?.fastMode === true} disabled={provider !== "chatgpt" || !chosen || savingModels}
|
||||
onClick={() => { setOpenMenu(null); void updateModels(composeSlotFast(models, slot, !override?.fastMode)); }}
|
||||
className={cn("flex h-7 items-center gap-1 rounded-sm border border-border px-1.5 font-ui text-xs transition-colors disabled:opacity-40",
|
||||
provider === "chatgpt" && chosen ? "disabled:cursor-default" : "disabled:cursor-not-allowed",
|
||||
provider === "chatgpt" && override?.fastMode ? "bg-muted text-foreground" : "bg-background text-muted-foreground hover:border-muted-foreground/50")}>
|
||||
<ZapIcon className="size-3.5" aria-hidden /><span>{t("Fast")}</span>
|
||||
</button>
|
||||
</span>
|
||||
</Hint>
|
||||
</span>
|
||||
{slot !== "strong" && <><ChatGPTBackgroundAccess provider={coord?.provider} /><NativeSubscriptionBackgroundAccess provider={coord?.provider} /></>}
|
||||
{thisMenuOpen === "model" && (
|
||||
<MenuShell
|
||||
preferredSide="down"
|
||||
@@ -690,13 +728,13 @@ export function AgentSection({
|
||||
// fresh pick writes a level — the stored one rides as-is
|
||||
// (the write clamps server-side), else the ordering's level.
|
||||
const next = populateLevel(thinking || undefined, entry.supportedLevels);
|
||||
onModelsChange(composeSlotModel(models, slot, entry.provider, entry.id, next));
|
||||
void updateModels(composeSlotModel(models, slot, entry.provider, entry.id, next));
|
||||
setOpenMenu(null);
|
||||
}}
|
||||
footer={
|
||||
catalog && catalog.length === 0
|
||||
? "No models — add a provider key in Keys"
|
||||
: "Runs every agent of this tier"
|
||||
? t("No models — add a provider key in Keys")
|
||||
: t("Runs every agent of this tier")
|
||||
}
|
||||
/>
|
||||
</MenuShell>
|
||||
@@ -714,7 +752,7 @@ export function AgentSection({
|
||||
// the same one the trigger shows.
|
||||
effectiveLevel={thinking || (chosen ? defaultOrderLevel(levels) : undefined)}
|
||||
onPick={(level) => {
|
||||
onModelsChange(composeSlotModel(models, slot, provider, modelId, level));
|
||||
void updateModels(composeSlotModel(models, slot, provider, modelId, level));
|
||||
setOpenMenu(null);
|
||||
}}
|
||||
/>
|
||||
@@ -726,7 +764,7 @@ export function AgentSection({
|
||||
})}
|
||||
</SettingsGroup>
|
||||
|
||||
<SettingsGroup label="Tools" testid="group-tools">
|
||||
<SettingsGroup label={t("Tools")} testid="group-tools">
|
||||
{/* The prober's graph tools (wave 7, owner ruling 2026-09-23):
|
||||
FIRST row of the group — its subject is the map, its
|
||||
mechanism is agent capability, so it lives in Tools but
|
||||
@@ -738,15 +776,15 @@ export function AgentSection({
|
||||
const graphOn = graph?.enabled ?? true;
|
||||
return (
|
||||
<SettingsRow
|
||||
label="Graph tools"
|
||||
hint={graphOn ? "Lets the tutor consult your knowledge map between sessions" : "Graph is disabled"}
|
||||
label={t("Graph tools")}
|
||||
hint={graphOn ? t("Lets the tutor consult your knowledge map between sessions") : t("Graph is disabled")}
|
||||
testid="graph-tools-row"
|
||||
dimmed={!graphOn}
|
||||
>
|
||||
<Toggle
|
||||
checked={agent?.graphTools?.enabled ?? true}
|
||||
disabled={!graphOn}
|
||||
label="graph tools"
|
||||
label={t("graph tools")}
|
||||
onChange={(on) => onSectionChange(composeGraphTools(agent, on))}
|
||||
/>
|
||||
</SettingsRow>
|
||||
@@ -760,14 +798,15 @@ export function AgentSection({
|
||||
const free = agent?.tools?.explain === true;
|
||||
return (
|
||||
<SettingsRow
|
||||
label="Quizzing"
|
||||
hint="How both tutors check your understanding"
|
||||
label={t("Quizzing")}
|
||||
hint={t("How both tutors check your understanding")}
|
||||
testid="quiz-mechanics-row"
|
||||
className="flex-wrap gap-y-2 [&>span]:flex-[1_1_12rem]"
|
||||
>
|
||||
<div
|
||||
role="radiogroup"
|
||||
aria-label="Quizzing mechanics"
|
||||
className="flex rounded-lg border border-border/60 bg-muted/30 p-0.5"
|
||||
aria-label={t("Quizzing mechanics")}
|
||||
className="flex max-w-full shrink-0 rounded-lg border border-border/60 bg-muted/30 p-0.5"
|
||||
>
|
||||
{(["choice", "free"] as const).map((m) => {
|
||||
const active = m === "free" ? free : !free;
|
||||
@@ -780,11 +819,11 @@ export function AgentSection({
|
||||
data-testid={`quiz-mechanics-${m}`}
|
||||
onClick={() => onSectionChange(composeQuizMechanics(agent, m))}
|
||||
className={cn(
|
||||
"h-8 rounded-md px-3 text-sm font-medium transition-colors",
|
||||
"min-h-8 min-w-0 rounded-md px-3 py-1 text-sm leading-snug font-medium break-words transition-colors",
|
||||
active ? "bg-background text-foreground shadow-sm" : "text-muted-foreground hover:text-foreground",
|
||||
)}
|
||||
>
|
||||
{m === "choice" ? "Multiple choice" : "Free recall"}
|
||||
{m === "choice" ? t("Multiple choice") : t("Free recall")}
|
||||
</button>
|
||||
);
|
||||
})}
|
||||
@@ -792,35 +831,26 @@ export function AgentSection({
|
||||
</SettingsRow>
|
||||
);
|
||||
})()}
|
||||
{TOGGLE_TOOLS.map((id) => {
|
||||
// Research needs a live search engine; the row + toggle gray
|
||||
// on the same signal the registry drops the tool on (see
|
||||
// researchToolUnavailable). The reason rides as the hint.
|
||||
const searchDown = researchToolUnavailable(id, search);
|
||||
return (
|
||||
<SettingsRow
|
||||
key={id}
|
||||
label={`Tool · ${id}`}
|
||||
hint={searchDown ? search?.reason : undefined}
|
||||
testid={`tool-row-${id}`}
|
||||
dimmed={searchDown}
|
||||
>
|
||||
<Toggle
|
||||
checked={agent?.tools?.[id] ?? true}
|
||||
disabled={searchDown}
|
||||
label={`tool ${id}`}
|
||||
onChange={(on) => onSectionChange(composeTool(agent, id, on))}
|
||||
/>
|
||||
</SettingsRow>
|
||||
);
|
||||
})}
|
||||
{TOGGLE_TOOLS.map((id) => (
|
||||
<SettingsRow
|
||||
key={id}
|
||||
label={t("Tool · {v0}", { v0: id })}
|
||||
testid={`tool-row-${id}`}
|
||||
>
|
||||
<Toggle
|
||||
checked={agent?.tools?.[id] ?? true}
|
||||
label={t("tool {v0}", { v0: id })}
|
||||
onChange={(on) => onSectionChange(composeTool(agent, id, on))}
|
||||
/>
|
||||
</SettingsRow>
|
||||
))}
|
||||
{(() => {
|
||||
const engine = agent?.search?.engine ?? null;
|
||||
const anyKey = engineKeys.tavily === true || engineKeys.brave === true;
|
||||
const open = openMenu?.target === "search";
|
||||
return (
|
||||
<SettingsRow
|
||||
label="Search engine"
|
||||
label={t("Search engine")}
|
||||
hint={search?.reason ?? undefined}
|
||||
testid="search-engine-row"
|
||||
dimmed={!anyKey}
|
||||
@@ -828,8 +858,8 @@ export function AgentSection({
|
||||
<span ref={open ? menuAnchorRef : undefined} className="relative flex items-center gap-2">
|
||||
<MenuTrigger
|
||||
value={engine === "tavily" ? "Tavily" : engine === "brave" ? "Brave" : ""}
|
||||
emptyLabel="Automatic"
|
||||
ariaLabel="Search engine"
|
||||
emptyLabel={t("Automatic")}
|
||||
ariaLabel={t("Search engine")}
|
||||
testid="search-engine-trigger"
|
||||
open={open}
|
||||
onClick={() => setOpenMenu(open ? null : { target: "search", kind: "engine" })}
|
||||
@@ -843,7 +873,7 @@ export function AgentSection({
|
||||
testid="search-engine-menu"
|
||||
menuClass="flex w-44 flex-col gap-0.5 rounded-xl border border-border bg-card p-2 text-xs shadow-xl"
|
||||
>
|
||||
{engineOption("auto", "Automatic", engine === null, null, () => {
|
||||
{engineOption("auto", t("Automatic"), engine === null, null, () => {
|
||||
onSectionChange(composeSearchEngine(agent, null));
|
||||
setOpenMenu(null);
|
||||
})}
|
||||
@@ -861,17 +891,17 @@ export function AgentSection({
|
||||
})()}
|
||||
</SettingsGroup>
|
||||
|
||||
<SettingsGroup label="Context" testid="group-context">
|
||||
<SettingsGroup label={t("Context")} testid="group-context">
|
||||
<SettingsRow
|
||||
label="Compaction threshold"
|
||||
hint={`${resolvedCompaction.thresholdTokens} tok`}
|
||||
label={t("Compaction threshold")}
|
||||
hint={t("{v0} tok", { v0: resolvedCompaction.thresholdTokens })}
|
||||
testid="compaction-row-threshold"
|
||||
>
|
||||
<CommitInput
|
||||
type="number"
|
||||
value={String(compaction?.thresholdTokens ?? "")}
|
||||
placeholder={String(resolvedCompaction.thresholdTokens)}
|
||||
ariaLabel="compaction threshold"
|
||||
ariaLabel={t("compaction threshold")}
|
||||
testid="input-compaction-threshold"
|
||||
onCommit={(v) => {
|
||||
// Empty = factory default (the budget row's discipline):
|
||||
@@ -894,9 +924,9 @@ export function AgentSection({
|
||||
</SettingsRow>
|
||||
</SettingsGroup>
|
||||
|
||||
<SettingsGroup label="System prompts" testid="group-prompts">
|
||||
<SettingsGroup label={t("System prompts")} testid="group-prompts">
|
||||
{prompts === null ? (
|
||||
<p className="text-xs text-muted-foreground/70">Loading prompt segments…</p>
|
||||
<p className="text-xs text-muted-foreground/70">{t("Loading prompt segments…")}</p>
|
||||
) : (
|
||||
<div className="flex flex-col gap-4">
|
||||
{/* The owner's ruled order (2026-09-26): Teacher first,
|
||||
@@ -906,10 +936,10 @@ export function AgentSection({
|
||||
{sectionedSegments(prompts).map((section) => (
|
||||
<div key={section.id} data-testid={`prompt-section-${section.id}`}>
|
||||
<p className="mb-1 text-xs uppercase tracking-widest text-muted-foreground/70">
|
||||
{section.label}
|
||||
{t(section.label)}
|
||||
</p>
|
||||
{section.hint && (
|
||||
<p className="mb-1 text-xs text-muted-foreground/60">{section.hint}</p>
|
||||
<p className="mb-1 text-xs text-muted-foreground/60">{t(section.hint)}</p>
|
||||
)}
|
||||
<div className="flex flex-col gap-2">
|
||||
{section.segments.map((info) => segmentRow(info))}
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
/**
|
||||
* The Appearance + Graph sections (thin settings wave).
|
||||
*
|
||||
@@ -97,6 +99,7 @@ export function AppearanceSection({
|
||||
/** PUT the whole appearance section; the page re-applies on success. */
|
||||
onSectionChange: (next: AppearanceSettings) => void;
|
||||
}) {
|
||||
const { t, language } = useI18n();
|
||||
const { appearance: resolved } = useAppearance();
|
||||
const md = appearance?.mdRendering;
|
||||
|
||||
@@ -186,27 +189,27 @@ export function AppearanceSection({
|
||||
|
||||
return (
|
||||
<>
|
||||
<SettingsRow label="Mode" hint="Coming soon" testid="row-mode" dimmed>
|
||||
<SettingsRow label={t("Mode")} hint={t("Coming soon")} testid="row-mode" dimmed>
|
||||
<ThinSelect value="dark" ariaLabel="mode" onChange={() => {}} testid="select-mode" disabled>
|
||||
<option value="dark">Dark</option>
|
||||
<option value="dark">{t("Dark")}</option>
|
||||
</ThinSelect>
|
||||
</SettingsRow>
|
||||
<SettingsRow
|
||||
label="Background"
|
||||
hint={`Empty = ${resolved.background ?? "#141414"}`}
|
||||
label={t("Background")}
|
||||
hint={t("Empty = {v0}", { v0: resolved.background ?? "#141414" })}
|
||||
testid="row-background"
|
||||
>
|
||||
<CommitInput
|
||||
value={appearance?.background ?? ""}
|
||||
placeholder="#141414"
|
||||
ariaLabel="background hex"
|
||||
ariaLabel={t("background hex")}
|
||||
testid="input-background"
|
||||
onCommit={(v) => onSectionChange({ ...appearance, background: v === "" ? null : v })}
|
||||
/>
|
||||
</SettingsRow>
|
||||
<SettingsRow
|
||||
label="Reading font"
|
||||
hint={`Empty = ${DEFAULT_READING_FONT}`}
|
||||
label={t("Reading font")}
|
||||
hint={t("Empty = {v0}", { v0: language === "ru" ? "Noto Sans" : DEFAULT_READING_FONT })}
|
||||
testid="row-font"
|
||||
>
|
||||
<span ref={fontMenuOpen ? menuAnchorRef : undefined} className="relative flex items-center gap-2">
|
||||
@@ -222,13 +225,13 @@ export function AppearanceSection({
|
||||
const triggerButton = (
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Reading font"
|
||||
aria-label={t("Reading font")}
|
||||
aria-expanded={fontMenuOpen}
|
||||
data-testid="font-trigger"
|
||||
onClick={openFontMenu}
|
||||
className="flex h-7 min-w-20 items-center gap-1 rounded-sm border border-border bg-background px-1.5 font-ui text-xs text-foreground transition-colors hover:border-muted-foreground/50"
|
||||
>
|
||||
<span className="min-w-0 flex-1 truncate">{appearance?.fontFamily || DEFAULT_READING_FONT}</span>
|
||||
<span className="min-w-0 flex-1 truncate">{appearance?.fontFamily || (language === "ru" ? "Noto Sans" : DEFAULT_READING_FONT)}</span>
|
||||
<span aria-hidden className="text-muted-foreground">
|
||||
▾
|
||||
</span>
|
||||
@@ -237,7 +240,7 @@ export function AppearanceSection({
|
||||
return fontMenuOpen ? (
|
||||
triggerButton
|
||||
) : (
|
||||
<Hint label="Choose from your installed fonts" side="left">
|
||||
<Hint label={t("Choose from your installed fonts")} side="left">
|
||||
{triggerButton}
|
||||
</Hint>
|
||||
);
|
||||
@@ -258,21 +261,21 @@ export function AppearanceSection({
|
||||
? undefined
|
||||
: localFonts === null
|
||||
? enumEmpty
|
||||
? "Common families — installed fonts could not be read"
|
||||
: "Common families — your installed list needs the desktop app"
|
||||
: "Your installed fonts"
|
||||
? t("Common families — installed fonts could not be read")
|
||||
: t("Common families — your installed list needs the desktop app")
|
||||
: t("Your installed fonts")
|
||||
}
|
||||
/>
|
||||
</MenuShell>
|
||||
)}
|
||||
</span>
|
||||
</SettingsRow>
|
||||
<SettingsRow label="Reading font size" hint={`${resolved.proseFontSize}px`} testid="row-prose-size">
|
||||
<SettingsRow label={t("Reading font size")} hint={`${resolved.proseFontSize}px`} testid="row-prose-size">
|
||||
<CommitInput
|
||||
type="number"
|
||||
value={String(appearance?.proseFontSize ?? "")}
|
||||
placeholder="16"
|
||||
ariaLabel="prose font size"
|
||||
ariaLabel={t("prose font size")}
|
||||
testid="input-prose-size"
|
||||
onCommit={(v) => {
|
||||
// Empty = factory default (owner, fix wave): omit the key so the record
|
||||
@@ -288,19 +291,19 @@ export function AppearanceSection({
|
||||
}}
|
||||
/>
|
||||
</SettingsRow>
|
||||
<SettingsRow label="Session names in serif" testid="row-session-serif">
|
||||
<SettingsRow label={t("Session names in serif")} testid="row-session-serif">
|
||||
<Toggle
|
||||
checked={appearance?.sessionNameSerif ?? true}
|
||||
label="session names serif"
|
||||
label={t("session names serif")}
|
||||
onChange={(on) => onSectionChange({ ...appearance, sessionNameSerif: on })}
|
||||
/>
|
||||
</SettingsRow>
|
||||
<SettingsRow label="Heading weight" hint={`${resolved.mdRendering.headingWeight}`} testid="row-heading-weight">
|
||||
<SettingsRow label={t("Heading weight")} hint={`${resolved.mdRendering.headingWeight}`} testid="row-heading-weight">
|
||||
<CommitInput
|
||||
type="number"
|
||||
value={String(md?.headingWeight ?? "")}
|
||||
placeholder="900"
|
||||
ariaLabel="heading weight"
|
||||
ariaLabel={t("heading weight")}
|
||||
testid="input-heading-weight"
|
||||
onCommit={(v) => {
|
||||
// Empty = factory default (owner, fix wave): Number("") is 0, so
|
||||
@@ -321,20 +324,20 @@ export function AppearanceSection({
|
||||
{/* The emphasis inks default to the REGULAR TEXT COLOR now
|
||||
(appearance wave, 2026-09-26) — the empty-state labels say
|
||||
so; explicit hex overrides ride unchanged. */}
|
||||
<SettingsRow label="Bold color" hint="Empty = same as text" testid="row-bold-color">
|
||||
<SettingsRow label={t("Bold color")} hint={t("Empty = same as text")} testid="row-bold-color">
|
||||
<CommitInput
|
||||
value={md?.boldColor ?? ""}
|
||||
placeholder="same as text"
|
||||
ariaLabel="bold color"
|
||||
placeholder={t("same as text")}
|
||||
ariaLabel={t("bold color")}
|
||||
testid="input-bold-color"
|
||||
onCommit={(v) => onSectionChange({ ...appearance, mdRendering: { ...md, boldColor: v === "" ? null : v } })}
|
||||
/>
|
||||
</SettingsRow>
|
||||
<SettingsRow label="Italic color" hint="Empty = same as text" testid="row-italic-color">
|
||||
<SettingsRow label={t("Italic color")} hint={t("Empty = same as text")} testid="row-italic-color">
|
||||
<CommitInput
|
||||
value={md?.italicColor ?? ""}
|
||||
placeholder="same as text"
|
||||
ariaLabel="italic color"
|
||||
placeholder={t("same as text")}
|
||||
ariaLabel={t("italic color")}
|
||||
testid="input-italic-color"
|
||||
onCommit={(v) => onSectionChange({ ...appearance, mdRendering: { ...md, italicColor: v === "" ? null : v } })}
|
||||
/>
|
||||
@@ -350,6 +353,7 @@ export function GraphSection({
|
||||
graph: GraphSettings | undefined;
|
||||
onSectionChange: (next: GraphSettings) => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
// Wave 7 collapse (owner ruling 2026-09-23): the section is the MASTER
|
||||
// SWITCH — the embedding/clustering/labeling rungs are gone; clustering
|
||||
// is the free birth-session partition derived on read, labels ARE session
|
||||
@@ -370,10 +374,10 @@ export function GraphSection({
|
||||
switch below arrived: off ≠ no graph, off = the graph stops
|
||||
growing. The testid keeps the old name's shape (row-enabled) so
|
||||
this stays one rename, not a test re-pin. */}
|
||||
<SettingsRow label="Extraction" hint="Off = the graph stops growing" testid="graph-row-enabled">
|
||||
<SettingsRow label={t("Extraction")} hint={t("Off = the graph stops growing")} testid="graph-row-enabled">
|
||||
<Toggle
|
||||
checked={graph?.enabled ?? true}
|
||||
label="extraction enabled"
|
||||
label={t("extraction enabled")}
|
||||
onChange={(on) =>
|
||||
// Compose, never replace-whole (the section PUT is, but the
|
||||
// row must not drop its sibling field — fixed with the budget
|
||||
@@ -386,23 +390,23 @@ export function GraphSection({
|
||||
round): display-only. Off = the home shows the chains view
|
||||
instead of the canvas. The ledgers, the pipeline, everything
|
||||
data keeps working — that is the extraction switch above. */}
|
||||
<SettingsRow label="Graph rendering" hint="Off = home shows the chains view" testid="graph-row-rendering">
|
||||
<SettingsRow label={t("Graph rendering")} hint={t("Off = home shows the chains view")} testid="graph-row-rendering">
|
||||
<Toggle
|
||||
checked={graph?.rendering ?? true}
|
||||
label="graph rendering enabled"
|
||||
label={t("graph rendering enabled")}
|
||||
onChange={(on) => onSectionChange({ ...graph, rendering: on })}
|
||||
/>
|
||||
</SettingsRow>
|
||||
<SettingsRow
|
||||
label="Extraction chunk budget"
|
||||
hint={`${resolved.extractionChunkTokens} tok`}
|
||||
label={t("Extraction chunk budget")}
|
||||
hint={t("{v0} tok", { v0: resolved.extractionChunkTokens })}
|
||||
testid="graph-row-chunk-tokens"
|
||||
>
|
||||
<CommitInput
|
||||
type="number"
|
||||
value={String(graph?.extractionChunkTokens ?? "")}
|
||||
placeholder={String(resolved.extractionChunkTokens)}
|
||||
ariaLabel="extraction chunk budget"
|
||||
ariaLabel={t("extraction chunk budget")}
|
||||
testid="input-chunk-tokens"
|
||||
onCommit={(v) => {
|
||||
// Empty = factory default (the fix-wave discipline): absence is
|
||||
|
||||
@@ -0,0 +1,357 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { createContext, useContext, useEffect, useRef, useState } from "react";
|
||||
import type { ChatGPTStatus } from "@/src/core";
|
||||
import { ConnectionDialog, ConnectionFooter, ConnectionRow } from "./connection-controls";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Toggle } from "./controls";
|
||||
|
||||
export const CHATGPT_NOTICE = "LearnHarness stores your ChatGPT account details and credentials in an unencrypted local file on this device. When this connection is used, relevant conversation context, learning material, and tool results are sent directly to OpenAI. ChatGPT plan limits apply; any additional credits are authorized and managed in ChatGPT, not LearnHarness.";
|
||||
export const CHATGPT_BACKGROUND_HINT = "Background work counts toward your ChatGPT plan usage.";
|
||||
const BACKGROUND_LABEL = "Allow background use for all ChatGPT accounts";
|
||||
const REVOCATION_WARNING = "Account disconnected locally. Remote revocation could not be confirmed.";
|
||||
export const CHATGPT_DISCONNECT_COPY = { title: "Disconnect account?", body: "This removes the saved account and its credentials from this device." };
|
||||
const empty: ChatGPTStatus = { available: false, pending: false, allowBackgroundUse: true, activeId: null, accounts: [], error: null };
|
||||
type Account = ChatGPTStatus["accounts"][number];
|
||||
type Dialog = { kind: "connect" } | { kind: "manage"; accountId: string; account: Account; confirm?: boolean } | { kind: "warning" };
|
||||
type LoginAttempt = { generation: number; dialog: Dialog; registration: string; background: boolean; backgroundDirty: boolean; pending: boolean; accountId?: string; phase: "starting" | "pending" | "consent" };
|
||||
const CONTROL_ERROR = "The ChatGPT connection could not be changed. Try again.";
|
||||
function isStatus(value: unknown): value is ChatGPTStatus {
|
||||
if (!value || typeof value !== "object") return false;
|
||||
const s = value as ChatGPTStatus;
|
||||
return typeof s.available === "boolean" && typeof s.pending === "boolean" && typeof s.allowBackgroundUse === "boolean" && (s.activeId === null || typeof s.activeId === "string") &&
|
||||
(s.error === null || typeof s.error === "string") && (s.catalogError == null || typeof s.catalogError === "string") && Array.isArray(s.accounts) &&
|
||||
s.accounts.every((a) => a && typeof a.id === "string" && typeof a.email === "string" && typeof a.registration === "string" && typeof a.connected === "boolean" && (a.planEnabled === undefined || typeof a.planEnabled === "boolean") && (a.canSignInAgain === undefined || typeof a.canSignInAgain === "boolean"));
|
||||
}
|
||||
function replyError(value: unknown): string {
|
||||
return value && typeof value === "object" && "error" in value && typeof value.error === "string" ? value.error : CONTROL_ERROR;
|
||||
}
|
||||
const Context = createContext({
|
||||
status: empty,
|
||||
busy: false,
|
||||
error: null as string | null,
|
||||
inlineError: null as string | null,
|
||||
warning: null as string | null,
|
||||
connect: () => {},
|
||||
manage: (_id: string) => {},
|
||||
select: (_id: string) => {},
|
||||
dismissWarning: () => {},
|
||||
});
|
||||
|
||||
/** UI lifetime spans setup's keys → models transition. Only existing safe controls
|
||||
* are used; account IDs remain control values, never displayed account labels. */
|
||||
export function ChatGPTUIProvider({ children }: { children: React.ReactNode }) {
|
||||
const { t } = useI18n();
|
||||
const [status, setStatus] = useState<ChatGPTStatus>(empty);
|
||||
const [dialog, setDialog] = useState<Dialog | null>(null);
|
||||
const [busy, setBusy] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [dismissedError, setDismissedError] = useState<string | null>(null);
|
||||
const [background, setBackground] = useState(true);
|
||||
const [backgroundDirty, setBackgroundDirty] = useState(false);
|
||||
const [registration, setRegistration] = useState("");
|
||||
const operation = useRef<"login" | "cancel" | "change" | "disconnect" | null>(null);
|
||||
const generation = useRef(0);
|
||||
const statusSequence = useRef(0);
|
||||
const mounted = useRef(false);
|
||||
const dialogRef = useRef<Dialog | null>(null);
|
||||
const statusRef = useRef(status);
|
||||
const loginAttempt = useRef<LoginAttempt | null>(null);
|
||||
const receive = useRef<(value: unknown) => void>(() => {});
|
||||
function showDialog(next: Dialog | null) { dialogRef.current = next; setDialog(next); }
|
||||
function publishStatus(value: unknown): ChatGPTStatus | null {
|
||||
if (!isStatus(value)) { setError(replyError(value)); return null; }
|
||||
statusSequence.current++; statusRef.current = value; setStatus(value);
|
||||
return value;
|
||||
}
|
||||
function owns(attempt: LoginAttempt) { return mounted.current && loginAttempt.current === attempt && generation.current === attempt.generation; }
|
||||
function finish(attempt: LoginAttempt) {
|
||||
if (!owns(attempt)) return;
|
||||
loginAttempt.current = null; operation.current = null; setBusy(false);
|
||||
}
|
||||
async function complete(attempt: LoginAttempt, next: ChatGPTStatus) {
|
||||
const account = next.accounts.find((a) => a.id === next.activeId && a.connected);
|
||||
if (next.error || !next.available || !account || (attempt.registration && account.id !== attempt.registration)) {
|
||||
finish(attempt); setError(next.error || CONTROL_ERROR); return;
|
||||
}
|
||||
attempt.phase = "consent"; attempt.accountId = account.id;
|
||||
let replyFailure: string | null = null;
|
||||
try {
|
||||
if (attempt.backgroundDirty && next.allowBackgroundUse !== attempt.background) {
|
||||
operation.current = "change";
|
||||
const request = ++statusSequence.current;
|
||||
const result: unknown = await window.lh!.chatgpt!.consent(attempt.background);
|
||||
if (!owns(attempt)) return;
|
||||
if (!isStatus(result)) { setError(replyError(result)); finish(attempt); return; }
|
||||
replyFailure = result.error;
|
||||
let saved: ChatGPTStatus | null;
|
||||
if (request !== statusSequence.current) {
|
||||
const refresh = ++statusSequence.current;
|
||||
const value: unknown = await window.lh!.chatgpt!.status();
|
||||
if (!owns(attempt)) return;
|
||||
saved = refresh === statusSequence.current ? publishStatus(value) : statusRef.current;
|
||||
} else saved = publishStatus(result);
|
||||
if (!saved) { finish(attempt); return; }
|
||||
next = saved;
|
||||
}
|
||||
if (!owns(attempt)) return;
|
||||
const current = next.accounts.find((a) => a.id === account.id && a.id === next.activeId && a.connected);
|
||||
if (replyFailure || next.error || next.pending || !next.available || !current || (attempt.backgroundDirty && next.allowBackgroundUse !== attempt.background)) setError(replyFailure || next.error || CONTROL_ERROR);
|
||||
else if (dialogRef.current === attempt.dialog) showDialog(null);
|
||||
} catch { if (owns(attempt)) setError(CONTROL_ERROR); }
|
||||
finally { finish(attempt); }
|
||||
}
|
||||
function reconcile(next: ChatGPTStatus, loginReply = false) {
|
||||
const attempt = loginAttempt.current;
|
||||
if (!attempt || !owns(attempt)) return;
|
||||
if (attempt.phase === "consent") {
|
||||
if (next.pending || next.error || !next.available || next.activeId !== attempt.accountId || !next.accounts.some((a) => a.id === attempt.accountId && a.connected)) {
|
||||
finish(attempt); setError(next.error || CONTROL_ERROR);
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (next.pending) { attempt.pending = true; attempt.phase = "pending"; return; }
|
||||
// login() normally acknowledges pending immediately; verified completion is
|
||||
// a later status notification. The acknowledgement itself is not success.
|
||||
if (attempt.pending || loginReply) void complete(attempt, next);
|
||||
}
|
||||
receive.current = (value) => {
|
||||
const next = publishStatus(value);
|
||||
if (next) reconcile(next);
|
||||
};
|
||||
useEffect(() => {
|
||||
mounted.current = true;
|
||||
const bridge = window.lh?.chatgpt;
|
||||
const refresh = async () => {
|
||||
const request = ++statusSequence.current;
|
||||
try {
|
||||
const next: unknown = await bridge?.status();
|
||||
if (next && mounted.current && request === statusSequence.current) receive.current(next);
|
||||
} catch { if (mounted.current && request === statusSequence.current) setError("The desktop connection is unavailable. Retry when the app is ready."); }
|
||||
};
|
||||
void refresh();
|
||||
const off = bridge?.onChange(() => void refresh());
|
||||
return () => { mounted.current = false; generation.current++; loginAttempt.current = null; off?.(); };
|
||||
}, []);
|
||||
|
||||
const managed = dialog?.kind === "manage" ? status.accounts.find((a) => a.id === dialog.accountId) ?? dialog.account : undefined;
|
||||
const managedPresent = !!managed && status.accounts.some((a) => a.id === managed.id);
|
||||
const visibleError = error || (status.error !== dismissedError ? status.error : null) || status.catalogError || null;
|
||||
const warning = visibleError === REVOCATION_WARNING ? visibleError : null;
|
||||
function openConnect(accountId = "") {
|
||||
if (operation.current) return;
|
||||
setBackground(statusRef.current.allowBackgroundUse);
|
||||
setBackgroundDirty(false);
|
||||
setRegistration(accountId);
|
||||
setError(null);
|
||||
setDismissedError(status.error);
|
||||
showDialog({ kind: "connect" });
|
||||
}
|
||||
function close() {
|
||||
if (operation.current === "disconnect" || operation.current === "change" || operation.current === "cancel") return;
|
||||
const current = dialogRef.current;
|
||||
if (current?.kind === "manage" && current.confirm) { showDialog({ ...current, confirm: false }); setError(null); return; }
|
||||
const cancel = loginAttempt.current !== null || statusRef.current.pending;
|
||||
const intent = ++generation.current;
|
||||
const owner = dialogRef.current;
|
||||
loginAttempt.current = null;
|
||||
if (!cancel) showDialog(null);
|
||||
setError(null);
|
||||
setDismissedError(status.error);
|
||||
if (cancel) {
|
||||
// Keep cancellation serialized even after login's pending IPC reply.
|
||||
operation.current = "cancel"; setBusy(true);
|
||||
const request = ++statusSequence.current;
|
||||
void window.lh?.chatgpt?.cancel().then(async (value: unknown) => {
|
||||
if (!mounted.current || generation.current !== intent) return;
|
||||
if (!isStatus(value)) { setError(replyError(value)); return; }
|
||||
let next: ChatGPTStatus | null;
|
||||
if (request !== statusSequence.current) {
|
||||
const refresh = ++statusSequence.current;
|
||||
const current: unknown = await window.lh!.chatgpt!.status();
|
||||
if (!mounted.current || generation.current !== intent) return;
|
||||
next = refresh === statusSequence.current ? publishStatus(current) : statusRef.current;
|
||||
} else next = publishStatus(value);
|
||||
if (next && !next.pending) {
|
||||
setDismissedError(value.error); // Dismiss only this cancellation's error, not a newer failure.
|
||||
if (dialogRef.current === owner) showDialog(null);
|
||||
} else if (next) setError(CONTROL_ERROR);
|
||||
}).catch(() => { if (mounted.current && generation.current === intent) setError(CONTROL_ERROR); }).finally(() => {
|
||||
if (mounted.current && generation.current === intent) { operation.current = null; setBusy(false); }
|
||||
});
|
||||
}
|
||||
}
|
||||
async function control(kind: "change" | "disconnect", action: () => Promise<ChatGPTStatus>, target?: string) {
|
||||
if (operation.current) return;
|
||||
const intent = ++generation.current;
|
||||
const request = ++statusSequence.current;
|
||||
const owner = dialogRef.current;
|
||||
operation.current = kind;
|
||||
setBusy(true); setError(null);
|
||||
if (kind === "disconnect") setDismissedError(null);
|
||||
try {
|
||||
const value: unknown = await action();
|
||||
if (!mounted.current || intent !== generation.current) return;
|
||||
if (!isStatus(value)) { setError(replyError(value)); return; }
|
||||
let next: ChatGPTStatus | null;
|
||||
if (request !== statusSequence.current) {
|
||||
const refresh = ++statusSequence.current;
|
||||
const current: unknown = await window.lh!.chatgpt!.status();
|
||||
if (!mounted.current || intent !== generation.current) return;
|
||||
next = refresh === statusSequence.current ? publishStatus(current) : statusRef.current;
|
||||
} else next = publishStatus(value);
|
||||
if (!next) return;
|
||||
// Dismissed status warnings belong to an earlier action. Only a new
|
||||
// disconnect outcome (or an explicit IPC error envelope above) reopens one.
|
||||
const failure = [value.error, next.error].find((message) => message && (kind === "disconnect" || message !== dismissedError)) ?? null;
|
||||
if (kind === "disconnect" && !next.accounts.some((a) => a.id === target)) {
|
||||
if (dialogRef.current === owner) {
|
||||
if (failure === REVOCATION_WARNING) showDialog({ kind: "warning" });
|
||||
else if (!failure) showDialog(null);
|
||||
}
|
||||
setError(failure);
|
||||
} else setError(failure || (kind === "disconnect" ? CONTROL_ERROR : null));
|
||||
} catch { if (mounted.current && intent === generation.current) setError(CONTROL_ERROR); }
|
||||
finally { if (intent === generation.current) { operation.current = null; if (mounted.current) setBusy(false); } }
|
||||
}
|
||||
async function login() {
|
||||
const bridge = window.lh?.chatgpt;
|
||||
const owner = dialogRef.current;
|
||||
if (!bridge || operation.current || !status.available || status.pending || owner?.kind !== "connect") return;
|
||||
const attempt: LoginAttempt = { generation: ++generation.current, dialog: owner, registration, background, backgroundDirty, pending: false, phase: "starting" };
|
||||
loginAttempt.current = attempt; operation.current = "login";
|
||||
const request = ++statusSequence.current;
|
||||
setBusy(true); setError(null); setDismissedError(null);
|
||||
try {
|
||||
let value: unknown = await bridge.login(registration || undefined);
|
||||
if (!owns(attempt) || attempt.phase === "consent") return;
|
||||
// Never publish an old acknowledgement over a newer event. If events
|
||||
// coalesced past pending before the acknowledgement arrived, read the
|
||||
// current backend state after it rather than losing that completion.
|
||||
if (request !== statusSequence.current && isStatus(value)) {
|
||||
if (value.error) { setError(value.error); finish(attempt); return; }
|
||||
attempt.pending = true; attempt.phase = "pending";
|
||||
const refresh = ++statusSequence.current;
|
||||
value = await bridge.status();
|
||||
if (!owns(attempt) || loginAttempt.current?.phase === "consent" || refresh !== statusSequence.current) return;
|
||||
}
|
||||
const next = publishStatus(value);
|
||||
if (!next) { finish(attempt); return; }
|
||||
reconcile(next, true);
|
||||
} catch { if (owns(attempt)) { setError(CONTROL_ERROR); finish(attempt); } }
|
||||
// No finally: pending OAuth outlives this IPC promise. Only its status
|
||||
// completion, failure, or explicit cancellation releases the attempt.
|
||||
}
|
||||
const bridge = typeof window !== "undefined" ? window.lh?.chatgpt : undefined;
|
||||
const context = {
|
||||
status, busy, error: warning ? null : visibleError, inlineError: dialog || warning ? null : visibleError, warning: dialog?.kind === "warning" ? null : warning,
|
||||
connect: openConnect,
|
||||
manage: (id: string) => {
|
||||
const account = statusRef.current.accounts.find((a) => a.id === id);
|
||||
if (!operation.current && account) { setError(null); showDialog({ kind: "manage", accountId: id, account }); }
|
||||
},
|
||||
select: (id: string) => { if (bridge) void control("change", () => bridge.select(id)); },
|
||||
dismissWarning: () => { setDismissedError(REVOCATION_WARNING); setError(null); },
|
||||
};
|
||||
return <Context.Provider value={context}>
|
||||
{children}
|
||||
{dialog && <AccountDialog key={`${dialog.kind}:${dialog.kind === "manage" && !!dialog.confirm}`} onClose={close} busy={busy && operation.current !== "login"}>
|
||||
<h2 className="text-sm font-semibold text-foreground">ChatGPT</h2>
|
||||
{dialog.kind === "warning" ? <>
|
||||
<p role="alert" className="rounded-sm border border-border px-3 py-2 text-xs text-foreground" data-testid="chatgpt-revocation-warning">{t(REVOCATION_WARNING)}</p>
|
||||
<div className="mt-4 flex justify-end"><Button variant="outline" size="sm" onClick={() => { context.dismissWarning(); showDialog(null); }}>{t("Dismiss")}</Button></div>
|
||||
</> : dialog.kind === "manage" && dialog.confirm ? <div data-testid="chatgpt-disconnect-confirmation">
|
||||
<p className="mt-3 text-sm font-semibold text-red-400">{t(CHATGPT_DISCONNECT_COPY.title)}</p>
|
||||
<p className="mt-3 text-xs text-foreground">{managed?.email || t("ChatGPT account")}</p>
|
||||
<p className="mt-3 text-xs text-muted-foreground">{t(CHATGPT_DISCONNECT_COPY.body)}</p>
|
||||
{context.error && <p role="alert" className="mt-3 text-xs text-red-400">{t(context.error)}</p>}
|
||||
<div className="mt-4 flex items-center justify-end gap-2">
|
||||
<Button variant="ghost" size="sm" disabled={busy} onClick={close}>{t("Cancel")}</Button>
|
||||
<Button variant="destructive" size="sm" data-testid="chatgpt-confirm-disconnect" disabled={busy || !managedPresent} onClick={() => bridge && managed && void control("disconnect", () => bridge.disconnect(managed.id), managed.id)}>{t("Disconnect account")}</Button>
|
||||
</div>
|
||||
</div> : <>
|
||||
{dialog.kind === "connect" ? <>
|
||||
{status.accounts.length > 0 && <div className="mt-3 flex items-center gap-2 text-xs text-muted-foreground">
|
||||
<select aria-label={t("Saved ChatGPT account")} value={registration} onChange={(event) => setRegistration(event.target.value)} disabled={busy || status.pending} className="min-w-0 rounded-sm border border-border bg-background px-2 py-1.5 text-foreground">
|
||||
<option value="">{t("Add another account or workspace")}</option>
|
||||
{status.accounts.map((a) => <option key={a.id} value={a.id}>{a.email || t("ChatGPT account")}</option>)}
|
||||
</select>
|
||||
{registration && <Button variant="ghost" size="xs" disabled={busy} onClick={() => context.manage(registration)}>{t("Manage…")}</Button>}
|
||||
</div>}
|
||||
<p className="mt-3 text-xs leading-relaxed text-muted-foreground" data-testid="chatgpt-privacy-notice">{t(CHATGPT_NOTICE)}</p>
|
||||
</> : null}
|
||||
<div className={`mt-4 flex items-center gap-3 text-xs text-foreground ${busy && operation.current === "change" && status.available && !status.pending ? "[&>button:disabled]:cursor-auto" : ""}`} data-testid="chatgpt-global-background">
|
||||
<Toggle label={t(BACKGROUND_LABEL)} checked={dialog.kind === "connect" ? background : status.allowBackgroundUse} disabled={busy || status.pending || !status.available} onChange={(enabled) => {
|
||||
if (dialog.kind === "connect") { setBackground(enabled); setBackgroundDirty(true); }
|
||||
else if (bridge) void control("change", () => bridge.consent(enabled));
|
||||
}} />
|
||||
<span>{t(BACKGROUND_LABEL)}<span className="mt-1 block leading-relaxed text-muted-foreground">{t(CHATGPT_BACKGROUND_HINT)}</span></span>
|
||||
</div>
|
||||
<div className="mt-3 flex flex-wrap items-center gap-3 text-xs text-muted-foreground">
|
||||
<a href="https://openai.com/policies/privacy-policy/" target="_blank" rel="noreferrer" className="underline underline-offset-2">{t("OpenAI privacy")}</a>
|
||||
<a href="https://chatgpt.com/settings/usage" target="_blank" rel="noreferrer" className="underline underline-offset-2">{t("Manage usage")}</a>
|
||||
</div>
|
||||
{!status.available && <p className="mt-3 text-xs text-muted-foreground">{t("ChatGPT sign-in is available only in the desktop app. API-key connections remain available here.")}</p>}
|
||||
{status.pending && <p role="status" className="mt-3 text-xs text-muted-foreground">{t("Waiting for browser sign-in…")}</p>}
|
||||
{context.error && <p role="alert" className="mt-3 text-xs text-red-400">{t(context.error)}</p>}
|
||||
{dialog.kind === "manage" && managed && <div className="mt-4 flex flex-wrap items-center justify-between gap-3" data-testid="chatgpt-account-strip">
|
||||
<div data-testid="chatgpt-managed-identity" className="flex min-w-0 items-center gap-2 text-xs text-foreground">
|
||||
{status.accounts.length > 1 && managedPresent && !busy ? <select aria-label={t("Manage ChatGPT account")} value={managed.id} onChange={(event) => context.manage(event.target.value)} className="min-w-0 rounded-sm border border-border bg-background px-2 py-1.5">
|
||||
{status.accounts.map((a) => <option key={a.id} value={a.id}>{a.email || t("ChatGPT account")}</option>)}
|
||||
</select> : <span className="break-all">{managed.email || t("ChatGPT account")}</span>}
|
||||
</div>
|
||||
<Button variant="ghost" size="sm" data-testid="chatgpt-add-accounts" className="cursor-pointer text-muted-foreground disabled:cursor-not-allowed" onClick={() => openConnect()} disabled={busy || status.pending || !status.available}>{t("Add accounts")}</Button>
|
||||
</div>}
|
||||
<ConnectionFooter testid="chatgpt-account-footer" leading={dialog.kind === "manage" && <div data-testid="chatgpt-account-actions">
|
||||
<Button variant="ghost" size="sm" className="cursor-pointer text-red-400 hover:bg-red-500/10 hover:text-red-300" data-testid="chatgpt-disconnect" disabled={busy || status.pending || !managedPresent} onClick={() => showDialog({ ...dialog, confirm: true })}>{t("Disconnect")}</Button>
|
||||
</div>}>
|
||||
{dialog.kind === "manage" && managedPresent && managed && !managed.connected && managed.canSignInAgain === true && status.available && <Button variant="outline" size="sm" disabled={busy || status.pending || !status.available} onClick={() => openConnect(managed.id)}>{t("Sign in again")}</Button>}
|
||||
<Button variant={dialog.kind === "manage" ? "outline" : "ghost"} size="sm" onClick={close} disabled={busy && operation.current !== "login"}>{dialog.kind === "connect" ? t("Cancel") : t("Close")}</Button>
|
||||
{dialog.kind === "connect" && <ContinueButton onClick={() => void login()} disabled={!status.available || busy || status.pending} testid="chatgpt-proceed" />}
|
||||
</ConnectionFooter>
|
||||
</>}
|
||||
</AccountDialog>}
|
||||
</Context.Provider>;
|
||||
}
|
||||
|
||||
function ContinueButton({ onClick, disabled, testid = "chatgpt-login" }: { onClick: () => void; disabled: boolean; testid?: string }) {
|
||||
const { t } = useI18n();
|
||||
return <Button type="button" variant="outline" size="sm" data-testid={testid} onClick={onClick} disabled={disabled} className="cursor-pointer disabled:cursor-not-allowed">
|
||||
{/* Official unmodified mark; existing secondary button hover/focus treatment. */}
|
||||
{/* eslint-disable-next-line @next/next/no-img-element */}
|
||||
<img src="/siwc/chatgpt-logo-white.svg" width="16" height="16" alt="" aria-hidden="true" />
|
||||
{t("Continue with ChatGPT")}</Button>;
|
||||
}
|
||||
|
||||
function AccountDialog({ children, onClose, busy }: { children: React.ReactNode; onClose: () => void; busy: boolean }) {
|
||||
const { t } = useI18n();
|
||||
return <ConnectionDialog label={t("ChatGPT account")} testid="chatgpt-account-dialog" backdropTestid="chatgpt-dialog-backdrop" onClose={onClose} busy={busy}>{children}</ConnectionDialog>;
|
||||
}
|
||||
|
||||
/** Shared compact settings/setup row; account selection precedes the quiet action. */
|
||||
export function ChatGPTConnection(_props: { setup?: boolean } = {}) {
|
||||
const { t } = useI18n();
|
||||
const ui = useContext(Context);
|
||||
const active = ui.status.accounts.find((a) => a.id === ui.status.activeId && a.connected);
|
||||
const accounts = ui.status.accounts.filter((a) => a.connected);
|
||||
return <div className="flex flex-col gap-2" data-testid="chatgpt-connection">
|
||||
<ConnectionRow label="ChatGPT" actionTestid={active ? undefined : "chatgpt-login"} action={active ? t("Manage…") : t("Connect")} disabled={!ui.status.available || ui.busy || ui.status.pending} onAction={() => active ? ui.manage(active.id) : ui.connect()}>
|
||||
{active && <select aria-label={t("ChatGPT account")} value={active.id} disabled={ui.busy || ui.status.pending} onChange={(event) => ui.select(event.target.value)} className="min-w-0 rounded-sm border border-border bg-background px-2 py-1 text-xs text-foreground">
|
||||
{accounts.map((a) => <option key={a.id} value={a.id}>{a.email || t("ChatGPT account")}</option>)}
|
||||
</select>}
|
||||
</ConnectionRow>
|
||||
{ui.inlineError && <p role="alert" className="text-xs text-red-400">{ui.inlineError}</p>}
|
||||
{ui.warning && <div role="alert" data-testid="chatgpt-revocation-warning" className="rounded-sm border border-border px-3 py-2 text-xs text-muted-foreground">{ui.warning}<button type="button" className="ml-2 cursor-pointer underline underline-offset-2" onClick={ui.dismissWarning}>{t("Dismiss")}</button></div>}
|
||||
</div>;
|
||||
}
|
||||
|
||||
/** Contextual consent discovery belongs beside background model choices only. */
|
||||
export function ChatGPTBackgroundAccess({ provider }: { provider: string | undefined }) {
|
||||
const { t } = useI18n();
|
||||
const ui = useContext(Context);
|
||||
const account: Account | undefined = ui.status.accounts.find((a) => a.id === ui.status.activeId && a.connected);
|
||||
if (provider !== "chatgpt" || !account || ui.status.allowBackgroundUse) return null;
|
||||
return <Button type="button" size="xs" variant="ghost" className="cursor-pointer" disabled={ui.busy} onClick={() => ui.manage(account.id)}>{t("Enable background use")}</Button>;
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
"use client";
|
||||
|
||||
import { useI18n } from "@/components/i18n";
|
||||
import { useEffect, useRef } from "react";
|
||||
import { createPortal } from "react-dom";
|
||||
import { useBackdropDismiss } from "@/components/backdrop-dismiss";
|
||||
import { Button } from "@/components/ui/button";
|
||||
|
||||
export function ConnectionRow({ label, action, disabled, onAction, children, testid, actionTestid }: { label: string; action: string; disabled: boolean; onAction: () => void; children?: React.ReactNode; testid?: string; actionTestid?: string }) {
|
||||
const { t } = useI18n();
|
||||
return <div className="flex flex-wrap items-center gap-3" data-testid={testid}>
|
||||
<span className="font-ui text-xs text-foreground">{label}</span>
|
||||
{children}
|
||||
<Button type="button" size="xs" variant={action === t("Connect") ? "outline" : "ghost"} className={`cursor-pointer disabled:cursor-not-allowed ${action === t("Connect") ? "" : "text-muted-foreground hover:text-foreground"}`} data-testid={actionTestid} disabled={disabled} onClick={onAction}>{action}</Button>
|
||||
</div>;
|
||||
}
|
||||
|
||||
export function ConnectionFooter({ leading, children, testid }: { leading?: React.ReactNode; children: React.ReactNode; testid?: string }) {
|
||||
return <div className="mt-4 flex flex-wrap items-center justify-between gap-3" data-testid={testid}>
|
||||
{leading}
|
||||
<div className="ml-auto flex flex-wrap items-center justify-end gap-2">{children}</div>
|
||||
</div>;
|
||||
}
|
||||
|
||||
export function ConnectionDialog({ children, onClose, busy, label, testid, backdropTestid }: { children: React.ReactNode; onClose: () => void; busy: boolean; label: string; testid: string; backdropTestid: string }) {
|
||||
const ref = useRef<HTMLDivElement>(null), closeRef = useRef(onClose);
|
||||
closeRef.current = onClose;
|
||||
const backdropDismiss = useBackdropDismiss(() => { if (!busy) onClose(); });
|
||||
useEffect(() => {
|
||||
const previous = document.activeElement as HTMLElement | null;
|
||||
const focusable = () => [...(ref.current?.querySelectorAll<HTMLElement>('button:not([disabled]), a[href], input:not([disabled]), select:not([disabled])') ?? [])];
|
||||
focusable()[0]?.focus();
|
||||
const key = (event: KeyboardEvent) => {
|
||||
if (event.key === "Escape") { event.preventDefault(); event.stopImmediatePropagation(); closeRef.current(); }
|
||||
else if (event.key === "Tab") {
|
||||
const items = focusable(), first = items[0], last = items.at(-1);
|
||||
if (!first) { event.preventDefault(); return; }
|
||||
if (event.shiftKey && (document.activeElement === first || !ref.current?.contains(document.activeElement))) { event.preventDefault(); last?.focus(); }
|
||||
else if (!event.shiftKey && (document.activeElement === last || !ref.current?.contains(document.activeElement))) { event.preventDefault(); first.focus(); }
|
||||
}
|
||||
};
|
||||
document.addEventListener("keydown", key, true);
|
||||
return () => { document.removeEventListener("keydown", key, true); if (previous?.isConnected) previous.focus(); };
|
||||
}, []);
|
||||
return createPortal(<div className="fixed inset-0 z-[60] flex items-center justify-center bg-background/80" data-testid={backdropTestid} {...backdropDismiss}>
|
||||
<div ref={ref} role="dialog" aria-modal="true" aria-label={label} aria-busy={busy} data-testid={testid} onClick={(event) => event.stopPropagation()} className="settings-dialog-pop mx-4 max-h-[85vh] w-full max-w-lg overflow-y-auto rounded-md border border-border bg-card p-5 shadow-xl">{children}</div>
|
||||
</div>, document.body);
|
||||
}
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
|
||||
import { useI18n } from "@/components/i18n";
|
||||
/**
|
||||
* Thin settings primitives (settings-app wave): the control kit the
|
||||
* settings dialog needs. Sections → groups → rows; everything SSRs clean
|
||||
@@ -25,10 +27,11 @@ export function SettingsSection({
|
||||
children: React.ReactNode;
|
||||
testid?: string;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<section data-testid={testid} className="px-6 py-5">
|
||||
<h2 className="text-sm uppercase tracking-widest text-foreground">{title}</h2>
|
||||
{hint && <p className="mt-1 text-xs text-muted-foreground">{hint}</p>}
|
||||
<h2 className="text-sm uppercase tracking-widest text-foreground">{t(title)}</h2>
|
||||
{hint && <p className="mt-1 text-xs text-muted-foreground">{t(hint)}</p>}
|
||||
<div className="mt-4 flex flex-col gap-3">{children}</div>
|
||||
</section>
|
||||
);
|
||||
@@ -45,9 +48,10 @@ export function SettingsGroup({
|
||||
children: React.ReactNode;
|
||||
testid?: string;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<div data-testid={testid} className="mt-5 border-t border-border/60 pt-4 first:mt-0 first:border-t-0 first:pt-0">
|
||||
<p className="mb-2 text-xs uppercase tracking-widest text-muted-foreground">{label}</p>
|
||||
<p className="mb-2 text-xs uppercase tracking-widest text-muted-foreground">{t(label)}</p>
|
||||
<div className="flex flex-col gap-2">{children}</div>
|
||||
</div>
|
||||
);
|
||||
@@ -61,6 +65,7 @@ export function SettingsRow({
|
||||
children,
|
||||
testid,
|
||||
dimmed,
|
||||
className,
|
||||
}: {
|
||||
label: string;
|
||||
hint?: string;
|
||||
@@ -69,12 +74,14 @@ export function SettingsRow({
|
||||
/** Dependency graying, graph-view style: the whole row dims when the
|
||||
* control is inert (parent off, no file yet, …). */
|
||||
dimmed?: boolean;
|
||||
className?: string;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<div data-testid={testid} className={cn("flex items-center justify-between gap-4 py-1", dimmed && "opacity-40")}>
|
||||
<div data-testid={testid} className={cn("flex items-center justify-between gap-4 py-1", dimmed && "opacity-40", className)}>
|
||||
<span className="min-w-0">
|
||||
<span className="block font-prose text-(length:--lh-prose-size)">{label}</span>
|
||||
{hint && <span className="block text-xs text-muted-foreground/70">{hint}</span>}
|
||||
<span className="block font-prose text-(length:--lh-prose-size)">{t(label)}</span>
|
||||
{hint && <span className="block text-xs text-muted-foreground/70">{t(hint)}</span>}
|
||||
</span>
|
||||
{children}
|
||||
</div>
|
||||
@@ -102,13 +109,14 @@ export function Toggle({
|
||||
/** Optional native tooltip on the switch. */
|
||||
title?: string;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
role="switch"
|
||||
aria-checked={checked}
|
||||
aria-label={label}
|
||||
{...(title ? { title } : {})}
|
||||
aria-label={t(label)}
|
||||
{...(title ? { title: t(title) } : {})}
|
||||
disabled={disabled}
|
||||
data-testid={`toggle-${label.toLowerCase().replace(/[^a-z0-9]+/g, "-")}`}
|
||||
onClick={() => onChange(!checked)}
|
||||
@@ -231,4 +239,4 @@ export function CommitInput({
|
||||
className="h-7 w-40 rounded-sm border border-border bg-background px-2 font-ui text-xs text-foreground outline-none placeholder:text-muted-foreground/60"
|
||||
/>
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
/**
|
||||
* The Keyboard section (thin settings wave): view / rebind / reset over
|
||||
* core/keyboard.ts's registry. The overrides persist in localStorage
|
||||
@@ -48,6 +50,7 @@ export function nextOverrides(
|
||||
}
|
||||
|
||||
export function KeyboardSection() {
|
||||
const { t } = useI18n();
|
||||
const [overrides, setOverrides] = useState<Partial<Record<KeyAction, string>>>({});
|
||||
const [rebinding, setRebinding] = useState<KeyAction | null>(null);
|
||||
const [nonce, setNonce] = useState(0);
|
||||
@@ -101,20 +104,20 @@ export function KeyboardSection() {
|
||||
if (!actions.length) return null;
|
||||
return (
|
||||
<div key={scope} data-testid={`kbd-scope-${scope}`}>
|
||||
<p className="mb-1 text-xs uppercase tracking-widest text-muted-foreground/70">{label}</p>
|
||||
<p className="mb-1 text-xs uppercase tracking-widest text-muted-foreground/70">{t(label)}</p>
|
||||
<div className="flex flex-col gap-2">
|
||||
{actions.map((def) => {
|
||||
const effective = overrides[def.id] ?? def.binding;
|
||||
return (
|
||||
<SettingsRow
|
||||
key={def.id}
|
||||
label={def.label}
|
||||
hint={def.displayOnly ? "Fixed — part of this screen" : undefined}
|
||||
label={t(def.label)}
|
||||
hint={def.displayOnly ? t("Fixed — part of this screen") : undefined}
|
||||
testid={`kbd-row-${def.id}`}
|
||||
>
|
||||
<span className="flex items-center gap-2">
|
||||
<kbd className="rounded-sm border border-border bg-muted px-1.5 py-0.5 font-ui text-xs">
|
||||
{rebinding === def.id ? "Press keys…" : formatBinding(effective)}
|
||||
{rebinding === def.id ? t("Press keys…") : t(formatBinding(effective))}
|
||||
</kbd>
|
||||
{def.displayOnly ? null : rebinding === def.id ? (
|
||||
<button
|
||||
@@ -122,8 +125,7 @@ export function KeyboardSection() {
|
||||
onClick={() => setRebinding(null)}
|
||||
className="text-xs text-muted-foreground/70 underline-offset-2 hover:text-foreground hover:underline"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
{t("Cancel")}</button>
|
||||
) : (
|
||||
<>
|
||||
<button
|
||||
@@ -132,8 +134,7 @@ export function KeyboardSection() {
|
||||
data-testid={`kbd-rebind-${def.id}`}
|
||||
className="text-xs text-muted-foreground underline-offset-2 hover:text-foreground hover:underline"
|
||||
>
|
||||
Rebind
|
||||
</button>
|
||||
{t("Rebind")}</button>
|
||||
{overridden(def.id) && (
|
||||
<button
|
||||
type="button"
|
||||
@@ -141,8 +142,7 @@ export function KeyboardSection() {
|
||||
data-testid={`kbd-reset-${def.id}`}
|
||||
className="text-xs text-muted-foreground/70 underline-offset-2 hover:text-foreground hover:underline"
|
||||
>
|
||||
Reset
|
||||
</button>
|
||||
{t("Reset")}</button>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
@@ -155,15 +155,14 @@ export function KeyboardSection() {
|
||||
);
|
||||
})}
|
||||
<div className="mt-1 flex items-center justify-between">
|
||||
<span className="text-xs text-muted-foreground/70">Stored on this device (lh:keymap) — overrides only.</span>
|
||||
<span className="text-xs text-muted-foreground/70">{t("Stored on this device (lh:keymap) — overrides only.")}</span>
|
||||
<button
|
||||
type="button"
|
||||
onClick={resetAll}
|
||||
data-testid="kbd-reset-all"
|
||||
className="text-xs text-muted-foreground underline-offset-2 hover:text-foreground hover:underline"
|
||||
>
|
||||
Reset all to defaults
|
||||
</button>
|
||||
{t("Reset all to defaults")}</button>
|
||||
</div>
|
||||
</>
|
||||
);
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
"use client";
|
||||
import { translator, type Translator } from "@/src/core";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
/**
|
||||
* The Keys section (wave-5 polish, 2026-09-21 — owner design): a MINIMAL
|
||||
* key-value table. Provider left, masked key right, no description hints
|
||||
@@ -15,8 +18,8 @@
|
||||
* a paste box on a key the UI cannot make live would mislead.
|
||||
* - OpenRouter is NOT special: one provider among 33, a row only when
|
||||
* stored, otherwise it lives in the Add dropdown like everyone else.
|
||||
* - Tools & services (Deepgram, the Google pair) keep their own group,
|
||||
* same look, same interaction.
|
||||
* - Providers groups API keys, subscriptions, dictation and search.
|
||||
* Unknown variables stay masked/read-only at the end of Model API keys.
|
||||
*
|
||||
* API: GET /api/keys (masked statuses + the providers array), PUT
|
||||
* /api/keys/:id (shape-gated 400s land inline), DELETE. Saves take
|
||||
@@ -26,6 +29,7 @@
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { AUTH_KEYS, type AuthKeyStatus } from "@/src/core";
|
||||
import { SettingsGroup } from "./controls.tsx";
|
||||
import { SubscriptionConnections } from "./subscription-connections.tsx";
|
||||
import { ProviderMenuList } from "./model-menu.tsx";
|
||||
import { MenuShell } from "@/components/menu-shell";
|
||||
import { notifySettingsSaved } from "@/components/settings-signal";
|
||||
@@ -97,11 +101,11 @@ export function classifyKeys(
|
||||
|
||||
/** The minimal status line, e.g. "…ab12 · 64 chars" (" · env" marks an
|
||||
* environment-owned value — the row itself is read-only then). Pure. */
|
||||
export function keyStatusLine(status: AuthKeyStatus): string {
|
||||
if (!status.present || !status.masked) return "not set";
|
||||
export function keyStatusLine(status: AuthKeyStatus, t: Translator = translator("en")): string {
|
||||
if (!status.present || !status.masked) return t("not set");
|
||||
const tail = status.masked.replace(/ \((\d+) chars\)$/, "");
|
||||
const chars = status.masked.match(/\((\d+) chars\)$/)?.[1] ?? "?";
|
||||
return `${tail} · ${chars}${status.source === "env" ? " · env" : ""}`;
|
||||
return `${tail} · ${chars}${status.source === "env" ? t(" · env") : ""}`;
|
||||
}
|
||||
|
||||
/** One table row: label left, tiny docs link + status right. Writable
|
||||
@@ -131,6 +135,7 @@ function KeyTableRow({
|
||||
onCancel: () => void;
|
||||
testid: string;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const envOwned = status.source === "env";
|
||||
const [value, setValue] = useState("");
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
@@ -162,8 +167,8 @@ function KeyTableRow({
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === "Enter") void save();
|
||||
}}
|
||||
placeholder="Paste key…"
|
||||
aria-label={`${label} key`}
|
||||
placeholder={t("Paste key…")}
|
||||
aria-label={t("{v0} key", { v0: label })}
|
||||
data-testid={`${testid}-input`}
|
||||
disabled={busy}
|
||||
autoFocus
|
||||
@@ -176,8 +181,7 @@ function KeyTableRow({
|
||||
data-testid={`${testid}-save`}
|
||||
className="shrink-0 text-xs text-foreground underline-offset-2 hover:underline disabled:text-muted-foreground/40 disabled:no-underline"
|
||||
>
|
||||
Save
|
||||
</button>
|
||||
{t("Save")}</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={onCancel}
|
||||
@@ -185,8 +189,7 @@ function KeyTableRow({
|
||||
data-testid={`${testid}-cancel`}
|
||||
className="shrink-0 text-xs text-muted-foreground/70 underline-offset-2 hover:text-foreground hover:underline"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
{t("Cancel")}</button>
|
||||
{status.present && status.source === "file" && onDelete && (
|
||||
<button
|
||||
type="button"
|
||||
@@ -195,13 +198,12 @@ function KeyTableRow({
|
||||
data-testid={`${testid}-delete`}
|
||||
className="shrink-0 text-xs text-muted-foreground/70 underline-offset-2 hover:text-red-500 hover:underline"
|
||||
>
|
||||
Delete
|
||||
</button>
|
||||
{t("Delete")}</button>
|
||||
)}
|
||||
</div>
|
||||
{error && (
|
||||
<p role="alert" data-testid={`${testid}-error`} className="px-1 text-xs text-red-500">
|
||||
{error}
|
||||
{t(error)}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
@@ -229,17 +231,16 @@ function KeyTableRow({
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
className="text-[10px] text-muted-foreground/60 underline-offset-2 hover:text-foreground hover:underline"
|
||||
>
|
||||
key ↗
|
||||
</a>
|
||||
{t("key ↗")}</a>
|
||||
)}
|
||||
<span data-testid={`${testid}-status`} className="font-mono text-[11px] text-muted-foreground">
|
||||
{keyStatusLine(status)}
|
||||
{keyStatusLine(status, t)}
|
||||
</span>
|
||||
</span>
|
||||
</button>
|
||||
{error && (
|
||||
<p role="alert" data-testid={`${testid}-error`} className="pl-6 text-xs text-red-500">
|
||||
{error}
|
||||
{t(error)}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
@@ -255,6 +256,7 @@ function AddProviderRow({
|
||||
addable: ProviderKeyInfo[];
|
||||
onPick: (p: ProviderKeyInfo) => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const [open, setOpen] = useState(false);
|
||||
const anchorRef = useRef<HTMLDivElement>(null);
|
||||
|
||||
@@ -289,7 +291,7 @@ function AddProviderRow({
|
||||
onClick={() => setOpen((v) => !v)}
|
||||
className="flex w-full items-center justify-between gap-3 rounded-sm px-1 py-1.5 text-left font-ui text-xs text-muted-foreground transition-colors hover:bg-accent/50 hover:text-foreground"
|
||||
>
|
||||
<span>+ Add provider key</span>
|
||||
<span>{t("+ Add provider key")}</span>
|
||||
{addable.length > 0 && <span className="font-mono text-[11px]">{addable.length}</span>}
|
||||
</button>
|
||||
{open && (
|
||||
@@ -323,6 +325,7 @@ export function KeysSection({
|
||||
}: {
|
||||
initialRow?: string;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const [statuses, setStatuses] = useState<AuthKeyStatus[] | null>(null);
|
||||
const [providers, setProviders] = useState<ProviderKeyInfo[] | undefined>(undefined);
|
||||
const [loading, setLoading] = useState(true);
|
||||
@@ -332,6 +335,7 @@ export function KeysSection({
|
||||
/** The paste editor for a freshly chosen Add-provider target. */
|
||||
const [adding, setAdding] = useState<ProviderKeyInfo | null>(null);
|
||||
const [addError, setAddError] = useState<string | null>(null);
|
||||
const followedProvider = useRef<string | null>(null);
|
||||
|
||||
// Escape folds any open editor (unfolded row or the Add-provider paste)
|
||||
// WITHOUT closing the dialog. Claimed at document CAPTURE phase — the
|
||||
@@ -369,7 +373,17 @@ export function KeysSection({
|
||||
// named row; a fresh mount seeds it via the useState initializer.
|
||||
useEffect(() => {
|
||||
if (initialRow !== undefined) setOpenRow(initialRow);
|
||||
followedProvider.current = null;
|
||||
}, [initialRow]);
|
||||
// A missing model-provider key has no table row yet. Deep-link into the
|
||||
// existing Add-provider editor instead (for example, OpenRouter STT setup).
|
||||
useEffect(() => {
|
||||
if (!initialRow || !statuses || !providers || followedProvider.current === initialRow) return;
|
||||
followedProvider.current = initialRow;
|
||||
if (statuses.some((status) => status.id === initialRow)) return;
|
||||
const provider = providers.find((provider) => provider.envVar === initialRow);
|
||||
if (provider) { setAdding(provider); setAddError(null); setOpenRow(null); }
|
||||
}, [initialRow, statuses, providers]);
|
||||
|
||||
async function saveKey(id: string, value: string): Promise<string | null> {
|
||||
const res = await fetch(`/api/keys/${id}`, {
|
||||
@@ -396,7 +410,7 @@ export function KeysSection({
|
||||
}
|
||||
|
||||
if (loading || statuses === null) {
|
||||
return <p className="px-6 py-5 text-xs text-muted-foreground/70">Loading keys…</p>;
|
||||
return <p className="px-6 py-5 text-xs text-muted-foreground/70">{t("Loading keys…")}</p>;
|
||||
}
|
||||
|
||||
const { providerRows, toolRows, unknownRows, addable } = classifyKeys(statuses, providers);
|
||||
@@ -412,7 +426,7 @@ export function KeysSection({
|
||||
|
||||
return (
|
||||
<>
|
||||
<SettingsGroup label="Model providers" testid="group-provider-keys">
|
||||
<SettingsGroup label={t("Model API keys")} testid="group-provider-keys">
|
||||
{providerRows.map((status) => (
|
||||
<KeyTableRow
|
||||
key={status.id}
|
||||
@@ -446,10 +460,20 @@ export function KeysSection({
|
||||
<AddProviderEditor provider={adding} onSave={(v) => void saveNewProvider(adding, v)} onCancel={() => setAdding(null)} error={addError} />
|
||||
</div>
|
||||
)}
|
||||
{unknownRows.length > 0 && <div data-testid="group-unknown-keys">
|
||||
{unknownRows.map((status) => <div key={status.id} data-testid={`unknown-${status.id}`} className="flex items-center justify-between gap-3 px-1 py-1.5 opacity-40">
|
||||
<span className="font-mono text-xs text-foreground">{status.id}</span>
|
||||
<span className="font-mono text-[11px] text-muted-foreground">{status.masked}</span>
|
||||
</div>)}
|
||||
</div>}
|
||||
</SettingsGroup>
|
||||
|
||||
<SettingsGroup label="Tools & services" testid="group-tool-keys">
|
||||
{toolRows.map((status) => (
|
||||
<SettingsGroup label={t("Subscriptions")} testid="group-subscriptions">
|
||||
<SubscriptionConnections />
|
||||
</SettingsGroup>
|
||||
|
||||
{(["Dictation", "Search"] as const).map((label) => <SettingsGroup key={label} label={label} testid={label === "Dictation" ? "group-dictation" : "group-search"}>
|
||||
{toolRows.filter((status) => label === "Dictation" ? status.id === "DEEPGRAM_API_KEY" : status.id !== "DEEPGRAM_API_KEY").map((status) => (
|
||||
<KeyTableRow
|
||||
key={status.id}
|
||||
label={status.info?.label ?? status.id}
|
||||
@@ -467,22 +491,8 @@ export function KeysSection({
|
||||
testid={`key-${status.id.toLowerCase()}`}
|
||||
/>
|
||||
))}
|
||||
</SettingsGroup>
|
||||
</SettingsGroup>)}
|
||||
|
||||
{unknownRows.length > 0 && (
|
||||
<SettingsGroup label="Other stored variables" testid="group-unknown-keys">
|
||||
{unknownRows.map((status) => (
|
||||
<div
|
||||
key={status.id}
|
||||
data-testid={`unknown-${status.id}`}
|
||||
className="flex items-center justify-between gap-3 px-1 py-1.5 opacity-40"
|
||||
>
|
||||
<span className="font-mono text-xs text-foreground">{status.id}</span>
|
||||
<span className="font-mono text-[11px] text-muted-foreground">{status.masked}</span>
|
||||
</div>
|
||||
))}
|
||||
</SettingsGroup>
|
||||
)}
|
||||
</>
|
||||
);
|
||||
}
|
||||
@@ -500,6 +510,7 @@ function AddProviderEditor({
|
||||
onCancel: () => void;
|
||||
error: string | null;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const [value, setValue] = useState("");
|
||||
return (
|
||||
<>
|
||||
@@ -510,8 +521,8 @@ function AddProviderEditor({
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === "Enter" && value.trim()) onSave(value);
|
||||
}}
|
||||
placeholder="Paste key…"
|
||||
aria-label={`${provider.label} key`}
|
||||
placeholder={t("Paste key…")}
|
||||
aria-label={t("{v0} key", { v0: provider.label })}
|
||||
data-testid={`key-${provider.id}-input`}
|
||||
autoFocus
|
||||
className="h-7 min-w-0 flex-1 rounded-sm border border-border bg-background px-1.5 font-mono text-xs text-foreground outline-none placeholder:text-muted-foreground/60 focus:border-muted-foreground/50"
|
||||
@@ -523,19 +534,17 @@ function AddProviderEditor({
|
||||
data-testid={`key-${provider.id}-save`}
|
||||
className="shrink-0 text-xs text-foreground underline-offset-2 hover:underline disabled:text-muted-foreground/40 disabled:no-underline"
|
||||
>
|
||||
Save
|
||||
</button>
|
||||
{t("Save")}</button>
|
||||
<button
|
||||
type="button"
|
||||
onClick={onCancel}
|
||||
data-testid={`key-${provider.id}-cancel`}
|
||||
className="shrink-0 text-xs text-muted-foreground/70 underline-offset-2 hover:text-foreground hover:underline"
|
||||
>
|
||||
Cancel
|
||||
</button>
|
||||
{t("Cancel")}</button>
|
||||
{error && (
|
||||
<p role="alert" className="w-full pl-0 text-xs text-red-500" data-testid={`key-${provider.id}-error`}>
|
||||
{error}
|
||||
{t(error)}
|
||||
</p>
|
||||
)}
|
||||
</>
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
/**
|
||||
* The model menu (extracted 2026-09-20 from model-picker.tsx, owner ask:
|
||||
* the agent settings' role selects use the EXACT same dropdown as the
|
||||
@@ -21,7 +23,7 @@
|
||||
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import type { ModelCatalogEntry } from "@/src/core";
|
||||
import { fuzzyScore } from "@/src/core";
|
||||
import { fuzzyScore, subscriptionLabel } from "@/src/core";
|
||||
import { formatTokens } from "@/components/usage-format";
|
||||
|
||||
function priceLabel(cost: ModelCatalogEntry["cost"]): string {
|
||||
@@ -53,6 +55,7 @@ export function ModelMenuList({
|
||||
/** Quiet footer note under the list (context-specific). */
|
||||
footer?: string;
|
||||
}) {
|
||||
const { t, language } = useI18n();
|
||||
const [query, setQuery] = useState("");
|
||||
const [menuIdx, setMenuIdx] = useState<number | null>(null);
|
||||
const searchRef = useRef<HTMLInputElement>(null);
|
||||
@@ -104,12 +107,12 @@ export function ModelMenuList({
|
||||
}
|
||||
}
|
||||
}}
|
||||
placeholder="Search models…"
|
||||
placeholder={t("Search models…")}
|
||||
className="lh-input mb-1.5 w-full rounded-lg border bg-background px-2 py-1.5 text-foreground outline-none focus:ring-1 focus:ring-ring"
|
||||
/>
|
||||
{!models && <div className="px-2 py-3 text-center text-muted-foreground">Loading models…</div>}
|
||||
{!models && <div className="px-2 py-3 text-center text-muted-foreground">{t("Loading models…")}</div>}
|
||||
{models && results.length === 0 && (
|
||||
<div className="px-2 py-3 text-center text-muted-foreground">No models match.</div>
|
||||
<div className="px-2 py-3 text-center text-muted-foreground">{t("No models match.")}</div>
|
||||
)}
|
||||
<ul ref={listRef} data-testid="model-list" className="flex max-h-72 flex-col overflow-y-auto px-1">
|
||||
{results.map((m, i) => (
|
||||
@@ -125,13 +128,13 @@ export function ModelMenuList({
|
||||
>
|
||||
<span className="flex items-center justify-between gap-2">
|
||||
<span className="truncate text-card-foreground">{m.name}</span>
|
||||
<span className="shrink-0 tabular-nums text-muted-foreground" title="USD per 1M tokens in/out">
|
||||
{priceLabel(m.cost)}
|
||||
<span className="shrink-0 tabular-nums text-muted-foreground" title={subscriptionLabel(`${m.provider}:${m.id}`) ? t("Subscription connection") : t("USD per 1M tokens in/out")}>
|
||||
{subscriptionLabel(`${m.provider}:${m.id}`) ?? priceLabel(m.cost)}
|
||||
</span>
|
||||
</span>
|
||||
<span className="flex items-center justify-between gap-2 text-muted-foreground">
|
||||
<span className="truncate">{m.provider} · {m.id}</span>
|
||||
<span className="shrink-0 tabular-nums">{formatTokens(m.contextWindow)}</span>
|
||||
<span className="truncate">{subscriptionLabel(`${m.provider}:${m.id}`) ? t("{v0} (subscription)", { v0: subscriptionLabel(`${m.provider}:${m.id}`) }) : m.provider} · {m.id}</span>
|
||||
<span className="shrink-0 tabular-nums">{formatTokens(m.contextWindow, language)}</span>
|
||||
</span>
|
||||
</button>
|
||||
</li>
|
||||
@@ -160,22 +163,23 @@ export function ThinkingMenuList({
|
||||
empty?: string;
|
||||
footer?: string;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<>
|
||||
{levels.length === 0 ? (
|
||||
<div className="px-2 py-3 text-center text-muted-foreground">{empty ?? "No thinking levels."}</div>
|
||||
<div className="px-2 py-3 text-center text-muted-foreground">{empty ?? t("No thinking levels.")}</div>
|
||||
) : (
|
||||
levels.map((level) => (
|
||||
<button
|
||||
key={level}
|
||||
key={t(level)}
|
||||
type="button"
|
||||
data-testid={`thinking-option-${level}`}
|
||||
data-testid={`thinking-option-${t(level)}`}
|
||||
onClick={() => onPick(level)}
|
||||
className={`flex items-center justify-between rounded-lg px-2 py-1.5 text-left transition-colors hover:bg-muted ${
|
||||
level === effectiveLevel ? "bg-muted/60 text-card-foreground" : "text-card-foreground"
|
||||
}`}
|
||||
>
|
||||
<span>{level}</span>
|
||||
<span>{t(level)}</span>
|
||||
{level === effectiveLevel && <span aria-hidden>✓</span>}
|
||||
</button>
|
||||
))
|
||||
@@ -199,6 +203,7 @@ export function ProviderMenuList({
|
||||
providers: { id: string; envVar: string; label: string }[];
|
||||
onPick: (provider: { id: string; envVar: string; label: string }) => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const [query, setQuery] = useState("");
|
||||
const [menuIdx, setMenuIdx] = useState<number | null>(null);
|
||||
const searchRef = useRef<HTMLInputElement>(null);
|
||||
@@ -248,11 +253,11 @@ export function ProviderMenuList({
|
||||
}
|
||||
}
|
||||
}}
|
||||
placeholder="Search providers…"
|
||||
placeholder={t("Search providers…")}
|
||||
className="lh-input mb-1.5 w-full rounded-lg border bg-background px-2 py-1.5 text-foreground outline-none focus:ring-1 focus:ring-ring"
|
||||
/>
|
||||
{results.length === 0 && (
|
||||
<div className="px-2 py-3 text-center text-muted-foreground">No providers match.</div>
|
||||
<div className="px-2 py-3 text-center text-muted-foreground">{t("No providers match.")}</div>
|
||||
)}
|
||||
<ul ref={listRef} data-testid="provider-list" className="flex max-h-72 flex-col overflow-y-auto px-1">
|
||||
{results.map((p, i) => (
|
||||
@@ -283,7 +288,7 @@ export function ProviderMenuList({
|
||||
* with the default first and a searched list drops it honestly — Enter
|
||||
* can never pick a row that isn't on screen. Pure — exported for
|
||||
* tests. */
|
||||
export function fontMenuResults(query: string, families: string[]): Array<string | null> {
|
||||
export function fontMenuResults(query: string, families: string[], defaultFamily = "Source Sans 3"): Array<string | null> {
|
||||
const scored = families
|
||||
.map((f) => ({ f, s: fuzzyScore(query, f) }))
|
||||
.filter((r) => r.s !== null)
|
||||
@@ -291,7 +296,7 @@ export function fontMenuResults(query: string, families: string[]): Array<string
|
||||
.map((r) => r.f);
|
||||
// The default row's searchable identity: the factory family + the
|
||||
// word "default" (the suffix it renders with).
|
||||
const defaultScore = fuzzyScore(query, "Source Sans 3", "default");
|
||||
const defaultScore = fuzzyScore(query, defaultFamily, "default");
|
||||
if (query.trim() === "" || defaultScore !== null) return [null, ...scored];
|
||||
return scored;
|
||||
}
|
||||
@@ -300,10 +305,10 @@ export function fontMenuResults(query: string, families: string[]): Array<string
|
||||
* query that matches NO family becomes the "Use '<query>'" custom pick —
|
||||
* a matching family is the better pick, so the action row only exists
|
||||
* when there is nothing else to pick. Exported for tests. */
|
||||
export function customFamilyFor(query: string, families: string[]): string | null {
|
||||
export function customFamilyFor(query: string, families: string[], defaultFamily = "Source Sans 3"): string | null {
|
||||
const trimmed = query.trim();
|
||||
if (trimmed === "") return null;
|
||||
return fontMenuResults(query, families).length === 0 ? trimmed : null;
|
||||
return fontMenuResults(query, families, defaultFamily).length === 0 ? trimmed : null;
|
||||
}
|
||||
|
||||
/** The reading-font dropdown body — ONE search field (owner ask
|
||||
@@ -329,6 +334,7 @@ export function FontMenuList({
|
||||
/** Quiet footer note under the list. */
|
||||
footer?: string;
|
||||
}) {
|
||||
const { t, language } = useI18n();
|
||||
const [query, setQuery] = useState("");
|
||||
const [menuIdx, setMenuIdx] = useState<number | null>(null);
|
||||
const searchRef = useRef<HTMLInputElement>(null);
|
||||
@@ -343,10 +349,11 @@ export function FontMenuList({
|
||||
listRef.current?.querySelector(`[data-idx="${menuIdx}"]`)?.scrollIntoView({ block: "nearest" });
|
||||
}, [menuIdx]);
|
||||
|
||||
const results = fontMenuResults(query, families ?? []);
|
||||
const defaultFamily = language === "ru" ? "Noto Sans" : "Source Sans 3";
|
||||
const results = fontMenuResults(query, families ?? [], defaultFamily);
|
||||
// The custom-family action row: only when a typed query matches
|
||||
// nothing (a matching family is the better pick). Enter picks it.
|
||||
const customFamily = customFamilyFor(query, families ?? []);
|
||||
const customFamily = customFamilyFor(query, families ?? [], defaultFamily);
|
||||
const walkable: Array<string | null> = customFamily !== null ? ["__custom__"] : results;
|
||||
|
||||
return (
|
||||
@@ -378,10 +385,10 @@ export function FontMenuList({
|
||||
}
|
||||
}
|
||||
}}
|
||||
placeholder="Search fonts…"
|
||||
placeholder={t("Search fonts…")}
|
||||
className="lh-input mb-1.5 w-full rounded-lg border bg-background px-2 py-1.5 text-foreground outline-none focus:ring-1 focus:ring-ring"
|
||||
/>
|
||||
{!families && <div className="px-2 py-3 text-center text-muted-foreground">Loading fonts…</div>}
|
||||
{!families && <div className="px-2 py-3 text-center text-muted-foreground">{t("Loading fonts…")}</div>}
|
||||
<ul ref={listRef} data-testid="font-list" className="flex max-h-72 flex-col overflow-y-auto px-1">
|
||||
{families &&
|
||||
results.map((family, i) => {
|
||||
@@ -398,7 +405,7 @@ export function FontMenuList({
|
||||
i === menuIdx ? "bg-accent/40 ring-1 ring-inset ring-border" : ""
|
||||
}${effective && i !== menuIdx ? " bg-muted/60" : ""}`}
|
||||
>
|
||||
<span className="truncate text-card-foreground">{family ?? "Source Sans 3"}</span>
|
||||
<span className="truncate text-card-foreground">{family ?? (language === "ru" ? "Noto Sans" : "Source Sans 3")}</span>
|
||||
<span className="shrink-0 text-muted-foreground">{isDefault ? "default" : effective && <span aria-hidden>✓</span>}</span>
|
||||
</button>
|
||||
</li>
|
||||
@@ -415,8 +422,8 @@ export function FontMenuList({
|
||||
menuIdx === 0 ? "bg-accent/40 ring-1 ring-inset ring-border" : ""
|
||||
}`}
|
||||
>
|
||||
<span className="truncate text-card-foreground">Use “{customFamily}”</span>
|
||||
<span className="shrink-0 text-muted-foreground">custom</span>
|
||||
<span className="truncate text-card-foreground">{t("Use “")}{customFamily}”</span>
|
||||
<span className="shrink-0 text-muted-foreground">{t("custom")}</span>
|
||||
</button>
|
||||
</li>
|
||||
)}
|
||||
|
||||
@@ -39,6 +39,7 @@ import {
|
||||
type GraphSettings,
|
||||
type UserSettings,
|
||||
} from "@/src/core";
|
||||
import { LanguageSelect, SttModelSelect, SttPreferredLanguages, useI18n } from "@/components/i18n";
|
||||
import { useAppearance } from "./appearance.tsx";
|
||||
import { SettingsSection, SettingsRow, Toggle } from "./controls.tsx";
|
||||
import { AgentSection } from "./agent-section.tsx";
|
||||
@@ -49,17 +50,20 @@ import { KeysSection } from "./keys-section.tsx";
|
||||
import { Hint } from "@/components/ui/hint";
|
||||
import { AppearanceSection, GraphSection } from "./appearance-section.tsx";
|
||||
import { KeyboardSection } from "./keyboard-section.tsx";
|
||||
import { ChatGPTUIProvider } from "./chatgpt-connection.tsx";
|
||||
import { NativeSubscriptionUIProvider } from "./subscription-connections.tsx";
|
||||
|
||||
/** Owner (2026-09-20): hints earn their place — mechanics-explaining
|
||||
* prose is out; only the keyboard note stays (storage location is a
|
||||
* real question users ask). */
|
||||
const SECTIONS = [
|
||||
{ id: "general", label: "General" },
|
||||
{ id: "keys", label: "Keys" },
|
||||
{ id: "keys", label: "Providers" },
|
||||
{ id: "agent", label: "Agent" },
|
||||
{ id: "appearance", label: "Appearance" },
|
||||
{ id: "graph", label: "Graph" },
|
||||
{ id: "keyboard", label: "Keyboard", hint: "Stored on this device" },
|
||||
{ id: "stt", label: "Speech recognition" },
|
||||
{ id: "general", label: "General" },
|
||||
] as const;
|
||||
type SectionId = (typeof SECTIONS)[number]["id"];
|
||||
|
||||
@@ -83,20 +87,20 @@ export function SettingsDialogProvider({
|
||||
children: React.ReactNode;
|
||||
}) {
|
||||
const [show, setShow] = useState(false);
|
||||
const [landOn, setLandOn] = useState<SectionId>("general");
|
||||
const [landOn, setLandOn] = useState<SectionId>("keys");
|
||||
const [landOnRow, setLandOnRow] = useState<string | null>(null);
|
||||
const open = useCallback((section?: string, row?: string) => {
|
||||
if (section) setLandOn(section as SectionId);
|
||||
setLandOn(section ? section as SectionId : "keys");
|
||||
setLandOnRow(row ?? null);
|
||||
setShow(true);
|
||||
}, []);
|
||||
return (
|
||||
<DialogContext.Provider value={{ open }}>
|
||||
<ChatGPTUIProvider><NativeSubscriptionUIProvider><DialogContext.Provider value={{ open }}>
|
||||
{children}
|
||||
{show && (
|
||||
<SettingsDialog onClose={() => setShow(false)} initialSection={landOn} initialRow={landOnRow} />
|
||||
)}
|
||||
</DialogContext.Provider>
|
||||
</DialogContext.Provider></NativeSubscriptionUIProvider></ChatGPTUIProvider>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -133,7 +137,7 @@ function SettingsDialog({
|
||||
* (portals render nothing under renderToStaticMarkup). */
|
||||
export function SettingsDialogBody({
|
||||
onClose,
|
||||
initialSection = "general",
|
||||
initialSection = "keys",
|
||||
initialRow = null,
|
||||
}: {
|
||||
onClose: () => void;
|
||||
@@ -142,6 +146,7 @@ export function SettingsDialogBody({
|
||||
* retargets follow it exactly like initialSection below. */
|
||||
initialRow?: string | null;
|
||||
}) {
|
||||
const { t, general, saveGeneral } = useI18n();
|
||||
const { onAppearanceChange } = useAppearance();
|
||||
const [record, setRecord] = useState<UserSettings | null | undefined>(
|
||||
undefined,
|
||||
@@ -230,6 +235,10 @@ export function SettingsDialogBody({
|
||||
body: object,
|
||||
) => {
|
||||
setError(null);
|
||||
if (section === "general") {
|
||||
try { await saveGeneral(body); } catch (error) { setError(error instanceof Error ? error.message : "Could not save language settings"); }
|
||||
return;
|
||||
}
|
||||
const res = await fetch(`/api/settings/${section}`, {
|
||||
method: "PUT",
|
||||
headers: { "content-type": "application/json" },
|
||||
@@ -258,30 +267,30 @@ export function SettingsDialogBody({
|
||||
if (section === "appearance")
|
||||
onAppearanceChange(body as AppearanceSettings);
|
||||
},
|
||||
[onAppearanceChange],
|
||||
[onAppearanceChange, saveGeneral, t],
|
||||
);
|
||||
|
||||
return (
|
||||
<div
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-label="Settings"
|
||||
aria-label={t("Settings")}
|
||||
data-testid="settings-dialog"
|
||||
className="settings-dialog-pop flex h-[620px] max-h-[85vh] w-[920px] max-w-[90vw] flex-col overflow-hidden rounded-md border border-border bg-card shadow-xl"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
>
|
||||
{/* Header — the app's quiet CMU title language. */}
|
||||
<header className="flex h-15 shrink-0 items-center gap-3 border-b border-border px-5">
|
||||
<h2 className="font-title text-2xl tracking-tight">Settings</h2>
|
||||
<h2 className="font-title text-2xl tracking-tight">{t("Settings")}</h2>
|
||||
<Hint
|
||||
// Esc closes the dialog (its own listener) — surface it.
|
||||
label="Close"
|
||||
label={t("Close")}
|
||||
binding="escape"
|
||||
side="left"
|
||||
>
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Close settings"
|
||||
aria-label={t("Close settings")}
|
||||
data-testid="settings-close"
|
||||
className="ml-auto size-7 rounded-sm text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
|
||||
onClick={onClose}
|
||||
@@ -303,7 +312,7 @@ export function SettingsDialogBody({
|
||||
{/* Left nav — text-only, the session-list mono language,
|
||||
active = bg-accent. */}
|
||||
<nav
|
||||
aria-label="Settings sections"
|
||||
aria-label={t("Settings sections")}
|
||||
data-testid="settings-nav"
|
||||
className="flex w-44 shrink-0 flex-col gap-1 border-r border-border p-2"
|
||||
>
|
||||
@@ -320,7 +329,7 @@ export function SettingsDialogBody({
|
||||
}`}
|
||||
onClick={() => setActive(s.id)}
|
||||
>
|
||||
{s.label}
|
||||
{t(s.label)}
|
||||
</button>
|
||||
))}
|
||||
</nav>
|
||||
@@ -342,32 +351,31 @@ export function SettingsDialogBody({
|
||||
className="m-4 rounded-sm border border-red-500/40 px-3 py-2 text-xs text-red-500"
|
||||
data-testid="settings-error"
|
||||
>
|
||||
{error}
|
||||
{t(error)}
|
||||
</p>
|
||||
)}
|
||||
{record === undefined ? (
|
||||
<p className="px-6 py-5 text-xs text-muted-foreground/70">
|
||||
Loading settings…
|
||||
</p>
|
||||
{t("Loading settings…")}</p>
|
||||
) : record === null ? (
|
||||
<p className="px-6 py-5 text-xs text-muted-foreground/70">
|
||||
Settings could not be loaded — refresh to retry.
|
||||
</p>
|
||||
{t("Settings could not be loaded — refresh to retry.")}</p>
|
||||
) : (
|
||||
<div>
|
||||
{active === "general" && (
|
||||
<SettingsSection
|
||||
title="General"
|
||||
title={t("General")}
|
||||
testid="section-general"
|
||||
>
|
||||
<SettingsRow label={t("Interface language")} testid="row-language"><LanguageSelect field="language" /></SettingsRow>
|
||||
<SettingsRow
|
||||
label="Auto-update"
|
||||
label={t("Auto-update")}
|
||||
hint={AUTO_UPDATE_HINT}
|
||||
testid="row-auto-update"
|
||||
>
|
||||
<Toggle
|
||||
checked={record.general?.autoUpdate ?? true}
|
||||
label="auto update"
|
||||
checked={general.autoUpdate ?? true}
|
||||
label={t("auto update")}
|
||||
onChange={(on) =>
|
||||
void write("general", { autoUpdate: on })
|
||||
}
|
||||
@@ -375,14 +383,23 @@ export function SettingsDialogBody({
|
||||
</SettingsRow>
|
||||
</SettingsSection>
|
||||
)}
|
||||
{active === "stt" && (
|
||||
<SettingsSection title={t("Speech recognition")} testid="section-stt">
|
||||
<SettingsRow label={t("Speech recognition model")} testid="row-stt-model" className="flex-wrap items-start gap-y-2 [&>span:first-child]:flex-[1_1_12rem]"><SttModelSelect /></SettingsRow>
|
||||
<SettingsRow label={t("Speech recognition language")} testid="row-stt-language"><LanguageSelect field="sttLanguage" /></SettingsRow>
|
||||
<SettingsRow label={t("Preferred languages")} testid="row-stt-preferred-languages">
|
||||
<SttPreferredLanguages />
|
||||
</SettingsRow>
|
||||
</SettingsSection>
|
||||
)}
|
||||
{active === "keys" && (
|
||||
<SettingsSection title="Keys" testid="section-keys">
|
||||
<SettingsSection title={t("Providers")} testid="section-keys">
|
||||
<KeysSection initialRow={initialRow ?? undefined} />
|
||||
</SettingsSection>
|
||||
)}
|
||||
{active === "agent" && (
|
||||
<SettingsSection
|
||||
title="Agent"
|
||||
title={t("Agent")}
|
||||
testid="section-agent"
|
||||
>
|
||||
<AgentSection
|
||||
@@ -391,7 +408,7 @@ export function SettingsDialogBody({
|
||||
graph={record.graph}
|
||||
compaction={record.compaction}
|
||||
onModelsChange={(next: ModelsSettings) =>
|
||||
void write("models", next)
|
||||
write("models", next)
|
||||
}
|
||||
onSectionChange={(next: AgentSettings) =>
|
||||
void write("agent", next)
|
||||
@@ -404,7 +421,7 @@ export function SettingsDialogBody({
|
||||
)}
|
||||
{active === "appearance" && (
|
||||
<SettingsSection
|
||||
title="Appearance"
|
||||
title={t("Appearance")}
|
||||
testid="section-appearance"
|
||||
>
|
||||
<AppearanceSection
|
||||
@@ -417,7 +434,7 @@ export function SettingsDialogBody({
|
||||
)}
|
||||
{active === "graph" && (
|
||||
<SettingsSection
|
||||
title="Graph"
|
||||
title={t("Graph")}
|
||||
testid="section-graph"
|
||||
>
|
||||
<GraphSection
|
||||
@@ -430,8 +447,8 @@ export function SettingsDialogBody({
|
||||
)}
|
||||
{active === "keyboard" && (
|
||||
<SettingsSection
|
||||
title="Keyboard"
|
||||
hint="Stored on this device"
|
||||
title={t("Keyboard")}
|
||||
hint={t("Stored on this device")}
|
||||
testid="section-keyboard"
|
||||
>
|
||||
<KeyboardSection />
|
||||
|
||||
@@ -0,0 +1,144 @@
|
||||
"use client";
|
||||
import { translator, type Translator } from "@/src/core";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
import { createContext, useContext, useEffect, useRef, useState } from "react";
|
||||
import { NATIVE_SUBSCRIPTIONS, type NativeSubscriptionProviderId, type NativeSubscriptionStatus } from "@/src/core";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { notifySettingsSaved } from "@/components/settings-signal";
|
||||
import { ConnectionDialog, ConnectionFooter, ConnectionRow } from "./connection-controls";
|
||||
import { ChatGPTConnection } from "./chatgpt-connection";
|
||||
import { Toggle } from "./controls";
|
||||
|
||||
export const COPILOT_POLICY_NOTICE = "Pi's native Copilot sign-in may enable additional models whose policy is not yet configured. Models explicitly disabled by policy are not enabled. Organization restrictions still apply.";
|
||||
export const SUBSCRIPTION_BACKGROUND_HINT = "Allow LearnHarness helper agents and automatic follow-ups to use this connection.";
|
||||
export function subscriptionNotice(label: string, t: Translator = translator("en")): string { return t("Your prompts, tool results, and relevant session context are sent to {v0} to run the work you select. Credentials are stored locally in an owner-only plaintext file. Provider terms, data-use policies, and plan limits apply. This connection never falls back to an API key.", { v0: label }); }
|
||||
export function subscriptionDisconnectCopy(label: string, t: Translator = translator("en")): string { return t("Disconnect {v0} from LearnHarness? This stops work using this connection and removes its saved credentials from this device. It does not cancel your subscription or revoke access at the provider. Saved model choices will remain unavailable until you reconnect or change them.", { v0: label }); }
|
||||
export function emptySubscriptionStatus(providerId: NativeSubscriptionProviderId): NativeSubscriptionStatus { return { providerId, available: false, connected: false, pending: false, allowBackgroundUse: true, connectionId: null, epoch: 0, authorityRevision: 0, revision: 0 }; }
|
||||
const Context = createContext({ statuses: [] as NativeSubscriptionStatus[], busy: false, open: (_providerId: NativeSubscriptionProviderId) => {} });
|
||||
const CONTROL_ERROR = "The connection could not be changed. Try again.";
|
||||
|
||||
export function NativeSubscriptionUIProvider({ children }: { children: React.ReactNode }) {
|
||||
const { t } = useI18n();
|
||||
const [statuses, setStatuses] = useState<NativeSubscriptionStatus[]>([]);
|
||||
const [dialog, setDialog] = useState<NativeSubscriptionProviderId | null>(null);
|
||||
const [view, setView] = useState<"notice" | "connection" | "manage">("notice");
|
||||
const [confirm, setConfirm] = useState(false), [background, setBackground] = useState(true), [backgroundDirty, setBackgroundDirty] = useState(false), [promptValue, setPromptValue] = useState("");
|
||||
const [operation, setOperation] = useState<"login" | "control" | null>(null), [error, setError] = useState<string | null>(null);
|
||||
const mounted = useRef(false), sequence = useRef(0), generation = useRef(0), statusesRef = useRef(statuses);
|
||||
const descriptor = NATIVE_SUBSCRIPTIONS.find((p) => p.providerId === dialog);
|
||||
const status = statuses.find((s) => s.providerId === dialog) ?? (dialog ? emptySubscriptionStatus(dialog) : undefined);
|
||||
const interaction = status?.interaction, prompt = interaction?.prompt;
|
||||
const management = view === "manage";
|
||||
const busy = operation === "control" || status?.committing === true;
|
||||
async function refresh() {
|
||||
const request = ++sequence.current;
|
||||
try {
|
||||
const values = await window.lh?.subscriptions?.status();
|
||||
if (!mounted.current || request !== sequence.current || !Array.isArray(values)) return;
|
||||
const accepted = NATIVE_SUBSCRIPTIONS.map(({ providerId }) => {
|
||||
const next = values.find((s) => s.providerId === providerId), old = statusesRef.current.find((s) => s.providerId === providerId);
|
||||
return next && (!old || next.revision >= old.revision) ? next : old ?? emptySubscriptionStatus(providerId);
|
||||
});
|
||||
statusesRef.current = accepted; setStatuses(accepted);
|
||||
} catch { if (mounted.current && request === sequence.current) setError("The desktop connection is unavailable. Retry when the app is ready."); }
|
||||
}
|
||||
useEffect(() => {
|
||||
mounted.current = true; void refresh();
|
||||
const off = window.lh?.subscriptions?.onChange(() => { void refresh(); notifySettingsSaved("keys"); });
|
||||
return () => { mounted.current = false; generation.current++; off?.(); };
|
||||
// The root-lifetime subscriber reads current state through refs.
|
||||
}, []);
|
||||
useEffect(() => { setPromptValue(""); }, [prompt?.id]);
|
||||
function open(providerId: NativeSubscriptionProviderId) {
|
||||
if (operation || statusesRef.current.some((s) => s.pending)) return;
|
||||
generation.current++; setError(null); setConfirm(false); setBackgroundDirty(false);
|
||||
const current = statusesRef.current.find((s) => s.providerId === providerId);
|
||||
setBackground(current?.allowBackgroundUse ?? true); setView(current?.connectionId ? "manage" : "notice"); setDialog(providerId);
|
||||
}
|
||||
async function control(action: () => Promise<void>, close = false) {
|
||||
if (busy) return;
|
||||
const owner = ++generation.current; setOperation("control"); setError(null);
|
||||
try { await action(); await refresh(); if (mounted.current && owner === generation.current && close) setDialog(null); }
|
||||
catch { if (mounted.current && owner === generation.current) setError(CONTROL_ERROR); }
|
||||
finally { if (mounted.current && owner === generation.current) setOperation(null); }
|
||||
}
|
||||
function close() {
|
||||
if (!dialog || busy) return;
|
||||
if (confirm) { setConfirm(false); setError(null); return; }
|
||||
const bridge = window.lh?.subscriptions;
|
||||
if ((status?.pending || operation === "login") && bridge) { void control(() => bridge.cancel(dialog), true); return; }
|
||||
generation.current++; setDialog(null); setError(null);
|
||||
}
|
||||
function beginSignIn() {
|
||||
if (operation || busy || !status) return;
|
||||
generation.current++; setError(null); setConfirm(false); setBackground(status.allowBackgroundUse); setBackgroundDirty(false); setView("notice");
|
||||
}
|
||||
async function login() {
|
||||
const bridge = window.lh?.subscriptions;
|
||||
if (!dialog || !bridge || operation || !status?.available) return;
|
||||
const owner = ++generation.current; setOperation("login"); setError(null);
|
||||
try { await bridge.login(dialog, backgroundDirty ? background : undefined); await refresh(); if (mounted.current && generation.current === owner) setDialog(null); }
|
||||
catch { if (mounted.current && generation.current === owner) setError("Sign-in did not complete. Try connecting again."); }
|
||||
finally { if (mounted.current && generation.current === owner) setOperation(null); }
|
||||
}
|
||||
const bridge = typeof window === "undefined" ? undefined : window.lh?.subscriptions;
|
||||
return <Context.Provider value={{ statuses, busy: !!operation, open }}>
|
||||
{children}
|
||||
{dialog && descriptor && status && <ConnectionDialog key={`${dialog}:${view}:${confirm}`} label={t("{v0} connection", { v0: descriptor.label })} testid="subscription-connection-dialog" backdropTestid="subscription-dialog-backdrop" busy={busy} onClose={close}>
|
||||
<h2 className="text-sm font-semibold text-foreground">{descriptor.label}</h2>
|
||||
{confirm ? <>
|
||||
<p className="mt-3 text-sm font-semibold text-red-400">{t("Disconnect")}{" "}{descriptor.label}?</p>
|
||||
<p className="mt-3 text-xs leading-relaxed text-muted-foreground">{subscriptionDisconnectCopy(descriptor.label, t)}</p>
|
||||
</> : view === "notice" ? <>
|
||||
<p className="mt-3 text-xs leading-relaxed text-muted-foreground" data-testid="subscription-privacy-notice">{subscriptionNotice(descriptor.label, t)}</p>
|
||||
{dialog === "github-copilot" && <p className="mt-3 text-xs leading-relaxed text-muted-foreground" data-testid="copilot-policy-notice">{t(COPILOT_POLICY_NOTICE)}</p>}
|
||||
</> : <>
|
||||
<div className="mt-4 flex items-center gap-3 text-xs text-foreground">
|
||||
<Toggle label={t("Allow background use")} checked={management ? status.allowBackgroundUse : background} disabled={busy || !!operation || status.pending || !status.available} onChange={(enabled) => { setBackground(enabled); if (management && bridge) void control(() => bridge.consent(dialog, enabled)); else setBackgroundDirty(true); }} />
|
||||
<span>{t("Allow background use")}<span className="mt-1 block leading-relaxed text-muted-foreground">{t(SUBSCRIPTION_BACKGROUND_HINT)}</span></span>
|
||||
</div>
|
||||
{!status.available && <p className="mt-3 text-xs text-muted-foreground">{t("Subscription sign-in requires the desktop app's private server connection. API-key connections remain available here.")}</p>}
|
||||
{view === "connection" && interaction && <div className="mt-3 space-y-3 text-xs" data-testid="subscription-login-interaction">
|
||||
{interaction.progress && <p role="status" className="text-muted-foreground">{t(interaction.progress)}</p>}
|
||||
{interaction.userCode && <p>{t("Device code:")}{" "}<code className="select-text font-mono">{interaction.userCode}</code></p>}
|
||||
{interaction.browser && <Button variant="outline" size="sm" disabled={busy} onClick={() => bridge && void bridge.open(dialog, interaction.attemptId, interaction.browser!.id).catch(() => setError("The browser could not be opened. Try again."))}>{t("Open browser")}</Button>}
|
||||
{prompt && <form className="space-y-2" onSubmit={(event) => { event.preventDefault(); if (bridge) void bridge.respond(dialog, interaction.attemptId, prompt.id, promptValue).catch(() => setError(CONTROL_ERROR)); }}>
|
||||
<label className="block" htmlFor="subscription-auth-prompt">{t(prompt.message)}</label>
|
||||
{prompt.type === "select" ? <select id="subscription-auth-prompt" value={promptValue} onChange={(event) => setPromptValue(event.target.value)} className="w-full rounded-sm border border-border bg-background px-2 py-1.5"><option value="" disabled>{t("Select…")}</option>{prompt.options?.map((option) => <option key={option.id} value={option.id}>{t(option.label)}</option>)}</select> : <input id="subscription-auth-prompt" type={prompt.type === "secret" ? "password" : "text"} autoComplete="off" value={promptValue} placeholder={prompt.placeholder ? t(prompt.placeholder) : undefined} onChange={(event) => setPromptValue(event.target.value)} className="w-full rounded-sm border border-border bg-background px-2 py-1.5" />}
|
||||
<Button type="submit" variant="outline" size="sm" disabled={busy || (prompt.type === "select" && !promptValue)}>{t("Continue")}</Button>
|
||||
</form>}
|
||||
</div>}
|
||||
</>}
|
||||
{(error || status.error) && <p role="alert" className="mt-3 text-xs text-red-400">{t(error || status.error || "")}</p>}
|
||||
<ConnectionFooter testid="subscription-connection-footer" leading={!confirm && management && status.connectionId && !status.pending && <Button variant="ghost" size="sm" className="cursor-pointer text-red-400 hover:bg-red-500/10 hover:text-red-300" disabled={busy || !!operation} onClick={() => setConfirm(true)}>{t("Disconnect")}</Button>}>
|
||||
{!confirm && management && status.connectionId && status.available && !status.connected && !!status.error && !status.pending && <>
|
||||
{status.error && <Button variant="outline" size="sm" disabled={busy || !!operation} onClick={() => bridge && void control(() => bridge.retry(dialog))}>{t("Retry")}</Button>}
|
||||
<Button variant="outline" size="sm" disabled={!status.available || busy || !!operation} onClick={beginSignIn}>{t("Sign in again")}</Button>
|
||||
</>}
|
||||
<Button variant={!confirm && management ? "outline" : "ghost"} size="sm" disabled={busy} onClick={close}>{confirm || !management ? t("Cancel") : t("Close")}</Button>
|
||||
{confirm ? <Button variant="destructive" size="sm" disabled={busy} onClick={() => bridge && void control(() => bridge.disconnect(dialog), true)}>{t("Disconnect")}</Button> : view === "notice" ? <Button variant="outline" size="sm" disabled={!status.available || !!operation} onClick={() => setView("connection")}>{t("Continue")}</Button> : view === "connection" && <Button variant="outline" size="sm" disabled={!status.available || !!operation || status.pending} onClick={() => void login()}>{t("Connect")}</Button>}
|
||||
</ConnectionFooter>
|
||||
</ConnectionDialog>}
|
||||
</Context.Provider>;
|
||||
}
|
||||
|
||||
export function NativeSubscriptionConnection({ providerId }: { providerId: NativeSubscriptionProviderId }) {
|
||||
const { t } = useI18n();
|
||||
const ui = useContext(Context), descriptor = NATIVE_SUBSCRIPTIONS.find((p) => p.providerId === providerId)!;
|
||||
const status = ui.statuses.find((s) => s.providerId === providerId) ?? emptySubscriptionStatus(providerId);
|
||||
return <div className="flex flex-col gap-2" data-testid={`${providerId}-connection`}>
|
||||
<ConnectionRow label={descriptor.label} action={status.connectionId ? t("Manage…") : t("Connect")} disabled={ui.busy || !status.available || ui.statuses.some((s) => s.pending)} onAction={() => ui.open(providerId)} />
|
||||
{status.error && <p role="alert" className="text-xs text-red-400">{t(status.error)}</p>}
|
||||
</div>;
|
||||
}
|
||||
export function SubscriptionConnections({ setup = false }: { setup?: boolean }) {
|
||||
return <div className="space-y-3" data-testid="subscription-connections"><ChatGPTConnection setup={setup} />{NATIVE_SUBSCRIPTIONS.map((p) => <NativeSubscriptionConnection key={p.providerId} providerId={p.providerId} />)}</div>;
|
||||
}
|
||||
export function NativeSubscriptionBackgroundAccess({ provider }: { provider: string | undefined }) {
|
||||
const { t } = useI18n();
|
||||
const ui = useContext(Context), descriptor = NATIVE_SUBSCRIPTIONS.find((p) => p.logicalId === provider);
|
||||
const status = ui.statuses.find((s) => s.providerId === descriptor?.providerId);
|
||||
if (!descriptor || !status?.connected || status.allowBackgroundUse) return null;
|
||||
return <Button type="button" size="xs" variant="ghost" disabled={ui.busy} onClick={() => ui.open(descriptor.providerId)}>{t("Enable background use")}</Button>;
|
||||
}
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
/**
|
||||
* The zero-keys surfaces (zero-keys wave, 2026-09-25, owner-locked over
|
||||
* Platform's 66dbea9 key-presence gate): when NO model-provider key
|
||||
@@ -15,12 +17,10 @@
|
||||
* its own save), the same re-read pattern chat.tsx uses for "models".
|
||||
*/
|
||||
|
||||
import { useCallback, useEffect, useState } from "react";
|
||||
import type { AuthKeyStatus } from "@/src/core";
|
||||
import { classifyKeys, type ProviderKeyInfo } from "@/components/settings/keys-section";
|
||||
import { useModelCatalog } from "@/components/model-picker";
|
||||
import type { ModelCatalogResponse } from "@/src/core";
|
||||
import { useSettingsSaved } from "@/components/settings-signal";
|
||||
|
||||
/** Pure: does a MODEL-PROVIDER key exist among the statuses? Reuses
|
||||
* classifyKeys (the keys section's own classification — no drift):
|
||||
@@ -40,28 +40,15 @@ export function hasProviderKey(
|
||||
* failed read claiming "zero keys" would be a lie the CTA flow then
|
||||
* leans on). Re-reads on the keys signal. */
|
||||
export function useZeroKeys(): boolean {
|
||||
const [zeroKeys, setZeroKeys] = useState(false);
|
||||
const read = useCallback(() => {
|
||||
fetch("/api/keys")
|
||||
.then((r) => r.json())
|
||||
.then((body: { keys?: AuthKeyStatus[]; providers?: ProviderKeyInfo[] }) => {
|
||||
setZeroKeys(!hasProviderKey(body.keys ?? [], body.providers));
|
||||
})
|
||||
.catch(() => {});
|
||||
}, []);
|
||||
useEffect(() => {
|
||||
read();
|
||||
}, [read]);
|
||||
useSettingsSaved((section) => {
|
||||
if (section === "keys") read();
|
||||
});
|
||||
return zeroKeys;
|
||||
const { catalog } = useModelCatalog();
|
||||
return catalog ? !catalog.providers.some((provider) => provider.keyPresent) : false;
|
||||
}
|
||||
|
||||
/** The pill itself — the models CTA's chrome and placement, the keys
|
||||
* chain's copy. testid "setup-cta-keys" (the models CTA keeps
|
||||
* "setup-cta"; probes can tell them apart). */
|
||||
export function ZeroKeysPill({ onOpen, inline = false }: { onOpen: () => void; inline?: boolean }) {
|
||||
const { t } = useI18n();
|
||||
const button = (
|
||||
<button
|
||||
type="button"
|
||||
@@ -69,8 +56,7 @@ export function ZeroKeysPill({ onOpen, inline = false }: { onOpen: () => void; i
|
||||
onClick={onOpen}
|
||||
className="rounded-sm border border-border bg-card px-3 py-1.5 font-ui text-xs text-foreground transition-colors hover:border-muted-foreground/50 hover:bg-accent cursor-pointer"
|
||||
>
|
||||
Add a provider key
|
||||
</button>
|
||||
{t("Add a provider key")}</button>
|
||||
);
|
||||
return inline ? button : <div className="pointer-events-auto mb-2 flex justify-center">{button}</div>;
|
||||
}
|
||||
@@ -93,9 +79,6 @@ export function strongKeyless(catalog: ModelCatalogResponse | undefined): boolea
|
||||
* (a provider key saved or deleted) and "models" (the strong slot
|
||||
* re-pinned). Live-updates with the page, never mid-send. */
|
||||
export function useStrongKeyless(): boolean {
|
||||
const { catalog, refresh } = useModelCatalog();
|
||||
useSettingsSaved((section) => {
|
||||
if (section === "keys" || section === "models") refresh();
|
||||
});
|
||||
const { catalog } = useModelCatalog();
|
||||
return strongKeyless(catalog);
|
||||
}
|
||||
|
||||
+39
-32
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
/**
|
||||
* The first-run setup flow (model-slots wave, 2026-09-20, owner design
|
||||
* "A — composer CTA + send interception"): chats cannot start until the
|
||||
@@ -44,6 +46,8 @@ import { notifySettingsSaved, useSettingsSaved } from "@/components/settings-sig
|
||||
import { Hint } from "@/components/ui/hint";
|
||||
import { type ProviderKeyInfo } from "@/components/settings/keys-section";
|
||||
import { ProviderMenuList } from "@/components/settings/model-menu";
|
||||
import { ChatGPTBackgroundAccess } from "@/components/settings/chatgpt-connection";
|
||||
import { NativeSubscriptionBackgroundAccess, SubscriptionConnections } from "@/components/settings/subscription-connections";
|
||||
import { defaultOrderLevel, populateLevel, THINKING_LABEL } from "@/components/thinking-default";
|
||||
import { ThinkingMenuList } from "@/components/settings/model-menu";
|
||||
import type { ThinkingLevel } from "@earendil-works/pi-agent-core";
|
||||
@@ -145,23 +149,22 @@ export function SetupKeysBody({
|
||||
/** The MenuShell anchor — wired by the wrapper (its triggerRef). */
|
||||
menuAnchor: React.RefObject<HTMLDivElement | null>;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<div className="flex flex-col gap-3 px-6 py-5" data-testid="setup-stage-keys">
|
||||
<p className="text-sm text-foreground">Add a provider key.</p>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Choose your AI provider and paste its API key. You’ll pick your models next.
|
||||
</p>
|
||||
{t("Choose your AI provider and paste its API key. You’ll pick your models next.")}</p>
|
||||
<div className="flex flex-col gap-2">
|
||||
<div ref={menuAnchor} className="relative max-w-96">
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Provider"
|
||||
aria-label={t("Provider")}
|
||||
data-testid="setup-key-provider"
|
||||
aria-expanded={menuOpen}
|
||||
onClick={onToggleMenu}
|
||||
className="flex h-7 w-full items-center gap-1 rounded-sm border border-border bg-background px-1.5 font-ui text-xs text-foreground transition-colors hover:border-muted-foreground/50"
|
||||
>
|
||||
<span className="min-w-0 flex-1 truncate text-left">{provider ? provider.label : "Pick a provider…"}</span>
|
||||
<span className="min-w-0 flex-1 truncate text-left">{provider ? provider.label : t("Pick a provider…")}</span>
|
||||
<span aria-hidden className="text-muted-foreground">
|
||||
▾
|
||||
</span>
|
||||
@@ -187,8 +190,8 @@ export function SetupKeysBody({
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === "Enter" && value.trim()) onSave();
|
||||
}}
|
||||
placeholder="Paste key…"
|
||||
aria-label={`${provider.label} key`}
|
||||
placeholder={t("Paste key…")}
|
||||
aria-label={t("{v0} key", { v0: provider.label })}
|
||||
data-testid="setup-key-input"
|
||||
disabled={saving}
|
||||
autoFocus
|
||||
@@ -201,16 +204,17 @@ export function SetupKeysBody({
|
||||
data-testid="setup-key-save"
|
||||
className="shrink-0 rounded-sm border border-border bg-background px-3 py-1.5 font-ui text-xs text-foreground transition-colors hover:border-muted-foreground/50 disabled:cursor-not-allowed disabled:opacity-40"
|
||||
>
|
||||
{saving ? "Saving…" : "Save key"}
|
||||
{saving ? t("Saving…") : t("Save key")}
|
||||
</button>
|
||||
</div>
|
||||
)}
|
||||
{error && (
|
||||
<p role="alert" data-testid="setup-key-error" className="text-xs text-red-400">
|
||||
{error}
|
||||
{t(error)}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
<div className="mt-2 border-t border-border/60 pt-4"><h3 className="mb-3 font-ui text-xs text-muted-foreground">{t("Subscriptions")}</h3><SubscriptionConnections setup /></div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -226,6 +230,7 @@ export function SetupDialog({
|
||||
onClose: () => void;
|
||||
onDone: (models: ModelsSettings) => void;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const backdropDismiss = useBackdropDismiss(onClose);
|
||||
const [body, setBody] = useState<ModelsBody | null>(null);
|
||||
const [failed, setFailed] = useState(false);
|
||||
@@ -265,16 +270,19 @@ export function SetupDialog({
|
||||
// moment ago (stage 1's own screen) widens the pickers immediately.
|
||||
useEffect(() => {
|
||||
if (!open) return;
|
||||
let cancelled = false;
|
||||
setBody(null);
|
||||
setPicked({});
|
||||
setLevels({});
|
||||
setError(null);
|
||||
fetch("/api/keys")
|
||||
.then((r) => r.json())
|
||||
.then((b: { providers?: ProviderKeyInfo[] }) => setKeyProviders(b.providers ?? []))
|
||||
.catch(() => setKeyProviders([]));
|
||||
.then((b: { providers?: ProviderKeyInfo[] }) => { if (!cancelled) setKeyProviders(b.providers ?? []); })
|
||||
.catch(() => { if (!cancelled) setKeyProviders([]); });
|
||||
fetch("/api/models")
|
||||
.then((r) => r.json())
|
||||
.then((r) => { if (!r.ok) throw new Error("Catalog unavailable"); return r.json(); })
|
||||
.then((b: ModelsBody) => {
|
||||
if (cancelled) return;
|
||||
setBody(b);
|
||||
setFailed(false);
|
||||
// Prefill (owner, 2026-09-22): each pinned tier opens with its
|
||||
@@ -292,7 +300,8 @@ export function SetupDialog({
|
||||
}
|
||||
setLevels(preLevels);
|
||||
})
|
||||
.catch(() => setFailed(true));
|
||||
.catch(() => { if (!cancelled) setFailed(true); });
|
||||
return () => { cancelled = true; };
|
||||
}, [open, keysTick]);
|
||||
|
||||
// Esc + outside-click — layered dismissal, closable WITHOUT
|
||||
@@ -401,17 +410,17 @@ export function SetupDialog({
|
||||
<div
|
||||
role="dialog"
|
||||
aria-modal="true"
|
||||
aria-label="Set up your models"
|
||||
aria-label={t("Set up your models")}
|
||||
data-testid="setup-dialog"
|
||||
className="settings-dialog-pop flex max-h-[85vh] w-[640px] max-w-[90vw] flex-col overflow-hidden rounded-md border border-border bg-card shadow-xl"
|
||||
onClick={(e) => e.stopPropagation()}
|
||||
>
|
||||
<header className="flex h-15 shrink-0 items-center gap-3 border-b border-border px-5">
|
||||
<h2 className="font-title text-2xl tracking-tight">Set up your models</h2>
|
||||
<Hint label="Close" binding="escape" side="left">
|
||||
<h2 className="font-title text-2xl tracking-tight">{t("Set up your models")}</h2>
|
||||
<Hint label={t("Close")} binding="escape" side="left">
|
||||
<button
|
||||
type="button"
|
||||
aria-label="Close setup"
|
||||
aria-label={t("Close setup")}
|
||||
data-testid="setup-close"
|
||||
onClick={onClose}
|
||||
className="ml-auto text-muted-foreground transition-colors hover:text-foreground"
|
||||
@@ -425,15 +434,14 @@ export function SetupDialog({
|
||||
<div className="flex flex-col px-6 py-5">
|
||||
{failed ? (
|
||||
<p className="text-sm text-foreground">
|
||||
Model catalog could not be loaded. Check the connection and retry.
|
||||
</p>
|
||||
{t("Model catalog could not be loaded. Check the connection and retry.")}</p>
|
||||
) : (
|
||||
<SetupKeysBody
|
||||
providers={keyProviders}
|
||||
provider={keyProvider}
|
||||
value={keyValue}
|
||||
saving={keySaving}
|
||||
error={keyError}
|
||||
error={t(keyError)}
|
||||
menuOpen={keyMenuOpen}
|
||||
menuAnchor={keyTriggerRef}
|
||||
onToggleMenu={() => setKeyMenuOpen((v) => !v)}
|
||||
@@ -450,8 +458,7 @@ export function SetupDialog({
|
||||
) : (
|
||||
<div className="flex flex-col gap-4 overflow-y-auto px-6 py-5" data-testid="setup-stage-pickers">
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Pick the model for each tier. All three are required before chats can start.
|
||||
</p>
|
||||
{t("Pick the model for each tier. All three are required before chats can start.")}</p>
|
||||
{SLOT_ORDER.map((slot) => {
|
||||
const entry = picked[slot];
|
||||
const level = levels[slot];
|
||||
@@ -461,28 +468,28 @@ export function SetupDialog({
|
||||
return (
|
||||
<div key={slot} data-testid={`setup-slot-${slot}`} className="flex flex-col gap-1.5">
|
||||
<span className="flex items-center gap-1.5">
|
||||
<span className="font-ui text-sm text-foreground">{SLOT_META[slot].label}</span>
|
||||
<span className="font-ui text-sm text-foreground">{t(SLOT_META[slot].label)}</span>
|
||||
{!body?.slots?.[slot]?.model && !picked[slot] && (
|
||||
<span
|
||||
data-testid={`setup-needed-${slot}`}
|
||||
className="rounded-sm border border-border px-1 py-0.5 text-[10px] font-normal tracking-wide text-muted-foreground"
|
||||
>
|
||||
needed
|
||||
</span>
|
||||
{t("needed")}</span>
|
||||
)}
|
||||
</span>
|
||||
<span className="text-xs text-muted-foreground/70">{SLOT_META[slot].roster}</span>
|
||||
<span className="text-xs text-muted-foreground/70">{t(SLOT_META[slot].roster)}</span>
|
||||
{slot !== "strong" && <><ChatGPTBackgroundAccess provider={entry?.provider} /><NativeSubscriptionBackgroundAccess provider={entry?.provider} /></>}
|
||||
<div className="flex items-center gap-2">
|
||||
<div className="relative flex-1">
|
||||
<button
|
||||
type="button"
|
||||
aria-label={`${SLOT_META[slot].label} model`}
|
||||
aria-label={t("{v0} model", { v0: SLOT_META[slot].label })}
|
||||
data-testid={`setup-trigger-${slot}`}
|
||||
aria-expanded={openMenu?.slot === slot && openMenu.kind === "model"}
|
||||
onClick={() => setOpenMenu(openMenu?.slot === slot && openMenu.kind === "model" ? null : { slot, kind: "model" })}
|
||||
className="flex h-7 min-w-40 w-full items-center gap-1 rounded-sm border border-border bg-background px-1.5 font-ui text-xs text-foreground transition-colors hover:border-muted-foreground/50"
|
||||
>
|
||||
<span className="min-w-0 flex-1 truncate">{entry ? prettyModel(entry.id) : "Pick a model…"}</span>
|
||||
<span className="min-w-0 flex-1 truncate">{entry ? prettyModel(entry.id) : t("Pick a model…")}</span>
|
||||
<span aria-hidden className="text-muted-foreground">
|
||||
▾
|
||||
</span>
|
||||
@@ -520,7 +527,7 @@ export function SetupDialog({
|
||||
}));
|
||||
setOpenMenu(null);
|
||||
}}
|
||||
footer={catalog && catalog.length === 0 ? "No image-capable models. Add a provider key with access to a vision model." : undefined}
|
||||
footer={catalog && catalog.length === 0 ? t("No image-capable models. Add a provider key with access to a vision model.") : undefined}
|
||||
/>
|
||||
</MenuShell>
|
||||
)}
|
||||
@@ -530,7 +537,7 @@ export function SetupDialog({
|
||||
<div className="relative">
|
||||
<button
|
||||
type="button"
|
||||
aria-label={`${SLOT_META[slot].label} thinking`}
|
||||
aria-label={t("{v0} thinking", { v0: SLOT_META[slot].label })}
|
||||
data-testid={`setup-thinking-${slot}`}
|
||||
aria-expanded={openMenu?.slot === slot && openMenu.kind === "thinking"}
|
||||
disabled={!entry}
|
||||
@@ -575,9 +582,9 @@ export function SetupDialog({
|
||||
onClick={() => void save()}
|
||||
className="rounded-sm border border-border bg-background px-3 py-1.5 font-ui text-xs text-foreground transition-colors hover:border-muted-foreground/50 disabled:cursor-not-allowed disabled:opacity-40"
|
||||
>
|
||||
{saving ? "Saving…" : "Save models"}
|
||||
{saving ? t("Saving…") : t("Save models")}
|
||||
</button>
|
||||
{error && <p className="text-xs text-red-400">{error}</p>}
|
||||
{error && <p className="text-xs text-red-400">{t(error)}</p>}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
+58
-42
@@ -1,4 +1,7 @@
|
||||
"use client";
|
||||
import { translator, type Language } from "@/src/core";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { createContext, useCallback, useContext, useEffect, useMemo, useRef, useState } from "react";
|
||||
import Link from "next/link";
|
||||
@@ -21,6 +24,7 @@ import { fuzzyScore } from "@/src/core";
|
||||
import { useServerEvent, useServerResync } from "@/components/server-events";
|
||||
import type { ChatListItem } from "@/src/core";
|
||||
import { kbdEventForAction } from "@/src/core";
|
||||
import { notifySettingsSaved } from "@/components/settings-signal";
|
||||
|
||||
/**
|
||||
* Toggleable sidebar — NOT a modal drawer: no backdrop, no focus theft. It
|
||||
@@ -47,6 +51,7 @@ const STORAGE_KEY = "lh:sidebar-open";
|
||||
*
|
||||
* Mirrors SIDEBAR_AUTOCLOSE in electron/main.cjs — keep in sync.
|
||||
*/
|
||||
import type { ChatGPTControlBridge, NativeSubscriptionControlBridge } from "@/src/core";
|
||||
const SIDEBAR_AUTOCLOSE = 928;
|
||||
|
||||
// Module scope, guarded for SSR (the server has no navigator).
|
||||
@@ -58,10 +63,13 @@ declare global {
|
||||
lh?: {
|
||||
/** Read-only host OS; determines the native-control gutter. */
|
||||
platform?: string;
|
||||
chatgpt?: ChatGPTControlBridge;
|
||||
subscriptions?: NativeSubscriptionControlBridge;
|
||||
expandWindow: () => void;
|
||||
/** The zoom truth (owner round 7): subscribes to "lh:zoom" pushes; returns unsubscribe. */
|
||||
onZoom?: (cb: (factor: number) => void) => () => void;
|
||||
getZoom?: () => Promise<number>;
|
||||
setLanguage?: (language: "en" | "ru") => void;
|
||||
/** Auto-update channel (Wave C, 2026-10-10): "lh:update-status" pushes once a staged update exists. */
|
||||
onUpdateStatus?: (cb: (status: { status: string; version: string | null }) => void) => () => void;
|
||||
installUpdate?: () => void;
|
||||
@@ -79,6 +87,13 @@ export function useSidebar() {
|
||||
}
|
||||
|
||||
export function SidebarProvider({ children }: { children: React.ReactNode }) {
|
||||
useEffect(() => {
|
||||
const bridge = window.lh?.chatgpt;
|
||||
if (!bridge) return;
|
||||
const off = bridge.onChange(() => notifySettingsSaved("keys"));
|
||||
notifySettingsSaved("keys"); // cover changes missed before this root-lifetime subscription
|
||||
return off;
|
||||
}, []);
|
||||
// Start closed so server and client first-render agree (no hydration
|
||||
// mismatch); the stored value is applied after mount.
|
||||
const [open, setOpen] = useState(false);
|
||||
@@ -177,6 +192,7 @@ export function SidebarProvider({ children }: { children: React.ReactNode }) {
|
||||
* The icon fades with the slot and is clipped by it as it collapses —
|
||||
* no popping in either direction. */
|
||||
export function SidebarToggle() {
|
||||
const { t } = useI18n();
|
||||
const { open, toggle } = useSidebar();
|
||||
return (
|
||||
<span
|
||||
@@ -185,11 +201,11 @@ export function SidebarToggle() {
|
||||
open ? "w-0 -mr-3" : "w-9 mr-0 lh-closed-toggle",
|
||||
)}
|
||||
>
|
||||
<Hint label="Open sidebar" action="toggle-sidebar">
|
||||
<Hint label={t("Open sidebar")} action="toggle-sidebar">
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
aria-label="Open sidebar"
|
||||
aria-label={t("Open sidebar")}
|
||||
aria-hidden={open}
|
||||
tabIndex={open ? -1 : 0}
|
||||
onClick={toggle}
|
||||
@@ -213,7 +229,7 @@ export function SidebarToggle() {
|
||||
* phases only advance (all sessions end in Teaching — phase-as-signal was
|
||||
* decoration, now retired app-wide), and question-pending is the dominant
|
||||
* RESTING state of real sessions — a resting state has no scan value, so
|
||||
* the meta line's "Waiting for your answer" text carries it. Idle is the
|
||||
* the meta line's "Waiting for input" text carries it. Idle is the
|
||||
* absence of a signal, by design.
|
||||
*/
|
||||
function SessionStatus({ busy }: { busy: boolean }) {
|
||||
@@ -228,16 +244,18 @@ function SessionStatus({ busy }: { busy: boolean }) {
|
||||
* in any locale and it sorts (owner, typography round 5; the old
|
||||
* M/D/YYYY was the US convention. A user-locale setting can come later
|
||||
* — trivial, a format function swap). Pure — exported for tests. */
|
||||
export function timeAgo(iso: string, now = new Date()): string {
|
||||
export function timeAgo(iso: string, now = new Date(), language: Language = "en"): string {
|
||||
const t = translator(language);
|
||||
const ms = now.getTime() - new Date(iso).getTime();
|
||||
if (ms < 60_000) return "just now";
|
||||
if (ms < 60_000) return t("just now");
|
||||
const min = Math.floor(ms / 60_000);
|
||||
if (min < 60) return `${min}m ago`;
|
||||
if (min < 60) return t("{v0}m ago", { v0: min });
|
||||
const h = Math.floor(min / 60);
|
||||
if (h < 24) return `${h}h ago`;
|
||||
if (h < 24) return t("{v0}h ago", { v0: h });
|
||||
const d = Math.floor(h / 24);
|
||||
if (d < 7) return `${d}d ago`;
|
||||
if (d < 7) return t("{v0}d ago", { v0: d });
|
||||
const date = new Date(iso);
|
||||
if (language === "ru") return new Intl.DateTimeFormat("ru-RU").format(date);
|
||||
const mm = String(date.getMonth() + 1).padStart(2, "0");
|
||||
const dd = String(date.getDate()).padStart(2, "0");
|
||||
return `${date.getFullYear()}-${mm}-${dd}`;
|
||||
@@ -248,14 +266,15 @@ export function timeAgo(iso: string, now = new Date()): string {
|
||||
* typography round 5): it informed no decision — clutter. messageCount
|
||||
* still rides the API payload, so this is a one-line flip back if it's
|
||||
* ever wanted. */
|
||||
function sessionMeta(chat: ChatListItem): string {
|
||||
if (chat.compacting) return `Compacting context · ${timeAgo(chat.updatedAt)}`;
|
||||
if (chat.pendingQuestion) return `Waiting for your answer · ${timeAgo(chat.updatedAt)}`;
|
||||
function sessionMeta(chat: ChatListItem, language: Language = "en"): string {
|
||||
const t = translator(language);
|
||||
if (chat.compacting) return t("Compacting context · {v0}", { v0: timeAgo(chat.updatedAt, undefined, language) });
|
||||
if (chat.pendingQuestion) return t("Waiting for input · {v0}", { v0: timeAgo(chat.updatedAt, undefined, language) });
|
||||
if ((chat.kind ?? "teach") === "practice" && chat.pendingProblem) {
|
||||
return `Problem waiting · ${timeAgo(chat.updatedAt)}`;
|
||||
return t("Problem waiting · {v0}", { v0: timeAgo(chat.updatedAt, undefined, language) });
|
||||
}
|
||||
if (chat.busy) return "Working…";
|
||||
return timeAgo(chat.updatedAt);
|
||||
if (chat.busy) return t("Working…");
|
||||
return timeAgo(chat.updatedAt, undefined, language);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -279,6 +298,7 @@ export function SessionRow({
|
||||
/** Right-click opens the context menu (wave 6: Rename / Delete). */
|
||||
onContextMenu?: (e: React.MouseEvent<HTMLButtonElement>) => void;
|
||||
}) {
|
||||
const { t, language } = useI18n();
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
@@ -299,13 +319,13 @@ export function SessionRow({
|
||||
rule, finally applied to the picker too (owner, typography
|
||||
round): mono = chrome, Source Sans = human words. */}
|
||||
<span className="block truncate font-prose text-(length:--lh-prose-size)">{chat.title}</span>
|
||||
<span className="block text-xs text-muted-foreground">{sessionMeta(chat)}</span>
|
||||
<span className="block text-xs text-muted-foreground">{sessionMeta(chat, language)}</span>
|
||||
</span>
|
||||
{/* The dumbbell rides the FAR RIGHT (owner round 6, 2026-10-05) —
|
||||
was left of the name; right-aligned keeps the titles flush with
|
||||
the teaching rows and reads cleaner. */}
|
||||
{(chat.kind ?? "teach") === "practice" && (
|
||||
<DumbbellIcon className="size-3.5 shrink-0 text-muted-foreground/70" aria-label="Practice session" />
|
||||
<DumbbellIcon className="size-3.5 shrink-0 text-muted-foreground/70" aria-label={t("Practice session")} />
|
||||
)}
|
||||
</button>
|
||||
);
|
||||
@@ -316,6 +336,7 @@ export function SessionRow({
|
||||
* "replace", the header rename's rule), Enter/blur commits, Esc discards.
|
||||
* The meta line stays so the row never changes height mid-edit. */
|
||||
export function RenameRow({ chat, onCommit, onCancel }: { chat: ChatListItem; onCommit: (next: string) => void; onCancel: () => void }) {
|
||||
const { t, language } = useI18n();
|
||||
const [draft, setDraft] = useState(chat.title);
|
||||
const inputRef = useRef<HTMLInputElement | null>(null);
|
||||
useEffect(() => {
|
||||
@@ -351,11 +372,11 @@ export function RenameRow({ chat, onCommit, onCancel }: { chat: ChatListItem; on
|
||||
onCancel();
|
||||
}
|
||||
}}
|
||||
aria-label="Rename session"
|
||||
aria-label={t("Rename session")}
|
||||
data-testid="session-rename-input"
|
||||
className="lh-input w-full min-w-0 truncate border-0 border-b border-border bg-transparent px-0 text-foreground outline-none"
|
||||
/>
|
||||
<span className="block truncate text-xs text-muted-foreground">{sessionMeta(chat)}</span>
|
||||
<span className="block truncate text-xs text-muted-foreground">{sessionMeta(chat, language)}</span>
|
||||
</span>
|
||||
</div>
|
||||
);
|
||||
@@ -368,6 +389,7 @@ export type SessionKindFilter = "teach" | "all" | "practice";
|
||||
const KIND_FILTER_KEY = "lh:session-kind-filter";
|
||||
|
||||
function SessionsSidebar() {
|
||||
const { t } = useI18n();
|
||||
const { open, toggle } = useSidebar();
|
||||
const [chats, setChats] = useState<ChatListItem[] | null>(null);
|
||||
const [query, setQuery] = useState("");
|
||||
@@ -645,23 +667,23 @@ function SessionsSidebar() {
|
||||
// of the logo, carrying its real shortcut: ⌘G jumps to
|
||||
// the graph view (keyboard-shortcuts routes it to "/",
|
||||
// the same destination as this logo).
|
||||
label="Home"
|
||||
label={t("Home")}
|
||||
action="jump-graph"
|
||||
side="right"
|
||||
>
|
||||
<Link
|
||||
href="/"
|
||||
aria-label="Home"
|
||||
aria-label={t("Home")}
|
||||
className="lh-no-drag flex size-9 shrink-0 items-center justify-center rounded-md transition-colors hover:bg-accent hover:text-accent-foreground dark:hover:bg-accent/50"
|
||||
>
|
||||
<LhMark className="size-6" />
|
||||
</Link>
|
||||
</Hint>
|
||||
<Hint label="Close sidebar" action="toggle-sidebar">
|
||||
<Hint label={t("Close sidebar")} action="toggle-sidebar">
|
||||
<Button
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
aria-label="Close sidebar"
|
||||
aria-label={t("Close sidebar")}
|
||||
onClick={toggle}
|
||||
className="lh-no-drag"
|
||||
>
|
||||
@@ -682,8 +704,7 @@ function SessionsSidebar() {
|
||||
className="flex w-full items-center gap-1.5 rounded-md px-2 py-1.5 text-xs uppercase tracking-wider text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
|
||||
>
|
||||
<PlusIcon className="size-3" />
|
||||
Teaching
|
||||
<span className="sr-only">create a new teaching session</span>
|
||||
{t("Teaching")}<span className="sr-only">{t("create a new teaching session")}</span>
|
||||
</button>
|
||||
<button
|
||||
type="button"
|
||||
@@ -692,14 +713,13 @@ function SessionsSidebar() {
|
||||
className="flex w-full items-center gap-1.5 rounded-md px-2 py-1.5 text-xs uppercase tracking-wider text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
|
||||
>
|
||||
<DumbbellIcon className="size-3" />
|
||||
Practice
|
||||
<span className="sr-only">create a new practice session</span>
|
||||
{t("Practice")}<span className="sr-only">{t("create a new practice session")}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div className="mx-3 mb-2 flex items-center gap-2">
|
||||
<span className="text-xs uppercase tracking-widest text-muted-foreground/70">Sessions</span>
|
||||
<Hint label="Search sessions" action="sessions-search" side="bottom">
|
||||
<span className="text-xs uppercase tracking-widest text-muted-foreground/70">{t("Sessions")}</span>
|
||||
<Hint label={t("Search sessions")} action="sessions-search" side="bottom">
|
||||
<span className="relative flex-1">
|
||||
<Input
|
||||
ref={searchRef}
|
||||
@@ -749,8 +769,8 @@ function SessionsSidebar() {
|
||||
e.currentTarget.blur();
|
||||
}
|
||||
}}
|
||||
placeholder="Search…"
|
||||
aria-label="Search sessions"
|
||||
placeholder={t("Search…")}
|
||||
aria-label={t("Search sessions")}
|
||||
className="h-6 rounded-sm border-border bg-background pl-6 text-xs placeholder:text-muted-foreground/60"
|
||||
/>
|
||||
<SearchIcon className="pointer-events-none absolute left-1.5 top-1/2 size-3 -translate-y-1/2 text-muted-foreground/70" />
|
||||
@@ -779,17 +799,17 @@ function SessionsSidebar() {
|
||||
: "text-muted-foreground hover:text-foreground",
|
||||
)}
|
||||
>
|
||||
{f === "teach" ? "Teaching" : f === "all" ? "All" : "Practice"}
|
||||
{f === "teach" ? t("Teaching") : f === "all" ? t("All") : t("Practice")}
|
||||
</button>
|
||||
))}
|
||||
</div>
|
||||
|
||||
<div ref={listRef} className="flex-1 overflow-y-auto p-2">
|
||||
{shown === null ? (
|
||||
<div className="px-2 py-4 text-xs text-muted-foreground">Loading…</div>
|
||||
<div className="px-2 py-4 text-xs text-muted-foreground">{t("Loading…")}</div>
|
||||
) : shown.length === 0 ? (
|
||||
<div className="px-2 py-4 text-xs text-muted-foreground">
|
||||
{query.trim() ? "No sessions match." : "No sessions yet."}
|
||||
{query.trim() ? t("No sessions match.") : t("No sessions yet.")}
|
||||
</div>
|
||||
) : (
|
||||
shown.map((c, i) =>
|
||||
@@ -828,7 +848,7 @@ function SessionsSidebar() {
|
||||
New session — quiet, bottom-pinned, opens the centered
|
||||
dialog (also mod+, in the keyboard registry). */}
|
||||
<div className="px-3 pb-3 pt-1">
|
||||
<Hint label="Settings" action="open-settings" side="right">
|
||||
<Hint label={t("Settings")} action="open-settings" side="right">
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => openSettings()}
|
||||
@@ -836,8 +856,7 @@ function SessionsSidebar() {
|
||||
className="flex items-center gap-1.5 rounded-md px-2 py-1.5 text-xs uppercase tracking-wider text-muted-foreground transition-colors hover:bg-accent hover:text-foreground"
|
||||
>
|
||||
<SettingsIcon className="size-3" />
|
||||
Settings
|
||||
</button>
|
||||
{t("Settings")}</button>
|
||||
</Hint>
|
||||
</div>
|
||||
</div>
|
||||
@@ -868,8 +887,7 @@ function SessionsSidebar() {
|
||||
}}
|
||||
className="flex items-center rounded-lg px-2.5 py-1.5 text-left text-foreground transition-colors hover:bg-accent"
|
||||
>
|
||||
Rename
|
||||
</button>
|
||||
{t("Rename")}</button>
|
||||
{/* Export as Markdown (owner, release polish 2026-10-06): the
|
||||
session-markdown engine's user-facing debut — same-origin
|
||||
anchor download; the route's Content-Disposition names the
|
||||
@@ -890,8 +908,7 @@ function SessionsSidebar() {
|
||||
}}
|
||||
className="flex items-center rounded-lg px-2.5 py-1.5 text-left text-foreground transition-colors hover:bg-accent"
|
||||
>
|
||||
Export as Markdown…
|
||||
</button>
|
||||
{t("Export as Markdown…")}</button>
|
||||
<button
|
||||
type="button"
|
||||
data-testid="ctx-delete"
|
||||
@@ -902,8 +919,7 @@ function SessionsSidebar() {
|
||||
}}
|
||||
className="flex items-center rounded-lg px-2.5 py-1.5 text-left text-muted-foreground/80 transition-colors hover:bg-accent hover:text-foreground"
|
||||
>
|
||||
Delete…
|
||||
</button>
|
||||
{t("Delete…")}</button>
|
||||
<div className="my-0.5 border-t border-border/60" aria-hidden="true" />
|
||||
<CoverageMenuBlock chatId={ctxChatId} />
|
||||
</MenuShell>
|
||||
|
||||
+41
-37
@@ -1,10 +1,17 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useEffect, useMemo, useRef, useState, type ReactNode } from "react";
|
||||
import { contextWindow, sessionCost, turnCost, type ChatSettings, type TurnUsage } from "@/src/core";
|
||||
import { formatTokens, formatUsd, prettyModel } from "@/components/usage-format";
|
||||
import { subscriptionLabels, subscriptionLabel, type Language, type SessionPricing, type TurnUsage } from "@/src/core";
|
||||
import { formatTokens, formatUsd, planCostLabel, prettyModel } from "@/components/usage-format";
|
||||
import { ModelControl, catalogLimits, useModelCatalog } from "@/components/model-picker";
|
||||
|
||||
export function formatContextMeasurement(tokens: number | null, limit: number | null, language: Language = "en"): string {
|
||||
const numerator = tokens === null ? "?" : formatTokens(tokens, language);
|
||||
return limit === null ? numerator : `${numerator} / ${formatTokens(limit, language)}`;
|
||||
}
|
||||
|
||||
/**
|
||||
* The below-composer stats bar (wave 4 observability): the session's
|
||||
* money/context footprint as one quiet row beneath the composer —
|
||||
@@ -16,23 +23,23 @@ import { ModelControl, catalogLimits, useModelCatalog } from "@/components/model
|
||||
* there died with the injection; a "— · —" summary over an empty
|
||||
* popover is pure noise) — the dictation strip's middle simply widens.
|
||||
*
|
||||
* All folds come from core/prices.ts (sessionCost, contextWindow, turnCost)
|
||||
* — no cost math lives here. Absent data renders "—", never zero (the
|
||||
* doctrine): no turns yet → every figure is "—"; turns the price table
|
||||
* can't price count as unpriced, shown in the popover, never folded into
|
||||
* a fake $0. The RIGHT side is the model + thinking control (components/
|
||||
* model-picker.tsx): one controller for the conversation agents, backed by
|
||||
* pi-ai's catalog; the buttons show the EFFECTIVE model (the record's
|
||||
* settings, else config's pin), while the left-side figures still fold the
|
||||
* turn log's actual billed models.
|
||||
* Spending arrives already priced by the server through Pi's catalog and
|
||||
* calculator. Missing cost stays "—", never fake zero. Context is a separate
|
||||
* completed-conversation measurement, never a money-log/summarizer fold or
|
||||
* transcript estimate. Its catalog denominator follows the selected model;
|
||||
* model changes preserve the numerator. Successful compaction clears it to ?.
|
||||
*/
|
||||
export function StatsBar({
|
||||
turns,
|
||||
contextTokens = null,
|
||||
pricing,
|
||||
dictationSlot,
|
||||
chatId,
|
||||
leadingSlot,
|
||||
}: {
|
||||
turns: TurnUsage[];
|
||||
contextTokens?: number | null;
|
||||
pricing?: SessionPricing;
|
||||
/** The bound session (per-session models, owner 2026-09-28): present
|
||||
* on the in-session bar — the model control binds THE SESSION'S own
|
||||
* record; absent on the draft surfaces, where it binds the strong
|
||||
@@ -48,7 +55,9 @@ export function StatsBar({
|
||||
* data (which renders nothing pre-chat on that surface). */
|
||||
leadingSlot?: ReactNode;
|
||||
}) {
|
||||
const { t, language } = useI18n();
|
||||
const [open, setOpen] = useState(false);
|
||||
const [selectedModel, setSelectedModel] = useState<string | undefined>();
|
||||
// Same dropdown discipline as the model control (owner, df4433f treatment,
|
||||
// stats round 1): close on any pointerdown outside the bar or on Escape.
|
||||
const barRef = useRef<HTMLDivElement>(null);
|
||||
@@ -73,22 +82,18 @@ export function StatsBar({
|
||||
document.removeEventListener("keydown", onKeyDown);
|
||||
};
|
||||
}, [open]);
|
||||
// The live-limits join (context-meter amendment, owner 2026-09-23):
|
||||
// contextWindow's denominator resolves ONLY from pi's live catalog —
|
||||
// built client-side over the picker's cached /api/models fetch (the
|
||||
// same fetch ModelControl below rides; module-level dedupe). Catalog
|
||||
// pending or failed → undefined index → limit null → USAGE-ONLY (the
|
||||
// honest-render precedent, never a fake window); the usage-only render
|
||||
// IS the null path.
|
||||
// Catalog-only denominator; the picker reports its effective selection.
|
||||
// Missing/pending catalog means usage-only, never a hardcoded maximum.
|
||||
const { catalog } = useModelCatalog();
|
||||
const limits = useMemo(() => (catalog ? catalogLimits(catalog) : undefined), [catalog]);
|
||||
const ctx = contextWindow({ turns }, limits);
|
||||
const { cost, unpriced } = sessionCost({ turns });
|
||||
const limit = selectedModel ? limits?.get(selectedModel) ?? null : null;
|
||||
const contextLabel = formatContextMeasurement(contextTokens, limit, language);
|
||||
const { cost = 0, unpriced = turns.length, subscription = 0 } = pricing ?? {};
|
||||
// Honest cost: show dollars only when at least one turn priced;
|
||||
// otherwise "—" (never a fake $0.0000).
|
||||
const pricedCount = turns.length - unpriced;
|
||||
const costLabel = pricedCount > 0 ? formatUsd(cost) : "—";
|
||||
const lastModel = turns.at(-1)?.model;
|
||||
const pricedCount = turns.length - unpriced - subscription;
|
||||
const providers = pricing?.subscriptionProviders ?? subscriptionLabels(turns.map((turn) => turn.model));
|
||||
const costLabel = planCostLabel(pricedCount > 0 ? cost : null, providers, (value) => formatUsd(value, language));
|
||||
|
||||
return (
|
||||
<div
|
||||
@@ -110,7 +115,7 @@ export function StatsBar({
|
||||
{leadingSlot}
|
||||
{/* The left side: the session-data summary — only once a session
|
||||
exists (turns). Pre-chat renders nothing (see the header). */}
|
||||
{turns.length > 0 && (
|
||||
{(chatId || turns.length > 0) && (
|
||||
<div ref={barRef} className="relative">
|
||||
{/* No tooltip — the numbers describe themselves and the popover
|
||||
speaks on click (owner, subtlety round 2026-09-25). */}
|
||||
@@ -122,7 +127,7 @@ export function StatsBar({
|
||||
className="flex items-center gap-1.5 tabular-nums transition-colors hover:text-foreground"
|
||||
>
|
||||
<span data-testid="stats-context">
|
||||
{ctx ? (ctx.limit !== null ? `${formatTokens(ctx.usedTokens)} / ${formatTokens(ctx.limit)}` : formatTokens(ctx.usedTokens)) : "—"}
|
||||
{contextLabel}
|
||||
</span>
|
||||
<span aria-hidden>·</span>
|
||||
<span data-testid="stats-cost">{costLabel}</span>
|
||||
@@ -133,22 +138,22 @@ export function StatsBar({
|
||||
className="absolute bottom-full left-1/2 z-40 mb-1.5 w-72 -translate-x-1/2 rounded-xl border bg-card p-3 text-xs shadow-xl"
|
||||
>
|
||||
<div className="mb-2 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
Session stats
|
||||
</div>
|
||||
{t("Session stats")}</div>
|
||||
<div className="flex flex-col gap-1 text-muted-foreground">
|
||||
<div className="flex justify-between gap-2">
|
||||
<span>Context (last call)</span>
|
||||
<span>{t("Context (last call)")}</span>
|
||||
<span className="tabular-nums text-card-foreground">
|
||||
{ctx ? (ctx.limit !== null ? `${formatTokens(ctx.usedTokens)} / ${formatTokens(ctx.limit)}` : formatTokens(ctx.usedTokens)) : "—"}
|
||||
{contextLabel}
|
||||
</span>
|
||||
</div>
|
||||
<div className="flex justify-between gap-2">
|
||||
<span>Total cost</span>
|
||||
<span>{subscription ? t("Usage") : t("Total cost")}</span>
|
||||
<span className="tabular-nums text-card-foreground">{costLabel}</span>
|
||||
</div>
|
||||
{providers.includes("ChatGPT") && <a href="https://chatgpt.com/settings/usage" target="_blank" rel="noreferrer" className="underline underline-offset-2">{t("Manage ChatGPT usage")}</a>}
|
||||
{unpriced > 0 && (
|
||||
<div className="flex justify-between gap-2">
|
||||
<span>Unpriced turns</span>
|
||||
<span>{t("Unpriced turns")}</span>
|
||||
<span className="tabular-nums text-card-foreground">{unpriced}</span>
|
||||
</div>
|
||||
)}
|
||||
@@ -156,19 +161,18 @@ export function StatsBar({
|
||||
{turns.length > 0 && (
|
||||
<>
|
||||
<div className="mb-1 mt-2.5 border-t pt-2 text-xs font-medium uppercase tracking-wide text-muted-foreground">
|
||||
Turns
|
||||
</div>
|
||||
{t("Turns")}</div>
|
||||
<ul className="flex max-h-56 flex-col gap-1 overflow-y-auto">
|
||||
{turns.map((turn, i) => {
|
||||
const c = turnCost(turn);
|
||||
const c = pricing?.turnCosts[turn.id] ?? null;
|
||||
return (
|
||||
<li key={`${turn.messageId}-${i}`} className="flex items-center justify-between gap-2">
|
||||
<span className="truncate text-muted-foreground">
|
||||
#{i + 1} · {prettyModel(turn.model, true)}
|
||||
</span>
|
||||
<span className="flex shrink-0 items-center gap-2 tabular-nums text-card-foreground">
|
||||
<span className="text-muted-foreground">{turn.steps.length} steps</span>
|
||||
<span>{c === null ? "—" : formatUsd(c)}</span>
|
||||
<span className="text-muted-foreground">{turn.steps.length}{" "}{t("steps")}</span>
|
||||
<span>{subscriptionLabel(turn.model) ?? (c === null ? "—" : formatUsd(c, language))}</span>
|
||||
</span>
|
||||
</li>
|
||||
);
|
||||
@@ -189,7 +193,7 @@ export function StatsBar({
|
||||
{/* The model + thinking control — one controller for the conversation
|
||||
agents (prober/teacher); the record's `turns` above still folds
|
||||
the ACTUAL models billed, regardless of what the picker says. */}
|
||||
<ModelControl chatId={chatId} />
|
||||
<ModelControl chatId={chatId} onModelChange={setSelectedModel} />
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
import { useEffect, useRef, useState } from "react";
|
||||
import { ChevronDownIcon } from "lucide-react";
|
||||
@@ -83,6 +85,7 @@ export function ThinkingBlock({
|
||||
/** On the card's own background: no band (the accent read too light). */
|
||||
inCard?: boolean;
|
||||
}) {
|
||||
const { t } = useI18n();
|
||||
const [open, setOpen] = useState(() => resolveUserThinkingOpen(defaultOpen));
|
||||
// ⌘T: an explicit global set overrides every row (once set, rows re-sync).
|
||||
const syncedRef = useRef(false);
|
||||
@@ -123,7 +126,7 @@ export function ThinkingBlock({
|
||||
aria-expanded={open}
|
||||
className="flex w-full items-center gap-2 font-medium uppercase tracking-wide text-muted-foreground transition-colors hover:text-foreground"
|
||||
>
|
||||
{label}
|
||||
{t(label)}
|
||||
<ChevronDownIcon className={cn("size-4 shrink-0 transition-transform", open ? "rotate-180" : "rotate-0")} />
|
||||
</button>
|
||||
{open && (
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
"use client"
|
||||
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
import * as React from "react"
|
||||
import { Tooltip, TooltipProvider, TooltipTrigger, TooltipContent } from "@/components/ui/tooltip"
|
||||
import { bindingForAction, formatBinding, type KeyAction } from "@/src/core"
|
||||
@@ -44,11 +46,12 @@ export function hintText(label: string, action?: KeyAction, binding?: string): s
|
||||
}
|
||||
|
||||
export function Hint({ label, action, binding, side = "top", children }: HintProps) {
|
||||
const { t } = useI18n();
|
||||
return (
|
||||
<TooltipProvider>
|
||||
<Tooltip>
|
||||
<TooltipTrigger asChild>{children}</TooltipTrigger>
|
||||
<TooltipContent side={side}>{hintText(label, action, binding)}</TooltipContent>
|
||||
<TooltipContent side={side}>{hintText(t(label), action, binding)}</TooltipContent>
|
||||
</Tooltip>
|
||||
</TooltipProvider>
|
||||
)
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
"use client";
|
||||
import { useI18n } from "@/components/i18n";
|
||||
|
||||
|
||||
/**
|
||||
* The auto-update banner (Wave C, owner 2026-10-10: silent download +
|
||||
@@ -19,6 +21,7 @@ import { useEffect, useState } from "react";
|
||||
type UpdateStatus = { status: string; version: string | null };
|
||||
|
||||
export default function UpdateBanner() {
|
||||
const { t } = useI18n();
|
||||
const [ready, setReady] = useState<UpdateStatus | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
@@ -35,16 +38,15 @@ export default function UpdateBanner() {
|
||||
className="fixed right-4 bottom-4 z-50 flex items-center gap-3 rounded-lg border border-border bg-popover px-4 py-3 shadow-lg"
|
||||
>
|
||||
<div className="text-sm">
|
||||
<span className="font-medium">LearnHarness {ready.version ?? "update"} is ready</span>
|
||||
<span className="text-muted-foreground"> — restart to finish installing.</span>
|
||||
<span className="font-medium">LearnHarness {ready.version ?? "update"}{" "}{t("is ready")}</span>
|
||||
<span className="text-muted-foreground"> {" "}{t("— restart to finish installing.")}</span>
|
||||
</div>
|
||||
<button
|
||||
type="button"
|
||||
onClick={() => window.lh?.installUpdate?.()}
|
||||
className="rounded-md bg-accent px-3 py-1.5 text-sm font-medium transition-colors hover:bg-accent/80"
|
||||
>
|
||||
Restart
|
||||
</button>
|
||||
{t("Restart")}</button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,15 +1,23 @@
|
||||
import { localeTag, type Language } from "@/src/core";
|
||||
/**
|
||||
* Money/token presentation helpers (wave-4 observability UI) — shared by the
|
||||
* activity dock and the stats bar. Pure; exported for tests.
|
||||
*/
|
||||
|
||||
/** USD for cent-scale money: >= $1 keeps two decimals, smaller keeps four. */
|
||||
export function formatUsd(c: number): string {
|
||||
export function formatUsd(c: number, language: Language = "en"): string {
|
||||
if (language === "ru") return `${new Intl.NumberFormat(localeTag(language), { minimumFractionDigits: c >= 1 ? 2 : 4, maximumFractionDigits: c >= 1 ? 2 : 4 }).format(c)} $`;
|
||||
return c >= 1 ? `$${c.toFixed(2)}` : `$${c.toFixed(4)}`;
|
||||
}
|
||||
|
||||
export function planCostLabel(dollars: number | null, subscription: boolean | string | readonly string[] | undefined, format = formatUsd): string {
|
||||
const labels = subscription === true ? ["ChatGPT"] : typeof subscription === "string" ? [subscription] : Array.isArray(subscription) ? [...new Set(subscription)] : [];
|
||||
return [...(dollars === null ? [] : [format(dollars)]), ...labels].join(" + ") || "—";
|
||||
}
|
||||
|
||||
/** 38000 → "38k", 1234567 → "1.2M" — trimmed, never "38.0k". */
|
||||
export function formatTokens(n: number): string {
|
||||
export function formatTokens(n: number, language: Language = "en"): string {
|
||||
if (language === "ru") return new Intl.NumberFormat("ru-RU", { notation: "compact", maximumFractionDigits: 1 }).format(n);
|
||||
if (n >= 1e6) return `${+(n / 1e6).toFixed(1)}M`;
|
||||
if (n >= 1e3) return `${+(n / 1e3).toFixed(1)}k`;
|
||||
return String(n);
|
||||
|
||||
+10
-2
@@ -399,7 +399,7 @@ Practice turns the graph into problem sets the learner reasons through out loud.
|
||||
```mermaid
|
||||
flowchart LR
|
||||
subgraph DESKTOP["Electron app (production)"]
|
||||
MAIN["Electron main (electron/main.cjs)<br/>thin launcher + security guard<br/>1 IPC channel: lh:expand-window"] -->|"spawn: ELECTRON_RUN_AS_NODE,<br/>loopback port, LH_DATA_DIR=userData/data"| NEXT["standalone Next server (child)<br/>ALL app logic: turns · extraction · jobs · graph"]
|
||||
MAIN["Electron main (electron/main.cjs)<br/>launcher + credential/security owner<br/>origin-pinned controls · private child IPC"] -->|"spawn: ELECTRON_RUN_AS_NODE,<br/>loopback port, LH_DATA_DIR=userData/data"| NEXT["standalone Next server (child)<br/>ALL app logic: turns · extraction · jobs · graph"]
|
||||
MAIN -->|"loadURL, sandboxed renderer"| REND["Browser renderer (components/)<br/>fetch/WebSocket to own origin only"]
|
||||
end
|
||||
subgraph OUTSIDE["outside the process"]
|
||||
@@ -417,10 +417,18 @@ flowchart LR
|
||||
REND -->|"fetch /api/*"| NEXT
|
||||
```
|
||||
|
||||
The Electron main is a launcher + security guard, never a host for app logic: single-instance lock, deny-by-default permissions, origin-pinned navigation, sandboxed renderer. All Next.js code runs unchanged in a child process (`output: "standalone"`), relocated by the `LH_DATA_DIR` seam (also the test seam — `data-dir-seam.test.ts` covers it, including a fresh-child-process case). The build hard-fails if repo `data/` would leak into the bundle or if prompt assets fall out of the trace (`scripts/build-server.mjs`).
|
||||
The Electron main is a launcher + credential/security guard, never a host for teaching or inference logic: single-instance lock, deny-by-default permissions, origin-pinned navigation, sandboxed renderer. All Next.js code runs unchanged in a child process (`output: "standalone"`), relocated by the `LH_DATA_DIR` seam (also the test seam — `data-dir-seam.test.ts` covers it, including a fresh-child-process case). The build hard-fails if repo `data/` would leak into the bundle or if prompt assets fall out of the trace (`scripts/build-server.mjs`).
|
||||
|
||||
---
|
||||
|
||||
### 8.1 Subscription connection boundary
|
||||
|
||||
`electron/chatgpt.cjs` retains the existing verified-account ChatGPT authentication, storage and revocation behavior. `electron/subscriptions.cjs` delegates GitHub Copilot/Grok login and refresh to the installed Pi SDK through its public provider/Models interfaces. Their single saved connections live independently in owner-only, atomically written `github-copilot-credentials.json` / `xai-credentials.json` beside the existing app credential files. Electron main alone owns durable OAuth credentials and serialized refresh; no global Pi files or API-key credential precedence are involved.
|
||||
|
||||
The renderer gets projected status, public device user codes, prompts and controls over origin-pinned IPC. The privately launched server child receives credential-free catalogs and scoped request auth (including native headers/account endpoints), never refresh tokens. `src/agent/subscription-bridge.ts` rejects framework-only IPC and invalidates stale connection/catalog scopes. `subscription-stream.ts` dispatches directly through native providers, retaining native protocol identity on the wire and restoring logical app identity in assistant history. Persisted routes `chatgpt`, `github-copilot-subscription` and `xai-subscription` are distinct from ordinary API routes and never fall back to them.
|
||||
|
||||
`subscription-request-cycle.ts` is the shared admission/automatic-input recovery state machine; the old ChatGPT module is its compatibility export. Background consent is independent per provider, default ON, with foreground-preserving cancellation and queue ownership retained on no-dispatch. Native usage rejected before dispatch is transiently excluded from helper usage collectors, without adding persisted provenance fields. Catalogs and read-time pricing preserve the selected connection: subscription use displays compact provider labels, API dollars remain dollars, and mixed usage joins both without estimating subscription dollars or claiming detected tiers/allowances.
|
||||
|
||||
## 9. The foundational invariants — what ALWAYS holds
|
||||
|
||||
### Tier A — machine-enforced (`eslint.config.mjs`; lint fails the build)
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
# Compaction and usage accounting
|
||||
|
||||
## Retention
|
||||
|
||||
`src/core/compaction.ts` locally ports the cutoff-selection behavior and relevant
|
||||
message-size heuristic from **@earendil-works/pi-coding-agent 1.4.0**. There is no
|
||||
coding-agent dependency. Upgrade this port deliberately; the native golden
|
||||
fixtures are in `tests/compaction-native-parity.test.ts`.
|
||||
|
||||
Walk backward to the approximately 20,000-token retained-tail budget, then select
|
||||
the nearest valid user/assistant boundary at or after the crossing. Never start
|
||||
at a tool result. If trailing results alone exceed the budget, keep the preceding
|
||||
assistant call. Preserve adjacent context-invisible metadata. LearnHarness adapts
|
||||
its visible custom markers to user-like entries, excludes UI-only markers, and
|
||||
uses the active compaction's retained history rather than discarded messages.
|
||||
|
||||
Text, visible thinking, tool-call names/arguments use characters divided by four;
|
||||
images receive the native fixed 1,200-token allowance. Encrypted signatures are
|
||||
not measured or stripped. Whole-message boundaries can overshoot. This does
|
||||
**not** guarantee a measured 20k tail or a fixed post-compaction request size.
|
||||
|
||||
Only cutoff selection is ported. LearnHarness retains its educational summary
|
||||
prompt, plan continuity, persistence, threshold, scheduling, and authorization
|
||||
lifecycle. It does not adopt Pi's coding summary or separate split-turn summary
|
||||
calls. A cut that drops no active history does not launch a summarizer.
|
||||
|
||||
## Conversation meter
|
||||
|
||||
The numerator is the latest qualifying completed conversation response's native
|
||||
Pi `input + output + cacheRead + cacheWrite`. Reasoning is already inside output;
|
||||
`totalTokens` is not an override. Partial stream updates, errors, aborts, invalid
|
||||
counts, and all-zero usage do not replace the last measurement. A successful
|
||||
compaction marker invalidates earlier measurements: show `? / maximum` until a
|
||||
new qualifying response completes. Summarizer usage never supplies this meter.
|
||||
|
||||
The denominator follows the selected model's catalog limit, independently of the
|
||||
last numeric measurement. Changing models preserves that numerator. No catalog
|
||||
limit means no invented denominator; no percentage display is added.
|
||||
|
||||
## Spending
|
||||
|
||||
`src/server/pricing.ts` uses Pi AI's full, key-independent catalog and public
|
||||
`calculateCost` on a new usage object. The browser receives derived costs, not a
|
||||
second calculator/rate table. Totals are estimates using the currently shipped
|
||||
catalog, not provider invoices; catalog updates can reprice history.
|
||||
|
||||
Saved input is Pi-normalized **fresh input**, disjoint from cache buckets. Never
|
||||
subtract cached reads from it again or migrate old logs as raw inclusive prompt
|
||||
tokens. New captures preserve the one-hour subset of cache writes and individual
|
||||
background-job calls. Older write-bearing records with a lost retention split,
|
||||
and tier-priced multi-call jobs with only aggregate usage, remain unpriced when
|
||||
the lost detail can change the answer. They are not reconstructed from totals.
|
||||
Flat-rate historical jobs with sufficient counts remain priceable. Missing models
|
||||
or required usage stay unpriced; ChatGPT subscriptions remain plan usage, not
|
||||
API dollars. Summarizer costs continue to count toward session spending.
|
||||
|
||||
## Upstream attribution
|
||||
|
||||
The cutoff/estimator port adapts MIT-licensed code from
|
||||
`@earendil-works/pi-coding-agent` 1.4.0, author Mario Zechner (published package
|
||||
metadata). The inspected `dist/core/compaction/compaction.js` SHA-256 is
|
||||
`f51e78ef1da66b5803fc91e185f07b968f8f989ab9326b7744958416aad3f6f6`.
|
||||
|
||||
MIT License
|
||||
|
||||
Copyright (c) Mario Zechner
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
of this software and associated documentation files (the "Software"), to deal
|
||||
in the Software without restriction, including without limitation the rights
|
||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in
|
||||
all copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
THE SOFTWARE.
|
||||
@@ -1,5 +1,8 @@
|
||||
# Desktop builds and releases
|
||||
|
||||
For this fork’s Linux and Windows 0.6.0 release on Gitea, see [Gitea releases](gitea-release.md).
|
||||
The three-platform GitHub process below documents the upstream reference.
|
||||
|
||||
## Platforms
|
||||
|
||||
| Platform | Build runner | Packages | In-app update |
|
||||
|
||||
+5
-2
@@ -30,7 +30,6 @@ npm run desktop:dist # local signed/notarized macOS arm64 build (LH_NOTARY key
|
||||
npx tsx --env-file=.env.local scripts/import-notes.ts <dir> # bulk-import notes → graph
|
||||
npx tsx --env-file=.env.local scripts/backfill-graph.ts # wipe + re-extract every chat
|
||||
npx tsx --env-file=.env.local scripts/replay-layout.ts # re-derive layout from the ledgers
|
||||
npx tsx scripts/sync-pricing.ts # regenerate core/prices.ts tables
|
||||
```
|
||||
|
||||
For Windows/Linux packages and the three-OS CI/release flow, see [`desktop-release.md`](desktop-release.md). Native renderer binaries are traced per platform, so release builds run on the target OS, not as cross-builds from macOS.
|
||||
@@ -144,7 +143,7 @@ src/
|
||||
electron/ desktop launcher + security guard (spawns the standalone
|
||||
server; 1 IPC channel; LH_DATA_DIR + BYOK env)
|
||||
scripts/ build-server.mjs (packaging guards), import-notes,
|
||||
backfill-graph, replay-layout, sync-pricing
|
||||
backfill-graph, replay-layout
|
||||
data/ chats/ · graph/ (nodes/chains/sessions/coverage
|
||||
ledgers + positions/sources/render-settings maps) ·
|
||||
jobs/ · settings.json — runtime state, git-ignored
|
||||
@@ -152,6 +151,10 @@ data/ chats/ · graph/ (nodes/chains/sessions/coverage
|
||||
|
||||
## Key mechanisms
|
||||
|
||||
See [compaction and accounting](compaction-accounting.md) for the local Pi cutoff port,
|
||||
measurement-only context meter, and server-side current-catalog pricing. There is no
|
||||
pricing-generation step: Pi AI's catalog and public calculator are the authority.
|
||||
|
||||
**Client-side question tools.** `quiz` and `ask_user_question` have no server `execute`: the tool call streams to the browser, the learner answers in the dock, the client grades via `question-core` and returns the verdict with `addToolOutput` — which fires the SDK continuation so the teacher resumes mid-turn. Options are shuffled deterministically (seeded by toolCallId) so server and client renders match. A pending quiz persisted in the chat record is exactly what makes **resume mid-question free**.
|
||||
|
||||
**The formal plan tree (author-once).** The teacher authors the session's dependency tree with one schema-validated tool — `plan_init`, whose mermaid-subset input is parsed deterministically (line-numbered errors) and validated as a DAG. The tree persists in the chat record; progress is never mutated — `current`/`visited`/upcoming are **derived** from tagged quiz calls in the transcript, and the panel renders that derivation.
|
||||
|
||||
@@ -0,0 +1,156 @@
|
||||
# Gitea releases for this fork
|
||||
|
||||
The release destination is
|
||||
https://server2.sorokin-oleg-edu.xyz/replicated/learnharness.
|
||||
Version **0.6.0 targets Linux x64 and Windows x64**, with each platform built
|
||||
and verified on its native operating system. The upstream GitHub workflow and three-platform packaging
|
||||
configuration remain available as reference in `.github/workflows/release.yml`
|
||||
and `electron-builder.yml`.
|
||||
|
||||
Official fork packages use `electron-builder.gitea.yml`, which inherits the
|
||||
upstream packaging and replaces its update origin with:
|
||||
|
||||
```
|
||||
https://server2.sorokin-oleg-edu.xyz/replicated/learnharness/releases/download/latest
|
||||
```
|
||||
|
||||
Gitea's `latest` alias resolves the most recent published, non-prerelease release.
|
||||
Drafts do not become updates. The repository and published downloads must be
|
||||
public; no API credential is embedded in the application.
|
||||
|
||||
## Preparing Linux packages
|
||||
|
||||
Use Node **26**, matching upstream's release gates. Build from a clean checkout
|
||||
of the intended release commit. Keep `.env*`, local keys, and application data out
|
||||
of the build directory. Next can copy loaded environment files after tracing;
|
||||
`build-server.mjs` refuses a payload containing them. A clean worktree avoids
|
||||
loading these files in the first place.
|
||||
|
||||
```sh
|
||||
npm ci
|
||||
npm run typecheck
|
||||
npm test
|
||||
npm run lint
|
||||
ELECTRON_RUN_AS_NODE=1 npx electron --import tsx --test tests/pdf-native-render.test.ts tests/pdf-ops.test.ts tests/svg-native-render.test.ts tests/browser-service.test.ts
|
||||
npm run desktop:release:linux
|
||||
```
|
||||
|
||||
The release script builds the standalone server, initializes providers offline,
|
||||
curates the payload, boots it under Electron's bundled Node, packages AppImage
|
||||
and Debian installers, checks the packaged Gitea updater configuration, creates SHA-256 checksums, and verifies update metadata
|
||||
against the actual installer bytes.
|
||||
|
||||
Run the packaged-runtime gates too:
|
||||
|
||||
```sh
|
||||
node scripts/smoke-provider-runtime.mjs --standalone dist/linux-unpacked/resources/server/standalone
|
||||
node scripts/smoke-provider-runtime.mjs --standalone dist/linux-unpacked/resources/server/standalone --runtime dist/linux-unpacked/learnharness
|
||||
xvfb-run -a node scripts/smoke-demo-runtime.mjs --standalone dist/linux-unpacked/resources/server/standalone --runtime dist/linux-unpacked/learnharness --browser
|
||||
```
|
||||
|
||||
The Linux portion of 0.6.0 has these attachments:
|
||||
|
||||
- `LearnHarness-0.6.0-x86_64.AppImage`
|
||||
- `LearnHarness-0.6.0-amd64.deb`
|
||||
- `latest-linux.yml`
|
||||
- `SHA256SUMS`
|
||||
|
||||
## Preparing Windows packages
|
||||
|
||||
Use a clean checkout of the same `v0.6.0` tag on Windows x64 with Node 26 and Git
|
||||
for Windows. Keep build tools and logs outside the checkout. The Windows
|
||||
release checkout is `~/Documents/Gitea/learnharness-release-0.6.0`, linked to the
|
||||
existing repository in `~/Documents/Gitea/learnharness`.
|
||||
|
||||
In PowerShell, stop after any failed command:
|
||||
|
||||
```powershell
|
||||
npm.cmd ci
|
||||
$env:NODE_ENV = 'test'
|
||||
$env:ELECTRON_RUN_AS_NODE = '1'
|
||||
node node_modules/electron/cli.js --import tsx --test tests/pdf-native-render.test.ts tests/pdf-ops.test.ts tests/svg-native-render.test.ts tests/browser-service.test.ts
|
||||
Remove-Item Env:ELECTRON_RUN_AS_NODE
|
||||
node --import tsx --test tests/i18n.test.tsx
|
||||
Remove-Item Env:NODE_ENV
|
||||
node node_modules/next/dist/bin/next build
|
||||
node scripts/smoke-provider-runtime.mjs
|
||||
node scripts/build-server.mjs
|
||||
node scripts/smoke-server.mjs --electron
|
||||
node node_modules/electron-builder/out/cli/cli.js --config electron-builder.gitea.yml --win --x64 --publish never
|
||||
node scripts/gitea-release.mjs verify-package dist/win-unpacked
|
||||
node scripts/smoke-provider-runtime.mjs --standalone dist/win-unpacked/resources/server/standalone
|
||||
node scripts/smoke-provider-runtime.mjs --standalone dist/win-unpacked/resources/server/standalone --runtime dist/win-unpacked/LearnHarness.exe
|
||||
node scripts/smoke-demo-runtime.mjs --standalone dist/win-unpacked/resources/server/standalone --runtime dist/win-unpacked/LearnHarness.exe --browser
|
||||
```
|
||||
|
||||
Windows contributes three attachments:
|
||||
|
||||
- `LearnHarness-0.6.0-x64-setup.exe`
|
||||
- `LearnHarness-0.6.0-x64-setup.exe.blockmap`
|
||||
- `latest.yml`
|
||||
|
||||
The combined release has **seven attachments**, including one `SHA256SUMS`
|
||||
covering all six other files. Verify that `latest.yml` names the Windows
|
||||
installer exactly, reports version `0.6.0`, and matches the installer's actual
|
||||
size and SHA-512. Its gzip blockmap must cover the installer and match every
|
||||
block checksum. Confirm the packaged `resources/app-update.yml` uses the Gitea
|
||||
generic provider. Windows builds follow upstream's unsigned, per-user installer
|
||||
configuration.
|
||||
|
||||
## Preparing a Linux-only Gitea draft
|
||||
|
||||
Commit and push the release source, then push its exact annotated tag:
|
||||
|
||||
```sh
|
||||
git tag -a v0.6.0 -m 'LearnHarness 0.6.0'
|
||||
git push gitea main v0.6.0
|
||||
```
|
||||
|
||||
Supply `GITEA_TOKEN` only to the upload command. A token file may remain outside
|
||||
the clean build checkout:
|
||||
|
||||
```sh
|
||||
node --env-file=/path/to/private/release.env scripts/gitea-release.mjs upload dist
|
||||
```
|
||||
|
||||
The tool requires the tag to exist in Gitea, creates or reuses one draft at that
|
||||
tag, uploads missing assets, and downloads every attachment to verify its actual
|
||||
SHA-256 against the local verified build. Existing mismatched attachments and
|
||||
published releases are refused. It never publishes or changes repository
|
||||
visibility. Release notes come from `docs/release-0.6.0.md`.
|
||||
|
||||
This uploader and its remote verifier enforce a **Linux-only** inventory. They
|
||||
will refuse a combined Linux/Windows draft. For the combined 0.6.0 release, add
|
||||
the verified Windows attachments to the existing draft and replace `SHA256SUMS`
|
||||
with the combined manifest. Keep the Linux installers and feed unchanged. Check
|
||||
all seven attachment names and sizes against the verified local builds. For
|
||||
the owner-approved 0.6.0 release, local installer/feed/blockmap validation and
|
||||
the combined checksum manifest are completed before upload. Confirm successful
|
||||
upload responses and publish immediately afterward; do not download attachments
|
||||
again or run post-upload hash checks. Do not publish until both platforms'
|
||||
local checks pass.
|
||||
|
||||
A separate verification can be repeated without changing the draft:
|
||||
|
||||
```sh
|
||||
node --env-file=/path/to/private/release.env scripts/gitea-release.mjs verify-remote dist
|
||||
```
|
||||
|
||||
Review the verified draft before publication. Only after publication will the
|
||||
public `latest` feed and in-app automatic updates expose this version.
|
||||
|
||||
## Gitea Actions
|
||||
|
||||
`.gitea/workflows/release.yml` provides the same Linux gates through a manual
|
||||
workflow with an existing release tag as input. It requires a native Linux x64
|
||||
runner labeled `ubuntu-24.04`, the label used by upstream's Linux release job,
|
||||
plus the native Electron dependencies and `xvfb-run`. There were no runners
|
||||
registered when 0.6.0 was prepared, so its packages are built locally. A tag push
|
||||
does not queue a job that cannot run.
|
||||
|
||||
The workflow uses the repository's ephemeral `GITEA_TOKEN` with release-write
|
||||
permission only in the final upload step. It checks out the requested tag without
|
||||
persisting credentials and leaves the result as a verified draft. Public pull
|
||||
requests cannot trigger this publishing workflow. This workflow remains
|
||||
Linux-only; the combined 0.6.0 draft was assembled from local native builds.
|
||||
Windows has its own standalone payload and smoke checks, as described above.
|
||||
@@ -0,0 +1,54 @@
|
||||
# Language support
|
||||
|
||||
LearnHarness supports English and Russian. Settings → General contains independent
|
||||
interface and speech recognition language selectors. The microphone also has a
|
||||
speech language selector. Each offers System default, English, and Русский.
|
||||
|
||||
System default uses the preferred browser language (the operating system's
|
||||
preferred language in the desktop app); Russian locales select Russian and other
|
||||
locales select English. Explicit choices persist in `settings.json` as
|
||||
`general.language` and `general.sttLanguage`. Removing a field restores automatic
|
||||
selection. Changing one preference preserves the other general settings.
|
||||
|
||||
The interface changes immediately, including accessibility labels and the desktop
|
||||
menu. New AI teaching, questions, plans, practice, graph descriptions, research,
|
||||
figures, and demos use the interface language. Existing conversations and imported
|
||||
source material retain their authored text. A session retains the language of its
|
||||
latest foreground turn so automatic follow-ups can use the same language after a
|
||||
restart; an explicit app language preference takes precedence.
|
||||
|
||||
Speech recognition uses Deepgram Nova-3 with an explicit `language=en` or
|
||||
`language=ru`. A recording captures the selected language when it starts and keeps
|
||||
that language through reconnections. The selector is disabled while recording;
|
||||
changes elsewhere take effect on the next recording. Audio capture, deferred
|
||||
transcript insertion, stopping, and cancellation retain their existing behavior.
|
||||
|
||||
## Maintaining translations
|
||||
|
||||
The pure localization functions live in `src/core/i18n.ts` and are exported through
|
||||
the core barrel. English and Russian catalogs are in `src/core/locales/en.json` and
|
||||
`ru.json`. English source phrases are message keys. Add every new app-owned message
|
||||
to both catalogs, use named interpolation parameters, and use plural entries with
|
||||
`Intl.PluralRules` for counts. Russian entries may use `one`, `few`, `many`, and
|
||||
`other` forms. Keep code, provider/model names, identifiers, and user-authored text
|
||||
out of translation lookups.
|
||||
|
||||
React components use `useI18n()` from `components/i18n.tsx`. The root provider gets
|
||||
server-resolved initial settings and locale to preserve hydration. General-setting
|
||||
writes share a serialized read-modify-write path; other surfaces use the existing
|
||||
settings-saved signal. Server and agent code receive an explicit language rather
|
||||
than depending on a mutable global translation state.
|
||||
|
||||
Some existing protocol errors arrive preformatted in English. Localization can
|
||||
recognize cataloged application templates at the display boundary, preserving the
|
||||
canonical error values used for classification and any third-party diagnostics.
|
||||
Raw technical instructions, code, and user overrides remain editable source data.
|
||||
|
||||
The desktop shell has its own small catalog in `electron/language.cjs`, packaged
|
||||
with the shell. Its narrow `lh:language` channel accepts only `en` and `ru` from a
|
||||
trusted application window. Russian prose uses Noto Sans because Source Sans 3
|
||||
has no Cyrillic subset. Explicit font choices continue to take precedence.
|
||||
|
||||
`tests/i18n.test.tsx` covers preference validation, automatic selection, independent
|
||||
STT requests, catalog parity and interpolation, Russian plural forms, SSR locale
|
||||
isolation, translated dialogs and exports, agent instructions, and native labels.
|
||||
@@ -0,0 +1,59 @@
|
||||
# LearnHarness 0.4.0
|
||||
|
||||
## English
|
||||
|
||||
LearnHarness now supports English and Russian throughout the interface and new
|
||||
AI learning content. Switch languages in **Settings → General**. The interface
|
||||
language and speech recognition language are independent and persist across
|
||||
restarts; System default follows the browser or operating system, using English
|
||||
for unsupported languages.
|
||||
|
||||
- Russian translations cover lessons, practice, the knowledge graph, setup,
|
||||
settings, dialogs, tooltips, accessibility labels, notifications, exports,
|
||||
desktop menus, and application error messages.
|
||||
- New teaching, questions, plans, practice, graph descriptions, research,
|
||||
diagrams, and interactive demos follow the interface language.
|
||||
- Choose English or Russian speech recognition next to the microphone or in
|
||||
General settings. A recording retains its language through reconnections;
|
||||
changing the preference affects the next recording.
|
||||
- Russian text uses a Cyrillic-capable reading font, correct plural forms,
|
||||
localized numbers, and filenames that preserve Cyrillic characters.
|
||||
- Language changes preserve other settings. Existing conversations and imported
|
||||
learning material retain their original text.
|
||||
|
||||
This Gitea release includes **Linux x64** AppImage and Debian packages and a
|
||||
**Windows x64** installer. Both platforms were built and checked on their native
|
||||
operating systems. Automatic updates use this fork's public Gitea releases.
|
||||
The Windows installer is unsigned, matching upstream's Windows packaging.
|
||||
|
||||
To use live dictation, configure a Deepgram key under **Settings → Providers**.
|
||||
To start AI sessions, connect an AI provider and select the required model tiers.
|
||||
|
||||
## Русский
|
||||
|
||||
LearnHarness теперь поддерживает английский и русский языки во всём интерфейсе
|
||||
и в новых учебных материалах, создаваемых ИИ. Язык можно выбрать в разделе
|
||||
**Настройки → Общие**. Язык интерфейса и язык распознавания речи выбираются
|
||||
независимо и сохраняются после перезапуска. В режиме «Язык системы» используется
|
||||
язык браузера или операционной системы; для неподдерживаемых языков — английский.
|
||||
|
||||
- Переведены занятия, практика, граф знаний, первоначальная настройка,
|
||||
параметры приложения, диалоги, подсказки, подписи для программ чтения с экрана,
|
||||
уведомления, экспорт, меню настольного приложения и сообщения об ошибках.
|
||||
- Новые объяснения, вопросы, планы, практические задачи, описания в графе,
|
||||
исследования, диаграммы и интерактивные демонстрации используют язык интерфейса.
|
||||
- Английский или русский язык распознавания речи можно выбрать рядом с микрофоном
|
||||
или в общих настройках. Запись сохраняет выбранный язык при восстановлении
|
||||
соединения; изменение настройки применяется к следующей записи.
|
||||
- Для русского текста добавлен шрифт с кириллицей, правильные формы множественного
|
||||
числа, локализованное отображение чисел и поддержка кириллицы в именах файлов.
|
||||
- Смена языка сохраняет остальные настройки. Существующие разговоры и
|
||||
импортированные учебные материалы остаются на исходном языке.
|
||||
|
||||
Этот выпуск в Gitea включает пакеты AppImage и Debian для **Linux x64** и
|
||||
установщик для **Windows x64**. Сборка и проверка каждой версии выполнены в её
|
||||
операционной системе. Автоматические обновления используют публичные выпуски
|
||||
этого форка в Gitea. Установщик Windows не подписан — как и в исходном проекте.
|
||||
|
||||
Для диктовки добавьте ключ Deepgram в разделе **Настройки → Провайдеры**.
|
||||
Для занятий с ИИ подключите провайдера и выберите модели для всех нужных уровней.
|
||||
@@ -0,0 +1,62 @@
|
||||
# LearnHarness 0.5.0
|
||||
|
||||
## English
|
||||
|
||||
This release adds ChatGPT Fast mode and improves the language controls and
|
||||
Russian settings layout introduced in 0.4.0.
|
||||
|
||||
- Interface-language and speech-recognition selectors in **Settings → General**,
|
||||
plus the quick selector beside the microphone, now use the app's styled menus.
|
||||
The menus include selected-item checkmarks and keyboard navigation; Escape
|
||||
closes the menu and restores focus to its trigger. Language preferences stay
|
||||
independent, and STT selection remains locked while recording.
|
||||
- **Quizzing** keeps its full Russian labels. The label and segmented control
|
||||
share a row when space permits. Narrower panels stack the control beneath the
|
||||
hint with matching left alignment and enough height for wrapped text.
|
||||
- **Settings → Agent** now has a **⚡ Fast** toggle for each Strong, Cheap, and
|
||||
Vision model tier. Fast mode is **off by default** and initially available only
|
||||
for **ChatGPT** connections. It requests priority processing and may consume
|
||||
more ChatGPT plan allowance; availability depends on the model and account.
|
||||
- Fast preferences take effect on the **next request**, including existing
|
||||
ChatGPT conversations and newly started background work in the corresponding
|
||||
tier. The selected model and reasoning effort are preserved. Selecting another
|
||||
provider turns Fast off for that tier; other providers show it as unavailable.
|
||||
- Unsupported Fast requests produce actionable, localized errors. Connections
|
||||
keep their existing account, background-consent, and no-API-key-fallback rules.
|
||||
|
||||
Packages: **Linux x64** AppImage and Debian, and a **Windows x64** installer.
|
||||
Both platforms use this fork's public Gitea releases for automatic updates.
|
||||
Windows packaging remains unsigned, matching upstream.
|
||||
|
||||
## Русский
|
||||
|
||||
В этом выпуске добавлен быстрый режим ChatGPT и улучшены языковые настройки
|
||||
и их отображение на русском языке, появившиеся в версии 0.4.0.
|
||||
|
||||
- Выбор языка интерфейса и распознавания речи в разделе **Настройки → Общие**,
|
||||
а также быстрый выбор языка рядом с микрофоном теперь используют меню в стиле
|
||||
приложения. Выбранный пункт отмечен галочкой, поддерживается управление
|
||||
клавиатурой. Escape закрывает меню и возвращает фокус на кнопку. Языковые
|
||||
настройки остаются независимыми; язык распознавания нельзя менять во время
|
||||
записи.
|
||||
- В разделе **Проверка понимания** сохранены полные русские подписи. Если места
|
||||
достаточно, заголовок и переключатель расположены в одной строке. В узких
|
||||
панелях переключатель размещается под пояснением с выравниванием по левому
|
||||
краю; высота кнопок учитывает перенос текста.
|
||||
- В разделе **Настройки → Агент** появился переключатель **⚡ Быстро** для каждого
|
||||
уровня моделей: основной, экономичной и с поддержкой изображений. Быстрый
|
||||
режим **отключён по умолчанию** и пока доступен только для подключений
|
||||
**ChatGPT**. Он запрашивает приоритетную обработку и может быстрее расходовать
|
||||
лимит ChatGPT. Доступность зависит от модели и учётной записи.
|
||||
- Настройка применяется к **следующему запросу**, в том числе в существующих
|
||||
занятиях с ChatGPT и в новых фоновых задачах соответствующего уровня.
|
||||
Выбранная модель и уровень рассуждений сохраняются. При выборе другого
|
||||
провайдера быстрый режим для этого уровня отключается; для остальных
|
||||
провайдеров переключатель недоступен.
|
||||
- Если быстрый режим не поддерживается, приложение показывает понятную ошибку
|
||||
на выбранном языке. Сохраняются выбранная учётная запись, разрешения на
|
||||
фоновую работу и запрет автоматического перехода на API-ключ.
|
||||
|
||||
Пакеты: AppImage и Debian для **Linux x64**, установщик для **Windows x64**.
|
||||
Обе версии используют публичные выпуски этого форка в Gitea для автоматических
|
||||
обновлений. Установщик Windows не подписан, как и в исходном проекте.
|
||||
@@ -0,0 +1,53 @@
|
||||
# LearnHarness 0.5.1
|
||||
|
||||
## English
|
||||
|
||||
This release adds multilingual speech recognition and simplifies the STT picker
|
||||
beside the microphone.
|
||||
|
||||
- **Settings → General → Speech recognition language** now includes
|
||||
**Multilingual**. It uses Deepgram Nova-3's `language=multi` mode for speech
|
||||
that switches between supported languages, including Russian and English.
|
||||
The preference is saved and applies to the next recording, including any
|
||||
reconnects during that recording.
|
||||
- The chat STT picker now offers **English**, **Русский**, and **Multilingual**.
|
||||
The compact button displays **Multi** when multilingual recognition is selected.
|
||||
The **Auto · LANG** entry has been removed from this picker.
|
||||
- **System default** remains available in General settings. When it is active,
|
||||
the chat picker displays the resolved English or Russian language. Opening
|
||||
the picker preserves System default; choosing a language saves that explicit
|
||||
preference, even when it matches the current system language.
|
||||
- Interface and STT languages remain independently selectable. Existing
|
||||
preferences and system defaults are preserved, and both STT controls remain
|
||||
locked while recording. The menus retain keyboard navigation and selected-item
|
||||
checkmarks.
|
||||
|
||||
Packages: **Linux x64** AppImage and Debian, and a **Windows x64** installer.
|
||||
Both platforms use this fork's public Gitea releases for automatic updates.
|
||||
Windows packaging remains unsigned, matching the previous release.
|
||||
|
||||
## Русский
|
||||
|
||||
В этом выпуске добавлено многоязычное распознавание речи и упрощён выбор языка
|
||||
рядом с микрофоном.
|
||||
|
||||
- В разделе **Настройки → Общие → Язык распознавания речи** появился вариант
|
||||
**Несколько языков**. Он включает режим `language=multi` в Deepgram Nova-3
|
||||
для речи с переключением между поддерживаемыми языками, в том числе русским
|
||||
и английским. Выбор сохраняется и применяется к следующей записи, включая
|
||||
повторные подключения во время этой записи.
|
||||
- В меню языка распознавания рядом с микрофоном теперь доступны **English**,
|
||||
**Русский** и **Несколько языков**. При многоязычном распознавании компактная
|
||||
кнопка показывает **Мульти**. Пункт **Авто · LANG** из этого меню удалён.
|
||||
- В общих настройках по-прежнему доступен вариант **Язык системы**. Если он
|
||||
выбран, кнопка рядом с микрофоном показывает фактически используемый язык:
|
||||
английский или русский. Открытие меню не меняет настройку. Выбор языка
|
||||
сохраняет его явно, даже если он совпадает с текущим языком системы.
|
||||
- Язык интерфейса и язык распознавания остаются независимыми. Сохраняются
|
||||
прежние предпочтения и выбор языка системы. Оба переключателя языка
|
||||
распознавания заблокированы во время записи. Меню поддерживают управление
|
||||
клавиатурой и отмечают выбранный пункт галочкой.
|
||||
|
||||
Пакеты: AppImage и Debian для **Linux x64**, установщик для **Windows x64**.
|
||||
Обе версии используют публичные выпуски этого форка в Gitea для автоматических
|
||||
обновлений. Установщик Windows не подписан, как и в предыдущем выпуске.
|
||||
@@ -0,0 +1,56 @@
|
||||
# LearnHarness 0.5.2
|
||||
|
||||
## English
|
||||
|
||||
This release adds preferred speech-recognition languages and fixes the model
|
||||
settings layout.
|
||||
|
||||
- **Settings → General → Preferred languages** offers **English** and **Русский**
|
||||
checkboxes below the label and explanation. Select both with **Multilingual**
|
||||
to guide recognition toward Russian and English in the same recording.
|
||||
Preferred languages are hints, so other supported languages may still be
|
||||
recognized. Leaving both unchecked keeps automatic detection.
|
||||
- Preferences are saved independently of interface language and STT mode.
|
||||
They remain saved when a single-language mode is selected, but are sent only
|
||||
with Multilingual. The controls lock while saving or recording, and a failed
|
||||
save preserves the previous choice and shows a localized error.
|
||||
- Each recording keeps its language and preferred-language hints through any
|
||||
reconnects. Later preference changes apply to the next recording.
|
||||
- **Settings → Agent** now gives model-tier descriptions a flexible text column.
|
||||
Model, reasoning, and Fast controls stay together and align across tiers.
|
||||
Narrow panels place the complete control group below the description,
|
||||
aligned left. Long model names keep their existing ellipsis, and background-use
|
||||
permission buttons occupy a separate line.
|
||||
|
||||
Packages: **Linux x64** AppImage and Debian, and a **Windows x64** installer.
|
||||
Both platforms use this fork's public Gitea releases for automatic updates.
|
||||
Windows packaging remains unsigned, matching previous releases.
|
||||
|
||||
## Русский
|
||||
|
||||
В этом выпуске добавлен выбор предпочитаемых языков распознавания речи
|
||||
и исправлено расположение элементов в настройках моделей.
|
||||
|
||||
- В разделе **Настройки → Общие → Предпочитаемые языки** появились флажки
|
||||
**English** и **Русский**, расположенные под заголовком и пояснением.
|
||||
Выберите оба в режиме **Несколько языков**, чтобы отдавать приоритет русскому
|
||||
и английскому в одной записи. Это подсказки для распознавания: другие
|
||||
поддерживаемые языки тоже могут быть распознаны. Если оба флажка сняты,
|
||||
используется автоматическое определение языка.
|
||||
- Предпочтения сохраняются независимо от языка интерфейса и режима распознавания.
|
||||
При выборе одного языка они сохраняются, но отправляются только в режиме
|
||||
«Несколько языков». Флажки заблокированы во время сохранения и записи.
|
||||
Если сохранить настройку не удалось, прежний выбор сохраняется, а приложение
|
||||
показывает ошибку на выбранном языке.
|
||||
- Язык и подсказки фиксируются на время записи, включая повторные подключения.
|
||||
Последующие изменения применяются к следующей записи.
|
||||
- В разделе **Настройки → Агент** описания уровней моделей занимают гибкую
|
||||
текстовую колонку. Выбор модели, уровня рассуждения и быстрый режим остаются
|
||||
вместе и выровнены между уровнями. В узких панелях вся группа располагается
|
||||
под описанием с выравниванием по левому краю. Длинные названия моделей
|
||||
по-прежнему сокращаются многоточием, а кнопки разрешения фоновой работы
|
||||
размещаются на отдельной строке.
|
||||
|
||||
Пакеты: AppImage и Debian для **Linux x64**, установщик для **Windows x64**.
|
||||
Обе версии используют публичные выпуски этого форка в Gitea для автоматических
|
||||
обновлений. Установщик Windows не подписан, как и в предыдущих выпусках.
|
||||
@@ -0,0 +1,63 @@
|
||||
# LearnHarness 0.6.0
|
||||
|
||||
## English
|
||||
|
||||
This release adds OpenRouter speech recognition and a dedicated speech-recognition
|
||||
settings page, with cleaner controls in English and Russian.
|
||||
|
||||
- **OpenRouter STT:** choose **MAI-Transcribe-2 · OpenRouter** and add your
|
||||
OpenRouter API key under **Settings → Providers**. The app records locally,
|
||||
sends the whole recording after **Stop**, and shows **Transcribing…** until
|
||||
the complete transcript is ready. Audio is not split into speech segments.
|
||||
Cancelling aborts the request; submitting an answer or message waits for
|
||||
transcription. The permanent API key stays on the server and audio is not
|
||||
saved to disk. Recordings are limited to 25 MB, about 13 minutes.
|
||||
- **Settings → Speech recognition** now contains the model, recognition language,
|
||||
and preferred languages. The two model choices use the same format:
|
||||
**Nova-3 · Deepgram** and **MAI-Transcribe-2 · OpenRouter**. General settings
|
||||
contains only interface language and automatic updates.
|
||||
- **Preferred languages** uses a styled checkbox dropdown aligned on the right.
|
||||
It stays open while selecting English and Russian, shows **No preference**
|
||||
when neither is selected, and no longer dims or flashes while saving.
|
||||
These hints remain available for Deepgram Multilingual. MAI uses automatic
|
||||
language detection for Multilingual; its API does not expose a RU + EN hint
|
||||
list. Saved hints are retained when switching models.
|
||||
- On Linux, clicking an available **Fast** button keeps the normal cursor while
|
||||
the setting is saved.
|
||||
|
||||
Existing settings remain compatible and direct Deepgram Nova-3 remains the
|
||||
default. Linux x64 packages include AppImage and Debian; Windows x64 has an
|
||||
installer. Both platforms use this fork's public Gitea releases for automatic
|
||||
updates. The Windows installer remains unsigned, as in previous releases.
|
||||
|
||||
## Русский
|
||||
|
||||
В этом выпуске добавлено распознавание речи через OpenRouter и отдельный раздел
|
||||
его настроек. Элементы управления обновлены на русском и английском языках.
|
||||
|
||||
- **Распознавание через OpenRouter:** выберите **MAI-Transcribe-2 · OpenRouter**
|
||||
и добавьте API-ключ OpenRouter в разделе **Настройки → Провайдеры**. Приложение
|
||||
записывает речь локально, отправляет всю запись после остановки и показывает
|
||||
**Распознавание…** до получения полного текста. Речь не разбивается на
|
||||
отдельные фрагменты. Отмена прерывает запрос, а отправка ответа или сообщения
|
||||
дожидается завершения распознавания. Постоянный API-ключ остаётся на сервере,
|
||||
аудио не сохраняется на диск. Максимальный размер записи — 25 МБ, примерно
|
||||
13 минут.
|
||||
- Новый раздел **Настройки → Распознавание речи** содержит выбор модели, языка
|
||||
распознавания и предпочитаемых языков. Названия моделей оформлены одинаково:
|
||||
**Nova-3 · Deepgram** и **MAI-Transcribe-2 · OpenRouter**. В разделе «Общие»
|
||||
остались только язык интерфейса и автоматические обновления.
|
||||
- **Предпочитаемые языки** выбираются в оформленном в стиле приложения
|
||||
выпадающем меню с флажками справа. Меню остаётся открытым при выборе русского
|
||||
и английского. Если оба флажка сняты, отображается **Без предпочтений**.
|
||||
Во время сохранения меню больше не тускнеет и не мигает. Подсказки работают
|
||||
в многоязычном режиме Deepgram. MAI определяет языки автоматически: его API
|
||||
не предоставляет списка подсказок RU + EN. Сохранённые предпочтения остаются
|
||||
при переключении моделей.
|
||||
- В Linux нажатие доступной кнопки **Быстро** больше не меняет курсор на время
|
||||
сохранения настройки.
|
||||
|
||||
Прежние настройки совместимы; по умолчанию по-прежнему используется Deepgram
|
||||
Nova-3 напрямую. Для Linux x64 доступны AppImage и Debian, для Windows x64 —
|
||||
установщик. Обе версии получают автоматические обновления из публичных выпусков
|
||||
этого форка в Gitea. Установщик Windows не подписан, как и в предыдущих выпусках.
|
||||
+18
@@ -0,0 +1,18 @@
|
||||
# Speech recognition
|
||||
|
||||
Settings → Speech recognition contains the model, recognition language and preferred-language controls. The model picker offers two choices:
|
||||
|
||||
- **Nova-3 · Deepgram** (the default): streams microphone audio directly to Deepgram using a short-lived token. Add a Deepgram API key under Providers.
|
||||
- **MAI-Transcribe-2 · OpenRouter**: records locally in memory and sends the complete recording in one request after Stop. Add an OpenRouter API key under Providers; the existing key also works if OpenRouter is already configured for chat. The permanent key stays on the server.
|
||||
|
||||
Both insert the transcript after recording finishes. OpenRouter displays **Transcribing…** while waiting. Sending a chat message or answer during recording waits for transcription before continuing. Cancel or Escape discards dictation; cancelling during transcription aborts the request and ignores late results. Navigating away releases the microphone and cancels pending transcription.
|
||||
|
||||
The interface language, recognition language, and STT model are saved independently. Model and language changes apply to the next recording, and their controls lock during recording/transcription. Existing settings continue to use Deepgram until another model is selected.
|
||||
|
||||
English and Russian select a single recognition language. **Multilingual** uses automatic language detection in MAI, including mixed-language speech. Its documented API accepts only one forced language and has no preferred-language list; saved RU/EN hints remain available for Deepgram and are disabled when MAI is selected. They are not sent as keyword hints or an ignored prompt.
|
||||
|
||||
OpenRouter audio is a lossless WAV container around the same 16 kHz mono PCM capture used for Deepgram. Stop drains the microphone's final partial frame before sending it. There is no speech splitting, silence removal, automatic provider fallback, or automatic transcription retry. The inline audio limit is 25 MB (about 13 minutes at this format); exceeding it stops recording with an error. Provider processing can time out for long recordings even within the size limit. Audio is not saved to disk.
|
||||
|
||||
The renderer sends WAV bytes to `POST /api/stt/transcribe?model=microsoft/mai-transcribe-2&language=en|ru|multi`. The server validates the model, language, WAV format and body size, reads `OPENROUTER_API_KEY` through the normal key store, and posts base64 audio to OpenRouter's dedicated transcription endpoint. Provider diagnostics are replaced with localized app errors, without returning credentials or audio. Offline tests mock all provider calls.
|
||||
|
||||
References: [OpenRouter transcription API](https://openrouter.ai/docs/guides/overview/multimodal/stt), [MAI-Transcribe-2](https://openrouter.ai/microsoft/mai-transcribe-2), [Microsoft language and model options](https://learn.microsoft.com/en-us/azure/ai-services/speech-service/mai-transcribe).
|
||||
@@ -0,0 +1,8 @@
|
||||
# Official packages for this fork. Upstream packaging stays in electron-builder.yml.
|
||||
extends: ./electron-builder.yml
|
||||
publish:
|
||||
# Use an object: electron-builder concatenates inherited publish arrays.
|
||||
provider: generic
|
||||
# Gitea resolves the latest published, non-prerelease release here.
|
||||
# Drafts remain private and do not become an update before publication.
|
||||
url: https://server2.sorokin-oleg-edu.xyz/replicated/learnharness/releases/download/latest
|
||||
@@ -81,7 +81,12 @@ files:
|
||||
- node_modules/universalify/**/*
|
||||
- node_modules/ms/**/*
|
||||
- node_modules/argparse/**/*
|
||||
# Main-process ID-token signature verification (no bundled OAuth implementation).
|
||||
- node_modules/jose/**/*
|
||||
extraResources:
|
||||
# Attribution/license for the bounded local Pi cutoff-selector port.
|
||||
- from: docs/compaction-accounting.md
|
||||
to: licenses/pi-compaction.md
|
||||
# Copy from the PARENT dir (.next), not .next/standalone itself:
|
||||
# electron-builder hard-excludes a copy's root node_modules and the
|
||||
# default no-filter pattern is a literal path match (empirically both
|
||||
@@ -95,6 +100,11 @@ extraResources:
|
||||
filter:
|
||||
- "standalone/**/*"
|
||||
mac:
|
||||
# The backend's --require runs before Next loads. Keep this resource
|
||||
# outside app.asar so early Node-mode loading needs no ASAR support.
|
||||
extraResources:
|
||||
- from: electron/server-title-guard.cjs
|
||||
to: server-title-guard.cjs
|
||||
icon: build/icon.icon
|
||||
# zip rides next to dmg (flipped 2026-10-08): Squirrel.Mac — Electron's
|
||||
# macOS auto-updater — installs from ZIP and cannot read DMGs. DMG is
|
||||
|
||||
@@ -0,0 +1,43 @@
|
||||
"use strict";
|
||||
const { publicError } = require("./chatgpt.cjs");
|
||||
|
||||
/** Inherited Node child IPC, not a listening HTTP/socket token service. */
|
||||
function attachChatGPTChild(child, connection) {
|
||||
const send = (value) => {
|
||||
if (child.connected) child.send({ channel: "lh:chatgpt", ...value }, () => {});
|
||||
};
|
||||
const listener = async (message) => {
|
||||
if (!message || message.channel !== "lh:chatgpt" || typeof message.id !== "string" || message.id.length > 100) return;
|
||||
try {
|
||||
let value;
|
||||
if (message.op === "status") value = { status: await connection.status(), ...connection.stamp() };
|
||||
else if (message.op === "models") value = await connection.models();
|
||||
else if (message.op === "lease" && typeof message.background === "boolean") value = await connection.lease(message.background, message);
|
||||
else throw new Error("Invalid private operation");
|
||||
send({ id: message.id, op: message.op, ok: true, value });
|
||||
} catch (err) { send({ id: message.id, op: message.op, ok: false, stamp: connection.stamp(), error: publicError(err) }); }
|
||||
};
|
||||
child.on("message", listener);
|
||||
return { send, dispose: () => child.removeListener("message", listener) };
|
||||
}
|
||||
|
||||
/** Sender must be the trusted window's main frame at its exact app origin. */
|
||||
function trustedSender(event, origin, BrowserWindow) {
|
||||
const win = BrowserWindow.fromWebContents(event.sender);
|
||||
try {
|
||||
return !!win && event.senderFrame === event.sender.mainFrame && new URL(event.senderFrame.url).origin === origin;
|
||||
} catch { return false; }
|
||||
}
|
||||
async function chatGPTControl(command, connection) {
|
||||
try {
|
||||
if (command?.op === "status") return await connection.status();
|
||||
if (command?.op === "login" && (command.id === undefined || typeof command.id === "string")) return await connection.login(command.id);
|
||||
if (command?.op === "cancel") return connection.cancelLogin();
|
||||
if (command?.op === "select" && typeof command.id === "string") return await connection.select(command.id);
|
||||
if (command?.op === "disconnect" && typeof command.id === "string") return await connection.disconnect(command.id);
|
||||
if (command?.op === "logout" && typeof command.id === "string") return await connection.logout(command.id);
|
||||
if (command?.op === "consent" && typeof command.enabled === "boolean") return await connection.consent(command.enabled);
|
||||
return { error: "Unsupported ChatGPT control." };
|
||||
} catch (err) { return { error: publicError(err) }; }
|
||||
}
|
||||
module.exports = { attachChatGPTChild, trustedSender, chatGPTControl };
|
||||
@@ -0,0 +1,542 @@
|
||||
"use strict";
|
||||
|
||||
// LearnHarness-owned public-client OAuth. Never import pi's bundled login.
|
||||
// This module is main-process-only; dependencies are injectable for scratch tests.
|
||||
const crypto = require("node:crypto");
|
||||
const http = require("node:http");
|
||||
const fs = require("node:fs/promises");
|
||||
const path = require("node:path");
|
||||
|
||||
const ISSUER = "https://auth.openai.com";
|
||||
const RESOURCE = "https://api.openai.com/v1";
|
||||
const AUTHORIZE = `${ISSUER}/api/accounts/authorize`;
|
||||
const TOKEN = `${ISSUER}/api/accounts/oauth/token`;
|
||||
const JWKS = `${ISSUER}/.well-known/jwks.json`;
|
||||
const SCOPES = ["openid", "profile", "email", "offline_access", "resource.invoke", "chatgpt.tokens.use.direct"];
|
||||
const REVOCATION_WARNING = "Account disconnected locally. Remote revocation could not be confirmed.";
|
||||
const random = () => crypto.randomBytes(32).toString("base64url");
|
||||
const fail = (code) => Object.assign(new Error(code), { code });
|
||||
const publicError = (err) => ({
|
||||
cancelled: "ChatGPT sign-in cancelled.",
|
||||
timeout: "ChatGPT sign-in timed out. Try again.",
|
||||
storage: "ChatGPT credentials could not be read or saved. Check local file access, then reconnect before making requests.",
|
||||
identity: "ChatGPT sign-in could not be verified. Select the intended saved account and try again.",
|
||||
scope: "ChatGPT plan permission is missing. Reconnect and authorize ChatGPT plan use.",
|
||||
disconnected: "This ChatGPT connection is disconnected. Reconnect in Providers.",
|
||||
background: "ChatGPT background use is off in this app. Enable Allow background use for all ChatGPT accounts in Providers, or explicitly select an API-key model for that workload.",
|
||||
catalog: "The ChatGPT account model catalog is unavailable. Retry the connection; no API-key fallback was used.",
|
||||
expired: "The ChatGPT session expired. Reconnect in Providers.",
|
||||
network: "ChatGPT could not be reached. Check your connection and try again.",
|
||||
pending: "A ChatGPT sign-in is already pending.",
|
||||
unavailable: "ChatGPT sign-in is unavailable in browser-only mode.",
|
||||
}[err?.code] || "ChatGPT sign-in failed. Try again; no API-key fallback was used.");
|
||||
|
||||
const nonempty = (v) => typeof v === "string" && v.length > 0 && !/[\x00-\x20\x7f]/.test(v);
|
||||
const planScopes = (tokens) => !!tokens?.accessToken && SCOPES.every((scope) => tokens.scopes.includes(scope));
|
||||
/** Reject the entire credential record when its schema is invalid. */
|
||||
function validateState(state) {
|
||||
if (!state || state.version !== 1 || !nonempty(state.hostId) || !Array.isArray(state.registrations) || !(state.activeId === null || nonempty(state.activeId))) throw fail("storage");
|
||||
if (Object.hasOwn(state, "allowBackgroundUse") && typeof state.allowBackgroundUse !== "boolean") throw fail("storage");
|
||||
const ids = new Set(); const clients = new Set();
|
||||
for (const r of state.registrations) {
|
||||
if (!r || !nonempty(r.id) || ids.has(r.id) || !nonempty(r.clientId) || r.clientId === "dynamic_agent_client" || clients.has(r.clientId) || r.issuer !== ISSUER || !nonempty(r.subject) || (Object.hasOwn(r, "background") && typeof r.background !== "boolean") || (r.email !== undefined && typeof r.email !== "string") || (Object.hasOwn(r, "reconnectRequired") && r.reconnectRequired !== true)) throw fail("storage");
|
||||
ids.add(r.id); clients.add(r.clientId);
|
||||
if (r.tokens !== undefined) {
|
||||
const t = r.tokens;
|
||||
if (!t || !nonempty(t.idToken) || !Array.isArray(t.scopes) || t.scopes.some((s) => !nonempty(s)) || !Number.isFinite(t.expiresAt) || t.expiresAt < 0 || (t.accessToken !== undefined && (!nonempty(t.accessToken) || t.accessToken.startsWith("sk-"))) || (t.refreshToken !== undefined && !nonempty(t.refreshToken))) throw fail("storage");
|
||||
}
|
||||
}
|
||||
if (state.activeId !== null && !ids.has(state.activeId)) throw fail("storage");
|
||||
return state;
|
||||
}
|
||||
|
||||
/** Private, unencrypted JSON outside learning data. No OS credential-store access. */
|
||||
function fileStore(file) {
|
||||
return {
|
||||
async read() {
|
||||
try {
|
||||
return validateState(JSON.parse(await fs.readFile(file, "utf8")));
|
||||
} catch (err) {
|
||||
if (err.code === "ENOENT") return null;
|
||||
throw fail("storage");
|
||||
}
|
||||
},
|
||||
async write(state) {
|
||||
validateState(state);
|
||||
const temp = `${file}.${crypto.randomUUID()}.tmp`;
|
||||
let handle;
|
||||
try {
|
||||
await fs.mkdir(path.dirname(file), { recursive: true, mode: 0o700 });
|
||||
handle = await fs.open(temp, "wx", 0o600);
|
||||
await handle.writeFile(`${JSON.stringify(state)}\n`);
|
||||
await handle.sync();
|
||||
await handle.close();
|
||||
handle = null;
|
||||
await fs.rename(temp, file);
|
||||
// Directory fsync is supported on Unix; the file fsync above is mandatory.
|
||||
if (process.platform !== "win32") {
|
||||
const dir = await fs.open(path.dirname(file), "r");
|
||||
try { await dir.sync(); } finally { await dir.close(); }
|
||||
}
|
||||
} catch {
|
||||
throw fail("storage");
|
||||
} finally {
|
||||
await handle?.close().catch(() => {});
|
||||
await fs.unlink(temp).catch(() => {});
|
||||
}
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function allowedAuthEndpoint(value) {
|
||||
try {
|
||||
const url = new URL(value);
|
||||
return url.origin === ISSUER && !url.username && !url.password && !url.search && !url.hash;
|
||||
} catch { return false; }
|
||||
}
|
||||
|
||||
function createChatGPT({ store, openExternal, fetch: request = globalThis.fetch, onChange = () => {}, timeoutMs = 180000 }) {
|
||||
let state;
|
||||
let init;
|
||||
let queue = Promise.resolve();
|
||||
let epoch = 0;
|
||||
let revision = 0;
|
||||
let authorityRevision = 0;
|
||||
let catalogSequence = 0;
|
||||
let storageDenied = false;
|
||||
const stamp = () => ({ epoch, authorityRevision, revision });
|
||||
let backgroundIntent;
|
||||
let pending;
|
||||
let catalog = [];
|
||||
let catalogError = null;
|
||||
let lastError = null;
|
||||
let closed = false;
|
||||
let paused = false;
|
||||
let suspended = false;
|
||||
let retryRegistration;
|
||||
let transportAbort = new AbortController();
|
||||
let backgroundAbort = new AbortController();
|
||||
const serial = (fn) => {
|
||||
const next = queue.then(fn, fn);
|
||||
queue = next.catch(() => {});
|
||||
return next;
|
||||
};
|
||||
const active = () => !storageDenied && !suspended && !closed && !paused ? state?.registrations.find((r) => r.id === state.activeId && r.tokens && !r.reconnectRequired) : undefined;
|
||||
// These fields are validated/verified before storage. Email is never identity.
|
||||
const sameAccount = (a, b) => a.issuer === b.issuer && a.subject === b.subject;
|
||||
function accountGroups() {
|
||||
const groups = [];
|
||||
for (const record of state?.registrations || []) {
|
||||
const group = groups.find((members) => sameAccount(members[0], record));
|
||||
if (group) group.push(record); else groups.push([record]);
|
||||
}
|
||||
return groups;
|
||||
}
|
||||
const backgroundAllowed = () => state?.allowBackgroundUse !== false && backgroundIntent?.enabled !== false;
|
||||
const notify = (invalidate = "none") => { revision++; onChange({ channel: "lh:chatgpt", kind: "state", stamp: stamp(), status: snapshot(), invalidate }); };
|
||||
function stop(backgroundOnly = false) {
|
||||
if (backgroundOnly) {
|
||||
backgroundAbort.abort();
|
||||
backgroundAbort = new AbortController();
|
||||
notify("background");
|
||||
return;
|
||||
}
|
||||
suspended = true;
|
||||
epoch++;
|
||||
authorityRevision++;
|
||||
catalogSequence++;
|
||||
transportAbort.abort();
|
||||
transportAbort = new AbortController();
|
||||
catalog = [];
|
||||
catalogError = null;
|
||||
notify("all");
|
||||
}
|
||||
async function ready() {
|
||||
if (closed) throw fail("disconnected");
|
||||
if (!init) init = (async () => {
|
||||
const loaded = await store.read();
|
||||
state = loaded ? validateState(loaded) : null;
|
||||
if (!state) {
|
||||
const first = { version: 1, hostId: `urn:uuid:${crypto.randomUUID()}`, activeId: null, registrations: [] };
|
||||
await store.write(first);
|
||||
state = first;
|
||||
}
|
||||
})();
|
||||
try { await init; } catch (err) { denyStorage(err); throw err; }
|
||||
}
|
||||
function denyStorage(err) {
|
||||
if (!storageDenied) { storageDenied = true; lastError = publicError(err); stop(); }
|
||||
}
|
||||
async function save(next) {
|
||||
try { validateState(next); await store.write(next); } catch (err) {
|
||||
// A rotated token may already have invalidated its predecessor. Fail closed.
|
||||
denyStorage(err);
|
||||
lastError = publicError(err);
|
||||
notify();
|
||||
throw err;
|
||||
}
|
||||
state = next;
|
||||
}
|
||||
function snapshot() {
|
||||
return {
|
||||
available: !!state && !closed && !paused,
|
||||
pending: !!pending,
|
||||
allowBackgroundUse: backgroundAllowed(),
|
||||
activeId: state?.activeId ?? null,
|
||||
accounts: accountGroups().map((members) => {
|
||||
// Preserve the actual active registration ID at the private transport
|
||||
// boundary; inactive groups prefer a usable registration, then a
|
||||
// remembered one. No credential/client records are merged or deleted.
|
||||
const r = members.find((r) => r.id === state.activeId) ?? members.find((r) => !r.reconnectRequired && planScopes(r.tokens)) ?? members[0];
|
||||
return {
|
||||
id: r.id,
|
||||
email: r.email || "ChatGPT account",
|
||||
registration: r.clientId,
|
||||
connected: !storageDenied && !closed && !paused && !suspended && !r.reconnectRequired && planScopes(r.tokens),
|
||||
planEnabled: !storageDenied && !r.reconnectRequired && planScopes(r.tokens),
|
||||
// Recovery is authorization-only, not a response to storage failure
|
||||
// or temporary transport suspension. Never infer it from error copy.
|
||||
canSignInAgain: !storageDenied && !closed && !paused && (r.reconnectRequired === true || !planScopes(r.tokens)),
|
||||
};
|
||||
}),
|
||||
error: lastError,
|
||||
catalogError,
|
||||
};
|
||||
}
|
||||
async function status() {
|
||||
try { await ready(); } catch (err) { return { ...snapshot(), available: false, error: publicError(err) }; }
|
||||
return snapshot();
|
||||
}
|
||||
async function json(url, options = {}) {
|
||||
try {
|
||||
const response = await request(url, { ...options, redirect: "error", signal: options.signal ?? AbortSignal.timeout(15000) });
|
||||
if (!response.ok) {
|
||||
const body = await response.json().catch(() => ({}));
|
||||
const oauthCode = typeof body.error === "string" ? body.error : body.error?.code;
|
||||
throw Object.assign(fail(oauthCode === "invalid_grant" || response.status === 401 || response.status === 403 ? "expired" : "network"), { oauthCode });
|
||||
}
|
||||
return await response.json();
|
||||
} catch (err) { throw err.code ? err : fail("network"); }
|
||||
}
|
||||
async function identity(idToken, clientId, nonce, expectedSubject) {
|
||||
try {
|
||||
const { jwtVerify, createLocalJWKSet } = await import("jose");
|
||||
// Fixed, documented JWKS origin; never follow a discovery-supplied URL.
|
||||
const keys = await json(JWKS);
|
||||
const { payload } = await jwtVerify(idToken, createLocalJWKSet(keys), {
|
||||
issuer: ISSUER, audience: clientId, algorithms: ["RS256"],
|
||||
requiredClaims: ["sub", "exp", "iat"], clockTolerance: 5,
|
||||
});
|
||||
if (typeof payload.sub !== "string" || !payload.sub || (nonce !== undefined && payload.nonce !== nonce) || (expectedSubject && payload.sub !== expectedSubject)) throw fail("identity");
|
||||
if ((payload.azp !== undefined && payload.azp !== clientId) || (Array.isArray(payload.aud) && payload.aud.length > 1 && payload.azp !== clientId)) throw fail("identity");
|
||||
return { subject: payload.sub, email: typeof payload.email === "string" ? payload.email : undefined };
|
||||
} catch { throw fail("identity"); }
|
||||
}
|
||||
function tokenSet(body, previous) {
|
||||
const scopes = typeof body.scope === "string" ? body.scope.split(/\s+/) : previous?.scopes;
|
||||
if (!scopes || SCOPES.some((scope) => !scopes.includes(scope))) {
|
||||
// Lack of entitlement is not lack of revocable material.
|
||||
return { idToken: body.id_token ?? previous?.idToken, scopes: scopes ?? [], expiresAt: 0,
|
||||
...(nonempty(body.refresh_token) ? { refreshToken: body.refresh_token } : previous?.refreshToken ? { refreshToken: previous.refreshToken } : {}) };
|
||||
}
|
||||
if (typeof body.access_token !== "string" || !body.access_token || body.access_token.startsWith("sk-") || body.token_type?.toLowerCase() !== "bearer" || !Number.isFinite(body.expires_in) || body.expires_in <= 0) throw fail("identity");
|
||||
const refreshToken = body.refresh_token ?? previous?.refreshToken;
|
||||
if (!nonempty(refreshToken)) throw fail("identity");
|
||||
return { accessToken: body.access_token, refreshToken, idToken: body.id_token ?? previous?.idToken, scopes, expiresAt: Date.now() + body.expires_in * 1000 };
|
||||
}
|
||||
async function grant(fields, signal) {
|
||||
return json(TOKEN, { method: "POST", headers: { "content-type": "application/x-www-form-urlencoded", accept: "application/json" }, body: new URLSearchParams({ ...fields, resource: RESOURCE }), signal });
|
||||
}
|
||||
|
||||
async function login(accountId) {
|
||||
await ready();
|
||||
if (pending) throw fail("pending");
|
||||
if (paused) throw fail("disconnected");
|
||||
const selected = accountId ? state.registrations.find((r) => r.id === accountId) : retryRegistration;
|
||||
if (accountId && !selected) throw fail("identity");
|
||||
const attemptEpoch = epoch;
|
||||
const verifier = random();
|
||||
const nonce = random();
|
||||
const expectedState = random();
|
||||
const abort = new AbortController();
|
||||
let finish;
|
||||
const completion = new Promise((resolve) => { finish = resolve; });
|
||||
const listener = http.createServer();
|
||||
let timer;
|
||||
let consumed = false;
|
||||
const cleanup = () => { clearTimeout(timer); listener.close(); listener.closeAllConnections(); };
|
||||
const cancel = (code = "cancelled") => {
|
||||
abort.abort();
|
||||
cleanup();
|
||||
if (pending?.abort === abort) pending = null;
|
||||
lastError = publicError(fail(code));
|
||||
finish();
|
||||
notify();
|
||||
};
|
||||
pending = { abort, cancel };
|
||||
lastError = null;
|
||||
notify();
|
||||
try {
|
||||
await new Promise((resolve, reject) => {
|
||||
listener.once("error", reject);
|
||||
listener.listen(0, "127.0.0.1", resolve);
|
||||
});
|
||||
const redirectUri = `http://127.0.0.1:${listener.address().port}/auth/callback`;
|
||||
listener.on("request", async (req, res) => {
|
||||
let callback;
|
||||
try { callback = new URL(req.url || "/", redirectUri); }
|
||||
catch { res.writeHead(400).end(); return; }
|
||||
res.setHeader("Cache-Control", "no-store");
|
||||
res.setHeader("Content-Security-Policy", "default-src 'none'");
|
||||
res.setHeader("Referrer-Policy", "no-referrer");
|
||||
if (req.method !== "GET" || callback.origin !== new URL(redirectUri).origin || callback.pathname !== "/auth/callback" || req.headers.host !== new URL(redirectUri).host || consumed) { res.writeHead(404).end(); return; }
|
||||
const params = callback.searchParams;
|
||||
// Reject duplicate parameters and unsolicited callbacks without consuming a valid pending attempt.
|
||||
if (["state", "code", "client_id", "error"].some((key) => params.getAll(key).length > 1) || params.get("state") !== expectedState) { res.writeHead(400).end("Sign-in could not be verified."); return; }
|
||||
consumed = true;
|
||||
res.writeHead(200, { "content-type": "text/plain; charset=utf-8" }).end("Return to LearnHarness to view the sign-in result. You may close this tab.");
|
||||
cleanup();
|
||||
try {
|
||||
if (params.has("error")) throw fail(params.get("error") === "access_denied" ? "cancelled" : "identity");
|
||||
const clientId = params.get("client_id") || selected?.clientId;
|
||||
if (!clientId || clientId === "dynamic_agent_client" || clientId.length > 512 || /[\s\x00-\x1f]/.test(clientId) || (selected && clientId !== selected.clientId) || !params.get("code")) throw fail("identity");
|
||||
let body;
|
||||
try { body = await grant({ grant_type: "authorization_code", client_id: clientId, code: params.get("code"), code_verifier: verifier, redirect_uri: redirectUri }, AbortSignal.any([abort.signal, AbortSignal.timeout(15000)])); }
|
||||
catch (err) {
|
||||
if (err.oauthCode === "invalid_grant" && !selected?.subject) retryRegistration = { clientId };
|
||||
throw err;
|
||||
}
|
||||
if (typeof body.id_token !== "string") throw fail("identity");
|
||||
const verified = await identity(body.id_token, clientId, nonce, selected?.subject);
|
||||
const tokens = tokenSet(body);
|
||||
await serial(async () => {
|
||||
if (closed || abort.signal.aborted || epoch !== attemptEpoch) throw fail("cancelled");
|
||||
const existing = state.registrations.find((r) => r.clientId === clientId);
|
||||
if (existing && existing.subject !== verified.subject) throw fail("identity");
|
||||
const record = { id: existing?.id ?? crypto.randomUUID(), clientId, issuer: ISSUER, ...verified, tokens };
|
||||
const next = structuredClone(state);
|
||||
next.registrations = next.registrations.filter((r) => r.id !== record.id).concat(record);
|
||||
next.activeId = record.id;
|
||||
const previous = structuredClone(state);
|
||||
await save(next); // Active identity changes only AFTER validation and durable persistence.
|
||||
if (closed || abort.signal.aborted || epoch !== attemptEpoch) {
|
||||
await save(previous);
|
||||
throw fail("cancelled");
|
||||
}
|
||||
stop();
|
||||
storageDenied = false;
|
||||
suspended = false;
|
||||
retryRegistration = undefined;
|
||||
});
|
||||
lastError = planScopes(tokens) ? null : publicError(fail("scope"));
|
||||
} catch (err) { if (!abort.signal.aborted) lastError = publicError(err); }
|
||||
finally { if (pending?.abort === abort) pending = null; finish(); notify(); }
|
||||
});
|
||||
timer = setTimeout(() => cancel("timeout"), timeoutMs);
|
||||
const url = new URL(AUTHORIZE);
|
||||
url.search = new URLSearchParams({
|
||||
client_id: selected?.clientId ?? "dynamic_agent_client",
|
||||
...(selected ? {} : { agent_name_hint: "LearnHarness" }),
|
||||
ext_agent_host_id: state.hostId,
|
||||
...(selected?.tokens?.idToken ? { id_token_hint: selected.tokens.idToken } : {}),
|
||||
...(selected?.email ? { login_hint: selected.email } : {}),
|
||||
response_type: "code", redirect_uri: redirectUri, scope: SCOPES.join(" "), resource: RESOURCE,
|
||||
state: expectedState, nonce, code_challenge_method: "S256",
|
||||
code_challenge: crypto.createHash("sha256").update(verifier).digest("base64url"),
|
||||
}).toString();
|
||||
await openExternal(url.toString()); // Trusted main only. Never return this URL to the renderer.
|
||||
} catch (err) { cancel(err.code || "network"); }
|
||||
void completion;
|
||||
return snapshot();
|
||||
}
|
||||
function cancelLogin() { pending?.cancel(); return snapshot(); }
|
||||
|
||||
function authorized(background, expected, capturedEpoch) {
|
||||
const account = active();
|
||||
if (!account || (capturedEpoch !== undefined && capturedEpoch !== epoch)) throw fail("disconnected");
|
||||
if (!planScopes(account.tokens)) throw fail("scope");
|
||||
if (expected && (expected.expectedAccountId !== account.id || expected.expectedAuthorityRevision !== authorityRevision || !catalog.some((m) => m.id === expected.selectedModelId))) throw fail("catalog");
|
||||
if (background && !backgroundAllowed()) throw fail("background");
|
||||
return account;
|
||||
}
|
||||
async function credential(background, expected) {
|
||||
await ready();
|
||||
return serial(async () => {
|
||||
const requestEpoch = epoch;
|
||||
const account = authorized(background, expected);
|
||||
if (account.tokens.expiresAt <= Date.now() + 60000) {
|
||||
const refreshEpoch = epoch;
|
||||
const signal = AbortSignal.any([transportAbort.signal, ...(background ? [backgroundAbort.signal] : []), AbortSignal.timeout(15000)]);
|
||||
let body;
|
||||
try { body = await grant({ grant_type: "refresh_token", client_id: account.clientId, refresh_token: account.tokens.refreshToken }, signal); }
|
||||
catch (err) {
|
||||
if (err.oauthCode === "invalid_grant") {
|
||||
const next = structuredClone(state);
|
||||
delete next.registrations.find((r) => r.id === account.id).tokens;
|
||||
next.activeId = null;
|
||||
await save(next);
|
||||
stop();
|
||||
notify();
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
let tokens;
|
||||
try {
|
||||
if (body.id_token !== undefined) await identity(body.id_token, account.clientId, undefined, account.subject);
|
||||
tokens = tokenSet(body, account.tokens);
|
||||
} catch (err) {
|
||||
// The fixed token endpoint may have rotated already. Preserve only
|
||||
// verified identity and a single likely-latest revocation handle.
|
||||
stop();
|
||||
const restricted = structuredClone(state);
|
||||
const record = restricted.registrations.find((r) => r.id === account.id);
|
||||
record.reconnectRequired = true;
|
||||
if (nonempty(body.refresh_token)) record.tokens.refreshToken = body.refresh_token;
|
||||
await save(restricted);
|
||||
lastError = publicError(fail("identity")); notify();
|
||||
throw err;
|
||||
}
|
||||
// A successful remote rotation must be durably retained even when
|
||||
// logout, account selection, consent revocation, or pause denies use.
|
||||
// Those serialized operations will revoke/clear the LATEST token.
|
||||
const next = structuredClone(state);
|
||||
next.registrations.find((r) => r.id === account.id).tokens = tokens;
|
||||
await save(next);
|
||||
if (closed || refreshEpoch !== epoch || signal.aborted) throw fail("disconnected");
|
||||
}
|
||||
const current = authorized(background, expected, requestEpoch);
|
||||
return { accessToken: current.tokens.accessToken, accountId: current.id, ...stamp() };
|
||||
});
|
||||
}
|
||||
async function lease(background, expected) {
|
||||
if (typeof background !== "boolean" || !expected || !nonempty(expected.expectedAccountId) || !Number.isSafeInteger(expected.expectedAuthorityRevision) || !nonempty(expected.selectedModelId)) throw fail("catalog");
|
||||
return credential(background, expected);
|
||||
}
|
||||
const modelValue = () => ({ ...stamp(), status: snapshot(), accountId: active()?.id ?? null, models: catalog });
|
||||
async function models() {
|
||||
const sequence = ++catalogSequence;
|
||||
try {
|
||||
await ready();
|
||||
if (!active()) return modelValue();
|
||||
// Discovery is identity/scope authorization, not an invented model lease.
|
||||
const token = await credential(false);
|
||||
const body = await json(`${RESOURCE}/models`, { headers: { Authorization: `Bearer ${token.accessToken}` }, signal: AbortSignal.any([transportAbort.signal, AbortSignal.timeout(15000)]) });
|
||||
authorized(false, undefined, token.epoch);
|
||||
if (sequence !== catalogSequence || active()?.id !== token.accountId || !Array.isArray(body.models)) throw fail("catalog");
|
||||
const visible = body.models.filter((m) => m && m.visibility === "list" && nonempty(m.slug) && typeof m.display_name === "string").map((m) => ({ id: m.slug, name: m.display_name }));
|
||||
const changed = JSON.stringify(visible) !== JSON.stringify(catalog);
|
||||
catalog = visible;
|
||||
if (changed) authorityRevision++;
|
||||
const hadError = catalogError !== null; catalogError = null;
|
||||
if (changed || hadError) notify();
|
||||
return modelValue();
|
||||
} catch {
|
||||
if (sequence === catalogSequence) {
|
||||
if (catalog.length) { catalog = []; authorityRevision++; }
|
||||
catalogError = publicError(fail("catalog")); notify();
|
||||
}
|
||||
return modelValue();
|
||||
}
|
||||
}
|
||||
async function select(id) {
|
||||
pending?.cancel();
|
||||
stop();
|
||||
const selectionIntent = epoch;
|
||||
await ready();
|
||||
return serial(async () => {
|
||||
const account = state.registrations.find((r) => r.id === id);
|
||||
if (!account?.tokens) throw fail("disconnected");
|
||||
await save({ ...state, activeId: id });
|
||||
if (epoch !== selectionIntent || closed || paused || storageDenied) throw fail("disconnected");
|
||||
suspended = false;
|
||||
lastError = null;
|
||||
notify();
|
||||
return snapshot();
|
||||
});
|
||||
}
|
||||
async function consent(enabled) {
|
||||
if (typeof enabled !== "boolean") throw fail("identity");
|
||||
// One app-owned intent, independent of account/registration lifetime.
|
||||
const intent = { enabled: false };
|
||||
backgroundIntent = intent; // ON cannot grant until its durable save.
|
||||
if (!enabled) stop(true); // Revoke all ChatGPT background streams only.
|
||||
await ready();
|
||||
return serial(async () => {
|
||||
await save({ ...structuredClone(state), allowBackgroundUse: enabled });
|
||||
if (backgroundIntent === intent && enabled) backgroundIntent = undefined;
|
||||
notify();
|
||||
return snapshot();
|
||||
});
|
||||
}
|
||||
async function revoke(account) {
|
||||
let revoked = false;
|
||||
try {
|
||||
if (account.tokens?.refreshToken) {
|
||||
const config = await json(`${ISSUER}/.well-known/openid-configuration`);
|
||||
if (config.issuer !== ISSUER || !allowedAuthEndpoint(config.revocation_endpoint)) throw fail("identity");
|
||||
for (let attempt = 0; attempt < 2; attempt++) {
|
||||
if (attempt) await new Promise((resolve) => setTimeout(resolve, 200));
|
||||
try {
|
||||
const response = await request(config.revocation_endpoint, { method: "POST", redirect: "error", signal: AbortSignal.timeout(5000), headers: { "content-type": "application/x-www-form-urlencoded" }, body: new URLSearchParams({ token: account.tokens.refreshToken, token_type_hint: "refresh_token", client_id: account.clientId }) });
|
||||
revoked = response.status === 200;
|
||||
if (revoked || response.status < 500) break;
|
||||
} catch { /* retry only while the refresh token is still in memory */ }
|
||||
}
|
||||
}
|
||||
} catch { /* local action is mandatory even when revocation is unavailable */ }
|
||||
return revoked;
|
||||
}
|
||||
async function disconnect(id) {
|
||||
// Explicit local forgetting: a visible account represents every retained
|
||||
// registration with this exact verified issuer/subject, never its email.
|
||||
pending?.cancel();
|
||||
const initial = state?.registrations.find((r) => r.id === id);
|
||||
let stopped = !!initial && state.registrations.some((r) => r.id === state.activeId && sameAccount(r, initial));
|
||||
if (stopped) stop();
|
||||
await ready();
|
||||
return serial(async () => {
|
||||
const target = state.registrations.find((r) => r.id === id);
|
||||
if (!target) throw fail("identity");
|
||||
const members = state.registrations.filter((r) => sameAccount(r, target));
|
||||
const activeGroup = members.some((r) => r.id === state.activeId);
|
||||
if (activeGroup && !stopped) { stop(); stopped = true; }
|
||||
const disconnectEpoch = epoch;
|
||||
let revoked = true;
|
||||
for (const member of members) { const confirmed = await revoke(member); revoked = confirmed && revoked; }
|
||||
const next = structuredClone(state);
|
||||
next.registrations = next.registrations.filter((r) => !sameAccount(r, target));
|
||||
if (activeGroup) next.activeId = null; // Never silently select another account.
|
||||
await save(next);
|
||||
if (members.some((r) => r.clientId === retryRegistration?.clientId)) retryRegistration = undefined;
|
||||
if (stopped && !closed && epoch === disconnectEpoch) suspended = false;
|
||||
lastError = revoked ? null : REVOCATION_WARNING;
|
||||
notify();
|
||||
return snapshot();
|
||||
});
|
||||
}
|
||||
async function logout(id) {
|
||||
pending?.cancel();
|
||||
stop();
|
||||
await ready();
|
||||
return serial(async () => {
|
||||
const account = state.registrations.find((r) => r.id === id);
|
||||
if (!account) throw fail("identity");
|
||||
const revoked = await revoke(account);
|
||||
const next = structuredClone(state);
|
||||
delete next.registrations.find((r) => r.id === id).tokens;
|
||||
if (next.activeId === id) next.activeId = null;
|
||||
const logoutEpoch = epoch;
|
||||
await save(next);
|
||||
if (!closed && epoch === logoutEpoch) suspended = false;
|
||||
lastError = revoked ? null : REVOCATION_WARNING;
|
||||
notify();
|
||||
return snapshot();
|
||||
});
|
||||
}
|
||||
function close() { closed = true; pending?.cancel(); stop(); }
|
||||
function pause() { paused = true; pending?.cancel(); stop(); notify(); }
|
||||
function resume() { paused = false; if (!storageDenied) suspended = false; notify(); }
|
||||
return { status, login, cancelLogin, lease, models, select, consent, disconnect, logout, close, pause, resume, stamp };
|
||||
}
|
||||
|
||||
module.exports = { createChatGPT, fileStore, publicError, allowedAuthEndpoint, SCOPES, validateState };
|
||||
@@ -0,0 +1,25 @@
|
||||
"use strict";
|
||||
|
||||
const HEADER = "x-learnharness-desktop";
|
||||
|
||||
/** Called for EVERY outgoing request, so redirects cannot carry the secret
|
||||
* to another origin. Never expose this function or its secret to preload. */
|
||||
function desktopAPIHeaders(details, origin, secret, windows) {
|
||||
const headers = { ...details.requestHeaders };
|
||||
for (const name of Object.keys(headers)) if (name.toLowerCase() === HEADER) delete headers[name];
|
||||
if (!secret) return headers;
|
||||
try {
|
||||
const target = new URL(details.url);
|
||||
if (target.origin !== origin || target.username || target.password || !(target.pathname === "/api" || target.pathname.startsWith("/api/"))) return headers;
|
||||
const win = windows.find((candidate) => !candidate.isDestroyed() && candidate.webContents.id === details.webContentsId);
|
||||
if (!win || win.webContents.isDestroyed()) return headers;
|
||||
const contents = win.webContents;
|
||||
if (details.webContents && details.webContents !== contents) return headers;
|
||||
if (!details.frame || details.frame !== contents.mainFrame) return headers;
|
||||
if (new URL(contents.mainFrame.url).origin !== origin) return headers;
|
||||
if (details.initiatorOrigin !== undefined && details.initiatorOrigin !== origin) return headers;
|
||||
headers[HEADER] = secret;
|
||||
} catch { /* Missing/destroyed/navigated frames fail closed. */ }
|
||||
return headers;
|
||||
}
|
||||
module.exports = { desktopAPIHeaders, HEADER };
|
||||
@@ -0,0 +1,13 @@
|
||||
/** Native-shell catalog. Kept with the shell so packaged builds do not load server sources. */
|
||||
const ru = {
|
||||
"Check for Updates…": "Проверить обновления…", "Edit": "Правка", "View": "Вид", "Window": "Окно",
|
||||
"Actual Size": "Исходный масштаб", "Zoom In": "Увеличить масштаб", "Zoom Out": "Уменьшить масштаб",
|
||||
"About LearnHarness": "О LearnHarness", "Hide LearnHarness": "Скрыть LearnHarness", "Hide Others": "Скрыть остальные", "Quit LearnHarness": "Выйти из LearnHarness",
|
||||
"Undo": "Отменить", "Redo": "Повторить", "Cut": "Вырезать", "Copy": "Копировать", "Paste": "Вставить", "Select All": "Выбрать всё",
|
||||
"Reload": "Перезагрузить", "Developer Tools": "Инструменты разработчика", "Toggle Full Screen": "Полноэкранный режим", "Minimize": "Свернуть", "Close": "Закрыть",
|
||||
"You're up to date.": "Установлена последняя версия.", "Couldn't check for updates.": "Не удалось проверить обновления.",
|
||||
"LearnHarness {version} is the latest version.": "LearnHarness {version} — последняя версия.", "OK": "ОК",
|
||||
};
|
||||
function resolveLanguage(preference, languages = []) { return preference === "ru" || preference !== "en" && /^ru(?:-|_|$)/i.test(languages[0] || "") ? "ru" : "en"; }
|
||||
function translate(language, text, params = {}) { return (language === "ru" ? ru[text] || text : text).replace(/\{(\w+)\}/g, (match, key) => Object.hasOwn(params, key) ? String(params[key]) : match); }
|
||||
module.exports = { resolveLanguage, translate };
|
||||
+111
-19
@@ -25,6 +25,12 @@
|
||||
*/
|
||||
|
||||
const { app, BrowserWindow, Menu, ipcMain, session, shell, dialog } = require("electron");
|
||||
const { createChatGPT, fileStore } = require("./chatgpt.cjs");
|
||||
const { attachChatGPTChild, trustedSender, chatGPTControl } = require("./chatgpt-ipc.cjs");
|
||||
const { createSubscriptions, loadSubscriptionSDK } = require("./subscriptions.cjs");
|
||||
const { attachSubscriptionChild, subscriptionControl } = require("./subscription-ipc.cjs");
|
||||
const { desktopAPIHeaders } = require("./desktop-api.cjs");
|
||||
const { randomBytes } = require("node:crypto");
|
||||
const { spawn } = require("node:child_process");
|
||||
const fs = require("node:fs");
|
||||
const http = require("node:http");
|
||||
@@ -128,6 +134,13 @@ if (process.argv.includes("--browser-service")) {
|
||||
}
|
||||
|
||||
let serverProcess = null;
|
||||
let chatgpt = null;
|
||||
let chatgptChild = null;
|
||||
let subscriptions = null;
|
||||
let subscriptionChild = null;
|
||||
// Per-launch request capability, never OAuth tokens and never renderer state.
|
||||
let desktopAPISecret = null;
|
||||
const trustedAppWindows = new Set();
|
||||
|
||||
// A GUI shell must never die to a stray exception (EPIPE dialogs, a race
|
||||
// in an event handler): the window + child server are the product, and
|
||||
@@ -187,7 +200,11 @@ function startServer(port) {
|
||||
return new Promise((resolve, reject) => {
|
||||
const child = spawn(
|
||||
process.execPath,
|
||||
[serverEntry()],
|
||||
// Only the macOS backend needs this: Next's native title setter
|
||||
// otherwise checks this Node-mode process in as a foreground app.
|
||||
process.platform === "darwin"
|
||||
? ["--require", path.join(process.resourcesPath, "server-title-guard.cjs"), serverEntry()]
|
||||
: [serverEntry()],
|
||||
{
|
||||
cwd: path.dirname(serverEntry()),
|
||||
env: {
|
||||
@@ -197,21 +214,32 @@ function startServer(port) {
|
||||
PORT: String(port),
|
||||
HOSTNAME: "127.0.0.1", // the server defaults to 0.0.0.0 — never
|
||||
LH_DATA_DIR: DATA_DIR(),
|
||||
LH_SYSTEM_LANGUAGE: app.getPreferredSystemLanguages()[0] || "en",
|
||||
// The auth/keys store — the child reads AND writes this file itself
|
||||
// (no env injection anymore: a spawn-time copy would shadow every
|
||||
// settings-page key change until restart; env wins over file).
|
||||
LH_AUTH_FILE: AUTH_FILE(),
|
||||
LH_DESKTOP_SERVER: "1",
|
||||
LH_DESKTOP_API_SECRET: desktopAPISecret,
|
||||
},
|
||||
stdio: ["ignore", "pipe", "pipe"],
|
||||
stdio: ["ignore", "pipe", "pipe", "ipc"],
|
||||
},
|
||||
);
|
||||
serverProcess = child;
|
||||
chatgptChild = attachChatGPTChild(child, chatgpt);
|
||||
subscriptionChild = attachSubscriptionChild(child, subscriptions);
|
||||
const fwd = (buf) => buf.toString().trimEnd().split("\n").forEach((l) => l && log(`server: ${l}`));
|
||||
child.stdout.on("data", fwd);
|
||||
child.stderr.on("data", fwd);
|
||||
child.on("exit", (code, signal) => {
|
||||
log(`server exited (code=${code} signal=${signal})`);
|
||||
serverProcess = null;
|
||||
chatgptChild?.dispose();
|
||||
chatgptChild = null;
|
||||
subscriptionChild?.dispose();
|
||||
subscriptionChild = null;
|
||||
chatgpt?.close();
|
||||
subscriptions?.close();
|
||||
});
|
||||
resolve(child);
|
||||
});
|
||||
@@ -235,6 +263,8 @@ function waitUntilUp(url, tries = 150) {
|
||||
}
|
||||
|
||||
function killServer() {
|
||||
chatgpt?.close();
|
||||
subscriptions?.close();
|
||||
if (!serverProcess) return;
|
||||
const child = serverProcess;
|
||||
serverProcess = null;
|
||||
@@ -306,6 +336,8 @@ function createWindow(url) {
|
||||
minHeight: 600,
|
||||
});
|
||||
|
||||
trustedAppWindows.add(win);
|
||||
win.once("closed", () => trustedAppWindows.delete(win));
|
||||
const allowedOrigin = () => new URL(url).origin;
|
||||
// Deny-by-default; the ONLY grants are media (mic/STT groundwork) and
|
||||
// clipboard-sanitized-write — the copy affordances in the transcript
|
||||
@@ -425,11 +457,11 @@ function checkForUpdates({ manual = false } = {}) {
|
||||
// update-downloaded. Manual checks additionally answer directly.
|
||||
if (!manual) return;
|
||||
const version = result?.updateInfo?.version;
|
||||
if (!version) dialog.showMessageBox({ type: "info", message: "You're up to date.", detail: `LearnHarness ${app.getVersion()} is the latest version.` });
|
||||
if (!version) dialog.showMessageBox({ type: "info", message: nt("You're up to date."), detail: nt("LearnHarness {version} is the latest version.", { version: app.getVersion() }), buttons: [nt("OK")] });
|
||||
})
|
||||
.catch((err) => {
|
||||
log(`update check failed: ${err?.message ?? err}`);
|
||||
if (manual) dialog.showMessageBox({ type: "warning", message: "Couldn't check for updates.", detail: String(err?.message ?? err) });
|
||||
if (manual) dialog.showMessageBox({ type: "warning", message: nt("Couldn't check for updates."), buttons: [nt("OK")], detail: String(err?.message ?? err) });
|
||||
});
|
||||
}
|
||||
|
||||
@@ -493,59 +525,71 @@ function applyZoom(win, factor) {
|
||||
|
||||
/** macOS needs an application menu with the Edit roles — without one,
|
||||
* Cmd+C/V/A do nothing in the renderer. Everything else stays minimal. */
|
||||
const { resolveLanguage: resolveShellLanguage, translate: translateShell } = require("./language.cjs");
|
||||
let shellLanguage;
|
||||
function nativeLanguage() {
|
||||
if (shellLanguage) return shellLanguage;
|
||||
let preference;
|
||||
try { preference = JSON.parse(fs.readFileSync(path.join(DATA_DIR(), "settings.json"), "utf8")).general?.language; } catch {}
|
||||
return resolveShellLanguage(preference, app.getPreferredSystemLanguages());
|
||||
}
|
||||
function nt(text, params) { return translateShell(nativeLanguage(), text, params); }
|
||||
|
||||
function installMenu() {
|
||||
const template = [
|
||||
{
|
||||
label: app.name,
|
||||
submenu: [
|
||||
{ role: "about" },
|
||||
{ role: "about", label: nt("About LearnHarness") },
|
||||
// Manual check (Wave C): answers via native dialog — no renderer
|
||||
// round-trip. The 24h automatic checks stay silent.
|
||||
{ label: "Check for Updates…", click: () => checkForUpdates({ manual: true }) },
|
||||
{ label: nt("Check for Updates…"), click: () => checkForUpdates({ manual: true }) },
|
||||
{ type: "separator" },
|
||||
{ role: "hide" },
|
||||
{ role: "hideOthers" },
|
||||
{ role: "hide", label: nt("Hide LearnHarness") },
|
||||
{ role: "hideOthers", label: nt("Hide Others") },
|
||||
{ type: "separator" },
|
||||
{ role: "quit" },
|
||||
{ role: "quit", label: nt("Quit LearnHarness") },
|
||||
],
|
||||
},
|
||||
{ label: "Edit", submenu: [{ role: "undo" }, { role: "redo" }, { type: "separator" }, { role: "cut" }, { role: "copy" }, { role: "paste" }, { role: "selectAll" }] },
|
||||
{ label: nt("Edit"), submenu: [{ role: "undo", label: nt("Undo") }, { role: "redo", label: nt("Redo") }, { type: "separator" }, { role: "cut", label: nt("Cut") }, { role: "copy", label: nt("Copy") }, { role: "paste", label: nt("Paste") }, { role: "selectAll", label: nt("Select All") }] },
|
||||
{
|
||||
label: "View",
|
||||
label: nt("View"),
|
||||
submenu: [
|
||||
{ role: "reload" },
|
||||
{ role: "toggleDevTools" },
|
||||
{ role: "reload", label: nt("Reload") },
|
||||
{ role: "toggleDevTools", label: nt("Developer Tools") },
|
||||
{ type: "separator" },
|
||||
// OWNED zoom (see applyZoom): the roles change zoomLevel
|
||||
// silently; these broadcast the factor and re-seat the
|
||||
// traffic lights. The renderer's --lh-zoom depends on
|
||||
// hearing every change.
|
||||
{
|
||||
label: "Actual Size",
|
||||
label: nt("Actual Size"),
|
||||
accelerator: "CommandOrControl+0",
|
||||
click: () => applyZoom(BrowserWindow.getAllWindows()[0], 1),
|
||||
},
|
||||
{
|
||||
label: "Zoom In",
|
||||
label: nt("Zoom In"),
|
||||
accelerator: "CommandOrControl+Plus",
|
||||
click: () => zoomStep(BrowserWindow.getAllWindows()[0], +1),
|
||||
},
|
||||
{
|
||||
label: "Zoom Out",
|
||||
label: nt("Zoom Out"),
|
||||
accelerator: "CommandOrControl+-",
|
||||
click: () => zoomStep(BrowserWindow.getAllWindows()[0], -1),
|
||||
},
|
||||
{ type: "separator" },
|
||||
{ role: "togglefullscreen" },
|
||||
{ role: "togglefullscreen", label: nt("Toggle Full Screen") },
|
||||
],
|
||||
},
|
||||
{ role: "windowMenu" },
|
||||
{ label: nt("Window"), submenu: [{ role: "minimize", label: nt("Minimize") }, { role: "close", label: nt("Close") }] },
|
||||
];
|
||||
Menu.setApplicationMenu(Menu.buildFromTemplate(template));
|
||||
}
|
||||
|
||||
async function main() {
|
||||
app.on("window-all-closed", () => {
|
||||
chatgpt?.pause();
|
||||
subscriptions?.pause();
|
||||
// macOS convention: the app stays resident, reactivated from the Dock.
|
||||
if (process.platform !== "darwin") app.quit();
|
||||
});
|
||||
@@ -563,6 +607,30 @@ async function main() {
|
||||
const devUrl = process.env.LH_DEV_URL;
|
||||
const url = devUrl ?? `http://127.0.0.1:${await freePort()}`;
|
||||
if (!devUrl) {
|
||||
desktopAPISecret = randomBytes(32).toString("hex");
|
||||
const ownedOrigin = new URL(url).origin;
|
||||
// All URLs, not only /api: remove the header again on external redirects.
|
||||
session.defaultSession.webRequest.onBeforeSendHeaders({ urls: ["<all_urls>"] }, (details, callback) => {
|
||||
callback({ requestHeaders: desktopAPIHeaders(details, ownedOrigin, desktopAPISecret, [...trustedAppWindows]) });
|
||||
});
|
||||
chatgpt = createChatGPT({
|
||||
store: fileStore(path.join(app.getPath("userData"), "chatgpt-credentials.json")),
|
||||
openExternal: (target) => shell.openExternal(target),
|
||||
onChange: (value) => {
|
||||
chatgptChild?.send(value);
|
||||
for (const win of BrowserWindow.getAllWindows()) win.webContents.send("lh:chatgpt:changed");
|
||||
},
|
||||
});
|
||||
subscriptions = createSubscriptions({
|
||||
directory: app.getPath("userData"),
|
||||
loadSDK: () => loadSubscriptionSDK(path.dirname(serverEntry())),
|
||||
openExternal: (target) => shell.openExternal(target),
|
||||
onChange: (snapshot) => {
|
||||
subscriptionChild?.send(snapshot);
|
||||
for (const win of BrowserWindow.getAllWindows()) win.webContents.send("lh:subscriptions:changed");
|
||||
},
|
||||
});
|
||||
await subscriptions.ready;
|
||||
log(`starting server: ${serverEntry()}`);
|
||||
log(`data dir: ${DATA_DIR()}${fs.existsSync(AUTH_FILE()) ? " · auth.json: present" : " · auth.json: ABSENT (no BYOK keys yet)"}`);
|
||||
await startServer(new URL(url).port);
|
||||
@@ -572,7 +640,31 @@ async function main() {
|
||||
log(`dev mode: ${devUrl}`);
|
||||
}
|
||||
|
||||
// Renderer controls contain no token/URL/code operation. The separate server
|
||||
// child is the only recipient of credential leases over inherited IPC.
|
||||
ipcMain.handle("lh:chatgpt:control", async (event, command) => {
|
||||
if (!trustedAppWindows.has(BrowserWindow.fromWebContents(event.sender)) || !trustedSender(event, new URL(url).origin, BrowserWindow)) return { error: "Untrusted desktop request." };
|
||||
if (!chatgpt || !serverProcess?.connected) return { available: false, pending: false, activeId: null, accounts: [], error: "ChatGPT sign-in requires the desktop app's private server connection. Browser-only and externally launched development servers keep API-key connections." };
|
||||
return chatGPTControl(command, chatgpt);
|
||||
});
|
||||
|
||||
ipcMain.handle("lh:subscriptions:control", async (event, command) => {
|
||||
if (!trustedAppWindows.has(BrowserWindow.fromWebContents(event.sender)) || !trustedSender(event, new URL(url).origin, BrowserWindow)) throw new Error("Untrusted desktop request.");
|
||||
if (!subscriptions || !serverProcess?.connected) {
|
||||
if (command?.op === "status") return [];
|
||||
throw new Error("Subscription sign-in requires the desktop app's private server connection.");
|
||||
}
|
||||
return subscriptionControl(command, subscriptions);
|
||||
});
|
||||
|
||||
installMenu();
|
||||
ipcMain.on("lh:language", (event, language) => {
|
||||
if (!trustedAppWindows.has(BrowserWindow.fromWebContents(event.sender)) || !trustedSender(event, new URL(url).origin, BrowserWindow)) return;
|
||||
if (language !== "en" && language !== "ru") return;
|
||||
if (shellLanguage === language) return;
|
||||
shellLanguage = language;
|
||||
installMenu();
|
||||
});
|
||||
|
||||
// Auto-update (Wave C): wire the updater before the window so the
|
||||
// banner channel is live from first paint; the first check and the 24h
|
||||
@@ -597,7 +689,7 @@ async function main() {
|
||||
if (width < target) win.setBounds({ x, y, width: target, height });
|
||||
});
|
||||
app.on("activate", () => {
|
||||
if (BrowserWindow.getAllWindows().length === 0) createWindow(url);
|
||||
if (BrowserWindow.getAllWindows().length === 0) { chatgpt?.resume(); subscriptions?.resume(); createWindow(url); }
|
||||
});
|
||||
createWindow(url);
|
||||
log(`window open: ${url}`);
|
||||
|
||||
@@ -29,6 +29,36 @@ const { contextBridge, ipcRenderer } = require("electron");
|
||||
|
||||
contextBridge.exposeInMainWorld("lh", {
|
||||
platform: process.platform,
|
||||
setLanguage: (language) => ipcRenderer.send("lh:language", language),
|
||||
chatgpt: {
|
||||
status: () => ipcRenderer.invoke("lh:chatgpt:control", { op: "status" }),
|
||||
login: (id) => ipcRenderer.invoke("lh:chatgpt:control", { op: "login", id }),
|
||||
cancel: () => ipcRenderer.invoke("lh:chatgpt:control", { op: "cancel" }),
|
||||
select: (id) => ipcRenderer.invoke("lh:chatgpt:control", { op: "select", id }),
|
||||
disconnect: (id) => ipcRenderer.invoke("lh:chatgpt:control", { op: "disconnect", id }),
|
||||
logout: (id) => ipcRenderer.invoke("lh:chatgpt:control", { op: "logout", id }),
|
||||
consent: (enabled) => ipcRenderer.invoke("lh:chatgpt:control", { op: "consent", enabled }),
|
||||
onChange: (cb) => {
|
||||
const listener = () => cb();
|
||||
ipcRenderer.on("lh:chatgpt:changed", listener);
|
||||
return () => ipcRenderer.removeListener("lh:chatgpt:changed", listener);
|
||||
},
|
||||
},
|
||||
subscriptions: {
|
||||
status: () => ipcRenderer.invoke("lh:subscriptions:control", { op: "status" }),
|
||||
login: (providerId, enabled) => ipcRenderer.invoke("lh:subscriptions:control", { op: "login", providerId, enabled }),
|
||||
cancel: (providerId) => ipcRenderer.invoke("lh:subscriptions:control", { op: "cancel", providerId }),
|
||||
respond: (providerId, attemptId, promptId, value) => ipcRenderer.invoke("lh:subscriptions:control", { op: "respond", providerId, attemptId, promptId, value }),
|
||||
open: (providerId, attemptId, actionId) => ipcRenderer.invoke("lh:subscriptions:control", { op: "open", providerId, attemptId, actionId }),
|
||||
retry: (providerId) => ipcRenderer.invoke("lh:subscriptions:control", { op: "retry", providerId }),
|
||||
disconnect: (providerId) => ipcRenderer.invoke("lh:subscriptions:control", { op: "disconnect", providerId }),
|
||||
consent: (providerId, enabled) => ipcRenderer.invoke("lh:subscriptions:control", { op: "consent", providerId, enabled }),
|
||||
onChange: (cb) => {
|
||||
const listener = () => cb();
|
||||
ipcRenderer.on("lh:subscriptions:changed", listener);
|
||||
return () => ipcRenderer.removeListener("lh:subscriptions:changed", listener);
|
||||
},
|
||||
},
|
||||
expandWindow: () => ipcRenderer.send("lh:expand-window"),
|
||||
onZoom: (cb) => {
|
||||
const listener = (_event, factor) => cb(factor);
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
/**
|
||||
* Preloaded only into the packaged macOS backend, before Next starts.
|
||||
*
|
||||
* Next assigns process.title. In Electron's Node mode on macOS, the native
|
||||
* setter checks in with Launch Services using the main app bundle, creating
|
||||
* an unwanted foreground application registration. Keep title writes in JS
|
||||
* instead: the native process name stays unchanged while JS can read back
|
||||
* its assigned title. This deliberately does not emulate native truncation
|
||||
* or every coercion detail; assignments use String(value).
|
||||
*
|
||||
* Explicit launch arguments (not NODE_OPTIONS) keep the full-Electron browser
|
||||
* helper untouched. Node-mode fork descendants can inherit this preload.
|
||||
*/
|
||||
if (process.platform === "darwin" && process.env.ELECTRON_RUN_AS_NODE === "1" && process.env.LH_DESKTOP_SERVER === "1") {
|
||||
let title = process.title;
|
||||
Object.defineProperty(process, "title", {
|
||||
configurable: true,
|
||||
enumerable: true,
|
||||
get: () => title,
|
||||
set: (value) => {
|
||||
title = String(value);
|
||||
},
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
"use strict";
|
||||
const { PROVIDERS } = require("./subscription-store.cjs");
|
||||
const { publicError } = require("./subscriptions.cjs");
|
||||
function attachSubscriptionChild(child, controller) {
|
||||
let disposed = false;
|
||||
const send = (packet) => { if (!disposed && child.connected) { try { child.send(packet, () => {}); } catch { /* child exited */ } } };
|
||||
const listener = async (message) => {
|
||||
if (disposed || !child.connected || message?.channel !== "lh:subscriptions" || typeof message.id !== "string") return;
|
||||
const { id, op } = message;
|
||||
try {
|
||||
if (!controller || !["snapshot", "lease"].includes(op)) throw new Error();
|
||||
if (op === "lease" && (typeof message.background !== "boolean" || !validScope(message.scope))) throw new Error();
|
||||
const value = op === "snapshot" ? await controller.snapshot() : await controller.lease(message.scope, message.background);
|
||||
send({ channel: "lh:subscriptions", id, op, ok: true, value });
|
||||
} catch (error) { send({ channel: "lh:subscriptions", id, op, ok: false, error: publicError(error) }); }
|
||||
};
|
||||
child.on("message", listener);
|
||||
return {
|
||||
send(snapshot) { send({ channel: "lh:subscriptions", op: "changed", snapshot }); },
|
||||
dispose() { disposed = true; child.removeListener("message", listener); },
|
||||
};
|
||||
}
|
||||
function validScope(scope) {
|
||||
return scope && PROVIDERS.includes(scope.providerId) && typeof scope.connectionId === "string" && !!scope.connectionId && typeof scope.selectedModelId === "string" && !!scope.selectedModelId && [scope.epoch, scope.authorityRevision].every((n) => Number.isSafeInteger(n) && n >= 0);
|
||||
}
|
||||
/** Caller authenticates the exact trusted main-frame origin before dispatch. */
|
||||
async function subscriptionControl(command, controller) {
|
||||
try {
|
||||
if (!controller || !command || typeof command !== "object") throw new Error();
|
||||
if (command.op === "status") return await controller.status();
|
||||
if (!PROVIDERS.includes(command.providerId)) throw new Error();
|
||||
const id = command.providerId;
|
||||
switch (command.op) {
|
||||
case "login": return await controller.login(id, command.enabled);
|
||||
case "cancel": return controller.cancel(id);
|
||||
case "respond": return await controller.respond(id, command.attemptId, command.promptId, command.value);
|
||||
case "open": return await controller.open(id, command.attemptId, command.actionId);
|
||||
case "retry": return await controller.retry(id);
|
||||
case "disconnect": return await controller.disconnect(id);
|
||||
case "consent": return await controller.consent(id, command.enabled);
|
||||
default: throw new Error();
|
||||
}
|
||||
} catch (error) { throw new Error(publicError(error)); }
|
||||
}
|
||||
module.exports = { attachSubscriptionChild, subscriptionControl, validScope };
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user