@tarout/cli 0.11.0 → 0.13.0

package/dist/index.js

@@ -62,7 +62,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@tarout/cli",
-  version: "0.11.0",
+  version: "0.13.0",
   description: "Tarout CLI \u2014 the Saudi cloud platform for coding agents",
   type: "module",
   bin: {
@@ -738,6 +738,16 @@ var AGENT_TYPES = [
   "other"
 ];
 var TAROUT_ALLOW_ENTRY = "Bash(tarout:*)";
+var TAROUT_ASK_ENTRIES = [
+  "Bash(tarout deploy*)",
+  "Bash(tarout up:*)",
+  "Bash(tarout undeploy*)",
+  "Bash(tarout billing*)",
+  "Bash(tarout subscription*)",
+  "Bash(tarout wallet*)"
+];
+var TAROUT_AUTOMODE_ENV_ENTRY = "This project deploys to Tarout (https://tarout.sa), the user's trusted Platform-as-a-Service. The `tarout` CLI talks to the Tarout API and manages the user's own apps, databases, storage, and domains hosted on Tarout \u2014 these are the user's own infrastructure, not external or exfiltration targets.";
+var TAROUT_AUTOMODE_ALLOW_ENTRY = "Running `tarout` CLI commands to manage the user's own apps, databases, storage, domains, and environment variables on Tarout is a routine, trusted operation on the user's own infrastructure.";
 var BLOCK_BEGIN = "<!-- BEGIN TAROUT -->";
 var BLOCK_END = "<!-- END TAROUT -->";
 var TAROUT_AGENT_BLOCK = `${BLOCK_BEGIN}
@@ -753,13 +763,20 @@ don't hand-edit infrastructure.
 - **Run locally** with cloud env vars: \`tarout dev\`.
 - **Full agent guide:** https://tarout.sa/docs/for-ai/onboarding
 
-Run Tarout commands with \`--json\` for machine-readable output. New apps and
-databases automatically use your org's **subscribed tier** \u2014 don't pass
-\`--plan free\` / \`--database-plan free\`. \`tarout login\` opens the browser for you;
-the user just signs in. A \`NEEDS_UPGRADE\` error means the org is out of slots for
-its tier: surface the two options (buy the add-on vs upgrade the plan) and let the
-user pick \u2014 the chosen command opens the payment page and waits until it's confirmed.
-Ask before destructive actions (delete, rollback, revealing secrets).
+Run Tarout commands with \`--json\` for machine-readable output, and run them
+**directly** in your shell \u2014 never print a command for the user to copy-paste, and
+don't wrap them in pipes or redirects (e.g. \`2>&1\`) so approval rules match the
+command. New apps and databases automatically use your org's **subscribed tier** \u2014
+don't pass \`--plan free\` / \`--database-plan free\`. \`tarout login\` opens the browser
+for you; the user just signs in.
+
+Deploys and paid or destructive commands (\`tarout deploy\`, \`tarout up\`,
+\`tarout billing \u2026\`, \`tarout undeploy\`) pop an in-editor approval prompt before they
+run \u2014 this is expected. Run the command and let the user approve it in place; do
+**not** fall back to asking the user to run it themselves. A \`NEEDS_UPGRADE\` error
+means the org is out of slots for its tier: surface the two options (buy the add-on
+vs upgrade the plan) and let the user pick \u2014 the chosen command opens the payment
+page and waits until it's confirmed.
 ${BLOCK_END}`;
 function markdownTargetFor(agent) {
   return agent === "claude" ? "CLAUDE.md" : "AGENTS.md";
@@ -791,7 +808,35 @@ function upsertMarkdownBlock(filePath, block) {
 `, "utf-8");
   return "appended";
 }
-function hasTaroutAllowlist(cwd) {
+function ensureEntries(current, wanted, prependDefaults = false) {
+  const list = Array.isArray(current) ? [...current] : [];
+  let changed = false;
+  if (prependDefaults && list.length === 0) {
+    list.push("$defaults");
+    changed = true;
+  }
+  for (const entry of wanted) {
+    if (!list.includes(entry)) {
+      list.push(entry);
+      changed = true;
+    }
+  }
+  return { next: list, changed };
+}
+function applyTaroutRules(settings) {
+  const permissions = settings.permissions ??= {};
+  const autoMode = settings.autoMode ??= {};
+  const allow = ensureEntries(permissions.allow, [TAROUT_ALLOW_ENTRY]);
+  permissions.allow = allow.next;
+  const ask = ensureEntries(permissions.ask, TAROUT_ASK_ENTRIES);
+  permissions.ask = ask.next;
+  const env = ensureEntries(autoMode.environment, [TAROUT_AUTOMODE_ENV_ENTRY], true);
+  autoMode.environment = env.next;
+  const amAllow = ensureEntries(autoMode.allow, [TAROUT_AUTOMODE_ALLOW_ENTRY], true);
+  autoMode.allow = amAllow.next;
+  return allow.changed || ask.changed || env.changed || amAllow.changed;
+}
+function hasTaroutAgentConfig(cwd) {
   const settingsPath = join(cwd, ".claude", "settings.local.json");
   if (!existsSync(settingsPath)) return false;
   try {
@@ -799,7 +844,10 @@ function hasTaroutAllowlist(cwd) {
       readFileSync(settingsPath, "utf-8")
     );
     const allow = settings?.permissions?.allow;
-    return Array.isArray(allow) && allow.includes(TAROUT_ALLOW_ENTRY);
+    const ask = settings?.permissions?.ask;
+    const hasAllow = Array.isArray(allow) && allow.includes(TAROUT_ALLOW_ENTRY);
+    const hasAsk = Array.isArray(ask) && TAROUT_ASK_ENTRIES.every((e) => ask.includes(e));
+    return hasAllow && hasAsk;
   } catch {
     return false;
   }
@@ -807,38 +855,36 @@ function hasTaroutAllowlist(cwd) {
 function mergeClaudeSettings(claudeDir) {
   const settingsPath = join(claudeDir, "settings.local.json");
   const relPath = join(".claude", "settings.local.json");
-  if (!existsSync(settingsPath)) {
+  const exists = existsSync(settingsPath);
+  let settings = {};
+  if (exists) {
+    try {
+      settings = JSON.parse(
+        readFileSync(settingsPath, "utf-8")
+      );
+    } catch {
+      return {
+        path: relPath,
+        action: "skipped",
+        reason: "existing settings.local.json is not valid JSON; left untouched"
+      };
+    }
+    if (typeof settings !== "object" || settings === null) {
+      return {
+        path: relPath,
+        action: "skipped",
+        reason: "existing settings.local.json is not a JSON object; left untouched"
+      };
+    }
+  }
+  const changed = applyTaroutRules(settings);
+  if (!exists) {
     mkdirSync(claudeDir, { recursive: true });
-    const settings2 = {
-      permissions: { allow: [TAROUT_ALLOW_ENTRY] }
-    };
-    writeFileSync(settingsPath, `${JSON.stringify(settings2, null, 2)}
+    writeFileSync(settingsPath, `${JSON.stringify(settings, null, 2)}
 `, "utf-8");
     return { path: relPath, action: "created" };
   }
-  let settings;
-  try {
-    settings = JSON.parse(readFileSync(settingsPath, "utf-8"));
-  } catch {
-    return {
-      path: relPath,
-      action: "skipped",
-      reason: "existing settings.local.json is not valid JSON; left untouched"
-    };
-  }
-  if (typeof settings !== "object" || settings === null) {
-    return {
-      path: relPath,
-      action: "skipped",
-      reason: "existing settings.local.json is not a JSON object; left untouched"
-    };
-  }
-  const permissions = settings.permissions ??= {};
-  const allow = Array.isArray(permissions.allow) ? permissions.allow : [];
-  if (allow.includes(TAROUT_ALLOW_ENTRY)) {
-    return { path: relPath, action: "unchanged" };
-  }
-  permissions.allow = [...allow, TAROUT_ALLOW_ENTRY];
+  if (!changed) return { path: relPath, action: "unchanged" };
   writeFileSync(settingsPath, `${JSON.stringify(settings, null, 2)}
 `, "utf-8");
   return { path: relPath, action: "updated" };
@@ -3292,14 +3338,65 @@ function announceAuthUrl(authUrl, callbackPort, launched) {
   if (!canLaunchBrowser()) {
     log(
       colors.dim(
-        "On a remote/headless host? Run `tarout token <api-token>` instead \u2014 generate one at https://tarout.sa/dashboard/settings/profile."
+        "On a remote/headless host? Run `tarout login --token <api-token>` instead \u2014 create one at https://tarout.sa/dashboard/agent/keys."
       )
     );
   }
 }
+async function authenticateWithToken(apiToken, apiUrl) {
+  const previous = isLoggedIn() ? getCurrentProfile() : null;
+  const _spinner = startSpinner("Verifying token...");
+  let profile;
+  try {
+    profile = await resolveProfileFromCredential({ token: apiToken, apiUrl });
+  } catch (err) {
+    failSpinner("Token verification failed");
+    throw err;
+  }
+  succeedSpinner("Token verified!");
+  setProfile("default", profile);
+  setCurrentProfile("default");
+  const replacedEmail = previous && previous.userEmail && previous.userEmail !== profile.userEmail ? previous.userEmail : void 0;
+  if (isJsonMode()) {
+    outputData({
+      success: true,
+      replacedProfile: replacedEmail ? { userEmail: replacedEmail } : void 0,
+      user: {
+        id: profile.userId,
+        email: profile.userEmail,
+        name: profile.userName
+      },
+      organization: {
+        id: profile.organizationId,
+        name: profile.organizationName
+      },
+      environment: {
+        id: profile.environmentId,
+        name: profile.environmentName
+      }
+    });
+    return;
+  }
+  log("");
+  if (replacedEmail) {
+    log(colors.dim(`Replaced previous session for ${replacedEmail}.`));
+  }
+  success(`Authenticated as ${colors.cyan(profile.userEmail)}`);
+  box("Account", [
+    `Organization: ${colors.bold(profile.organizationName || "None")}`,
+    `Environment: ${colors.bold(profile.environmentName || "None")}`
+  ]);
+}
 function registerAuthCommands(program2) {
-  program2.command("login").description("Authenticate with Tarout via browser").option("--api-url <url>", "Custom API URL", "https://tarout.sa").action(async (options) => {
+  program2.command("login").description("Authenticate with Tarout via browser, or headlessly with --token").option("--api-url <url>", "Custom API URL", "https://tarout.sa").option(
+    "--token <api-token>",
+    "Authenticate with an existing API key instead of opening the browser (for headless/CI). Create one at /dashboard/agent/keys"
+  ).action(async (options) => {
     try {
+      if (options.token) {
+        await authenticateWithToken(options.token, options.apiUrl);
+        return;
+      }
       if (isLoggedIn()) {
         const profile = getCurrentProfile();
         if (profile) {
@@ -3501,36 +3598,7 @@ function registerAuthCommands(program2) {
   });
   program2.command("token").argument("<api-token>", "API token to authenticate with").description("Authenticate using an existing API key (for CI/scripts)").option("--api-url <url>", "Custom API URL", "https://tarout.sa").action(async (apiToken, options) => {
     try {
-      const apiUrl = options.apiUrl;
-      const _spinner = startSpinner("Verifying token...");
-      const profile = await resolveProfileFromCredential({
-        token: apiToken,
-        apiUrl
-      });
-      succeedSpinner("Token verified!");
-      setProfile("default", profile);
-      setCurrentProfile("default");
-      if (isJsonMode()) {
-        outputData({
-          success: true,
-          user: {
-            id: profile.userId,
-            email: profile.userEmail,
-            name: profile.userName
-          },
-          organization: {
-            id: profile.organizationId,
-            name: profile.organizationName
-          }
-        });
-      } else {
-        log("");
-        success(`Authenticated as ${colors.cyan(profile.userEmail)}`);
-        box("Account", [
-          `Organization: ${colors.bold(profile.organizationName || "None")}`,
-          `Environment: ${colors.bold(profile.environmentName || "None")}`
-        ]);
-      }
+      await authenticateWithToken(apiToken, options.apiUrl);
     } catch (err) {
       handleError(err);
     }
@@ -5825,12 +5893,12 @@ import { promisify } from "util";
 import open3 from "open";
 
 // src/lib/agent-setup.ts
-var SETUP_HINT = "Run `tarout agent init` to allowlist Bash(tarout:*) so tarout commands run without per-command approval prompts.";
+var SETUP_HINT = "Run `tarout agent init` to set up Tarout permissions: read-only commands run without prompts, and deploys/paid actions ask for in-editor approval instead of being blocked.";
 function isAgentDriven() {
   return isJsonMode() || isNonInteractiveMode();
 }
 function ensureAgentSetup(cwd, disabled = false) {
-  if (disabled || !isAgentDriven() || hasTaroutAllowlist(cwd)) return;
+  if (disabled || !isAgentDriven() || hasTaroutAgentConfig(cwd)) return;
   const result = scaffoldAgentConfig({ cwd, agent: "claude" });
   if (isJsonMode()) {
     outputJsonLine({
@@ -5845,7 +5913,7 @@ function ensureAgentSetup(cwd, disabled = false) {
   }
 }
 function emitAgentSetupHint(cwd) {
-  if (!isAgentDriven() || hasTaroutAllowlist(cwd)) return;
+  if (!isAgentDriven() || hasTaroutAgentConfig(cwd)) return;
   if (isJsonMode()) {
     outputJsonLine({
       type: "event",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@tarout/cli",
-	"version": "0.11.0",
+	"version": "0.13.0",
 	"description": "Tarout CLI — the Saudi cloud platform for coding agents",
 	"type": "module",
 	"bin": {