@opscompass/skills 0.2.0 → 0.2.1

package/manifest.json

@@ -2,10 +2,10 @@
   "schemaVersion": 1,
   "scope": "public",
   "name": "@opscompass/skills",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "source": {
     "repository": "https://gitlab.com/opscompass-hob/opscompass-ai/opscompassai.git",
-    "revision": "e96ebc310fdaff22d6b9861025380528e59bcae8",
+    "revision": "e71529c9bf8952fa65fc291216a07c54e15e29ad",
     "dirty": false
   },
   "skills": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opscompass/skills",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Public OpsCompass Skills with portable compiled tools and runtime assets",
   "license": "UNLICENSED",
   "type": "module",

package/skills/opscompass-oracle-licensing/.opscompass-runtime/tools/opsc-cli-context.js

@@ -22,3 +22,13 @@ export function resolveCliContext(cliCommand) {
         opscompassHome: path.join(os.homedir(), `.${selectedCommand}`),
     };
 }
+export function resolveCliInvocation(context, args) {
+    return {
+        executable: context.cliInvocation?.executable ?? context.cliEntryPoint,
+        args: [...(context.cliInvocation?.args ?? []), ...args],
+        env: {
+            ...(context.cliInvocation?.env ?? process.env),
+            OPSCOMPASS_CLI_ENTRYPOINT: context.cliEntryPoint,
+        },
+    };
+}

package/skills/opscompass-oracle-licensing/.opscompass-runtime/tools/opsc-cli.js

@@ -1,31 +1,41 @@
 import { spawn } from "node:child_process";
+import { resolveCliInvocation } from "./opsc-cli-context.js";
 const MAX_TIMEOUT_SECONDS = 120;
 const MAX_OUTPUT_BYTES = 100_000;
 export async function runCli(context, args) {
-    const child = spawn(context.cliEntryPoint, args, {
+    if (context.signal.aborted)
+        throw new Error("Opscompass command aborted.");
+    const invocation = resolveCliInvocation(context, args);
+    const child = spawn(invocation.executable, invocation.args, {
+        shell: false,
         cwd: context.workspaceRoot,
         // The host-selected executable must win over ambient standalone overrides.
         env: {
-            ...process.env,
-            OPSCOMPASS_CLI_ENTRYPOINT: context.cliEntryPoint,
+            ...invocation.env,
             ELECTRON_RUN_AS_NODE: "1",
             OPSCOMPASS_STUDIO: "1",
         },
         stdio: ["ignore", "pipe", "pipe"],
         detached: process.platform !== "win32",
     });
-    const chunks = [];
-    let outputBytes = 0;
+    const stdout = [];
+    const stderr = [];
+    let stdoutBytes = 0;
+    let stderrBytes = 0;
     let timedOut = false;
-    const collect = (chunk) => {
+    const collect = (chunks, chunk, outputBytes) => {
         if (outputBytes >= MAX_OUTPUT_BYTES)
-            return;
+            return outputBytes;
         const bounded = chunk.subarray(0, MAX_OUTPUT_BYTES - outputBytes);
         chunks.push(bounded);
-        outputBytes += bounded.length;
+        return outputBytes + bounded.length;
     };
-    child.stdout?.on("data", collect);
-    child.stderr?.on("data", collect);
+    child.stdout?.on("data", (chunk) => {
+        stdoutBytes = collect(stdout, chunk, stdoutBytes);
+    });
+    child.stderr?.on("data", (chunk) => {
+        stderrBytes = collect(stderr, chunk, stderrBytes);
+    });
     let graceTimer;
     const forceKill = () => {
         try {
@@ -59,13 +69,15 @@ export async function runCli(context, args) {
     const result = new Promise((resolve, reject) => {
         child.once("error", reject);
         child.once("close", (code) => {
-            const output = Buffer.concat(chunks).toString("utf8");
+            const output = Buffer.concat(stdout).toString("utf8");
+            const diagnostic = Buffer.concat(stderr).toString("utf8");
             if (context.signal.aborted)
                 reject(new Error("Opscompass command aborted."));
             else if (timedOut)
                 reject(new Error(`Opscompass command timed out after ${MAX_TIMEOUT_SECONDS} seconds.`));
             else if (code !== 0)
-                reject(new Error(output.trim() ||
+                reject(new Error(diagnostic.trim() ||
+                    output.trim() ||
                     `Opscompass command failed with exit code ${code}.`));
             else
                 resolve(output);

package/skills/opscompass-oracle-licensing/scripts/tools.js

@@ -1,2 +1,3 @@
 import { oracleAssessmentTool } from "./oracle-assessment.tool.js";
+export const supportsCliInvocation = true;
 export const tools = [oracleAssessmentTool];

package/skills/opscompass-resources/.opscompass-runtime/tools/opsc-cli-context.js

@@ -22,3 +22,13 @@ export function resolveCliContext(cliCommand) {
         opscompassHome: path.join(os.homedir(), `.${selectedCommand}`),
     };
 }
+export function resolveCliInvocation(context, args) {
+    return {
+        executable: context.cliInvocation?.executable ?? context.cliEntryPoint,
+        args: [...(context.cliInvocation?.args ?? []), ...args],
+        env: {
+            ...(context.cliInvocation?.env ?? process.env),
+            OPSCOMPASS_CLI_ENTRYPOINT: context.cliEntryPoint,
+        },
+    };
+}

package/skills/opscompass-resources/.opscompass-runtime/tools/opsc-cli.js

@@ -1,31 +1,41 @@
 import { spawn } from "node:child_process";
+import { resolveCliInvocation } from "./opsc-cli-context.js";
 const MAX_TIMEOUT_SECONDS = 120;
 const MAX_OUTPUT_BYTES = 100_000;
 export async function runCli(context, args) {
-    const child = spawn(context.cliEntryPoint, args, {
+    if (context.signal.aborted)
+        throw new Error("Opscompass command aborted.");
+    const invocation = resolveCliInvocation(context, args);
+    const child = spawn(invocation.executable, invocation.args, {
+        shell: false,
         cwd: context.workspaceRoot,
         // The host-selected executable must win over ambient standalone overrides.
         env: {
-            ...process.env,
-            OPSCOMPASS_CLI_ENTRYPOINT: context.cliEntryPoint,
+            ...invocation.env,
             ELECTRON_RUN_AS_NODE: "1",
             OPSCOMPASS_STUDIO: "1",
         },
         stdio: ["ignore", "pipe", "pipe"],
         detached: process.platform !== "win32",
     });
-    const chunks = [];
-    let outputBytes = 0;
+    const stdout = [];
+    const stderr = [];
+    let stdoutBytes = 0;
+    let stderrBytes = 0;
     let timedOut = false;
-    const collect = (chunk) => {
+    const collect = (chunks, chunk, outputBytes) => {
         if (outputBytes >= MAX_OUTPUT_BYTES)
-            return;
+            return outputBytes;
         const bounded = chunk.subarray(0, MAX_OUTPUT_BYTES - outputBytes);
         chunks.push(bounded);
-        outputBytes += bounded.length;
+        return outputBytes + bounded.length;
     };
-    child.stdout?.on("data", collect);
-    child.stderr?.on("data", collect);
+    child.stdout?.on("data", (chunk) => {
+        stdoutBytes = collect(stdout, chunk, stdoutBytes);
+    });
+    child.stderr?.on("data", (chunk) => {
+        stderrBytes = collect(stderr, chunk, stderrBytes);
+    });
     let graceTimer;
     const forceKill = () => {
         try {
@@ -59,13 +69,15 @@ export async function runCli(context, args) {
     const result = new Promise((resolve, reject) => {
         child.once("error", reject);
         child.once("close", (code) => {
-            const output = Buffer.concat(chunks).toString("utf8");
+            const output = Buffer.concat(stdout).toString("utf8");
+            const diagnostic = Buffer.concat(stderr).toString("utf8");
             if (context.signal.aborted)
                 reject(new Error("Opscompass command aborted."));
             else if (timedOut)
                 reject(new Error(`Opscompass command timed out after ${MAX_TIMEOUT_SECONDS} seconds.`));
             else if (code !== 0)
-                reject(new Error(output.trim() ||
+                reject(new Error(diagnostic.trim() ||
+                    output.trim() ||
                     `Opscompass command failed with exit code ${code}.`));
             else
                 resolve(output);

package/skills/opscompass-resources/scripts/build_resources_command.js

@@ -1,6 +1,6 @@
 import { spawn } from "node:child_process";
 import { isMainModule } from "../.opscompass-runtime/tools/cli-entrypoint.js";
-import { resolveCliContext } from "../.opscompass-runtime/tools/opsc-cli-context.js";
+import { resolveCliContext, resolveCliInvocation, } from "../.opscompass-runtime/tools/opsc-cli-context.js";
 import { resolveCompany } from "../.opscompass-runtime/tools/opsc-cli-defaults.js";
 export { resolveCompany };
 export const ALLOWED_LIST_PARAMS = new Set([
@@ -81,7 +81,9 @@ const shellQuote = (value) => /^[A-Za-z0-9_./:-]+$/.test(value)
 export const commandText = (command) => command.map(shellQuote).join(" ");
 function runCommand(command, context) {
     return new Promise((resolve, reject) => {
-        const child = spawn(context.cliEntryPoint, command.slice(1), {
+        const invocation = resolveCliInvocation(context, command.slice(1));
+        const child = spawn(invocation.executable, invocation.args, {
+            env: invocation.env,
             shell: false,
             stdio: "inherit",
         });

package/skills/opscompass-resources/scripts/list_and_fetch_latest_configs.js

@@ -2,7 +2,7 @@ import { mkdirSync, writeFileSync } from "node:fs";
 import path from "node:path";
 import { spawn } from "node:child_process";
 import { isMainModule } from "../.opscompass-runtime/tools/cli-entrypoint.js";
-import { resolveCliContext } from "../.opscompass-runtime/tools/opsc-cli-context.js";
+import { resolveCliContext, resolveCliInvocation, } from "../.opscompass-runtime/tools/opsc-cli-context.js";
 import * as brc from "./build_resources_command.js";
 import * as moc from "./map_oracle_workloads_to_platform_cpus.js";
 import * as slc from "./summarize_latest_configuration.js";
@@ -23,7 +23,8 @@ function runJsonCommand(command, verbose, logger, execution) {
         if (verbose)
             logger.error(`$ ${command.join(" ")}`);
         let stdout = "", stderr = "";
-        const child = spawn(execution.context.cliEntryPoint, command.slice(1), {
+        const invocation = resolveCliInvocation(execution.context, command.slice(1));
+        const child = spawn(invocation.executable, invocation.args, {
             shell: false,
             stdio: ["ignore", "pipe", "pipe"],
             cwd: execution.workspaceRoot,
@@ -503,8 +504,7 @@ async function runWorkflow(argv, logger, execution, signal) {
                 : process.cwd(),
             signal,
             env: {
-                ...process.env,
-                OPSCOMPASS_CLI_ENTRYPOINT: context.cliEntryPoint,
+                ...resolveCliInvocation(context, []).env,
                 ...(execution
                     ? { ELECTRON_RUN_AS_NODE: "1", OPSCOMPASS_STUDIO: "1" }
                     : {}),

package/skills/opscompass-resources/scripts/tools.js

@@ -5,6 +5,7 @@ import { opscompassDefaultsTool } from "./opscompass-defaults.tool.js";
 import { opscompassResourcesTool } from "./opscompass-resources.tool.js";
 import { summarizeLatestConfigurationTool } from "./summarize-latest-configuration.tool.js";
 import { summarizeResourcesListTool } from "./summarize-resources-list.tool.js";
+export const supportsCliInvocation = true;
 export const tools = [
     opscompassResourcesTool,
     buildResourcesCommandTool,