byterover-cli 3.11.0 → 3.13.0

package/dist/server/infra/connectors/rules/rules-connector.js

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import { AGENT_CONNECTOR_CONFIG } from '../../../core/domain/entities/agent.js';
-import { hasMcpToolsInBrvSection } from '../shared/constants.js';
+import { extractInstalledAgentFromBrvSection, hasMcpToolsInBrvSection } from '../shared/constants.js';
 import { RuleFileManager } from '../shared/rule-file-manager.js';
 import { RULES_CONNECTOR_CONFIGS } from './rules-connector-config.js';
 /**
@@ -99,7 +99,12 @@ export class RulesConnector {
             }
             const content = await this.fileService.read(fullPath);
             const hasMcpTools = hasMcpToolsInBrvSection(content);
-            const installed = hasMarkers && !hasMcpTools;
+            const footerAgent = extractInstalledAgentFromBrvSection(content);
+            // Footer present: only the agent named in the footer owns this rule file.
+            // Footer absent (legacy file pre-footer): fall back to marker presence so
+            // existing installs keep reporting installed until the next reinstall.
+            const matchesFooter = footerAgent === undefined ? true : footerAgent === agent;
+            const installed = hasMarkers && !hasMcpTools && matchesFooter;
             return {
                 configExists: true,
                 configPath: config.filePath,

package/dist/server/infra/connectors/shared/constants.d.ts

@@ -15,3 +15,12 @@ export declare const BRV_RULE_MARKERS: {
  * Only checks within the markers section to avoid false positives from user content.
  */
 export declare const hasMcpToolsInBrvSection: (content: string) => boolean;
+/**
+ * Extracts the agent name from a `Generated by ByteRover CLI for X` footer
+ * inside the BRV markers section. Used to disambiguate which agent owns a
+ * shared rule file (Amp / Codex / OpenCode all map to AGENTS.md).
+ *
+ * Returns undefined when markers are missing, when the footer is absent
+ * (legacy pre-footer installs), or when the footer line is empty.
+ */
+export declare const extractInstalledAgentFromBrvSection: (content: string) => string | undefined;

package/dist/server/infra/connectors/shared/constants.js

@@ -10,16 +10,42 @@ export const BRV_RULE_MARKERS = {
     END: '<!-- END BYTEROVER RULES -->',
     START: '<!-- BEGIN BYTEROVER RULES -->',
 };
+const sliceBrvSection = (content) => {
+    const startIdx = content.indexOf(BRV_RULE_MARKERS.START);
+    const endIdx = content.indexOf(BRV_RULE_MARKERS.END);
+    if (startIdx === -1 || endIdx === -1 || endIdx < startIdx)
+        return undefined;
+    return content.slice(startIdx, endIdx);
+};
 /**
  * Checks if the BRV markers section contains MCP tool references (brv-query/brv-curate).
  * Only checks within the markers section to avoid false positives from user content.
  */
 export const hasMcpToolsInBrvSection = (content) => {
-    const startIdx = content.indexOf(BRV_RULE_MARKERS.START);
-    const endIdx = content.indexOf(BRV_RULE_MARKERS.END);
-    if (startIdx === -1 || endIdx === -1)
+    const brvSection = sliceBrvSection(content);
+    if (brvSection === undefined)
         return false;
-    // eslint-disable-next-line unicorn/prefer-set-has
-    const brvSection = content.slice(startIdx, endIdx);
     return brvSection.includes('brv-query') || brvSection.includes('brv-curate');
 };
+/**
+ * Extracts the agent name from a `Generated by ByteRover CLI for X` footer
+ * inside the BRV markers section. Used to disambiguate which agent owns a
+ * shared rule file (Amp / Codex / OpenCode all map to AGENTS.md).
+ *
+ * Returns undefined when markers are missing, when the footer is absent
+ * (legacy pre-footer installs), or when the footer line is empty.
+ */
+export const extractInstalledAgentFromBrvSection = (content) => {
+    const brvSection = sliceBrvSection(content);
+    if (brvSection === undefined)
+        return undefined;
+    const tagWithDelimiter = `${BRV_RULE_TAG} `;
+    const tagIdx = brvSection.indexOf(tagWithDelimiter);
+    if (tagIdx === -1)
+        return undefined;
+    const afterTag = brvSection.slice(tagIdx + tagWithDelimiter.length);
+    const newlineIdx = afterTag.indexOf('\n');
+    const agentLine = newlineIdx === -1 ? afterTag : afterTag.slice(0, newlineIdx);
+    const agent = agentLine.trim();
+    return agent.length === 0 ? undefined : agent;
+};

package/dist/server/infra/daemon/agent-process.js

@@ -133,7 +133,7 @@ async function activateExistingSession(sessionId, providerId) {
  */
 let cachedSessionKey = '';
 let cachedBrvConfig;
-let cachedTeamId = '';
+let cachedPinnedOrgId;
 let cachedSpaceId = '';
 let cachedActiveProvider = '';
 let cachedActiveModel = '';
@@ -177,15 +177,16 @@ async function start() {
     transport.on('connect_error', (err) => {
         agentLog(`Transport connect_error: ${err?.message ?? 'unknown'}`);
     });
-    const [configResult, authResult, providerResult] = await Promise.all([
+    const [configResult, authResult, providerResult, billingResult] = await Promise.all([
         transport.requestWithAck(TransportStateEventNames.GET_PROJECT_CONFIG, { projectPath }),
         transport.requestWithAck(TransportStateEventNames.GET_AUTH),
         transport.requestWithAck(TransportStateEventNames.GET_PROVIDER_CONFIG),
+        transport.requestWithAck(TransportStateEventNames.GET_BILLING_CONFIG, { projectPath }),
     ]);
     cachedBrvConfig = configResult.brvConfig;
-    cachedTeamId = configResult.teamId ?? '';
     cachedSpaceId = configResult.spaceId ?? '';
     cachedSessionKey = authResult.sessionKey ?? '';
+    cachedPinnedOrgId = billingResult.pinnedTeamId;
     agentLog('Initial config loaded from state server');
     // 3. Listen for config/auth/provider updates from daemon
     transport.on('config:updated', (data) => {
@@ -193,8 +194,6 @@ async function start() {
             return;
         if (data.brvConfig)
             cachedBrvConfig = data.brvConfig;
-        if (data.teamId !== undefined)
-            cachedTeamId = data.teamId;
         if (data.spaceId !== undefined)
             cachedSpaceId = data.spaceId;
     });
@@ -206,6 +205,11 @@ async function start() {
         providerConfigDirty = true;
         providerFetchRetries = 0;
     });
+    transport.on(TransportDaemonEventNames.BILLING_PIN_CHANGED, (data) => {
+        if (data.projectPath !== projectPath)
+            return;
+        cachedPinnedOrgId = data.teamId;
+    });
     // 4. Provider config resolved by daemon (API key, base URL, headers, etc.)
     const { activeModel, activeProvider } = providerResult;
     cachedActiveProvider = activeProvider;
@@ -244,7 +248,7 @@ async function start() {
         projectIdProvider: () => PROJECT,
         sessionKeyProvider: () => cachedSessionKey,
         spaceIdProvider: () => cachedSpaceId,
-        teamIdProvider: () => cachedTeamId,
+        teamIdProvider: () => cachedPinnedOrgId ?? '',
         transportClient: transport,
     });
     await agent.start();
@@ -393,8 +397,6 @@ async function executeTask(task, curateExecutor, folderPackExecutor, queryExecut
                 const configResult = await transport.requestWithAck(TransportStateEventNames.GET_PROJECT_CONFIG, { projectPath });
                 if (configResult.brvConfig)
                     cachedBrvConfig = configResult.brvConfig;
-                if (configResult.teamId !== undefined)
-                    cachedTeamId = configResult.teamId;
                 if (configResult.spaceId !== undefined)
                     cachedSpaceId = configResult.spaceId;
             }

package/dist/server/infra/daemon/brv-server.js

@@ -34,6 +34,7 @@ import { TransportStateEventNames, TransportTaskEventNames, } from '../../core/d
 import { getGlobalDataDir } from '../../utils/global-data-path.js';
 import { getProjectDataDir } from '../../utils/path-utils.js';
 import { crashLog, processLog } from '../../utils/process-logger.js';
+import { createBillingStateHandler } from '../billing/billing-state-endpoint.js';
 import { ClientManager } from '../client/client-manager.js';
 import { ProjectConfigStore } from '../config/file-config-store.js';
 import { readContextTreeRemoteUrl } from '../context-tree/read-context-tree-remote.js';
@@ -44,6 +45,8 @@ import { broadcastToProjectRoom } from '../process/broadcast-utils.js';
 import { CurateLogHandler } from '../process/curate-log-handler.js';
 import { setupFeatureHandlers } from '../process/feature-handlers.js';
 import { QueryLogHandler } from '../process/query-log-handler.js';
+import { TaskHistoryHook } from '../process/task-history-hook.js';
+import { getStore as getTaskHistoryStore } from '../process/task-history-store-cache.js';
 import { TransportHandlers } from '../process/transport-handlers.js';
 import { ProjectRegistry } from '../project/project-registry.js';
 import { createProviderOAuthTokenStore } from '../provider-oauth/provider-oauth-token-store.js';
@@ -52,6 +55,7 @@ import { clearStaleProviderConfig, resolveProviderConfig } from '../provider/pro
 import { ProjectRouter } from '../routing/project-router.js';
 import { AuthStateStore } from '../state/auth-state-store.js';
 import { ProjectStateLoader } from '../state/project-state-loader.js';
+import { FileBillingConfigStore } from '../storage/file-billing-config-store.js';
 import { FileCurateLogStore } from '../storage/file-curate-log-store.js';
 import { FileProviderConfigStore } from '../storage/file-provider-config-store.js';
 import { FileReviewBackupStore } from '../storage/file-review-backup-store.js';
@@ -334,6 +338,32 @@ async function main() {
             broadcastToProjectRoom(projectRegistry, projectRouter, info.projectPath, ReviewEvents.NOTIFY, payload, info.clientId);
         });
         const queryLogHandler = new QueryLogHandler();
+        // Task-history hook — persists every lifecycle transition + accumulated
+        // llmservice events to a per-project FileTaskHistoryStore. The store
+        // factory is module-scoped so M2.09 wire handlers can read from the
+        // same instances this hook writes to.
+        const taskHistoryHook = new TaskHistoryHook({ getStore: getTaskHistoryStore });
+        // Provider config/keychain stores — shared between feature handlers and state endpoint.
+        // Hoisted ahead of `new TransportHandlers` so the resolveActiveProvider callback below
+        // can close over them and call resolveProviderConfig synchronously at task-create time.
+        const providerConfigStore = new FileProviderConfigStore();
+        const providerKeychainStore = createProviderKeychainStore();
+        const providerOAuthTokenStore = createProviderOAuthTokenStore();
+        // Token refresh manager — transparently refreshes OAuth tokens before they expire
+        const tokenRefreshManager = new TokenRefreshManager({
+            providerConfigStore,
+            providerKeychainStore,
+            providerOAuthTokenStore,
+            transport: transportServer,
+        });
+        // Clear stale provider config on startup (e.g. migration from v1 system keychain to v2 file keystore).
+        // If a provider is configured but its API key is no longer accessible, disconnect it so the user
+        // is returned to the onboarding flow rather than hitting a cryptic API key error mid-task.
+        await clearStaleProviderConfig(providerConfigStore, providerKeychainStore, providerOAuthTokenStore);
+        // State endpoint: provider config — agents request this on startup and after provider:updated
+        transportServer.onRequest(TransportStateEventNames.GET_PROVIDER_CONFIG, async () => resolveProviderConfig({ authStateStore, providerConfigStore, providerKeychainStore, tokenRefreshManager }));
+        const billingConfigStoreFactory = (projectPath) => new FileBillingConfigStore({ baseDir: join(projectPath, BRV_DIR) });
+        transportServer.onRequest(TransportStateEventNames.GET_BILLING_CONFIG, createBillingStateHandler(billingConfigStoreFactory));
         const transportHandlers = new TransportHandlers({
             agentPool,
             clientManager,
@@ -341,6 +371,7 @@ async function main() {
             // so peer clients (TUI / MCP) can render drift indicators without an
             // extra round-trip.
             daemonVersion: version,
+            getTaskHistoryStore,
             // Resolves the project's review-disabled flag once at task-create. The result
             // is stamped onto TaskInfo + TaskExecute so daemon hooks (CurateLogHandler) and
             // the agent process (curate-tool backups, dream review entries) all observe a
@@ -348,7 +379,7 @@ async function main() {
             // idle-dream dispatch above so review semantics are identical regardless of
             // dispatch source (CLI task:create vs agent-idle trigger).
             isReviewDisabled: resolveReviewDisabled,
-            lifecycleHooks: [curateLogHandler, queryLogHandler],
+            lifecycleHooks: [curateLogHandler, queryLogHandler, taskHistoryHook],
             // Daemon-side gate for dream task:create — mirrors the idle-trigger pre-check
             // in this file so the CLI path (brv dream without --force) actually honors
             // gate 3 (queue). The agent-side check kept gate 3 hardcoded to skip,
@@ -369,6 +400,21 @@ async function main() {
             },
             projectRegistry,
             projectRouter,
+            // Stamp the active provider/model snapshot onto every created task so the
+            // Web UI can display which provider handled which task. Failures are
+            // swallowed by TaskRouter's safeResolveActiveProvider — never blocks dispatch.
+            async resolveActiveProvider() {
+                const config = await resolveProviderConfig({
+                    authStateStore,
+                    providerConfigStore,
+                    providerKeychainStore,
+                    tokenRefreshManager,
+                });
+                return {
+                    ...(config.activeModel ? { model: config.activeModel } : {}),
+                    ...(config.activeProvider ? { provider: config.activeProvider } : {}),
+                };
+            },
             transport: transportServer,
         });
         transportHandlers.setup();
@@ -526,28 +572,12 @@ async function main() {
                 running: transportServer.isRunning(),
             },
         }));
-        // Provider config/keychain stores — shared between feature handlers and state endpoint
-        const providerConfigStore = new FileProviderConfigStore();
-        const providerKeychainStore = createProviderKeychainStore();
-        const providerOAuthTokenStore = createProviderOAuthTokenStore();
-        // Token refresh manager — transparently refreshes OAuth tokens before they expire
-        const tokenRefreshManager = new TokenRefreshManager({
-            providerConfigStore,
-            providerKeychainStore,
-            providerOAuthTokenStore,
-            transport: transportServer,
-        });
-        // Clear stale provider config on startup (e.g. migration from v1 system keychain to v2 file keystore).
-        // If a provider is configured but its API key is no longer accessible, disconnect it so the user
-        // is returned to the onboarding flow rather than hitting a cryptic API key error mid-task.
-        await clearStaleProviderConfig(providerConfigStore, providerKeychainStore, providerOAuthTokenStore);
-        // State endpoint: provider config — agents request this on startup and after provider:updated
-        transportServer.onRequest(TransportStateEventNames.GET_PROVIDER_CONFIG, async () => resolveProviderConfig({ authStateStore, providerConfigStore, providerKeychainStore, tokenRefreshManager }));
         // Feature handlers (auth, init, status, push, pull, etc.) require async OIDC discovery.
         // Placed after daemon:getState so the debug endpoint is available immediately,
         // without waiting for OIDC discovery (~400ms).
         await setupFeatureHandlers({
             authStateStore,
+            billingConfigStoreFactory,
             broadcastToProject(projectPath, event, data) {
                 broadcastToProjectRoom(projectRegistry, projectRouter, projectPath, event, data);
             },

package/dist/server/infra/dream/dream-response-schemas.d.ts

@@ -86,10 +86,16 @@ export declare const SynthesisCandidateSchema: z.ZodObject<{
         domain: string;
         fact: string;
     }>, "many">;
+    keywords: z.ZodArray<z.ZodString, "many">;
     placement: z.ZodString;
+    summary: z.ZodString;
+    tags: z.ZodArray<z.ZodString, "many">;
     title: z.ZodString;
 }, "strip", z.ZodTypeAny, {
+    summary: string;
+    tags: string[];
     title: string;
+    keywords: string[];
     confidence: number;
     claim: string;
     evidence: {
@@ -98,7 +104,10 @@ export declare const SynthesisCandidateSchema: z.ZodObject<{
     }[];
     placement: string;
 }, {
+    summary: string;
+    tags: string[];
     title: string;
+    keywords: string[];
     confidence: number;
     claim: string;
     evidence: {
@@ -121,10 +130,16 @@ export declare const SynthesizeResponseSchema: z.ZodObject<{
             domain: string;
             fact: string;
         }>, "many">;
+        keywords: z.ZodArray<z.ZodString, "many">;
         placement: z.ZodString;
+        summary: z.ZodString;
+        tags: z.ZodArray<z.ZodString, "many">;
         title: z.ZodString;
     }, "strip", z.ZodTypeAny, {
+        summary: string;
+        tags: string[];
         title: string;
+        keywords: string[];
         confidence: number;
         claim: string;
         evidence: {
@@ -133,7 +148,10 @@ export declare const SynthesizeResponseSchema: z.ZodObject<{
         }[];
         placement: string;
     }, {
+        summary: string;
+        tags: string[];
         title: string;
+        keywords: string[];
         confidence: number;
         claim: string;
         evidence: {
@@ -144,7 +162,10 @@ export declare const SynthesizeResponseSchema: z.ZodObject<{
     }>, "many">;
 }, "strip", z.ZodTypeAny, {
     syntheses: {
+        summary: string;
+        tags: string[];
         title: string;
+        keywords: string[];
         confidence: number;
         claim: string;
         evidence: {
@@ -155,7 +176,10 @@ export declare const SynthesizeResponseSchema: z.ZodObject<{
     }[];
 }, {
     syntheses: {
+        summary: string;
+        tags: string[];
         title: string;
+        keywords: string[];
         confidence: number;
         claim: string;
         evidence: {

package/dist/server/infra/dream/dream-response-schemas.js

@@ -13,6 +13,10 @@ export const ConsolidateResponseSchema = z.object({
     actions: z.array(ConsolidationActionSchema),
 });
 // ── Synthesize ───────────────────────────────────────────────────────────────
+// Bounds are slightly above the prompt's soft targets (200 chars / 3-5 tags /
+// 5-10 keywords) so a model that goes a little over still produces a usable
+// synthesis instead of being rejected outright; the caps still prevent a
+// runaway model from landing oversized text directly in card-mode YAML.
 export const SynthesisCandidateSchema = z.object({
     claim: z.string(),
     confidence: z.number().min(0).max(1),
@@ -20,7 +24,10 @@ export const SynthesisCandidateSchema = z.object({
         domain: z.string(),
         fact: z.string(),
     })),
+    keywords: z.array(z.string()).max(15),
     placement: z.string(),
+    summary: z.string().max(500),
+    tags: z.array(z.string()).max(8),
     title: z.string(),
 });
 export const SynthesizeResponseSchema = z.object({

package/dist/server/infra/dream/operations/consolidate.js

@@ -15,6 +15,7 @@ import { randomUUID } from 'node:crypto';
 import { access, mkdir, readdir, readFile, rename, unlink, writeFile } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { warnSidecarFailure } from '../../../core/domain/knowledge/sidecar-logging.js';
+import { isExcludedFromSync } from '../../context-tree/derived-artifact.js';
 import { ConsolidateResponseSchema } from '../dream-response-schemas.js';
 import { parseDreamResponse } from '../parse-dream-response.js';
 /**
@@ -226,7 +227,7 @@ function addFrontmatterFields(content, fields) {
                 if (parsed && typeof parsed === 'object') {
                     // Spread preserves existing key order; new fields are appended at end.
                     const merged = { ...parsed, ...fields };
-                    const newYaml = yamlDump(merged, { flowLevel: 2, lineWidth: -1, sortKeys: false }).trimEnd();
+                    const newYaml = yamlDump(merged, { flowLevel: 1, lineWidth: -1, sortKeys: false }).trimEnd();
                     return `---\n${newYaml}\n---\n${body}`;
                 }
             }
@@ -236,7 +237,7 @@ function addFrontmatterFields(content, fields) {
         }
     }
     // No valid frontmatter — prepend
-    const yaml = yamlDump(fields, { flowLevel: 2, lineWidth: -1, sortKeys: false }).trimEnd();
+    const yaml = yamlDump(fields, { flowLevel: 1, lineWidth: -1, sortKeys: false }).trimEnd();
     return `---\n${yaml}\n---\n${content}`;
 }
 // ── Helpers ──────────────────────────────────────────────────────────────────
@@ -458,8 +459,10 @@ async function executeCrossReference(action, ctx) {
         await Promise.all(Object.entries(previousTexts).map(([file, content]) => reviewBackupStore.save(file, content).catch(() => { })));
     }
     // For each file, add the other files to its related frontmatter
-    await Promise.all(action.files.map((file) => {
-        const otherFiles = action.files.filter((f) => f !== file);
+    // Skip derived-artifact targets so we never write related: onto them.
+    const eligibleFiles = action.files.filter((f) => !isExcludedFromSync(f));
+    await Promise.all(eligibleFiles.map((file) => {
+        const otherFiles = eligibleFiles.filter((f) => f !== file);
         return addRelatedLinks(join(contextTreeDir, file), otherFiles);
     }));
     return {
@@ -472,6 +475,8 @@ async function executeCrossReference(action, ctx) {
     };
 }
 async function addRelatedLinks(filePath, relatedPaths) {
+    // Skip paths that won't be pushed — they'd be dangling refs on remote.
+    const incoming = relatedPaths.filter((p) => !isExcludedFromSync(p));
     let content;
     try {
         content = await readFile(filePath, 'utf8');
@@ -491,8 +496,14 @@ async function addRelatedLinks(filePath, relatedPaths) {
             try {
                 const parsed = yamlLoad(yamlBlock);
                 if (parsed && typeof parsed === 'object') {
-                    const existing = Array.isArray(parsed.related) ? parsed.related : [];
-                    parsed.related = [...new Set([...existing, ...relatedPaths])];
+                    const hadRelated = Array.isArray(parsed.related);
+                    const existing = (Array.isArray(parsed.related) ? parsed.related : [])
+                        .filter((p) => !isExcludedFromSync(p));
+                    const merged = [...new Set([...existing, ...incoming])];
+                    // Don't introduce a related: [] key into a file that didn't have one.
+                    if (!hadRelated && merged.length === 0)
+                        return;
+                    parsed.related = merged;
                     const newYaml = yamlDump(parsed, { flowLevel: 1, lineWidth: -1, sortKeys: false }).trimEnd();
                     await atomicWrite(filePath, `---\n${newYaml}\n---\n${body}`);
                     return;
@@ -503,8 +514,10 @@ async function addRelatedLinks(filePath, relatedPaths) {
             }
         }
     }
-    // No existing frontmatter — add one with related field
-    const yaml = yamlDump({ related: relatedPaths }, { flowLevel: 1, lineWidth: -1, sortKeys: false }).trimEnd();
+    // No existing frontmatter — add one with related field, unless filter left nothing to add.
+    if (incoming.length === 0)
+        return;
+    const yaml = yamlDump({ related: incoming }, { flowLevel: 1, lineWidth: -1, sortKeys: false }).trimEnd();
     await atomicWrite(filePath, `---\n${yaml}\n---\n${content}`);
 }
 async function determineNeedsReview(actionType, files, opts) {

package/dist/server/infra/dream/operations/synthesize.js

@@ -200,15 +200,36 @@ async function writeSynthesisFile(candidate, contextTreeDir, runtimeSignalStore,
         // ENOENT — good, proceed
     }
     const sources = candidate.evidence.map((e) => `${e.domain}/_index.md`);
+    // Normalize tags to lowercase kebab-case so card chips and BM25 search see
+    // a consistent label regardless of whether the model honored the prompt's
+    // formatting rule. Empty entries (post-trim) are dropped.
+    const normalizedTags = candidate.tags
+        .map((t) => t.toLowerCase().trim().replaceAll(/\s+/g, '-'))
+        .filter((t) => t.length > 0);
+    const now = new Date().toISOString();
+    // Field order is enforced by insertion order (yamlDump uses sortKeys:false).
+    // Synthesis markers (confidence, sources, synthesized_at, type) come first
+    // in the order pre-existing synthesized files use on disk, so re-generating
+    // an old file does not produce a mechanical reorder diff. The seven
+    // semantic fields below mirror the order in markdown-writer.ts's
+    // generateFrontmatter so the on-disk shape matches regular `brv save`
+    // files; cogit then exposes them in DtoV3MemoryCardResource for card-mode
+    // display in the web UI.
     /* eslint-disable camelcase */
-    const frontmatter = {
-        confidence: candidate.confidence,
-        sources,
-        synthesized_at: new Date().toISOString(),
-        type: 'synthesis',
-    };
+    const frontmatter = {};
+    frontmatter.confidence = candidate.confidence;
+    frontmatter.sources = sources;
+    frontmatter.synthesized_at = now;
+    frontmatter.type = 'synthesis';
+    frontmatter.title = candidate.title;
+    frontmatter.summary = candidate.summary;
+    frontmatter.tags = normalizedTags;
+    frontmatter.related = [];
+    frontmatter.keywords = candidate.keywords;
+    frontmatter.createdAt = now;
+    frontmatter.updatedAt = now;
     /* eslint-enable camelcase */
-    const yaml = yamlDump(frontmatter, { lineWidth: -1, sortKeys: false }).trimEnd();
+    const yaml = yamlDump(frontmatter, { flowLevel: 1, lineWidth: -1, sortKeys: false }).trimEnd();
     const body = [
         `# ${candidate.title}`,
         '',
@@ -280,11 +301,17 @@ function buildPrompt(domains, existingSyntheses) {
         '- Do NOT report trivial or obvious connections (e.g., "both domains use TypeScript").',
         '- Each synthesis must reference at least 2 domains with specific evidence.',
         '- For "placement", choose the domain where this insight is MOST actionable.',
+        '- "summary" is one sentence (≤ 200 chars) describing the insight; this is what the UI shows as a card preview.',
+        '- "tags" are 3-5 short topical labels drawn from the source domains (e.g., "auth", "caching"). Lowercase, kebab-case.',
+        '- "keywords" are 5-10 single words a developer would search for to surface this synthesis.',
         '- If nothing meaningful is found, return an empty array. That is fine — but missing a clear cross-domain pattern is a failure.',
         '',
+        // Keep the JSON shape below in sync with SynthesisCandidateSchema in
+        // dream-response-schemas.ts; the schema rejects responses that omit any
+        // listed field, so adding a field there requires updating this example.
         'Respond with JSON:',
         '```',
-        '{ "syntheses": [{ "title": "...", "claim": "...", "evidence": [{"domain": "...", "fact": "..."}], "confidence": 0.0-1.0, "placement": "..." }] }',
+        '{ "syntheses": [{ "title": "...", "summary": "...", "claim": "...", "evidence": [{"domain": "...", "fact": "..."}], "tags": ["..."], "keywords": ["..."], "confidence": 0.0-1.0, "placement": "..." }] }',
         '```',
     ].join('\n');
 }

package/dist/server/infra/http/provider-model-fetchers.js

@@ -361,17 +361,23 @@ export class OpenAICompatibleModelFetcher {
         const modelList = Array.isArray(responseData)
             ? responseData
             : (responseData.data ?? responseData.models ?? []);
-        const models = modelList.map((model) => {
+        const uniqueModels = new Map();
+        for (const model of modelList) {
             const id = String(model.id ?? model.name ?? '');
-            return {
+            if (!id)
+                continue;
+            if (uniqueModels.has(id))
+                continue;
+            uniqueModels.set(id, {
                 contextLength: typeof model.context_length === 'number' ? model.context_length : 128_000,
                 id,
                 isFree: false,
                 name: id,
                 pricing: { inputPerM: 0, outputPerM: 0 },
                 provider: this.providerName,
-            };
-        });
+            });
+        }
+        const models = [...uniqueModels.values()];
         // Sort by ID
         models.sort((a, b) => a.id.localeCompare(b.id));
         this.cache = { models, timestamp: Date.now() };

package/dist/server/infra/process/feature-handlers.d.ts

@@ -9,10 +9,12 @@ import type { IProviderKeychainStore } from '../../core/interfaces/i-provider-ke
 import type { IProviderOAuthTokenStore } from '../../core/interfaces/i-provider-oauth-token-store.js';
 import type { IProjectRegistry } from '../../core/interfaces/project/i-project-registry.js';
 import type { IAuthStateStore } from '../../core/interfaces/state/i-auth-state-store.js';
+import type { IBillingConfigStore } from '../../core/interfaces/storage/i-billing-config-store.js';
 import type { ITransportServer } from '../../core/interfaces/transport/i-transport-server.js';
 import type { ProjectBroadcaster, ProjectPathResolver } from '../transport/handlers/handler-types.js';
 export interface FeatureHandlersOptions {
     authStateStore: IAuthStateStore;
+    billingConfigStoreFactory: (projectPath: string) => IBillingConfigStore;
     broadcastToProject: ProjectBroadcaster;
     getActiveProjectPaths: () => string[];
     log: (msg: string) => void;
@@ -28,4 +30,4 @@ export interface FeatureHandlersOptions {
  * Setup all feature handlers on the transport server.
  * These handlers implement the TUI ↔ Server event contract (auth:*, config:*, status:*, etc.).
  */
-export declare function setupFeatureHandlers({ authStateStore, broadcastToProject, getActiveProjectPaths, log, projectRegistry, providerConfigStore, providerKeychainStore, providerOAuthTokenStore, resolveProjectPath, transport, webuiPort, }: FeatureHandlersOptions): Promise<void>;
+export declare function setupFeatureHandlers({ authStateStore, billingConfigStoreFactory, broadcastToProject, getActiveProjectPaths, log, projectRegistry, providerConfigStore, providerKeychainStore, providerOAuthTokenStore, resolveProjectPath, transport, webuiPort, }: FeatureHandlersOptions): Promise<void>;

package/dist/server/infra/process/feature-handlers.js

@@ -10,9 +10,12 @@ import { ReviewEvents } from '../../../shared/transport/events/review-events.js'
 import { getAuthConfig } from '../../config/auth.config.js';
 import { getCurrentConfig } from '../../config/environment.js';
 import { API_V1_PATH, BRV_DIR } from '../../constants.js';
+import { TransportStateEventNames } from '../../core/domain/transport/schemas.js';
 import { getProjectDataDir } from '../../utils/path-utils.js';
 import { OAuthService } from '../auth/oauth-service.js';
 import { OidcDiscoveryService } from '../auth/oidc-discovery-service.js';
+import { HttpBillingService } from '../billing/http-billing-service.js';
+import { createPaidOrganizationsHandler } from '../billing/paid-organizations-endpoint.js';
 import { SystemBrowserLauncher } from '../browser/system-browser-launcher.js';
 import { HttpCogitPullService } from '../cogit/http-cogit-pull-service.js';
 import { HttpCogitPushService } from '../cogit/http-cogit-push-service.js';
@@ -37,23 +40,25 @@ import { FileReviewBackupStore } from '../storage/file-review-backup-store.js';
 import { createTokenStore } from '../storage/token-store.js';
 import { HttpTeamService } from '../team/http-team-service.js';
 import { FsTemplateLoader } from '../template/fs-template-loader.js';
-import { AuthHandler, ConfigHandler, ConnectorsHandler, ContextTreeHandler, HubHandler, InitHandler, LocationsHandler, ModelHandler, ProviderHandler, PullHandler, PushHandler, ResetHandler, ReviewHandler, SourceHandler, SpaceHandler, StatusHandler, VcHandler, WorktreeHandler, } from '../transport/handlers/index.js';
+import { AuthHandler, BillingHandler, ConfigHandler, ConnectorsHandler, ContextTreeHandler, HubHandler, InitHandler, LocationsHandler, ModelHandler, ProviderHandler, PullHandler, PushHandler, ResetHandler, ReviewHandler, SourceHandler, SpaceHandler, StatusHandler, TeamHandler, VcHandler, WorktreeHandler, } from '../transport/handlers/index.js';
 import { HttpUserService } from '../user/http-user-service.js';
 import { FileVcGitConfigStore } from '../vc/file-vc-git-config-store.js';
 /**
  * Setup all feature handlers on the transport server.
  * These handlers implement the TUI ↔ Server event contract (auth:*, config:*, status:*, etc.).
  */
-export async function setupFeatureHandlers({ authStateStore, broadcastToProject, getActiveProjectPaths, log, projectRegistry, providerConfigStore, providerKeychainStore, providerOAuthTokenStore, resolveProjectPath, transport, webuiPort, }) {
+export async function setupFeatureHandlers({ authStateStore, billingConfigStoreFactory, broadcastToProject, getActiveProjectPaths, log, projectRegistry, providerConfigStore, providerKeychainStore, providerOAuthTokenStore, resolveProjectPath, transport, webuiPort, }) {
     const envConfig = getCurrentConfig();
     const tokenStore = createTokenStore();
     const projectConfigStore = new ProjectConfigStore();
     // API version paths appended at point of use.
     // Note: IAM and Cogit currently share this version path, but may version independently in the future.
     const iamApiV1 = `${envConfig.iamBaseUrl}${API_V1_PATH}`;
+    const billingApiV1 = `${envConfig.billingBaseUrl}${API_V1_PATH}`;
     const userService = new HttpUserService({ apiBaseUrl: iamApiV1 });
     const teamService = new HttpTeamService({ apiBaseUrl: iamApiV1 });
     const spaceService = new HttpSpaceService({ apiBaseUrl: iamApiV1 });
+    const billingService = new HttpBillingService({ apiBaseUrl: billingApiV1 });
     // Auth handler requires async OIDC discovery
     const discoveryService = new OidcDiscoveryService();
     const authConfig = await getAuthConfig(discoveryService);
@@ -65,6 +70,7 @@ export async function setupFeatureHandlers({ authStateStore, broadcastToProject,
         browserLauncher: new SystemBrowserLauncher(),
         callbackHandler: new CallbackHandler(),
         projectConfigStore,
+        providerConfigStore,
         resolveProjectPath,
         tokenStore,
         transport,
@@ -78,6 +84,20 @@ export async function setupFeatureHandlers({ authStateStore, broadcastToProject,
         providerOAuthTokenStore,
         transport,
     }).setup();
+    new BillingHandler({
+        authStateStore,
+        billingConfigStoreFactory,
+        billingService,
+        providerConfigStore,
+        resolveProjectPath,
+        transport,
+    }).setup();
+    transport.onRequest(TransportStateEventNames.GET_PAID_ORGANIZATIONS, createPaidOrganizationsHandler({ authStateStore, billingService }));
+    new TeamHandler({
+        authStateStore,
+        teamService,
+        transport,
+    }).setup();
     new ModelHandler({
         providerConfigStore,
         providerKeychainStore,
@@ -100,10 +120,14 @@ export async function setupFeatureHandlers({ authStateStore, broadcastToProject,
     // Project-scoped handlers (receive resolveProjectPath for client → project resolution)
     const gitService = new IsomorphicGitService(authStateStore);
     new StatusHandler({
+        authStateStore,
+        billingConfigStoreFactory,
+        billingService,
         contextTreeService,
         contextTreeSnapshotService,
         curateLogStoreFactory: (projectPath) => new FileCurateLogStore({ baseDir: getProjectDataDir(projectPath) }),
         projectConfigStore,
+        providerConfigStore,
         resolveProjectPath,
         tokenStore,
         transport,