@mepuka/skygent 0.3.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mepuka/skygent",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Composable Bluesky data filtering and monitoring CLI built with Effect",
   "module": "index.ts",
   "type": "module",

package/src/cli/compact-output.ts

@@ -0,0 +1,52 @@
+import type { FeedGeneratorView, ListItemView, ListView, PostLike, ProfileView } from "../domain/bsky.js";
+import type { Post } from "../domain/post.js";
+
+type CompactProfile = {
+  readonly did: ProfileView["did"];
+  readonly handle: ProfileView["handle"];
+  readonly displayName?: string;
+};
+
+const compactProfile = (profile: ProfileView): CompactProfile => ({
+  did: profile.did,
+  handle: profile.handle,
+  ...(profile.displayName ? { displayName: profile.displayName } : {})
+});
+
+export const compactProfileView = (profile: ProfileView) =>
+  compactProfile(profile);
+
+export const compactFeedGeneratorView = (feed: FeedGeneratorView) => ({
+  uri: feed.uri,
+  displayName: feed.displayName,
+  creator: compactProfile(feed.creator),
+  ...(feed.likeCount !== undefined ? { likeCount: feed.likeCount } : {})
+});
+
+export const compactListView = (list: ListView) => ({
+  uri: list.uri,
+  name: list.name,
+  purpose: list.purpose,
+  creator: compactProfile(list.creator),
+  ...(list.listItemCount !== undefined
+    ? { listItemCount: list.listItemCount }
+    : {})
+});
+
+export const compactListItemView = (item: ListItemView) => ({
+  uri: item.uri,
+  subject: compactProfile(item.subject)
+});
+
+export const compactPostLike = (like: PostLike) => ({
+  actor: compactProfile(like.actor),
+  createdAt: like.createdAt,
+  indexedAt: like.indexedAt
+});
+
+export const compactPost = (post: Post) => ({
+  uri: post.uri,
+  author: post.author,
+  text: post.text,
+  createdAt: post.createdAt
+});

package/src/cli/config.ts

@@ -1,4 +1,4 @@
-import { Options } from "@effect/cli";
+import { HelpDoc, Options } from "@effect/cli";
 import { Option, Redacted } from "effect";
 import { pickDefined } from "../services/shared.js";
 import { OutputFormat } from "../domain/config.js";
@@ -6,13 +6,33 @@ import { AppConfig } from "../domain/config.js";
 import type { LogFormat } from "./logging.js";
 import type { SyncSettingsValue } from "../services/sync-settings.js";
 import type { CredentialsOverridesValue } from "../services/credential-store.js";
+import { NonNegativeInt, PositiveInt } from "./option-schemas.js";
 
 
-const compactOption = Options.boolean("full", {
-  negationNames: ["compact"]
+const compactOption = Options.all({
+  full: Options.boolean("full").pipe(
+    Options.withDescription("Use full JSON output")
+  ),
+  compact: Options.boolean("compact").pipe(
+    Options.withDescription("Use compact JSON output (default)")
+  )
 }).pipe(
-  Options.withDescription("Use full JSON output (disables compact default)"),
-  Options.map((full) => !full)
+  Options.mapTryCatch(
+    ({ full, compact }) => {
+      if (full && compact) {
+        throw new Error("Use either --full or --compact, not both.");
+      }
+      if (full) return false;
+      if (compact) return true;
+      return true;
+    },
+    (error) =>
+      HelpDoc.p(
+        typeof error === "object" && error !== null && "message" in error
+          ? String((error as { readonly message?: unknown }).message ?? error)
+          : String(error)
+      )
+  )
 );
 
 export const configOptions = {
@@ -44,22 +64,27 @@ export const configOptions = {
     Options.withDescription("Override log format (json or human)")
   ),
   syncConcurrency: Options.integer("sync-concurrency").pipe(
+    Options.withSchema(PositiveInt),
     Options.optional,
     Options.withDescription("Concurrent sync preparation workers (default: 5)")
   ),
   syncBatchSize: Options.integer("sync-batch-size").pipe(
+    Options.withSchema(PositiveInt),
     Options.optional,
     Options.withDescription("Batch size for sync store writes (default: 100)")
   ),
   syncPageLimit: Options.integer("sync-page-limit").pipe(
+    Options.withSchema(PositiveInt),
     Options.optional,
     Options.withDescription("Page size for sync fetches (default: 100)")
   ),
   checkpointEvery: Options.integer("checkpoint-every").pipe(
+    Options.withSchema(PositiveInt),
     Options.optional,
     Options.withDescription("Checkpoint every N processed posts (default: 100)")
   ),
   checkpointIntervalMs: Options.integer("checkpoint-interval-ms").pipe(
+    Options.withSchema(NonNegativeInt),
     Options.optional,
     Options.withDescription("Checkpoint interval in milliseconds (default: 5000)")
   )

package/src/cli/feed.ts

@@ -1,11 +1,14 @@
 import { Args, Command, Options } from "@effect/cli";
-import { Effect, Stream } from "effect";
+import { Effect, Option, Schema, Stream } from "effect";
 import { renderTableLegacy } from "./doc/table.js";
 import { renderFeedTable } from "./doc/table-renderers.js";
 import { BskyClient } from "../services/bsky-client.js";
 import { AppConfigService } from "../services/app-config.js";
 import type { FeedGeneratorView } from "../domain/bsky.js";
-import { decodeActor } from "./shared-options.js";
+import { AtUri } from "../domain/primitives.js";
+import { CliPreferences } from "./preferences.js";
+import { compactFeedGeneratorView } from "./compact-output.js";
+import { actorArg } from "./shared-options.js";
 import { CliInputError } from "./errors.js";
 import { withExamples } from "./help.js";
 import { writeJson, writeJsonStream, writeText } from "./output.js";
@@ -14,18 +17,16 @@ import { emitWithFormat } from "./output-render.js";
 import { cursorOption as baseCursorOption, limitOption as baseLimitOption, parsePagination } from "./pagination.js";
 
 const feedUriArg = Args.text({ name: "uri" }).pipe(
+  Args.withSchema(AtUri),
   Args.withDescription("Bluesky feed URI (at://...)")
 );
 
 const feedUrisArg = Args.text({ name: "uri" }).pipe(
   Args.repeated,
+  Args.withSchema(Schema.mutable(Schema.Array(AtUri))),
   Args.withDescription("Feed URIs to fetch")
 );
 
-const actorArg = Args.text({ name: "actor" }).pipe(
-  Args.withDescription("Bluesky handle or DID")
-);
-
 const limitOption = baseLimitOption.pipe(
   Options.withDescription("Maximum number of results")
 );
@@ -39,6 +40,17 @@ const formatOption = Options.choice("format", jsonNdjsonTableFormats).pipe(
   Options.optional
 );
 
+const ensureSupportedFormat = (
+  format: Option.Option<typeof jsonNdjsonTableFormats[number]>,
+  configFormat: string
+) =>
+  Option.isNone(format) && configFormat === "markdown"
+    ? CliInputError.make({
+        message: 'Output format "markdown" is not supported for feed commands. Use --format json|ndjson|table.',
+        cause: { format: configFormat }
+      })
+    : Effect.void;
+
 
 const renderFeedInfoTable = (
   view: FeedGeneratorView,
@@ -56,16 +68,24 @@ const showCommand = Command.make(
   ({ uri, format }) =>
     Effect.gen(function* () {
       const appConfig = yield* AppConfigService;
+      yield* ensureSupportedFormat(format, appConfig.outputFormat);
+      const preferences = yield* CliPreferences;
       const client = yield* BskyClient;
       const result = yield* client.getFeedGenerator(uri);
+      const payload = preferences.compact
+        ? {
+            ...result,
+            view: compactFeedGeneratorView(result.view)
+          }
+        : result;
       yield* emitWithFormat(
         format,
         appConfig.outputFormat,
         jsonNdjsonTableFormats,
         "json",
         {
-          json: writeJson(result),
-          ndjson: writeJson(result),
+          json: writeJson(payload),
+          ndjson: writeJson(payload),
           table: writeText(renderFeedInfoTable(result.view, result.isOnline, result.isValid))
         }
       );
@@ -84,6 +104,8 @@ const batchCommand = Command.make(
   ({ uris, format }) =>
     Effect.gen(function* () {
       const appConfig = yield* AppConfigService;
+      yield* ensureSupportedFormat(format, appConfig.outputFormat);
+      const preferences = yield* CliPreferences;
       const client = yield* BskyClient;
       if (uris.length === 0) {
         return yield* CliInputError.make({
@@ -92,14 +114,21 @@ const batchCommand = Command.make(
         });
       }
       const result = yield* client.getFeedGenerators(uris);
+      const feeds = preferences.compact
+        ? result.feeds.map(compactFeedGeneratorView)
+        : result.feeds;
+      const payload = { ...result, feeds };
+      const feedsStream = Stream.fromIterable(
+        feeds as ReadonlyArray<FeedGeneratorView | ReturnType<typeof compactFeedGeneratorView>>
+      );
       yield* emitWithFormat(
         format,
         appConfig.outputFormat,
         jsonNdjsonTableFormats,
         "json",
         {
-          json: writeJson(result),
-          ndjson: writeJsonStream(Stream.fromIterable(result.feeds)),
+          json: writeJson(payload),
+          ndjson: writeJsonStream(feedsStream),
           table: writeText(renderFeedTable(result.feeds, undefined))
         }
       );
@@ -118,21 +147,29 @@ const byActorCommand = Command.make(
   ({ actor, limit, cursor, format }) =>
     Effect.gen(function* () {
       const appConfig = yield* AppConfigService;
+      yield* ensureSupportedFormat(format, appConfig.outputFormat);
+      const preferences = yield* CliPreferences;
       const client = yield* BskyClient;
-      const { limit: limitValue, cursor: cursorValue } = yield* parsePagination(limit, cursor);
-      const resolvedActor = yield* decodeActor(actor);
-      const result = yield* client.getActorFeeds(resolvedActor, {
+      const { limit: limitValue, cursor: cursorValue } = parsePagination(limit, cursor);
+      const result = yield* client.getActorFeeds(actor, {
         ...(limitValue !== undefined ? { limit: limitValue } : {}),
         ...(cursorValue !== undefined ? { cursor: cursorValue } : {})
       });
+      const feeds = preferences.compact
+        ? result.feeds.map(compactFeedGeneratorView)
+        : result.feeds;
+      const payload = { ...result, feeds };
+      const feedsStream = Stream.fromIterable(
+        feeds as ReadonlyArray<FeedGeneratorView | ReturnType<typeof compactFeedGeneratorView>>
+      );
       yield* emitWithFormat(
         format,
         appConfig.outputFormat,
         jsonNdjsonTableFormats,
         "json",
         {
-          json: writeJson(result),
-          ndjson: writeJsonStream(Stream.fromIterable(result.feeds)),
+          json: writeJson(payload),
+          ndjson: writeJsonStream(feedsStream),
           table: writeText(renderFeedTable(result.feeds, result.cursor))
         }
       );

package/src/cli/filter-errors.ts

@@ -1,5 +1,5 @@
 import { ParseResult } from "effect";
-import { safeParseJson, issueDetails } from "./parse-errors.js";
+import { safeParseJson, issueDetails, findJsonParseIssue, jsonParseTip } from "./parse-errors.js";
 import { formatAgentError, type AgentErrorPayload } from "./errors.js";
 
 const validFilterTags = [
@@ -76,19 +76,15 @@ export const formatFilterParseError = (error: ParseResult.ParseError, raw: strin
   const received = safeParseJson(raw);
   const receivedValue = received === undefined ? raw : received;
 
-  const jsonParseIssue = issues.find(
-    (issue) =>
-      issue._tag === "Transformation" &&
-      typeof issue.message === "string" &&
-      issue.message.startsWith("JSON Parse error")
-  );
+  const jsonParseIssue = findJsonParseIssue(issues);
   if (jsonParseIssue) {
+    const jsonMessage = jsonParseIssue.message ?? "Invalid JSON input.";
     return jsonParseError({
       message: "Invalid JSON in --filter-json.",
       received: raw,
       details: [
-        jsonParseIssue.message,
-        "Tip: wrap JSON in single quotes to avoid shell escaping issues."
+        jsonMessage,
+        jsonParseTip
       ]
     });
   }

package/src/cli/filter.ts

@@ -4,7 +4,7 @@ import { Chunk, Clock, Effect, Option, Stream } from "effect";
 import { StoreQuery } from "../domain/events.js";
 import { RawPost } from "../domain/raw.js";
 import type { Post } from "../domain/post.js";
-import { StoreName } from "../domain/primitives.js";
+import { PostUri, StoreName } from "../domain/primitives.js";
 import { BskyClient } from "../services/bsky-client.js";
 import { FilterCompiler } from "../services/filter-compiler.js";
 import { FilterLibrary } from "../services/filter-library.js";
@@ -25,6 +25,7 @@ import { withExamples } from "./help.js";
 import { filterOption, filterJsonOption } from "./shared-options.js";
 import { jsonTableFormats, resolveOutputFormat, textJsonFormats } from "./output-format.js";
 import { filterDslDescription, filterJsonDescription } from "./filter-help.js";
+import { PositiveInt } from "./option-schemas.js";
 
 const filterNameArg = Args.text({ name: "name" }).pipe(
   Args.withSchema(StoreName),
@@ -36,6 +37,7 @@ const postJsonOption = Options.text("post-json").pipe(
   Options.optional
 );
 const postUriOption = Options.text("post-uri").pipe(
+  Options.withSchema(PostUri),
   Options.withDescription("Bluesky post URI (at://...)."),
   Options.optional
 );
@@ -49,10 +51,12 @@ const storeTestOption = Options.text("store").pipe(
   Options.optional
 );
 const testLimitOption = Options.integer("limit").pipe(
+  Options.withSchema(PositiveInt),
   Options.withDescription("Number of posts to evaluate (default: 100)"),
   Options.optional
 );
 const sampleSizeOption = Options.integer("sample-size").pipe(
+  Options.withSchema(PositiveInt),
   Options.withDescription("Number of posts to evaluate (default: 1000)"),
   Options.optional
 );
@@ -294,12 +298,6 @@ export const filterTest = Command.make(
             cause: { store: store.value, postJson, postUri }
           });
         }
-        if (Option.isSome(limit) && limit.value <= 0) {
-          return yield* CliInputError.make({
-            message: "--limit must be a positive integer.",
-            cause: { limit: limit.value }
-          });
-        }
         const storeRef = yield* storeOptions.loadStoreRef(store.value);
         const index = yield* StoreIndex;
         const evaluateBatch = yield* runtime.evaluateBatch(expr);