@pablozaiden/devbox 0.1.3 → 0.1.5

package/README.md

@@ -12,6 +12,7 @@ It does not modify the original `devcontainer.json`. Instead, it generates a der
 - Publishes the same TCP port on host and container.
 - Mounts the current directory into the container as the workspace.
 - Shares a usable SSH agent socket with the container and copies `known_hosts` into the container.
+- Seeds the container user's global Git `user.name` and `user.email` from the host when available.
 - Runs the [`ssh-server-runner`](https://github.com/PabloZaiden/ssh-server-runner) one-liner inside the devcontainer.
 - Persists the runner credentials on the mounted workspace as a local `.sshcred` file, and keeps SSH host keys in `.devbox-ssh-host-keys/`, so they survive `down` / `rebuild`.
 
@@ -108,6 +109,7 @@ cd examples/smoke-workspace
 - When Docker Desktop host services are available, `devbox` can share the SSH agent without relying on a host-shell `SSH_AUTH_SOCK`.
 - On Docker Desktop, `devbox` prefers the Docker-provided SSH agent socket over the host `SSH_AUTH_SOCK`, which avoids macOS launchd socket mount issues.
 - `--allow-missing-ssh` starts the workspace without mounting an SSH agent and prints a warning instead of failing.
+- When the host already has Git author identity configured, `devbox` copies it into the container user's global Git config if the container does not already define those values.
 
 ## Releasing to npm
 

package/dist/devbox.js

@@ -1305,12 +1305,22 @@ function formatDevcontainerProgressLine(line) {
       return null;
     }
     if (type === "raw" && text === "Container started") {
-      return "Container started.";
+      return "Container started. Finishing devcontainer setup...";
     }
     if (text.startsWith("workspace root: ")) {
       return `Workspace: ${text.slice("workspace root: ".length)}`;
     }
-    if (text === "No user features to update" || text === "Inspecting container" || text.startsWith("Run: ") || text.startsWith("Run in container: ") || text.startsWith("userEnvProbe") || text.startsWith("LifecycleCommandExecutionMap:") || text.startsWith("Exit code ")) {
+    if (text === "Inspecting container") {
+      return "Inspecting container...";
+    }
+    if (text.startsWith("userEnvProbe")) {
+      return "Checking container environment...";
+    }
+    const lifecycleProgress = formatDevcontainerLifecycleProgress(text);
+    if (lifecycleProgress) {
+      return lifecycleProgress;
+    }
+    if (text === "No user features to update" || text.startsWith("Run: ") || text.startsWith("Run in container: ") || text.startsWith("Exit code ")) {
       return null;
     }
     if (level !== undefined && level >= 2) {
@@ -1340,6 +1350,25 @@ function buildAssertConfiguredSshAuthSockScript() {
   ].join(`
 `);
 }
+function buildConfigureGitIdentityScript(input) {
+  const commands = [];
+  if (input.gitUserName) {
+    commands.push('current_git_user_name="$(git config --global --get user.name 2>/dev/null || true)"', 'if [ -z "$current_git_user_name" ]; then', `  git config --global user.name ${quoteShell(input.gitUserName)}`, "fi");
+  }
+  if (input.gitUserEmail) {
+    commands.push('current_git_user_email="$(git config --global --get user.email 2>/dev/null || true)"', 'if [ -z "$current_git_user_email" ]; then', `  git config --global user.email ${quoteShell(input.gitUserEmail)}`, "fi");
+  }
+  if (commands.length === 0) {
+    return null;
+  }
+  return [
+    "if ! command -v git >/dev/null 2>&1; then",
+    "  exit 0",
+    "fi",
+    ...commands
+  ].join(`
+`);
+}
 function buildInteractiveShellScript() {
   return [
     "if command -v bash >/dev/null 2>&1; then",
@@ -1405,13 +1434,21 @@ async function ensureHostEnvironment(options) {
   }
   const hostEnvSshAuthSock = process.env.SSH_AUTH_SOCK?.trim() || undefined;
   const hostEnvSockExists = hostEnvSshAuthSock ? await pathExists(hostEnvSshAuthSock) : false;
-  const dockerDesktopHostServiceAvailable = await hasDockerDesktopHostService();
-  return resolveSshAuthSockSource({
-    hostEnvSshAuthSock,
-    hostEnvSockExists,
-    dockerDesktopHostServiceAvailable,
-    allowMissingSsh: options.allowMissingSsh
-  });
+  const [dockerDesktopHostServiceAvailable, gitUserName, gitUserEmail] = await Promise.all([
+    hasDockerDesktopHostService(),
+    tryGetGitConfig(options.workspacePath, "user.name"),
+    tryGetGitConfig(options.workspacePath, "user.email")
+  ]);
+  return {
+    ...resolveSshAuthSockSource({
+      hostEnvSshAuthSock,
+      hostEnvSockExists,
+      dockerDesktopHostServiceAvailable,
+      allowMissingSsh: options.allowMissingSsh
+    }),
+    gitUserName,
+    gitUserEmail
+  };
 }
 async function ensureGeneratedConfigIgnored(workspacePath, generatedConfigPath) {
   await ensurePathIgnored(workspacePath, generatedConfigPath);
@@ -1517,6 +1554,13 @@ async function copyKnownHosts(containerId) {
   const script = `if [ -f ${quoteShell(KNOWN_HOSTS_TARGET)} ]; then umask 077 && mkdir -p ~/.ssh && cp ${quoteShell(KNOWN_HOSTS_TARGET)} ~/.ssh/known_hosts && chmod 600 ~/.ssh/known_hosts; fi`;
   await devcontainerExec(containerId, script, { quiet: true });
 }
+async function configureGitIdentity(containerId, gitUserName, gitUserEmail) {
+  const script = buildConfigureGitIdentityScript({ gitUserName, gitUserEmail });
+  if (!script) {
+    return;
+  }
+  await devcontainerExec(containerId, script, { quiet: true });
+}
 async function stopManagedSshd(containerId) {
   await devcontainerExec(containerId, buildStopManagedSshdScript(), { quiet: true });
 }
@@ -1642,6 +1686,22 @@ async function tryGetGitTopLevel(workspacePath) {
     return null;
   }
 }
+async function tryGetGitConfig(workspacePath, key) {
+  if (!isExecutableAvailable("git")) {
+    return null;
+  }
+  const result = await execute(["git", "config", "--get", key], {
+    cwd: workspacePath,
+    stdoutMode: "capture",
+    stderrMode: "capture",
+    allowFailure: true
+  });
+  if (result.exitCode !== 0) {
+    return null;
+  }
+  const trimmed = result.stdout.trim();
+  return trimmed.length > 0 ? trimmed : null;
+}
 async function findListeningPids(port) {
   if (isExecutableAvailable("lsof")) {
     const result = await execute(["lsof", "-nP", `-iTCP:${port}`, "-sTCP:LISTEN", "-t"], {
@@ -1713,6 +1773,7 @@ async function consumeStream(stream, mode, useStderr) {
   stream.setEncoding("utf8");
   let captured = "";
   let buffered = "";
+  let lastRenderedProgressLine = null;
   for await (const chunk of stream) {
     const text = typeof chunk === "string" ? chunk : String(chunk);
     captured += text;
@@ -1729,13 +1790,13 @@ async function consumeStream(stream, mode, useStderr) {
     while (newlineIndex >= 0) {
       const line = buffered.slice(0, newlineIndex);
       buffered = buffered.slice(newlineIndex + 1);
-      renderDevcontainerJsonLine(line, writer);
+      lastRenderedProgressLine = renderDevcontainerJsonLine(line, writer, lastRenderedProgressLine);
       newlineIndex = buffered.indexOf(`
 `);
     }
   }
   if (mode === "devcontainer-json" && buffered.length > 0) {
-    renderDevcontainerJsonLine(buffered, writer);
+    renderDevcontainerJsonLine(buffered, writer, lastRenderedProgressLine);
   }
   return captured;
 }
@@ -1771,12 +1832,14 @@ function isExecutablePath(candidate) {
     return false;
   }
 }
-function renderDevcontainerJsonLine(line, writer) {
+function renderDevcontainerJsonLine(line, writer, previousLine) {
   const formatted = formatDevcontainerProgressLine(line);
-  if (formatted) {
+  if (formatted && formatted !== previousLine) {
     writer.write(`${formatted}
 `);
+    return formatted;
   }
+  return previousLine;
 }
 function parseDevcontainerOutcome(stdout) {
   const lines = stdout.split(/\r?\n/).map((line) => line.trim()).filter(Boolean);
@@ -1806,6 +1869,16 @@ ${details}`;
 function stripAnsi(text) {
   return text.replace(/\u001B\[[0-9;]*m/g, "");
 }
+function formatDevcontainerLifecycleProgress(text) {
+  if (!text.startsWith("LifecycleCommandExecutionMap:")) {
+    return null;
+  }
+  const commandMatch = text.match(/\b(initializeCommand|onCreateCommand|updateContentCommand|postCreateCommand|postStartCommand|postAttachCommand)\b/);
+  if (commandMatch) {
+    return `Running ${commandMatch[1]}...`;
+  }
+  return "Running devcontainer lifecycle commands...";
+}
 function looksLikeDevcontainerUserEnvProbeDump(text) {
   const match = text.match(/^([0-9a-f]{8}(?:-[0-9a-f]{4}){3}-[0-9a-f]{12})([\s\S]*)\1$/i);
   if (!match) {
@@ -1840,7 +1913,7 @@ async function main() {
   await handleUpLike(parsed.command, workspacePath, state, parsed.port, parsed.allowMissingSsh, parsed.devcontainerSubpath);
 }
 async function handleUpLike(command, workspacePath, state, explicitPort, allowMissingSsh, devcontainerSubpath) {
-  const environment = await ensureHostEnvironment({ allowMissingSsh });
+  const environment = await ensureHostEnvironment({ allowMissingSsh, workspacePath });
   const port = resolvePort(command, explicitPort, state);
   const knownHostsPath = await getKnownHostsPath();
   const discovered = await discoverDevcontainerConfig(workspacePath, devcontainerSubpath);
@@ -1899,6 +1972,10 @@ async function handleUpLike(command, workspacePath, state, explicitPort, allowMi
     await assertConfiguredSshAuthSockAvailable(upResult.containerId);
   }
   await copyKnownHosts(upResult.containerId);
+  if (environment.gitUserName || environment.gitUserEmail) {
+    console.log("Syncing Git author identity from the host into the devcontainer...");
+    await configureGitIdentity(upResult.containerId, environment.gitUserName, environment.gitUserEmail);
+  }
   await stopManagedSshd(upResult.containerId);
   await restoreRunnerHostKeys(upResult.containerId, remoteWorkspaceFolder);
   console.log("Installing and starting the SSH server inside the container (first run can take a bit)...");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pablozaiden/devbox",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "type": "module",
   "description": "CLI to run and expose a devcontainer with SSH agent sharing and a forwarded ssh-server-runner port.",
   "repository": {