Skip to content
Merged
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
6 changes: 6 additions & 0 deletions .changeset/bump-version.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@prover-coder-ai/docker-git": patch
"@spawn-dock/cli": patch
---

chore: automated bump to trigger release using new NPM_KEY
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
skip_if_unchanged: true
cancel_on_no_changes: true

release-spawndock-cli:
release-spawndock-runtime:
if: github.event.workflow_run.conclusion == 'success'
runs-on: ubuntu-latest
steps:
Expand All @@ -41,8 +41,8 @@ jobs:
npm_token: ${{ secrets.NPM_KEY }}
ref: ${{ github.event.workflow_run.head_sha }}
branch: ${{ github.event.workflow_run.head_branch }}
package_json_path: packages/spawndock-cli/package.json
pnpm_filter: ./packages/spawndock-cli
package_json_path: packages/spawndock-runtime/package.json
pnpm_filter: ./packages/spawndock-runtime
bump_type: patch
publish_npm: true
publish_github_packages: true
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
"packages/api",
"packages/app",
"packages/lib",
"packages/spawndock-cli"
"packages/spawndock-runtime"
],
"scripts": {
"setup:pre-commit-hook": "node scripts/setup-pre-commit-hook.js",
"build": "pnpm --filter ./packages/app build && pnpm --filter ./packages/spawndock-cli build",
"build": "pnpm --filter ./packages/app build && pnpm --filter ./packages/spawndock-runtime build",
"api:build": "pnpm --filter ./packages/api build",
"api:start": "pnpm --filter ./packages/api start",
"api:dev": "pnpm --filter ./packages/api dev",
"api:test": "pnpm --filter ./packages/api test",
"api:typecheck": "pnpm --filter ./packages/api typecheck",
"check": "pnpm --filter ./packages/app check && pnpm --filter ./packages/lib typecheck && pnpm --filter ./packages/spawndock-cli typecheck",
"check": "pnpm --filter ./packages/app check && pnpm --filter ./packages/lib typecheck && pnpm --filter ./packages/spawndock-runtime typecheck",
"changeset": "changeset",
"changeset-publish": "node -e \"if (!process.env.NPM_KEY) { console.log('Skipping publish: NPM_KEY is not set'); process.exit(0); }\" && changeset publish",
"changeset-version": "changeset version",
Expand All @@ -34,8 +34,8 @@
"lint": "pnpm --filter ./packages/app lint && pnpm --filter ./packages/lib lint",
"lint:tests": "pnpm --filter ./packages/app lint:tests",
"lint:effect": "pnpm --filter ./packages/app lint:effect && pnpm --filter ./packages/lib lint:effect",
"test": "pnpm --filter ./packages/app test && pnpm --filter ./packages/lib test && pnpm --filter ./packages/spawndock-cli test",
"typecheck": "pnpm --filter ./packages/app typecheck && pnpm --filter ./packages/lib typecheck && pnpm --filter ./packages/spawndock-cli typecheck",
"test": "pnpm --filter ./packages/app test && pnpm --filter ./packages/lib test && pnpm --filter ./packages/spawndock-runtime test",
"typecheck": "pnpm --filter ./packages/app typecheck && pnpm --filter ./packages/lib typecheck && pnpm --filter ./packages/spawndock-runtime typecheck",
"start": "pnpm --filter ./packages/app start"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/app/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@prover-coder-ai/docker-git",
"version": "1.0.68",
"name": "@spawn-dock/cli",
"version": "1.0.69",
"description": "Minimal Vite-powered TypeScript console starter using Effect",
"main": "dist/src/docker-git/main.js",
"bin": {
"docker-git": "dist/src/docker-git/main.js"
"spawn-dock": "dist/src/docker-git/main.js"
},
"files": [
"dist"
Expand Down
44 changes: 22 additions & 22 deletions packages/app/src/docker-git/cli/usage.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,28 @@ import { Match } from "effect"

import type { ParseError } from "@effect-template/lib/core/domain"

export const usageText = `docker-git menu
docker-git spawn --token <pairing-token> [options]
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]
docker-git panes [<url>] [options]
docker-git scrap <action> [<url>] [options]
docker-git sessions [list] [<url>] [options]
docker-git sessions kill <pid> [<url>] [options]
docker-git sessions logs <pid> [<url>] [options]
docker-git session-gists [list] [options]
docker-git session-gists backup [<url>] [options]
docker-git session-gists view <snapshot-ref>
docker-git session-gists download <snapshot-ref> [options]
docker-git ps
docker-git apply-all [--active]
docker-git down-all
docker-git auth <provider> <action> [options]
docker-git state <action> [options]
export const usageText = `spawn-dock menu
spawn-dock spawn --token <pairing-token> [options]
spawn-dock create [--repo-url <url>] [options]
spawn-dock clone <url> [options]
spawn-dock open [<url>] [options]
spawn-dock apply [<url>] [options]
spawn-dock mcp-playwright [<url>] [options]
spawn-dock attach [<url>] [options]
spawn-dock panes [<url>] [options]
spawn-dock scrap <action> [<url>] [options]
spawn-dock sessions [list] [<url>] [options]
spawn-dock sessions kill <pid> [<url>] [options]
spawn-dock sessions logs <pid> [<url>] [options]
spawn-dock session-gists [list] [options]
spawn-dock session-gists backup [<url>] [options]
spawn-dock session-gists view <snapshot-ref>
spawn-dock session-gists download <snapshot-ref> [options]
spawn-dock ps
spawn-dock apply-all [--active]
spawn-dock down-all
spawn-dock auth <provider> <action> [options]
spawn-dock state <action> [options]

Commands:
menu Interactive menu (default when no args)
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@spawn-dock/cli",
"version": "1.0.0",
"name": "@spawn-dock/runtime",
"version": "1.0.1",
"private": false,
"description": "Minimal SpawnDock runtime launcher for bootstrapped TMA projects",
"type": "module",
Expand All @@ -10,7 +10,7 @@
"README.md"
],
"bin": {
"spawn-dock": "dist/src/main.js"
"spawn-dock-runtime": "dist/src/main.js"
},
"scripts": {
"build": "tsc -p tsconfig.build.json && chmod +x dist/src/main.js",
Expand Down
2 changes: 1 addition & 1 deletion pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ packages:
- packages/api
- packages/app
- packages/lib
- packages/spawndock-cli
- packages/spawndock-runtime
20 changes: 10 additions & 10 deletions scripts/e2e/local-package-cli.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ ROOT="$(mktemp -d "$ROOT_BASE/local-package-cli.XXXXXX")"
KEEP="${KEEP:-0}"

PACK_LOG="$ROOT/npm-pack.log"
HELP_LOG_PNPM="$ROOT/docker-git-help-pnpm.log"
HELP_LOG_NPM="$ROOT/docker-git-help-npm.log"
HELP_LOG_PNPM="$ROOT/spawn-dock-help-pnpm.log"
HELP_LOG_NPM="$ROOT/spawn-dock-help-npm.log"
TAR_LIST="$ROOT/tar-list.txt"
PACKED_TARBALL=""

Expand All @@ -28,11 +28,11 @@ on_error() {
cat "$PACK_LOG" >&2 || true
fi
if [[ -f "$HELP_LOG_PNPM" ]]; then
echo "--- pnpm docker-git --help log ---" >&2
echo "--- pnpm spawn-dock --help log ---" >&2
cat "$HELP_LOG_PNPM" >&2 || true
fi
if [[ -f "$HELP_LOG_NPM" ]]; then
echo "--- npm exec docker-git --help log ---" >&2
echo "--- npm exec spawn-dock --help log ---" >&2
cat "$HELP_LOG_NPM" >&2 || true
fi
}
Expand Down Expand Up @@ -86,18 +86,18 @@ mkdir -p "$ROOT/project"
cd "$ROOT/project"
npm init -y >/dev/null
pnpm add "$PACKED_TARBALL" --silent --lockfile=false
pnpm docker-git --help >"$HELP_LOG_PNPM" 2>&1
pnpm spawn-dock --help >"$HELP_LOG_PNPM" 2>&1

grep -Fq -- "docker-git clone <url> [options]" "$HELP_LOG_PNPM" \
|| fail "expected docker-git help output from local packed package"
grep -Fq -- "spawn-dock clone <url> [options]" "$HELP_LOG_PNPM" \
|| fail "expected spawn-dock help output from local packed package"

mkdir -p "$ROOT/project-npm"
cd "$ROOT/project-npm"
npm init -y >/dev/null
npm install "$PACKED_TARBALL" --silent --no-audit --fund=false
npm exec -- docker-git --help >"$HELP_LOG_NPM" 2>&1
npm exec -- spawn-dock --help >"$HELP_LOG_NPM" 2>&1

grep -Fq -- "docker-git clone <url> [options]" "$HELP_LOG_NPM" \
|| fail "expected docker-git help output via npm exec from local packed package"
grep -Fq -- "spawn-dock clone <url> [options]" "$HELP_LOG_NPM" \
|| fail "expected spawn-dock help output via npm exec from local packed package"

echo "e2e/local-package-cli: local tarball install + pnpm/npm CLI execution OK" >&2