Skip to content

feat(skill): tool invocation via npx #2916

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
helloeve merged 7 commits into from
Apr 6, 2026
Merged

feat(skill): tool invocation via npx #2916

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f23a41f
feat(skill): tool invocation via npx
helloeve Mar 31, 2026
d58ff45
make tool invocation approach configurable
helloeve Apr 2, 2026
359161b
update npx
helloeve Apr 2, 2026
0e735a2
Merge branch 'main' into skill-npx
helloeve Apr 2, 2026
959c316
make toolbox version configurable
helloeve Apr 2, 2026
c437f61
set npx as default skill generation option
helloeve Apr 6, 2026
5ee5250
Merge remote-tracking branch 'upstream' into skill-npx
helloeve Apr 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 20 additions & 30 deletions cmd/internal/skills/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,37 +124,11 @@ const nodeScriptTemplate = `#!/usr/bin/env node
const { spawn, execSync } = require('child_process');
const path = require('path');
const fs = require('fs');
const os = require('os');

const toolName = "{{.Name}}";
const configArgs = [{{.ConfigArgs}}];

function getToolboxPath() {
if (process.env.GEMINI_CLI === '1') {
const localPath = path.resolve(__dirname, '../../../toolbox');
if (fs.existsSync(localPath)) {
return localPath;
}
}
try {
const checkCommand = process.platform === 'win32' ? 'where toolbox' : 'which toolbox';
const globalPath = execSync(checkCommand, { stdio: 'pipe', encoding: 'utf-8' }).trim();
if (globalPath) {
return globalPath.split('\n')[0].trim();
}
throw new Error("Toolbox binary not found");
} catch (e) {
throw new Error("Toolbox binary not found");
}
}

let toolboxBinary;
try {
toolboxBinary = getToolboxPath();
} catch (err) {
console.error("Error:", err.message);
process.exit(1);
}

function getEnv() {
const envPath = path.resolve(__dirname, '../../../.env');
const env = { ...process.env };
Expand Down Expand Up @@ -186,10 +160,26 @@ if (process.env.GEMINI_CLI === '1') {
}

const args = process.argv.slice(2);
const npxArgs = ["--yes", "@toolbox-sdk/server", "--log-level", "error", ...configArgs, "invoke", toolName, "--user-agent-metadata", userAgent, ...args];

let command = 'npx';
let spawnArgs = npxArgs;

// The Windows Dependency-Free Bypass
if (os.platform() === 'win32') {
const nodeDir = path.dirname(process.execPath);
const npxCliJs = path.join(nodeDir, 'node_modules', 'npm', 'bin', 'npx-cli.js');

if (fs.existsSync(npxCliJs)) {
command = process.execPath;
spawnArgs = [npxCliJs, ...npxArgs];
} else {
console.error("Error: Could not find the npx executable to launch.");
process.exit(1);
}
}

const toolboxArgs = ["--log-level", "error", ...configArgs, "invoke", toolName, "--user-agent-metadata", userAgent, ...args];

const child = spawn(toolboxBinary, toolboxArgs, { stdio: 'inherit', env });
const child = spawn(command, spawnArgs, { stdio: 'inherit', env });

child.on('close', (code) => {
process.exit(code);
Expand Down
Loading