sequoia-cli 0.3.1 → 0.3.3

package/dist/index.js

@@ -99758,8 +99758,7 @@ async function tryLoadOAuthCredentials(profile) {
       return {
         type: "oauth",
         did: profile,
-        handle: handle || profile,
-        pdsUrl: "https://bsky.social"
+        handle: handle || profile
       };
     }
   }
@@ -99769,8 +99768,7 @@ async function tryLoadOAuthCredentials(profile) {
     return {
       type: "oauth",
       did: match2.did,
-      handle: match2.handle || match2.did,
-      pdsUrl: "https://bsky.social"
+      handle: match2.handle || match2.did
     };
   }
   return null;
@@ -99821,8 +99819,7 @@ async function loadCredentials(projectIdentity) {
         return {
           type: "oauth",
           did: oauthDids[0],
-          handle: handle || oauthDids[0],
-          pdsUrl: "https://bsky.social"
+          handle: handle || oauthDids[0]
         };
       }
     }
@@ -100125,6 +100122,42 @@ async function saveState(configDir, state) {
   await fs5.writeFile(statePath, JSON.stringify(state, null, 2));
 }
 
+// src/lib/credential-select.ts
+async function selectCredential(allCredentials) {
+  const options = await Promise.all(allCredentials.map(async ({ id, type }) => {
+    let label = id;
+    if (type === "oauth") {
+      const handle = await getOAuthHandle(id);
+      label = handle ? `${handle} (${id})` : id;
+    }
+    return {
+      value: { id, type },
+      label: `${label} [${type}]`
+    };
+  }));
+  const selected = exitOnCancel(await qt({
+    message: "Multiple identities found. Select one:",
+    options
+  }));
+  if (selected.type === "oauth") {
+    const session = await getOAuthSession(selected.id);
+    if (session) {
+      const handle = await getOAuthHandle(selected.id);
+      return {
+        type: "oauth",
+        did: selected.id,
+        handle: handle || selected.id
+      };
+    }
+  } else {
+    const creds = await getCredentials(selected.id);
+    if (creds) {
+      return creds;
+    }
+  }
+  return null;
+}
+
 // src/commands/init.ts
 async function fileExists5(filePath) {
   try {
@@ -100253,10 +100286,21 @@ var initCommand = import_cmd_ts2.command({
       onCancel();
     }
     let publicationUri;
-    const credentials = await loadCredentials();
+    let credentials = await loadCredentials();
     if (publicationChoice === "create") {
       if (!credentials) {
-        R2.error("You must authenticate first. Run 'sequoia auth' before creating a publication.");
+        const allCredentials = await listAllCredentials();
+        if (allCredentials.length > 1) {
+          credentials = await selectCredential(allCredentials);
+        } else if (allCredentials.length === 1) {
+          credentials = await selectCredential(allCredentials);
+        } else {
+          R2.error("You must authenticate first. Run 'sequoia login' (recommended) or 'sequoia auth' before creating a publication.");
+          process.exit(1);
+        }
+      }
+      if (!credentials) {
+        R2.error("Could not load credentials. Try running 'sequoia login' again to re-authenticate.");
         process.exit(1);
       }
       const s = Ie();
@@ -100267,7 +100311,7 @@ var initCommand = import_cmd_ts2.command({
         s.stop("Connected!");
       } catch (_error) {
         s.stop("Failed to connect");
-        R2.error("Failed to connect. Check your credentials with 'sequoia auth'.");
+        R2.error("Failed to connect. Try re-authenticating with 'sequoia login' or 'sequoia auth'.");
         process.exit(1);
       }
       const publicationConfig = await Rt({
@@ -100353,7 +100397,7 @@ var initCommand = import_cmd_ts2.command({
         ...maxAgeDays !== 7 && { maxAgeDays }
       };
     }
-    const pdsUrl = credentials?.pdsUrl;
+    const pdsUrl = credentials?.type === "app-password" ? credentials.pdsUrl : undefined;
     const configContent = generateConfigTemplate({
       siteUrl: siteConfig.siteUrl,
       contentDir: siteConfig.contentDir || "./content",
@@ -100809,8 +100853,7 @@ var publishCommand = import_cmd_ts5.command({
           credentials = {
             type: "oauth",
             did: selected,
-            handle: handle || selected,
-            pdsUrl: "https://bsky.social"
+            handle: handle || selected
           };
         }
       } else {
@@ -100908,7 +100951,8 @@ Bluesky posting: enabled (max age: ${maxAgeDays} days)`);
 Dry run complete. No changes made.`);
       return;
     }
-    s.start(`Connecting to ${credentials.pdsUrl}...`);
+    const connectingTo = credentials.type === "oauth" ? credentials.handle : credentials.pdsUrl;
+    s.start(`Connecting as ${connectingTo}...`);
     let agent;
     try {
       agent = await createAgent(credentials);
@@ -101078,8 +101122,7 @@ var syncCommand = import_cmd_ts6.command({
           credentials = {
             type: "oauth",
             did: selected,
-            handle: handle || selected,
-            pdsUrl: "https://bsky.social"
+            handle: handle || selected
           };
         }
       } else {
@@ -101091,7 +101134,8 @@ var syncCommand = import_cmd_ts6.command({
       }
     }
     const s = Ie();
-    s.start(`Connecting to ${credentials.pdsUrl}...`);
+    const connectingTo = credentials.type === "oauth" ? credentials.handle : credentials.pdsUrl;
+    s.start(`Connecting as ${connectingTo}...`);
     let agent;
     try {
       agent = await createAgent(credentials);
@@ -101486,10 +101530,49 @@ async function editBluesky(config) {
   };
 }
 async function updatePublicationFlow(config) {
-  const credentials = await loadCredentials(config.identity);
+  let credentials = await loadCredentials(config.identity);
   if (!credentials) {
-    R2.error("No credentials found. Run 'sequoia auth' or 'sequoia login' first.");
-    process.exit(1);
+    const identities = await listAllCredentials();
+    if (identities.length === 0) {
+      R2.error("No credentials found. Run 'sequoia login' or 'sequoia auth' first.");
+      process.exit(1);
+    }
+    const options = await Promise.all(identities.map(async (cred) => {
+      if (cred.type === "oauth") {
+        const handle = await getOAuthHandle(cred.id);
+        return {
+          value: cred.id,
+          label: `${handle || cred.id} (OAuth)`
+        };
+      }
+      return {
+        value: cred.id,
+        label: `${cred.id} (App Password)`
+      };
+    }));
+    R2.info("Multiple identities found. Select one to use:");
+    const selected = exitOnCancel(await qt({
+      message: "Identity:",
+      options
+    }));
+    const selectedCred = identities.find((c) => c.id === selected);
+    if (selectedCred?.type === "oauth") {
+      const session = await getOAuthSession(selected);
+      if (session) {
+        const handle = await getOAuthHandle(selected);
+        credentials = {
+          type: "oauth",
+          did: selected,
+          handle: handle || selected
+        };
+      }
+    } else {
+      credentials = await getCredentials(selected);
+    }
+    if (!credentials) {
+      R2.error("Failed to load selected credentials.");
+      process.exit(1);
+    }
   }
   const s = Ie();
   s.start("Connecting to ATProto...");
@@ -101606,7 +101689,7 @@ Publish evergreen content to the ATmosphere
 
 > https://tangled.org/stevedylan.dev/sequoia
 	`,
-  version: "0.3.1",
+  version: "0.3.3",
   cmds: {
     auth: authCommand,
     init: initCommand,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sequoia-cli",
-	"version": "0.3.1",
+	"version": "0.3.3",
 	"type": "module",
 	"bin": {
 		"sequoia": "dist/index.js"