kitowall 3.2.0 → 3.4.0

package/dist/cli.js

@@ -1503,6 +1503,7 @@ async function main() {
         const pack = cleanOpt(getOptionValue(args, '--pack'));
         const namespace = cleanOpt(getOptionValue(args, '--namespace')) ?? 'kitowall';
         const force = cmd === 'rotate-now' || args.includes('--force');
+        const forceStatic = args.includes('--force-static');
         if (state.mode === 'manual' && !force) {
             console.log(JSON.stringify({
                 ok: true,
@@ -1513,6 +1514,20 @@ async function main() {
             }, null, 2));
             return;
         }
+        // If live mode currently owns wallpaper state, skip static rotation unless explicitly forced.
+        if (!forceStatic) {
+            const coexist = await (0, workshop_1.workshopCoexistenceStatus)().catch(() => ({ ok: true, snapshot: [], current: {} }));
+            if (Array.isArray(coexist.snapshot) && coexist.snapshot.length > 0) {
+                console.log(JSON.stringify({
+                    ok: true,
+                    skipped: true,
+                    reason: 'livewallpaper_active',
+                    hint: 'Use: kitowall next --force-static (or rotate-now --force-static) to switch back to static mode',
+                    namespace
+                }, null, 2));
+                return;
+            }
+        }
         await switchToStaticWallpaperMode();
         const result = await controller.applyNext(pack, namespace);
         console.log(JSON.stringify({

package/dist/core/live.js

@@ -1524,19 +1524,10 @@ async function liveApply(opts) {
     ];
     await (0, exec_1.run)(bin, setVideoArgs, { timeoutMs: 120000 });
     // Live mode owns wallpaper state: stop static rotation services while live is active.
-    try {
-        await (0, workshop_1.workshopCoexistenceEnter)();
-    }
-    catch { }
+    await (0, workshop_1.workshopCoexistenceEnter)();
     // Keep live authority persistent across session restarts.
-    try {
-        await (0, exec_1.run)(bin, ['service', 'install'], { timeoutMs: 20000 });
-    }
-    catch { }
-    try {
-        await (0, exec_1.run)(bin, ['service', 'enable'], { timeoutMs: 20000 });
-    }
-    catch { }
+    await (0, exec_1.run)(bin, ['service', 'install'], { timeoutMs: 20000 });
+    await (0, exec_1.run)(bin, ['service', 'enable'], { timeoutMs: 20000 });
     withLiveLock(() => {
         const current = readIndex();
         const updatedItems = current.items.map(v => (v.id === item.id ? { ...v, last_applied_at: nowUnix() } : v));
@@ -1725,14 +1716,53 @@ async function liveServiceAutostart(action) {
     const index = readIndex();
     let bin = index.runner.bin_name;
     let out;
+    const extractResult = (err) => {
+        const result = err?.result;
+        if (!result)
+            return null;
+        return {
+            stdout: String(result.stdout ?? ''),
+            stderr: String(result.stderr ?? ''),
+            code: Number(result.code ?? 1)
+        };
+    };
     try {
         out = await (0, exec_1.run)(bin, ['service', action], { timeoutMs: 30000 });
     }
     catch (err) {
+        const partial = extractResult(err);
+        if (action === 'status' && partial) {
+            out = partial;
+            return {
+                ok: true,
+                action,
+                runner: bin,
+                stdout: out.stdout.trim(),
+                stderr: out.stderr.trim(),
+                code: out.code
+            };
+        }
         // Legacy compatibility: if user still points to kitsune-livewallpaper,
         // map to its older subcommand to avoid hard failure.
         if (clean(bin) === 'kitsune-livewallpaper') {
-            out = await (0, exec_1.run)(bin, ['service-autostart', action], { timeoutMs: 30000 });
+            try {
+                out = await (0, exec_1.run)(bin, ['service-autostart', action], { timeoutMs: 30000 });
+            }
+            catch (legacyErr) {
+                const legacyPartial = extractResult(legacyErr);
+                if (action === 'status' && legacyPartial) {
+                    out = legacyPartial;
+                    return {
+                        ok: true,
+                        action,
+                        runner: bin,
+                        stdout: out.stdout.trim(),
+                        stderr: out.stderr.trim(),
+                        code: out.code
+                    };
+                }
+                throw legacyErr;
+            }
         }
         else {
             throw err;

package/dist/core/workshop.js

@@ -131,9 +131,12 @@ function getCoexistServices() {
     const defaults = [
         'swww-daemon.service',
         'swww-daemon@kitowall.service',
+        'kitowall-watch.service',
+        'kitowall-next.service',
+        'kitowall-next.timer',
         'hyprwall-watch.service',
-        'hyprwall-next.timer',
-        'kitowall-next.timer'
+        'hyprwall-next.service',
+        'hyprwall-next.timer'
     ];
     const configured = Array.isArray(cfg.coexistServices) ? cfg.coexistServices.map(v => String(v).trim()).filter(Boolean) : [];
     return configured.length > 0 ? configured : defaults;
@@ -1005,14 +1008,26 @@ async function isUnitActive(unit) {
         return false;
     }
 }
+async function isUnitEnabled(unit) {
+    try {
+        const out = await (0, exec_1.run)('systemctl', ['--user', 'is-enabled', unit], { timeoutMs: 4000 });
+        return out.stdout.trim() === 'enabled';
+    }
+    catch {
+        return false;
+    }
+}
 async function workshopCoexistenceEnter() {
     const paths = getWePaths();
     ensureWePaths(paths);
     const units = getCoexistServices();
     const active = [];
+    const enabled = [];
     for (const unit of units) {
         if (await isUnitActive(unit))
             active.push(unit);
+        if (await isUnitEnabled(unit))
+            enabled.push(unit);
     }
     for (const unit of active) {
         try {
@@ -1022,8 +1037,16 @@ async function workshopCoexistenceEnter() {
             // best effort
         }
     }
+    for (const unit of enabled) {
+        try {
+            await (0, exec_1.run)('systemctl', ['--user', 'disable', unit]);
+        }
+        catch {
+            // best effort
+        }
+    }
     const snapshotId = String(now());
-    const snap = { id: snapshotId, ts: now(), active };
+    const snap = { id: snapshotId, ts: now(), active, enabled };
     (0, fs_1.writeJson)(node_path_1.default.join(snapshotDir(paths), `${snapshotId}.json`), snap);
     (0, fs_1.writeJson)(snapshotFile(paths), { id: snapshotId, ts: snap.ts });
     return { ok: true, stopped: active, snapshot: active, snapshot_id: snapshotId };
@@ -1036,18 +1059,29 @@ async function workshopCoexistenceExit() {
         return { ok: true, restored: [] };
     const raw = JSON.parse(node_fs_1.default.readFileSync(snapPath, 'utf8'));
     let active = Array.isArray(raw.active) ? raw.active.map(v => String(v)) : [];
+    let enabled = Array.isArray(raw.enabled) ? raw.enabled.map(v => String(v)) : [];
     if ((!active || active.length === 0) && raw.id) {
         const historical = node_path_1.default.join(snapshotDir(paths), `${raw.id}.json`);
         if (node_fs_1.default.existsSync(historical)) {
             try {
                 const snap = JSON.parse(node_fs_1.default.readFileSync(historical, 'utf8'));
                 active = Array.isArray(snap.active) ? snap.active.map(v => String(v)) : [];
+                enabled = Array.isArray(snap.enabled) ? snap.enabled.map(v => String(v)) : [];
             }
             catch {
                 active = [];
+                enabled = [];
             }
         }
     }
+    for (const unit of enabled) {
+        try {
+            await (0, exec_1.run)('systemctl', ['--user', 'enable', unit]);
+        }
+        catch {
+            // best effort
+        }
+    }
     const restored = [];
     for (const unit of active) {
         try {

package/dist/utils/exec.js

@@ -18,6 +18,7 @@ function run(cmd, args = [], options = {}) {
             'ffprobe',
             'cargo',
             'kitsune-livewallpaper',
+            'kitsune-rendercore',
             'dd'
         ]);
         const useHost = isFlatpak && hostCommands.has(cmd);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitowall",
-  "version": "3.2.0",
+  "version": "3.4.0",
   "description": "CLI/daemon for Hyprland wallpapers using swww with pack-based rotation.",
   "license": "SEE LICENSE IN LICENSE.md",
   "type": "commonjs",