Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ pnpm run docker-git clone https://github.com/agiens/crm/tree/vova-fork --force
# Clone an issue URL (creates isolated workspace + issue branch)
pnpm run docker-git clone https://github.com/agiens/crm/issues/123 --force

# Open an existing docker-git project by repo/issue URL (runs up + tmux attach)
pnpm run docker-git open https://github.com/agiens/crm/issues/123

# Reset only project env defaults (keep workspace volume/data)
pnpm run docker-git clone https://github.com/agiens/crm/issues/123 --force-env

Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"changeset-publish": "node -e \"if (!process.env.NPM_TOKEN) { console.log('Skipping publish: NPM_TOKEN is not set'); process.exit(0); }\" && changeset publish",
"changeset-version": "changeset version",
"clone": "pnpm --filter ./packages/app build && node packages/app/dist/main.js clone",
"open": "pnpm --filter ./packages/app build && node packages/app/dist/main.js open",
"docker-git": "pnpm --filter ./packages/app build:docker-git && node packages/app/dist/src/docker-git/main.js",
"e2e": "bash scripts/e2e/run-all.sh",
"e2e:clone-cache": "bash scripts/e2e/clone-cache.sh",
Expand Down
1 change: 1 addition & 0 deletions packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"build:docker-git": "tsc -p tsconfig.build.json",
"check": "pnpm run typecheck",
"clone": "pnpm -C ../.. run clone",
"open": "pnpm -C ../.. run open",
"docker-git": "node dist/src/docker-git/main.js",
"list": "pnpm -C ../.. run list",
"prestart": "pnpm run build",
Expand Down
29 changes: 16 additions & 13 deletions packages/app/src/app/program.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import { listProjects, readCloneRequest, runDockerGitClone } from "@effect-template/lib"
import { listProjects, readCloneRequest, runDockerGitClone, runDockerGitOpen } from "@effect-template/lib"
import { Console, Effect, Match, pipe } from "effect"

/**
* Compose the CLI program as a single effect.
*
* @returns Effect that either runs docker-git clone or prints usage.
* @returns Effect that either runs docker-git clone/open or prints usage.
*
* @pure false - uses Console output and spawns commands when cloning
* @pure false - uses Console output and spawns commands when running shortcuts
* @effect Console, CommandExecutor, Path
* @invariant forall args in Argv: clone(args) -> docker_git_invoked(args)
* @invariant forall args in Argv: shortcut(args) -> docker_git_invoked(args)
* @precondition true
* @postcondition clone(args) -> docker_git_invoked(args); otherwise usage printed
* @complexity O(build + clone)
* @postcondition shortcut(args) -> docker_git_invoked(args); otherwise usage printed
* @complexity O(build + shortcut)
* @throws Never - all errors are typed in the Effect error channel
*/
// CHANGE: replace greeting demo with deterministic usage text
Expand All @@ -28,32 +28,35 @@ const usageText = [
"Usage:",
" pnpm docker-git",
" pnpm clone <repo-url> [ref]",
" pnpm open <repo-url>",
" pnpm list",
"",
"Notes:",
" - docker-git is the interactive TUI.",
" - clone builds + runs docker-git clone for you."
" - clone builds + runs docker-git clone for you.",
" - open builds + runs docker-git open for existing projects."
].join("\n")

// PURITY: SHELL
// EFFECT: Effect<void, never, Console>
const runHelp = Console.log(usageText)

// CHANGE: route between clone runner and help based on CLI context
// WHY: allow pnpm run clone <url> while keeping a single entrypoint
// QUOTE(ТЗ): "pnpm run clone <url>"
// CHANGE: route between shortcut runners and help based on CLI context
// WHY: allow pnpm run clone/open <url> while keeping a single entrypoint
// QUOTE(ТЗ): "Добавить команду open."
// REF: user-request-2026-01-27
// SOURCE: n/a
// FORMAT THEOREM: forall argv: clone(argv) -> docker_git_invoked(argv)
// FORMAT THEOREM: forall argv: shortcut(argv) -> docker_git_invoked(argv)
// PURITY: SHELL
// EFFECT: Effect<void, Error, Console | CommandExecutor | Path>
// INVARIANT: help is printed when clone is not requested
// COMPLEXITY: O(build + clone)
// INVARIANT: help is printed when shortcut is not requested
// COMPLEXITY: O(build + shortcut)
const runDockerGit = pipe(
readCloneRequest,
Effect.flatMap((request) =>
Match.value(request).pipe(
Match.when({ _tag: "Clone" }, ({ args }) => runDockerGitClone(args)),
Match.when({ _tag: "Open" }, ({ args }) => runDockerGitOpen(args)),
Match.when({ _tag: "None" }, () => runHelp),
Match.exhaustive
)
Expand Down
1 change: 1 addition & 0 deletions packages/app/src/docker-git/cli/parser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ export const parseArgs = (args: ReadonlyArray<string>): Either.Either<Command, P
Match.when("auth", () => parseAuth(rest))
)
.pipe(
Match.when("open", () => parseAttach(rest)),
Match.when("apply", () => parseApply(rest)),
Match.when("state", () => parseState(rest)),
Match.orElse(() => Either.left(unknownCommandError))
Expand Down
6 changes: 4 additions & 2 deletions packages/app/src/docker-git/cli/usage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 open [<url>] [options]
docker-git apply [<url>] [options]
docker-git mcp-playwright [<url>] [options]
docker-git attach [<url>] [options]
Expand All @@ -22,9 +23,10 @@ Commands:
menu Interactive menu (default when no args)
create, init Generate docker development environment
clone Create + run container and clone repo
open Open existing docker-git project workspace
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
attach, tmux Alias for open
panes, terms List tmux panes for a docker-git project
scrap Export/import project scrap (session snapshot + rebuildable deps)
sessions List/kill/log container terminal processes
Expand All @@ -50,7 +52,7 @@ Options:
--network-mode <mode> Compose network mode: shared|project (default: shared)
--shared-network <name> Shared Docker network name when network-mode=shared (default: docker-git-shared)
--out-dir <path> Output directory (default: <projectsRoot>/<org>/<repo>[/issue-<id>|/pr-<id>])
--project-dir <path> Project directory for attach (default: .)
--project-dir <path> Project directory for open/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)
Expand Down
23 changes: 16 additions & 7 deletions packages/app/tests/docker-git/parser.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,18 @@ const expectProjectDirRunUpCommand = (
expect(command.runUp).toBe(expectedRunUp)
})

const expectAttachProjectDirCommand = (
args: ReadonlyArray<string>,
expectedProjectDir: string
) =>
Effect.sync(() => {
const command = parseOrThrow(args)
if (command._tag !== "Attach") {
throw new Error("expected Attach command")
}
expect(command.projectDir).toBe(expectedProjectDir)
})

const expectCreateCommand = (
args: ReadonlyArray<string>,
onRight: (command: CreateCommand) => void
Expand Down Expand Up @@ -196,13 +208,10 @@ describe("parseArgs", () => {
}))

it.effect("parses attach with GitHub issue url into issue workspace", () =>
Effect.sync(() => {
const command = parseOrThrow(["attach", "https://github.com/org/repo/issues/7"])
if (command._tag !== "Attach") {
throw new Error("expected Attach command")
}
expect(command.projectDir).toBe(".docker-git/org/repo/issue-7")
}))
expectAttachProjectDirCommand(["attach", "https://github.com/org/repo/issues/7"], ".docker-git/org/repo/issue-7"))

it.effect("parses open with GitHub issue url into issue workspace", () =>
expectAttachProjectDirCommand(["open", "https://github.com/org/repo/issues/7"], ".docker-git/org/repo/issue-7"))

it.effect("parses mcp-playwright command in current directory", () =>
expectProjectDirRunUpCommand(["mcp-playwright"], "McpPlaywrightUp", ".", true))
Expand Down
38 changes: 29 additions & 9 deletions packages/lib/src/core/clone.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export type CloneRequest =
| { readonly _tag: "Clone"; readonly args: ReadonlyArray<string> }
| { readonly _tag: "Open"; readonly args: ReadonlyArray<string> }
| { readonly _tag: "None" }

const emptyRequest: CloneRequest = { _tag: "None" }
Expand All @@ -9,32 +10,51 @@ const toCloneRequest = (args: ReadonlyArray<string>): CloneRequest => ({
args
})

// CHANGE: resolve a clone request from argv + npm lifecycle metadata
// WHY: support pnpm run clone <url> without requiring "--"
// QUOTE(ТЗ): "pnpm run clone <url>"
const toOpenRequest = (args: ReadonlyArray<string>): CloneRequest => ({
_tag: "Open",
args
})

const resolveLifecycleArgs = (
argv: ReadonlyArray<string>,
command: "clone" | "open"
): ReadonlyArray<string> => {
if (argv.length === 0) {
return []
}
const [first, ...rest] = argv
return first === command ? rest : argv
}

// CHANGE: resolve clone/open shortcut requests from argv + npm lifecycle metadata
// WHY: support pnpm run clone/open <url> without requiring "--"
// QUOTE(ТЗ): "Добавить команду open. ... Просто открывает существующий по ссылке"
// REF: user-request-2026-01-27
// SOURCE: n/a
// FORMAT THEOREM: forall a,e: resolve(a,e) -> deterministic
// PURITY: CORE
// EFFECT: Effect<CloneRequest, never, never>
// INVARIANT: clone requested only when argv[0] == "clone" or npmLifecycleEvent == "clone"
// INVARIANT: command requested only when argv[0] or npmLifecycleEvent is clone/open
// COMPLEXITY: O(n)
export const resolveCloneRequest = (
argv: ReadonlyArray<string>,
npmLifecycleEvent: string | undefined
): CloneRequest => {
if (npmLifecycleEvent === "clone") {
if (argv.length > 0) {
const [first, ...rest] = argv
return first === "clone" ? toCloneRequest(rest) : toCloneRequest(argv)
}
return toCloneRequest(resolveLifecycleArgs(argv, "clone"))
}

return toCloneRequest([])
if (npmLifecycleEvent === "open") {
return toOpenRequest(resolveLifecycleArgs(argv, "open"))
}

if (argv.length > 0 && argv[0] === "clone") {
return toCloneRequest(argv.slice(1))
}

if (argv.length > 0 && argv[0] === "open") {
return toOpenRequest(argv.slice(1))
}

return emptyRequest
}
90 changes: 61 additions & 29 deletions packages/lib/src/core/command-builders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,56 @@ const resolvePaths = (
}
})

type CreateCommandResolvedInput = {
readonly repo: RepoBasics
readonly names: NameConfig
readonly paths: PathConfig
readonly runUp: boolean
readonly openSsh: boolean
readonly force: boolean
readonly forceEnv: boolean
readonly gitTokenLabel: CreateCommand["config"]["gitTokenLabel"]
readonly codexAuthLabel: CreateCommand["config"]["codexAuthLabel"]
readonly claudeAuthLabel: CreateCommand["config"]["claudeAuthLabel"]
readonly dockerNetworkMode: CreateCommand["config"]["dockerNetworkMode"]
readonly dockerSharedNetworkName: CreateCommand["config"]["dockerSharedNetworkName"]
readonly enableMcpPlaywright: boolean
}

const composeCreateCommand = (input: CreateCommandResolvedInput): CreateCommand => ({
_tag: "Create",
outDir: input.paths.outDir,
runUp: input.runUp,
openSsh: input.openSsh,
force: input.force,
forceEnv: input.forceEnv,
waitForClone: false,
config: {
containerName: input.names.containerName,
serviceName: input.names.serviceName,
sshUser: input.repo.sshUser,
sshPort: input.repo.sshPort,
repoUrl: input.repo.repoUrl,
repoRef: input.repo.repoRef,
gitTokenLabel: input.gitTokenLabel,
codexAuthLabel: input.codexAuthLabel,
claudeAuthLabel: input.claudeAuthLabel,
targetDir: input.repo.targetDir,
volumeName: input.names.volumeName,
dockerGitPath: input.paths.dockerGitPath,
authorizedKeysPath: input.paths.authorizedKeysPath,
envGlobalPath: input.paths.envGlobalPath,
envProjectPath: input.paths.envProjectPath,
codexAuthPath: input.paths.codexAuthPath,
codexSharedAuthPath: input.paths.codexSharedAuthPath,
codexHome: input.paths.codexHome,
dockerNetworkMode: input.dockerNetworkMode,
dockerSharedNetworkName: input.dockerSharedNetworkName,
enableMcpPlaywright: input.enableMcpPlaywright,
pnpmVersion: defaultTemplateConfig.pnpmVersion
}
})

// CHANGE: build a typed create command from raw options (CLI or API)
// WHY: share deterministic command construction across CLI and server
// QUOTE(ТЗ): "В lib ты оставляешь бизнес логику, а все CLI морду хранишь в app"
Expand Down Expand Up @@ -230,37 +280,19 @@ export const buildCreateCommand = (
nonEmpty("--shared-network", raw.dockerSharedNetworkName, defaultTemplateConfig.dockerSharedNetworkName)
)

return {
_tag: "Create",
outDir: paths.outDir,
return composeCreateCommand({
repo,
names,
paths,
runUp,
openSsh,
force,
forceEnv,
waitForClone: false,
config: {
containerName: names.containerName,
serviceName: names.serviceName,
sshUser: repo.sshUser,
sshPort: repo.sshPort,
repoUrl: repo.repoUrl,
repoRef: repo.repoRef,
gitTokenLabel,
codexAuthLabel,
claudeAuthLabel,
targetDir: repo.targetDir,
volumeName: names.volumeName,
dockerGitPath: paths.dockerGitPath,
authorizedKeysPath: paths.authorizedKeysPath,
envGlobalPath: paths.envGlobalPath,
envProjectPath: paths.envProjectPath,
codexAuthPath: paths.codexAuthPath,
codexSharedAuthPath: paths.codexSharedAuthPath,
codexHome: paths.codexHome,
dockerNetworkMode,
dockerSharedNetworkName,
enableMcpPlaywright,
pnpmVersion: defaultTemplateConfig.pnpmVersion
}
}
gitTokenLabel,
codexAuthLabel,
claudeAuthLabel,
dockerNetworkMode,
dockerSharedNetworkName,
enableMcpPlaywright
})
})
Loading