sequoia-cli 0.5.1 → 0.5.2

package/dist/components/sequoia-subscribe.js

@@ -161,7 +161,7 @@ function storeSubscriberDid(did) {
 		const expires = new Date(
 			Date.now() + 365 * 24 * 60 * 60 * 1000,
 		).toUTCString();
-		document.cookie = `sequoia_did=${encodeURIComponent(did)}; expires=${expires}; path=/; SameSite=Lax`;
+		document.cookie = `sequoia_did=${encodeURIComponent(did)}; Expires=${expires}; Path=/; SameSite=Lax; Secure`;
 	} catch {
 		// Cookie write may fail in some embedded contexts
 	}
@@ -201,7 +201,7 @@ function getStoredSubscriberDid() {
 function clearSubscriberDid() {
 	try {
 		document.cookie =
-			"sequoia_did=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=/; SameSite=Lax";
+			"sequoia_did=; Expires=Thu, 01 Jan 1970 00:00:00 GMT; Path=/; SameSite=Lax; Secure";
 	} catch {
 		// ignore
 	}

package/dist/index.js

@@ -104691,8 +104691,131 @@ function waitForCallback() {
 
 // src/commands/publish.ts
 var import_cmd_ts6 = __toESM(require_cjs(), 1);
+import * as fs15 from "node:fs/promises";
+import * as path12 from "node:path";
+
+// src/lib/sync.ts
 import * as fs14 from "node:fs/promises";
 import * as path11 from "node:path";
+async function syncStateFromPDS(agent, config, configDir, options = {}) {
+  const { updateFrontmatter = false, dryRun = false, quiet = false } = options;
+  const documents = await listDocuments(agent, config.publicationUri);
+  if (documents.length === 0) {
+    if (!quiet) {
+      R2.info("No documents found for this publication.");
+    }
+    return {
+      state: await loadState(configDir),
+      matchedCount: 0,
+      unmatchedCount: 0,
+      frontmatterUpdatesApplied: 0
+    };
+  }
+  const contentDir = path11.isAbsolute(config.contentDir) ? config.contentDir : path11.join(configDir, config.contentDir);
+  const localPosts = await scanContentDirectory(contentDir, {
+    frontmatterMapping: config.frontmatter,
+    ignorePatterns: config.ignore,
+    slugField: config.frontmatter?.slugField,
+    removeIndexFromSlug: config.removeIndexFromSlug,
+    stripDatePrefix: config.stripDatePrefix
+  });
+  const postsByPath = new Map;
+  for (const post of localPosts) {
+    const postPath = resolvePostPath(post, config.pathPrefix, config.pathTemplate);
+    postsByPath.set(postPath, post);
+  }
+  const state = await loadState(configDir);
+  let matchedCount = 0;
+  let unmatchedCount = 0;
+  let frontmatterUpdatesApplied = 0;
+  const frontmatterUpdates = [];
+  if (!quiet) {
+    R2.message(`
+Matching documents to local files:
+`);
+  }
+  for (const doc of documents) {
+    const docPath = doc.value.path;
+    const localPost = postsByPath.get(docPath);
+    if (localPost) {
+      matchedCount++;
+      const relativeFilePath = path11.relative(configDir, localPost.filePath);
+      if (!quiet) {
+        R2.message(`  ✓ ${doc.value.title}`);
+        R2.message(`    Path: ${docPath}`);
+        R2.message(`    URI: ${doc.uri}`);
+        R2.message(`    File: ${path11.basename(localPost.filePath)}`);
+      }
+      const needsFrontmatterUpdate = updateFrontmatter && localPost.frontmatter.atUri !== doc.uri;
+      if (needsFrontmatterUpdate) {
+        frontmatterUpdates.push({
+          filePath: localPost.filePath,
+          atUri: doc.uri,
+          relativeFilePath
+        });
+        if (!quiet) {
+          R2.message(`    → Will update frontmatter`);
+        }
+      }
+      let contentHash;
+      if (needsFrontmatterUpdate) {
+        const updatedContent = updateFrontmatterWithAtUri(localPost.rawContent, doc.uri);
+        contentHash = await getContentHash(updatedContent);
+      } else {
+        contentHash = await getContentHash(localPost.rawContent);
+      }
+      state.posts[relativeFilePath] = {
+        contentHash,
+        atUri: doc.uri,
+        lastPublished: doc.value.publishedAt
+      };
+    } else {
+      unmatchedCount++;
+      if (!quiet) {
+        R2.message(`  ✗ ${doc.value.title} (no matching local file)`);
+        R2.message(`    Path: ${docPath}`);
+        R2.message(`    URI: ${doc.uri}`);
+      }
+    }
+    if (!quiet) {
+      R2.message("");
+    }
+  }
+  if (!quiet) {
+    R2.message("---");
+    R2.info(`Matched: ${matchedCount} documents`);
+    if (unmatchedCount > 0) {
+      R2.warn(`Unmatched: ${unmatchedCount} documents (exist on PDS but not locally)`);
+    }
+  }
+  if (dryRun) {
+    if (!quiet) {
+      R2.info(`
+Dry run complete. No changes made.`);
+    }
+    return {
+      state,
+      matchedCount,
+      unmatchedCount,
+      frontmatterUpdatesApplied: 0
+    };
+  }
+  await saveState(configDir, state);
+  if (frontmatterUpdates.length > 0) {
+    for (const { filePath, atUri } of frontmatterUpdates) {
+      const content = await fs14.readFile(filePath, "utf-8");
+      const updated = updateFrontmatterWithAtUri(content, atUri);
+      await fs14.writeFile(filePath, updated);
+      if (!quiet) {
+        R2.message(`  Updated: ${path11.basename(filePath)}`);
+      }
+    }
+    frontmatterUpdatesApplied = frontmatterUpdates.length;
+  }
+  return { state, matchedCount, unmatchedCount, frontmatterUpdatesApplied };
+}
+
+// src/commands/publish.ts
 var publishCommand = import_cmd_ts6.command({
   name: "publish",
   description: "Publish content to ATProto",
@@ -104720,7 +104843,7 @@ var publishCommand = import_cmd_ts6.command({
       process.exit(1);
     }
     const config = await loadConfig(configPath);
-    const configDir = path11.dirname(configPath);
+    const configDir = path12.dirname(configPath);
     R2.info(`Site: ${config.siteUrl}`);
     R2.info(`Content directory: ${config.contentDir}`);
     let credentials = await loadCredentials(config.identity);
@@ -104770,10 +104893,36 @@ var publishCommand = import_cmd_ts6.command({
       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 = path11.isAbsolute(config.contentDir) ? config.contentDir : path11.join(configDir, config.contentDir);
-    const imagesDir = config.imagesDir ? path11.isAbsolute(config.imagesDir) ? config.imagesDir : path11.join(configDir, config.imagesDir) : undefined;
-    const state = await loadState(configDir);
+    const contentDir = path12.isAbsolute(config.contentDir) ? config.contentDir : path12.join(configDir, config.contentDir);
+    const imagesDir = config.imagesDir ? path12.isAbsolute(config.imagesDir) ? config.imagesDir : path12.join(configDir, config.imagesDir) : undefined;
+    let state = await loadState(configDir);
     const s = Ie();
+    let agent;
+    if (config.autoSync !== false && Object.keys(state.posts).length === 0 && !dryRun) {
+      const connectingTo = credentials.type === "oauth" ? credentials.handle : credentials.pdsUrl;
+      s.start(`Connecting as ${connectingTo}...`);
+      try {
+        agent = await createAgent(credentials);
+        s.stop(`Logged in as ${agent.did}`);
+      } catch (error) {
+        s.stop("Failed to login");
+        R2.error(`Failed to login: ${error}`);
+        process.exit(1);
+      }
+      try {
+        s.start("Auto-syncing state from PDS...");
+        const syncResult = await syncStateFromPDS(agent, config, configDir, {
+          updateFrontmatter: true,
+          quiet: true
+        });
+        s.stop(`Auto-synced ${syncResult.matchedCount} posts from PDS`);
+        state = syncResult.state;
+      } catch (error) {
+        s.stop("Auto-sync failed");
+        R2.warn(`Auto-sync failed: ${error instanceof Error ? error.message : String(error)}`);
+        R2.warn("Continuing with empty state. Run 'sequoia sync' manually to fix.");
+      }
+    }
     s.start("Scanning for posts...");
     const posts = await scanContentDirectory(contentDir, {
       frontmatterMapping: config.frontmatter,
@@ -104791,7 +104940,7 @@ var publishCommand = import_cmd_ts6.command({
         continue;
       }
       const contentHash = await getContentHash(post.rawContent);
-      const relativeFilePath = path11.relative(configDir, post.filePath);
+      const relativeFilePath = path12.relative(configDir, post.filePath);
       const postState = state.posts[relativeFilePath];
       if (force) {
         postsToPublish.push({
@@ -104829,7 +104978,7 @@ ${postsToPublish.length} posts to publish:
     cutoffDate.setDate(cutoffDate.getDate() - maxAgeDays);
     for (const { post, action, reason } of postsToPublish) {
       const icon = action === "create" ? "+" : "~";
-      const relativeFilePath = path11.relative(configDir, post.filePath);
+      const relativeFilePath = path12.relative(configDir, post.filePath);
       const existingBskyPostRef = state.posts[relativeFilePath]?.bskyPostRef;
       let bskyNote = "";
       if (blueskyEnabled) {
@@ -104861,16 +105010,17 @@ Bluesky posting: enabled (max age: ${maxAgeDays} days)`);
 Dry run complete. No changes made.`);
       return;
     }
-    const connectingTo = credentials.type === "oauth" ? credentials.handle : credentials.pdsUrl;
-    s.start(`Connecting as ${connectingTo}...`);
-    let agent;
-    try {
-      agent = await createAgent(credentials);
-      s.stop(`Logged in as ${agent.did}`);
-    } catch (error) {
-      s.stop("Failed to login");
-      R2.error(`Failed to login: ${error}`);
-      process.exit(1);
+    if (!agent) {
+      const connectingTo = credentials.type === "oauth" ? credentials.handle : credentials.pdsUrl;
+      s.start(`Connecting as ${connectingTo}...`);
+      try {
+        agent = await createAgent(credentials);
+        s.stop(`Logged in as ${agent.did}`);
+      } catch (error) {
+        s.stop("Failed to login");
+        R2.error(`Failed to login: ${error}`);
+        process.exit(1);
+      }
     }
     let publishedCount = 0;
     let updatedCount = 0;
@@ -104883,7 +105033,7 @@ Dry run complete. No changes made.`);
         if (post.frontmatter.ogImage) {
           const imagePath = await resolveImagePath(post.frontmatter.ogImage, imagesDir, contentDir);
           if (imagePath) {
-            R2.info(`  Uploading cover image: ${path11.basename(imagePath)}`);
+            R2.info(`  Uploading cover image: ${path12.basename(imagePath)}`);
             coverImage = await uploadImage(agent, imagePath);
             if (coverImage) {
               R2.info(`  Uploaded image blob: ${coverImage.ref.$link}`);
@@ -104895,14 +105045,14 @@ Dry run complete. No changes made.`);
         let atUri;
         let contentForHash;
         let bskyPostRef;
-        const relativeFilePath = path11.relative(configDir, post.filePath);
+        const relativeFilePath = path12.relative(configDir, post.filePath);
         const existingBskyPostRef = state.posts[relativeFilePath]?.bskyPostRef;
         if (action === "create") {
           atUri = await createDocument(agent, post, config, coverImage);
           s.stop(`Created: ${atUri}`);
           const updatedContent = updateFrontmatterWithAtUri(post.rawContent, atUri);
-          await fs14.writeFile(post.filePath, updatedContent);
-          R2.info(`  Updated frontmatter in ${path11.basename(post.filePath)}`);
+          await fs15.writeFile(post.filePath, updatedContent);
+          R2.info(`  Updated frontmatter in ${path12.basename(post.filePath)}`);
           contentForHash = updatedContent;
           publishedCount++;
         } else {
@@ -104951,7 +105101,7 @@ Dry run complete. No changes made.`);
         };
       } catch (error) {
         const errorMessage = error instanceof Error ? error.message : String(error);
-        s.stop(`Error publishing "${path11.basename(post.filePath)}"`);
+        s.stop(`Error publishing "${path12.basename(post.filePath)}"`);
         R2.error(`  ${errorMessage}`);
         errorCount++;
       }
@@ -104972,8 +105122,7 @@ Dry run complete. No changes made.`);
 
 // src/commands/sync.ts
 var import_cmd_ts7 = __toESM(require_cjs(), 1);
-import * as fs15 from "node:fs/promises";
-import * as path12 from "node:path";
+import * as path13 from "node:path";
 var syncCommand = import_cmd_ts7.command({
   name: "sync",
   description: "Sync state from ATProto to restore .sequoia-state.json",
@@ -104996,7 +105145,7 @@ var syncCommand = import_cmd_ts7.command({
       process.exit(1);
     }
     const config = await loadConfig(configPath);
-    const configDir = path12.dirname(configPath);
+    const configDir = path13.dirname(configPath);
     R2.info(`Site: ${config.siteUrl}`);
     R2.info(`Publication: ${config.publicationUri}`);
     let credentials = await loadCredentials(config.identity);
@@ -105056,89 +105205,19 @@ var syncCommand = import_cmd_ts7.command({
       process.exit(1);
     }
     s.start("Fetching documents from PDS...");
-    const documents = await listDocuments(agent, config.publicationUri);
-    s.stop(`Found ${documents.length} documents on PDS`);
-    if (documents.length === 0) {
-      R2.info("No documents found for this publication.");
-      return;
-    }
-    const contentDir = path12.isAbsolute(config.contentDir) ? config.contentDir : path12.join(configDir, config.contentDir);
-    s.start("Scanning local content...");
-    const localPosts = await scanContentDirectory(contentDir, {
-      frontmatterMapping: config.frontmatter,
-      ignorePatterns: config.ignore,
-      slugField: config.frontmatter?.slugField,
-      removeIndexFromSlug: config.removeIndexFromSlug,
-      stripDatePrefix: config.stripDatePrefix
+    const result = await syncStateFromPDS(agent, config, configDir, {
+      updateFrontmatter,
+      dryRun,
+      quiet: false
     });
-    s.stop(`Found ${localPosts.length} local posts`);
-    const postsByPath = new Map;
-    for (const post of localPosts) {
-      const postPath = resolvePostPath(post, config.pathPrefix, config.pathTemplate);
-      postsByPath.set(postPath, post);
-    }
-    const state = await loadState(configDir);
-    const originalPostCount = Object.keys(state.posts).length;
-    let matchedCount = 0;
-    let unmatchedCount = 0;
-    const frontmatterUpdates = [];
-    R2.message(`
-Matching documents to local files:
-`);
-    for (const doc of documents) {
-      const docPath = doc.value.path;
-      const localPost = postsByPath.get(docPath);
-      if (localPost) {
-        matchedCount++;
-        R2.message(`  ✓ ${doc.value.title}`);
-        R2.message(`    Path: ${docPath}`);
-        R2.message(`    URI: ${doc.uri}`);
-        R2.message(`    File: ${path12.basename(localPost.filePath)}`);
-        const contentHash = await getContentHash(localPost.rawContent);
-        const relativeFilePath = path12.relative(configDir, localPost.filePath);
-        state.posts[relativeFilePath] = {
-          contentHash,
-          atUri: doc.uri,
-          lastPublished: doc.value.publishedAt
-        };
-        if (updateFrontmatter && localPost.frontmatter.atUri !== doc.uri) {
-          frontmatterUpdates.push({
-            filePath: localPost.filePath,
-            atUri: doc.uri
-          });
-          R2.message(`    → Will update frontmatter`);
-        }
-      } else {
-        unmatchedCount++;
-        R2.message(`  ✗ ${doc.value.title} (no matching local file)`);
-        R2.message(`    Path: ${docPath}`);
-        R2.message(`    URI: ${doc.uri}`);
-      }
-      R2.message("");
-    }
-    R2.message("---");
-    R2.info(`Matched: ${matchedCount} documents`);
-    if (unmatchedCount > 0) {
-      R2.warn(`Unmatched: ${unmatchedCount} documents (exist on PDS but not locally)`);
-    }
-    if (dryRun) {
-      R2.info(`
-Dry run complete. No changes made.`);
-      return;
-    }
-    await saveState(configDir, state);
-    const newPostCount = Object.keys(state.posts).length;
-    R2.success(`
-Saved .sequoia-state.json (${originalPostCount} → ${newPostCount} entries)`);
-    if (frontmatterUpdates.length > 0) {
-      s.start(`Updating frontmatter in ${frontmatterUpdates.length} files...`);
-      for (const { filePath, atUri } of frontmatterUpdates) {
-        const content = await fs15.readFile(filePath, "utf-8");
-        const updated = updateFrontmatterWithAtUri(content, atUri);
-        await fs15.writeFile(filePath, updated);
-        R2.message(`  Updated: ${path12.basename(filePath)}`);
+    s.stop(`Found documents on PDS`);
+    if (!dryRun) {
+      const stateCount = Object.keys(result.state.posts).length;
+      R2.success(`
+Saved .sequoia-state.json (${stateCount} entries)`);
+      if (result.frontmatterUpdatesApplied > 0) {
+        R2.success(`Updated frontmatter in ${result.frontmatterUpdatesApplied} files`);
       }
-      s.stop("Frontmatter updated");
     }
     R2.success(`
 Sync complete!`);
@@ -105605,7 +105684,7 @@ Publish evergreen content to the ATmosphere
 
 > https://tangled.org/stevedylan.dev/sequoia
 	`,
-  version: "0.5.1",
+  version: "0.5.2",
   cmds: {
     add: addCommand,
     auth: authCommand,

package/package.json

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