@docyrus/docyrus 0.0.19 → 0.0.20

package/main.js

@@ -124678,7 +124678,7 @@ function buildInputSchema(args, env2, options2) {
 // package.json
 var package_default = {
   name: "@docyrus/docyrus",
-  version: "0.0.19",
+  version: "0.0.20",
   private: false,
   description: "Docyrus API CLI",
   main: "./main.js",
@@ -124687,8 +124687,8 @@ var package_default = {
   },
   dependencies: {
     "@clack/prompts": "^0.11.0",
-    "@mariozechner/pi-ai": "0.60.0",
-    "@mariozechner/pi-coding-agent": "0.60.0",
+    "@mariozechner/pi-ai": "0.61.0",
+    "@mariozechner/pi-coding-agent": "0.61.0",
     "@opentui/core": "^0.1.85",
     "@opentui/react": "^0.1.85",
     incur: "^0.1.6",
@@ -125956,6 +125956,20 @@ var BULK_OPERATION_LIMIT = 50;
 function isRecord(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function normalizeOptionalString(value) {
+  const trimmed = value?.trim();
+  return trimmed && trimmed.length > 0 ? trimmed : void 0;
+}
+function normalizeJsonLikeQueryValue(value, flag) {
+  const trimmed = normalizeOptionalString(value);
+  if (!trimmed) {
+    return void 0;
+  }
+  if (trimmed.startsWith("{") || trimmed.startsWith("[")) {
+    return JSON.stringify(parseJsonData(trimmed, flag));
+  }
+  return trimmed;
+}
 function toBulkPayload(payload, mode) {
   if (!Array.isArray(payload)) {
     return null;
@@ -126004,7 +126018,10 @@ function createDsCli(dependencies) {
       const apiClient = dependencies.createApiClient(apiBaseUrl);
       const response = await apiClient.request({
         method: "GET",
-        path: `/apps/${context.args.appSlug}/data-sources/${context.args.dataSourceSlug}`
+        path: `/apps/${context.args.appSlug}/data-sources/${context.args.dataSourceSlug}`,
+        query: {
+          expand: "fields"
+        }
       });
       return await injectContext({
         apiBaseUrl,
@@ -126020,31 +126037,44 @@ function createDsCli(dependencies) {
       dataSourceSlug: external_exports.string().min(1)
     }),
     options: external_exports.object({
-      columns: external_exports.string().optional(),
-      filters: external_exports.string().optional(),
+      collapseRows: external_exports.boolean().optional().describe("Collapse rows into a single aggregated array"),
+      columns: external_exports.string().optional().describe("Columns to select; comma-separated or JSON array"),
+      distinctColumns: external_exports.string().optional().describe("Distinct columns; comma-separated or JSON array"),
+      formulas: external_exports.string().optional().describe("JSON formulas object"),
+      calculations: external_exports.string().optional().describe("JSON calculations array"),
+      filters: external_exports.string().optional().describe("JSON filter group"),
+      filterKeyword: external_exports.string().optional().describe("Keyword filter"),
       limit: external_exports.number().optional(),
       offset: external_exports.number().optional(),
-      orderBy: external_exports.string().optional(),
-      fullCount: external_exports.boolean().optional()
+      orderBy: external_exports.string().optional().describe("Sort order string or JSON object/array"),
+      groupSummaries: external_exports.boolean().optional().describe("Return per-group summaries when calculations are used"),
+      fullCount: external_exports.boolean().optional(),
+      expand: external_exports.string().optional().describe("Expand columns; comma-separated or JSON array"),
+      pivot: external_exports.string().optional().describe("JSON pivot configuration"),
+      childQueries: external_exports.string().optional().describe("JSON child query array")
     }),
     run: async (context) => {
       const apiBaseUrl = await dependencies.environmentConfigService.getActiveApiBaseUrl();
       const apiClient = dependencies.createApiClient(apiBaseUrl);
-      let serializedFilters;
-      if (context.options.filters) {
-        const parsedFilters = parseJsonData(context.options.filters, "--filters");
-        serializedFilters = JSON.stringify(parsedFilters);
-      }
       const response = await apiClient.request({
         method: "GET",
         path: `/apps/${context.args.appSlug}/data-sources/${context.args.dataSourceSlug}/items`,
         query: {
-          columns: context.options.columns,
-          filters: serializedFilters,
+          collapseRows: context.options.collapseRows,
+          columns: normalizeJsonLikeQueryValue(context.options.columns, "--columns"),
+          distinctColumns: normalizeJsonLikeQueryValue(context.options.distinctColumns, "--distinctColumns"),
+          formulas: normalizeJsonLikeQueryValue(context.options.formulas, "--formulas"),
+          calculations: normalizeJsonLikeQueryValue(context.options.calculations, "--calculations"),
+          filters: normalizeJsonLikeQueryValue(context.options.filters, "--filters"),
+          filterKeyword: normalizeOptionalString(context.options.filterKeyword),
           limit: context.options.limit,
           offset: context.options.offset,
-          orderBy: context.options.orderBy,
-          fullCount: context.options.fullCount
+          orderBy: normalizeJsonLikeQueryValue(context.options.orderBy, "--orderBy"),
+          groupSummaries: context.options.groupSummaries,
+          fullCount: context.options.fullCount,
+          expand: normalizeJsonLikeQueryValue(context.options.expand, "--expand"),
+          pivot: normalizeJsonLikeQueryValue(context.options.pivot, "--pivot"),
+          childQueries: normalizeJsonLikeQueryValue(context.options.childQueries, "--childQueries")
         }
       });
       return await injectContext({
@@ -126920,25 +126950,13 @@ function createStudioCli(dependencies) {
   studioCli.command("get-data-source", {
     description: "Get a single data source",
     options: external_exports.object({
-      appId: external_exports.string().optional().describe("App ID"),
-      appSlug: external_exports.string().optional().describe("App slug"),
-      dataSourceId: external_exports.string().optional().describe("Data source ID"),
-      dataSourceSlug: external_exports.string().optional().describe("Data source slug")
+      dataSourceId: external_exports.string().min(1).describe("Data source ID")
     }),
     run: async (context) => {
       const studio = await getStudioRunContext(dependencies);
-      const appId = await studio.resolver.resolveAppId({
-        appId: context.options.appId,
-        appSlug: context.options.appSlug
-      });
-      const dataSourceId = await studio.resolver.resolveDataSourceId({
-        appId,
-        dataSourceId: context.options.dataSourceId,
-        dataSourceSlug: context.options.dataSourceSlug
-      });
       const response = await studio.apiClient.request({
         method: "GET",
-        path: `/dev/apps/${appId}/data-sources/${dataSourceId}`
+        path: `/dev/data-sources/${context.options.dataSourceId}`
       });
       return await wrapStudioPayload(studio.apiBaseUrl, dependencies, response.data);
     }
@@ -128918,6 +128936,23 @@ var import_node_child_process3 = require("node:child_process");
 var import_node_fs4 = require("node:fs");
 var import_promises7 = require("node:fs/promises");
 var import_node_path9 = require("node:path");
+var DOCYRUS_EXTERNAL_SKILL_SOURCE = "docyrus/agent-skills";
+var DOCYRUS_PACKAGED_PLATFORM_SKILL_NAME = "docyrus-platform";
+var DOCYRUS_MIGRATED_SKILL_NAMES = [
+  "docyrus-app-dev",
+  "docyrus-api-dev",
+  "docyrus-cli-app"
+];
+var DOCYRUS_EXTERNAL_SKILL_AGENT_IDS = [
+  "pi",
+  "claude-code",
+  "codex",
+  "github-copilot",
+  "gemini-cli",
+  "antigravity",
+  "windsurf"
+];
+var DOCYRUS_EXTERNAL_SKILL_MARKER_FILE = ".docyrus-external-skills-installed.json";
 function summarizeFailure2(result) {
   const stderr = result.stderr?.toString().trim();
   if (stderr && stderr.length > 0) {
@@ -129074,6 +129109,12 @@ async function syncPackagedSkills(params) {
   const entries = await (0, import_promises7.readdir)(sourceSkillsRoot, {
     withFileTypes: true
   });
+  await Promise.all(DOCYRUS_MIGRATED_SKILL_NAMES.map(async (skillName) => {
+    await (0, import_promises7.rm)((0, import_node_path9.join)(targetSkillsRoot, skillName), {
+      recursive: true,
+      force: true
+    });
+  }));
   await Promise.all(entries.map(async (entry) => {
     await (0, import_promises7.cp)((0, import_node_path9.join)(sourceSkillsRoot, entry.name), (0, import_node_path9.join)(targetSkillsRoot, entry.name), {
       recursive: true,
@@ -129093,6 +129134,107 @@ async function writeRuntimeSkill(params) {
     mode: 384
   });
 }
+function resolveNpxCommand() {
+  return process.platform === "win32" ? "npx.cmd" : "npx";
+}
+function createDocyrusSkillsInstallArgs(scope) {
+  const args = [
+    "skills",
+    "add",
+    DOCYRUS_EXTERNAL_SKILL_SOURCE
+  ];
+  if (scope === "global") {
+    args.push("--global");
+  }
+  args.push(
+    "--skill",
+    ...DOCYRUS_MIGRATED_SKILL_NAMES,
+    "--agent",
+    ...DOCYRUS_EXTERNAL_SKILL_AGENT_IDS,
+    "--yes"
+  );
+  return args;
+}
+function createPackagedDocyrusPlatformInstallArgs(params) {
+  const args = [
+    "skills",
+    "add",
+    params.skillSourcePath
+  ];
+  if (params.scope === "global") {
+    args.push("--global");
+  }
+  args.push(
+    "--agent",
+    ...DOCYRUS_EXTERNAL_SKILL_AGENT_IDS,
+    "--copy",
+    "--yes"
+  );
+  return args;
+}
+async function installExternalDocyrusSkillsOnce(params) {
+  const markerPath = (0, import_node_path9.join)(params.agentRootPath, DOCYRUS_EXTERNAL_SKILL_MARKER_FILE);
+  if ((0, import_node_fs4.existsSync)(markerPath)) {
+    return;
+  }
+  const result = params.spawnCommand(resolveNpxCommand(), createDocyrusSkillsInstallArgs(params.scope), {
+    stdio: ["ignore", "pipe", "pipe"],
+    encoding: "utf8",
+    cwd: params.cwd,
+    env: {
+      ...process.env
+    }
+  });
+  if (result.error || result.status !== 0) {
+    process.stderr.write(
+      `[docyrus] Automatic Docyrus skill install failed. Continuing without it: ${result.error?.message || summarizeFailure2(result)}
+`
+    );
+    return;
+  }
+  await (0, import_promises7.writeFile)(markerPath, `${JSON.stringify({
+    source: DOCYRUS_EXTERNAL_SKILL_SOURCE,
+    skills: DOCYRUS_MIGRATED_SKILL_NAMES,
+    agents: DOCYRUS_EXTERNAL_SKILL_AGENT_IDS,
+    scope: params.scope,
+    installedAt: (/* @__PURE__ */ new Date()).toISOString()
+  }, null, 2)}
+`, {
+    encoding: "utf8",
+    mode: 384
+  });
+}
+function resolvePackagedDocyrusPlatformSkillPath(resourceRoot) {
+  return (0, import_node_path9.join)(resourceRoot, "skills", DOCYRUS_PACKAGED_PLATFORM_SKILL_NAME);
+}
+function installPackagedDocyrusPlatformSkill(params) {
+  const skillSourcePath = resolvePackagedDocyrusPlatformSkillPath(params.resourceRoot);
+  if (!(0, import_node_fs4.existsSync)(skillSourcePath)) {
+    process.stderr.write("[docyrus] Packaged docyrus-platform skill is missing. Continuing without agent sync.\n");
+    return;
+  }
+  const result = params.spawnCommand(
+    resolveNpxCommand(),
+    createPackagedDocyrusPlatformInstallArgs({
+      scope: params.scope,
+      skillSourcePath
+    }),
+    {
+      stdio: ["ignore", "pipe", "pipe"],
+      encoding: "utf8",
+      cwd: params.cwd,
+      env: {
+        ...process.env
+      }
+    }
+  );
+  if (result.error || result.status !== 0) {
+    process.stderr.write(
+      `[docyrus] Automatic docyrus-platform skill sync failed. Continuing without it: ${result.error?.message || summarizeFailure2(result)}
+`
+    );
+  }
+}
 function validatePiAgentLaunchRequest(params) {
   if (params.request.mode && !params.request.print && params.stdinIsTTY) {
     throw new UserInputError("`--mode` requires `--print` when stdin is interactive.");
@@ -129133,6 +129275,18 @@ function createPiAgentLauncher(options2) {
         settingsRootPath
       })
     });
+    await installExternalDocyrusSkillsOnce({
+      agentRootPath,
+      cwd,
+      scope: options2.settingsPaths.scope,
+      spawnCommand
+    });
+    installPackagedDocyrusPlatformSkill({
+      resourceRoot,
+      cwd,
+      scope: options2.settingsPaths.scope,
+      spawnCommand
+    });
     const loaderEntryPath = resolveLoaderPath({ cwd });
     const piPackageRoot = resolvePiPackageRoot({ cwd });
     const result = spawnCommand(processExecPath, [loaderEntryPath], {