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

package/dist/src/docker-git/cli/parser-apply.js

@@ -0,0 +1,22 @@
+import { Either } from "effect";
+import {} from "@effect-template/lib/core/domain";
+import { parseProjectDirWithOptions } from "./parser-shared.js";
+// CHANGE: parse "apply" command for existing docker-git projects
+// WHY: update managed docker-git config on the current project/container without creating a new project
+// QUOTE(ТЗ): "Не создавать новый... а прямо в текущем обновить её на актуальную"
+// REF: issue-72-followup-apply-current-config
+// SOURCE: n/a
+// FORMAT THEOREM: forall argv: parseApply(argv) = cmd -> deterministic(cmd)
+// PURITY: CORE
+// EFFECT: Effect<ApplyCommand, ParseError, never>
+// INVARIANT: projectDir is never empty
+// COMPLEXITY: O(n) where n = |argv|
+export const parseApply = (args) => Either.map(parseProjectDirWithOptions(args), ({ projectDir, raw }) => ({
+    _tag: "Apply",
+    projectDir,
+    runUp: raw.up ?? true,
+    gitTokenLabel: raw.gitTokenLabel,
+    codexTokenLabel: raw.codexTokenLabel,
+    claudeTokenLabel: raw.claudeTokenLabel,
+    enableMcpPlaywright: raw.enableMcpPlaywright
+}));

package/dist/src/docker-git/cli/parser-clone.js

@@ -1,17 +1,16 @@
 import { Either } from "effect";
 import { buildCreateCommand, nonEmpty } from "@effect-template/lib/core/command-builders";
-import { defaultTemplateConfig, resolveRepoInput } from "@effect-template/lib/core/domain";
+import { resolveRepoInput } from "@effect-template/lib/core/domain";
 import { parseRawOptions } from "./parser-options.js";
 import { resolveWorkspaceRepoPath, splitPositionalRepo } from "./parser-shared.js";
 const applyCloneDefaults = (raw, rawRepoUrl, resolvedRepo) => {
     const repoPath = resolveWorkspaceRepoPath(resolvedRepo);
-    const sshUser = raw.sshUser?.trim() ?? defaultTemplateConfig.sshUser;
-    const homeDir = `/home/${sshUser}`;
+    const targetHome = "~";
     return {
         ...raw,
         repoUrl: rawRepoUrl,
         outDir: raw.outDir ?? `.docker-git/${repoPath}`,
-        targetDir: raw.targetDir ?? `${homeDir}/${repoPath}`
+        targetDir: raw.targetDir ?? `${targetHome}/workspaces/${repoPath}`
     };
 };
 // CHANGE: parse clone command with positional repo url

package/dist/src/docker-git/cli/parser-options.js

@@ -19,6 +19,9 @@ const valueOptionSpecs = [
     { flag: "--archive", key: "archivePath" },
     { flag: "--mode", key: "scrapMode" },
     { flag: "--label", key: "label" },
+    { flag: "--git-token", key: "gitTokenLabel" },
+    { flag: "--codex-token", key: "codexTokenLabel" },
+    { flag: "--claude-token", key: "claudeTokenLabel" },
     { flag: "--token", key: "token" },
     { flag: "--scopes", key: "scopes" },
     { flag: "--message", key: "message" },
@@ -60,6 +63,9 @@ const valueFlagUpdaters = {
     archivePath: (raw, value) => ({ ...raw, archivePath: value }),
     scrapMode: (raw, value) => ({ ...raw, scrapMode: value }),
     label: (raw, value) => ({ ...raw, label: value }),
+    gitTokenLabel: (raw, value) => ({ ...raw, gitTokenLabel: value }),
+    codexTokenLabel: (raw, value) => ({ ...raw, codexTokenLabel: value }),
+    claudeTokenLabel: (raw, value) => ({ ...raw, claudeTokenLabel: value }),
     token: (raw, value) => ({ ...raw, token: value }),
     scopes: (raw, value) => ({ ...raw, scopes: value }),
     message: (raw, value) => ({ ...raw, message: value }),
@@ -79,30 +85,49 @@ export const applyCommandValueFlag = (raw, token, value) => {
     const update = valueFlagUpdaters[valueSpec.key];
     return Either.right(update(raw, value));
 };
+const parseInlineValueToken = (raw, token) => {
+    const equalIndex = token.indexOf("=");
+    if (equalIndex <= 0 || !token.startsWith("-")) {
+        return null;
+    }
+    const flag = token.slice(0, equalIndex);
+    const inlineValue = token.slice(equalIndex + 1);
+    return applyCommandValueFlag(raw, flag, inlineValue);
+};
+const parseRawOptionsStep = (args, index, raw) => {
+    const token = args[index] ?? "";
+    const inlineApplied = parseInlineValueToken(raw, token);
+    if (inlineApplied !== null) {
+        return Either.isLeft(inlineApplied)
+            ? { _tag: "error", error: inlineApplied.left }
+            : { _tag: "ok", raw: inlineApplied.right, nextIndex: index + 1 };
+    }
+    const booleanApplied = applyCommandBooleanFlag(raw, token);
+    if (booleanApplied !== null) {
+        return { _tag: "ok", raw: booleanApplied, nextIndex: index + 1 };
+    }
+    if (!token.startsWith("-")) {
+        return { _tag: "error", error: { _tag: "UnexpectedArgument", value: token } };
+    }
+    const value = args[index + 1];
+    if (value === undefined) {
+        return { _tag: "error", error: { _tag: "MissingOptionValue", option: token } };
+    }
+    const nextRaw = applyCommandValueFlag(raw, token, value);
+    return Either.isLeft(nextRaw)
+        ? { _tag: "error", error: nextRaw.left }
+        : { _tag: "ok", raw: nextRaw.right, nextIndex: index + 2 };
+};
 export const parseRawOptions = (args) => {
     let index = 0;
     let raw = {};
     while (index < args.length) {
-        const token = args[index] ?? "";
-        const booleanApplied = applyCommandBooleanFlag(raw, token);
-        if (booleanApplied !== null) {
-            raw = booleanApplied;
-            index += 1;
-            continue;
-        }
-        if (!token.startsWith("-")) {
-            return Either.left({ _tag: "UnexpectedArgument", value: token });
-        }
-        const value = args[index + 1];
-        if (value === undefined) {
-            return Either.left({ _tag: "MissingOptionValue", option: token });
-        }
-        const nextRaw = applyCommandValueFlag(raw, token, value);
-        if (Either.isLeft(nextRaw)) {
-            return Either.left(nextRaw.left);
+        const step = parseRawOptionsStep(args, index, raw);
+        if (step._tag === "error") {
+            return Either.left(step.error);
         }
-        raw = nextRaw.right;
-        index += 2;
+        raw = step.raw;
+        index = step.nextIndex;
     }
     return Either.right(raw);
 };

package/dist/src/docker-git/cli/parser.js

@@ -1,5 +1,6 @@
 import { Either, Match } from "effect";
 import {} from "@effect-template/lib/core/domain";
+import { parseApply } from "./parser-apply.js";
 import { parseAttach } from "./parser-attach.js";
 import { parseAuth } from "./parser-auth.js";
 import { parseClone } from "./parser-clone.js";
@@ -42,5 +43,5 @@ export const parseArgs = (args) => {
     };
     return Match.value(command)
         .pipe(Match.when("create", () => parseCreate(rest)), Match.when("init", () => parseCreate(rest)), Match.when("clone", () => parseClone(rest)), Match.when("attach", () => parseAttach(rest)), Match.when("tmux", () => parseAttach(rest)), Match.when("panes", () => parsePanes(rest)), Match.when("terms", () => parsePanes(rest)), Match.when("terminals", () => parsePanes(rest)), Match.when("sessions", () => parseSessions(rest)), Match.when("scrap", () => parseScrap(rest)), Match.when("mcp-playwright", () => parseMcpPlaywright(rest)), Match.when("help", () => Either.right(helpCommand)), Match.when("ps", () => Either.right(statusCommand)), Match.when("status", () => Either.right(statusCommand)), Match.when("down-all", () => Either.right(downAllCommand)), Match.when("stop-all", () => Either.right(downAllCommand)), Match.when("kill-all", () => Either.right(downAllCommand)), Match.when("menu", () => Either.right(menuCommand)), Match.when("ui", () => Either.right(menuCommand)), Match.when("auth", () => parseAuth(rest)))
-        .pipe(Match.when("state", () => parseState(rest)), Match.orElse(() => Either.left(unknownCommandError)));
+        .pipe(Match.when("apply", () => parseApply(rest)), Match.when("state", () => parseState(rest)), Match.orElse(() => Either.left(unknownCommandError)));
 };

package/dist/src/docker-git/cli/usage.js

@@ -2,6 +2,7 @@ import { Match } from "effect";
 export const usageText = `docker-git menu
 docker-git create --repo-url <url> [options]
 docker-git clone <url> [options]
+docker-git apply [<url>] [options]
 docker-git mcp-playwright [<url>] [options]
 docker-git attach [<url>] [options]
 docker-git panes [<url>] [options]
@@ -18,6 +19,7 @@ Commands:
   menu                Interactive menu (default when no args)
   create, init        Generate docker development environment
   clone               Create + run container and clone repo
+  apply               Apply docker-git config to an existing project/container (current dir by default)
   mcp-playwright      Enable Playwright MCP + Chromium sidecar for an existing project dir
   attach, tmux        Open tmux workspace for a docker-git project
   panes, terms        List tmux panes for a docker-git project
@@ -31,7 +33,7 @@ Commands:
 Options:
   --repo-ref <ref>          Git ref/branch (default: main)
   --branch, -b <ref>        Alias for --repo-ref
-  --target-dir <path>       Target dir inside container (create default: /home/dev/app, clone default: /home/dev/<org>/<repo>[/issue-<id>|/pr-<id>])
+  --target-dir <path>       Target dir inside container (create default: /home/dev/app, clone default: ~/workspaces/<org>/<repo>[/issue-<id>|/pr-<id>])
   --ssh-port <port>         Local SSH port (default: 2222)
   --ssh-user <user>         SSH user inside container (default: dev)
   --container-name <name>   Docker container name (default: dg-<repo>)
@@ -46,6 +48,9 @@ Options:
   --project-dir <path>      Project directory for attach (default: .)
   --archive <path>          Scrap snapshot directory (default: .orch/scrap/session)
   --mode <session>          Scrap mode (default: session)
+  --git-token <label>       Token label for clone/create (maps to GITHUB_TOKEN__<LABEL>, example: agiens)
+  --codex-token <label>     Codex auth label for clone/create (maps to CODEX_AUTH_LABEL, example: agien)
+  --claude-token <label>    Claude auth label for clone/create (maps to CLAUDE_AUTH_LABEL, example: agien)
   --wipe | --no-wipe        Wipe workspace before scrap import (default: --wipe)
   --lines <n>               Tail last N lines for sessions logs (default: 200)
   --include-default         Show default/system processes in sessions list

package/dist/src/docker-git/program.js

@@ -1,4 +1,5 @@
 import { createProject } from "@effect-template/lib/usecases/actions";
+import { applyProjectConfig } from "@effect-template/lib/usecases/apply";
 import { authClaudeLogin, authClaudeLogout, authClaudeStatus, authCodexLogin, authCodexLogout, authCodexStatus, authGithubLogin, authGithubLogout, authGithubStatus } from "@effect-template/lib/usecases/auth";
 import { renderError } from "@effect-template/lib/usecases/errors";
 import { mcpPlaywrightUp } from "@effect-template/lib/usecases/mcp-playwright";
@@ -23,7 +24,7 @@ const logWarningAndExit = (error) => pipe(Effect.logWarning(renderError(error)),
 const logErrorAndExit = (error) => pipe(Effect.logError(renderError(error)), Effect.tap(() => setExitCode(1)), Effect.asVoid);
 const handleNonBaseCommand = (command) => Match.value(command)
     .pipe(Match.when({ _tag: "StatePath" }, () => statePath), Match.when({ _tag: "StateInit" }, (cmd) => stateInit(cmd)), Match.when({ _tag: "StateStatus" }, () => stateStatus), Match.when({ _tag: "StatePull" }, () => statePull), Match.when({ _tag: "StateCommit" }, (cmd) => stateCommit(cmd.message)), Match.when({ _tag: "StatePush" }, () => statePush), Match.when({ _tag: "StateSync" }, (cmd) => stateSync(cmd.message)), Match.when({ _tag: "AuthGithubLogin" }, (cmd) => authGithubLogin(cmd)), Match.when({ _tag: "AuthGithubStatus" }, (cmd) => authGithubStatus(cmd)), Match.when({ _tag: "AuthGithubLogout" }, (cmd) => authGithubLogout(cmd)), Match.when({ _tag: "AuthCodexLogin" }, (cmd) => authCodexLogin(cmd)), Match.when({ _tag: "AuthCodexStatus" }, (cmd) => authCodexStatus(cmd)), Match.when({ _tag: "AuthCodexLogout" }, (cmd) => authCodexLogout(cmd)), Match.when({ _tag: "AuthClaudeLogin" }, (cmd) => authClaudeLogin(cmd)), Match.when({ _tag: "AuthClaudeStatus" }, (cmd) => authClaudeStatus(cmd)), Match.when({ _tag: "AuthClaudeLogout" }, (cmd) => authClaudeLogout(cmd)), Match.when({ _tag: "Attach" }, (cmd) => attachTmux(cmd)), Match.when({ _tag: "Panes" }, (cmd) => listTmuxPanes(cmd)), Match.when({ _tag: "SessionsList" }, (cmd) => listTerminalSessions(cmd)), Match.when({ _tag: "SessionsKill" }, (cmd) => killTerminalProcess(cmd)))
-    .pipe(Match.when({ _tag: "SessionsLogs" }, (cmd) => tailTerminalLogs(cmd)), Match.when({ _tag: "ScrapExport" }, (cmd) => exportScrap(cmd)), Match.when({ _tag: "ScrapImport" }, (cmd) => importScrap(cmd)), Match.when({ _tag: "McpPlaywrightUp" }, (cmd) => mcpPlaywrightUp(cmd)), Match.exhaustive);
+    .pipe(Match.when({ _tag: "Apply" }, (cmd) => applyProjectConfig(cmd)), Match.when({ _tag: "SessionsLogs" }, (cmd) => tailTerminalLogs(cmd)), Match.when({ _tag: "ScrapExport" }, (cmd) => exportScrap(cmd)), Match.when({ _tag: "ScrapImport" }, (cmd) => importScrap(cmd)), Match.when({ _tag: "McpPlaywrightUp" }, (cmd) => mcpPlaywrightUp(cmd)), Match.exhaustive);
 // CHANGE: compose CLI program with typed errors and shell effects
 // WHY: keep a thin entry layer over pure parsing and template generation
 // QUOTE(ТЗ): "CLI команду... создавать докер образы"

package/package.json

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

package/src/docker-git/cli/parser-apply.ts

@@ -0,0 +1,28 @@
+import { Either } from "effect"
+
+import { type ApplyCommand, type ParseError } from "@effect-template/lib/core/domain"
+
+import { parseProjectDirWithOptions } from "./parser-shared.js"
+
+// CHANGE: parse "apply" command for existing docker-git projects
+// WHY: update managed docker-git config on the current project/container without creating a new project
+// QUOTE(ТЗ): "Не создавать новый... а прямо в текущем обновить её на актуальную"
+// REF: issue-72-followup-apply-current-config
+// SOURCE: n/a
+// FORMAT THEOREM: forall argv: parseApply(argv) = cmd -> deterministic(cmd)
+// PURITY: CORE
+// EFFECT: Effect<ApplyCommand, ParseError, never>
+// INVARIANT: projectDir is never empty
+// COMPLEXITY: O(n) where n = |argv|
+export const parseApply = (
+  args: ReadonlyArray<string>
+): Either.Either<ApplyCommand, ParseError> =>
+  Either.map(parseProjectDirWithOptions(args), ({ projectDir, raw }) => ({
+    _tag: "Apply",
+    projectDir,
+    runUp: raw.up ?? true,
+    gitTokenLabel: raw.gitTokenLabel,
+    codexTokenLabel: raw.codexTokenLabel,
+    claudeTokenLabel: raw.claudeTokenLabel,
+    enableMcpPlaywright: raw.enableMcpPlaywright
+  }))

package/src/docker-git/cli/parser-clone.ts

@@ -2,12 +2,7 @@ import { Either } from "effect"
 
 import { buildCreateCommand, nonEmpty } from "@effect-template/lib/core/command-builders"
 import type { RawOptions } from "@effect-template/lib/core/command-options"
-import {
-  type Command,
-  defaultTemplateConfig,
-  type ParseError,
-  resolveRepoInput
-} from "@effect-template/lib/core/domain"
+import { type Command, type ParseError, resolveRepoInput } from "@effect-template/lib/core/domain"
 
 import { parseRawOptions } from "./parser-options.js"
 import { resolveWorkspaceRepoPath, splitPositionalRepo } from "./parser-shared.js"
@@ -18,13 +13,12 @@ const applyCloneDefaults = (
   resolvedRepo: ReturnType<typeof resolveRepoInput>
 ): RawOptions => {
   const repoPath = resolveWorkspaceRepoPath(resolvedRepo)
-  const sshUser = raw.sshUser?.trim() ?? defaultTemplateConfig.sshUser
-  const homeDir = `/home/${sshUser}`
+  const targetHome = "~"
   return {
     ...raw,
     repoUrl: rawRepoUrl,
     outDir: raw.outDir ?? `.docker-git/${repoPath}`,
-    targetDir: raw.targetDir ?? `${homeDir}/${repoPath}`
+    targetDir: raw.targetDir ?? `${targetHome}/workspaces/${repoPath}`
   }
 }
 

package/src/docker-git/cli/parser-options.ts

@@ -23,6 +23,9 @@ interface ValueOptionSpec {
     | "archivePath"
     | "scrapMode"
     | "label"
+    | "gitTokenLabel"
+    | "codexTokenLabel"
+    | "claudeTokenLabel"
     | "token"
     | "scopes"
     | "message"
@@ -51,6 +54,9 @@ const valueOptionSpecs: ReadonlyArray<ValueOptionSpec> = [
   { flag: "--archive", key: "archivePath" },
   { flag: "--mode", key: "scrapMode" },
   { flag: "--label", key: "label" },
+  { flag: "--git-token", key: "gitTokenLabel" },
+  { flag: "--codex-token", key: "codexTokenLabel" },
+  { flag: "--claude-token", key: "claudeTokenLabel" },
   { flag: "--token", key: "token" },
   { flag: "--scopes", key: "scopes" },
   { flag: "--message", key: "message" },
@@ -99,6 +105,9 @@ const valueFlagUpdaters: { readonly [K in ValueKey]: (raw: RawOptions, value: st
   archivePath: (raw, value) => ({ ...raw, archivePath: value }),
   scrapMode: (raw, value) => ({ ...raw, scrapMode: value }),
   label: (raw, value) => ({ ...raw, label: value }),
+  gitTokenLabel: (raw, value) => ({ ...raw, gitTokenLabel: value }),
+  codexTokenLabel: (raw, value) => ({ ...raw, codexTokenLabel: value }),
+  claudeTokenLabel: (raw, value) => ({ ...raw, claudeTokenLabel: value }),
   token: (raw, value) => ({ ...raw, token: value }),
   scopes: (raw, value) => ({ ...raw, scopes: value }),
   message: (raw, value) => ({ ...raw, message: value }),
@@ -126,34 +135,68 @@ export const applyCommandValueFlag = (
   return Either.right(update(raw, value))
 }
 
+type ParseRawOptionsStep =
+  | { readonly _tag: "ok"; readonly raw: RawOptions; readonly nextIndex: number }
+  | { readonly _tag: "error"; readonly error: ParseError }
+
+const parseInlineValueToken = (
+  raw: RawOptions,
+  token: string
+): Either.Either<RawOptions, ParseError> | null => {
+  const equalIndex = token.indexOf("=")
+  if (equalIndex <= 0 || !token.startsWith("-")) {
+    return null
+  }
+
+  const flag = token.slice(0, equalIndex)
+  const inlineValue = token.slice(equalIndex + 1)
+  return applyCommandValueFlag(raw, flag, inlineValue)
+}
+
+const parseRawOptionsStep = (
+  args: ReadonlyArray<string>,
+  index: number,
+  raw: RawOptions
+): ParseRawOptionsStep => {
+  const token = args[index] ?? ""
+  const inlineApplied = parseInlineValueToken(raw, token)
+  if (inlineApplied !== null) {
+    return Either.isLeft(inlineApplied)
+      ? { _tag: "error", error: inlineApplied.left }
+      : { _tag: "ok", raw: inlineApplied.right, nextIndex: index + 1 }
+  }
+
+  const booleanApplied = applyCommandBooleanFlag(raw, token)
+  if (booleanApplied !== null) {
+    return { _tag: "ok", raw: booleanApplied, nextIndex: index + 1 }
+  }
+
+  if (!token.startsWith("-")) {
+    return { _tag: "error", error: { _tag: "UnexpectedArgument", value: token } }
+  }
+
+  const value = args[index + 1]
+  if (value === undefined) {
+    return { _tag: "error", error: { _tag: "MissingOptionValue", option: token } }
+  }
+
+  const nextRaw = applyCommandValueFlag(raw, token, value)
+  return Either.isLeft(nextRaw)
+    ? { _tag: "error", error: nextRaw.left }
+    : { _tag: "ok", raw: nextRaw.right, nextIndex: index + 2 }
+}
+
 export const parseRawOptions = (args: ReadonlyArray<string>): Either.Either<RawOptions, ParseError> => {
   let index = 0
   let raw: RawOptions = {}
 
   while (index < args.length) {
-    const token = args[index] ?? ""
-    const booleanApplied = applyCommandBooleanFlag(raw, token)
-    if (booleanApplied !== null) {
-      raw = booleanApplied
-      index += 1
-      continue
-    }
-
-    if (!token.startsWith("-")) {
-      return Either.left({ _tag: "UnexpectedArgument", value: token })
-    }
-
-    const value = args[index + 1]
-    if (value === undefined) {
-      return Either.left({ _tag: "MissingOptionValue", option: token })
-    }
-
-    const nextRaw = applyCommandValueFlag(raw, token, value)
-    if (Either.isLeft(nextRaw)) {
-      return Either.left(nextRaw.left)
+    const step = parseRawOptionsStep(args, index, raw)
+    if (step._tag === "error") {
+      return Either.left(step.error)
     }
-    raw = nextRaw.right
-    index += 2
+    raw = step.raw
+    index = step.nextIndex
   }
 
   return Either.right(raw)

package/src/docker-git/cli/parser.ts

@@ -2,6 +2,7 @@ import { Either, Match } from "effect"
 
 import { type Command, type ParseError } from "@effect-template/lib/core/domain"
 
+import { parseApply } from "./parser-apply.js"
 import { parseAttach } from "./parser-attach.js"
 import { parseAuth } from "./parser-auth.js"
 import { parseClone } from "./parser-clone.js"
@@ -74,6 +75,7 @@ export const parseArgs = (args: ReadonlyArray<string>): Either.Either<Command, P
       Match.when("auth", () => parseAuth(rest))
     )
     .pipe(
+      Match.when("apply", () => parseApply(rest)),
       Match.when("state", () => parseState(rest)),
       Match.orElse(() => Either.left(unknownCommandError))
     )

package/src/docker-git/cli/usage.ts

@@ -5,6 +5,7 @@ import type { ParseError } from "@effect-template/lib/core/domain"
 export const usageText = `docker-git menu
 docker-git create --repo-url <url> [options]
 docker-git clone <url> [options]
+docker-git apply [<url>] [options]
 docker-git mcp-playwright [<url>] [options]
 docker-git attach [<url>] [options]
 docker-git panes [<url>] [options]
@@ -21,6 +22,7 @@ Commands:
   menu                Interactive menu (default when no args)
   create, init        Generate docker development environment
   clone               Create + run container and clone repo
+  apply               Apply docker-git config to an existing project/container (current dir by default)
   mcp-playwright      Enable Playwright MCP + Chromium sidecar for an existing project dir
   attach, tmux        Open tmux workspace for a docker-git project
   panes, terms        List tmux panes for a docker-git project
@@ -34,7 +36,7 @@ Commands:
 Options:
   --repo-ref <ref>          Git ref/branch (default: main)
   --branch, -b <ref>        Alias for --repo-ref
-  --target-dir <path>       Target dir inside container (create default: /home/dev/app, clone default: /home/dev/<org>/<repo>[/issue-<id>|/pr-<id>])
+  --target-dir <path>       Target dir inside container (create default: /home/dev/app, clone default: ~/workspaces/<org>/<repo>[/issue-<id>|/pr-<id>])
   --ssh-port <port>         Local SSH port (default: 2222)
   --ssh-user <user>         SSH user inside container (default: dev)
   --container-name <name>   Docker container name (default: dg-<repo>)
@@ -49,6 +51,9 @@ Options:
   --project-dir <path>      Project directory for attach (default: .)
   --archive <path>          Scrap snapshot directory (default: .orch/scrap/session)
   --mode <session>          Scrap mode (default: session)
+  --git-token <label>       Token label for clone/create (maps to GITHUB_TOKEN__<LABEL>, example: agiens)
+  --codex-token <label>     Codex auth label for clone/create (maps to CODEX_AUTH_LABEL, example: agien)
+  --claude-token <label>    Claude auth label for clone/create (maps to CLAUDE_AUTH_LABEL, example: agien)
   --wipe | --no-wipe        Wipe workspace before scrap import (default: --wipe)
   --lines <n>               Tail last N lines for sessions logs (default: 200)
   --include-default         Show default/system processes in sessions list

package/src/docker-git/program.ts

@@ -1,5 +1,6 @@
 import type { Command, ParseError } from "@effect-template/lib/core/domain"
 import { createProject } from "@effect-template/lib/usecases/actions"
+import { applyProjectConfig } from "@effect-template/lib/usecases/apply"
 import {
   authClaudeLogin,
   authClaudeLogout,
@@ -97,6 +98,7 @@ const handleNonBaseCommand = (command: NonBaseCommand) =>
       Match.when({ _tag: "SessionsKill" }, (cmd) => killTerminalProcess(cmd))
     )
     .pipe(
+      Match.when({ _tag: "Apply" }, (cmd) => applyProjectConfig(cmd)),
       Match.when({ _tag: "SessionsLogs" }, (cmd) => tailTerminalLogs(cmd)),
       Match.when({ _tag: "ScrapExport" }, (cmd) => exportScrap(cmd)),
       Match.when({ _tag: "ScrapImport" }, (cmd) => importScrap(cmd)),

package/tests/docker-git/entrypoint-auth.test.ts

@@ -17,12 +17,23 @@ describe("renderEntrypoint auth bridge", () => {
         "GIT_AUTH_TOKEN=\"${GIT_AUTH_TOKEN:-${GITHUB_TOKEN:-${GH_TOKEN:-}}}\""
       )
       expect(entrypoint).toContain("GITHUB_TOKEN=\"${GITHUB_TOKEN:-${GH_TOKEN:-}}\"")
-      expect(entrypoint).toContain("if [[ -n \"$GH_TOKEN\" || -n \"$GITHUB_TOKEN\" ]]; then")
+      expect(entrypoint).toContain("AUTH_LABEL_RAW=\"${GIT_AUTH_LABEL:-${GITHUB_AUTH_LABEL:-}}\"")
+      expect(entrypoint).toContain("LABELED_GITHUB_TOKEN_KEY=\"GITHUB_TOKEN__$RESOLVED_AUTH_LABEL\"")
+      expect(entrypoint).toContain("LABELED_GIT_TOKEN_KEY=\"GIT_AUTH_TOKEN__$RESOLVED_AUTH_LABEL\"")
+      expect(entrypoint).toContain("if [[ -n \"$EFFECTIVE_GH_TOKEN\" ]]; then")
       expect(entrypoint).toContain(String.raw`printf "export GITHUB_TOKEN=%q\n" "$EFFECTIVE_GITHUB_TOKEN"`)
+      expect(entrypoint).toContain(String.raw`printf "export GH_TOKEN=%q\n" "$EFFECTIVE_GH_TOKEN"`)
+      expect(entrypoint).toContain(String.raw`printf "export GIT_AUTH_TOKEN=%q\n" "$EFFECTIVE_GITHUB_TOKEN"`)
       expect(entrypoint).toContain("docker_git_upsert_ssh_env \"GITHUB_TOKEN\" \"$EFFECTIVE_GITHUB_TOKEN\"")
+      expect(entrypoint).toContain("docker_git_upsert_ssh_env \"GH_TOKEN\" \"$EFFECTIVE_GH_TOKEN\"")
+      expect(entrypoint).toContain("docker_git_upsert_ssh_env \"GIT_AUTH_TOKEN\" \"$EFFECTIVE_GITHUB_TOKEN\"")
       expect(entrypoint).toContain("GIT_CREDENTIAL_HELPER_PATH=\"/usr/local/bin/docker-git-credential-helper\"")
-      expect(entrypoint).toContain("token=\"$GITHUB_TOKEN\"")
-      expect(entrypoint).toContain("token=\"$GH_TOKEN\"")
+      expect(entrypoint).toContain("CLAUDE_REAL_BIN=\"/usr/local/bin/.docker-git-claude-real\"")
+      expect(entrypoint).toContain("CLAUDE_WRAPPER_BIN=\"/usr/local/bin/claude\"")
+      expect(entrypoint).toContain("cat <<'EOF' > \"$CLAUDE_WRAPPER_BIN\"")
+      expect(entrypoint).toContain("CLAUDE_CONFIG_DIR=\"${CLAUDE_CONFIG_DIR:-$HOME/.claude}\"")
+      expect(entrypoint).toContain("token=\"${GITHUB_TOKEN:-}\"")
+      expect(entrypoint).toContain("token=\"${GH_TOKEN:-}\"")
       expect(entrypoint).toContain(String.raw`printf "%s\n" "password=$token"`)
       expect(entrypoint).toContain("git config --global credential.helper")
     }))