@xmoxmo/bncr 0.5.6 → 0.5.7

package/src/core/outbox-summary.ts

@@ -1,23 +1,16 @@
 import type { OutboxEntry } from './types.ts';
 
-type OutboxSummaryMeta = {
-  kind?: string;
-  asVoice?: boolean;
-  audioAsVoice?: boolean;
-  type?: unknown;
-  mediaUrl?: unknown;
-  text?: unknown;
-};
-
 type OutboxSummaryMessage = {
   type?: unknown;
   msg?: unknown;
+  mediaUrl?: unknown;
+  audioAsVoice?: boolean;
+  asVoice?: boolean;
 };
 
 type OutboxSummaryPayload = {
   type?: unknown;
   message?: OutboxSummaryMessage;
-  _meta?: OutboxSummaryMeta;
 };
 
 function inferMediaTypeFromUrl(raw: string): 'image' | 'video' | 'audio' | 'file' {
@@ -47,27 +40,22 @@ function summarizeOutboxType(
 ) {
   const directType = asString(msg.type || '');
   if (directType) return directType;
-
-  const meta = payload?._meta || {};
-  if (meta.kind === 'file-transfer') {
-    if (meta.asVoice === true || meta.audioAsVoice === true) return 'voice';
-    const hintedType = asString(meta.type || '').trim();
-    if (hintedType) return hintedType;
-    return inferMediaTypeFromUrl(asString(meta.mediaUrl || ''));
+  // Infer type from mediaUrl when no direct type is set
+  const mediaUrl = asString(msg.mediaUrl || '');
+  if (mediaUrl) {
+    if (msg.audioAsVoice === true || msg.asVoice === true) return 'voice';
+    const inferred = inferMediaTypeFromUrl(mediaUrl);
+    if (inferred) return inferred;
   }
-
   return asString(payload?.type || 'unknown');
 }
 
-function summarizeOutboxText(
-  payload: OutboxSummaryPayload,
-  msg: OutboxSummaryMessage,
-  asString: (value: unknown) => string,
-) {
-  const text = asString(msg.msg || payload?._meta?.text || '').trim();
+function summarizeOutboxText(msg: OutboxSummaryMessage, asString: (value: unknown) => string) {
+  const text = asString(msg.msg || '').trim();
   if (text) return text;
-  const meta = payload?._meta || {};
-  if (meta.kind === 'file-transfer') return filenameFromUrl(asString(meta.mediaUrl || ''));
+  // Fall back to filename from mediaUrl when no caption is set
+  const mediaUrl = asString(msg.mediaUrl || '');
+  if (mediaUrl) return filenameFromUrl(mediaUrl);
   return '';
 }
 
@@ -80,7 +68,7 @@ export function summarizeOutboxEntry(args: {
   const payload = args.entry.payload as OutboxSummaryPayload;
   const msg = payload?.message || {};
   const type = summarizeOutboxType(payload, msg, args.asString);
-  const text = summarizeOutboxText(payload, msg, args.asString);
+  const text = summarizeOutboxText(msg, args.asString);
   const preview = args.summarizeTextPreview(text);
   return [type, args.formatDisplayScope(args.entry.route), preview].join('|');
 }

package/src/core/outbox-text-push-prep.ts

@@ -1,36 +1 @@
-import type { BncrConnection, OutboxEntry } from './types.ts';
-
-export function prepareTextPushRouteSelection(args: {
-  entry: OutboxEntry;
-  owner: BncrConnection | null;
-  resolvePushConnIds: (accountId: string) => Iterable<string>;
-  resolveRecentInboundConnIds: (accountId: string) => Iterable<string>;
-  hasRecentInboundReachability: (accountId: string) => boolean;
-  isRevalidatedAttemptedConn: (connId: string) => boolean;
-  selectOutboxRouteCandidates: (args: {
-    routeCandidates: Iterable<string>;
-    attemptedConnIds: string[];
-    recentInboundConnIds: Iterable<string>;
-    ownerConnId?: string;
-    recentInboundReachable: boolean;
-    isRevalidatedAttemptedConn: (connId: string) => boolean;
-  }) => {
-    connIds: Iterable<string>;
-    recentInboundReachable: boolean;
-    routeReason: string;
-    ownerConnId?: string;
-  };
-}) {
-  const attemptedConnIds = Array.isArray(args.entry.routeAttemptConnIds)
-    ? args.entry.routeAttemptConnIds.filter((v): v is string => typeof v === 'string' && !!v)
-    : [];
-
-  return args.selectOutboxRouteCandidates({
-    routeCandidates: args.resolvePushConnIds(args.entry.accountId),
-    attemptedConnIds,
-    recentInboundConnIds: args.resolveRecentInboundConnIds(args.entry.accountId),
-    ownerConnId: args.owner?.connId,
-    recentInboundReachable: args.hasRecentInboundReachability(args.entry.accountId),
-    isRevalidatedAttemptedConn: args.isRevalidatedAttemptedConn,
-  });
-}
+export { prepareRouteSelection as prepareTextPushRouteSelection } from './outbox-file-transfer-prep.ts';

package/src/core/permissions.ts

@@ -1,8 +1,4 @@
-function asString(v: unknown, fallback = ''): string {
-  if (typeof v === 'string') return v;
-  if (v == null) return fallback;
-  return String(v);
-}
+import { asString } from '../core/value-sanitize.ts';
 
 type BncrElevatedConfigRoot = {
   tools?: {
@@ -14,21 +10,18 @@ type BncrElevatedConfigRoot = {
     };
   };
 };
-
 export function getBncrElevatedConfig(rootCfg: BncrElevatedConfigRoot | null | undefined) {
   const elevated = rootCfg?.tools?.elevated || {};
   const allowFrom = elevated?.allowFrom || {};
   const bncrRules = Array.isArray(allowFrom?.bncr)
     ? allowFrom.bncr.map((x: unknown) => asString(x).trim()).filter(Boolean)
     : [];
-
   return {
     enabled: elevated?.enabled === true,
     bncrAllowed: bncrRules.length > 0,
     bncrRules,
   };
 }
-
 export function buildBncrPermissionSummary(rootCfg: BncrElevatedConfigRoot | null | undefined) {
   const elevated = getBncrElevatedConfig(rootCfg);
   return {
@@ -40,5 +33,4 @@ export function buildBncrPermissionSummary(rootCfg: BncrElevatedConfigRoot | nul
       : 'bncr elevated not explicitly allowed',
   };
 }
-
 export type BncrPermissionSummary = ReturnType<typeof buildBncrPermissionSummary>;

package/src/core/persisted-outbox-entry.ts

@@ -1,22 +1,12 @@
 import { normalizeAccountId } from './accounts.ts';
 import { normalizeStoredSessionKey, parseRouteLike } from './targets.ts';
 import type { OutboxEntry } from './types.ts';
+import { asString, finiteNumberOr } from './value-sanitize.ts';
 
 type PersistedOutboxEntryInput = Partial<OutboxEntry> & {
   payload?: Record<string, unknown>;
 };
 
-function asString(v: unknown, fallback = ''): string {
-  if (typeof v === 'string') return v;
-  if (v == null) return fallback;
-  return String(v);
-}
-
-function finiteNumberOr(value: unknown, fallback: number): number {
-  const n = Number(value);
-  return Number.isFinite(n) ? n : fallback;
-}
-
 function optionalFiniteNumber(value: unknown): number | undefined {
   if (value == null || value === '') return undefined;
   const n = Number(value);
@@ -43,6 +33,59 @@ export function normalizePersistedOutboxEntry(args: {
   payload.groupId = route.groupId;
   payload.userId = route.userId;
 
+  // Migrate old _meta format entries to the new message format.
+  // Old entries persisted before the _meta→message refactor carry media
+  // metadata in payload._meta.  New code reads from payload.message.
+  const oldMeta = payload._meta as Record<string, unknown> | undefined;
+  if (oldMeta && !payload.message) {
+    const oldKind = asString(oldMeta.kind);
+    if (oldKind === 'file-transfer') {
+      // Move replyToId from _meta to payload top level
+      const replyToId = asString(oldMeta.replyToId || '').trim() || undefined;
+      if (replyToId) payload.replyToId = replyToId;
+
+      // Build new message object from old _meta fields
+      const msg: Record<string, unknown> = {
+        type: (oldMeta.type as string) || 'file',
+        msg: oldMeta.text || '',
+        mediaUrl: oldMeta.mediaUrl,
+        mediaLocalRoots: oldMeta.mediaLocalRoots,
+        asVoice: oldMeta.asVoice === true,
+        audioAsVoice: oldMeta.audioAsVoice === true,
+        downloadMedia: oldMeta.downloadMedia === true,
+        kind: oldMeta.messageKind,
+        transferMode: 'media',
+        path: '',
+        base64: '',
+        fileName: '',
+      };
+      // Strip consumed _meta keys, pass through remaining as extra
+      const consumed = new Set([
+        'kind',
+        'mediaUrl',
+        'mediaLocalRoots',
+        'text',
+        'asVoice',
+        'audioAsVoice',
+        'replyToId',
+        'finalEvent',
+        'type',
+        'downloadMedia',
+        'messageKind',
+        'retryCount',
+        'nextAttemptAt',
+      ]);
+      for (const [key, value] of Object.entries(oldMeta)) {
+        if (!consumed.has(key)) {
+          msg[key] = value;
+        }
+      }
+      payload.message = msg;
+    }
+    // Remove old _meta after migration
+    delete payload._meta;
+  }
+
   return {
     ...entry,
     messageId: asString(entry.messageId).trim(),

package/src/core/policy.ts

@@ -1,8 +1,4 @@
-function asString(v: unknown, fallback = ''): string {
-  if (typeof v === 'string') return v;
-  if (v == null) return fallback;
-  return String(v);
-}
+import { asBoolean, asString } from './value-sanitize.ts';
 
 export type BncrChannelPolicyConfig = {
   enabled?: boolean;
@@ -21,12 +17,6 @@ function asList(v: unknown): string[] {
   return v.map((x) => asString(x).trim()).filter(Boolean);
 }
 
-function asBoolean(v: unknown, fallback = false): boolean {
-  if (typeof v === 'boolean') return v;
-  if (v == null) return fallback;
-  return String(v).trim().toLowerCase() === 'true';
-}
-
 function normalizeDmPolicy(value: unknown): BncrDmPolicy {
   const normalized = asString(value || 'open')
     .trim()

package/src/core/register-trace.ts

@@ -1,9 +1,6 @@
-const DEFAULT_REGISTER_WARMUP_WINDOW_MS = 30_000;
+import { finiteNumberOr } from './value-sanitize.ts';
 
-function finiteNumberOr(value: unknown, fallback: number): number {
-  const n = Number(value);
-  return Number.isFinite(n) ? n : fallback;
-}
+const DEFAULT_REGISTER_WARMUP_WINDOW_MS = 30_000;
 
 export type RegisterTraceEntry = {
   ts: number;

package/src/core/status-meta.ts

@@ -1,4 +1,5 @@
 import type { PendingAdmission } from './types.ts';
+import { finiteNumberOrNull, now } from './value-sanitize.ts';
 
 type RuntimeStatusMetaDisplayInput = {
   pendingAdmissions?: PendingAdmission[];
@@ -8,15 +9,6 @@ type RuntimeStatusMetaDisplayInput = {
   lastOutboundAt?: number | null;
 };
 
-function now() {
-  return Date.now();
-}
-
-function finiteNumberOrNull(value: unknown): number | null {
-  const n = Number(value);
-  return Number.isFinite(n) ? n : null;
-}
-
 function formatPendingAdmissionScope(route: unknown): string | null {
   if (!route || typeof route !== 'object') return null;
   const record = route as Record<string, unknown>;

package/src/core/status.ts

@@ -2,6 +2,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { buildRuntimeStatusMetaDisplay } from './status-meta.ts';
 import type { BncrDiagnosticsSummary, BncrRuntimeLastSession, PendingAdmission } from './types.ts';
+import { finiteNumberOr, nonNegativeFiniteNumberOr, now } from './value-sanitize.ts';
 
 type RuntimeStatusInput = {
   accountId: string;
@@ -27,19 +28,6 @@ type RuntimeStatusInput = {
   channelRoot?: string;
 };
 
-function now() {
-  return Date.now();
-}
-
-function finiteNumberOr(value: unknown, fallback: number): number {
-  const n = Number(value);
-  return Number.isFinite(n) ? n : fallback;
-}
-
-function nonNegativeFiniteNumberOr(value: unknown, fallback: number): number {
-  return Math.max(0, finiteNumberOr(value, fallback));
-}
-
 export function buildIntegratedDiagnostics(input: RuntimeStatusInput): BncrDiagnosticsSummary {
   const root = input.channelRoot || path.join(process.cwd(), 'plugins', 'bncr');
   const pluginIndexExists = fs.existsSync(path.join(root, 'index.ts'));
@@ -230,11 +218,3 @@ export function buildAccountStatusSnapshot(input: {
     diagnostics,
   };
 }
-
-export function buildChannelSummaryFromRuntime(input: RuntimeStatusInput) {
-  const headline = buildStatusHeadlineFromRuntime(input);
-  return {
-    linked: input.connected,
-    self: { e164: headline },
-  };
-}

package/src/core/targets.ts

@@ -1,4 +1,5 @@
 import type { BncrRoute } from './types.ts';
+import { asString } from './value-sanitize.ts';
 
 type RouteInputLike = {
   platform?: unknown;
@@ -28,14 +29,8 @@ export type BncrExplicitTarget = {
   groupId?: string;
 };
 
-export function asTargetString(value: unknown, fallback = ''): string {
-  if (typeof value === 'string') return value;
-  if (value == null) return fallback;
-  return String(value);
-}
-
-export function parseRouteFromStandardDisplayScope(scope: string): BncrRoute | null {
-  const parts = asTargetString(scope).trim().split(':');
+function parseRouteFromStandardDisplayScope(scope: string): BncrRoute | null {
+  const parts = asString(scope).trim().split(':');
   if (parts.length === 3) {
     const [platform, kind, id] = parts;
     if (!platform || !kind || !id) return null;
@@ -65,7 +60,7 @@ export function parseRouteFromStandardDisplayScope(scope: string): BncrRoute | n
 }
 
 function parseGroupScope(scope: string): { platform: string; groupId: string } | null {
-  const parts = asTargetString(scope).trim().split(':');
+  const parts = asString(scope).trim().split(':');
   if (parts.length !== 2) return null;
   const [platform, groupId] = parts;
   if (!platform || !groupId) return null;
@@ -73,15 +68,15 @@ function parseGroupScope(scope: string): { platform: string; groupId: string } |
 }
 
 function parseDirectScope(scope: string): { platform: string; userId: string } | null {
-  const parts = asTargetString(scope).trim().split(':');
+  const parts = asString(scope).trim().split(':');
   if (parts.length !== 2) return null;
   const [platform, userId] = parts;
   if (!platform || !userId) return null;
   return { platform, userId };
 }
 
-export function normalizeDisplayScopePrefix(scope: string): string {
-  const raw = asTargetString(scope).trim();
+function normalizeDisplayScopePrefix(scope: string): string {
+  const raw = asString(scope).trim();
   if (!raw) return '';
   if (raw.startsWith('Bncr:')) return raw;
   if (/^bncr[:-]/i.test(raw)) return raw;
@@ -89,11 +84,7 @@ export function normalizeDisplayScopePrefix(scope: string): string {
   return `Bncr:${raw}`;
 }
 
-export function resolveCanonicalSessionKind(): BncrSessionKind {
-  return 'direct';
-}
-
-export function buildExplicitTargetResult(args: {
+function buildExplicitTargetResult(args: {
   raw: string;
   source:
     | 'display-scope'
@@ -121,8 +112,8 @@ export function buildExplicitTargetResult(args: {
   };
 }
 
-export function isLowerHex(input: string): boolean {
-  const raw = asTargetString(input).trim();
+function isLowerHex(input: string): boolean {
+  const raw = asString(input).trim();
   return !!raw && /^[0-9a-fA-F]+$/.test(raw) && raw.length % 2 === 0;
 }
 
@@ -131,18 +122,18 @@ export function routeScopeToHex(route: BncrRoute): string {
   return Buffer.from(raw, 'utf8').toString('hex').toLowerCase();
 }
 
-export function groupScopeToHex(route: BncrRoute): string {
+function groupScopeToHex(route: BncrRoute): string {
   const raw = `${route.platform}:${route.groupId}`;
   return Buffer.from(raw, 'utf8').toString('hex').toLowerCase();
 }
 
-export function directScopeToHex(route: BncrRoute): string {
+function directScopeToHex(route: BncrRoute): string {
   const raw = `${route.platform}:${route.userId}`;
   return Buffer.from(raw, 'utf8').toString('hex').toLowerCase();
 }
 
-export function parseRouteFromScope(scope: string): BncrRoute | null {
-  const parts = asTargetString(scope).trim().split(':');
+function parseRouteFromScope(scope: string): BncrRoute | null {
+  const parts = asString(scope).trim().split(':');
   if (parts.length < 3) return null;
   const [platform, groupId, userId] = parts;
   if (!platform || !groupId || !userId) return null;
@@ -150,8 +141,8 @@ export function parseRouteFromScope(scope: string): BncrRoute | null {
   return { platform, groupId, userId };
 }
 
-export function parseRouteFromHexScope(scopeHex: string): BncrRoute | null {
-  const rawHex = asTargetString(scopeHex).trim();
+function parseRouteFromHexScope(scopeHex: string): BncrRoute | null {
+  const rawHex = asString(scopeHex).trim();
   if (!isLowerHex(rawHex)) return null;
 
   try {
@@ -162,8 +153,8 @@ export function parseRouteFromHexScope(scopeHex: string): BncrRoute | null {
   }
 }
 
-export function parseGroupRouteFromHexScope(scopeHex: string): BncrRoute | null {
-  const rawHex = asTargetString(scopeHex).trim();
+function parseGroupRouteFromHexScope(scopeHex: string): BncrRoute | null {
+  const rawHex = asString(scopeHex).trim();
   if (!isLowerHex(rawHex)) return null;
 
   try {
@@ -176,8 +167,8 @@ export function parseGroupRouteFromHexScope(scopeHex: string): BncrRoute | null
   }
 }
 
-export function parseDirectRouteFromHexScope(scopeHex: string): BncrRoute | null {
-  const rawHex = asTargetString(scopeHex).trim();
+function parseDirectRouteFromHexScope(scopeHex: string): BncrRoute | null {
+  const rawHex = asString(scopeHex).trim();
   if (!isLowerHex(rawHex)) return null;
 
   try {
@@ -197,15 +188,15 @@ export function parseStrictBncrSessionKey(input: string): {
   scopeHex: string;
   route: BncrRoute;
 } | null {
-  const raw = asTargetString(input).trim();
+  const raw = asString(input).trim();
   if (!raw) return null;
 
   const m = raw.match(/^agent:([^:]+):bncr:(direct|group):(.+)$/);
   if (!m?.[1] || !m?.[2] || !m?.[3]) return null;
 
-  const inputAgentId = asTargetString(m[1]).trim();
+  const inputAgentId = asString(m[1]).trim();
   const inputKind = m[2] as BncrSessionKind;
-  const payload = asTargetString(m[3]).trim();
+  const payload = asString(m[3]).trim();
   let route: BncrRoute | null = null;
   let scopeHex = '';
 
@@ -243,13 +234,13 @@ export function parseStrictBncrSessionKey(input: string): {
   };
 }
 
-export function parseLegacySessionKey(input: string): {
+function parseLegacySessionKey(input: string): {
   route: BncrRoute;
   inputKind: BncrSessionKind;
   inputAgentId?: string;
   source: 'legacy-direct' | 'legacy-bncr' | 'legacy-agent' | 'hex';
 } | null {
-  const raw = asTargetString(input).trim();
+  const raw = asString(input).trim();
   if (!raw) return null;
 
   const directLegacy = raw.match(/^agent:([^:]+):bncr:direct:([0-9a-fA-F]+):0$/);
@@ -304,10 +295,10 @@ export function parseLegacySessionKey(input: string): {
   return null;
 }
 
-export function isLegacyNoiseRoute(route: BncrRoute): boolean {
-  const platform = asTargetString(route.platform).trim().toLowerCase();
-  const groupId = asTargetString(route.groupId).trim().toLowerCase();
-  const userId = asTargetString(route.userId).trim().toLowerCase();
+function isLegacyNoiseRoute(route: BncrRoute): boolean {
+  const platform = asString(route.platform).trim().toLowerCase();
+  const groupId = asString(route.groupId).trim().toLowerCase();
+  const userId = asString(route.userId).trim().toLowerCase();
 
   if (platform === 'agent' && groupId === 'main' && userId === 'bncr') return true;
   if (platform === 'bncr' && userId === '0' && isLowerHex(groupId)) return true;
@@ -326,7 +317,7 @@ export function parseRouteFromDisplayScope(scope: string): BncrRoute | null {
 }
 
 export function buildCanonicalBncrSessionKey(route: BncrRoute, canonicalAgentId: string): string {
-  const agentId = asTargetString(canonicalAgentId).trim() || 'main';
+  const agentId = asString(canonicalAgentId).trim() || 'main';
   if (route.groupId !== '0') {
     return `agent:${agentId}:bncr:group:${groupScopeToHex(route)}`;
   }
@@ -338,7 +329,7 @@ export function normalizeStoredSessionKey(
   canonicalAgentId?: string | null,
   helpers?: { normalizeTaskKey?: (input: unknown) => string | null },
 ): { sessionKey: string; route: BncrRoute } | null {
-  const raw = asTargetString(input).trim();
+  const raw = asString(input).trim();
   if (!raw) return null;
 
   let taskKey: string | null = null;
@@ -346,7 +337,7 @@ export function normalizeStoredSessionKey(
 
   const taskTagged = raw.match(/^(.*):task:([a-z0-9_-]{1,32})$/i);
   if (taskTagged) {
-    base = asTargetString(taskTagged[1]).trim();
+    base = asString(taskTagged[1]).trim();
     taskKey = helpers?.normalizeTaskKey?.(taskTagged[2]) || null;
   }
 
@@ -370,7 +361,7 @@ export function normalizeStoredSessionKey(
   if (!route) return null;
   if (isLegacyNoiseRoute(route)) return null;
 
-  const finalAgentId = asTargetString(canonicalAgentId).trim() || passthroughAgentId;
+  const finalAgentId = asString(canonicalAgentId).trim() || passthroughAgentId;
   if (!finalAgentId) return null;
 
   const finalSessionKey = buildCanonicalBncrSessionKey(route, finalAgentId);
@@ -385,7 +376,7 @@ export function normalizeInboundSessionKey(
   route: BncrRoute,
   canonicalAgentId: string,
 ): string | null {
-  const raw = asTargetString(scope).trim();
+  const raw = asString(scope).trim();
   let finalRoute: BncrRoute | null = null;
 
   if (!raw) finalRoute = route;
@@ -399,15 +390,11 @@ export function normalizeInboundSessionKey(
   return buildCanonicalBncrSessionKey(finalRoute, canonicalAgentId);
 }
 
-export function buildFallbackSessionKey(route: BncrRoute, canonicalAgentId: string): string {
-  return buildCanonicalBncrSessionKey(route, canonicalAgentId);
-}
-
 export function parseRouteLike(input: unknown): BncrRoute | null {
   const routeInput = input && typeof input === 'object' ? (input as RouteInputLike) : null;
-  const platform = asTargetString(routeInput?.platform || '').trim();
-  const groupId = asTargetString(routeInput?.groupId || '').trim();
-  const userId = asTargetString(routeInput?.userId || '').trim();
+  const platform = asString(routeInput?.platform || '').trim();
+  const groupId = asString(routeInput?.groupId || '').trim();
+  const userId = asString(routeInput?.userId || '').trim();
   if (!platform || !groupId || !userId) return null;
   if (groupId !== '0' && userId !== '0') return null;
   return { platform, groupId, userId };
@@ -421,28 +408,23 @@ export type BncrExplicitTargetSource =
   | 'route-scope';
 
 export function formatDisplayScope(route: BncrRoute): string {
-  const platform = asTargetString(route?.platform).trim();
-  const groupId = asTargetString(route?.groupId || '0').trim() || '0';
-  const userId = asTargetString(route?.userId || '0').trim() || '0';
+  const platform = asString(route?.platform).trim();
+  const groupId = asString(route?.groupId || '0').trim() || '0';
+  const userId = asString(route?.userId || '0').trim() || '0';
   if (groupId !== '0') return `Bncr:${platform}:${groupId}:0`;
   return `Bncr:${platform}:0:${userId}`;
 }
 
 export function formatHumanDisplayScope(route: BncrRoute): string {
-  const platform = asTargetString(route?.platform).trim();
-  const groupId = asTargetString(route?.groupId || '0').trim() || '0';
-  const userId = asTargetString(route?.userId || '0').trim() || '0';
+  const platform = asString(route?.platform).trim();
+  const groupId = asString(route?.groupId || '0').trim() || '0';
+  const userId = asString(route?.userId || '0').trim() || '0';
   if (groupId !== '0') return `Bncr:${platform}:Group:${groupId}`;
   if (userId !== '0') return `Bncr:${platform}:User:${userId}`;
   return formatDisplayScope(route);
 }
 
-export function buildDisplayScopeCandidates(route: BncrRoute): string[] {
-  const candidates = [formatDisplayScope(route)].filter(Boolean);
-  return Array.from(new Set(candidates.map((x) => asTargetString(x).trim()).filter(Boolean)));
-}
-
-export function resolveExplicitTargetRoute(raw: string): {
+function resolveExplicitTargetRoute(raw: string): {
   route: BncrRoute | null;
   source: BncrExplicitTargetSource | null;
 } {
@@ -491,10 +473,10 @@ export function resolveExplicitTargetRoute(raw: string): {
 }
 
 export function parseExplicitTarget(input: string, options?: { canonicalAgentId?: string | null }) {
-  const raw = asTargetString(input).trim();
+  const raw = asString(input).trim();
   if (!raw) return null;
 
-  const canonicalAgentId = asTargetString(options?.canonicalAgentId).trim() || undefined;
+  const canonicalAgentId = asString(options?.canonicalAgentId).trim() || undefined;
   const { route, source } = resolveExplicitTargetRoute(raw);
   if (!route || !source) return null;
 
@@ -510,8 +492,8 @@ export function parseExplicitTarget(input: string, options?: { canonicalAgentId?
   });
 }
 
-export function normalizeTaskKey(input: unknown): string | null {
-  const raw = asTargetString(input).trim().toLowerCase();
+function normalizeTaskKey(input: unknown): string | null {
+  const raw = asString(input).trim().toLowerCase();
   if (!raw) return null;
   const normalized = raw
     .replace(/[^a-z0-9_-]+/g, '-')
@@ -521,7 +503,7 @@ export function normalizeTaskKey(input: unknown): string | null {
 }
 
 export function extractInlineTaskKey(text: string): { taskKey: string | null; text: string } {
-  const raw = asTargetString(text);
+  const raw = asString(text);
   if (!raw) return { taskKey: null, text: '' };
 
   const tagged = raw.match(
@@ -530,7 +512,7 @@ export function extractInlineTaskKey(text: string): { taskKey: string | null; te
   if (tagged) {
     return {
       taskKey: normalizeTaskKey(tagged[1]),
-      text: asTargetString(tagged[2]),
+      text: asString(tagged[2]),
     };
   }
 
@@ -538,7 +520,7 @@ export function extractInlineTaskKey(text: string): { taskKey: string | null; te
   if (spaced) {
     return {
       taskKey: normalizeTaskKey(spaced[1]),
-      text: asTargetString(spaced[2]),
+      text: asString(spaced[2]),
     };
   }
 
@@ -546,7 +528,7 @@ export function extractInlineTaskKey(text: string): { taskKey: string | null; te
 }
 
 export function withTaskSessionKey(sessionKey: string, taskKey?: string | null): string {
-  const base = asTargetString(sessionKey).trim();
+  const base = asString(sessionKey).trim();
   const tk = normalizeTaskKey(taskKey);
   if (!base || !tk) return base;
   if (/:task:[a-z0-9_-]+(?:$|:)/i.test(base)) return base;