revdeck 0.2.0 → 0.2.1

package/CHANGELOG.md

@@ -6,6 +6,15 @@ All notable changes to this project are documented here. The format is based on
 
 ## [Unreleased]
 
+## [0.2.1] - 2026-11-12
+
+### Fixed
+
+- `revdeck devcontainer --write` no longer writes absolute host paths into the shared
+  `devcontainer.json`: mounts use `${localEnv:HOME}${localEnv:USERPROFILE}` and a stable
+  `~/.local/state/revdeck/devcontainer/{run,state}` bridge. The daemon listens on a second RPC socket
+  there for containers. Comments and formatting in an existing JSONC file are preserved.
+
 ## [0.2.0] - 2026-11-12
 
 ### Added

package/README.md

@@ -139,12 +139,17 @@ revdeck devcontainer          # print the mounts and environment
 revdeck devcontainer --write  # merge them into .devcontainer/devcontainer.json
 ```
 
-The command mounts the host runtime directory at `/run/revdeck` (socket) and the state directory at
-`/var/lib/revdeck` (read-only `daemon.json`), and sets `REVDECK_RUNTIME_DIR`, `REVDECK_STATE_DIR`,
-`REVDECK_DEV_CONTAINER=1` and `REVDECK_UI_HOST`. After rebuilding the container, start the daemon on
-the host. Inside the container revdeck never starts a local daemon, so `gh`/`glab` are never invoked
-there; if the host socket is missing it fails with a clear `DEVCONTAINER` error. `revdeck doctor` is
-aware of this mode. For the UI from the container, start the host daemon with
+The command mounts the stable host bridge `~/.local/state/revdeck/devcontainer/run` at `/run/revdeck`
+(socket) and `~/.local/state/revdeck/devcontainer/state` at `/var/lib/revdeck` (read-only
+`daemon.json`), and sets `REVDECK_RUNTIME_DIR`, `REVDECK_STATE_DIR`, `REVDECK_DEV_CONTAINER=1` and
+`REVDECK_UI_HOST`. The JSON uses `${localEnv:HOME}${localEnv:USERPROFILE}` instead of an absolute
+home path, so the same `.devcontainer/devcontainer.json` works for every developer. Comments and
+foreign keys in an existing JSONC file are preserved.
+
+The daemon creates the bridge socket on startup, so on the host run `revdeck daemon restart`, then
+rebuild the container. Inside the container revdeck never starts a local daemon, so `gh`/`glab` are
+never invoked there; if the host socket is missing it fails with a clear `DEVCONTAINER` error.
+`revdeck doctor` is aware of this mode. For the UI from the container, start the host daemon with
 `revdeck daemon start --host 0.0.0.0`.
 
 ## MCP

package/README.ru.md

@@ -125,12 +125,18 @@ revdeck devcontainer          # показать mounts и окружение
 revdeck devcontainer --write  # добавить их в .devcontainer/devcontainer.json
 ```
 
-Команда монтирует runtime-каталог хоста в `/run/revdeck` (сокет) и state-каталог в `/var/lib/revdeck`
-(только чтение, `daemon.json`) и выставляет `REVDECK_RUNTIME_DIR`, `REVDECK_STATE_DIR`,
-`REVDECK_DEV_CONTAINER=1` и `REVDECK_UI_HOST`. После пересборки контейнера запустите демон на хосте.
-В контейнере revdeck никогда не запускает свой демон, поэтому `gh`/`glab` там не вызываются; если
-сокет хоста недоступен, команда падает с понятной ошибкой `DEVCONTAINER`. `revdeck doctor` знает об
-этом режиме. Для UI из контейнера запустите демон на хосте с `revdeck daemon start --host 0.0.0.0`.
+Команда монтирует стабильный мост хоста `~/.local/state/revdeck/devcontainer/run` в `/run/revdeck`
+(сокет) и `~/.local/state/revdeck/devcontainer/state` в `/var/lib/revdeck` (только чтение,
+`daemon.json`) и выставляет `REVDECK_RUNTIME_DIR`, `REVDECK_STATE_DIR`, `REVDECK_DEV_CONTAINER=1` и
+`REVDECK_UI_HOST`. В JSON пишется `${localEnv:HOME}${localEnv:USERPROFILE}`, а не абсолютный домашний
+путь, поэтому один `.devcontainer/devcontainer.json` работает у всех разработчиков. Комментарии и
+чужие ключи в существующем JSONC сохраняются.
+
+Демон создаёт сокет моста при старте: на хосте выполните `revdeck daemon restart`, затем пересоберите
+контейнер. В контейнере revdeck никогда не запускает свой демон, поэтому `gh`/`glab` там не
+вызываются; если сокет хоста недоступен, команда падает с понятной ошибкой `DEVCONTAINER`.
+`revdeck doctor` знает об этом режиме. Для UI из контейнера запустите демон на хосте с
+`revdeck daemon start --host 0.0.0.0`.
 
 ## MCP
 

package/dist/cli.js

@@ -47,6 +47,19 @@ function socketPath() {
 function daemonInfoPath() {
   return path.join(stateDir(), "daemon.json");
 }
+function devcontainerBridgeDir() {
+  if (process.env.REVDECK_DEVCONTAINER_DIR) return path.resolve(process.env.REVDECK_DEVCONTAINER_DIR);
+  return path.join(os.homedir(), ".local", "state", "revdeck", "devcontainer");
+}
+function devcontainerRunDir() {
+  return path.join(devcontainerBridgeDir(), "run");
+}
+function devcontainerStateDir() {
+  return path.join(devcontainerBridgeDir(), "state");
+}
+function devcontainerSocketPath() {
+  return path.join(devcontainerRunDir(), "daemon.sock");
+}
 function logPath() {
   return path.join(stateDir(), "daemon.log");
 }
@@ -155,7 +168,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = "0.2.0";
+    VERSION = "0.2.1";
   }
 });
 
@@ -1967,22 +1980,26 @@ function isRecord(value) {
   return Boolean(value) && typeof value === "object" && !Array.isArray(value);
 }
 
+// src/cli/eject.ts
+import { applyEdits as applyEdits2, modify as modify2 } from "jsonc-parser";
+
 // src/cli/devcontainer.ts
 init_paths();
 import { existsSync as existsSync6 } from "node:fs";
 import { mkdir as mkdir3, readFile as readFile4, writeFile as writeFile2 } from "node:fs/promises";
 import path6 from "node:path";
+import { applyEdits, modify, parse as parseJsonc2 } from "jsonc-parser";
 init_locale();
 init_format();
 var CONTAINER_RUNTIME_DIR = "/run/revdeck";
 var CONTAINER_STATE_DIR = "/var/lib/revdeck";
 var CONTAINER_UI_HOST = "host.docker.internal";
 function devcontainerPatch() {
-  const mountSource = { runtime: runtimeDir(), state: stateDir() };
+  const bridge = "${localEnv:HOME}${localEnv:USERPROFILE}/.local/state/revdeck/devcontainer";
   return {
     mounts: [
-      { type: "bind", source: mountSource.runtime, target: CONTAINER_RUNTIME_DIR },
-      { type: "bind", source: mountSource.state, target: CONTAINER_STATE_DIR, readonly: true }
+      { type: "bind", source: `${bridge}/run`, target: CONTAINER_RUNTIME_DIR },
+      { type: "bind", source: `${bridge}/state`, target: CONTAINER_STATE_DIR, readonly: true }
     ],
     containerEnv: {
       REVDECK_RUNTIME_DIR: CONTAINER_RUNTIME_DIR,
@@ -2019,16 +2036,54 @@ function mergeDevcontainerConfig(existing, patch) {
   result.runArgs = runArgs;
   return result;
 }
+function applyDevcontainerPatch(text, patch) {
+  let current2 = text;
+  const parsed = parseJsonc2(current2);
+  if (!isRecord(parsed)) throw new Error("devcontainer.json: expected an object");
+  const formatting = { formattingOptions: { insertSpaces: true, tabSize: 2 } };
+  const mounts = Array.isArray(parsed.mounts) ? [...parsed.mounts] : [];
+  for (const mount of patch.mounts) {
+    const index = mounts.findIndex((item) => isRecord(item) && item.target === mount.target);
+    const path10 = ["mounts", index >= 0 ? index : mounts.length];
+    current2 = applyEdits(current2, modify(current2, path10, mount, formatting));
+    if (index >= 0) mounts[index] = mount;
+    else mounts.push(mount);
+  }
+  for (const [key, env] of [
+    ["containerEnv", patch.containerEnv],
+    ["remoteEnv", patch.remoteEnv]
+  ]) {
+    for (const [name, value] of Object.entries(env)) {
+      current2 = applyEdits(current2, modify(current2, [key, name], value, formatting));
+    }
+  }
+  const runArgs = Array.isArray(parsed.runArgs) ? parsed.runArgs.filter((item) => typeof item === "string") : [];
+  for (const arg of patch.runArgs) {
+    if (runArgs.includes(arg)) continue;
+    current2 = applyEdits(current2, modify(current2, ["runArgs", runArgs.length], arg, formatting));
+    runArgs.push(arg);
+  }
+  return current2.endsWith("\n") ? current2 : `${current2}
+`;
+}
 async function runDevcontainer(rootInput, options) {
   const root = findRepoRoot(rootInput);
   const patch = devcontainerPatch();
-  await ensureDir(runtimeDir());
-  await ensureDir(stateDir());
+  await ensureDir(devcontainerRunDir());
+  await ensureDir(devcontainerStateDir());
   const dir = path6.join(root, ".devcontainer");
   const file = path6.join(dir, "devcontainer.json");
-  writers.out(tr("\u0425\u043E\u0441\u0442-\u043A\u0430\u0442\u0430\u043B\u043E\u0433\u0438 revdeck:", "revdeck host directories:"));
-  writers.out(`  ${tr("\u0441\u043E\u043A\u0435\u0442", "socket")}: ${runtimeDir()} -> ${CONTAINER_RUNTIME_DIR}`);
-  writers.out(`  ${tr("\u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0435", "state")}: ${stateDir()} -> ${CONTAINER_STATE_DIR} (${tr("\u0442\u043E\u043B\u044C\u043A\u043E \u0447\u0442\u0435\u043D\u0438\u0435", "read-only")})`);
+  writers.out(tr("\u041C\u043E\u0441\u0442 revdeck \u0434\u043B\u044F \u043A\u043E\u043D\u0442\u0435\u0439\u043D\u0435\u0440\u0430:", "revdeck bridge for the container:"));
+  writers.out(`  ${tr("\u0441\u043E\u043A\u0435\u0442", "socket")}: ${devcontainerRunDir()} -> ${CONTAINER_RUNTIME_DIR}`);
+  writers.out(`  ${tr("\u0441\u043E\u0441\u0442\u043E\u044F\u043D\u0438\u0435", "state")}: ${devcontainerStateDir()} -> ${CONTAINER_STATE_DIR} (${tr("\u0442\u043E\u043B\u044C\u043A\u043E \u0447\u0442\u0435\u043D\u0438\u0435", "read-only")})`);
+  if (!existsSync6(devcontainerSocketPath())) {
+    writers.err(
+      tr(
+        "! \u0441\u043E\u043A\u0435\u0442 \u043C\u043E\u0441\u0442\u0430 \u0435\u0449\u0451 \u043D\u0435 \u0441\u043E\u0437\u0434\u0430\u043D: \u043D\u0430 \u0445\u043E\u0441\u0442\u0435 \u0432\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u0435 revdeck daemon restart",
+        "! the bridge socket does not exist yet: run revdeck daemon restart on the host"
+      )
+    );
+  }
   writers.out(tr("\u0412 \u043A\u043E\u043D\u0442\u0435\u0439\u043D\u0435\u0440\u0435: \u0434\u0435\u043C\u043E\u043D, gh \u0438 glab \u043E\u0441\u0442\u0430\u044E\u0442\u0441\u044F \u043D\u0430 \u0445\u043E\u0441\u0442\u0435.", "In the container: the daemon, gh and glab stay on the host."));
   if (!options.write) {
     writers.out("");
@@ -2040,12 +2095,11 @@ async function runDevcontainer(rootInput, options) {
   }
   await mkdir3(dir, { recursive: true });
   const existed = existsSync6(file);
-  let existing = {};
+  let output;
   if (existed) {
     const text = await readFile4(file, "utf8");
-    let parsed;
     try {
-      parsed = parseJsonc(text);
+      output = applyDevcontainerPatch(text, patch);
     } catch (error) {
       throw new Error(
         tr(
@@ -2054,22 +2108,18 @@ async function runDevcontainer(rootInput, options) {
         )
       );
     }
-    if (!isRecord(parsed)) throw new Error(`${path6.relative(root, file)}: ${tr("\u043E\u0436\u0438\u0434\u0430\u043B\u0441\u044F \u043E\u0431\u044A\u0435\u043A\u0442", "expected an object")}`);
-    existing = parsed;
   } else {
-    existing = { image: "mcr.microsoft.com/devcontainers/base:bookworm" };
+    const existing = { image: "mcr.microsoft.com/devcontainers/base:bookworm" };
+    output = `${JSON.stringify(mergeDevcontainerConfig(existing, patch), null, 2)}
+`;
   }
-  const merged = mergeDevcontainerConfig(existing, patch);
-  await writeFile2(file, `${JSON.stringify(merged, null, 2)}
-`);
+  await writeFile2(file, output);
   writers.out(`\u2714 ${path6.relative(root, file)}`);
-  if (existed) {
-    writers.out(tr("  \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438 \u0432 \u0441\u0443\u0449\u0435\u0441\u0442\u0432\u0443\u044E\u0449\u0435\u043C JSONC \u043D\u0435 \u0441\u043E\u0445\u0440\u0430\u043D\u044F\u044E\u0442\u0441\u044F: \u043F\u0440\u043E\u0432\u0435\u0440\u044C\u0442\u0435 diff.", "  comments in an existing JSONC are not preserved: review the diff."));
-  }
+  if (existed) writers.out(tr("  \u043A\u043E\u043C\u043C\u0435\u043D\u0442\u0430\u0440\u0438\u0438 \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u044B.", "  comments were preserved."));
   writers.out("");
   writers.out(tr("\u0414\u0430\u043B\u044C\u0448\u0435:", "Next:"));
-  writers.out(tr("  1. \u041F\u0435\u0440\u0435\u0441\u043E\u0431\u0435\u0440\u0438\u0442\u0435/\u043F\u0435\u0440\u0435\u043E\u0442\u043A\u0440\u043E\u0439\u0442\u0435 devcontainer.", "  1. Rebuild/reopen the devcontainer."));
-  writers.out(tr("  2. \u041D\u0430 \u0445\u043E\u0441\u0442\u0435: revdeck daemon start.", "  2. On the host: revdeck daemon start."));
+  writers.out(tr("  1. \u041D\u0430 \u0445\u043E\u0441\u0442\u0435: revdeck daemon restart \u2014 \u043E\u043D \u0441\u043E\u0437\u0434\u0430\u0441\u0442 \u0441\u043E\u043A\u0435\u0442 \u043C\u043E\u0441\u0442\u0430.", "  1. On the host: revdeck daemon restart \u2014 it creates the bridge socket."));
+  writers.out(tr("  2. \u041F\u0435\u0440\u0435\u0441\u043E\u0431\u0435\u0440\u0438\u0442\u0435/\u043F\u0435\u0440\u0435\u043E\u0442\u043A\u0440\u043E\u0439\u0442\u0435 devcontainer.", "  2. Rebuild/reopen the devcontainer."));
   writers.out(tr("  3. \u0412 \u043A\u043E\u043D\u0442\u0435\u0439\u043D\u0435\u0440\u0435: revdeck doctor \u2014 \u043E\u043D \u043D\u0435 \u0431\u0443\u0434\u0435\u0442 \u0438\u0441\u043A\u0430\u0442\u044C glab/gh \u0432\u043D\u0443\u0442\u0440\u0438.", "  3. In the container: revdeck doctor \u2014 it will not look for glab/gh inside."));
   writers.out(tr("  \u0414\u043B\u044F UI \u0438\u0437 \u043A\u043E\u043D\u0442\u0435\u0439\u043D\u0435\u0440\u0430 \u0437\u0430\u043F\u0443\u0441\u0442\u0438\u0442\u0435 \u0434\u0435\u043C\u043E\u043D \u043D\u0430 \u0445\u043E\u0441\u0442\u0435 \u0441 --host 0.0.0.0.", "  For the UI from the container, start the daemon on the host with --host 0.0.0.0."));
 }
@@ -2147,37 +2197,39 @@ async function runEject(rootInput, options) {
     try {
       const parsed = parseJsonc(text);
       if (isRecord(parsed)) {
-        const next = { ...parsed };
+        const formatting = { formattingOptions: { insertSpaces: true, tabSize: 2 } };
+        let current2 = text;
         let changed = false;
-        if (Array.isArray(next.mounts)) {
-          const mounts = next.mounts.filter((item) => !(isRecord(item) && (item.target === CONTAINER_RUNTIME_DIR || item.target === CONTAINER_STATE_DIR)));
-          if (mounts.length !== next.mounts.length) {
-            next.mounts = mounts;
+        if (Array.isArray(parsed.mounts)) {
+          const mounts = parsed.mounts.filter((item) => !(isRecord(item) && (item.target === CONTAINER_RUNTIME_DIR || item.target === CONTAINER_STATE_DIR)));
+          if (mounts.length !== parsed.mounts.length) {
+            current2 = applyEdits2(current2, modify2(current2, ["mounts"], mounts, formatting));
             changed = true;
           }
         }
         for (const key of ["containerEnv", "remoteEnv"]) {
-          if (!isRecord(next[key])) continue;
-          const env = { ...next[key] };
+          if (!isRecord(parsed[key])) continue;
+          const env = { ...parsed[key] };
           for (const name of ["REVDECK_RUNTIME_DIR", "REVDECK_STATE_DIR", "REVDECK_DEV_CONTAINER", "REVDECK_UI_HOST"]) delete env[name];
-          if (Object.keys(env).length !== Object.keys(next[key]).length) {
-            next[key] = env;
+          if (Object.keys(env).length !== Object.keys(parsed[key]).length) {
+            current2 = applyEdits2(current2, modify2(current2, [key], env, formatting));
             changed = true;
           }
         }
-        if (Array.isArray(next.runArgs)) {
-          const args = next.runArgs.filter((item) => item !== "--add-host=host.docker.internal:host-gateway");
-          if (args.length !== next.runArgs.length) {
-            next.runArgs = args;
+        if (Array.isArray(parsed.runArgs)) {
+          const args = parsed.runArgs.filter((item) => item !== "--add-host=host.docker.internal:host-gateway");
+          if (args.length !== parsed.runArgs.length) {
+            current2 = applyEdits2(current2, modify2(current2, ["runArgs"], args, formatting));
             changed = true;
           }
         }
         if (changed) {
+          const output = current2.endsWith("\n") ? current2 : `${current2}
+`;
           changes.push({
             path: ".devcontainer/devcontainer.json",
             action: tr("\u0443\u0431\u0440\u0430\u0442\u044C \u043F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D\u0438\u0435 \u043A \u0434\u0435\u043C\u043E\u043D\u0443 \u0445\u043E\u0441\u0442\u0430", "remove the host daemon connection"),
-            remove: () => writeFile3(devcontainer, `${JSON.stringify(next, null, 2)}
-`)
+            remove: () => writeFile3(devcontainer, output)
           });
         }
       }
@@ -2785,6 +2837,15 @@ function openBrowser(url) {
   });
 }
 async function daemon(action, values = {}) {
+  if (isDevContainer() && ["start", "stop", "restart", "install", "uninstall"].includes(action)) {
+    fail(
+      tr(
+        "\u0432 devcontainer \u0434\u0435\u043C\u043E\u043D\u043E\u043C \u0443\u043F\u0440\u0430\u0432\u043B\u044F\u0435\u0442 \u0445\u043E\u0441\u0442: \u0432\u044B\u043F\u043E\u043B\u043D\u0438\u0442\u0435 \u043A\u043E\u043C\u0430\u043D\u0434\u0443 \u043D\u0430 \u0445\u043E\u0441\u0442\u0435",
+        "the daemon is managed by the host in a devcontainer: run this command on the host"
+      ),
+      tr("revdeck daemon restart \u043D\u0430 \u0445\u043E\u0441\u0442\u0435", "revdeck daemon restart on the host")
+    );
+  }
   if (action === "start") {
     const { client: client2, started } = await ensureDaemon({
       ...values.host ? { daemonArgs: ["--host", String(values.host)] } : {}