plotlink-ows 1.0.5 → 1.0.8

package/app/server.ts

@@ -1,4 +1,5 @@
 import dotenv from "dotenv";
+import os from "os";
 import path from "path";
 import { fileURLToPath } from "url";
 import { ENV_FILE, DATA_DIR, STORIES_DIR, DATABASE_URL } from "./lib/paths";
@@ -60,45 +61,56 @@ if (fs.existsSync(distPath)) {
   });
 }
 
-/** Migrate stories/data from old package-relative paths to ~/.plotlink-ows/ */
-function migrateOldData() {
-  const oldStoriesDir = path.join(__dirname, "..", "stories");
-  const oldDataDir = path.join(__dirname, "..", "data");
-
-  // Migrate stories
-  if (fs.existsSync(oldStoriesDir) && oldStoriesDir !== STORIES_DIR) {
-    const oldEntries = fs.readdirSync(oldStoriesDir, { withFileTypes: true })
-      .filter((d) => d.isDirectory() && !d.name.startsWith(".") && d.name !== "_example");
-    for (const entry of oldEntries) {
-      const src = path.join(oldStoriesDir, entry.name);
-      const dest = path.join(STORIES_DIR, entry.name);
-      if (!fs.existsSync(dest)) {
-        try {
-          fs.renameSync(src, dest);
-        } catch {
-          // EXDEV: cross-device move — fall back to copy
-          fs.cpSync(src, dest, { recursive: true });
-        }
-        console.log(`  Migrated story "${entry.name}" → ${STORIES_DIR}`);
-      }
+/** Copy story directories from a source dir into STORIES_DIR, skipping duplicates */
+function migrateStoriesFrom(srcDir: string, label: string) {
+  if (!fs.existsSync(srcDir) || srcDir === STORIES_DIR) return;
+  const entries = fs.readdirSync(srcDir, { withFileTypes: true })
+    .filter((d) => d.isDirectory() && !d.name.startsWith(".") && d.name !== "_example");
+  for (const entry of entries) {
+    const dest = path.join(STORIES_DIR, entry.name);
+    if (fs.existsSync(dest)) continue;
+    try {
+      fs.renameSync(path.join(srcDir, entry.name), dest);
+    } catch {
+      fs.cpSync(path.join(srcDir, entry.name), dest, { recursive: true });
     }
+    console.log(`  Migrated story "${entry.name}" from ${label}`);
   }
+}
 
-  // Migrate database
-  const oldDb = path.join(oldDataDir, "local.db");
-  const newDb = path.join(DATA_DIR, "local.db");
-  if (fs.existsSync(oldDb) && !fs.existsSync(newDb)) {
-    fs.copyFileSync(oldDb, newDb);
-    console.log(`  Migrated database → ${DATA_DIR}`);
+/** Copy a single file if source exists and destination doesn't */
+function migrateFileFrom(src: string, dest: string, label: string) {
+  if (fs.existsSync(src) && !fs.existsSync(dest)) {
+    fs.copyFileSync(src, dest);
+    console.log(`  Migrated ${label} → ${path.dirname(dest)}`);
   }
+}
 
-  // Migrate terminal sessions
-  const oldSessions = path.join(oldDataDir, "terminal-sessions.json");
-  const newSessions = path.join(DATA_DIR, "terminal-sessions.json");
-  if (fs.existsSync(oldSessions) && !fs.existsSync(newSessions)) {
-    fs.copyFileSync(oldSessions, newSessions);
-    console.log(`  Migrated terminal sessions → ${DATA_DIR}`);
+/** Migrate stories/data from old locations to ~/.plotlink-ows/ */
+function migrateOldData() {
+  // 1. Scan all previous npx cache directories
+  const npxBase = path.join(os.homedir(), ".npm", "_npx");
+  if (fs.existsSync(npxBase)) {
+    try {
+      // Only migrate stories from npx caches — db/sessions are singletons and
+      // picking from a random cache entry could restore stale state
+      for (const hash of fs.readdirSync(npxBase)) {
+        const pkgRoot = path.join(npxBase, hash, "node_modules", "plotlink-ows");
+        migrateStoriesFrom(path.join(pkgRoot, "stories"), `npx cache (${hash.slice(0, 8)})`);
+      }
+    } catch { /* npx cache scan best-effort */ }
   }
+
+  // 2. Current package-relative path (dev → npx transition)
+  const oldStoriesDir = path.join(__dirname, "..", "stories");
+  const oldDataDir = path.join(__dirname, "..", "data");
+  migrateStoriesFrom(oldStoriesDir, "package directory");
+  migrateFileFrom(path.join(oldDataDir, "local.db"), path.join(DATA_DIR, "local.db"), "database");
+  migrateFileFrom(
+    path.join(oldDataDir, "terminal-sessions.json"),
+    path.join(DATA_DIR, "terminal-sessions.json"),
+    "terminal sessions",
+  );
 }
 
 async function start() {

package/app/web/components/TerminalPanel.tsx

@@ -36,7 +36,7 @@ const THEME = {
   blue: "#4A6FA5",
   magenta: "#7B4B8A",
   cyan: "#3D7A7A",
-  white: "#3A2A1E",
+  white: "#E6DDD0",       // subtle cream tint for input line backgrounds
   brightBlack: "#8B7355",
   brightRed: "#B85C5C",   // muted red — readable as text, soft as diff bg
   brightGreen: "#5A8A5A", // muted green — readable as text, soft as diff bg
@@ -184,6 +184,8 @@ export function TerminalPanel({ token, storyName, authFetch, onSelectStory }: Te
     container.style.width = "100%";
     container.style.height = "100%";
     container.style.display = "none";
+    container.style.paddingLeft = "10px";
+    container.style.boxSizing = "border-box";
     wrapperRef.current.appendChild(container);
 
     const term = new Terminal({
@@ -207,11 +209,6 @@ export function TerminalPanel({ token, storyName, authFetch, onSelectStory }: Te
     term.loadAddon(serialize);
     term.open(container);
 
-    // Apply padding to term.element so FitAddon measures correctly
-    if (term.element) {
-      term.element.style.paddingLeft = "10px";
-    }
-
     const session: TerminalSession = { term, fit, serialize, ws: null, container, observer: null as unknown as ResizeObserver, connected: false };
 
     const observer = new ResizeObserver(() => {

package/app/web/styles.css

@@ -1,6 +1,18 @@
 @import "tailwindcss";
 @plugin "@tailwindcss/typography";
 
+@theme inline {
+  --color-background: #E8DFD0;
+  --color-foreground: #2C1810;
+  --color-surface: #F0EBE1;
+  --color-muted: #8B7355;
+  --color-accent: #8B4513;
+  --color-accent-dim: #6B3410;
+  --color-border: #D4C5B0;
+  --color-error: #CC3333;
+  --default-font-family: "Inter", system-ui, -apple-system, sans-serif;
+}
+
 :root {
   --bg: #E8DFD0;
   --bg-surface: #F0EBE1;
@@ -14,18 +26,6 @@
   --paper-bg: #F5F0E8;
 }
 
-@theme inline {
-  --color-background: var(--bg);
-  --color-foreground: var(--text);
-  --color-surface: var(--bg-surface);
-  --color-muted: var(--text-muted);
-  --color-accent: var(--accent);
-  --color-accent-dim: var(--accent-dim);
-  --color-border: var(--border);
-  --color-error: var(--error);
-  --default-font-family: "Inter", system-ui, -apple-system, sans-serif;
-}
-
 body {
   background: var(--bg);
   color: var(--text);
@@ -67,3 +67,15 @@ code, pre {
   opacity: 1 !important;
   color: #8B7355 !important;
 }
+
+/* Remove left vertical line artifact from xterm container */
+.xterm {
+  border: none !important;
+  outline: none !important;
+}
+
+.xterm-viewport {
+  border: none !important;
+  outline: none !important;
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plotlink-ows",
-  "version": "1.0.5",
+  "version": "1.0.8",
   "bin": {
     "plotlink-ows": "./bin/plotlink-ows.js"
   },