Beautiful, AI-native markdown IDE and LLM wiki
TypeScript 2nd-brainagent-skillsclaudecodexcompany-braindocsknowledge-knowledge-baseknowledge-managementllmllm-wikillm-wiki-karpathymarkdownmarkdown-editormdmdxnotespkmsecond-brainskills
Show one Beta label in the Beta app header (PRD-9638) (#6816)
Andrew Mikofalvy6177d3512944
diff --git a/.changeset/beta-header-single-badge.md b/.changeset/beta-header-single-badge.mdnew file mode 100644index 000000000..4d656ab82--- /dev/null+++ b/.changeset/beta-header-single-badge.md@@ -0,0 +1,5 @@+---+'@inkeep/open-knowledge': patch+---++OpenKnowledge Beta now shows one Beta label in the window header instead of two.diff --git a/packages/desktop/src/main/index.ts b/packages/desktop/src/main/index.tsindex 1d645309e..1823d053e 100644--- a/packages/desktop/src/main/index.ts+++ b/packages/desktop/src/main/index.ts@@ -306,9 +306,9 @@ import { readCanonicalGitHubRemoteUrl } from './git-remote.ts';import { describeStopFailure, failedOpenHolder, promptHolderStop } from './holder-stop-prompt.ts';import { agentConnectionsAvailability, isSupportedInstallShape } from './install-shape.ts';import {- combineInstanceLabels,formatInstanceAppName,resolveInstanceLabel,+ resolveWindowInstanceLabels,} from './instance-identity.ts';import { deriveInstanceUserDataDir } from './instance-isolation.ts';import {@@ -592,7 +592,7 @@ import {bringWindowToFront,collabUrlFromApiOrigin,heldChildServer,- setWindowInstanceLabel,+ setWindowInstanceLabels,type UtilityProcessLike,WindowManager,type WindowManagerDeps,@@ -6109,13 +6109,14 @@ if (!app.isPackaged) {}const parallelInstanceLabel = resolveInstanceLabel(app.getPath('userData'));-const instanceLabel = combineInstanceLabels(DESKTOP_VARIANT.instanceLabel, parallelInstanceLabel);+const windowInstanceLabels = resolveWindowInstanceLabels(+ DESKTOP_VARIANT.instanceLabel,+ parallelInstanceLabel,+);if (parallelInstanceLabel) {app.setName(formatInstanceAppName(app.getName(), parallelInstanceLabel));}-if (instanceLabel) {- setWindowInstanceLabel(instanceLabel);-}+setWindowInstanceLabels(windowInstanceLabels);const A11Y_FORCED_BY_ENV = process.env.OK_FORCE_A11Y === '1';if (A11Y_FORCED_BY_ENV) {@@ -6570,7 +6571,7 @@ function bootPrimaryInstance(): void {nativeTheme.themeSource = source;},refreshApplicationMenu,- installDockIcon: () => installDockIcon(instanceLabel),+ installDockIcon: () => installDockIcon(windowInstanceLabels.title),log: { warn: (msg, obj) => console.warn(msg, obj) },appVersion: app.getVersion(),maxSupportedSchemaVersion: MAX_SUPPORTED_SCHEMA_VERSION,diff --git a/packages/desktop/src/main/instance-identity.test.ts b/packages/desktop/src/main/instance-identity.test.tsindex baf1edcf5..f33df1534 100644--- a/packages/desktop/src/main/instance-identity.test.ts+++ b/packages/desktop/src/main/instance-identity.test.ts@@ -3,6 +3,7 @@ import {combineInstanceLabels,formatInstanceAppName,resolveInstanceLabel,+ resolveWindowInstanceLabels,} from './instance-identity.ts';describe('resolveInstanceLabel', () => {@@ -45,3 +46,21 @@ describe('combineInstanceLabels', () => {expect(combineInstanceLabels(null, null)).toBeNull();});});++describe('resolveWindowInstanceLabels', () => {+ test('the Beta product label names the window but stays out of the renderer header', () => {+ expect(resolveWindowInstanceLabels('Beta', null)).toEqual({ title: 'Beta', renderer: null });+ });++ test('a parallel instance label names the window and reaches the renderer header', () => {+ expect(resolveWindowInstanceLabels('Beta', 'work')).toEqual({+ title: 'Beta · work',+ renderer: 'work',+ });+ expect(resolveWindowInstanceLabels(null, 'work')).toEqual({ title: 'work', renderer: 'work' });+ });++ test('a default install carries no label anywhere', () => {+ expect(resolveWindowInstanceLabels(null, null)).toEqual({ title: null, renderer: null });+ });+});diff --git a/packages/desktop/src/main/instance-identity.ts b/packages/desktop/src/main/instance-identity.tsindex 72ecfdae5..4cae12b74 100644--- a/packages/desktop/src/main/instance-identity.ts+++ b/packages/desktop/src/main/instance-identity.ts@@ -25,3 +25,18 @@ export function combineInstanceLabels(...labels: Array<string | null>): string |const present = labels.filter((label): label is string => label !== null && label.length > 0);return present.length > 0 ? present.join(' · ') : null;}++export interface WindowInstanceLabels {+ readonly title: string | null;+ readonly renderer: string | null;+}++export function resolveWindowInstanceLabels(+ variantLabel: string | null,+ parallelLabel: string | null,+): WindowInstanceLabels {+ return {+ title: combineInstanceLabels(variantLabel, parallelLabel),+ renderer: parallelLabel !== null && parallelLabel.length > 0 ? parallelLabel : null,+ };+}diff --git a/packages/desktop/src/main/window-manager.ts b/packages/desktop/src/main/window-manager.tsindex 6eab7d7d1..474cdac41 100644--- a/packages/desktop/src/main/window-manager.ts+++ b/packages/desktop/src/main/window-manager.ts@@ -37,6 +37,7 @@ import { registerPendingDelivery } from '../shared/ipc-send.ts';import type { AssetOpenResult } from './asset-allowlist.ts';import { attachAssetSafetyNet } from './asset-safety-net.ts';import { startBootHeartbeat } from './boot-heartbeat.ts';+import type { WindowInstanceLabels } from './instance-identity.ts';import {type HostCliInvocation,resolveLocalOpCliArgsForUtilityFork,@@ -127,13 +128,15 @@ function nonNegativeInitCounters(}let windowInstanceLabel: string | null = null;+let rendererInstanceLabel: string | null = null;-export function setWindowInstanceLabel(label: string | null): void {- windowInstanceLabel = label;+export function setWindowInstanceLabels(labels: WindowInstanceLabels): void {+ windowInstanceLabel = labels.title;+ rendererInstanceLabel = labels.renderer;}function instanceLabelArgs(): string[] {- return windowInstanceLabel ? [`--ok-instance-label=${windowInstanceLabel}`] : [];+ return rendererInstanceLabel ? [`--ok-instance-label=${rendererInstanceLabel}`] : [];}function formatEditorTitle(projectName: string): string {diff --git a/packages/desktop/tests/main/window-manager.test.ts b/packages/desktop/tests/main/window-manager.test.tsindex db5e8b642..895011a91 100644--- a/packages/desktop/tests/main/window-manager.test.ts+++ b/packages/desktop/tests/main/window-manager.test.ts@@ -17,6 +17,7 @@ import {otherChannelStopOffer,type ServerLockMetadataLike,type SpawnedServer,+ setWindowInstanceLabels,type UtilityProcessLike,WindowManager,type WindowManagerDeps,@@ -261,6 +262,36 @@ describe('WindowManager', () => {expect(env.createWindowOpts[0]?.title).toBe('dragon-wiki — OpenKnowledge');});+ describe('instance labels', () => {+ afterEach(() => {+ setWindowInstanceLabels({ title: null, renderer: null });+ });++ async function openProjectWindow() {+ const wm = new WindowManager(env.deps);+ const promise = wm.createProjectWindow({ projectPath: '/tmp/dragon-wiki' });+ env.utilities[0]?.fire({ type: 'ready', port: 52010, apiOrigin: 'http://localhost:52010' });+ await promise;+ return env.createWindowOpts[0];+ }++ test('the Beta product label names the window but never reaches the renderer header', async () => {+ setWindowInstanceLabels({ title: 'Beta', renderer: null });+ const opts = await openProjectWindow();+ expect(opts?.title).toBe('dragon-wiki — OpenKnowledge (Beta)');+ expect(opts?.additionalArguments.some((arg) => arg.startsWith('--ok-instance-label='))).toBe(+ false,+ );+ });++ test('a parallel dev instance label reaches the renderer header', async () => {+ setWindowInstanceLabels({ title: 'Beta · work', renderer: 'work' });+ const opts = await openProjectWindow();+ expect(opts?.title).toBe('dragon-wiki — OpenKnowledge (Beta · work)');+ expect(opts?.additionalArguments).toContain('--ok-instance-label=work');+ });+ });+test('createProjectWindow threads project identity to the window seam (spawn path)', async () => {const wm = new WindowManager(env.deps);const promise = wm.createProjectWindow({ projectPath: '/tmp/dragon-wiki' });