dsh-claude-style 0.16.0-dev.27 → 0.16.1-dev.31

package/lib/host/settings.js

@@ -1,43 +1,138 @@
+// packages/contracts/src/package.ts
+var PACKAGE_NAME = "dsh-claude-style";
+
+// packages/contracts/src/services.ts
+var OFFICIAL_MODEL_GROUP = "deepseek-official";
+
 // packages/contracts/src/prefs.ts
-var PREFS_DEFAULT = Object.freeze({
-  brand: "claude",
-  brandName: "",
-  brandInk: "original",
-  brandAccent: "",
-  motion: "system",
-  statusMotion: "sweep",
-  statusDetail: true,
-  collapseFooter: true,
-  autoPopover: "all",
-  composerScope: "all",
-  modelPicker: true,
-  modelDescriptions: true,
-  peakrate: true,
-  quickProviders: [],
-  username: "",
-  banLocale: "en",
-  homeLayout: "studio",
-  palette: "claude",
-  typeface: "claude",
-  mascot: "brand",
-  mascotScope: "all",
-  permissionsControl: true,
-  statsPosition: "context",
-  workspaceView: true,
-  dockCards: true,
-  sidebarSearch: true,
-  searchStyle: "overlay",
-  sidebarLayout: "relaxed",
-  turnNav: true,
-  viewTabs: true,
-  headerBand: true,
-  chatAnimations: true,
-  chatWait: true,
-  chatSend: true,
-  chatReveal: "off",
-  caretMotion: "typing",
-  messageEnter: "flight"
-});
+var BRAND_CLAUDE = "claude";
+var BRAND_DEEPSEEK = "deepseek";
+var BRAND_DEEPSEEK_LEGACY = "off";
+var BRANDS = [BRAND_CLAUDE, BRAND_DEEPSEEK];
+var BRAND_INK_ORIGINAL = "original";
+var BRAND_INK_TEXT = "text";
+var BRAND_INKS = [BRAND_INK_ORIGINAL, BRAND_INK_TEXT];
+var BRAND_NAME_MAX = 40;
+var MOTION_SYSTEM = "system";
+var MOTION_REDUCED = "reduced";
+var MOTION_FULL = "full";
+var MOTION_MODES = [MOTION_SYSTEM, MOTION_REDUCED, MOTION_FULL];
+var STATUS_MOTION_SWEEP = "sweep";
+var STATUS_MOTION_WASH = "wash";
+var STATUS_MOTIONS = [STATUS_MOTION_SWEEP, STATUS_MOTION_WASH];
+var CARET_MOTION_OFF = "off";
+var CARET_MOTION_TYPING = "typing";
+var CARET_MOTIONS = [CARET_MOTION_TYPING, CARET_MOTION_OFF];
+var CHAT_REVEAL_OFF = "off";
+var CHAT_REVEAL_ON = "on";
+var CHAT_REVEAL_MODES = [CHAT_REVEAL_ON, CHAT_REVEAL_OFF];
+var MESSAGE_ENTER_FLIGHT = "flight";
+var MESSAGE_ENTER_GROW = "grow";
+var MESSAGE_ENTER_MODES = [MESSAGE_ENTER_FLIGHT, MESSAGE_ENTER_GROW];
+var PALETTE_CLAUDE = "claude";
+var PALETTE_HOST = "host";
+var PALETTES = [PALETTE_CLAUDE, PALETTE_HOST];
+var TYPEFACE_CLAUDE = "claude";
+var TYPEFACE_HOST = "host";
+var TYPEFACES = [TYPEFACE_CLAUDE, TYPEFACE_HOST];
+var MASCOT_BRAND = "brand";
+var MASCOT_CRAB = "crab";
+var MASCOT_DEEPY = "deepy";
+var MASCOT_OFF = "off";
+var MASCOTS = [MASCOT_BRAND, MASCOT_CRAB, MASCOT_DEEPY, MASCOT_OFF];
+var MASCOT_SCOPE_HOME = "home";
+var MASCOT_SCOPE_ALL = "all";
+var MASCOT_SCOPES = [MASCOT_SCOPE_HOME, MASCOT_SCOPE_ALL];
+var SEARCH_STYLE_ICON = "icon";
+var SEARCH_STYLE_OVERLAY = "overlay";
+var SEARCH_STYLE_STANDALONE = "standalone";
+var SEARCH_STYLES = [SEARCH_STYLE_ICON, SEARCH_STYLE_OVERLAY, SEARCH_STYLE_STANDALONE];
+var SIDEBAR_LAYOUT_RELAXED = "relaxed";
+var SIDEBAR_LAYOUT_COMPACT = "compact";
+var SIDEBAR_LAYOUTS = [SIDEBAR_LAYOUT_RELAXED, SIDEBAR_LAYOUT_COMPACT];
+var CHAT_ANIMATIONS_OFF = "off";
+var STATS_POSITION_INLINE = "inline";
+var STATS_POSITION_CONTEXT = "context";
+var STATS_POSITIONS = [STATS_POSITION_INLINE, STATS_POSITION_CONTEXT];
+var BAN_LOCALE_EN = "en";
+var BAN_LOCALE_ZH = "zh";
+var BAN_LOCALE_OFF = "off";
+var BAN_LOCALES = [BAN_LOCALE_EN, BAN_LOCALE_ZH, BAN_LOCALE_OFF];
+var HOME_LAYOUT_CLASSIC = "classic";
+var HOME_LAYOUT_STUDIO = "studio";
+var HOME_LAYOUTS = [HOME_LAYOUT_CLASSIC, HOME_LAYOUT_STUDIO];
+var COMPOSER_SCOPE_OFF = "off";
+var COMPOSER_SCOPE_HERO = "hero";
+var COMPOSER_SCOPE_CONVERSATION = "conversation";
+var COMPOSER_SCOPE_ALL = "all";
+var COMPOSER_SCOPES = [COMPOSER_SCOPE_OFF, COMPOSER_SCOPE_HERO, COMPOSER_SCOPE_CONVERSATION, COMPOSER_SCOPE_ALL];
+var AUTO_POPOVER_OFF = "off";
+var AUTO_POPOVER_ACCOUNT = "account";
+var AUTO_POPOVER_ALL = "all";
+var AUTO_POPOVER_SCOPES = [AUTO_POPOVER_OFF, AUTO_POPOVER_ACCOUNT, AUTO_POPOVER_ALL];
+var PAGE_ZOOM_SYSTEM = "system";
+var PAGE_ZOOM_08 = "0.8";
+var PAGE_ZOOM_1 = "1";
+var PAGE_ZOOM_125 = "1.25";
+var PAGE_ZOOM_15 = "1.5";
+var PAGE_ZOOMS = [PAGE_ZOOM_SYSTEM, PAGE_ZOOM_08, PAGE_ZOOM_1, PAGE_ZOOM_125, PAGE_ZOOM_15];
+var USERNAME_MAX = 64;
+var QUICK_PROVIDERS_MAX = 64;
+var PROVIDER_ID_MAX = 128;
+var PREFS = {
+  brand: { type: "choice", values: BRANDS, default: BRAND_CLAUDE, legacy: { [BRAND_DEEPSEEK_LEGACY]: BRAND_DEEPSEEK } },
+  brandName: { type: "text", default: "", max: BRAND_NAME_MAX },
+  brandInk: { type: "choice", values: BRAND_INKS, default: BRAND_INK_ORIGINAL },
+  brandAccent: { type: "color", default: "" },
+  motion: { type: "choice", values: MOTION_MODES, default: MOTION_SYSTEM },
+  statusMotion: { type: "choice", values: STATUS_MOTIONS, default: STATUS_MOTION_SWEEP },
+  /** An earlier build stored the two words; `precise` is what the switch being on means. */
+  statusDetail: { type: "boolean", default: true, legacy: { precise: true, simple: false } },
+  collapseFooter: { type: "boolean", default: true },
+  /** It was a boolean before it grew its choices. */
+  autoPopover: { type: "choice", values: AUTO_POPOVER_SCOPES, default: AUTO_POPOVER_ALL, legacy: { true: AUTO_POPOVER_ALL, false: AUTO_POPOVER_OFF } },
+  composerScope: { type: "choice", values: COMPOSER_SCOPES, default: COMPOSER_SCOPE_ALL },
+  modelPicker: { type: "boolean", default: true },
+  modelDescriptions: { type: "boolean", default: true },
+  peakrate: { type: "boolean", default: true },
+  /**
+   * The provider ids the picker's first level carries: ids rather than names,
+   * so a catalog rename does not lose the stored selection. The official
+   * service is the picker's default rather than a choice, so a stored id for it
+   * is dropped.
+   */
+  quickProviders: { type: "list", default: [], max: QUICK_PROVIDERS_MAX, entryMax: PROVIDER_ID_MAX, drop: [OFFICIAL_MODEL_GROUP] },
+  username: { type: "text", default: "", max: USERNAME_MAX },
+  pageZoom: { type: "choice", values: PAGE_ZOOMS, default: PAGE_ZOOM_SYSTEM },
+  banLocale: { type: "choice", values: BAN_LOCALES, default: BAN_LOCALE_EN },
+  homeLayout: { type: "choice", values: HOME_LAYOUTS, default: HOME_LAYOUT_STUDIO },
+  homeRipple: { type: "boolean", default: false },
+  palette: { type: "choice", values: PALETTES, default: PALETTE_CLAUDE },
+  typeface: { type: "choice", values: TYPEFACES, default: TYPEFACE_CLAUDE },
+  /** The mascot on the composer; the resolved one rides the document. */
+  mascot: { type: "choice", values: MASCOTS, default: MASCOT_BRAND },
+  mascotScope: { type: "choice", values: MASCOT_SCOPES, default: MASCOT_SCOPE_ALL },
+  permissionsControl: { type: "boolean", default: true },
+  statsPosition: { type: "choice", values: STATS_POSITIONS, default: STATS_POSITION_CONTEXT },
+  workspaceView: { type: "boolean", default: true },
+  dockCards: { type: "boolean", default: true },
+  sidebarSearch: { type: "boolean", default: true },
+  searchStyle: { type: "choice", values: SEARCH_STYLES, default: SEARCH_STYLE_OVERLAY },
+  sidebarLayout: { type: "choice", values: SIDEBAR_LAYOUTS, default: SIDEBAR_LAYOUT_RELAXED },
+  turnNav: { type: "boolean", default: true },
+  viewTabs: { type: "boolean", default: true },
+  headerBand: { type: "boolean", default: true },
+  /** It held a choice before it became a switch again; every retired choice meant on bar `off`. */
+  chatAnimations: { type: "boolean", default: true, legacy: { [CHAT_ANIMATIONS_OFF]: false, enhanced: true, redraw: true } },
+  chatWait: { type: "boolean", default: true },
+  chatSend: { type: "boolean", default: true },
+  chatReveal: { type: "choice", values: CHAT_REVEAL_MODES, default: CHAT_REVEAL_OFF },
+  caretMotion: { type: "choice", values: CARET_MOTIONS, default: CARET_MOTION_TYPING },
+  messageEnter: { type: "choice", values: MESSAGE_ENTER_MODES, default: MESSAGE_ENTER_FLIGHT }
+};
+var PREF_DEFAULTS = Object.freeze(Object.fromEntries(
+  Object.entries(PREFS).map(([key, spec]) => [key, spec.default])
+));
 
 // packages/host/src/settings.ts
 async function resolveSchemaFactory() {
@@ -62,11 +157,10 @@ function volatileField(field) {
   return typeof field?.volatile === "function" ? field.volatile() : field;
 }
 function prefsField(Schema, key) {
-  const value = PREFS_DEFAULT[key];
-  return Schema.union([Schema.string(), Schema.boolean(), Schema.array(Schema.string())]).default(value);
+  return Schema.union([Schema.string(), Schema.boolean(), Schema.array(Schema.string())]).default(PREFS[key].default);
 }
 var Config = SchemaFactory === null ? void 0 : SchemaFactory.object(Object.fromEntries(
-  Object.keys(PREFS_DEFAULT).map((key) => [key, volatileField(prefsField(SchemaFactory, key))])
+  Object.keys(PREFS).map((key) => [key, volatileField(prefsField(SchemaFactory, key))])
 ));
 function registerSettings(ctx) {
   if (typeof ctx.inject !== "function") return;
@@ -75,7 +169,7 @@ function registerSettings(ctx) {
     if (typeof settings?.configure !== "function") return;
     scope.effect(
       () => settings.configure({ auto: false }, ctx.fiber),
-      "dsh-claude-style: settings presentation"
+      `${PACKAGE_NAME}: settings presentation`
     );
   });
 }

package/lib/host/usage-record.js

@@ -1,3 +1,6 @@
+// packages/contracts/src/package.ts
+var PACKAGE_NAME = "dsh-claude-style";
+
 // packages/host/src/usage-record.ts
 import { existsSync, renameSync, unlinkSync } from "node:fs";
 import { cachePath, readJsonDocument, writeJsonDocument } from "./cache-file.js";
@@ -178,13 +181,13 @@ function readStored(ctx) {
     if (existsSync(path)) {
       const aside = `${path}.corrupt-${Date.now()}`;
       renameSync(path, aside);
-      ctx.logger?.warn?.(`dsh-claude-style: usage record moved aside to ${aside}; it is rebuilt from the session logs`);
+      ctx.logger?.warn?.(`${PACKAGE_NAME}: usage record moved aside to ${aside}; it is rebuilt from the session logs`);
     }
     return { kind: "absent" };
   }
   const document = parsed;
   if (document.version !== RECORD_VERSION) {
-    ctx.logger?.warn?.(`dsh-claude-style: usage record version ${String(document.version)} is not one this build reads; it is left as it stands`);
+    ctx.logger?.warn?.(`${PACKAGE_NAME}: usage record version ${String(document.version)} is not one this build reads; it is left as it stands`);
     return { kind: "foreign" };
   }
   const sessions = /* @__PURE__ */ new Map();

package/lib/host/usage.js

@@ -1,8 +1,60 @@
+// packages/contracts/src/package.ts
+var PACKAGE_NAME = "dsh-claude-style";
+
+// packages/host/src/usage.ts
+import { join as join2, resolve } from "node:path";
+
+// packages/engine/node/harness-home.ts
+import { homedir } from "node:os";
+import { join } from "node:path";
+function harnessPath(ctx, ...segments) {
+  const resolvePath = ctx.get("dshHomePath");
+  if (typeof resolvePath === "function") return resolvePath(...segments);
+  return join(process.env.DSH_HOME ?? join(homedir(), ".dsh"), ...segments);
+}
+
 // packages/host/src/usage.ts
-import { join, resolve } from "node:path";
-import { harnessPath } from "./harness-home.js";
 import { readRecord, writeRecord } from "./usage-record.js";
-import { readEvents } from "./session-events.js";
+
+// packages/engine/node/session-events.ts
+function eventsOf(events) {
+  return Array.isArray(events) ? events : null;
+}
+function unreadableLog(error) {
+  const failure = error;
+  return failure?.code === "SESSION_QUERY_CORRUPT_SESSION" || failure?.code === "SESSION_QUERY_SESSION_NOT_FOUND" ? failure : null;
+}
+function reportUnreadable(ctx, packageName, error, sessionId, label) {
+  ctx.logger?.warn?.(`${packageName}: session ${sessionId} left out of ${label}: ${unreadableLog(error)?.message}`);
+}
+function releaseObservation(observation) {
+  const named = observation.dispose;
+  if (typeof named === "function") named.call(observation);
+  else if (Symbol.dispose in observation) observation[Symbol.dispose]();
+}
+async function readEvents(ctx, packageName, sessionId, label) {
+  const query = ctx.get("sessionQuery");
+  if (query === null || query === void 0) return null;
+  try {
+    if (typeof query.observeSession === "function") {
+      const observation = await query.observeSession(sessionId, { projectionMode: "none" });
+      try {
+        return eventsOf(observation.events);
+      } finally {
+        releaseObservation(observation);
+      }
+    }
+    if (typeof query.readSession !== "function") return null;
+    const snapshot = await query.readSession(sessionId);
+    return eventsOf(snapshot?.events);
+  } catch (error) {
+    if (unreadableLog(error) === null) throw error;
+    reportUnreadable(ctx, packageName, error, sessionId, label);
+    return null;
+  }
+}
+
+// packages/host/src/usage.ts
 import { foldSession, listSessionLogs } from "./usage-fold.js";
 import { readLedger } from "./usage-ledger.js";
 import { mergeLedgerFold, summarize } from "./usage-summary.js";
@@ -42,7 +94,7 @@ function createUsage(ctx) {
         sessions.set(log.id, stored);
         continue;
       }
-      const events = await readEvents(ctx, log.id, "the usage roll-up");
+      const events = await readEvents(ctx, PACKAGE_NAME, log.id, "the usage roll-up");
       if (events === null) {
         failed += 1;
         if (stored !== void 0) sessions.set(log.id, stored);
@@ -70,7 +122,7 @@ function createUsage(ctx) {
     return { ...summary, read, failed, sessions: logs.length };
   }
   async function compute(publish) {
-    const root = resolve(join(home(), "sessions"));
+    const root = resolve(join2(home(), "sessions"));
     const logs = listSessionLogs(root);
     const ledgerDays = readLedger(home());
     if (ledgerDays !== null && ledgerDays.size > 0) {