quilltap 4.11.0-dev.97 → 4.11.0

package/lib/__tests__/platform-paths.test.js

@@ -0,0 +1,62 @@
+/**
+ * Platform default instance root, including the Docker case.
+ *
+ * The bug this guards: inside the Docker image `quilltap db --lock-status`
+ * fell through to `~/.quilltap` (a home directory the image never creates),
+ * reported "No instance lock found" while the server held one, and
+ * `db --tables` reported a missing database.
+ *
+ * @jest-environment node
+ */
+
+'use strict';
+
+const os = require('os');
+const path = require('path');
+
+const { getDefaultBaseDir, isDockerContainer, DOCKER_BASE_DIR } = require('../platform-paths');
+const { resolveDataDir } = require('../db-helpers');
+
+const savedEnv = { ...process.env };
+
+afterEach(() => {
+  process.env = { ...savedEnv };
+});
+
+describe('platform default instance root', () => {
+  it('is /app/quilltap inside the Docker image', () => {
+    process.env.DOCKER_CONTAINER = 'true';
+    expect(isDockerContainer()).toBe(true);
+    expect(getDefaultBaseDir()).toBe(DOCKER_BASE_DIR);
+  });
+
+  it('is the per-OS location outside a container', () => {
+    delete process.env.DOCKER_CONTAINER;
+    if (isDockerContainer()) return; // the suite itself is running in a container
+    const expected = process.platform === 'darwin'
+      ? path.join(os.homedir(), 'Library', 'Application Support', 'Quilltap')
+      : process.platform === 'win32'
+        ? path.join(process.env.APPDATA || path.join(os.homedir(), 'AppData', 'Roaming'), 'Quilltap')
+        : path.join(os.homedir(), '.quilltap');
+    expect(getDefaultBaseDir()).toBe(expected);
+  });
+});
+
+describe('resolveDataDir', () => {
+  it('defaults to the Docker data directory inside the image', () => {
+    process.env.DOCKER_CONTAINER = 'true';
+    delete process.env.QUILLTAP_DATA_DIR;
+    expect(resolveDataDir()).toBe('/app/quilltap/data');
+  });
+
+  it('still lets QUILLTAP_DATA_DIR win inside the image', () => {
+    process.env.DOCKER_CONTAINER = 'true';
+    process.env.QUILLTAP_DATA_DIR = '/elsewhere';
+    expect(resolveDataDir()).toBe(path.join('/elsewhere', 'data'));
+  });
+
+  it('still lets an explicit override win', () => {
+    process.env.DOCKER_CONTAINER = 'true';
+    expect(resolveDataDir('/explicit')).toBe(path.join('/explicit', 'data'));
+  });
+});

package/lib/db-helpers.js

@@ -15,14 +15,11 @@ function resolveDataDir(overrideDir) {
       : overrideDir;
     return path.join(resolved, 'data');
   }
-  const os = require('os');
   if (process.env.QUILLTAP_DATA_DIR) {
     return path.join(process.env.QUILLTAP_DATA_DIR, 'data');
   }
-  const home = os.homedir();
-  if (process.platform === 'darwin') return path.join(home, 'Library', 'Application Support', 'Quilltap', 'data');
-  if (process.platform === 'win32') return path.join(process.env.APPDATA || path.join(home, 'AppData', 'Roaming'), 'Quilltap', 'data');
-  return path.join(home, '.quilltap', 'data');
+  const { getDefaultBaseDir } = require('./platform-paths');
+  return path.join(getDefaultBaseDir(), 'data');
 }
 
 // Resolve the data dir + database passphrase a subcommand should use, given

package/lib/lock-helpers.js

@@ -206,10 +206,7 @@ let exitHandlersRegistered = false;
 function detectEnvironmentType() {
   if (process.versions && process.versions.electron) return 'electron';
   if (process.env.ELECTRON_DEV) return 'electron';
-  if (process.env.DOCKER_CONTAINER === 'true') return 'docker';
-  try {
-    if (fs.existsSync('/.dockerenv')) return 'docker';
-  } catch { /* not Docker */ }
+  if (require('./platform-paths').isDockerContainer()) return 'docker';
   return 'local';
 }
 

package/lib/platform-paths.js

@@ -0,0 +1,45 @@
+'use strict';
+
+/**
+ * Where an instance lives when nothing says otherwise.
+ *
+ * The CLI's mirror of the server's platform default (lib/paths.ts). Inside the
+ * Docker image the instance is always the bind mount at /app/quilltap, and the
+ * `nextjs` user has no home directory, so falling through to `~/.quilltap`
+ * sent `docker exec quilltap quilltap db …` to a database that does not exist
+ * and reported "no instance lock" while the server held one.
+ *
+ * Docker detection matches the server's lock-environment check
+ * (DOCKER_CONTAINER or /.dockerenv), deliberately without the server's
+ * "/app exists" heuristic, which misfires on hosts that happen to have /app.
+ */
+
+const fs = require('fs');
+const os = require('os');
+const path = require('path');
+
+const DOCKER_BASE_DIR = '/app/quilltap';
+
+function isDockerContainer() {
+  if (process.env.DOCKER_CONTAINER === 'true') return true;
+  try {
+    return fs.existsSync('/.dockerenv');
+  } catch {
+    return false;
+  }
+}
+
+/** The instance root used when no flag, env var or registered instance names one. */
+function getDefaultBaseDir() {
+  if (isDockerContainer()) return DOCKER_BASE_DIR;
+  const home = os.homedir();
+  if (process.platform === 'darwin') return path.join(home, 'Library', 'Application Support', 'Quilltap');
+  if (process.platform === 'win32') return path.join(process.env.APPDATA || path.join(home, 'AppData', 'Roaming'), 'Quilltap');
+  return path.join(home, '.quilltap');
+}
+
+module.exports = {
+  DOCKER_BASE_DIR,
+  isDockerContainer,
+  getDefaultBaseDir,
+};

package/lib/theme-commands.js

@@ -21,6 +21,7 @@ const os = require('os');
 const crypto = require('crypto');
 const { execSync } = require('child_process');
 const { validateThemeBundle, validateManifest } = require('./theme-validation');
+const { getDefaultBaseDir } = require('./platform-paths');
 
 // ============================================================================
 // COLOR HELPERS
@@ -54,10 +55,7 @@ function resolveBaseDir(overrideDir) {
   if (process.env.QUILLTAP_DATA_DIR) {
     return process.env.QUILLTAP_DATA_DIR;
   }
-  const home = os.homedir();
-  if (process.platform === 'darwin') return path.join(home, 'Library', 'Application Support', 'Quilltap');
-  if (process.platform === 'win32') return path.join(process.env.APPDATA || path.join(home, 'AppData', 'Roaming'), 'Quilltap');
-  return path.join(home, '.quilltap');
+  return getDefaultBaseDir();
 }
 
 function getThemesDir(overrideDir) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quilltap",
-  "version": "4.11.0-dev.97",
+  "version": "4.11.0",
   "description": "Self-hosted AI workspace for writers, worldbuilders, and roleplayers. Run with npx quilltap.",
   "author": {
     "name": "Charles Sebold",