pylot-cli 0.1.4 → 0.1.5

package/dist/index.mjs

@@ -14362,37 +14362,42 @@ async function resolveConfig(opts) {
     pickToken(env2.PYLOT_API_TOKEN, "PYLOT_API_TOKEN");
     pickToken(env2.PYLOT_SESSION_JWT, "PYLOT_SESSION_JWT");
     pickToken(env2.PYLOT_BROKER_TOKEN, "PYLOT_BROKER_TOKEN");
-    pickToken(env2.PYLOT_DISPATCH_TOKEN, "PYLOT_DISPATCH_TOKEN");
     pickUrl(env2.PYLOT_DISPATCH_URL, "PYLOT_DISPATCH_URL");
     pickUrl(env2.PYLOT_API_URL, "PYLOT_API_URL");
     pickUrl(env2.PYLOT_GATEWAY_URL, "PYLOT_GATEWAY_URL");
     pickUrl(env2.PYLOT_API, "PYLOT_API");
-    pickToken(await confGet("token"), "config file");
     pickUrl(await confGet("url"), "config file");
-    if (token === null) {
-      const org = opts.org ?? await confGet("org");
-      if (org) {
-        try {
-          const creds = readCredentials();
-          let entry = creds.orgs[org];
-          if (entry?.token && entry.refresh_token && baseUrl && isNearExpiry(entry.expires_at)) {
-            const rotated = await refreshOrgCredential(baseUrl, org, entry).catch(() => null);
-            if (rotated) {
-              creds.orgs[org] = rotated;
-              try {
-                writeCredentials(creds);
-              } catch {
-              }
-              entry = rotated;
-            } else if (new Date(entry.expires_at).getTime() <= Date.now()) {
-              throw new UsageError(`stored token for ${org} expired and refresh failed \u2014 run: pylot auth login`);
+    const selectedOrg = opts.org ?? await confGet("org");
+    if (selectedOrg && token === null) {
+      let entry;
+      try {
+        const creds = readCredentials();
+        entry = creds.orgs[selectedOrg];
+        if (entry?.token && entry.refresh_token && baseUrl && isNearExpiry(entry.expires_at)) {
+          const rotated = await refreshOrgCredential(baseUrl, selectedOrg, entry).catch(() => null);
+          if (rotated) {
+            creds.orgs[selectedOrg] = rotated;
+            try {
+              writeCredentials(creds);
+            } catch {
             }
+            entry = rotated;
+          } else if (new Date(entry.expires_at).getTime() <= Date.now()) {
+            throw new UsageError(`stored token for ${selectedOrg} expired and refresh failed \u2014 run: pylot auth login`);
           }
-          if (entry?.token) pickToken(entry.token, "credentials file");
-        } catch (err) {
-          if (err instanceof UsageError) throw err;
         }
+      } catch (err) {
+        if (err instanceof UsageError) throw err;
       }
+      if (!entry?.token) {
+        throw new UsageError(
+          `no credentials found for org '${selectedOrg}' \u2014 run: pylot auth login --org ${selectedOrg}`
+        );
+      }
+      pickToken(entry.token, "credentials file");
+    } else {
+      pickToken(env2.PYLOT_DISPATCH_TOKEN, "PYLOT_DISPATCH_TOKEN");
+      pickToken(await confGet("token"), "config file");
     }
     if (!baseUrl) {
       throw new UsageError(
@@ -14918,9 +14923,11 @@ function registerAuth(program3) {
     );
   });
   const tokens = auth.command("tokens").description("scoped API tokens (plt_*) \u2014 token plane #1884");
-  tokens.command("create").description("mint a scoped API token (POST /auth/tokens \u2014 requires admin)").requiredOption("--org <org>", "org the token is scoped to").option("--label <label>", "human-readable label").option("--scopes <a,b,c>", "comma-separated scopes (e.g. dispatch,missions:read)").option("--expires-at <iso>", "expiry timestamp (ISO 8601)").action(async (flags, cmd) => {
+  tokens.command("create").description("mint a scoped API token (POST /auth/tokens \u2014 requires admin)").option("--org <org>", "org the token is scoped to (or use global --org before the subcommand)").option("--label <label>", "human-readable label").option("--scopes <a,b,c>", "comma-separated scopes (e.g. dispatch,missions:read)").option("--expires-at <iso>", "expiry timestamp (ISO 8601)").action(async (flags, cmd) => {
     const { opts, cfg } = await ctx(cmd);
-    const body = { org: flags.org, label: flags.label, expires_at: flags.expiresAt };
+    const org = cmd.optsWithGlobals().org;
+    if (!org) throw new UsageError("--org <org> is required");
+    const body = { org, label: flags.label, expires_at: flags.expiresAt };
     if (flags.scopes) body.scopes = String(flags.scopes).split(",").map((s) => s.trim()).filter(Boolean);
     for (const key of Object.keys(body)) if (body[key] === void 0) delete body[key];
     emit(opts, await request(cfg, "/auth/tokens", { method: "POST", body }));
@@ -15015,7 +15022,7 @@ Waiting for authorization\u2026
         process.stdout.write(`Credentials written to ~/.pylot/credentials (mode 0600)
 `);
         if (flags.org) {
-          process.stdout.write(`Active org: ${flags.org} \u2014 use PYLOT_API_TOKEN or pylot config set org ${flags.org}
+          process.stdout.write(`Active org: ${flags.org} \u2014 use --org ${flags.org} or: pylot config set org ${flags.org}
 `);
         }
         return;
@@ -15069,7 +15076,7 @@ Waiting for authorization\u2026
     process.stdout.write(`Credentials written to ~/.pylot/credentials (mode 0600)
 `);
     if (flags.org) {
-      process.stdout.write(`Active org: ${flags.org} \u2014 use PYLOT_API_TOKEN or pylot config set org ${flags.org}
+      process.stdout.write(`Active org: ${flags.org} \u2014 use --org ${flags.org} or: pylot config set org ${flags.org}
 `);
     }
   }
@@ -15078,7 +15085,7 @@ Waiting for authorization\u2026
 }
 
 // src/commands/config-cmd.mts
-var KEYS = ["url", "token", "staging-url", "staging-token"];
+var KEYS = ["url", "token", "org", "staging-url", "staging-token"];
 function redact(key, value) {
   if (!key.includes("token") || typeof value !== "string" || value.length === 0) return value;
   return value.length > 8 ? `${value.slice(0, 4)}\u2026${value.slice(-4)}` : "****";
@@ -15332,14 +15339,16 @@ function convPath(id, sub = "") {
 }
 function registerConversations(program3) {
   const conversations = program3.command("conversations").alias("convo").description("chat conversations: lifecycle, messages, wakes, resources");
-  conversations.command("create").description("create a conversation (POST /conversations)").requiredOption("--org <org>", "owning org (required)").option("--title <title>", "conversation title").option("--team <team>", "team name (must belong to --org)").option("--repos <a,b>", "comma-separated repo list").option("--branch <branch>", "working branch").option("--user-handle <handle>", "user handle").action(async (flags, cmd) => {
+  conversations.command("create").description("create a conversation (POST /conversations)").option("--org <org>", "owning org (required; or use global --org before the subcommand)").option("--title <title>", "conversation title").option("--team <team>", "team name (must belong to --org)").option("--repos <a,b>", "comma-separated repo list").option("--branch <branch>", "working branch").option("--user-handle <handle>", "user handle").action(async (flags, cmd) => {
     const { opts, cfg } = await ctx(cmd);
+    const org = cmd.optsWithGlobals().org;
+    if (!org) throw new UsageError("--org <org> is required");
     emit(
       opts,
       await request(cfg, "/conversations", {
         method: "POST",
         body: {
-          org: flags.org,
+          org,
           title: flags.title,
           team: flags.team,
           repos: flags.repos ? String(flags.repos).split(",").map((r) => r.trim()).filter(Boolean) : void 0,
@@ -15700,7 +15709,7 @@ function withParentBuildOpts(flags, cmd) {
 function registerDeploy(program3) {
   const deploy = program3.command("deploy").description(
     "trigger a cdk deploy via CodeBuild (POST /admin/deploy) \u2014 a 409 means a deploy is already running (deploy lock held: {stage, held_by, since, build_id}); wait for it or poll `pylot deploy status`"
-  ).option("--source-version <ref>", "git ref to deploy (default: gateway's stage branch)").option("--wait", "poll the build to a terminal state (exit 0 only on SUCCEEDED)").option("--timeout <seconds>", "max seconds to wait (default 1500 = 25min)", (v) => parseInt(v, 10), 1500).action(async (flags, cmd) => {
+  ).allowExcessArguments(false).showHelpAfterError("(run 'pylot deploy --help' to list valid subcommands)").option("--source-version <ref>", "git ref to deploy (default: gateway's stage branch)").option("--wait", "poll the build to a terminal state (exit 0 only on SUCCEEDED)").option("--timeout <seconds>", "max seconds to wait (default 1500 = 25min)", (v) => parseInt(v, 10), 1500).action(async (flags, cmd) => {
     const { opts, cfg } = await ctx(cmd);
     const body = {};
     if (flags.sourceVersion) body.source_version = flags.sourceVersion;
@@ -15898,21 +15907,24 @@ function registerSkills(program3) {
     const { opts, cfg } = await ctx(cmd);
     emit(opts, await request(cfg, "/admin/skills/lock"));
   });
-  skills.command("staleness").description("SHA-mismatch report vs origin HEAD (GET /admin/skills/staleness?org=<org>)").requiredOption("--org <org>", "GitHub org to check (staleness is per-org, #1919)").action(async (flags, cmd) => {
+  skills.command("staleness").description("SHA-mismatch report vs origin HEAD (GET /admin/skills/staleness?org=<org>)").option("--org <org>", "GitHub org to check (staleness is per-org, #1919; or use global --org before the subcommand)").action(async (flags, cmd) => {
     const { opts, cfg } = await ctx(cmd);
-    emit(opts, await request(cfg, "/admin/skills/staleness", { query: { org: flags.org } }));
+    const org = cmd.optsWithGlobals().org;
+    if (!org) throw new UsageError("--org <org> is required");
+    emit(opts, await request(cfg, "/admin/skills/staleness", { query: { org } }));
   });
   skills.command("sync").description(
     "trigger the CodeBuild skills-sync job for one org (POST /admin/skills/sync, body {org}) or every installed org (--all \u2192 POST /admin/skills/sync-all)"
   ).option("--all", "fan out one sync per installed org").option("--org <org>", "GitHub org to sync (required unless --all)").action(async (flags, cmd) => {
     const { opts, cfg } = await ctx(cmd);
+    const org = cmd.optsWithGlobals().org;
     if (flags.all) {
-      if (flags.org) throw new UsageError("pass either --all or --org <org>, not both");
+      if (org) throw new UsageError("pass either --all or --org <org>, not both");
       emit(opts, await request(cfg, "/admin/skills/sync-all", { method: "POST", body: {} }));
       return;
     }
-    if (!flags.org) throw new UsageError("--org <org> is required (or --all to sync every installed org)");
-    emit(opts, await request(cfg, "/admin/skills/sync", { method: "POST", body: { org: flags.org } }));
+    if (!org) throw new UsageError("--org <org> is required (or --all to sync every installed org)");
+    emit(opts, await request(cfg, "/admin/skills/sync", { method: "POST", body: { org } }));
   });
   skills.command("sync-status").description("skills-sync build status + logs (GET /admin/skills/sync/:id)").argument("[build_id]", "CodeBuild build id (from `skills sync`)").action(async (buildId, _flags, cmd) => {
     const { opts, cfg } = await ctx(cmd);
@@ -15924,26 +15936,30 @@ function registerSkills(program3) {
     const body = await bodyFromArgs(fields, flags.file);
     emit(opts, await request(cfg, "/admin/skills/reconcile-org", { method: "POST", body }));
   });
-  skills.command("update").description("update catalog metadata (PATCH /admin/skills/:name?org=<org> \u2014 tags, origin_repo, version, commit_sha, needs_worker)").argument("<name>").argument("[fields...]", "key=value pairs").requiredOption("--org <org>", "owning org (catalog rows are keyed (org, name))").option("--file <path>", "JSON body from file ('-' for stdin)").action(async (name, fields, flags, cmd) => {
+  skills.command("update").description("update catalog metadata (PATCH /admin/skills/:name?org=<org> \u2014 tags, origin_repo, version, commit_sha, needs_worker)").argument("<name>").argument("[fields...]", "key=value pairs").option("--org <org>", "owning org (catalog rows are keyed (org, name)); or use global --org before the subcommand)").option("--file <path>", "JSON body from file ('-' for stdin)").action(async (name, fields, flags, cmd) => {
     const { opts, cfg } = await ctx(cmd);
+    const org = cmd.optsWithGlobals().org;
+    if (!org) throw new UsageError("--org <org> is required");
     const body = await bodyFromArgs(fields, flags.file);
     emit(
       opts,
       await request(cfg, `/admin/skills/${encodeURIComponent(name)}`, {
         method: "PATCH",
-        query: { org: flags.org },
+        query: { org },
         body
       })
     );
   });
-  skills.command("delete").description("remove a skill from the catalog (DELETE /admin/skills/:name?org=<org>)").argument("<name>").requiredOption("--org <org>", "owning org (catalog rows are keyed (org, name))").option("--force", "required to confirm deletion").action(async (name, flags, cmd) => {
+  skills.command("delete").description("remove a skill from the catalog (DELETE /admin/skills/:name?org=<org>)").argument("<name>").option("--org <org>", "owning org (catalog rows are keyed (org, name)); or use global --org before the subcommand)").option("--force", "required to confirm deletion").action(async (name, flags, cmd) => {
     const { opts, cfg } = await ctx(cmd);
     if (!flags.force) throw new UsageError("deleting a catalog skill is destructive \u2014 re-run with --force");
+    const org = cmd.optsWithGlobals().org;
+    if (!org) throw new UsageError("--org <org> is required");
     emit(
       opts,
       await request(cfg, `/admin/skills/${encodeURIComponent(name)}`, {
         method: "DELETE",
-        query: { org: flags.org }
+        query: { org }
       })
     );
   });
@@ -16004,9 +16020,11 @@ function registerAutomations(program3) {
 init_http();
 function registerProviders(program3) {
   const providers = program3.command("providers").description("LLM provider instances and org purpose-chains");
-  providers.command("list").description("provider instances for an org (GET /admin/providers?org=)").requiredOption("--org <org>", "org to list (required by the gateway)").action(async (flags, cmd) => {
+  providers.command("list").description("provider instances for an org (GET /admin/providers?org=)").option("--org <org>", "org to list (required by the gateway; or use global --org before the subcommand)").action(async (flags, cmd) => {
     const { opts, cfg } = await ctx(cmd);
-    emit(opts, await request(cfg, "/admin/providers", { query: { org: flags.org } }));
+    const org = cmd.optsWithGlobals().org;
+    if (!org) throw new UsageError("--org <org> is required");
+    emit(opts, await request(cfg, "/admin/providers", { query: { org } }));
   });
   providers.command("create").description("create a provider instance (POST /admin/providers, body {org, type, model, label?, credentials?})").argument("[fields...]", "key=value pairs (e.g. org=my-org type=anthropic-api model=opus)").option("--file <path>", "JSON body from file ('-' for stdin)").action(async (fields, flags, cmd) => {
     const { opts, cfg } = await ctx(cmd);
@@ -16113,12 +16131,12 @@ function registerAssets(program3) {
 }
 
 // src/index.mts
-var VERSION = true ? "0.1.4" : "0.0.0-dev";
+var VERSION = true ? "0.1.5" : "0.0.0-dev";
 installEpipeGuard();
 var program2 = new Command();
 program2.name("pylot").description(
   "Pylot gateway CLI \u2014 dispatch missions, tail logs, manage teams/admin/secrets without curl.\nJSON on non-TTY stdout (pipe-friendly for agents and jq); tables on TTY."
-).allowExcessArguments(false).configureHelp({ sortSubcommands: true }).version(VERSION).option("--url <url>", "gateway base URL (default: PYLOT_DISPATCH_URL / PYLOT_API_URL / PYLOT_GATEWAY_URL)").option("--token <token>", "bearer token (default: PYLOT_API_TOKEN / PYLOT_SESSION_JWT / PYLOT_BROKER_TOKEN / PYLOT_DISPATCH_TOKEN)").option("--env <env>", "target environment: prod | staging (staging uses PYLOT_STAGING_URL + PYLOT_STAGING_DISPATCH_TOKEN)").option("--json", "force JSON output even on a TTY").option("-q, --quiet", "suppress progress notes on stderr");
+).allowExcessArguments(false).configureHelp({ sortSubcommands: true }).version(VERSION).option("--url <url>", "gateway base URL (default: PYLOT_DISPATCH_URL / PYLOT_API_URL / PYLOT_GATEWAY_URL)").option("--token <token>", "bearer token (default: PYLOT_API_TOKEN / PYLOT_SESSION_JWT / PYLOT_BROKER_TOKEN / PYLOT_DISPATCH_TOKEN)").option("--org <org>", "default org for credential resolution (selects ~/.pylot/credentials entry; overrides pylot config set org)").option("--env <env>", "target environment: prod | staging (staging uses PYLOT_STAGING_URL + PYLOT_STAGING_DISPATCH_TOKEN)").option("--json", "force JSON output even on a TTY").option("-q, --quiet", "suppress progress notes on stderr");
 program2.exitOverride();
 program2.configureOutput({ outputError: (str, write) => write(str) });
 registerCore(program2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pylot-cli",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "type": "module",
   "description": "pylot \u2014 first-class CLI for the Pylot gateway API. Replaces curl workflows for operators and humans.",
   "bin": {