@floomhq/floom 1.0.51 → 1.0.52

package/dist/status.js

@@ -2,10 +2,10 @@ import { constants } from "node:fs";
 import { open, readdir } from "node:fs/promises";
 import { join } from "node:path";
 import { CONFIG_DIR, readConfig, resolveApiUrl } from "./config.js";
-import { getJson } from "./lib/api.js";
+import { floomFetch } from "./lib/api.js";
 import { AGENT_TARGETS, targetSkillsDir } from "./targets.js";
 import { c, symbols } from "./ui.js";
-const MAX_PACKAGE_SCAN_DEPTH = 8;
+const STATUS_CLOUD_TIMEOUT_MS = 8_000;
 async function readJsonFile(path) {
     try {
         const handle = await open(path, constants.O_RDONLY | constants.O_NOFOLLOW);
@@ -23,30 +23,32 @@ async function readJsonFile(path) {
         throw err;
     }
 }
-async function countSkillPackages(root) {
+async function countDirectSkillPackages(root) {
     let count = 0;
-    async function walk(dir, depth) {
-        if (depth > MAX_PACKAGE_SCAN_DEPTH)
-            return;
-        let entries;
+    let entries;
+    try {
+        entries = await readdir(root, { withFileTypes: true });
+    }
+    catch (err) {
+        if (err.code === "ENOENT")
+            return 0;
+        throw err;
+    }
+    if (entries.some((entry) => entry.isFile() && entry.name === "SKILL.md"))
+        count += 1;
+    for (const entry of entries) {
+        if (!entry.isDirectory() || entry.name.startsWith("."))
+            continue;
         try {
-            entries = await readdir(dir, { withFileTypes: true });
+            const child = await readdir(join(root, entry.name), { withFileTypes: true });
+            if (child.some((item) => item.isFile() && item.name === "SKILL.md"))
+                count += 1;
         }
         catch (err) {
-            if (err.code === "ENOENT")
-                return;
-            throw err;
-        }
-        if (entries.some((entry) => entry.isFile() && entry.name === "SKILL.md")) {
-            count += 1;
-        }
-        for (const entry of entries) {
-            if (!entry.isDirectory() || entry.name.startsWith("."))
-                continue;
-            await walk(join(dir, entry.name), depth + 1);
+            if (err.code !== "ENOENT")
+                throw err;
         }
     }
-    await walk(root, 0);
     return count;
 }
 function manifestCounts(manifest) {
@@ -61,24 +63,31 @@ async function countCloudVisible() {
     if (!cfg)
         return { signedIn: false, total: null };
     const apiUrl = resolveApiUrl(cfg);
-    let cursor;
-    const seenCursors = new Set();
-    let total = 0;
-    for (let page = 0; page < 1000; page += 1) {
+    try {
         const url = new URL(`${apiUrl}/api/v1/me/skills`);
         url.searchParams.set("limit", "100");
-        if (cursor)
-            url.searchParams.set("cursor", cursor);
-        const payload = await getJson(url.toString(), "load your skills", cfg.accessToken);
-        total += Array.isArray(payload.skills) ? payload.skills.length : 0;
-        if (!payload.next_cursor)
-            return { signedIn: true, total };
-        if (seenCursors.has(payload.next_cursor))
-            return { signedIn: true, total };
-        seenCursors.add(payload.next_cursor);
-        cursor = payload.next_cursor;
+        const res = await floomFetch(url.toString(), "load your skills", {
+            token: cfg.accessToken,
+            timeoutMs: STATUS_CLOUD_TIMEOUT_MS,
+            rateLimitRetries: 0,
+        });
+        const payload = (await res.json());
+        const sampleCount = Array.isArray(payload.skills) ? payload.skills.length : 0;
+        const hasMore = Boolean(payload.next_cursor);
+        return {
+            signedIn: true,
+            total: hasMore ? null : sampleCount,
+            sampleCount,
+            hasMore,
+        };
+    }
+    catch (err) {
+        return {
+            signedIn: true,
+            total: null,
+            error: err instanceof Error ? err.message : String(err),
+        };
     }
-    return { signedIn: true, total };
 }
 async function buildStatus() {
     const cloud = await countCloudVisible();
@@ -91,11 +100,11 @@ async function buildStatus() {
         const cacheManifest = manifestCounts(await readJsonFile(join(cacheRoot, ".floom-cli-sync-manifest.json")));
         const nativeManifest = manifestCounts(await readJsonFile(join(CONFIG_DIR, "native-sync-manifests", `${target}.json`)));
         targets[target] = {
-            cache_packages: await countSkillPackages(cacheRoot),
+            cache_packages: cacheManifest.skills || await countDirectSkillPackages(cacheRoot),
             cache_manifest_files: cacheManifest.files,
             cache_manifest_skills: cacheManifest.skills,
             native_root: nativeRoot,
-            native_packages: await countSkillPackages(nativeRoot),
+            native_packages: nativeManifest.skills || await countDirectSkillPackages(nativeRoot),
             native_manifest_files: nativeManifest.files,
             native_manifest_skills: nativeManifest.skills,
             ...(daemonRaw?.last_run?.[target] ? { daemon: daemonRaw.last_run[target] } : {}),
@@ -105,6 +114,9 @@ async function buildStatus() {
         cloud: {
             signed_in: cloud.signedIn,
             visible_total: cloud.total,
+            ...(cloud.sampleCount !== undefined ? { visible_sample_count: cloud.sampleCount } : {}),
+            ...(cloud.hasMore !== undefined ? { visible_has_more: cloud.hasMore } : {}),
+            ...(cloud.error ? { error: cloud.error } : {}),
         },
         daemon: {
             running: daemonRunning,
@@ -149,7 +161,10 @@ export async function status(opts) {
     }
     process.stdout.write(`\n${symbols.dot}  ${c.bold("Floom status")}\n\n`);
     process.stdout.write(`   ${c.dim("cloud signed in:")} ${payload.cloud.signed_in ? "yes" : "no"}\n`);
-    process.stdout.write(`   ${c.dim("cloud visible skills:")} ${payload.cloud.visible_total ?? "unknown"}\n`);
+    const cloudVisible = payload.cloud.visible_total ?? (payload.cloud.visible_has_more ? `${payload.cloud.visible_sample_count ?? "?"}+` : "unknown");
+    process.stdout.write(`   ${c.dim("cloud visible skills:")} ${cloudVisible}\n`);
+    if (payload.cloud.error)
+        process.stdout.write(`   ${c.dim("cloud status:")} ${payload.cloud.error}\n`);
     process.stdout.write(`   ${c.dim("daemon:")} ${payload.daemon.running ? "running" : "not running"}${payload.daemon.version ? ` (${payload.daemon.version})` : ""}\n`);
     if (payload.daemon.last_completed_at)
         process.stdout.write(`   ${c.dim("last completed:")} ${payload.daemon.last_completed_at}\n`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floomhq/floom",
-  "version": "1.0.51",
+  "version": "1.0.52",
   "description": "Sync AI skills across agents and machines.",
   "license": "MIT",
   "type": "module",