Skip to content

Commit ad39eb7

Browse files
pRizzpRizz
committed
refactor(npm): rename platform packages to cli-node-* and wire workflows
- Rename cli-darwin|linux* -> cli-node-darwin|linux* (packages + dirs) - Update package names to @opencode-cloud/cli-node-darwin-arm64, etc. - cli-node: optionalDependencies, getPlatformPackage, resolveBinaryPath use new names - build-cli-binaries.yml, publish-npm.yml: matrix pkgs, artifacts, publish filters - version-bump.yml: enable publish-npm job, pass ref, secrets inherit - pnpm-workspace, pnpm-lock: cli-node-* entries - Planning: 18-04-SUMMARY, 18-CONTEXT updated for new names
1 parent 2538839 commit ad39eb7

28 files changed

Lines changed: 133 additions & 133 deletions

File tree

‎.github/workflows/build-cli-binaries.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ jobs:
1616
include:
1717
- target: aarch64-apple-darwin
1818
os: macos-latest
19-
package: cli-darwin-arm64
19+
package: cli-node-darwin-arm64
2020
- target: x86_64-apple-darwin
2121
os: macos-latest
22-
package: cli-darwin-x64
22+
package: cli-node-darwin-x64
2323
- target: x86_64-unknown-linux-gnu
2424
os: ubuntu-latest
25-
package: cli-linux-x64
25+
package: cli-node-linux-x64
2626
- target: aarch64-unknown-linux-gnu
2727
os: ubuntu-latest
28-
package: cli-linux-arm64
28+
package: cli-node-linux-arm64
2929
use-cross: true
3030
- target: x86_64-unknown-linux-musl
3131
os: ubuntu-latest
32-
package: cli-linux-x64-musl
32+
package: cli-node-linux-x64-musl
3333
- target: aarch64-unknown-linux-musl
3434
os: ubuntu-latest
35-
package: cli-linux-arm64-musl
35+
package: cli-node-linux-arm64-musl
3636
use-cross: true
3737

3838
runs-on: ${{ matrix.os }}

‎.github/workflows/publish-npm.yml‎

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -61,70 +61,70 @@ jobs:
6161
- name: Download darwin-arm64 binary
6262
uses: actions/download-artifact@v4
6363
with:
64-
name: cli-darwin-arm64
65-
path: packages/cli-darwin-arm64/bin
64+
name: cli-node-darwin-arm64
65+
path: packages/cli-node-darwin-arm64/bin
6666

6767
- name: Download darwin-x64 binary
6868
uses: actions/download-artifact@v4
6969
with:
70-
name: cli-darwin-x64
71-
path: packages/cli-darwin-x64/bin
70+
name: cli-node-darwin-x64
71+
path: packages/cli-node-darwin-x64/bin
7272

7373
- name: Download linux-x64 binary
7474
uses: actions/download-artifact@v4
7575
with:
76-
name: cli-linux-x64
77-
path: packages/cli-linux-x64/bin
76+
name: cli-node-linux-x64
77+
path: packages/cli-node-linux-x64/bin
7878

7979
- name: Download linux-arm64 binary
8080
uses: actions/download-artifact@v4
8181
with:
82-
name: cli-linux-arm64
83-
path: packages/cli-linux-arm64/bin
82+
name: cli-node-linux-arm64
83+
path: packages/cli-node-linux-arm64/bin
8484

8585
- name: Download linux-x64-musl binary
8686
uses: actions/download-artifact@v4
8787
with:
88-
name: cli-linux-x64-musl
89-
path: packages/cli-linux-x64-musl/bin
88+
name: cli-node-linux-x64-musl
89+
path: packages/cli-node-linux-x64-musl/bin
9090

9191
- name: Download linux-arm64-musl binary
9292
uses: actions/download-artifact@v4
9393
with:
94-
name: cli-linux-arm64-musl
95-
path: packages/cli-linux-arm64-musl/bin
94+
name: cli-node-linux-arm64-musl
95+
path: packages/cli-node-linux-arm64-musl/bin
9696

9797
- name: Make binaries executable
9898
run: |
99-
chmod +x packages/cli-darwin-arm64/bin/occ
100-
chmod +x packages/cli-darwin-x64/bin/occ
101-
chmod +x packages/cli-linux-x64/bin/occ
102-
chmod +x packages/cli-linux-arm64/bin/occ
103-
chmod +x packages/cli-linux-x64-musl/bin/occ
104-
chmod +x packages/cli-linux-arm64-musl/bin/occ
99+
chmod +x packages/cli-node-darwin-arm64/bin/occ
100+
chmod +x packages/cli-node-darwin-x64/bin/occ
101+
chmod +x packages/cli-node-linux-x64/bin/occ
102+
chmod +x packages/cli-node-linux-arm64/bin/occ
103+
chmod +x packages/cli-node-linux-x64-musl/bin/occ
104+
chmod +x packages/cli-node-linux-arm64-musl/bin/occ
105105
106106
- name: Build Node packages
107107
run: |
108108
pnpm -C packages/core build
109109
pnpm -C packages/cli-node build
110110
111-
- name: Publish @opencode-cloud/cli-darwin-arm64
112-
run: pnpm --filter @opencode-cloud/cli-darwin-arm64 publish --access public --no-git-checks
111+
- name: Publish @opencode-cloud/cli-node-darwin-arm64
112+
run: pnpm --filter @opencode-cloud/cli-node-darwin-arm64 publish --access public --no-git-checks
113113

114-
- name: Publish @opencode-cloud/cli-darwin-x64
115-
run: pnpm --filter @opencode-cloud/cli-darwin-x64 publish --access public --no-git-checks
114+
- name: Publish @opencode-cloud/cli-node-darwin-x64
115+
run: pnpm --filter @opencode-cloud/cli-node-darwin-x64 publish --access public --no-git-checks
116116

117-
- name: Publish @opencode-cloud/cli-linux-x64
118-
run: pnpm --filter @opencode-cloud/cli-linux-x64 publish --access public --no-git-checks
117+
- name: Publish @opencode-cloud/cli-node-linux-x64
118+
run: pnpm --filter @opencode-cloud/cli-node-linux-x64 publish --access public --no-git-checks
119119

120-
- name: Publish @opencode-cloud/cli-linux-arm64
121-
run: pnpm --filter @opencode-cloud/cli-linux-arm64 publish --access public --no-git-checks
120+
- name: Publish @opencode-cloud/cli-node-linux-arm64
121+
run: pnpm --filter @opencode-cloud/cli-node-linux-arm64 publish --access public --no-git-checks
122122

123-
- name: Publish @opencode-cloud/cli-linux-x64-musl
124-
run: pnpm --filter @opencode-cloud/cli-linux-x64-musl publish --access public --no-git-checks
123+
- name: Publish @opencode-cloud/cli-node-linux-x64-musl
124+
run: pnpm --filter @opencode-cloud/cli-node-linux-x64-musl publish --access public --no-git-checks
125125

126-
- name: Publish @opencode-cloud/cli-linux-arm64-musl
127-
run: pnpm --filter @opencode-cloud/cli-linux-arm64-musl publish --access public --no-git-checks
126+
- name: Publish @opencode-cloud/cli-node-linux-arm64-musl
127+
run: pnpm --filter @opencode-cloud/cli-node-linux-arm64-musl publish --access public --no-git-checks
128128

129129
- name: Wait for npm to index platform packages
130130
run: sleep 30
@@ -145,12 +145,12 @@ jobs:
145145
echo "**Version:** ${{ inputs.version }}" >> $GITHUB_STEP_SUMMARY
146146
echo "" >> $GITHUB_STEP_SUMMARY
147147
echo "**Platform Packages:**" >> $GITHUB_STEP_SUMMARY
148-
echo "- [@opencode-cloud/cli-darwin-arm64](https://www.npmjs.com/package/@opencode-cloud/cli-darwin-arm64)" >> $GITHUB_STEP_SUMMARY
149-
echo "- [@opencode-cloud/cli-darwin-x64](https://www.npmjs.com/package/@opencode-cloud/cli-darwin-x64)" >> $GITHUB_STEP_SUMMARY
150-
echo "- [@opencode-cloud/cli-linux-x64](https://www.npmjs.com/package/@opencode-cloud/cli-linux-x64)" >> $GITHUB_STEP_SUMMARY
151-
echo "- [@opencode-cloud/cli-linux-arm64](https://www.npmjs.com/package/@opencode-cloud/cli-linux-arm64)" >> $GITHUB_STEP_SUMMARY
152-
echo "- [@opencode-cloud/cli-linux-x64-musl](https://www.npmjs.com/package/@opencode-cloud/cli-linux-x64-musl)" >> $GITHUB_STEP_SUMMARY
153-
echo "- [@opencode-cloud/cli-linux-arm64-musl](https://www.npmjs.com/package/@opencode-cloud/cli-linux-arm64-musl)" >> $GITHUB_STEP_SUMMARY
148+
echo "- [@opencode-cloud/cli-node-darwin-arm64](https://www.npmjs.com/package/@opencode-cloud/cli-node-darwin-arm64)" >> $GITHUB_STEP_SUMMARY
149+
echo "- [@opencode-cloud/cli-node-darwin-x64](https://www.npmjs.com/package/@opencode-cloud/cli-node-darwin-x64)" >> $GITHUB_STEP_SUMMARY
150+
echo "- [@opencode-cloud/cli-node-linux-x64](https://www.npmjs.com/package/@opencode-cloud/cli-node-linux-x64)" >> $GITHUB_STEP_SUMMARY
151+
echo "- [@opencode-cloud/cli-node-linux-arm64](https://www.npmjs.com/package/@opencode-cloud/cli-node-linux-arm64)" >> $GITHUB_STEP_SUMMARY
152+
echo "- [@opencode-cloud/cli-node-linux-x64-musl](https://www.npmjs.com/package/@opencode-cloud/cli-node-linux-x64-musl)" >> $GITHUB_STEP_SUMMARY
153+
echo "- [@opencode-cloud/cli-node-linux-arm64-musl](https://www.npmjs.com/package/@opencode-cloud/cli-node-linux-arm64-musl)" >> $GITHUB_STEP_SUMMARY
154154
echo "" >> $GITHUB_STEP_SUMMARY
155155
echo "**Main Packages:**" >> $GITHUB_STEP_SUMMARY
156156
echo "- [@opencode-cloud/core](https://www.npmjs.com/package/@opencode-cloud/core)" >> $GITHUB_STEP_SUMMARY

‎.github/workflows/version-bump.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
permissions:
1717
contents: write # Required for pushing commits and tags
1818
packages: write # Required for GHCR push (docker-publish)
19-
id-token: write # Required for npm provenance (publish-npm)
19+
id-token: write # Reserved for future npm provenance (publish-npm uses NPM_TOKEN for now)
2020

2121
jobs:
2222
bump-version:
@@ -163,14 +163,14 @@ jobs:
163163
secrets: inherit
164164

165165
# Publish to npm (after checks pass)
166-
# DISABLED - npm is deprecated in favor of cargo install
167-
# publish-npm:
168-
# name: Publish to npm
169-
# needs: [bump-version, ci-pre-publish]
170-
# uses: ./.github/workflows/publish-npm.yml
171-
# with:
172-
# version: ${{ needs.bump-version.outputs.version }}
173-
# secrets: inherit
166+
publish-npm:
167+
name: Publish to npm
168+
needs: [bump-version, ci-pre-publish]
169+
uses: ./.github/workflows/publish-npm.yml
170+
with:
171+
version: ${{ needs.bump-version.outputs.version }}
172+
ref: ${{ needs.bump-version.outputs.ref }}
173+
secrets: inherit
174174

175175
# Publish Docker image (after checks pass)
176176
docker-publish:

‎.planning/phases/18-cli-sync-strategy/18-04-SUMMARY.md‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,24 @@ affects:
1313
- 18-06 # CI build + publish
1414
key-files:
1515
created:
16-
- packages/cli-darwin-arm64/package.json
17-
- packages/cli-darwin-arm64/index.js
18-
- packages/cli-darwin-arm64/bin/.gitkeep
19-
- packages/cli-darwin-x64/package.json
20-
- packages/cli-darwin-x64/index.js
21-
- packages/cli-darwin-x64/bin/.gitkeep
22-
- packages/cli-linux-x64/package.json
23-
- packages/cli-linux-x64/index.js
24-
- packages/cli-linux-x64/bin/.gitkeep
25-
- packages/cli-linux-arm64/package.json
26-
- packages/cli-linux-arm64/index.js
27-
- packages/cli-linux-arm64/bin/.gitkeep
28-
- packages/cli-linux-x64-musl/package.json
29-
- packages/cli-linux-x64-musl/index.js
30-
- packages/cli-linux-x64-musl/bin/.gitkeep
31-
- packages/cli-linux-arm64-musl/package.json
32-
- packages/cli-linux-arm64-musl/index.js
33-
- packages/cli-linux-arm64-musl/bin/.gitkeep
16+
- packages/cli-node-darwin-arm64/package.json
17+
- packages/cli-node-darwin-arm64/index.js
18+
- packages/cli-node-darwin-arm64/bin/.gitkeep
19+
- packages/cli-node-darwin-x64/package.json
20+
- packages/cli-node-darwin-x64/index.js
21+
- packages/cli-node-darwin-x64/bin/.gitkeep
22+
- packages/cli-node-linux-x64/package.json
23+
- packages/cli-node-linux-x64/index.js
24+
- packages/cli-node-linux-x64/bin/.gitkeep
25+
- packages/cli-node-linux-arm64/package.json
26+
- packages/cli-node-linux-arm64/index.js
27+
- packages/cli-node-linux-arm64/bin/.gitkeep
28+
- packages/cli-node-linux-x64-musl/package.json
29+
- packages/cli-node-linux-x64-musl/index.js
30+
- packages/cli-node-linux-x64-musl/bin/.gitkeep
31+
- packages/cli-node-linux-arm64-musl/package.json
32+
- packages/cli-node-linux-arm64-musl/index.js
33+
- packages/cli-node-linux-arm64-musl/bin/.gitkeep
3434
decisions:
3535
- name: "optionalDependencies pattern (esbuild/swc)"
3636
rationale: "npm installs only matching platform package; minimal footprint"
@@ -47,9 +47,9 @@ metrics:
4747

4848
## What Was Built
4949

50-
- **Darwin:** `cli-darwin-arm64`, `cli-darwin-x64` (os: darwin, cpu: arm64|x64)
51-
- **Linux glibc:** `cli-linux-x64`, `cli-linux-arm64` (os: linux, libc: glibc)
52-
- **Linux musl:** `cli-linux-x64-musl`, `cli-linux-arm64-musl` (os: linux, libc: musl)
50+
- **Darwin:** `cli-node-darwin-arm64`, `cli-node-darwin-x64` (os: darwin, cpu: arm64|x64)
51+
- **Linux glibc:** `cli-node-linux-x64`, `cli-node-linux-arm64` (os: linux, libc: glibc)
52+
- **Linux musl:** `cli-node-linux-x64-musl`, `cli-node-linux-arm64-musl` (os: linux, libc: musl)
5353

5454
Each package has `package.json` (name, version 3.0.0, os, cpu, libc, files, main), `index.js` exporting `binaryPath`, and `bin/.gitkeep` as placeholder for the `occ` binary.
5555

‎.planning/phases/18-cli-sync-strategy/18-CONTEXT.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Establish patterns and processes to keep the Rust CLI (`packages/cli-rust`) and
4040

4141
### Package Structure
4242
- Main package: `@opencode-cloud/cli` (or `opencode-cloud`)
43-
- Platform packages: `@opencode-cloud/cli-darwin-arm64`, etc.
43+
- Platform packages: `@opencode-cloud/cli-node-darwin-arm64`, etc.
4444
- Binary path resolution in index.js finds the installed platform package
4545
- Uses existing pattern from packages/core/index.js as reference
4646

packages/cli-darwin-arm64/bin/.gitkeep renamed to packages/cli-node-darwin-arm64/bin/.gitkeep

File renamed without changes.

packages/cli-darwin-arm64/index.js renamed to packages/cli-node-darwin-arm64/index.js

File renamed without changes.

packages/cli-darwin-arm64/package.json renamed to packages/cli-node-darwin-arm64/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
2-
"name": "@opencode-cloud/cli-darwin-arm64",
2+
"name": "@opencode-cloud/cli-node-darwin-arm64",
33
"version": "3.0.0",
44
"description": "opencode-cloud CLI binary for macOS ARM64 (Apple Silicon)",
55
"license": "MIT",
66
"author": "pRizz",
77
"repository": {
88
"type": "git",
99
"url": "git+https://github.com/pRizz/opencode-cloud.git",
10-
"directory": "packages/cli-darwin-arm64"
10+
"directory": "packages/cli-node-darwin-arm64"
1111
},
1212
"homepage": "https://github.com/pRizz/opencode-cloud",
1313
"os": ["darwin"],

packages/cli-darwin-x64/bin/.gitkeep renamed to packages/cli-node-darwin-x64/bin/.gitkeep

File renamed without changes.

packages/cli-darwin-x64/index.js renamed to packages/cli-node-darwin-x64/index.js

File renamed without changes.

0 commit comments

Comments
 (0)