sequoia-cli 0.3.0 → 0.3.2

package/dist/index.js

@@ -99159,6 +99159,25 @@ async function deleteOAuthSession(did) {
 function getOAuthStorePath() {
   return OAUTH_FILE;
 }
+async function setOAuthHandle(did, handle) {
+  const store = await loadOAuthStore();
+  if (!store.handles) {
+    store.handles = {};
+  }
+  store.handles[did] = handle;
+  await saveOAuthStore(store);
+}
+async function getOAuthHandle(did) {
+  const store = await loadOAuthStore();
+  return store.handles?.[did];
+}
+async function listOAuthSessionsWithHandles() {
+  const store = await loadOAuthStore();
+  return Object.keys(store.sessions).map((did) => ({
+    did,
+    handle: store.handles?.[did]
+  }));
+}
 
 // src/lib/oauth-client.ts
 var CALLBACK_PORT = 4000;
@@ -99330,9 +99349,17 @@ async function uploadImage(agent, imagePath) {
   }
 }
 async function resolveImagePath(ogImage, imagesDir, contentDir) {
-  const filename = path4.basename(ogImage);
   if (imagesDir) {
-    const imagePath = path4.join(imagesDir, filename);
+    const imagesDirBaseName = path4.basename(imagesDir);
+    const imagesDirIndex = ogImage.indexOf(imagesDirBaseName);
+    let relativePath;
+    if (imagesDirIndex !== -1) {
+      const afterImagesDir = ogImage.substring(imagesDirIndex + imagesDirBaseName.length);
+      relativePath = afterImagesDir.replace(/^[/\\]/, "");
+    } else {
+      relativePath = path4.basename(ogImage);
+    }
+    const imagePath = path4.join(imagesDir, relativePath);
     if (await fileExists2(imagePath)) {
       const stat2 = await fs3.stat(imagePath);
       if (stat2.size > 0) {
@@ -99727,14 +99754,25 @@ async function tryLoadOAuthCredentials(profile) {
   if (profile.startsWith("did:")) {
     const session = await getOAuthSession(profile);
     if (session) {
+      const handle = await getOAuthHandle(profile);
       return {
         type: "oauth",
         did: profile,
-        handle: profile,
+        handle: handle || profile,
         pdsUrl: "https://bsky.social"
       };
     }
   }
+  const sessions = await listOAuthSessionsWithHandles();
+  const match2 = sessions.find((s) => s.handle === profile);
+  if (match2) {
+    return {
+      type: "oauth",
+      did: match2.did,
+      handle: match2.handle || match2.did,
+      pdsUrl: "https://bsky.social"
+    };
+  }
   return null;
 }
 async function loadCredentials(projectIdentity) {
@@ -99779,10 +99817,11 @@ async function loadCredentials(projectIdentity) {
     if (oauthDids.length === 1 && oauthDids[0]) {
       const session = await getOAuthSession(oauthDids[0]);
       if (session) {
+        const handle = await getOAuthHandle(oauthDids[0]);
         return {
           type: "oauth",
           did: oauthDids[0],
-          handle: oauthDids[0],
+          handle: handle || oauthDids[0],
           pdsUrl: "https://bsky.social"
         };
       }
@@ -99801,6 +99840,18 @@ async function listCredentials() {
   const store = await loadCredentialsStore();
   return Object.keys(store);
 }
+async function listAllCredentials() {
+  const store = await loadCredentialsStore();
+  const oauthDids = await listOAuthSessions();
+  const result = [];
+  for (const id of Object.keys(store)) {
+    result.push({ id, type: "app-password" });
+  }
+  for (const did of oauthDids) {
+    result.push({ id: did, type: "oauth" });
+  }
+  return result;
+}
 async function saveCredentials(credentials) {
   const store = await loadCredentialsStore();
   store[credentials.identifier] = credentials;
@@ -100074,6 +100125,43 @@ 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,
+        pdsUrl: "https://bsky.social"
+      };
+    }
+  } else {
+    const creds = await getCredentials(selected.id);
+    if (creds) {
+      return creds;
+    }
+  }
+  return null;
+}
+
 // src/commands/init.ts
 async function fileExists5(filePath) {
   try {
@@ -100202,10 +100290,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();
@@ -100216,7 +100315,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({
@@ -100491,13 +100590,13 @@ var loginCommand = import_cmd_ts4.command({
   },
   handler: async ({ logout, list }) => {
     if (list) {
-      const sessions = await listOAuthSessions();
+      const sessions = await listOAuthSessionsWithHandles();
       if (sessions.length === 0) {
         R2.info("No OAuth sessions stored");
       } else {
         R2.info("OAuth sessions:");
-        for (const did2 of sessions) {
-          console.log(`  - ${did2}`);
+        for (const { did: did2, handle: handle2 } of sessions) {
+          console.log(`  - ${handle2 || did2} (${did2})`);
         }
       }
       return;
@@ -100591,12 +100690,11 @@ var loginCommand = import_cmd_ts4.command({
       }
       s.message("Completing authentication...");
       const { session } = await client.callback(new URLSearchParams(result.params));
-      let displayName = handle;
-      try {
-        displayName = handle.startsWith("did:") ? session.did : handle;
-      } catch {
-        displayName = session.did;
+      const handleToStore = handle.startsWith("did:") ? undefined : handle;
+      if (handleToStore) {
+        await setOAuthHandle(session.did, handleToStore);
       }
+      const displayName = handleToStore || session.did;
       s.stop(`Logged in as ${displayName}`);
       R2.success(`OAuth session saved to ${getOAuthStorePath()}`);
       R2.info("Your session will refresh automatically when needed.");
@@ -100727,23 +100825,51 @@ var publishCommand = import_cmd_ts5.command({
     R2.info(`Content directory: ${config.contentDir}`);
     let credentials = await loadCredentials(config.identity);
     if (!credentials) {
-      const identities = await listCredentials();
+      const identities = await listAllCredentials();
       if (identities.length === 0) {
-        R2.error("No credentials found. Run 'sequoia auth' first.");
+        R2.error("No credentials found. Run 'sequoia login' or 'sequoia auth' first.");
         R2.info("Or set ATP_IDENTIFIER and ATP_APP_PASSWORD environment variables.");
         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: identities.map((id) => ({ value: id, label: id }))
+        options
       }));
-      credentials = await getCredentials(selected);
+      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,
+            pdsUrl: "https://bsky.social"
+          };
+        }
+      } else {
+        credentials = await getCredentials(selected);
+      }
       if (!credentials) {
         R2.error("Failed to load selected credentials.");
         process.exit(1);
       }
-      R2.info(`Tip: Add "identity": "${selected}" to sequoia.json to use this by default.`);
+      const displayId = credentials.type === "oauth" ? credentials.handle || credentials.did : credentials.identifier;
+      R2.info(`Tip: Add "identity": "${displayId}" to sequoia.json to use this by default.`);
     }
     const contentDir = path10.isAbsolute(config.contentDir) ? config.contentDir : path10.join(configDir, config.contentDir);
     const imagesDir = config.imagesDir ? path10.isAbsolute(config.imagesDir) ? config.imagesDir : path10.join(configDir, config.imagesDir) : undefined;
@@ -100969,17 +101095,44 @@ var syncCommand = import_cmd_ts6.command({
     R2.info(`Publication: ${config.publicationUri}`);
     let credentials = await loadCredentials(config.identity);
     if (!credentials) {
-      const identities = await listCredentials();
+      const identities = await listAllCredentials();
       if (identities.length === 0) {
-        R2.error("No credentials found. Run 'sequoia auth' first.");
+        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: identities.map((id) => ({ value: id, label: id }))
+        options
       }));
-      credentials = await getCredentials(selected);
+      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,
+            pdsUrl: "https://bsky.social"
+          };
+        }
+      } else {
+        credentials = await getCredentials(selected);
+      }
       if (!credentials) {
         R2.error("Failed to load selected credentials.");
         process.exit(1);
@@ -101501,7 +101654,7 @@ Publish evergreen content to the ATmosphere
 
 > https://tangled.org/stevedylan.dev/sequoia
 	`,
-  version: "0.3.0",
+  version: "0.3.2",
   cmds: {
     auth: authCommand,
     init: initCommand,

package/package.json

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