khal-os 1.260326.2 → 1.260326.4

package/.github/workflows/version.yml

@@ -114,33 +114,42 @@ jobs:
           cd packages/npx-cli
           bun build src/cli.ts --outfile dist/cli.js --target node
 
-      - name: Resolve workspace references for npm
+      - name: Strip workspace deps for npm publish
         run: |
-          VERSION="${{ steps.version.outputs.version }}"
           node -e "
             const fs = require('fs');
             const pkg = JSON.parse(fs.readFileSync('package.json', 'utf8'));
-            let changed = false;
+            // Remove all workspace:* deps — the bundled cli.js has everything inlined
             for (const depType of ['dependencies', 'devDependencies', 'peerDependencies']) {
-              for (const [key, val] of Object.entries(pkg[depType] || {})) {
+              if (!pkg[depType]) continue;
+              for (const [key, val] of Object.entries(pkg[depType])) {
                 if (typeof val === 'string' && val.startsWith('workspace:')) {
-                  pkg[depType][key] = '${VERSION}';
-                  changed = true;
+                  delete pkg[depType][key];
                 }
               }
+              if (Object.keys(pkg[depType]).length === 0) delete pkg[depType];
             }
-            if (changed) {
-              fs.writeFileSync('package.json', JSON.stringify(pkg, null, '\t') + '\n');
-              console.log('Resolved workspace:* → ${VERSION}');
-            } else {
-              console.log('No workspace references to resolve');
+            // Also strip sub-package workspace refs
+            const npxPkg = 'packages/npx-cli/package.json';
+            if (fs.existsSync(npxPkg)) {
+              const sub = JSON.parse(fs.readFileSync(npxPkg, 'utf8'));
+              for (const depType of ['dependencies', 'devDependencies']) {
+                if (!sub[depType]) continue;
+                for (const [key, val] of Object.entries(sub[depType])) {
+                  if (typeof val === 'string' && val.startsWith('workspace:')) {
+                    delete sub[depType][key];
+                  }
+                }
+              }
+              fs.writeFileSync(npxPkg, JSON.stringify(sub, null, '\t') + '\n');
             }
+            fs.writeFileSync('package.json', JSON.stringify(pkg, null, '\t') + '\n');
+            console.log('Stripped workspace:* deps for npm publish');
           "
 
       - name: Publish to npm
         env:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          NPM_CONFIG_TOKEN: ${{ secrets.NPM_TOKEN }}
           HUSKY: "0"
         run: |
           if [ -z "$NPM_TOKEN" ]; then
@@ -148,4 +157,5 @@ jobs:
             exit 0
           fi
           echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc
-          npm publish --access public --tag ${{ steps.context.outputs.npm_tag }} || echo "Publish failed — version may already exist"
+          # Use pnpm publish — it resolves workspace:* automatically
+          pnpm publish --access public --tag ${{ steps.context.outputs.npm_tag }} --no-git-checks || echo "Publish failed — version may already exist"

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "khal-os",
-	"version": "1.260326.2",
+	"version": "1.260326.4",
 	"bin": {
 		"khal-os": "./packages/npx-cli/dist/cli.js"
 	},