@prover-coder-ai/docker-git 1.0.10 → 1.0.12

package/.package.json.release.bak

@@ -1,6 +1,6 @@
 {
   "name": "@prover-coder-ai/docker-git",
-  "version": "1.0.10",
+  "version": "1.0.12",
   "description": "Minimal Vite-powered TypeScript console starter using Effect",
   "main": "dist/src/docker-git/main.js",
   "bin": {

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @prover-coder-ai/docker-git
 
+## 1.0.12
+
+### Patch Changes
+
+- chore: automated version bump
+
+## 1.0.11
+
+### Patch Changes
+
+- chore: automated version bump
+
 ## 1.0.10
 
 ### Patch Changes

package/README.md

@@ -93,6 +93,9 @@ Disable sharing (per-project auth):
 Enable during create/clone:
 - Add `--mcp-playwright`
 
+Enable for an existing project directory (preserves `.orch/env/project.env` and volumes):
+- `docker-git mcp-playwright [<url>] [--project-dir <path>]`
+
 This will:
 - Create a Chromium sidecar container: `dg-<repo>-browser`
 - Configure Codex MCP server `playwright` inside the dev container
@@ -119,7 +122,8 @@ Common toggles:
 MCP errors in `codex` UI:
 - `No such file or directory (os error 2)` for `playwright`:
   - `~/.codex/config.toml` contains `[mcp_servers.playwright]`, but the container was created without `--mcp-playwright`.
-  - Fix: recreate with `--force --mcp-playwright` (or remove the block from `config.toml`).
+  - Fix (recommended): run `docker-git mcp-playwright [<url>]` to enable it for the existing project.
+  - Fix (recreate): recreate with `--force-env --mcp-playwright` (keeps volumes) or `--force --mcp-playwright` (wipes volumes).
 - `handshaking ... initialize response`:
   - The configured MCP command is not a real MCP server (example: `command="echo"`).
 

package/dist/main.js

@@ -273,6 +273,51 @@ const runDockerPsNames = (cwd) => pipe(runCommandCapture({
   command: "docker",
   args: ["ps", "--format", "{{.Names}}"]
 }, [Number(ExitCode(0))], (exitCode) => new CommandFailedError({ command: "docker ps", exitCode })), Effect.map((output) => output.split(/\r?\n/).map((line) => line.trim()).filter((line) => line.length > 0)));
+const isParseError = (error) => error._tag === "UnknownCommand" || error._tag === "UnknownOption" || error._tag === "MissingOptionValue" || error._tag === "MissingRequiredOption" || error._tag === "InvalidOption" || error._tag === "UnexpectedArgument";
+const renderDockerAccessHeadline = (issue) => issue === "PermissionDenied" ? "Cannot access Docker daemon socket: permission denied." : "Cannot connect to Docker daemon.";
+const renderPrimaryError = (error) => Match.value(error).pipe(Match.when({ _tag: "FileExistsError" }, ({ path }) => `File already exists: ${path} (use --force to overwrite)`), Match.when({ _tag: "DockerCommandError" }, ({ exitCode }) => [
+  `docker compose failed with exit code ${exitCode}`,
+  "Hint: ensure Docker daemon is running and current user can access /var/run/docker.sock (for example via the docker group)."
+].join("\n")), Match.when({ _tag: "DockerAccessError" }, ({ details, issue }) => [
+  renderDockerAccessHeadline(issue),
+  "Hint: ensure Docker daemon is running and current user can access the docker socket.",
+  "Hint: if you use rootless Docker, set DOCKER_HOST to your user socket (for example unix:///run/user/$UID/docker.sock).",
+  `Details: ${details}`
+].join("\n")), Match.when({ _tag: "CloneFailedError" }, ({ repoRef, repoUrl, targetDir }) => `Clone failed for ${repoUrl} (${repoRef}) into ${targetDir}`), Match.when({ _tag: "PortProbeError" }, ({ message, port }) => `SSH port check failed for ${port}: ${message}`), Match.when({ _tag: "CommandFailedError" }, ({ command, exitCode }) => `${command} failed with exit code ${exitCode}`), Match.when({ _tag: "ScrapArchiveNotFoundError" }, ({ path }) => `Scrap archive not found: ${path} (run docker-git scrap export first)`), Match.when({ _tag: "ScrapArchiveInvalidError" }, ({ message, path }) => `Invalid scrap archive: ${path}
+Details: ${message}`), Match.when({ _tag: "ScrapTargetDirUnsupportedError" }, ({ reason, sshUser, targetDir }) => [
+  `Cannot use scrap with targetDir ${targetDir}.`,
+  `Reason: ${reason}`,
+  `Hint: scrap currently supports workspaces under /home/${sshUser}/... only.`
+].join("\n")), Match.when({ _tag: "ScrapWipeRefusedError" }, ({ reason, targetDir }) => [
+  `Refusing to wipe workspace for scrap import (targetDir ${targetDir}).`,
+  `Reason: ${reason}`,
+  "Hint: re-run with --no-wipe, or set a narrower --target-dir when creating the project."
+].join("\n")), Match.when({ _tag: "AuthError" }, ({ message }) => message), Match.orElse(() => null));
+const renderConfigError = (error) => {
+  if (error._tag === "ConfigNotFoundError") {
+    return `docker-git.json not found: ${error.path} (run docker-git create in that directory)`;
+  }
+  if (error._tag === "ConfigDecodeError") {
+    return `Invalid docker-git.json at ${error.path}: ${error.message}`;
+  }
+  return null;
+};
+const renderInputError = (error) => {
+  if (error._tag === "InputCancelledError") {
+    return "Input cancelled.";
+  }
+  if (error._tag === "InputReadError") {
+    return `Input error: ${error.message}`;
+  }
+  return null;
+};
+const renderNonParseError = (error) => renderPrimaryError(error) ?? renderConfigError(error) ?? renderInputError(error) ?? error.message;
+const renderError = (error) => {
+  if (isParseError(error)) {
+    return formatParseError(error);
+  }
+  return renderNonParseError(error);
+};
 const splitLines = (input) => input.replaceAll("\r\n", "\n").replaceAll("\r", "\n").split("\n");
 const isAlpha = (char) => {
   const code = char.codePointAt(0) ?? 0;
@@ -456,85 +501,6 @@ Authorized keys: ${authorizedKeysPath}${authorizedKeysExists ? "" : " (missing)"
 Env global: ${config.template.envGlobalPath}
 Env project: ${config.template.envProjectPath}
 Codex auth: ${config.template.codexAuthPath} -> ${config.template.codexHome}`;
-const successExitCode = Number(ExitCode(0));
-const gitBaseEnv = {
-  // Avoid blocking on interactive credential prompts in CI / TUI contexts.
-  GIT_TERMINAL_PROMPT: "0"
-};
-const git = (cwd, args, env = gitBaseEnv) => runCommandWithExitCodes({ cwd, command: "git", args, env }, [successExitCode], (exitCode) => new CommandFailedError({ command: `git ${args[0] ?? ""}`, exitCode }));
-const gitExitCode = (cwd, args, env = gitBaseEnv) => runCommandExitCode({ cwd, command: "git", args, env });
-const gitCapture = (cwd, args, env = gitBaseEnv) => runCommandCapture({ cwd, command: "git", args, env }, [successExitCode], (exitCode) => new CommandFailedError({ command: `git ${args[0] ?? ""}`, exitCode }));
-const githubTokenKey = "GITHUB_TOKEN";
-const isGithubHttpsRemote = (url) => /^https:\/\/github\.com\//.test(url.trim());
-const resolveTokenFromProcessEnv = () => {
-  const github = process.env["GITHUB_TOKEN"];
-  if (github !== void 0) {
-    const trimmed = github.trim();
-    if (trimmed.length > 0) {
-      return trimmed;
-    }
-  }
-  const gh = process.env["GH_TOKEN"];
-  if (gh !== void 0) {
-    const trimmed = gh.trim();
-    if (trimmed.length > 0) {
-      return trimmed;
-    }
-  }
-  return null;
-};
-const findTokenInEnvEntries = (entries) => {
-  const directEntry = entries.find((e) => e.key === githubTokenKey);
-  if (directEntry !== void 0) {
-    const direct = directEntry.value.trim();
-    if (direct.length > 0) {
-      return direct;
-    }
-  }
-  const labeledEntry = entries.find((e) => e.key.startsWith("GITHUB_TOKEN__"));
-  if (labeledEntry !== void 0) {
-    const labeled = labeledEntry.value.trim();
-    if (labeled.length > 0) {
-      return labeled;
-    }
-  }
-  return null;
-};
-const resolveGithubToken = (fs, path, root) => Effect.gen(function* (_) {
-  const fromEnv = resolveTokenFromProcessEnv();
-  if (fromEnv !== null) {
-    return fromEnv;
-  }
-  const envPath = path.join(root, ".orch", "env", "global.env");
-  const exists = yield* _(fs.exists(envPath));
-  if (!exists) {
-    return null;
-  }
-  const text = yield* _(fs.readFileString(envPath));
-  return findTokenInEnvEntries(parseEnvEntries(text));
-});
-const withGithubAskpassEnv = (token, use) => Effect.scoped(Effect.gen(function* (_) {
-  const fs = yield* _(FileSystem.FileSystem);
-  const askpassPath = yield* _(fs.makeTempFileScoped({ prefix: "docker-git-askpass-" }));
-  const contents = [
-    "#!/bin/sh",
-    'case "$1" in',
-    '  *Username*) echo "x-access-token" ;;',
-    '  *Password*) echo "${DOCKER_GIT_GITHUB_TOKEN}" ;;',
-    '  *) echo "${DOCKER_GIT_GITHUB_TOKEN}" ;;',
-    "esac",
-    ""
-  ].join("\n");
-  yield* _(fs.writeFileString(askpassPath, contents));
-  yield* _(fs.chmod(askpassPath, 448));
-  const env = {
-    ...gitBaseEnv,
-    DOCKER_GIT_GITHUB_TOKEN: token,
-    GIT_ASKPASS: askpassPath,
-    GIT_ASKPASS_REQUIRE: "force"
-  };
-  return yield* _(use(env));
-}));
 const isDockerGitConfig = (entry) => entry.endsWith("docker-git.json");
 const shouldSkipDir = (entry) => entry === ".git" || entry === ".orch";
 const processDockerGitEntry = (fs, path, dir, entry, state) => Effect.gen(function* (_) {
@@ -571,92 +537,6 @@ const findDockerGitConfigPaths = (fs, path, rootDir) => Effect.gen(function* (_)
   }
   return results;
 });
-const resolveStateRoot = (path, cwd) => path.resolve(defaultProjectsRoot(cwd));
-Effect.gen(function* (_) {
-  const path = yield* _(Path.Path);
-  const cwd = process.cwd();
-  const root = resolveStateRoot(path, cwd);
-  yield* _(Effect.log(root));
-}).pipe(Effect.asVoid);
-Effect.gen(function* (_) {
-  const path = yield* _(Path.Path);
-  const root = resolveStateRoot(path, process.cwd());
-  const output = yield* _(gitCapture(root, ["status", "-sb", "--porcelain=v1"], gitBaseEnv));
-  yield* _(Effect.log(output.trim().length > 0 ? output.trimEnd() : "(clean)"));
-}).pipe(Effect.asVoid);
-Effect.gen(function* (_) {
-  const fs = yield* _(FileSystem.FileSystem);
-  const path = yield* _(Path.Path);
-  const root = resolveStateRoot(path, process.cwd());
-  const originUrlExit = yield* _(gitExitCode(root, ["remote", "get-url", "origin"], gitBaseEnv));
-  if (originUrlExit !== successExitCode) {
-    yield* _(git(root, ["pull", "--rebase"], gitBaseEnv));
-    return;
-  }
-  const originUrl = yield* _(gitCapture(root, ["remote", "get-url", "origin"], gitBaseEnv).pipe(Effect.map((value) => value.trim())));
-  const token = yield* _(resolveGithubToken(fs, path, root));
-  const effect = token && token.length > 0 && isGithubHttpsRemote(originUrl) ? withGithubAskpassEnv(token, (env) => git(root, ["pull", "--rebase"], env)) : git(root, ["pull", "--rebase"], gitBaseEnv);
-  yield* _(effect);
-}).pipe(Effect.asVoid);
-Effect.gen(function* (_) {
-  const fs = yield* _(FileSystem.FileSystem);
-  const path = yield* _(Path.Path);
-  const root = resolveStateRoot(path, process.cwd());
-  const originUrlExit = yield* _(gitExitCode(root, ["remote", "get-url", "origin"], gitBaseEnv));
-  if (originUrlExit !== successExitCode) {
-    yield* _(git(root, ["push", "-u", "origin", "HEAD"], gitBaseEnv));
-    return;
-  }
-  const originUrl = yield* _(gitCapture(root, ["remote", "get-url", "origin"], gitBaseEnv).pipe(Effect.map((value) => value.trim())));
-  const token = yield* _(resolveGithubToken(fs, path, root));
-  const effect = token && token.length > 0 && isGithubHttpsRemote(originUrl) ? withGithubAskpassEnv(token, (env) => git(root, ["push", "-u", "origin", "HEAD"], env)) : git(root, ["push", "-u", "origin", "HEAD"], gitBaseEnv);
-  yield* _(effect);
-}).pipe(Effect.asVoid);
-const isParseError = (error) => error._tag === "UnknownCommand" || error._tag === "UnknownOption" || error._tag === "MissingOptionValue" || error._tag === "MissingRequiredOption" || error._tag === "InvalidOption" || error._tag === "UnexpectedArgument";
-const renderDockerAccessHeadline = (issue) => issue === "PermissionDenied" ? "Cannot access Docker daemon socket: permission denied." : "Cannot connect to Docker daemon.";
-const renderPrimaryError = (error) => Match.value(error).pipe(Match.when({ _tag: "FileExistsError" }, ({ path }) => `File already exists: ${path} (use --force to overwrite)`), Match.when({ _tag: "DockerCommandError" }, ({ exitCode }) => [
-  `docker compose failed with exit code ${exitCode}`,
-  "Hint: ensure Docker daemon is running and current user can access /var/run/docker.sock (for example via the docker group)."
-].join("\n")), Match.when({ _tag: "DockerAccessError" }, ({ details, issue }) => [
-  renderDockerAccessHeadline(issue),
-  "Hint: ensure Docker daemon is running and current user can access the docker socket.",
-  "Hint: if you use rootless Docker, set DOCKER_HOST to your user socket (for example unix:///run/user/$UID/docker.sock).",
-  `Details: ${details}`
-].join("\n")), Match.when({ _tag: "CloneFailedError" }, ({ repoRef, repoUrl, targetDir }) => `Clone failed for ${repoUrl} (${repoRef}) into ${targetDir}`), Match.when({ _tag: "PortProbeError" }, ({ message, port }) => `SSH port check failed for ${port}: ${message}`), Match.when({ _tag: "CommandFailedError" }, ({ command, exitCode }) => `${command} failed with exit code ${exitCode}`), Match.when({ _tag: "ScrapArchiveNotFoundError" }, ({ path }) => `Scrap archive not found: ${path} (run docker-git scrap export first)`), Match.when({ _tag: "ScrapArchiveInvalidError" }, ({ message, path }) => `Invalid scrap archive: ${path}
-Details: ${message}`), Match.when({ _tag: "ScrapTargetDirUnsupportedError" }, ({ reason, sshUser, targetDir }) => [
-  `Cannot use scrap with targetDir ${targetDir}.`,
-  `Reason: ${reason}`,
-  `Hint: scrap currently supports workspaces under /home/${sshUser}/... only.`
-].join("\n")), Match.when({ _tag: "ScrapWipeRefusedError" }, ({ reason, targetDir }) => [
-  `Refusing to wipe workspace for scrap import (targetDir ${targetDir}).`,
-  `Reason: ${reason}`,
-  "Hint: re-run with --no-wipe, or set a narrower --target-dir when creating the project."
-].join("\n")), Match.when({ _tag: "AuthError" }, ({ message }) => message), Match.orElse(() => null));
-const renderConfigError = (error) => {
-  if (error._tag === "ConfigNotFoundError") {
-    return `docker-git.json not found: ${error.path} (run docker-git create in that directory)`;
-  }
-  if (error._tag === "ConfigDecodeError") {
-    return `Invalid docker-git.json at ${error.path}: ${error.message}`;
-  }
-  return null;
-};
-const renderInputError = (error) => {
-  if (error._tag === "InputCancelledError") {
-    return "Input cancelled.";
-  }
-  if (error._tag === "InputReadError") {
-    return `Input error: ${error.message}`;
-  }
-  return null;
-};
-const renderNonParseError = (error) => renderPrimaryError(error) ?? renderConfigError(error) ?? renderInputError(error) ?? error.message;
-const renderError = (error) => {
-  if (isParseError(error)) {
-    return formatParseError(error);
-  }
-  return renderNonParseError(error);
-};
 const sshOptions = "-tt -Y -o LogLevel=ERROR -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null";
 const buildSshCommand = (config, sshKey) => sshKey === null ? `ssh ${sshOptions} -p ${config.sshPort} ${config.sshUser}@localhost` : `ssh -i ${sshKey} ${sshOptions} -p ${config.sshPort} ${config.sshUser}@localhost`;
 const loadProjectBase = (configPath) => Effect.gen(function* (_) {
@@ -773,6 +653,126 @@ const withProjectIndexAndSsh = (run) => pipe(loadProjectIndex(), Effect.flatMap(
   const sshKey = yield* _(findSshPrivateKey(fs, path, process.cwd()));
   return yield* _(run(index, sshKey));
 })));
+const successExitCode = Number(ExitCode(0));
+const gitBaseEnv = {
+  // Avoid blocking on interactive credential prompts in CI / TUI contexts.
+  GIT_TERMINAL_PROMPT: "0"
+};
+const git = (cwd, args, env = gitBaseEnv) => runCommandWithExitCodes({ cwd, command: "git", args, env }, [successExitCode], (exitCode) => new CommandFailedError({ command: `git ${args[0] ?? ""}`, exitCode }));
+const gitExitCode = (cwd, args, env = gitBaseEnv) => runCommandExitCode({ cwd, command: "git", args, env });
+const gitCapture = (cwd, args, env = gitBaseEnv) => runCommandCapture({ cwd, command: "git", args, env }, [successExitCode], (exitCode) => new CommandFailedError({ command: `git ${args[0] ?? ""}`, exitCode }));
+const githubTokenKey = "GITHUB_TOKEN";
+const isGithubHttpsRemote = (url) => /^https:\/\/github\.com\//.test(url.trim());
+const resolveTokenFromProcessEnv = () => {
+  const github = process.env["GITHUB_TOKEN"];
+  if (github !== void 0) {
+    const trimmed = github.trim();
+    if (trimmed.length > 0) {
+      return trimmed;
+    }
+  }
+  const gh = process.env["GH_TOKEN"];
+  if (gh !== void 0) {
+    const trimmed = gh.trim();
+    if (trimmed.length > 0) {
+      return trimmed;
+    }
+  }
+  return null;
+};
+const findTokenInEnvEntries = (entries) => {
+  const directEntry = entries.find((e) => e.key === githubTokenKey);
+  if (directEntry !== void 0) {
+    const direct = directEntry.value.trim();
+    if (direct.length > 0) {
+      return direct;
+    }
+  }
+  const labeledEntry = entries.find((e) => e.key.startsWith("GITHUB_TOKEN__"));
+  if (labeledEntry !== void 0) {
+    const labeled = labeledEntry.value.trim();
+    if (labeled.length > 0) {
+      return labeled;
+    }
+  }
+  return null;
+};
+const resolveGithubToken = (fs, path, root) => Effect.gen(function* (_) {
+  const fromEnv = resolveTokenFromProcessEnv();
+  if (fromEnv !== null) {
+    return fromEnv;
+  }
+  const envPath = path.join(root, ".orch", "env", "global.env");
+  const exists = yield* _(fs.exists(envPath));
+  if (!exists) {
+    return null;
+  }
+  const text = yield* _(fs.readFileString(envPath));
+  return findTokenInEnvEntries(parseEnvEntries(text));
+});
+const withGithubAskpassEnv = (token, use) => Effect.scoped(Effect.gen(function* (_) {
+  const fs = yield* _(FileSystem.FileSystem);
+  const askpassPath = yield* _(fs.makeTempFileScoped({ prefix: "docker-git-askpass-" }));
+  const contents = [
+    "#!/bin/sh",
+    'case "$1" in',
+    '  *Username*) echo "x-access-token" ;;',
+    '  *Password*) echo "${DOCKER_GIT_GITHUB_TOKEN}" ;;',
+    '  *) echo "${DOCKER_GIT_GITHUB_TOKEN}" ;;',
+    "esac",
+    ""
+  ].join("\n");
+  yield* _(fs.writeFileString(askpassPath, contents));
+  yield* _(fs.chmod(askpassPath, 448));
+  const env = {
+    ...gitBaseEnv,
+    DOCKER_GIT_GITHUB_TOKEN: token,
+    GIT_ASKPASS: askpassPath,
+    GIT_ASKPASS_REQUIRE: "force"
+  };
+  return yield* _(use(env));
+}));
+const resolveStateRoot = (path, cwd) => path.resolve(defaultProjectsRoot(cwd));
+Effect.gen(function* (_) {
+  const path = yield* _(Path.Path);
+  const cwd = process.cwd();
+  const root = resolveStateRoot(path, cwd);
+  yield* _(Effect.log(root));
+}).pipe(Effect.asVoid);
+Effect.gen(function* (_) {
+  const path = yield* _(Path.Path);
+  const root = resolveStateRoot(path, process.cwd());
+  const output = yield* _(gitCapture(root, ["status", "-sb", "--porcelain=v1"], gitBaseEnv));
+  yield* _(Effect.log(output.trim().length > 0 ? output.trimEnd() : "(clean)"));
+}).pipe(Effect.asVoid);
+Effect.gen(function* (_) {
+  const fs = yield* _(FileSystem.FileSystem);
+  const path = yield* _(Path.Path);
+  const root = resolveStateRoot(path, process.cwd());
+  const originUrlExit = yield* _(gitExitCode(root, ["remote", "get-url", "origin"], gitBaseEnv));
+  if (originUrlExit !== successExitCode) {
+    yield* _(git(root, ["pull", "--rebase"], gitBaseEnv));
+    return;
+  }
+  const originUrl = yield* _(gitCapture(root, ["remote", "get-url", "origin"], gitBaseEnv).pipe(Effect.map((value) => value.trim())));
+  const token = yield* _(resolveGithubToken(fs, path, root));
+  const effect = token && token.length > 0 && isGithubHttpsRemote(originUrl) ? withGithubAskpassEnv(token, (env) => git(root, ["pull", "--rebase"], env)) : git(root, ["pull", "--rebase"], gitBaseEnv);
+  yield* _(effect);
+}).pipe(Effect.asVoid);
+Effect.gen(function* (_) {
+  const fs = yield* _(FileSystem.FileSystem);
+  const path = yield* _(Path.Path);
+  const root = resolveStateRoot(path, process.cwd());
+  const originUrlExit = yield* _(gitExitCode(root, ["remote", "get-url", "origin"], gitBaseEnv));
+  if (originUrlExit !== successExitCode) {
+    yield* _(git(root, ["push", "-u", "origin", "HEAD"], gitBaseEnv));
+    return;
+  }
+  const originUrl = yield* _(gitCapture(root, ["remote", "get-url", "origin"], gitBaseEnv).pipe(Effect.map((value) => value.trim())));
+  const token = yield* _(resolveGithubToken(fs, path, root));
+  const effect = token && token.length > 0 && isGithubHttpsRemote(originUrl) ? withGithubAskpassEnv(token, (env) => git(root, ["push", "-u", "origin", "HEAD"], env)) : git(root, ["push", "-u", "origin", "HEAD"], gitBaseEnv);
+  yield* _(effect);
+}).pipe(Effect.asVoid);
 pipe(loadProjectIndex(), Effect.flatMap((index) => index === null ? Effect.void : forEachProjectStatus(index.configPaths, (status) => pipe(Effect.log(renderProjectStatusHeader(status)), Effect.zipRight(runDockerComposeDown(status.projectDir).pipe(Effect.catchTag("DockerCommandError", (error) => Effect.logWarning(`docker compose down failed for ${status.projectDir}: ${renderError(error)}`))))))), Effect.asVoid);
 const listProjects = pipe(withProjectIndexAndSsh((index, sshKey) => Effect.gen(function* (_) {
   const available = [];