siluzan-cso-cli 1.1.14 → 1.1.15

package/dist/index.js

@@ -6465,8 +6465,33 @@ function buildMaterialQueryListParams(belongToId, folderId) {
     folderId
   });
 }
+function mergeFoldersByIdOrder(primary, secondary) {
+  const seen = new Set(primary.map((f) => f.id));
+  const out = [...primary];
+  for (const f of secondary) {
+    if (!seen.has(f.id)) {
+      seen.add(f.id);
+      out.push(f);
+    }
+  }
+  return out;
+}
+async function safeQueryMaterialFolderList(csoBaseUrl, config, belongToId, folderId, verbose) {
+  const p = buildMaterialQueryListParams(belongToId, folderId);
+  const url = `${csoBaseUrl}/cutapi/v1/material/querylist?${p.toString()}`;
+  try {
+    const raw = await apiFetch2(url, config, {}, verbose);
+    if (raw.code !== 1) {
+      return { ok: false, reason: raw.message || `\u4E1A\u52A1\u7801 ${raw.code}` };
+    }
+    return { ok: true, folders: raw.data?.folders ?? [] };
+  } catch (e) {
+    return { ok: false, reason: e.message };
+  }
+}
 async function runRagList(options) {
   const config = loadConfig(options.token);
+  const verbose = Boolean(options.verbose);
   let belongToId = String(options.belongToId ?? "").trim();
   if (!belongToId) {
     const me = await fetchSiluzanCurrentUser(config.apiBaseUrl, config);
@@ -6478,57 +6503,28 @@ async function runRagList(options) {
     );
     process.exit(1);
   }
-  const p = buildMaterialQueryListParams(belongToId, RAG_ROOT_FOLDER_ID);
-  const url = `${config.csoBaseUrl}/cutapi/v1/material/querylist?${p.toString()}`;
-  let raw;
-  try {
-    raw = await apiFetch2(
-      url,
+  const [rootRes, builtinRes] = await Promise.all([
+    safeQueryMaterialFolderList(config.csoBaseUrl, config, belongToId, RAG_ROOT_FOLDER_ID, verbose),
+    safeQueryMaterialFolderList(
+      config.csoBaseUrl,
       config,
-      {},
-      Boolean(options.verbose)
-    );
-  } catch (e) {
+      belongToId,
+      RAG_BUILTIN_PARENT_FOLDER_ID,
+      verbose
+    )
+  ]);
+  if (!rootRes.ok) {
     console.error(`
-\u274C \u8BF7\u6C42\u5931\u8D25\uFF1A${e.message}`);
-    if (!options.verbose) console.error("   \u52A0 --verbose \u53C2\u6570\u53EF\u67E5\u770B\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F");
+\u274C \u83B7\u53D6\u77E5\u8BC6\u5E93\u5217\u8868\u5931\u8D25\uFF08\u6839\u8282\u70B9\uFF09\uFF1A${rootRes.reason}`);
+    if (!verbose) console.error("   \u52A0 --verbose \u53C2\u6570\u53EF\u67E5\u770B\u8BE6\u7EC6\u9519\u8BEF\u4FE1\u606F");
     process.exit(1);
   }
-  if (raw.code !== 1) {
+  let folders = rootRes.folders;
+  if (builtinRes.ok) {
+    folders = mergeFoldersByIdOrder(rootRes.folders, builtinRes.folders);
+  } else if (verbose) {
     console.error(`
-\u274C \u83B7\u53D6\u77E5\u8BC6\u5E93\u5217\u8868\u5931\u8D25\uFF1A${raw.message || `\u4E1A\u52A1\u7801 ${raw.code}`}`);
-    process.exit(1);
-  }
-  let folders = raw.data?.folders ?? [];
-  try {
-    const pBuiltin = buildMaterialQueryListParams(belongToId, RAG_BUILTIN_PARENT_FOLDER_ID);
-    const urlBuiltin = `${config.csoBaseUrl}/cutapi/v1/material/querylist?${pBuiltin.toString()}`;
-    const rawBuiltin = await apiFetch2(
-      urlBuiltin,
-      config,
-      {},
-      Boolean(options.verbose)
-    );
-    if (rawBuiltin.code === 1) {
-      const extra = rawBuiltin.data?.folders ?? [];
-      const seen = new Set(folders.map((f) => f.id));
-      for (const f of extra) {
-        if (!seen.has(f.id)) {
-          seen.add(f.id);
-          folders.push(f);
-        }
-      }
-    } else if (options.verbose) {
-      console.error(
-        `
-\u26A0\uFE0F \u5185\u7F6E\u77E5\u8BC6\u5E93\u5B50\u5217\u8868\u5931\u8D25\uFF1A${rawBuiltin.message || `\u4E1A\u52A1\u7801 ${rawBuiltin.code}`}\uFF08\u5DF2\u8DF3\u8FC7\u5408\u5E76\uFF09`
-      );
-    }
-  } catch (e) {
-    if (options.verbose) {
-      console.error(`
-\u26A0\uFE0F \u5185\u7F6E\u77E5\u8BC6\u5E93\u5B50\u5217\u8868\u8BF7\u6C42\u5F02\u5E38\uFF1A${e.message}\uFF08\u5DF2\u8DF3\u8FC7\u5408\u5E76\uFF09`);
-    }
+\u26A0\uFE0F \u83B7\u53D6\u77E5\u8BC6\u5E93\u5217\u8868\u5931\u8D25\uFF08\u5185\u7F6E\u7236\u7EA7\uFF09\uFF1A${builtinRes.reason}\uFF08\u5DF2\u4EC5\u7528\u6839\u8282\u70B9\u6570\u636E\u5408\u5E76\u5C55\u793A\uFF09`);
   }
   if (options.ragOnly) {
     folders = folders.filter((f) => f.ragStatus === true);

package/dist/skill/_meta.json

@@ -1,7 +1,7 @@
 {
   "slug": "siluzan-cso",
-  "version": "1.1.14",
-  "publishedAt": 1777528215373,
+  "version": "1.1.15",
+  "publishedAt": 1777536583822,
   "homepage": "https://www.siluzan.com",
   "source": "https://dev.azure.com/jack4it/Sammamish/_git/siluzan-skill",
   "requiredBinaries": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "siluzan-cso-cli",
-  "version": "1.1.14",
+  "version": "1.1.15",
   "description": "Siluzan platform AI Skill CLI — multi-platform content publishing (video/image-text) for Cursor, Claude Code, and OpenClaw.",
   "keywords": [
     "ai-skill",