@prover-coder-ai/docker-git 1.0.19 → 1.0.21

package/.package.json.release.bak

@@ -1,6 +1,6 @@
 {
   "name": "@prover-coder-ai/docker-git",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "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.21
+
+### Patch Changes
+
+- chore: automated version bump
+
+## 1.0.20
+
+### Patch Changes
+
+- chore: automated version bump
+
 ## 1.0.19
 
 ### Patch Changes

package/dist/main.js

@@ -1,5 +1,5 @@
 import { NodeContext, NodeRuntime } from "@effect/platform-node";
-import { Match, Effect, pipe, Data, Either, Duration, Console } from "effect";
+import { Data, Match, Effect, pipe, Either, Duration, Console } from "effect";
 import * as CommandExecutor from "@effect/platform/CommandExecutor";
 import { ExitCode } from "@effect/platform/CommandExecutor";
 import * as Path from "@effect/platform/Path";
@@ -28,6 +28,36 @@ const resolveCloneRequest = (argv, npmLifecycleEvent) => {
   }
   return emptyRequest;
 };
+class FileExistsError extends Data.TaggedError("FileExistsError") {
+}
+class ConfigNotFoundError extends Data.TaggedError("ConfigNotFoundError") {
+}
+class ConfigDecodeError extends Data.TaggedError("ConfigDecodeError") {
+}
+class InputCancelledError extends Data.TaggedError("InputCancelledError") {
+}
+class InputReadError extends Data.TaggedError("InputReadError") {
+}
+class DockerCommandError extends Data.TaggedError("DockerCommandError") {
+}
+class DockerAccessError extends Data.TaggedError("DockerAccessError") {
+}
+class CloneFailedError extends Data.TaggedError("CloneFailedError") {
+}
+class PortProbeError extends Data.TaggedError("PortProbeError") {
+}
+class CommandFailedError extends Data.TaggedError("CommandFailedError") {
+}
+class AuthError extends Data.TaggedError("AuthError") {
+}
+class ScrapArchiveNotFoundError extends Data.TaggedError("ScrapArchiveNotFoundError") {
+}
+class ScrapArchiveInvalidError extends Data.TaggedError("ScrapArchiveInvalidError") {
+}
+class ScrapTargetDirUnsupportedError extends Data.TaggedError("ScrapTargetDirUnsupportedError") {
+}
+class ScrapWipeRefusedError extends Data.TaggedError("ScrapWipeRefusedError") {
+}
 const trimLeftChar = (value, char) => {
   let start = 0;
   while (start < value.length && value[start] === char) {
@@ -160,36 +190,6 @@ const runCommandCapture = (spec, okExitCodes, onFailure) => Effect.scoped(Effect
   yield* _(ensureExitCode(Number(exitCode), okExitCodes, onFailure));
   return new TextDecoder("utf-8").decode(bytes);
 }));
-class FileExistsError extends Data.TaggedError("FileExistsError") {
-}
-class ConfigNotFoundError extends Data.TaggedError("ConfigNotFoundError") {
-}
-class ConfigDecodeError extends Data.TaggedError("ConfigDecodeError") {
-}
-class InputCancelledError extends Data.TaggedError("InputCancelledError") {
-}
-class InputReadError extends Data.TaggedError("InputReadError") {
-}
-class DockerCommandError extends Data.TaggedError("DockerCommandError") {
-}
-class DockerAccessError extends Data.TaggedError("DockerAccessError") {
-}
-class CloneFailedError extends Data.TaggedError("CloneFailedError") {
-}
-class PortProbeError extends Data.TaggedError("PortProbeError") {
-}
-class CommandFailedError extends Data.TaggedError("CommandFailedError") {
-}
-class AuthError extends Data.TaggedError("AuthError") {
-}
-class ScrapArchiveNotFoundError extends Data.TaggedError("ScrapArchiveNotFoundError") {
-}
-class ScrapArchiveInvalidError extends Data.TaggedError("ScrapArchiveInvalidError") {
-}
-class ScrapTargetDirUnsupportedError extends Data.TaggedError("ScrapTargetDirUnsupportedError") {
-}
-class ScrapWipeRefusedError extends Data.TaggedError("ScrapWipeRefusedError") {
-}
 const successExitCode$1 = Number(ExitCode(0));
 const readCloneRequest = Effect.sync(() => resolveCloneRequest(process.argv.slice(2), process.env["npm_lifecycle_event"]));
 const runDockerGitClone = (args) => Effect.gen(function* (_) {
@@ -215,6 +215,9 @@ const TemplateConfigSchema = Schema.Struct({
   sshPort: Schema.Number.pipe(Schema.int()),
   repoUrl: Schema.String,
   repoRef: Schema.String,
+  gitTokenLabel: Schema.optional(Schema.String),
+  codexAuthLabel: Schema.optional(Schema.String),
+  claudeAuthLabel: Schema.optional(Schema.String),
   targetDir: Schema.String,
   volumeName: Schema.String,
   dockerGitPath: Schema.optionalWith(Schema.String, {
@@ -275,19 +278,38 @@ const runDockerPsNames = (cwd) => pipe(runCommandCapture({
 }, [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 renderDockerAccessActionPlan = (issue) => {
+  const permissionDeniedPlan = [
+    "Action plan:",
+    "1) In the same shell, run: `groups $USER` and make sure group `docker` is present.",
+    "2) Re-login to refresh group memberships and run command again.",
+    "3) If DOCKER_HOST is set to rootless socket, keep running: `export DOCKER_HOST=unix:///run/user/$UID/docker.sock`.",
+    "4) If using a dedicated socket not in /run/user, set DOCKER_HOST explicitly and re-run.",
+    "Tip: this app now auto-tries a rootless socket fallback on first permission error."
+  ];
+  const daemonUnavailablePlan = [
+    "Action plan:",
+    "1) Check daemon status: `systemctl --user status docker` or `systemctl status docker`.",
+    "2) Start daemon: `systemctl --user start docker` (or `systemctl start docker` for system Docker).",
+    "3) Retry command in a new shell."
+  ];
+  return issue === "PermissionDenied" ? permissionDeniedPlan.join("\n") : daemonUnavailablePlan.join("\n");
+};
 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)."
+  "Hint: ensure Docker daemon is running and current user can access /var/run/docker.sock (for example via the docker group).",
+  "Hint: if output above contains 'port is already allocated', retry with a free SSH port via --ssh-port <port> (for example --ssh-port 2235), or stop the conflicting project/container."
 ].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).",
+  renderDockerAccessActionPlan(issue),
   `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 }) => [
+Details: ${message}`), Match.when({ _tag: "ScrapTargetDirUnsupportedError" }, ({ reason, targetDir }) => [
   `Cannot use scrap with targetDir ${targetDir}.`,
   `Reason: ${reason}`,
-  `Hint: scrap currently supports workspaces under /home/${sshUser}/... only.`
+  `Hint: scrap currently supports workspaces under the ssh home directory only (for example: ~/repo).`
 ].join("\n")), Match.when({ _tag: "ScrapWipeRefusedError" }, ({ reason, targetDir }) => [
   `Refusing to wipe workspace for scrap import (targetDir ${targetDir}).`,
   `Reason: ${reason}`,
@@ -502,13 +524,17 @@ Env global: ${config.template.envGlobalPath}
 Env project: ${config.template.envProjectPath}
 Codex auth: ${config.template.codexAuthPath} -> ${config.template.codexHome}`;
 const isDockerGitConfig = (entry) => entry.endsWith("docker-git.json");
-const shouldSkipDir = (entry) => entry === ".git" || entry === ".orch" || entry === ".docker-git";
+const shouldSkipDir = (entry) => entry === ".git" || entry === ".orch" || entry === ".docker-git" || entry === ".cache";
+const isNotFoundStatError = (error) => error._tag === "SystemError" && error.reason === "NotFound";
 const processDockerGitEntry = (fs, path, dir, entry, state) => Effect.gen(function* (_) {
   if (shouldSkipDir(entry)) {
     return;
   }
   const resolved = path.join(dir, entry);
-  const info = yield* _(fs.stat(resolved));
+  const info = yield* _(fs.stat(resolved).pipe(Effect.catchTag("SystemError", (error) => isNotFoundStatError(error) ? Effect.succeed(null) : Effect.fail(error))));
+  if (info === null) {
+    return;
+  }
   if (info.type === "Directory") {
     state.stack.push(resolved);
     return;