@monster-orange/den 0.2.8 → 0.3.0

package/src/ui/server/ui-assets.ts

@@ -1,6 +1,8 @@
 /**
  * Static assets the graph needs beyond the pages themselves:
- *   - the graph's own modules in public/ (UI_MODULES), served like header.js;
+ *   - the UI's own modules in public/ (UI_MODULES: the graph, the appearance
+ *     controls, the version label, the top bar's chips and overlays),
+ *     served like header.js;
  *   - browser libraries the UI loads, served by Den's own server from
  * node_modules (never a CDN), so the UI works offline. Each is a pinned
  * dependency in package.json. npm hoists Den's dependencies into a
@@ -19,7 +21,20 @@ export const UI_MODULES: readonly string[] = [
   "/graph-model.js",
   "/panel.js",
   "/graph.css",
+  "/appearance.js",
+  "/version-label.js",
   "/changelog-view.js",
+  "/health-fit.js",
+  "/health-rollup.js",
+  "/shell.js",
+  "/settings-registry.js",
+  "/settings-page.js",
+  "/topbar.js",
+  "/edge-page.js",
+  "/error-page.js",
+  // The UI's catalogs other than English (R19; en is in shell.js).
+  "/i18n/ja.js",
+  "/i18n/es.js",
 ];
 
 /** URL path → file inside node_modules. */

package/src/ui/server/ui-language.ts

@@ -0,0 +1,50 @@
+/**
+ * The web UI's language (R19, 0.3.0-dev.39): a user pref, stored as
+ * `language:` in config/local/user.yml and served by /api/settings, like
+ * `editor`. Absent means English.
+ *
+ * The catalogs are public/shell.js's MESSAGES (en, the fallback) and one
+ * classic script per other language, public/i18n/<lang>.js, which adds its
+ * table to window.denMessages before shell.js runs. A page served in a
+ * language other than English gets that script and `<html lang>` from
+ * localizePage, so the first paint is already in that language. An English
+ * page is served exactly as it is on disk.
+ *
+ * Only Den's own words are translated: names (services, workspaces, repos,
+ * themes, languages), logs and command output never are.
+ */
+
+/** Every language the UI ships a catalog for; the first is the fallback. */
+export const UI_LANGUAGES = ["en", "ja", "es"] as const;
+export type UiLanguage = (typeof UI_LANGUAGES)[number];
+export const DEFAULT_UI_LANGUAGE: UiLanguage = "en";
+
+export function isUiLanguage(v: unknown): v is UiLanguage {
+  return (
+    typeof v === "string" && (UI_LANGUAGES as readonly string[]).includes(v)
+  );
+}
+
+/** The stored value, normalised: an unknown or missing one is English. */
+export function uiLanguage(stored: unknown): UiLanguage {
+  return isUiLanguage(stored) ? stored : DEFAULT_UI_LANGUAGE;
+}
+
+/** The catalog script a language's pages load before shell.js (none for en). */
+export function catalogPath(lang: UiLanguage): string | null {
+  return lang === DEFAULT_UI_LANGUAGE ? null : `/i18n/${lang}.js`;
+}
+
+/**
+ * A page in `lang`: `<html lang>` set, and the language's catalog loaded
+ * just before shell.js, so the shell draws in it from the first paint.
+ * English, or a page without the shell, comes back unchanged.
+ */
+export function localizePage(html: string, lang: UiLanguage): string {
+  const src = catalogPath(lang);
+  const shell = '<script src="/shell.js"></script>';
+  if (!src || !html.includes(shell)) return html;
+  return html
+    .replace(/<html lang="[^"]*"/, () => `<html lang="${lang}"`)
+    .replace(shell, () => `<script src="${src}"></script>${shell}`);
+}

package/src/ui/server/workspace-routes.ts

@@ -19,6 +19,7 @@ import type { ResolvedService } from "../../shared/types/index.js";
 import type { EditorManager } from "./editor-manager.js";
 import type { GitHubService } from "./github-service.js";
 import { JETBRAINS_EDITORS } from "./editor-manager.js";
+import { stackNamespaceRows } from "../../shared/stacks/namespace.js";
 import {
   readWorkspacesFile,
   writeWorkspacesFile,
@@ -44,6 +45,7 @@ import {
 import {
   checkServiceHealth,
   claimHealthyService,
+  settledDaemonRecord,
   runServiceCommand,
   prepareServiceSecretEnv,
   resolveService,
@@ -552,7 +554,21 @@ export async function handleWorkspaceRoutes(
       syncJetBrainsWorkspaceSymlinks(wsFile);
     }
 
-    return sendJson(res, { ...wsFile, resolvedDirs, codeWorkspacePaths });
+    // Each workspace's stack namespace, resolved, with where it came from
+    // (workspace, blueprint or default) and whether it differs from the
+    // default suffix: the page's "stacks: <ns>" chip.
+    const stackNamespaces = Object.fromEntries(
+      stackNamespaceRows(Object.keys(wsFile.workspaces)).map((r) => [
+        r.workspace,
+        r,
+      ]),
+    );
+    return sendJson(res, {
+      ...wsFile,
+      resolvedDirs,
+      codeWorkspacePaths,
+      stackNamespaces,
+    });
   }
 
   // ── API: rename workspace ─────────────────────────────────────────────────
@@ -1775,10 +1791,31 @@ export async function handleWorkspaceRoutes(
           if (cmd === "up") {
             const health = await checkServiceHealth(resolved, "local");
             if (cancelled) return;
-            if (health.health === "ok") {
+            // `conflict`: a shared stack namespace runs another checkout's
+            // project; the real up refuses it, naming both.
+            const claim =
+              health.health === "ok"
+                ? claimHealthyService(resolved, ws.name, (text) =>
+                    emit({ type: "line", text }),
+                  )
+                : "untracked";
+            // Another process answers on its port (said above): nothing is
+            // claimed and nothing started on top of it (0.3.0-dev.39).
+            if (health.health === "ok" && claim === "busy") {
+              overallExit = 1;
+              emit({
+                type: "svc-done",
+                address,
+                exitCode: 1,
+                repoName: svcRepoName,
+                subsystem: svcSubsystem,
+              });
+              safeRunNext(i + 1);
+              return;
+            }
+            if (health.health === "ok" && claim !== "conflict") {
               // Skipping must not lose the refcount — this workspace is an
               // owner of what's running, whether den tracked it or not.
-              const claim = claimHealthyService(resolved, ws.name);
               emit({
                 type: "line",
                 text:
@@ -1801,6 +1838,11 @@ export async function handleWorkspaceRoutes(
               return;
             }
           } else {
+            // A pre-dev.37 record is settled before the skip decides
+            // (0.3.0-dev.39): adopted, it is running; stale, it is dropped.
+            settledDaemonRecord(resolved, ws.name, (text) =>
+              emit({ type: "line", text }),
+            );
             let running = hasRunningOpctlContainers(resolved);
             if (!running) {
               // Not opctl-visible but still responding (host-run process)?

package/themes/den/den-theme.json

@@ -0,0 +1,72 @@
+{
+  "$schema": "https://raw.githubusercontent.com/Monster-Orange/den/main/schemas/den.theme.v1.json",
+  "schema": "den.theme/v1",
+  "id": "den",
+  "name": "Den",
+  "version": "2.0.0",
+  "description": "Den's default: a sheltered workspace in walnut and umber neutrals with a moss-green accent. System fonts.",
+  "author": "Monster Orange",
+  "license": "MIT",
+  "homepage": "https://github.com/Monster-Orange/den-themes/tree/main/themes/den",
+  "default_mode": "dark",
+  "type": {
+    "sans": "-apple-system, BlinkMacSystemFont, \"Segoe UI\", \"Noto Sans\", Helvetica, Arial, sans-serif",
+    "mono": "ui-monospace, SFMono-Regular, \"SF Mono\", Menlo, Consolas, monospace",
+    "display": "-apple-system, BlinkMacSystemFont, \"Segoe UI\", \"Noto Sans\", Helvetica, Arial, sans-serif",
+    "ja": "\"Hiragino Sans\", \"Hiragino Kaku Gothic ProN\", \"Noto Sans JP\", \"Yu Gothic\", Meiryo, sans-serif"
+  },
+  "shape": {
+    "radius": "8px",
+    "radius-button": "6px",
+    "density": "comfortable"
+  },
+  "mark": {
+    "svg": "mark.svg",
+    "shape": "rounded"
+  },
+  "favicon": "favicon.ico",
+  "modes": {
+    "light": {
+      "bg": "#f2eee8",
+      "surface": "#fbf9f6",
+      "raised": "#ffffff",
+      "sunken": "#e8e2d9",
+      "text": "#241e18",
+      "muted": "#5c5247",
+      "faint": "#6d6358",
+      "border": "#dcd3c7",
+      "border-strong": "#8d7f6d",
+      "accent": "#557a2a",
+      "accent-text": "#4a6b23",
+      "accent-fill": "#4a6b23",
+      "on-accent": "#ffffff",
+      "ok": "#2e7246",
+      "warn": "#8c5a10",
+      "bad": "#b0392a",
+      "remote": "#23677a",
+      "shadow": "0 8px 24px rgb(48 36 24 / 0.14)",
+      "bar": "linear-gradient(90deg, #557a2a 0%, #8a6a48 100%)"
+    },
+    "dark": {
+      "bg": "#1a1612",
+      "surface": "#221d18",
+      "raised": "#2b251f",
+      "sunken": "#14110e",
+      "text": "#ede6dc",
+      "muted": "#b5aa9b",
+      "faint": "#978b7e",
+      "border": "#3a322a",
+      "border-strong": "#7a6d5d",
+      "accent": "#9bbb63",
+      "accent-text": "#a8c672",
+      "accent-fill": "#9bbb63",
+      "on-accent": "#1a1612",
+      "ok": "#6fc28f",
+      "warn": "#e0a84e",
+      "bad": "#ef7f6a",
+      "remote": "#74b8c8",
+      "shadow": "0 12px 30px rgb(0 0 0 / 0.5)",
+      "bar": "linear-gradient(90deg, #9bbb63 0%, #a07c55 100%)"
+    }
+  }
+}

package/themes/den/mark.svg

@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32" width="32" height="32" role="img" aria-label="Den">
+  <rect width="32" height="32" rx="7" fill="#3a2e22"/>
+  <path d="M5 26.5h22" stroke="#9bbb63" stroke-width="2" stroke-linecap="round"/>
+  <path d="M8 26V15a8 8 0 0 1 16 0v11h-4.5V15.5a3.5 3.5 0 0 0-7 0V26z" fill="#f2eee8"/>
+  <path d="M13 26v-9.5a3 3 0 0 1 6 0V26z" fill="#c8a46a" opacity="0.9"/>
+</svg>