@prover-coder-ai/docker-git 1.0.15 → 1.0.17

package/.package.json.release.bak

@@ -1,6 +1,6 @@
 {
   "name": "@prover-coder-ai/docker-git",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "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.17
+
+### Patch Changes
+
+- chore: automated version bump
+
+## 1.0.16
+
+### Patch Changes
+
+- chore: automated version bump
+
 ## 1.0.15
 
 ### Patch Changes

package/README.md

@@ -59,10 +59,10 @@ Structure (simplified):
   authorized_keys
   .orch/
     env/
-      global.env
+      global.env      # shared tokens/keys (GitHub, Git, Claude) with labels
     auth/
-      codex/          # shared Codex auth cache (credentials)
-      gh/             # shared GitHub auth (optional)
+      codex/          # shared Codex auth/config (when CODEX_SHARE_AUTH=1)
+      gh/             # GH CLI auth cache for OAuth login container
   <owner>/<repo>/
     docker-compose.yml
     Dockerfile
@@ -70,7 +70,6 @@ Structure (simplified):
     docker-git.json
     .orch/
       env/
-        global.env    # copied/synced from root .orch/env/global.env
         project.env   # per-project env knobs (see below)
       auth/
         codex/        # project-local Codex state (sessions/logs/tmp/etc)
@@ -79,7 +78,7 @@ Structure (simplified):
 ## Codex Auth: Shared Credentials, Per-Project Sessions
 
 Default behavior:
-- Shared credentials live in `/home/dev/.codex-shared/auth.json` (mounted from projects root).
+- Shared credentials live in `/home/dev/.codex-shared/auth.json` (mounted from `<projectsRoot>/.orch/auth/codex`).
 - Each project keeps its own Codex state under `/home/dev/.codex/` (mounted from project `.orch/auth/codex`).
 - The entrypoint links `/home/dev/.codex/auth.json -> /home/dev/.codex-shared/auth.json`.
 
@@ -160,7 +159,7 @@ Clone auth error (`Invalid username or token`):
   ```bash
   pnpm run docker-git auth github status
   pnpm run docker-git auth github logout
-  pnpm run docker-git auth github login --token '<GITHUB_TOKEN>'
+  pnpm run docker-git auth github login --web
   pnpm run docker-git auth github status
   ```
 - Token requirements:

package/dist/main.js

@@ -702,13 +702,24 @@ const resolveGithubToken = (fs, path, root) => Effect.gen(function* (_) {
   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 candidates = [
+    // Canonical layout: ~/.docker-git/.orch/env/global.env
+    path.join(root, ".orch", "env", "global.env"),
+    // Legacy layout (kept for backward compatibility): ~/.docker-git/secrets/global.env
+    path.join(root, "secrets", "global.env")
+  ];
+  for (const envPath of candidates) {
+    const exists = yield* _(fs.exists(envPath));
+    if (!exists) {
+      continue;
+    }
+    const text = yield* _(fs.readFileString(envPath));
+    const token = findTokenInEnvEntries(parseEnvEntries(text));
+    if (token !== null) {
+      return token;
+    }
   }
-  const text = yield* _(fs.readFileString(envPath));
-  return findTokenInEnvEntries(parseEnvEntries(text));
+  return null;
 });
 const withGithubAskpassEnv = (token, use) => Effect.scoped(Effect.gen(function* (_) {
   const fs = yield* _(FileSystem.FileSystem);
@@ -770,7 +781,7 @@ Effect.gen(function* (_) {
   }
   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);
+  const effect = token && token.length > 0 && isGithubHttpsRemote(originUrl) ? withGithubAskpassEnv(token, (env) => pipe(gitCapture(root, ["rev-parse", "--abbrev-ref", "HEAD"], env), Effect.map((value) => value.trim()), Effect.map((branch) => branch === "HEAD" ? "main" : branch), Effect.flatMap((branch) => git(root, ["push", "--no-verify", originUrl, `HEAD:refs/heads/${branch}`], env)))) : git(root, ["push", "--no-verify", "-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);
@@ -818,6 +829,12 @@ Effect.asVoid(withProjectIndexAndSsh((index, sshKey) => forEachProjectStatus(ind
   onSuccess: () => Effect.void
 })))))));
 Duration.seconds(1);
+const ClaudeAuthStatusSchema = Schema.Struct({
+  loggedIn: Schema.Boolean,
+  authMethod: Schema.optional(Schema.String),
+  apiProvider: Schema.optional(Schema.String)
+});
+Schema.parseJson(ClaudeAuthStatusSchema);
 const ChunkManifestSchema = Schema.Struct({
   original: Schema.String,
   originalSize: Schema.Number,