log-llm-config-staging 1.4.3 → 1.4.4

package/dist/log_config_files/collection/skills_cli_collector.js

@@ -1,11 +1,9 @@
 import { execFileSync } from 'node:child_process';
-import { createRequire } from 'node:module';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
-import { fileURLToPath } from 'node:url';
 export const SKILLS_CLI_FILE_TYPE = 'skills_cli_installed';
 export const SKILLS_CLI_INSTALLED_PATH = join(homedir(), '.agents', '.skills-cli-installed.json');
-/** Override fallback runner, e.g. `skills@1.5.10`. Default `skills` uses the machine npx cache. */
+/** Override the skills package spec, e.g. `skills@1.5.10`. Default uses whatever is on the machine. */
 export const SKILLS_CLI_NPX_PACKAGE_ENV = 'SKILLS_CLI_NPX_PACKAGE';
 const LIST_TIMEOUT_MS = 120_000;
 function listExecEnv() {
@@ -14,46 +12,17 @@ function listExecEnv() {
         DISABLE_TELEMETRY: process.env.DISABLE_TELEMETRY ?? '1',
     };
 }
-function npxPackageSpecForFallback() {
+function npxPackageSpec() {
     const fromEnv = (process.env[SKILLS_CLI_NPX_PACKAGE_ENV] || '').trim();
     return fromEnv || 'skills';
 }
-function resolveSkillsListRunner() {
-    try {
-        const require = createRequire(fileURLToPath(import.meta.url));
-        const bin = require.resolve('skills/bin/cli.mjs');
-        const pkg = require('skills/package.json');
-        const version = (pkg.version || '').trim() || 'unknown';
-        return { mode: 'bundled', bin, version };
-    }
-    catch {
-        return { mode: 'npx', packageSpec: npxPackageSpecForFallback() };
-    }
-}
-function execSkillsList(args, cwd, runner) {
-    if (runner.mode === 'bundled') {
-        return execFileSync(process.execPath, [runner.bin, 'list', ...args, '--json'], {
-            encoding: 'utf8',
-            cwd,
-            timeout: LIST_TIMEOUT_MS,
-            env: listExecEnv(),
-        });
-    }
-    return execFileSync('npx', ['--yes', runner.packageSpec, 'list', ...args, '--json'], {
+export function runSkillsListJson(args, cwd) {
+    const out = execFileSync('npx', [npxPackageSpec(), 'list', ...args, '--json'], {
         encoding: 'utf8',
         cwd,
         timeout: LIST_TIMEOUT_MS,
         env: listExecEnv(),
     });
-}
-function runnerVersionLabel(runner) {
-    if (runner.mode === 'bundled')
-        return runner.version;
-    return `npx:${runner.packageSpec}`;
-}
-export function runSkillsListJson(args, cwd) {
-    const runner = resolveSkillsListRunner();
-    const out = execSkillsList(args, cwd, runner);
     const trimmed = out.trim();
     if (!trimmed)
         return [];
@@ -96,13 +65,8 @@ export function collectSkillsCliInstalled(projectRoot, log) {
         log?.(message);
     };
     try {
-        const runner = resolveSkillsListRunner();
-        if (runner.mode === 'bundled') {
-            logLine(`skills_cli: bundled skills@${runner.version} — list -g --json && list --json (projectRoot=${projectRoot})`);
-        }
-        else {
-            logLine(`skills_cli: npx fallback (${runner.packageSpec}) — no bundled skills dep; uses machine npx cache (projectRoot=${projectRoot})`);
-        }
+        const packageSpec = npxPackageSpec();
+        logLine(`skills_cli: npx ${packageSpec} — list -g --json && list --json (projectRoot=${projectRoot})`);
         const globalRows = runSkillsListJson(['-g'], projectRoot);
         const projectRows = runSkillsListJson([], projectRoot);
         const global = normalizeListRows(globalRows, 'global');
@@ -111,7 +75,7 @@ export function collectSkillsCliInstalled(projectRoot, log) {
         logLine(formatSkillsListScopeForHookLog('project', project));
         const payload = {
             version: 1,
-            skills_cli_version: runnerVersionLabel(runner),
+            skills_cli_version: packageSpec,
             generated_at: new Date().toISOString(),
             global,
             project,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "log-llm-config-staging",
-  "version": "1.4.3",
+  "version": "1.4.4",
   "description": "CLI helpers for logging hardware UUIDs and posting startup payloads to Optimus Security.",
   "type": "module",
   "bin": {
@@ -58,7 +58,6 @@
   "dependencies": {
     "axios": "^1.15.2",
     "canonicalize": "^2.1.0",
-    "optimus-tofu-staging": "^0.1.17",
-    "skills": "1.5.10"
+    "optimus-tofu-staging": "^0.1.17"
   }
 }