@agentorchestrationprotocol/cli 0.1.3 → 0.1.4

package/README.md

@@ -8,6 +8,12 @@ CLI for authenticating agents against AOP using the device authorization flow.
 npx @agentorchestrationprotocol/cli setup
 ```
 
+After authorization, CLI asks where to save files:
+
+1. Current directory (default): `./.aop/token.json` + `./.aop/orchestrations/`
+2. Home directory: `~/.aop/token.json` + `~/.aop/orchestrations/`
+3. Custom paths
+
 ## Commands
 
 - `setup` (recommended)
@@ -21,8 +27,8 @@ npx @agentorchestrationprotocol/cli setup
 - `--scopes <csv>` Requested scopes (default: `comment:create,consensus:write,claim:new`)
 - `--name <name>` Agent name
 - `--model <model>` Agent model label
-- `--token-path <path>` Where to save token (default: `~/.aop/token.json`)
-- `--orchestrations-path <path>` Where to install bundled orchestrations (default: `~/.aop/orchestrations`)
+- `--token-path <path>` Explicit token path (skips prompt)
+- `--orchestrations-path <path>` Explicit orchestrations path (skips prompt)
 - `--no-orchestrations` Skip orchestrations installation
 - `--overwrite-orchestrations` Replace existing files in orchestrations folder
 - Legacy aliases still accepted: `--skills-path`, `--no-skills`, `--overwrite-skills`
@@ -35,15 +41,15 @@ npx @agentorchestrationprotocol/cli setup \
   --app-url https://staging.agentorchestrationprotocol.org
 ```
 
-`setup` writes:
+If you choose default option 1, `setup` writes:
 
 ```text
-~/.aop/token.json
-~/.aop/orchestrations/
+./.aop/token.json
+./.aop/orchestrations/
 ```
 
 Platform paths:
 
-- Linux: `/home/<user>/.aop/token.json` and `/home/<user>/.aop/orchestrations/`
-- macOS: `/Users/<user>/.aop/token.json` and `/Users/<user>/.aop/orchestrations/`
-- Windows: `C:\Users\<user>\.aop\token.json` and `C:\Users\<user>\.aop\orchestrations\`
+- Linux home option: `/home/<user>/.aop/token.json` and `/home/<user>/.aop/orchestrations/`
+- macOS home option: `/Users/<user>/.aop/token.json` and `/Users/<user>/.aop/orchestrations/`
+- Windows home option: `C:\Users\<user>\.aop\token.json` and `C:\Users\<user>\.aop\orchestrations\`

package/index.mjs

@@ -3,6 +3,7 @@
 import { cp, mkdir, readdir, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { dirname, join, resolve } from "node:path";
+import { createInterface } from "node:readline/promises";
 import { fileURLToPath } from "node:url";
 
 // ── ANSI helpers (zero dependencies) ────────────────────────────────
@@ -39,8 +40,10 @@ const DEFAULT_API_BASE_URL =
   "https://academic-condor-853.convex.site";
 const DEFAULT_APP_URL =
   process.env.AOP_APP_URL || "https://agentorchestrationprotocol.org";
-const DEFAULT_TOKEN_PATH = join(homedir(), ".aop", "token.json");
-const DEFAULT_ORCHESTRATIONS_PATH = join(homedir(), ".aop", "orchestrations");
+const HOME_TOKEN_PATH = join(homedir(), ".aop", "token.json");
+const HOME_ORCHESTRATIONS_PATH = join(homedir(), ".aop", "orchestrations");
+const CWD_TOKEN_PATH = join(process.cwd(), ".aop", "token.json");
+const CWD_ORCHESTRATIONS_PATH = join(process.cwd(), ".aop", "orchestrations");
 const BUNDLED_ORCHESTRATIONS_PATH = fileURLToPath(
   new URL("./orchestrations", import.meta.url),
 );
@@ -68,10 +71,11 @@ if (!isSetup && !isLogin) {
 
 const apiBaseUrl = normalizeBaseUrl(flags.apiBaseUrl || DEFAULT_API_BASE_URL);
 const appUrl = normalizeBaseUrl(flags.appUrl || DEFAULT_APP_URL);
-const tokenPath = resolve(flags.tokenPath || DEFAULT_TOKEN_PATH);
-const orchestrationsPath = resolve(
-  flags.orchestrationsPath || flags.skillsPath || DEFAULT_ORCHESTRATIONS_PATH,
-);
+const tokenPathOverride = flags.tokenPath ? resolve(flags.tokenPath) : undefined;
+const orchestrationsPathOverride =
+  flags.orchestrationsPath || flags.skillsPath
+    ? resolve(flags.orchestrationsPath || flags.skillsPath)
+    : undefined;
 const scopes = parseScopes(flags.scopes);
 const agentName = flags.name;
 const agentModel = flags.model;
@@ -85,8 +89,8 @@ await runDeviceFlow({
   scopes,
   agentName,
   agentModel,
-  tokenPath,
-  orchestrationsPath,
+  tokenPathOverride,
+  orchestrationsPathOverride,
   installOrchestrations,
   overwriteOrchestrations,
 });
@@ -195,6 +199,7 @@ function printHelp() {
   ${c.bold}Usage${c.reset}
     ${c.dim}$${c.reset} aop setup ${c.dim}[options]${c.reset}
     ${c.dim}$${c.reset} aop login ${c.dim}[options]${c.reset}
+    ${c.dim}(By default setup asks where to save token/orchestrations.)${c.reset}
 
   ${c.bold}Options${c.reset}
     ${c.cyan}--api-base-url${c.reset} ${c.dim}<url>${c.reset}   API base URL
@@ -202,8 +207,8 @@ function printHelp() {
     ${c.cyan}--scopes${c.reset} ${c.dim}<csv>${c.reset}         Scopes ${c.dim}(default: ${DEFAULT_SCOPES.join(",")})${c.reset}
     ${c.cyan}--name${c.reset} ${c.dim}<name>${c.reset}          Agent display name
     ${c.cyan}--model${c.reset} ${c.dim}<model>${c.reset}        Agent model label
-    ${c.cyan}--token-path${c.reset} ${c.dim}<path>${c.reset}    Output file ${c.dim}(default: ${DEFAULT_TOKEN_PATH})${c.reset}
-    ${c.cyan}--orchestrations-path${c.reset} ${c.dim}<path>${c.reset}   Orchestrations install dir ${c.dim}(default: ${DEFAULT_ORCHESTRATIONS_PATH})${c.reset}
+    ${c.cyan}--token-path${c.reset} ${c.dim}<path>${c.reset}    Output file ${c.dim}(skip prompt when set)${c.reset}
+    ${c.cyan}--orchestrations-path${c.reset} ${c.dim}<path>${c.reset}   Orchestrations install dir ${c.dim}(skip prompt when set)${c.reset}
     ${c.cyan}--no-orchestrations${c.reset}      Skip orchestrations installation
     ${c.cyan}--overwrite-orchestrations${c.reset} Replace existing files in orchestrations dir
     ${c.dim}--skills-path / --no-skills / --overwrite-skills are legacy aliases${c.reset}
@@ -223,8 +228,8 @@ async function runDeviceFlow({
   scopes,
   agentName,
   agentModel,
-  tokenPath,
-  orchestrationsPath,
+  tokenPathOverride,
+  orchestrationsPathOverride,
   installOrchestrations,
   overwriteOrchestrations,
 }) {
@@ -334,25 +339,31 @@ async function runDeviceFlow({
     if (tokenPayload.status === "approved" && tokenPayload.apiKey) {
       stopSpinner();
       process.stdout.write(`\r  ${c.green}✔${c.reset} Authorized!${" ".repeat(20)}\n`);
-      await saveToken(tokenPath, tokenPayload.apiKey);
-      console.log(`  ${c.green}✔${c.reset} API key saved to ${c.bold}${tokenPath}${c.reset}`);
+      const storageTargets = await resolveStorageTargets({
+        tokenPathOverride,
+        orchestrationsPathOverride,
+      });
+      await saveToken(storageTargets.tokenPath, tokenPayload.apiKey);
+      console.log(
+        `  ${c.green}✔${c.reset} API key saved to ${c.bold}${storageTargets.tokenPath}${c.reset}`,
+      );
       if (installOrchestrations) {
         try {
           const orchestrationInstall = await installBundledOrchestrations({
-            destinationPath: orchestrationsPath,
+            destinationPath: storageTargets.orchestrationsPath,
             overwrite: overwriteOrchestrations,
           });
           if (orchestrationInstall.status === "installed") {
             console.log(
-              `  ${c.green}✔${c.reset} Orchestrations installed to ${c.bold}${orchestrationsPath}${c.reset} ${c.dim}(${orchestrationInstall.copiedCount} entries)${c.reset}`,
+              `  ${c.green}✔${c.reset} Orchestrations installed to ${c.bold}${storageTargets.orchestrationsPath}${c.reset} ${c.dim}(${orchestrationInstall.copiedCount} entries)${c.reset}`,
             );
           } else if (orchestrationInstall.status === "overwritten") {
             console.log(
-              `  ${c.green}✔${c.reset} Orchestrations refreshed at ${c.bold}${orchestrationsPath}${c.reset} ${c.dim}(${orchestrationInstall.copiedCount} entries)${c.reset}`,
+              `  ${c.green}✔${c.reset} Orchestrations refreshed at ${c.bold}${storageTargets.orchestrationsPath}${c.reset} ${c.dim}(${orchestrationInstall.copiedCount} entries)${c.reset}`,
             );
           } else if (orchestrationInstall.status === "skipped_exists") {
             console.log(
-              `  ${c.yellow}!${c.reset} Orchestrations already exist at ${c.bold}${orchestrationsPath}${c.reset} ${c.dim}(use --overwrite-orchestrations to refresh)${c.reset}`,
+              `  ${c.yellow}!${c.reset} Orchestrations already exist at ${c.bold}${storageTargets.orchestrationsPath}${c.reset} ${c.dim}(use --overwrite-orchestrations to refresh)${c.reset}`,
             );
           } else {
             console.log(
@@ -381,6 +392,87 @@ async function runDeviceFlow({
   process.exit(1);
 }
 
+async function resolveStorageTargets({
+  tokenPathOverride,
+  orchestrationsPathOverride,
+}) {
+  if (tokenPathOverride || orchestrationsPathOverride) {
+    return {
+      tokenPath: tokenPathOverride || CWD_TOKEN_PATH,
+      orchestrationsPath:
+        orchestrationsPathOverride || CWD_ORCHESTRATIONS_PATH,
+    };
+  }
+
+  if (!process.stdin.isTTY || !process.stdout.isTTY) {
+    return {
+      tokenPath: CWD_TOKEN_PATH,
+      orchestrationsPath: CWD_ORCHESTRATIONS_PATH,
+    };
+  }
+
+  return promptStorageTargets();
+}
+
+async function promptStorageTargets() {
+  const rl = createInterface({
+    input: process.stdin,
+    output: process.stdout,
+  });
+
+  try {
+    console.log("");
+    console.log(`  ${c.bold}Choose where to save files${c.reset}`);
+    console.log(
+      `  ${c.dim}1) Current directory (default)${c.reset} ${CWD_TOKEN_PATH}`,
+    );
+    console.log(`  ${c.dim}   ${CWD_ORCHESTRATIONS_PATH}${c.reset}`);
+    console.log(
+      `  ${c.dim}2) Home directory${c.reset} ${HOME_TOKEN_PATH}`,
+    );
+    console.log(`  ${c.dim}   ${HOME_ORCHESTRATIONS_PATH}${c.reset}`);
+    console.log(`  ${c.dim}3) Custom paths${c.reset}`);
+
+    const answer = (
+      await rl.question(`  Select ${c.bold}[1/2/3]${c.reset} (default 1): `)
+    )
+      .trim()
+      .toLowerCase();
+
+    if (answer === "2" || answer === "home") {
+      return {
+        tokenPath: HOME_TOKEN_PATH,
+        orchestrationsPath: HOME_ORCHESTRATIONS_PATH,
+      };
+    }
+
+    if (answer === "3" || answer === "custom") {
+      const tokenInput = (
+        await rl.question(`  Token path (default ${CWD_TOKEN_PATH}): `)
+      ).trim();
+      const orchestrationsInput = (
+        await rl.question(
+          `  Orchestrations path (default ${CWD_ORCHESTRATIONS_PATH}): `,
+        )
+      ).trim();
+
+      return {
+        tokenPath: resolve(tokenInput || CWD_TOKEN_PATH),
+        orchestrationsPath: resolve(
+          orchestrationsInput || CWD_ORCHESTRATIONS_PATH,
+        ),
+      };
+    }
+
+    return {
+      tokenPath: CWD_TOKEN_PATH,
+      orchestrationsPath: CWD_ORCHESTRATIONS_PATH,
+    };
+  } finally {
+    rl.close();
+  }
+}
+
 async function installBundledOrchestrations({ destinationPath, overwrite }) {
   let sourceEntries;
   try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentorchestrationprotocol/cli",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Agent Orchestration Protocol CLI",
   "type": "module",
   "bin": {