fraim-hub 2.0.248 → 2.0.249

package/dist/src/ai-hub/cli.js

@@ -36,6 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.waitForDesktopHubReady = waitForDesktopHubReady;
 exports.runHub = runHub;
 // Hub-owned launcher used by the fraim-hub package. Keep this outside
 // src/cli/commands so the core fraim package has no Hub command implementation.
@@ -79,7 +80,7 @@ function openDesktopWindow(projectPath, preferredPort, runtimeId) {
     const electronBinary = resolveElectronBinary();
     const desktopEntry = resolveDesktopEntry();
     if (!electronBinary || !desktopEntry) {
-        return false;
+        return null;
     }
     const args = projectPath
         ? [desktopEntry, '--project-path', projectPath, '--port', String(preferredPort)]
@@ -91,8 +92,7 @@ function openDesktopWindow(projectPath, preferredPort, runtimeId) {
         detached: true,
         stdio: 'ignore',
     });
-    child.unref();
-    return true;
+    return child;
 }
 function openBrowser(url) {
     if (process.platform === 'win32') {
@@ -207,6 +207,41 @@ function fetchRunningHubVersion(port) {
         req.on('timeout', () => { req.destroy(); resolve(null); });
     });
 }
+async function waitForDesktopHubReady(child, preferredPort, options = {}) {
+    const timeoutMs = options.timeoutMs ?? 15000;
+    const pollMs = options.pollMs ?? 250;
+    const runtimeId = options.runtimeId || 'hub';
+    const fraimDir = options.fraimDir || (0, project_fraim_paths_1.getUserFraimDirPath)();
+    const start = Date.now();
+    const childState = {};
+    child.once('exit', (code, signal) => {
+        childState.exit = { code, signal };
+    });
+    child.once('error', (error) => {
+        childState.error = error;
+    });
+    while (Date.now() - start < timeoutMs) {
+        if (childState.error) {
+            throw new Error(`FRAIM Hub desktop shell failed to launch: ${childState.error.message}`);
+        }
+        if (childState.exit) {
+            const detail = childState.exit.signal ? `signal ${childState.exit.signal}` : `exit code ${childState.exit.code ?? 'unknown'}`;
+            throw new Error(`FRAIM Hub desktop shell exited before the Hub became ready (${detail}).`);
+        }
+        const runtime = (0, hub_runtime_file_1.readHubRuntimeFile)(fraimDir, runtimeId);
+        const ports = runtime?.port && runtime.port !== preferredPort
+            ? [runtime.port, preferredPort]
+            : [preferredPort];
+        for (const port of ports) {
+            const version = await fetchRunningHubVersion(port);
+            if (version) {
+                return { port, version };
+            }
+        }
+        await new Promise((r) => setTimeout(r, pollMs));
+    }
+    throw new Error(`Timed out waiting for FRAIM Hub desktop shell to become ready on port ${preferredPort}.`);
+}
 async function reconcileRunningHub(flags, runtimeId = 'hub') {
     const running = (0, hub_runtime_file_1.readHubRuntimeFile)((0, project_fraim_paths_1.getUserFraimDirPath)(), runtimeId);
     const confirmedVersion = running ? await fetchRunningHubVersion(running.port) : null;
@@ -243,8 +278,8 @@ async function runHub(options) {
         if (wantDesktop) {
             await reconcileRunningHub({ restart: !!options.restart, keepRunning: !!options.keepRunning }, runtimeId);
         }
-        const openedDesktop = wantDesktop && openDesktopWindow(projectPath, preferredPort, runtimeId);
-        if (!openedDesktop) {
+        const desktopChild = wantDesktop ? openDesktopWindow(projectPath, preferredPort, runtimeId) : null;
+        if (!desktopChild) {
             const port = await findAvailablePort(preferredPort);
             const server = new AiHubServer(projectPath ? { projectPath } : {});
             await server.start(port);
@@ -254,7 +289,9 @@ async function runHub(options) {
             openBrowser(url);
             return;
         }
-        console.log('AI Hub desktop shell launched.');
+        const ready = await waitForDesktopHubReady(desktopChild, preferredPort, { runtimeId });
+        desktopChild.unref();
+        console.log(`AI Hub desktop shell launched at http://127.0.0.1:${ready.port}/ai-hub/ (v${ready.version}).`);
         if (projectPath)
             console.log(`Project path: ${projectPath}`);
         else

package/dist/src/ai-hub/custom-employees.js

@@ -17,21 +17,22 @@ exports.buildCustomEmployeePersona = buildCustomEmployeePersona;
 // evaluatePersonaAccess) must never call resolveEmployee.
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const project_fraim_paths_1 = require("../core/utils/project-fraim-paths");
+const pack_home_1 = require("../cli/utils/pack-home");
 const persona_hiring_1 = require("../config/persona-hiring");
 const EMPLOYEES_DIR_REL = path_1.default.join('fraim', 'personalized-employee', 'employees');
 function employeesDir(projectDir) {
     return path_1.default.join(projectDir, EMPLOYEES_DIR_REL);
 }
-// Issue #1002: the manager level is the default home for a custom employee, so
-// an employee the manager created is available in every project on the machine.
-// Two roots, matching capability precedence: the writable home wins over the
-// synced cache, so a just-created employee appears before any publish or sync.
-function managerEmployeesDirs() {
-    return {
-        local: path_1.default.join((0, project_fraim_paths_1.getUserFraimDirPath)(), 'personalized-employee', 'employees'),
-        cache: path_1.default.join((0, project_fraim_paths_1.getUserFraimDirPath)(), 'manager', 'employees'),
-    };
+// Issue #1043 (review round 2): every layer has exactly one home, named by
+// config, and that home holds the whole layer. There are no caches, so an
+// employee has exactly one authoritative location per level.
+const EMPLOYEES_SUBDIR = 'employees';
+function layerEmployeeReadDirs(layer) {
+    return (0, pack_home_1.packReadRoots)(layer).map((root) => path_1.default.join(root, EMPLOYEES_SUBDIR));
+}
+/** The single writable employees directory for a layer. */
+function layerEmployeeWriteDir(layer) {
+    return path_1.default.join((0, pack_home_1.resolvePackHome)(layer).root, EMPLOYEES_SUBDIR);
 }
 function readEmployeesFromDir(dir, scope) {
     if (!fs_1.default.existsSync(dir))
@@ -82,15 +83,23 @@ function safeSlug(key) {
  * cache. Reading the manager level here is what makes the manager-level default
  * usable: without it an employee created at the manager level would exist on
  * disk and appear in no roster.
+ *
+ * Issue #1043 adds the org level at the bottom of that order, so an employee
+ * shared company-wide is visible to everyone, and a manager or project copy of
+ * the same key still takes precedence over it.
  */
 function readCustomEmployees(projectDir) {
-    const dirs = managerEmployeesDirs();
     const byKey = new Map();
     // Lowest precedence first, so a later write overwrites on key collision.
-    for (const emp of readEmployeesFromDir(dirs.cache, 'manager'))
-        byKey.set(emp.key, emp);
-    for (const emp of readEmployeesFromDir(dirs.local, 'manager'))
-        byKey.set(emp.key, emp);
+    // packReadRoots is highest-precedence-first, so it is walked in reverse.
+    for (const dir of [...layerEmployeeReadDirs('org')].reverse()) {
+        for (const emp of readEmployeesFromDir(dir, 'org'))
+            byKey.set(emp.key, emp);
+    }
+    for (const dir of [...layerEmployeeReadDirs('manager')].reverse()) {
+        for (const emp of readEmployeesFromDir(dir, 'manager'))
+            byKey.set(emp.key, emp);
+    }
     for (const emp of readEmployeesFromDir(employeesDir(projectDir), 'project'))
         byKey.set(emp.key, emp);
     return [...byKey.values()];
@@ -108,7 +117,9 @@ function writeCustomEmployee(projectDir, employee) {
     const slug = safeSlug(record.key);
     if (!slug)
         throw new Error(`Invalid employee key: ${record.key}`);
-    const dir = scope === 'project' ? employeesDir(projectDir) : managerEmployeesDirs().local;
+    // Issue #1043 (review round 1): the org level now has a real writable home,
+    // resolved from config, so an org-scope write no longer has to be refused.
+    const dir = scope === 'project' ? employeesDir(projectDir) : layerEmployeeWriteDir(scope);
     fs_1.default.mkdirSync(dir, { recursive: true });
     fs_1.default.writeFileSync(path_1.default.join(dir, `${slug}.json`), JSON.stringify(record, null, 2), 'utf8');
 }
@@ -121,11 +132,12 @@ function deleteCustomEmployee(projectDir, key) {
     const slug = safeSlug(key);
     if (!slug)
         return false;
-    const dirs = managerEmployeesDirs();
+    // Every place a copy could live, at every level. A delete that misses one
+    // reports success while the record is still listed from that level.
     const candidates = [
         path_1.default.join(employeesDir(projectDir), `${slug}.json`),
-        path_1.default.join(dirs.local, `${slug}.json`),
-        path_1.default.join(dirs.cache, `${slug}.json`),
+        ...layerEmployeeReadDirs('manager').map((d) => path_1.default.join(d, `${slug}.json`)),
+        ...layerEmployeeReadDirs('org').map((d) => path_1.default.join(d, `${slug}.json`)),
     ];
     let removed = false;
     for (const fp of candidates) {

package/dist/src/ai-hub/office-sideload.js

@@ -3,9 +3,9 @@
  * Sideloads Office add-in manifests (Word + PowerPoint) so they appear under
  * Insert > My Add-ins > Developer Add-ins without admin rights or AppSource.
  *
- * Windows: writes HKCU\SOFTWARE\Microsoft\Office\16.0\WEF\Developer\<guid> =
- *          ABSOLUTE FILE PATH to manifest.xml. This is exactly what Microsoft's
- *          `office-addin-dev-settings register` writes. A URL value is for
+ * Windows: writes HKCU\SOFTWARE\Microsoft\Office\16.0\WEF\Developer\{<guid>}
+ *          (Default) = ABSOLUTE FILE PATH to manifest.xml. This is the registry
+ *          shape Word resolves for Developer Add-ins. A URL value is for
  *          SharePoint/network-share catalogs and yields "catalog access denied"
  *          for a developer sideload — do NOT use a URL here.
  * macOS:   copies the manifest into each app's
@@ -23,6 +23,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.manifestXmlForPort = manifestXmlForPort;
+exports.winDeveloperManifestSubkey = winDeveloperManifestSubkey;
 exports.isSideloaded = isSideloaded;
 exports.sideloadManifest = sideloadManifest;
 exports.removeSideload = removeSideload;
@@ -61,7 +62,7 @@ function generatedManifestPath(entry, userDataDir) {
     return path_1.default.join(userDataDir, 'office-manifests', entry.guid, 'manifest.xml');
 }
 function manifestXmlForPort(xml, httpPort) {
-    return xml.replace(/(https?:\/\/(?:localhost|127\.0\.0\.1)):43091/g, `$1:${httpPort}`);
+    return xml.replace(/https?:\/\/(?:localhost|127\.0\.0\.1):43091/g, `http://127.0.0.1:${httpPort}`);
 }
 function prepareManifestForSideload(entry, sourcePath, options) {
     if (!options.httpPort)
@@ -76,16 +77,46 @@ function prepareManifestForSideload(entry, sourcePath, options) {
 // ---------------------------------------------------------------------------
 // Windows registry helpers
 // ---------------------------------------------------------------------------
-function winRegisteredValue(guid) {
+function winDeveloperManifestSubkey(guid) {
+    return `${WEF_DEVELOPER_KEY}\\{${guid}}`;
+}
+function parseRegSzValue(stdout) {
+    const line = stdout.split(/\r?\n/).find(l => l.includes('REG_SZ'));
+    if (!line)
+        return null;
+    const idx = line.indexOf('REG_SZ');
+    return line.slice(idx + 'REG_SZ'.length).trim() || null;
+}
+function winRegisteredRootValue(guid) {
     const r = (0, child_process_1.spawnSync)('reg', ['query', WEF_DEVELOPER_KEY, '/v', guid], { encoding: 'utf8' });
     if (r.status !== 0 || !r.stdout.includes('REG_SZ'))
         return null;
     // Output line looks like: "    <guid>    REG_SZ    C:\path\to\manifest.xml"
-    const line = r.stdout.split(/\r?\n/).find(l => l.includes('REG_SZ'));
-    if (!line)
+    return parseRegSzValue(r.stdout);
+}
+function winRegisteredDefaultValue(guid) {
+    const r = (0, child_process_1.spawnSync)('reg', ['query', winDeveloperManifestSubkey(guid), '/ve'], { encoding: 'utf8' });
+    if (r.status !== 0 || !r.stdout.includes('REG_SZ'))
         return null;
-    const idx = line.indexOf('REG_SZ');
-    return line.slice(idx + 'REG_SZ'.length).trim() || null;
+    // Output line looks like: "    (Default)    REG_SZ    C:\path\to\manifest.xml"
+    return parseRegSzValue(r.stdout);
+}
+function winRegisteredValue(guid) {
+    // Word resolves the braced GUID subkey. Prefer it even when a legacy root
+    // value exists, so a stale effective registration cannot be hidden.
+    return winRegisteredDefaultValue(guid) ?? winRegisteredRootValue(guid);
+}
+function winWriteRegisteredValue(guid, manifestPath) {
+    const r = (0, child_process_1.spawnSync)('reg', [
+        'add', winDeveloperManifestSubkey(guid),
+        '/ve', '/t', 'REG_SZ', '/d', manifestPath, '/f',
+    ], { encoding: 'utf8' });
+    if (r.status !== 0)
+        return { ok: false, reason: r.stderr || `reg add failed for ${guid}` };
+    // Remove the older root-value registration if present. Office does not need
+    // it, and keeping two registration shapes makes stale-state diagnosis harder.
+    (0, child_process_1.spawnSync)('reg', ['delete', WEF_DEVELOPER_KEY, '/v', guid, '/f'], { encoding: 'utf8' });
+    return { ok: true };
 }
 // ---------------------------------------------------------------------------
 // Public API
@@ -117,13 +148,10 @@ function sideloadManifest(projectPath, options = {}) {
         }
         const sideloadPath = prepareManifestForSideload(entry, manifestPath, options);
         if (process.platform === 'win32') {
-            // Developer-key value = absolute file path to manifest.xml (NOT a URL).
-            const r = (0, child_process_1.spawnSync)('reg', [
-                'add', WEF_DEVELOPER_KEY,
-                '/v', entry.guid, '/t', 'REG_SZ', '/d', sideloadPath, '/f',
-            ], { encoding: 'utf8' });
-            if (r.status !== 0)
-                return { ok: false, reason: r.stderr || `reg add failed for ${entry.guid}` };
+            // Developer add-in subkey default value = absolute file path to manifest.xml (NOT a URL).
+            const r = winWriteRegisteredValue(entry.guid, sideloadPath);
+            if (!r.ok)
+                return r;
             continue;
         }
         if (process.platform === 'darwin') {
@@ -146,6 +174,7 @@ function removeSideload() {
     for (const entry of MANIFESTS) {
         if (process.platform === 'win32') {
             (0, child_process_1.spawnSync)('reg', ['delete', WEF_DEVELOPER_KEY, '/v', entry.guid, '/f'], { encoding: 'utf8' });
+            (0, child_process_1.spawnSync)('reg', ['delete', winDeveloperManifestSubkey(entry.guid), '/f'], { encoding: 'utf8' });
         }
         else if (process.platform === 'darwin') {
             const target = macWefPath(entry.macContainer, entry.guid);

package/dist/src/ai-hub/server.js

@@ -1786,8 +1786,11 @@ class AiHubServer {
                     '.css': 'text/css; charset=utf-8',
                     '.js': 'application/javascript; charset=utf-8',
                     '.xml': 'application/xml; charset=utf-8',
+                    '.png': 'image/png',
+                    '.ico': 'image/x-icon',
+                    '.svg': 'image/svg+xml',
                 };
-                const contentType = contentTypes[ext] || 'text/plain; charset=utf-8';
+                const contentType = contentTypes[ext] || 'application/octet-stream';
                 fs_1.default.readFile(filePath, (err, data) => {
                     if (err) {
                         next(); // fall through to 404
@@ -3533,8 +3536,10 @@ class AiHubServer {
                 '.js': 'application/javascript',
                 '.css': 'text/css',
                 '.png': 'image/png',
+                '.ico': 'image/x-icon',
+                '.svg': 'image/svg+xml',
             };
-            const contentType = contentTypeMap[ext] || 'text/plain';
+            const contentType = contentTypeMap[ext] || 'application/octet-stream';
             fs_1.default.readFile(filePath, (err, data) => {
                 if (err) {
                     res.status(404).end('Not found');
@@ -5440,7 +5445,7 @@ class AiHubServer {
         });
         // POST /api/ai-hub/custom-employees — create a new custom employee.
         this.app.post('/api/ai-hub/custom-employees', (req, res) => {
-            const { projectPath: reqProjectPath, displayName, role, icon, jobIds } = req.body;
+            const { projectPath: reqProjectPath, displayName, role, icon, jobIds, scope: reqScope } = req.body;
             const projectPath = reqProjectPath || this.projectPath;
             if (!displayName || typeof displayName !== 'string' || !displayName.trim()) {
                 return res.status(400).json({ error: 'displayName is required.' });
@@ -5448,6 +5453,15 @@ class AiHubServer {
             if (!Array.isArray(jobIds) || jobIds.length === 0) {
                 return res.status(400).json({ error: 'jobIds must be a non-empty array.' });
             }
+            // Issue #1043 bug bash: this handler hardcoded scope 'project', so the
+            // manager and org levels were unreachable from the Hub even though the
+            // store writes all three. An explicit scope is now honored. The default
+            // stays 'project' so existing Hub behavior is unchanged.
+            const VALID_SCOPES = new Set(['manager', 'project', 'org']);
+            if (reqScope !== undefined && !VALID_SCOPES.has(reqScope)) {
+                return res.status(400).json({ error: `Invalid scope '${reqScope}'. Expected manager, project, or org.` });
+            }
+            const scope = (reqScope ?? 'project');
             const existing = (0, custom_employees_1.readCustomEmployees)(projectPath).map((e) => e.key);
             const key = (0, custom_employees_1.slugifyDisplayName)(displayName.trim(), existing);
             const VALID_ICON_KINDS = new Set(['emoji', 'generated', 'image']);
@@ -5459,7 +5473,7 @@ class AiHubServer {
                 icon: { kind: iconKind, value: icon?.value ?? displayName.trim() },
                 jobIds,
                 createdBy: '',
-                scope: 'project',
+                scope,
                 createdAt: new Date().toISOString(),
             };
             (0, custom_employees_1.writeCustomEmployee)(projectPath, employee);

package/dist/src/cli/utils/local-folder-sync.js

@@ -37,42 +37,84 @@ exports.isConflictCopy = isConflictCopy;
 exports.countConflictCopies = countConflictCopies;
 exports.collectLocalFolderFiles = collectLocalFolderFiles;
 exports.writeLocalFolderFile = writeLocalFolderFile;
+exports.removeLocalFolderFiles = removeLocalFolderFiles;
 exports.localFolderVersion = localFolderVersion;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const crypto_1 = __importDefault(require("crypto"));
-/** Pack subdirectories expected in every local-folder backend. */
-exports.LOCAL_FOLDER_PACK_DIRS = ['context', 'rules', 'learnings'];
+const capability_pack_1 = require("../../core/capability-pack");
+/**
+ * Pack subdirectories expected in every local-folder backend.
+ *
+ * Issue #1043: the capability directories (and `employees`) were missing, so a
+ * job, skill, nested rule, or employee record published into a local-folder
+ * pack was never collected on the way back down. The pack was write-only for
+ * those types. `CAPABILITY_DIRS` is the single allowlist for the capability
+ * half; this list is context/rules/learnings plus that, deduplicated because
+ * `rules` appears in both.
+ */
+exports.LOCAL_FOLDER_PACK_DIRS = [
+    ...new Set(['context', 'rules', 'learnings', ...capability_pack_1.CAPABILITY_DIRS]),
+];
 /**
  * Matches the conflict-copy filename patterns produced by OneDrive,
  * SharePoint, Google Drive for Desktop, and Dropbox.
  *
  * Deliberately does NOT match ordinary parenthesised names like
  * "sprint-retro (Q2 2026).md" — only the well-known suffix patterns.
+ *
+ * Issue #1043 widened the extension from `.md` to `.md|.json`: employee
+ * records are JSON pack members and get conflict copies like any other file.
  */
-exports.CONFLICT_COPY_RE = /[\s-](\([^)]*'s conflicted copy \d{4}-\d{2}-\d{2}\)|\(\d+\)|[\w-]+-PC)\.md$/i;
+exports.CONFLICT_COPY_RE = /[\s-](\([^)]*'s conflicted copy \d{4}-\d{2}-\d{2}\)|\(\d+\)|[\w-]+-PC)\.(md|json)$/i;
 /** True when the filename looks like a sync-client conflict copy. */
 function isConflictCopy(fileName) {
     return exports.CONFLICT_COPY_RE.test(fileName);
 }
 /**
- * Count conflict-copy files directly under dirPath/learnings (non-recursive).
- * Used by the Hub UI to surface an amber "N conflicts" indicator.
+ * Walk every pack file under localPath, depth-first, yielding pack-relative
+ * paths with forward slashes.
+ *
+ * Issue #1043: this replaces three separate one-level `readdirSync` loops.
+ * Capability members live at `jobs/<category>/<name>.md`, so a one-level scan
+ * could never see them — which is why a published job neither synced back down
+ * nor moved the pack version.
  */
-function countConflictCopies(localPath) {
-    let count = 0;
+function walkPackFiles(localPath, visit) {
+    const descend = (absDir, relDir) => {
+        let entries;
+        try {
+            entries = fs_1.default.readdirSync(absDir, { withFileTypes: true });
+        }
+        catch {
+            return; // non-fatal — missing or unreadable subdirs are fine
+        }
+        for (const entry of entries) {
+            const abs = path_1.default.join(absDir, entry.name);
+            const rel = `${relDir}/${entry.name}`;
+            if (entry.isDirectory())
+                descend(abs, rel);
+            else if (entry.isFile())
+                visit(rel, abs);
+        }
+    };
     for (const dirName of exports.LOCAL_FOLDER_PACK_DIRS) {
         const dir = path_1.default.join(localPath, dirName);
         if (!fs_1.default.existsSync(dir))
             continue;
-        try {
-            for (const entry of fs_1.default.readdirSync(dir, { withFileTypes: true })) {
-                if (entry.isFile() && isConflictCopy(entry.name))
-                    count++;
-            }
-        }
-        catch { /* non-fatal */ }
+        descend(dir, dirName);
     }
+}
+/**
+ * Count conflict-copy files across the pack directories.
+ * Used by the Hub UI to surface an amber "N conflicts" indicator.
+ */
+function countConflictCopies(localPath) {
+    let count = 0;
+    walkPackFiles(localPath, (rel) => {
+        if (isConflictCopy(path_1.default.basename(rel)))
+            count++;
+    });
     return count;
 }
 /**
@@ -84,25 +126,16 @@ function countConflictCopies(localPath) {
  */
 function collectLocalFolderFiles(localPath, pathGuard) {
     const files = [];
-    for (const dirName of exports.LOCAL_FOLDER_PACK_DIRS) {
-        const dir = path_1.default.join(localPath, dirName);
-        if (!fs_1.default.existsSync(dir))
-            continue;
+    walkPackFiles(localPath, (rel, abs) => {
+        if (isConflictCopy(path_1.default.basename(rel)))
+            return;
+        if (!pathGuard(rel))
+            return;
         try {
-            for (const entry of fs_1.default.readdirSync(dir, { withFileTypes: true })) {
-                if (!entry.isFile())
-                    continue;
-                if (isConflictCopy(entry.name))
-                    continue;
-                const rel = `${dirName}/${entry.name}`;
-                if (!pathGuard(rel))
-                    continue;
-                const content = fs_1.default.readFileSync(path_1.default.join(dir, entry.name), 'utf8');
-                files.push({ relativePath: rel, content });
-            }
+            files.push({ relativePath: rel, content: fs_1.default.readFileSync(abs, 'utf8') });
         }
-        catch { /* non-fatal — missing subdirs are fine */ }
-    }
+        catch { /* non-fatal — skip files we cannot read */ }
+    });
     return files;
 }
 /**
@@ -147,32 +180,51 @@ function writeLocalFolderFile(localPath, relativePath, content, lastSyncedAt) {
         throw err;
     }
 }
+/**
+ * Remove the source side of a move from a local-folder pack.
+ *
+ * Call this only after every destination write has landed, so a partial failure
+ * never leaves the artifact at neither level. A path that is also a write target
+ * is skipped: a same-path move is a no-op, not a delete of what was just written.
+ *
+ * Returns the absolute paths actually removed.
+ */
+function removeLocalFolderFiles(localPath, deletions, writtenRelativePaths) {
+    const written = new Set(writtenRelativePaths);
+    const removed = [];
+    for (const relativePath of deletions) {
+        if (written.has(relativePath))
+            continue;
+        const target = path_1.default.join(localPath, relativePath);
+        if (!fs_1.default.existsSync(target))
+            continue;
+        fs_1.default.rmSync(target, { force: true });
+        removed.push(target);
+    }
+    return removed;
+}
 /**
  * A stable version string for the local-folder backend — a hex digest
  * of the most recent mtime across all pack files. Changes whenever any
  * file in the folder is written (by this machine or the sync client).
  */
 function localFolderVersion(localPath) {
-    const mtimes = [];
-    for (const dirName of exports.LOCAL_FOLDER_PACK_DIRS) {
-        const dir = path_1.default.join(localPath, dirName);
-        if (!fs_1.default.existsSync(dir))
-            continue;
+    // Issue #1043: the digest mixes in the pack-relative path, not just mtimes.
+    // Two files written in the same filesystem-clock tick produce identical
+    // mtimes, so an mtime-only digest could leave the version unchanged after a
+    // publish and make sync skip the update.
+    const entries = [];
+    walkPackFiles(localPath, (rel, abs) => {
+        if (isConflictCopy(path_1.default.basename(rel)))
+            return;
         try {
-            for (const entry of fs_1.default.readdirSync(dir, { withFileTypes: true })) {
-                if (!entry.isFile() || isConflictCopy(entry.name))
-                    continue;
-                try {
-                    mtimes.push(fs_1.default.statSync(path_1.default.join(dir, entry.name)).mtimeMs);
-                }
-                catch { /* skip files we can't stat */ }
-            }
+            entries.push(`${rel}:${fs_1.default.statSync(abs).mtimeMs}`);
         }
-        catch { /* non-fatal */ }
-    }
-    if (mtimes.length === 0)
+        catch { /* skip files we can't stat */ }
+    });
+    if (entries.length === 0)
         return '0';
     const hash = crypto_1.default.createHash('sha1');
-    hash.update(mtimes.sort((a, b) => a - b).join(','));
+    hash.update(entries.sort().join(','));
     return hash.digest('hex').slice(0, 12);
 }