@crewx/cli 0.9.0-rc.92 → 0.9.0-rc.94

package/dist/commands/publish.js

@@ -126,7 +126,7 @@ Options:
   --version <ver>  Override manifest version (semver, e.g. 1.0.0)
   --json           Print machine-readable JSON to stdout
   --upload         Submit + upload the packed archive to marketplace
-                    (requires CREWX_MARKETPLACE_URL and a prior login;
+                    (uses the configured account target and a prior login;
                     ignored when combined with --dry-run)
   --help, -h       Show this help
 
@@ -136,13 +136,26 @@ Notes:
   .crewx/publish/<name>-<version>.tgz archive.
 `.trim());
 }
-/** CREWX_MARKETPLACE_URL — same env var name as the server's MARKETPLACE_DISABLED check, never a second name. */
+/** Resolve and validate the Marketplace target immediately before an upload. */
 function requireMarketplaceUrl() {
-    const url = process.env['CREWX_MARKETPLACE_URL'];
-    if (!url?.trim()) {
-        throw new Error('publish: [E_ENV_MISSING] CREWX_MARKETPLACE_URL is not set — this environment variable is required for upload');
+    try {
+        const url = (0, account_1.resolveMarketplaceUrl)();
+        (0, account_1.assertAccountTargetNotMixed)();
+        return url;
+    }
+    catch (error) {
+        const code = typeof error === 'object' && error !== null && 'code' in error
+            ? error.code
+            : undefined;
+        if (code === 'ACCOUNT_TARGET_INVALID' ||
+            code === 'ACCOUNT_TARGET_MIXED' ||
+            code === 'MARKETPLACE_DISABLED' ||
+            code === 'MARKETPLACE_URL_INVALID') {
+            const message = error instanceof Error ? error.message : String(error);
+            throw new Error(`publish: [${code}] ${message}`);
+        }
+        throw error;
     }
-    return url.trim();
 }
 function isMarketplaceUnauthorized(err) {
     return err instanceof Error

package/dist/main.d.ts

@@ -5,7 +5,7 @@
  *
  * Boot sequence:
  *   1. Inject CREWX_CLI / CREWX_WORKSPACE env defaults (must be first)
- *   2. Load workspace .env (does not override existing process.env values)
+ *   2. Load workspace and ~/.crewx .env files (does not override process.env)
  *   3. Parse command
  *   4. Dispatch to handler
  */

package/dist/main.js

@@ -6,7 +6,7 @@
  *
  * Boot sequence:
  *   1. Inject CREWX_CLI / CREWX_WORKSPACE env defaults (must be first)
- *   2. Load workspace .env (does not override existing process.env values)
+ *   2. Load workspace and ~/.crewx .env files (does not override process.env)
  *   3. Parse command
  *   4. Dispatch to handler
  */
@@ -47,15 +47,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // ─── P0-1: Env Bootstrap ─────────────────────────────────────────────────────
 // Must run before any other code that might use process.env.CREWX_CLI.
 const sdk_compat_1 = require("./utils/sdk-compat");
-const dotenv = __importStar(require("dotenv"));
-const path_1 = require("path");
+const account_1 = require("@crewx/sdk/account");
 process.env.CREWX_CLI ??= sdk_compat_1.sdkCompat.resolveCrewxCli();
 process.env.CREWX_WORKSPACE ??= sdk_compat_1.sdkCompat.resolveCrewxWorkspace();
-// Load the workspace .env (WI-20260725-010): keeps CLI (crewx q/x) in parity with
-// the server's ConfigModule, which already reads cwd/.env. override:false so a
-// value already present in the shell/environment always wins over the file.
-// quiet:true suppresses dotenv's injected-keys log and tip banner on stdout.
-dotenv.config({ path: (0, path_1.join)(process.env.CREWX_WORKSPACE, '.env'), override: false, quiet: true });
+// Load workspace .env before ~/.crewx/.env. The SDK-owned loader keeps CLI and
+// server bootstrap on the same process > workspace > home precedence contract.
+(0, account_1.loadCrewxEnvFiles)();
 // ─── Pricing remote override (WI-20260701-002) ───────────────────────────────
 // Best-effort, non-blocking: fetch remote model registry so new models get
 // accurate pricing without a CLI republish. Falls back to bundled table on

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crewx/cli",
-  "version": "0.9.0-rc.92",
+  "version": "0.9.0-rc.94",
   "license": "UNLICENSED",
   "engines": {
     "node": ">=20.19.0"
@@ -25,17 +25,17 @@
     "better-sqlite3": "*",
     "dotenv": "17.2.3",
     "isomorphic-git": "1.37.1",
-    "@crewx/sdk": "0.9.0-rc.92",
-    "@crewx/memory": "0.1.23-rc.109",
-    "@crewx/wbs": "0.1.10-rc.118",
-    "@crewx/doc": "0.1.9-rc.85",
-    "@crewx/search": "0.1.10-rc.88",
-    "@crewx/workflow": "0.3.22-rc.138",
-    "@crewx/cron": "0.1.10-rc.127",
-    "@crewx/chromex": "0.1.0-rc.125",
+    "@crewx/memory": "0.1.23-rc.111",
+    "@crewx/sdk": "0.9.0-rc.94",
+    "@crewx/doc": "0.1.9-rc.87",
+    "@crewx/wbs": "0.1.10-rc.120",
+    "@crewx/search": "0.1.10-rc.90",
+    "@crewx/workflow": "0.3.22-rc.140",
+    "@crewx/cron": "0.1.10-rc.129",
+    "@crewx/notify": "0.1.0-rc.65",
     "@crewx/shared": "0.0.6",
-    "@crewx/notify": "0.1.0-rc.63",
-    "@crewx/wi": "0.1.10-rc.112",
+    "@crewx/wi": "0.1.10-rc.114",
+    "@crewx/chromex": "0.1.0-rc.127",
     "@crewx/skill": "0.1.20"
   },
   "devDependencies": {