@moltbankhq/openclaw 0.1.15 → 0.1.17

package/README.md

@@ -44,15 +44,16 @@ After installing, run:
 moltbank setup
 ```
 
-The CLI will guide you through linking your MoltBank account via browser-based OAuth. Once approved, setup verifies a real authenticated balance read before reporting success.
+By default, `moltbank setup` issues the browser activation code, starts background finalization, and returns without hanging on approval. Host setup also skips automatic gateway restarts by default so the active chat session is not interrupted. Use `moltbank setup --blocking` or `moltbank setup-blocking` when you want the command to wait for approval and finish readiness verification in the foreground.
 
 ## CLI Commands
 
 | Command | Description |
 |---------|-------------|
-| `moltbank setup` | Run full setup and verify readiness |
+| `moltbank setup` | Start setup in nonblocking mode and return after issuing activation steps |
+| `moltbank setup --blocking` | Run setup and wait for approval in the foreground |
 | `moltbank setup --verbose` | Run setup with detailed logs |
-| `moltbank setup-blocking` | Alias for setup |
+| `moltbank setup-blocking` | Run setup and wait for approval |
 | `moltbank status` | Check current auth state |
 | `moltbank auth-status` | Alias for `moltbank status` |
 | `moltbank sandbox-setup` | Reconfigure sandbox Docker settings |
@@ -65,6 +66,7 @@ CLI flags:
 
 ```bash
 moltbank setup --app-base-url https://app.moltbank.bot --skill-name MoltBank
+moltbank setup --workspace ~/.openclaw/workspace
 ```
 
 ## Environment Variables
@@ -73,8 +75,10 @@ moltbank setup --app-base-url https://app.moltbank.bot --skill-name MoltBank
 |----------|-------------|
 | `APP_BASE_URL` | MoltBank deployment URL (default: `https://app.moltbank.bot`) |
 | `MOLTBANK_SKILL_NAME` | Override skill folder name (default: `MoltBank`) |
+| `OPENCLAW_WORKSPACE` | Override OpenClaw workspace path (default: `~/.openclaw/workspace`) |
 | `MOLTBANK_CREDENTIALS_PATH` | Custom credentials file path |
 | `MOLTBANK_SETUP_AUTH_WAIT_MODE` | `blocking` or `nonblocking` (default: `nonblocking`) |
+| `MOLTBANK_SETUP_RESTART_GATEWAY` | `true` or `false` (default: `false`) |
 
 ## Capabilities
 

package/cli.ts

@@ -5,6 +5,7 @@ import {
   createSetupCommandLogger,
   ensureMcporterConfig,
   getAppBaseUrl,
+  getSetupAuthWaitMode,
   getSetupGatewayRestartEnabled,
   getSkillDir,
   injectSandboxEnv,
@@ -16,6 +17,7 @@ import {
 type CliConfig = {
   appBaseUrl?: string;
   skillName?: string;
+  workspacePath?: string;
 };
 
 type ParsedArgs = {
@@ -35,7 +37,7 @@ Usage:
 
 Commands:
   setup             Run MoltBank setup
-  setup-blocking    Alias for setup
+  setup-blocking    Run setup and wait for approval
   status            Show current MoltBank auth state
   auth-status       Alias for status
   sandbox-setup     Reconfigure sandbox Docker settings in openclaw.json
@@ -45,15 +47,18 @@ Commands:
 Options:
   --app-base-url <url>  Override MoltBank deployment URL
   --skill-name <name>   Override skill folder name
-  --blocking            Compatibility flag; setup already waits for approval
+  --workspace <path>    Override OpenClaw workspace path
+  --blocking            Wait for browser approval before setup exits
   --restart-gateway     Force gateway restart after successful host setup
-  --no-restart-gateway  Skip gateway restart after successful host setup
+  --no-restart-gateway  Skip gateway restart after successful host setup (default)
   --verbose             Show detailed setup logs
   -h, --help            Show help
   -v, --version         Show package version
 
 Examples:
   moltbank setup
+  moltbank setup --workspace ~/.openclaw/workspace
+  moltbank setup --blocking
   moltbank setup --verbose
   moltbank status
   moltbank register --app-base-url https://app.moltbank.bot
@@ -137,6 +142,21 @@ function parseArgs(argv: string[]): ParsedArgs {
       continue;
     }
 
+    if (arg === '--workspace') {
+      const value = argv[index + 1];
+      if (!value) {
+        throw new Error('missing value for --workspace');
+      }
+      config.workspacePath = value;
+      index += 1;
+      continue;
+    }
+
+    if (arg.startsWith('--workspace=')) {
+      config.workspacePath = arg.slice('--workspace='.length);
+      continue;
+    }
+
     if (arg.startsWith('-')) {
       throw new Error(`unknown option: ${arg}`);
     }
@@ -160,10 +180,11 @@ async function runCommand(parsed: ParsedArgs): Promise<void> {
 
   switch (parsed.command) {
     case 'setup': {
-      const restartGatewayOnSuccess = parsed.restartGateway ?? getSetupGatewayRestartEnabled(process.platform === 'win32');
+      const restartGatewayOnSuccess = parsed.restartGateway ?? getSetupGatewayRestartEnabled(false);
       const logger = createSetupCommandLogger({ verbose: parsed.verbose, statusCommand: 'moltbank status' });
+      const authWaitMode = parsed.blocking ? 'blocking' : getSetupAuthWaitMode('nonblocking');
       try {
-        await runSetup(cfg, logger, { authWaitMode: 'blocking', restartGatewayOnSuccess });
+        await runSetup(cfg, logger, { authWaitMode, restartGatewayOnSuccess });
       } finally {
         logger.finish();
       }
@@ -171,7 +192,7 @@ async function runCommand(parsed: ParsedArgs): Promise<void> {
     }
 
     case 'setup-blocking': {
-      const restartGatewayOnSuccess = parsed.restartGateway ?? getSetupGatewayRestartEnabled(process.platform === 'win32');
+      const restartGatewayOnSuccess = parsed.restartGateway ?? getSetupGatewayRestartEnabled(false);
       const logger = createSetupCommandLogger({ verbose: parsed.verbose, statusCommand: 'moltbank status' });
       try {
         await runSetup(cfg, logger, { authWaitMode: 'blocking', restartGatewayOnSuccess });

package/index.ts

@@ -1,6 +1,6 @@
 import { spawn, spawnSync } from 'child_process';
 import { chmodSync, chownSync, existsSync, mkdirSync, readdirSync, readFileSync, unlinkSync, writeFileSync, type Dirent } from 'fs';
-import { join, dirname, basename } from 'path';
+import { join, dirname, basename, resolve } from 'path';
 import { homedir, userInfo } from 'os';
 const IS_WIN = process.platform === 'win32';
 
@@ -10,6 +10,7 @@ type ParsedJsonObject = Record<string, unknown>;
 export interface MoltbankConfig {
   skillName?: string;
   appBaseUrl?: string;
+  workspacePath?: string;
 }
 
 interface CredentialsOrganization {
@@ -391,9 +392,13 @@ function resolveWindowsCommandPath(command: string, env: NodeJS.ProcessEnv): str
   const extensions = getWindowsCommandExtensions(env);
 
   const tryCandidates = (basePath: string): string => {
-    if (existsSync(basePath)) return basePath;
-
     const lower = basePath.toLowerCase();
+    const hasKnownExtension = extensions.some((ext) => lower.endsWith(ext));
+
+    if (hasKnownExtension && existsSync(basePath)) {
+      return basePath;
+    }
+
     for (const ext of extensions) {
       if (lower.endsWith(ext)) continue;
       const candidate = `${basePath}${ext}`;
@@ -402,6 +407,10 @@ function resolveWindowsCommandPath(command: string, env: NodeJS.ProcessEnv): str
       }
     }
 
+    if (existsSync(basePath)) {
+      return basePath;
+    }
+
     return '';
   };
 
@@ -886,8 +895,30 @@ function lastNonEmptyLine(text: string): string {
   return lines.length ? lines[lines.length - 1] : '';
 }
 
-function getWorkspace(): string {
-  return process.env.OPENCLAW_WORKSPACE || join(homedir(), '.openclaw', 'workspace');
+function normalizeWorkspacePath(rawPath: string): string {
+  const trimmed = rawPath.trim();
+  if (!trimmed) {
+    return join(homedir(), '.openclaw', 'workspace');
+  }
+
+  if (trimmed === '~') {
+    return homedir();
+  }
+
+  if (trimmed.startsWith('~/') || trimmed.startsWith('~\\')) {
+    return resolve(join(homedir(), trimmed.slice(2)));
+  }
+
+  return resolve(trimmed);
+}
+
+export function getWorkspace(cfg?: MoltbankConfig): string {
+  return normalizeWorkspacePath(cfg?.workspacePath || process.env.OPENCLAW_WORKSPACE || join(homedir(), '.openclaw', 'workspace'));
+}
+
+function getWorkspaceFromSkillDir(skillDir: string): string {
+  const skillsDir = dirname(skillDir);
+  return basename(skillsDir) === 'skills' ? dirname(skillsDir) : getWorkspace();
 }
 
 export function getSkillName(cfg: MoltbankConfig): string {
@@ -916,7 +947,7 @@ function isSandboxEnabled(): boolean {
 
 export function getSkillDir(cfg: MoltbankConfig): string {
   const skillName = getSkillName(cfg);
-  return join(getWorkspace(), 'skills', skillName);
+  return join(getWorkspace(cfg), 'skills', skillName);
 }
 
 function getCredentialsPath(): string {
@@ -1626,6 +1657,7 @@ function startBackgroundFinalizeAfterAuth(skillDir: string, appBaseUrl: string,
     env: {
       ...process.env,
       APP_BASE_URL: appBaseUrl,
+      OPENCLAW_WORKSPACE: getWorkspaceFromSkillDir(skillDir),
       MOLTBANK_SETUP_AUTH_WAIT_MODE: 'blocking'
     },
     stdio: 'ignore', // Ignore logs so it doesn't hang the parent
@@ -2303,7 +2335,11 @@ export async function runSetup(
     api.logger.info('[moltbank] [host 8/8] running readiness balance check...');
     hostReady = runHostReadinessCheck(skillDir, api);
 
-    api.logger.info('[moltbank] host mode — setup completed with onboarding flow');
+    if (hostReady) {
+      api.logger.info('[moltbank] host mode — setup completed with onboarding flow');
+    } else {
+      api.logger.warn('[moltbank] host mode setup finished, but operational readiness verification failed');
+    }
 
     if (hostReady && restartGatewayOnSuccess) {
       restartGatewayAfterHostSetup(api);
@@ -2311,13 +2347,19 @@ export async function runSetup(
   }
 
   api.logger.info(`[moltbank] ══════════════════════════════════════`);
-  api.logger.info(`[moltbank] ✓ setup complete`);
+  if (sandbox || hostReady) {
+    api.logger.info(`[moltbank] ✓ setup complete`);
+  } else {
+    api.logger.warn('[moltbank] ✗ setup incomplete');
+  }
   if (sandbox) {
     api.logger.info('[moltbank] ⏳ sandbox will be recreated in ~8s — send a message to the agent after that');
   } else if (hostReady) {
     api.logger.info('[moltbank] ✓ host ready');
+  } else {
+    api.logger.warn('[moltbank] ✗ host not ready');
   }
-  api.logger.info(`[moltbank]   skill:    ${skillDir}/SKILL.md`);
+  api.logger.info(`[moltbank]   skill:    ${skillDir}/skill/SKILL.md`);
   api.logger.info(`[moltbank]   mcporter: ${skillDir}/assets/mcporter.json`);
   if (sandbox) {
     const finalConfig = readOpenclawConfig();
@@ -2359,5 +2401,9 @@ export async function runSetup(
     }
   }
   api.logger.info(`[moltbank] ══════════════════════════════════════`);
+
+  if (!sandbox && !hostReady) {
+    throw new Error('host setup incomplete: authenticated readiness verification failed');
+  }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@moltbankhq/openclaw",
-    "version": "0.1.15",
+    "version": "0.1.17",
     "description": "MoltBank stablecoin treasury CLI and OpenClaw skill installer",
     "homepage": "https://github.com/moltbankhq/openclaw-plugin#readme",
     "repository": {