From 9ca0aac87a5c8da6f619f080429292a3b52c779f Mon Sep 17 00:00:00 2001
From: Alan Shaw <alan.shaw@protocol.ai>
Date: Mon, 14 Nov 2022 10:53:59 +0000
Subject: [PATCH] feat: some progress

---
 packages/cli/package.json      |  2 ++
 packages/cli/src/cmd-upload.js |  3 +--
 packages/cli/src/config.js     |  2 ++
 packages/cli/src/index.js      | 17 +++++------------
 pnpm-lock.yaml                 |  4 ++++
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 32ade0920..f63e8ff91 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -17,10 +17,12 @@
     "@web3-storage/upload-client": "workspace:^",
     "conf": "^10.1.2",
     "files-from-path": "^0.2.6",
+    "inquirer": "^9.1.4",
     "ora": "^6.1.2",
     "sade": "^1.7.4"
   },
   "devDependencies": {
+    "@types/inquirer": "^9.0.2",
     "@types/node": "^18.11.7"
   }
 }
diff --git a/packages/cli/src/cmd-upload.js b/packages/cli/src/cmd-upload.js
index db64474a4..4a555a888 100644
--- a/packages/cli/src/cmd-upload.js
+++ b/packages/cli/src/cmd-upload.js
@@ -3,7 +3,6 @@ import fs from 'fs'
 import path from 'path'
 import { uploadFile, uploadDirectory, delegateCapabilities } from '@web3-storage/upload-client'
 import { Agent } from '@web3-storage/access'
-import { getService } from '@web3-storage/access/cli/utils'
 import { StoreConf } from '@web3-storage/access/stores/store-conf'
 import ora from 'ora'
 import { filesFromPath } from 'files-from-path'
@@ -28,7 +27,7 @@ export async function cmdUpload (firstPath, opts) {
 
   const exists = await store.exists()
   if (!exists) {
-    console.error('run setup command first.')
+    console.error('run account create command first.')
     process.exit(1)
   }
 
diff --git a/packages/cli/src/config.js b/packages/cli/src/config.js
index 7be12ba76..1af19fdb5 100644
--- a/packages/cli/src/config.js
+++ b/packages/cli/src/config.js
@@ -6,3 +6,5 @@ export const pkg = JSON.parse(
 )
 
 export const NAME = pkg.name.split('/').pop()
+
+export const SERVICE_URL = new URL(process.env.SERVICE_URL ?? 'https://w3access-staging.protocol-labs.workers.dev')
diff --git a/packages/cli/src/index.js b/packages/cli/src/index.js
index b2b1e3032..6734fcbdf 100755
--- a/packages/cli/src/index.js
+++ b/packages/cli/src/index.js
@@ -1,26 +1,19 @@
 #!/usr/bin/env node
 import sade from 'sade'
-import { cmdSetup } from '@web3-storage/access/cli/cmd-setup'
-import { cmdCreateAccount } from '@web3-storage/access/cli/cmd-create-account'
 import { NAME, pkg } from './config.js'
+import { cmdAccountRegister } from './cmd-account-create.js'
 import { cmdUpload } from './cmd-upload.js'
 
 const prog = sade(NAME)
 
 prog
   .version(pkg.version)
-  .option('--env', 'Env', 'staging')
+  .option('--profile', 'Profile to use', 'main')
 
 prog
-  .command('setup')
-  .option('--reset', 'Reset current store.', false)
-  .describe('Setup the web3.storage CLI tool.')
-  .action(cmdSetup)
-
-prog
-  .command('account create')
-  .describe('Create a new account.')
-  .action(cmdCreateAccount)
+  .command('account register <email>')
+  .describe('Register a new account.')
+  .action(cmdAccountRegister)
 
 prog
   .command('upload <path>')
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6db5ee2a5..ac097f955 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -261,11 +261,13 @@ importers:
 
   packages/cli:
     specifiers:
+      '@types/inquirer': ^9.0.2
       '@types/node': ^18.11.7
       '@web3-storage/access': workspace:^
       '@web3-storage/upload-client': workspace:^
       conf: ^10.1.2
       files-from-path: ^0.2.6
+      inquirer: ^9.1.4
       ora: ^6.1.2
       sade: ^1.7.4
     dependencies:
@@ -273,9 +275,11 @@ importers:
       '@web3-storage/upload-client': link:../upload-client
       conf: 10.2.0
       files-from-path: 0.2.6
+      inquirer: 9.1.4
       ora: 6.1.2
       sade: 1.8.1
     devDependencies:
+      '@types/inquirer': 9.0.2
       '@types/node': 18.11.9
 
   packages/store: