mirror of
https://github.com/binaricat/Netcatty.git
synced 2026-11-11 08:42:45 +00:00
* Cursor: Apply local changes for cloud agent * fix(terminal): stop first SSH fail under StrictMode remount Defer backend boot past the double-invoke, cancel superseded vault init, gate start on vault hydration, and harden hotkey/attach cleanup so the first connect no longer races a stale close or empty keychain. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * perf: finish StrictMode mega-subscriber plan (accent isolation + docs) Stabilize published terminal themes across custom-accent drag, apply accent at chrome/log leaves and CSS injection only, land Phase 0 design/plan docs, and lock Host-bag / Bugbot-clean contracts for the isolation checklist. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * docs: add StrictMode mega-subscriber design and plan artifacts Force-add Phase 0 spec/plan under docs/superpowers (gitignored locally) so the delivery branch carries the approved design and plan copy. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix: clear remaining StrictMode doubles and notes editor jank Gate every AI send and reject concurrent runTurn, latch tray connect flush and settings persistMounted remounts, and stop notes content drafts from rebuilding MDXEditor/shell on each keystroke. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * perf: gate hidden notes panel subscribe and skip host-link annotate on keystrokes Hidden terminal notes mounts keep a live snapshot read but stop listening to publishes. Host-link DOM annotation follows hosts/mode (preview MutationObserver) instead of every markdown value change. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix: latch SSH transport idle TTL notify under StrictMode Avoid duplicate main-process notifySettingsChanged on effect double-invoke when the idle TTL value has not changed. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * perf: freeze inactive vault notes against hosts churn and prefetch MDXEditor Gate the retained VaultNotesSection notesStore subscription while hidden, ignore hosts identity in its memo compare when inactive, and warm the lazy InlineMarkdownEditor chunk when notes become active. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix: clear remaining AI StrictMode double-fire hazards Latch Ask-AI terminal selection on requestId before draft mutation, hoist Codex App Server IPC bridge to App (ref-counted), and make Catty requestApproval join an existing waiter for the same toolCallId. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix: remount-safe AI send latch and skip stale MCP approval IPC Replace the component sendInFlightRef with a module key latch so StrictMode panel remount cannot reopen a mid-flight send, and no-op resolveApproval when the pending entry is already drained. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * test: allow gated useNotesStore in VaultNotesSection memo contract The retained notes section now passes enabled:isActive so hidden mounts do not subscribe; update the VaultView memo source assertion accordingly. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix: keep note drafts across mode toggle and external note publishes Flush ref-only content before edit/preview remount, and skip prop→editor setMarkdown while a local draft diverges from the last synced value. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * chore: strip StrictMode sermon comments after Bugbot/Comment Sicko pass Keep effect-order and public-export contracts; drop remount/perf narration that the latches and tests already encode. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * fix: remount-safe Ask-AI terminal selection latch Move consumed requestIds to a module Set so StrictMode remount cannot append the same selection chip twice before parent state clears. Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> * chore: drop remount latch comment Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com> Co-authored-by: 陈大猫 <binaricat@users.noreply.github.com>
291 lines
8.5 KiB
TypeScript
291 lines
8.5 KiB
TypeScript
import assert from "node:assert/strict";
|
|
import test from "node:test";
|
|
|
|
import { toEditorTabId } from "../state/activeTabStore.ts";
|
|
import type { EditorTab } from "../state/editorTabStore.ts";
|
|
import type { LogView } from "../state/logViewState.ts";
|
|
import { isActiveChromeThemeResolvable, resolveActiveChromeTheme } from "./activeChromeTheme.ts";
|
|
import type { Host, TerminalSession, TerminalTheme, Workspace } from "../../types";
|
|
|
|
const theme = (id: string, type: "dark" | "light" = "dark"): TerminalTheme => ({
|
|
id,
|
|
name: id,
|
|
type,
|
|
colors: {
|
|
background: type === "dark" ? "#111111" : "#eeeeee",
|
|
foreground: type === "dark" ? "#eeeeee" : "#111111",
|
|
cursor: "#22aaff",
|
|
},
|
|
});
|
|
|
|
const currentTheme = theme("current");
|
|
const hostTheme = theme("host-theme");
|
|
const logTheme = theme("log-theme", "light");
|
|
|
|
const baseInput = {
|
|
accentMode: "theme" as const,
|
|
currentTerminalTheme: currentTheme,
|
|
customAccent: "221.2 83.2% 53.3%",
|
|
editorTabs: [],
|
|
followAppTerminalTheme: false,
|
|
hostById: new Map<string, Host>(),
|
|
logViews: [],
|
|
sessionById: new Map<string, TerminalSession>(),
|
|
themeById: new Map([
|
|
[currentTheme.id, currentTheme],
|
|
[hostTheme.id, hostTheme],
|
|
[logTheme.id, logTheme],
|
|
]),
|
|
workspaceById: new Map<string, Workspace>(),
|
|
};
|
|
|
|
test("editor tabs use the owning host terminal theme when follow-app terminal theme is off", () => {
|
|
const editorTab = {
|
|
id: "editor-1",
|
|
hostId: "host-1",
|
|
sessionId: "sftp-1",
|
|
};
|
|
|
|
const resolved = resolveActiveChromeTheme({
|
|
...baseInput,
|
|
activeTabId: toEditorTabId(editorTab.id),
|
|
editorTabs: [editorTab as unknown as EditorTab],
|
|
hostById: new Map([
|
|
["host-1", { id: "host-1", theme: hostTheme.id } as unknown as Host],
|
|
]),
|
|
});
|
|
|
|
assert.equal(resolved?.id, hostTheme.id);
|
|
});
|
|
|
|
test("editor tabs use the followed terminal theme when follow-app terminal theme is on", () => {
|
|
const editorTab = {
|
|
id: "editor-1",
|
|
hostId: "host-1",
|
|
sessionId: "sftp-1",
|
|
};
|
|
|
|
const resolved = resolveActiveChromeTheme({
|
|
...baseInput,
|
|
activeTabId: toEditorTabId(editorTab.id),
|
|
editorTabs: [editorTab as unknown as EditorTab],
|
|
followAppTerminalTheme: true,
|
|
hostById: new Map([
|
|
["host-1", { id: "host-1", theme: hostTheme.id } as unknown as Host],
|
|
]),
|
|
});
|
|
|
|
assert.equal(resolved?.id, currentTheme.id);
|
|
});
|
|
|
|
test("follow-app chrome applies custom accent onto the published base theme", () => {
|
|
const editorTab = {
|
|
id: "editor-1",
|
|
hostId: "host-1",
|
|
sessionId: "sftp-1",
|
|
};
|
|
|
|
const resolved = resolveActiveChromeTheme({
|
|
...baseInput,
|
|
accentMode: "custom",
|
|
customAccent: "0 100% 50%",
|
|
activeTabId: toEditorTabId(editorTab.id),
|
|
editorTabs: [editorTab as unknown as EditorTab],
|
|
followAppTerminalTheme: true,
|
|
hostById: new Map([
|
|
["host-1", { id: "host-1", theme: hostTheme.id } as unknown as Host],
|
|
]),
|
|
});
|
|
|
|
assert.equal(resolved?.id, currentTheme.id);
|
|
assert.notEqual(resolved?.colors.cursor, currentTheme.colors.cursor);
|
|
assert.notEqual(resolved, currentTheme);
|
|
});
|
|
|
|
test("log tabs use the saved log theme when available", () => {
|
|
const resolved = resolveActiveChromeTheme({
|
|
...baseInput,
|
|
activeTabId: "log-1",
|
|
logViews: [{
|
|
id: "log-1",
|
|
connectionLogId: "1",
|
|
log: { id: "1", themeId: logTheme.id },
|
|
} as unknown as LogView],
|
|
});
|
|
|
|
assert.equal(resolved?.id, logTheme.id);
|
|
});
|
|
|
|
test("root pages use the normal application theme", () => {
|
|
const resolved = resolveActiveChromeTheme({
|
|
...baseInput,
|
|
activeTabId: "vault",
|
|
});
|
|
|
|
assert.equal(resolved, null);
|
|
});
|
|
|
|
test("follow-app workspace split view always uses the global terminal theme", () => {
|
|
const workspace: Workspace = {
|
|
id: "ws-1",
|
|
name: "Workspace",
|
|
viewMode: "split",
|
|
focusedSessionId: "session-1",
|
|
root: {
|
|
type: "split",
|
|
direction: "horizontal",
|
|
sizes: [50, 50],
|
|
children: [
|
|
{ type: "session", sessionId: "session-1" },
|
|
{ type: "session", sessionId: "session-2" },
|
|
],
|
|
},
|
|
} as unknown as Workspace;
|
|
|
|
const hostA = { id: "host-a", theme: hostTheme.id, themeOverride: true } as unknown as Host;
|
|
const hostB = { id: "host-b", theme: logTheme.id, themeOverride: true } as unknown as Host;
|
|
|
|
const resolved = resolveActiveChromeTheme({
|
|
...baseInput,
|
|
activeTabId: "ws-1",
|
|
followAppTerminalTheme: true,
|
|
hostById: new Map([
|
|
["host-a", hostA],
|
|
["host-b", hostB],
|
|
]),
|
|
sessionById: new Map([
|
|
["session-1", { id: "session-1", hostId: "host-a" } as TerminalSession],
|
|
["session-2", { id: "session-2", hostId: "host-b" } as TerminalSession],
|
|
]),
|
|
workspaceById: new Map([["ws-1", workspace]]),
|
|
});
|
|
|
|
assert.equal(resolved?.id, currentTheme.id);
|
|
});
|
|
|
|
test("manual workspace split view uses the focused session theme when panes differ", () => {
|
|
const workspace: Workspace = {
|
|
id: "ws-1",
|
|
name: "Workspace",
|
|
viewMode: "split",
|
|
focusedSessionId: "session-2",
|
|
root: {
|
|
type: "split",
|
|
direction: "horizontal",
|
|
sizes: [50, 50],
|
|
children: [
|
|
{ type: "pane", sessionId: "session-1" },
|
|
{ type: "pane", sessionId: "session-2" },
|
|
],
|
|
},
|
|
} as unknown as Workspace;
|
|
|
|
const hostA = { id: "host-a", theme: hostTheme.id, themeOverride: true } as unknown as Host;
|
|
const hostB = { id: "host-b", theme: logTheme.id, themeOverride: true } as unknown as Host;
|
|
const focusedTheme = theme("focused-intent");
|
|
|
|
const resolved = resolveActiveChromeTheme({
|
|
...baseInput,
|
|
activeTabId: "ws-1",
|
|
hostById: new Map([
|
|
["host-a", hostA],
|
|
["host-b", hostB],
|
|
]),
|
|
sessionById: new Map([
|
|
["session-1", { id: "session-1", hostId: "host-a" } as TerminalSession],
|
|
["session-2", { id: "session-2", hostId: "host-b" } as TerminalSession],
|
|
]),
|
|
workspaceById: new Map([["ws-1", workspace]]),
|
|
resolveSessionAppearance: ({ host }) => (
|
|
host?.id === "host-b"
|
|
? { themeId: focusedTheme.id, theme: focusedTheme, source: "intent", appThemeUpdate: null }
|
|
: { themeId: hostTheme.id, theme: hostTheme, source: "host-override", appThemeUpdate: null }
|
|
),
|
|
});
|
|
|
|
assert.equal(resolved?.id, focusedTheme.id);
|
|
});
|
|
|
|
test("manual split workspace falls back to the first tree session theme when focus is stale", () => {
|
|
const workspace: Workspace = {
|
|
id: "ws-1",
|
|
name: "Workspace",
|
|
viewMode: "split",
|
|
focusedSessionId: "missing-session",
|
|
root: {
|
|
type: "split",
|
|
direction: "horizontal",
|
|
sizes: [50, 50],
|
|
children: [
|
|
{ type: "pane", sessionId: "session-1" },
|
|
{ type: "pane", sessionId: "session-2" },
|
|
],
|
|
},
|
|
} as unknown as Workspace;
|
|
|
|
const hostA = { id: "host-a", theme: hostTheme.id, themeOverride: true } as unknown as Host;
|
|
const hostB = { id: "host-b", theme: logTheme.id, themeOverride: true } as unknown as Host;
|
|
|
|
const resolved = resolveActiveChromeTheme({
|
|
...baseInput,
|
|
activeTabId: "ws-1",
|
|
hostById: new Map([
|
|
["host-a", hostA],
|
|
["host-b", hostB],
|
|
]),
|
|
sessionById: new Map([
|
|
["session-1", { id: "session-1", hostId: "host-a" } as TerminalSession],
|
|
["session-2", { id: "session-2", hostId: "host-b" } as TerminalSession],
|
|
]),
|
|
workspaceById: new Map([["ws-1", workspace]]),
|
|
});
|
|
|
|
assert.equal(resolved?.id, hostTheme.id);
|
|
});
|
|
|
|
test("manual mode prefers runtime session appearance over stale host theme ids", () => {
|
|
const intentTheme = theme("intent-theme");
|
|
const resolved = resolveActiveChromeTheme({
|
|
...baseInput,
|
|
activeTabId: "session-1",
|
|
hostById: new Map([
|
|
["host-1", { id: "host-1", theme: hostTheme.id, themeOverride: true } as unknown as Host],
|
|
]),
|
|
sessionById: new Map([
|
|
["session-1", { id: "session-1", hostId: "host-1" } as TerminalSession],
|
|
]),
|
|
resolveSessionAppearance: () => ({
|
|
themeId: intentTheme.id,
|
|
theme: intentTheme,
|
|
source: "intent",
|
|
appThemeUpdate: null,
|
|
}),
|
|
});
|
|
|
|
assert.equal(resolved?.id, intentTheme.id);
|
|
});
|
|
|
|
test("chrome theme sync waits until a newly opened session is present in deps", () => {
|
|
assert.equal(
|
|
isActiveChromeThemeResolvable({
|
|
activeTabId: "session-new",
|
|
editorTabs: [],
|
|
logViews: [],
|
|
sessionById: new Map(),
|
|
workspaceById: new Map(),
|
|
}),
|
|
false,
|
|
);
|
|
|
|
assert.equal(
|
|
isActiveChromeThemeResolvable({
|
|
activeTabId: "session-new",
|
|
editorTabs: [],
|
|
logViews: [],
|
|
sessionById: new Map([["session-new", { id: "session-new" } as TerminalSession]]),
|
|
workspaceById: new Map(),
|
|
}),
|
|
true,
|
|
);
|
|
});
|