@kontextmind/kxm 0.7.178 → 0.7.179

package/plugins/kxm/dist/extension.js

@@ -37827,12 +37827,12 @@ var MAX_SESSION_BRIEF_TASKS = 5;
 var MAX_SESSION_BRIEF_PLANS = 5;
 var SESSION_BRIEF_SCHEMA = "kxm.session-brief.v1";
 var DEFAULT_SESSION_BRIEF_STALE_SECONDS = 5;
-function hubPrefix(hub) {
+function hubStatusPart(hub) {
   const suffix = hub?.scope === "remote" ? "/remote" : "";
-  if (hub?.state === "on" || hub?.state === void 0 && hub?.online === true) return `kxm hub:on${suffix}`;
-  if (hub?.state === "off" || hub?.state === void 0 && hub?.online === false) return `kxm hub:off${suffix}`;
-  if (hub?.state === "unknown") return `kxm hub:unknown${suffix}`;
-  return "kxm";
+  if (hub?.state === "off" || hub?.state === void 0 && hub?.online === false) return `hub:off${suffix}`;
+  if (hub?.state === "unknown") return `hub:unknown${suffix}`;
+  if (hub?.scope === "remote") return "hub:remote";
+  return void 0;
 }
 function truncate(value, width) {
   const text = value.replace(/\s+/g, " ").trim();
@@ -37908,40 +37908,34 @@ function readGitShip(cwd) {
     return void 0;
   }
 }
-function formatSessionStatusLine(stats, current, hub, ship, updateLatest, cost) {
-  const head = hubPrefix(hub);
-  if (!current && stats.activeTasks === 0 && stats.planCount === 0 && stats.inbox === 0) {
-    const idle = hub?.online === void 0 && hub?.state === void 0 ? "kxm idle" : `${head} \xB7 idle`;
-    const withShip = ship?.dirty ? `${idle} \xB7 dirty` : ship && ship.ahead > 0 ? `${idle} \xB7 ${ship.ahead} local` : idle;
-    const withCost = cost ? `${withShip} \xB7 ${cost}` : withShip;
-    const finalLine = updateLatest ? `${withCost} \xB7 upd ${updateLatest}` : withCost;
-    return finalLine.length <= 80 ? finalLine : `${finalLine.slice(0, 79)}\u2026`;
-  }
-  const parts = [];
-  if (current?.kind === "task") parts.push(`${head} ${current.detail}`);
-  else if (current?.kind === "plan") parts.push(`${head} plan ${truncate(current.detail, 36)}`);
-  else parts.push(head);
-  parts.push(`${stats.activeTasks} task${stats.activeTasks === 1 ? "" : "s"}`);
+function formatSessionStatusLine(stats, current, hub, ship, updateLatest) {
+  const parts = ["kxm"];
+  const hubPart = hubStatusPart(hub);
+  if (hubPart) parts.push(hubPart);
+  if (current?.kind === "task") parts.push(current.detail);
+  else if (current?.kind === "plan") parts.push(`plan ${truncate(current.detail, 36)}`);
+  if (stats.activeTasks > 0) parts.push(`${stats.activeTasks} task${stats.activeTasks === 1 ? "" : "s"}`);
   if (stats.waitingTasks > 0) parts.push(`${stats.waitingTasks} waiting`);
-  parts.push(`${stats.planCount} plan${stats.planCount === 1 ? "" : "s"}`);
+  if (stats.planCount > 0) parts.push(`${stats.planCount} plan${stats.planCount === 1 ? "" : "s"}`);
   if (stats.inbox > 0) parts.push(`inbox ${stats.inbox}`);
   if (ship?.dirty) parts.push("dirty");
   else if (ship && ship.ahead > 0) parts.push(`${ship.ahead} local`);
-  if (cost) parts.push(cost);
   if (updateLatest) parts.push(`upd ${updateLatest}`);
-  const line = parts.join(" \xB7 ");
-  return line.length <= 80 ? line : `${line.slice(0, 79)}\u2026`;
+  return truncate(parts.join(" \xB7 "), 80);
 }
 function formatSessionWidget(stats, current, hub, ship, updateLatest, cost) {
-  const hubMark = hub?.state === "on" || hub?.online === true ? "hub:on  " : hub?.state === "off" || hub?.online === false ? "hub:off  " : hub?.state === "unknown" ? "hub:unknown  " : "";
-  const lines = [
-    `KXM  ${hubMark}${stats.activeTasks} tasks  ${stats.waitingTasks} waiting  ${stats.planCount} plans  inbox ${stats.inbox}`
-  ];
+  const suffix = hub?.scope === "remote" ? "/remote" : "";
+  const hubMark = hub?.state === "on" || hub?.state === void 0 && hub?.online === true ? `hub:on${suffix}` : hub?.state === "off" || hub?.state === void 0 && hub?.online === false ? `hub:off${suffix}` : hub?.state === "unknown" ? `hub:unknown${suffix}` : void 0;
+  const summary = ["KXM", hubMark];
+  if (stats.activeTasks > 0) summary.push(`${stats.activeTasks} task${stats.activeTasks === 1 ? "" : "s"}`);
+  if (stats.waitingTasks > 0) summary.push(`${stats.waitingTasks} waiting`);
+  if (stats.planCount > 0) summary.push(`${stats.planCount} plan${stats.planCount === 1 ? "" : "s"}`);
+  if (stats.inbox > 0) summary.push(`inbox ${stats.inbox}`);
+  const lines = [summary.filter(Boolean).join(" \xB7 ")];
   if (current) lines.push(`now  ${current.kind}  ${truncate(current.detail, 56)}`);
-  else if (stats.latestPlan) lines.push(`plan ${truncate(stats.latestPlan, 60)}`);
-  else lines.push("now  no selected work");
-  lines.push(formatShipLine(ship));
-  if (cost) lines.push(`cost  ${cost}`);
+  else if (stats.latestPlan) lines.push(`plan  ${truncate(stats.latestPlan, 60)}`);
+  if (ship?.dirty || ship && ship.ahead > 0) lines.push(formatShipLine(ship));
+  if (cost && cost !== "unknown") lines.push(`cost  ${cost}`);
   if (updateLatest) lines.push(`update  ${updateLatest} available \xB7 kxm update --kxm`);
   return lines;
 }
@@ -37961,7 +37955,7 @@ function buildSessionBrief(snapshot, current, hub, ship, updateLatest, cost, ses
   const tasks = uniqueLabels(recentTasks(snapshot.runs).map(taskItem));
   const plans = uniqueLabels(snapshot.plans.slice(0, MAX_SESSION_BRIEF_PLANS).map(planItem));
   const resolvedHub = hub ?? { state: "off", evidence: "unconfigured", online: false };
-  const statusLine = formatSessionStatusLine(stats, current, resolvedHub, ship, updateLatest, cost);
+  const statusLine = formatSessionStatusLine(stats, current, resolvedHub, ship, updateLatest);
   const widgetLines = formatSessionWidget(stats, current, resolvedHub, ship, updateLatest, cost);
   return {
     schema: SESSION_BRIEF_SCHEMA,
@@ -38025,7 +38019,7 @@ function estimateSessionCost(stateDir) {
       latestModel = r.effectiveModel ?? r.requestedModel ?? latestModel;
       latestHarness = r.harness ?? latestHarness;
     }
-    if (!hasMetered) return "unknown";
+    if (!hasMetered) return void 0;
     const route = latestHarness && latestModel ? `${latestHarness}/${latestModel}` : latestModel;
     return `$${totalCost.toFixed(2)} sess${route ? ` \xB7 ${route}` : ""}`;
   } catch {
@@ -38062,8 +38056,7 @@ function loadSessionBrief(cwd, env = process.env, current, hub, options = {}) {
           current,
           effectiveHub,
           options.ship,
-          options.updateLatest,
-          effectiveCost
+          options.updateLatest
         );
         const widgetLines = formatSessionWidget(
           cached2.stats,
@@ -38128,8 +38121,7 @@ async function loadSessionBriefAsync(cwd, env = process.env, current, hub, optio
           current,
           effectiveHub,
           options.ship,
-          void 0,
-          effectiveCost
+          void 0
         );
         const widgetLines = formatSessionWidget(
           cached2.stats,

package/plugins/kxm/dist/mcp-server.js

@@ -25462,7 +25462,7 @@ function sessionTokenFixHint(policy) {
 }
 
 // plugins/kxm/src/mcp-server.ts
-var VERSION = "0.7.178";
+var VERSION = "0.7.179";
 var CONFIGURE_PLUGIN = "/plugin configure kxm@kxm";
 var inbox = /* @__PURE__ */ new Map();
 var notifiedInbox = /* @__PURE__ */ new Set();

package/plugins/kxm/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-plugin",
-  "version": "0.7.178",
+  "version": "0.7.179",
   "private": true,
   "type": "module",
   "engines": {

package/plugins/kxm/src/cli/plugins.ts

@@ -1,7 +1,10 @@
 import { spawnSync } from "node:child_process";
+import { existsSync, readFileSync } from "node:fs";
+import { isAbsolute, join } from "node:path";
+import { parse as parseYaml } from "yaml";
 import { findKxmRepoRoot } from "../repo-root.ts";
 import { probeHarnesses } from "../harness.ts";
-import { print, type Runtime } from "./types.ts";
+import { print, type CliSpawnResult, type Runtime } from "./types.ts";
 
 export type PluginHarnessId = "pi" | "omp" | "claude";
 
@@ -12,6 +15,7 @@ export interface PluginInstallOptions {
   claude?: boolean | undefined;
   omp?: boolean | undefined;
   pi?: boolean | undefined;
+  statusBand?: boolean | undefined;
 }
 
 export interface PluginInstallHarnessResult {
@@ -23,6 +27,149 @@ export interface PluginInstallHarnessResult {
   error?: string | undefined;
 }
 
+const OMP_STATUS_SETTINGS = [
+  { key: "statusLine.leftSegments", configKey: "leftSegments", value: ["model", "mode", "git", "pr", "subagents"] },
+  { key: "statusLine.rightSegments", configKey: "rightSegments", value: ["usage", "cost", "context_pct"] },
+  { key: "statusLine.preset", configKey: "preset", value: "custom" },
+] as const;
+
+function spawnHarness(runtime: Runtime, command: string, args: readonly string[]): CliSpawnResult {
+  return runtime.io.spawnSync
+    ? runtime.io.spawnSync(command, args)
+    : spawnSync(command, args, { encoding: "utf8", windowsHide: true, env: runtime.env });
+}
+
+function spawnFailed(run: CliSpawnResult): boolean {
+  return Boolean(run.error) || run.status !== 0;
+}
+
+function spawnFailureDetail(run: CliSpawnResult, fallback: string): string {
+  return (run.stderr || run.stdout || run.error?.message || fallback).trim();
+}
+
+interface OmpStatusBandFailure {
+  args: readonly string[];
+  run: CliSpawnResult;
+  rollbackAttempted: boolean;
+  rollbackFailed: boolean;
+}
+
+interface OmpGlobalSettingSnapshot {
+  present: boolean;
+  value?: unknown;
+}
+
+function ompConfigValueArg(value: unknown): string {
+  return typeof value === "string" ? value : JSON.stringify(value);
+}
+
+function readOmpGlobalStatusSettings(
+  runtime: Runtime,
+  command: string,
+): { previous: Record<string, OmpGlobalSettingSnapshot> } | OmpStatusBandFailure {
+  const args = ["config", "path"];
+  const run = spawnHarness(runtime, command, args);
+  if (spawnFailed(run)) return { args, run, rollbackAttempted: false, rollbackFailed: false };
+
+  const agentDir = run.stdout.trim();
+  if (!agentDir || !isAbsolute(agentDir) || !existsSync(agentDir)) {
+    return {
+      args,
+      run: { status: 1, stdout: run.stdout, stderr: "omp config path did not return an existing absolute directory" },
+      rollbackAttempted: false,
+      rollbackFailed: false,
+    };
+  }
+
+  const configPath = ["config.yml", "config.yaml"].map((name) => join(agentDir, name)).find(existsSync);
+  let document: unknown = {};
+  try {
+    if (configPath) document = parseYaml(readFileSync(configPath, "utf8"));
+  } catch {
+    return {
+      args,
+      run: { status: 1, stdout: run.stdout, stderr: `could not read OMP global config at ${configPath}` },
+      rollbackAttempted: false,
+      rollbackFailed: false,
+    };
+  }
+
+  const root = document && typeof document === "object" && !Array.isArray(document) ? document : {};
+  const rawStatusLine = "statusLine" in root ? root.statusLine : undefined;
+  const statusLine = rawStatusLine && typeof rawStatusLine === "object" && !Array.isArray(rawStatusLine)
+    ? rawStatusLine
+    : {};
+  const previous: Record<string, OmpGlobalSettingSnapshot> = {};
+  for (const setting of OMP_STATUS_SETTINGS) {
+    const value = statusLine[setting.configKey as keyof typeof statusLine];
+    previous[setting.key] = Object.hasOwn(statusLine, setting.configKey) && value !== null && value !== undefined
+      ? { present: true, value }
+      : { present: false };
+  }
+  return { previous };
+}
+
+function rollbackOmpStatusBand(
+  runtime: Runtime,
+  command: string,
+  settings: readonly (typeof OMP_STATUS_SETTINGS)[number][],
+  previous: Readonly<Record<string, OmpGlobalSettingSnapshot>>,
+): boolean {
+  let failed = false;
+  for (const setting of [...settings].reverse()) {
+    const snapshot = previous[setting.key];
+    const args = snapshot?.present
+      ? ["config", "set", setting.key, ompConfigValueArg(snapshot.value), "--json"]
+      : ["config", "reset", setting.key, "--json"];
+    if (spawnFailed(spawnHarness(runtime, command, args))) failed = true;
+  }
+  return failed;
+}
+
+function configureOmpStatusBand(runtime: Runtime, command: string): OmpStatusBandFailure | undefined {
+  const snapshot = readOmpGlobalStatusSettings(runtime, command);
+  if ("run" in snapshot) return snapshot;
+
+  const written: (typeof OMP_STATUS_SETTINGS)[number][] = [];
+  for (const setting of OMP_STATUS_SETTINGS) {
+    const args = ["config", "set", setting.key, ompConfigValueArg(setting.value), "--json"];
+    written.push(setting);
+    const run = spawnHarness(runtime, command, args);
+    if (spawnFailed(run)) {
+      return {
+        args,
+        run,
+        rollbackAttempted: true,
+        rollbackFailed: rollbackOmpStatusBand(runtime, command, written, snapshot.previous),
+      };
+    }
+  }
+
+  for (const setting of OMP_STATUS_SETTINGS) {
+    const args = ["config", "get", setting.key, "--json"];
+    const run = spawnHarness(runtime, command, args);
+    let actual: unknown;
+    try {
+      const parsed: unknown = JSON.parse(run.stdout);
+      actual = parsed && typeof parsed === "object" && "value" in parsed ? parsed.value : undefined;
+    } catch {
+      actual = undefined;
+    }
+    if (spawnFailed(run) || JSON.stringify(actual) !== JSON.stringify(setting.value)) {
+      const mismatch = spawnFailed(run)
+        ? run
+        : { status: 1, stdout: run.stdout, stderr: `effective ${setting.key} is shadowed or did not persist` };
+      return {
+        args,
+        run: mismatch,
+        rollbackAttempted: true,
+        rollbackFailed: rollbackOmpStatusBand(runtime, command, written, snapshot.previous),
+      };
+    }
+  }
+  return undefined;
+}
+
 export async function cmdPluginInstall(
   runtime: Runtime,
   options: PluginInstallOptions,
@@ -41,6 +188,17 @@ export async function cmdPluginInstall(
     ? requestedHarnesses
     : PLUGIN_SUPPORTED_HARNESSES;
 
+  if (options.statusBand && isExplicit && !options.omp) {
+    const detail = "--status-band requires OMP to be among the selected harnesses";
+    print(
+      runtime.io,
+      runtime.json,
+      { ok: false, command: "plugin install", error: "omp_status_band_requires_omp", results: [] },
+      detail,
+    );
+    return 1;
+  }
+
   const results: PluginInstallHarnessResult[] = [];
 
   for (const harnessId of targetHarnesses) {
@@ -48,7 +206,7 @@ export async function cmdPluginInstall(
     const detected = Boolean(status?.detected && status?.command);
 
     if (!detected) {
-      if (isExplicit) {
+      if (isExplicit || (options.statusBand && harnessId === "omp")) {
         results.push({
           harness: harnessId,
           status: "failed",
@@ -72,17 +230,15 @@ export async function cmdPluginInstall(
           detail: `would install kxm plugin into pi: ${command} ${args.join(" ")}`,
         });
       } else {
-        const run = runtime.io.spawnSync
-          ? runtime.io.spawnSync(command, args)
-          : spawnSync(command, args, { encoding: "utf8", windowsHide: true, env: runtime.env });
-        if (run.error || (run.status !== 0 && run.status !== null)) {
+        const run = spawnHarness(runtime, command, args);
+        if (spawnFailed(run)) {
           results.push({
             harness: "pi",
             status: "failed",
             command,
             args,
             error: run.error?.message || "install_failed",
-            detail: (run.stderr || run.stdout || "pi install exited with error").trim(),
+            detail: spawnFailureDetail(run, "pi install exited with error"),
           });
         } else {
           results.push({
@@ -102,29 +258,43 @@ export async function cmdPluginInstall(
           status: "would",
           command,
           args,
-          detail: `would install kxm plugin into omp: ${command} ${args.join(" ")}`,
+          detail: options.statusBand
+            ? `would install kxm plugin into omp and configure the focused subscription status band: ${command} ${args.join(" ")}`
+            : `would install kxm plugin into omp: ${command} ${args.join(" ")}`,
         });
       } else {
-        const run = runtime.io.spawnSync
-          ? runtime.io.spawnSync(command, args)
-          : spawnSync(command, args, { encoding: "utf8", windowsHide: true, env: runtime.env });
-        if (run.error || (run.status !== 0 && run.status !== null)) {
+        const run = spawnHarness(runtime, command, args);
+        if (spawnFailed(run)) {
           results.push({
             harness: "omp",
             status: "failed",
             command,
             args,
             error: run.error?.message || "install_failed",
-            detail: (run.stderr || run.stdout || "omp plugin install exited with error").trim(),
+            detail: spawnFailureDetail(run, "omp plugin install exited with error"),
           });
         } else {
-          results.push({
-            harness: "omp",
-            status: "passed",
-            command,
-            args,
-            detail: "installed kxm plugin into omp",
-          });
+          const configFailure = options.statusBand ? configureOmpStatusBand(runtime, command) : undefined;
+          if (configFailure) {
+            results.push({
+              harness: "omp",
+              status: "failed",
+              command,
+              args: configFailure.args,
+              error: "status_band_config_failed",
+              detail: `installed kxm plugin into omp, but ${configFailure.args.slice(0, 3).join(" ")} failed: ${spawnFailureDetail(configFailure.run, "omp status band configuration exited with error")}${configFailure.rollbackAttempted ? (configFailure.rollbackFailed ? "; previous settings could not be fully restored" : "; previous settings restored") : ""}`,
+            });
+          } else {
+            results.push({
+              harness: "omp",
+              status: "passed",
+              command,
+              args,
+              detail: options.statusBand
+                ? "installed kxm plugin into omp and configured the focused subscription status band; restart omp"
+                : "installed kxm plugin into omp",
+            });
+          }
         }
       }
     } else if (harnessId === "claude") {
@@ -144,17 +314,15 @@ export async function cmdPluginInstall(
         } else {
           spawnSync(command, marketplaceArgs, { encoding: "utf8", windowsHide: true, env: runtime.env });
         }
-        const run = runtime.io.spawnSync
-          ? runtime.io.spawnSync(command, installArgs)
-          : spawnSync(command, installArgs, { encoding: "utf8", windowsHide: true, env: runtime.env });
-        if (run.error || (run.status !== 0 && run.status !== null)) {
+        const run = spawnHarness(runtime, command, installArgs);
+        if (spawnFailed(run)) {
           results.push({
             harness: "claude",
             status: "failed",
             command,
             args: installArgs,
             error: run.error?.message || "install_failed",
-            detail: (run.stderr || run.stdout || "claude plugin install exited with error").trim(),
+            detail: spawnFailureDetail(run, "claude install exited with error"),
           });
         } else {
           results.push({

package/plugins/kxm/src/cli.ts

@@ -773,7 +773,8 @@ function createProgram(ctx: CliContext, result: { code: number }, argv: readonly
     .option("--claude", "Install plugin for Claude Code")
     .option("--omp", "Install plugin for Oh My Pi (OMP)")
     .option("--pi", "Install plugin for Pi")
-    .action(async function pluginInstallAction(this: Command, options: { all?: boolean; claude?: boolean; omp?: boolean; pi?: boolean }) {
+    .option("--status-band", "Configure OMP's focused status band with live subscription usage")
+    .action(async function pluginInstallAction(this: Command, options: { all?: boolean; claude?: boolean; omp?: boolean; pi?: boolean; statusBand?: boolean }) {
       result.code = await cmdPluginInstall(runtimeFrom(ctx, this), options);
     });
 

package/plugins/kxm/src/mcp-server.ts

@@ -11,7 +11,7 @@ import { deliverInboxNotification } from "./inbox.ts";
 import type { HubEvent, MessageRecord } from "./protocol.ts";
 import { sessionTokenFixHint } from "./session-token-hint.ts";
 
-const VERSION = "0.7.178";
+const VERSION = "0.7.179";
 const CONFIGURE_PLUGIN = "/plugin configure kxm@kxm";
 const inbox = new Map<string, MessageRecord>();
 const notifiedInbox = new Set<string>();

package/plugins/kxm/src/session-work.ts

@@ -66,15 +66,12 @@ export interface SessionBrief {
   sessionToken?: string;
 }
 
-function hubPrefix(hub?: Partial<SessionHubStatus>): string {
-  // A remote hub carries a bearer over a network; a loopback one does not. The JSON
-  // said so while every text surface printed the same bytes for both, which is the
-  // distinction an operator actually reads.
+function hubStatusPart(hub?: Partial<SessionHubStatus>): string | undefined {
   const suffix = hub?.scope === "remote" ? "/remote" : "";
-  if (hub?.state === "on" || (hub?.state === undefined && hub?.online === true)) return `kxm hub:on${suffix}`;
-  if (hub?.state === "off" || (hub?.state === undefined && hub?.online === false)) return `kxm hub:off${suffix}`;
-  if (hub?.state === "unknown") return `kxm hub:unknown${suffix}`;
-  return "kxm";
+  if (hub?.state === "off" || (hub?.state === undefined && hub?.online === false)) return `hub:off${suffix}`;
+  if (hub?.state === "unknown") return `hub:unknown${suffix}`;
+  if (hub?.scope === "remote") return "hub:remote";
+  return undefined;
 }
 
 function truncate(value: string, width: number): string {
@@ -172,12 +169,12 @@ export function formatCostLine(input?: {
   model?: string;
 }): string | undefined {
   if (!input) return undefined;
-  if (input.sessionCostUsd === undefined && input.runCostUsd === undefined) return "unknown";
+  if (input.sessionCostUsd === undefined && input.runCostUsd === undefined) return undefined;
   const sess = input.sessionCostUsd !== undefined ? `$${input.sessionCostUsd.toFixed(2)} sess` : undefined;
   const run = input.runCostUsd !== undefined ? `$${input.runCostUsd.toFixed(2)} run` : undefined;
   const route = input.harness && input.model ? `${input.harness}/${input.model}` : (input.model ?? undefined);
   const parts = [sess, run, route].filter(Boolean);
-  return parts.length > 0 ? parts.join(" · ") : "unknown";
+  return parts.length > 0 ? parts.join(" · ") : undefined;
 }
 
 export function renderStatusLine(
@@ -186,11 +183,10 @@ export function renderStatusLine(
   hub?: Partial<SessionHubStatus>,
   ship?: SessionShipStatus,
   updateLatest?: string,
-  cost?: string,
 ): string {
   if ("schema" in statsOrBrief && statsOrBrief.schema === "kxm.session-brief.v1") {
     const brief = statsOrBrief;
-    if (!current && !hub && !ship && !updateLatest && !cost) {
+    if (!current && !hub && !ship && !updateLatest) {
       return brief.statusLine;
     }
     return formatSessionStatusLine(
@@ -199,10 +195,9 @@ export function renderStatusLine(
       hub ?? brief.hub,
       ship,
       updateLatest,
-      cost ?? brief.cost,
     );
   }
-  return formatSessionStatusLine(statsOrBrief as SessionWorkStats, current, hub, ship, updateLatest, cost);
+  return formatSessionStatusLine(statsOrBrief as SessionWorkStats, current, hub, ship, updateLatest);
 }
 
 export function formatSessionStatusLine(
@@ -211,32 +206,20 @@ export function formatSessionStatusLine(
   hub?: Partial<SessionHubStatus>,
   ship?: SessionShipStatus,
   updateLatest?: string,
-  cost?: string,
 ): string {
-  const head = hubPrefix(hub);
-  if (!current && stats.activeTasks === 0 && stats.planCount === 0 && stats.inbox === 0) {
-    const idle = hub?.online === undefined && hub?.state === undefined ? "kxm idle" : `${head} · idle`;
-    const withShip = ship?.dirty
-      ? `${idle} · dirty`
-      : (ship && ship.ahead > 0 ? `${idle} · ${ship.ahead} local` : idle);
-    const withCost = cost ? `${withShip} · ${cost}` : withShip;
-    const finalLine = updateLatest ? `${withCost} · upd ${updateLatest}` : withCost;
-    return finalLine.length <= 80 ? finalLine : `${finalLine.slice(0, 79)}…`;
-  }
-  const parts: string[] = [];
-  if (current?.kind === "task") parts.push(`${head} ${current.detail}`);
-  else if (current?.kind === "plan") parts.push(`${head} plan ${truncate(current.detail, 36)}`);
-  else parts.push(head);
-  parts.push(`${stats.activeTasks} task${stats.activeTasks === 1 ? "" : "s"}`);
+  const parts = ["kxm"];
+  const hubPart = hubStatusPart(hub);
+  if (hubPart) parts.push(hubPart);
+  if (current?.kind === "task") parts.push(current.detail);
+  else if (current?.kind === "plan") parts.push(`plan ${truncate(current.detail, 36)}`);
+  if (stats.activeTasks > 0) parts.push(`${stats.activeTasks} task${stats.activeTasks === 1 ? "" : "s"}`);
   if (stats.waitingTasks > 0) parts.push(`${stats.waitingTasks} waiting`);
-  parts.push(`${stats.planCount} plan${stats.planCount === 1 ? "" : "s"}`);
+  if (stats.planCount > 0) parts.push(`${stats.planCount} plan${stats.planCount === 1 ? "" : "s"}`);
   if (stats.inbox > 0) parts.push(`inbox ${stats.inbox}`);
   if (ship?.dirty) parts.push("dirty");
   else if (ship && ship.ahead > 0) parts.push(`${ship.ahead} local`);
-  if (cost) parts.push(cost);
   if (updateLatest) parts.push(`upd ${updateLatest}`);
-  const line = parts.join(" · ");
-  return line.length <= 80 ? line : `${line.slice(0, 79)}…`;
+  return truncate(parts.join(" · "), 80);
 }
 
 export function formatSessionWidget(
@@ -247,19 +230,22 @@ export function formatSessionWidget(
   updateLatest?: string,
   cost?: string,
 ): string[] {
-  const hubMark = hub?.state === "on" || hub?.online === true
-    ? "hub:on  "
-    : (hub?.state === "off" || hub?.online === false
-      ? "hub:off  "
-      : (hub?.state === "unknown" ? "hub:unknown  " : ""));
-  const lines = [
-    `KXM  ${hubMark}${stats.activeTasks} tasks  ${stats.waitingTasks} waiting  ${stats.planCount} plans  inbox ${stats.inbox}`,
-  ];
+  const suffix = hub?.scope === "remote" ? "/remote" : "";
+  const hubMark = hub?.state === "on" || (hub?.state === undefined && hub?.online === true)
+    ? `hub:on${suffix}`
+    : (hub?.state === "off" || (hub?.state === undefined && hub?.online === false)
+      ? `hub:off${suffix}`
+      : (hub?.state === "unknown" ? `hub:unknown${suffix}` : undefined));
+  const summary = ["KXM", hubMark];
+  if (stats.activeTasks > 0) summary.push(`${stats.activeTasks} task${stats.activeTasks === 1 ? "" : "s"}`);
+  if (stats.waitingTasks > 0) summary.push(`${stats.waitingTasks} waiting`);
+  if (stats.planCount > 0) summary.push(`${stats.planCount} plan${stats.planCount === 1 ? "" : "s"}`);
+  if (stats.inbox > 0) summary.push(`inbox ${stats.inbox}`);
+  const lines = [summary.filter(Boolean).join(" · ")];
   if (current) lines.push(`now  ${current.kind}  ${truncate(current.detail, 56)}`);
-  else if (stats.latestPlan) lines.push(`plan ${truncate(stats.latestPlan, 60)}`);
-  else lines.push("now  no selected work");
-  lines.push(formatShipLine(ship));
-  if (cost) lines.push(`cost  ${cost}`);
+  else if (stats.latestPlan) lines.push(`plan  ${truncate(stats.latestPlan, 60)}`);
+  if (ship?.dirty || (ship && ship.ahead > 0)) lines.push(formatShipLine(ship));
+  if (cost && cost !== "unknown") lines.push(`cost  ${cost}`);
   if (updateLatest) lines.push(`update  ${updateLatest} available · kxm update --kxm`);
   return lines;
 }
@@ -290,7 +276,7 @@ export function buildSessionBrief(
   const tasks = uniqueLabels(recentTasks(snapshot.runs).map(taskItem));
   const plans = uniqueLabels(snapshot.plans.slice(0, MAX_SESSION_BRIEF_PLANS).map(planItem));
   const resolvedHub: SessionHubStatus = hub ?? { state: "off", evidence: "unconfigured", online: false };
-  const statusLine = formatSessionStatusLine(stats, current, resolvedHub, ship, updateLatest, cost);
+  const statusLine = formatSessionStatusLine(stats, current, resolvedHub, ship, updateLatest);
   const widgetLines = formatSessionWidget(stats, current, resolvedHub, ship, updateLatest, cost);
   return {
     schema: SESSION_BRIEF_SCHEMA,
@@ -359,7 +345,7 @@ export function estimateSessionCost(stateDir: string): string | undefined {
       latestModel = (r.effectiveModel as string | undefined) ?? (r.requestedModel as string | undefined) ?? latestModel;
       latestHarness = (r.harness as string | undefined) ?? latestHarness;
     }
-    if (!hasMetered) return "unknown";
+    if (!hasMetered) return undefined;
     const route = latestHarness && latestModel ? `${latestHarness}/${latestModel}` : latestModel;
     return `$${totalCost.toFixed(2)} sess${route ? ` · ${route}` : ""}`;
   } catch {
@@ -417,7 +403,6 @@ export function loadSessionBrief(
           effectiveHub,
           options.ship,
           options.updateLatest,
-          effectiveCost,
         );
         const widgetLines = formatSessionWidget(
           cached.stats,
@@ -499,7 +484,6 @@ export async function loadSessionBriefAsync(
           effectiveHub,
           options.ship,
           undefined,
-          effectiveCost,
         );
         const widgetLines = formatSessionWidget(
           cached.stats,