quilltap 4.8.0-dev.146 → 4.8.0-dev.147

package/lib/docs-commands.js

@@ -84,9 +84,9 @@ Write subcommands (server required for database-backed mounts):
   write [--force] [--base64] <mount> <path> [file]  Write a file from <file> or stdin
   delete <mount> <path>                              Idempotent file delete
   mkdir <mount> <path>                               Idempotent folder create
-  move <srcMount> <srcPath> <dstMount> <dstPath>                   Move file (hard-link when possible)
-  copy [--force] <srcMount> <srcPath> <dstMount> <dstPath>         Copy file (hard-link unless --force)
-  link <srcMount> <srcPath> <dstMount> <dstPath>                   Hard-link file (server-required)
+  move <srcMount> <srcPath> <dstMount> <dstPath>                   Move file (relocates the link; no byte copy)
+  copy [--force] <srcMount> <srcPath> <dstMount> <dstPath>         Copy file (independent; shares bytes until either side is written)
+  link <srcMount> <srcPath> <dstMount> <dstPath>                   Hard-link file — one file, two paths; edits show at both (server-required)
   rmdir <mount> <path>                               Delete an empty folder (server-required)
   mvdir <mount> <fromPath> <toPath>                  Rename/move a folder (server-required)
 
@@ -117,14 +117,17 @@ Options:
                             file size, or hard-link count
   -r, --reverse             Reverse sort order
   --links                   For 'ls' / 'dir': under each file with more than
-                            one hard link, list the other mount/path entries
+                            one hard link, list the other mount/path entries.
+                            Counts deliberate links made with 'docs link' — not
+                            unrelated files that merely share identical bytes
   --depth N                 For 'tree': maximum nesting depth (default: 20)
   --max-nodes N             For 'tree': maximum nodes to render (default: 1000)
   --long                    For 'tree': include text/emb columns (reserved for future)
   --force                   For 'read': dump binary to TTY anyway
                             For 'write': overwrite existing destination
                             For 'copy':  overwrite + force a real byte copy
-                                         (skips the default hard-link path)
+                                         (skips the default shared-content path;
+                                          the end state is the same either way)
   --base64                  For 'write': send content as base64 JSON via PUT
                                          .../files/{path} (portable path used
                                          by the file browser; server-required)
@@ -624,21 +627,51 @@ function formatLsDate(iso) {
   return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`;
 }
 
-const LS_FILE_COLUMNS = `
+// Cached per process: one PRAGMA per run, not one per prepared statement.
+let linkGroupColumnPresent = null;
+
+function hasLinkGroupColumn(db) {
+  if (linkGroupColumnPresent !== null) return linkGroupColumnPresent;
+  try {
+    const cols = db.prepare(`PRAGMA table_info("doc_mount_file_links")`).all();
+    linkGroupColumnPresent = cols.some((c) => c.name === 'linkGroupId');
+  } catch {
+    linkGroupColumnPresent = false;
+  }
+  return linkGroupColumnPresent;
+}
+
+// The "links" column counts deliberate hard links — members of this file's
+// linkGroupId — NOT rows sharing a fileId. Content rows are addressed by
+// sha256, so a boilerplate or empty file collects dozens of unrelated links
+// that share its bytes purely by coincidence; reporting those as links told
+// the operator a file was linked into 36 stores when nothing had been linked
+// at all. An instance that hasn't run the linkGroupId migration yet degrades
+// to 1 rather than failing the whole listing.
+function lsFileColumns(db) {
+  const present = hasLinkGroupColumn(db);
+  const linkCount = present
+    ? `(CASE WHEN l.linkGroupId IS NULL THEN 1 ELSE
+         (SELECT COUNT(*) FROM doc_mount_file_links g WHERE g.linkGroupId = l.linkGroupId) END)`
+    : `1`;
+  const linkGroupId = present ? `l.linkGroupId` : `NULL`;
+  return `
+  ${linkGroupId} AS linkGroupId,
   l.id AS linkId, l.fileId, l.relativePath, l.fileName, l.lastModified,
   l.extractionStatus, l.extractedTextSha256, l.chunkCount,
   f.fileType, f.fileSizeBytes, f.source, f.sha256,
-  (SELECT COUNT(*) FROM doc_mount_file_links WHERE fileId = l.fileId) AS linkCount,
+  ${linkCount} AS linkCount,
   (SELECT COUNT(*) FROM doc_mount_chunks
     WHERE linkId = l.id AND embedding IS NOT NULL) AS embeddedChunkCount
 `;
+}
 
 function resolveLsTarget(db, mountId, normalizedPath) {
   if (!normalizedPath) return { kind: 'root', path: '' };
 
   // Exact file match wins — handles the single-file display mode.
   const file = db.prepare(`
-    SELECT ${LS_FILE_COLUMNS}
+    SELECT ${lsFileColumns(db)}
     FROM doc_mount_file_links l
     JOIN doc_mount_files f ON f.id = l.fileId
     WHERE l.mountPointId = ? AND l.relativePath = ?
@@ -692,7 +725,7 @@ function fetchLsRows(db, mountId, parentPath) {
 
   const files = parentPath === ''
     ? db.prepare(`
-        SELECT ${LS_FILE_COLUMNS}
+        SELECT ${lsFileColumns(db)}
         FROM doc_mount_file_links l
         JOIN doc_mount_files f ON f.id = l.fileId
         WHERE l.mountPointId = ?
@@ -700,7 +733,7 @@ function fetchLsRows(db, mountId, parentPath) {
         ORDER BY l.fileName COLLATE NOCASE
       `).all(mountId)
     : db.prepare(`
-        SELECT ${LS_FILE_COLUMNS}
+        SELECT ${lsFileColumns(db)}
         FROM doc_mount_file_links l
         JOIN doc_mount_files f ON f.id = l.fileId
         WHERE l.mountPointId = ?
@@ -712,26 +745,29 @@ function fetchLsRows(db, mountId, parentPath) {
   return { folders, files };
 }
 
-function fetchLinksForFiles(db, fileIds) {
-  if (fileIds.length === 0) return new Map();
-  const placeholders = fileIds.map(() => '?').join(',');
+// Members of each named hard-link group, keyed by linkGroupId. Grouping is by
+// linkGroupId rather than fileId on purpose — see lsFileColumns: a shared
+// fileId only means "identical bytes", which is not a link.
+function fetchLinkGroupMembers(db, groupIds) {
+  if (groupIds.length === 0) return new Map();
+  const placeholders = groupIds.map(() => '?').join(',');
   const rows = db.prepare(`
-    SELECT l.fileId, l.relativePath, l.mountPointId, m.name AS mountName
+    SELECT l.linkGroupId, l.relativePath, l.mountPointId, m.name AS mountName
     FROM doc_mount_file_links l
     JOIN doc_mount_points m ON m.id = l.mountPointId
-    WHERE l.fileId IN (${placeholders})
+    WHERE l.linkGroupId IN (${placeholders})
     ORDER BY m.name COLLATE NOCASE, l.relativePath COLLATE NOCASE
-  `).all(...fileIds);
-  const byFile = new Map();
+  `).all(...groupIds);
+  const byGroup = new Map();
   for (const r of rows) {
-    if (!byFile.has(r.fileId)) byFile.set(r.fileId, []);
-    byFile.get(r.fileId).push({
+    if (!byGroup.has(r.linkGroupId)) byGroup.set(r.linkGroupId, []);
+    byGroup.get(r.linkGroupId).push({
       mountPointId: r.mountPointId,
       mountName: r.mountName,
       relativePath: r.relativePath,
     });
   }
-  return byFile;
+  return byGroup;
 }
 
 function sortLsFiles(files, sortType, reverse) {
@@ -780,14 +816,14 @@ async function handleLs(flags, mountSpec, rawPath) {
       const prefix = normalizedPath ? normalizedPath.replace(/\/+$/, '') + '/' : '';
       const allFiles = normalizedPath
         ? db.prepare(`
-            SELECT ${LS_FILE_COLUMNS}
+            SELECT ${lsFileColumns(db)}
             FROM doc_mount_file_links l
             JOIN doc_mount_files f ON f.id = l.fileId
             WHERE l.mountPointId = ? AND l.relativePath LIKE ?
             ORDER BY l.relativePath
           `).all(mount.id, prefix + '%')
         : db.prepare(`
-            SELECT ${LS_FILE_COLUMNS}
+            SELECT ${lsFileColumns(db)}
             FROM doc_mount_file_links l
             JOIN doc_mount_files f ON f.id = l.fileId
             WHERE l.mountPointId = ?
@@ -824,10 +860,10 @@ async function handleLs(flags, mountSpec, rawPath) {
 
     // Fetch links for JSON or --links flag
     const wantLinks = flags.json || flags.links;
-    const multiLinkFileIds = wantLinks
-      ? files.filter((f) => f.linkCount > 1).map((f) => f.fileId)
+    const linkedGroupIds = wantLinks
+      ? files.filter((f) => f.linkCount > 1 && f.linkGroupId).map((f) => f.linkGroupId)
       : [];
-    const linksByFile = fetchLinksForFiles(db, multiLinkFileIds);
+    const linksByGroup = fetchLinkGroupMembers(db, linkedGroupIds);
 
     // JSON output
     if (flags.json) {
@@ -846,7 +882,7 @@ async function handleLs(flags, mountSpec, rawPath) {
         }
       }
       for (const file of files) {
-        const others = linksByFile.get(file.fileId);
+        const others = file.linkGroupId ? linksByGroup.get(file.linkGroupId) : undefined;
         const links = others && others.length > 0
           ? others
           : [{
@@ -951,6 +987,7 @@ async function handleLs(flags, mountSpec, rawPath) {
         emb: embedColumnMarker(file.chunkCount, file.embeddedChunkCount),
         name: singleFile ? file.relativePath : file.fileName,
         fileId: file.fileId,
+        linkGroupId: file.linkGroupId,
         relativePath: file.relativePath,
       });
     }
@@ -982,7 +1019,7 @@ async function handleLs(flags, mountSpec, rawPath) {
     for (const r of dataRows) {
       console.log(renderLine(r, false));
       if (flags.links && r.type === '-') {
-        const others = (linksByFile.get(r.fileId) || []).filter(
+        const others = ((r.linkGroupId && linksByGroup.get(r.linkGroupId)) || []).filter(
           (l) => !(l.mountPointId === mount.id && l.relativePath === r.relativePath)
         );
         if (others.length > 0) {

package/package.json

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