Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions packages/cli/src/commands/catalog.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,10 @@ import usageFree from "./usage/free.ts";
import pipelineRun from "./pipeline/run.ts";
import pipelineValidate from "./pipeline/validate.ts";
import advisorRecommend from "./advisor/recommend.ts";
import pluginList from "./plugin/list.ts";
import pluginInstall from "./plugin/install.ts";
import pluginLink from "./plugin/link.ts";
import pluginRemove from "./plugin/remove.ts";

/** Command registry map (no dependency on registry.ts — safe for build-time import). */
export const commands: Record<string, Command> = {
Expand DownExpand Up@@ -76,6 +80,10 @@ export const commands: Record<string, Command> = {
"usage free": usageFree,
"pipeline run": pipelineRun,
"pipeline validate": pipelineValidate,
"plugin list": pluginList,
"plugin install": pluginInstall,
"plugin link": pluginLink,
"plugin remove": pluginRemove,
"config show": configShow,
"config set": configSet,
"config export-schema": configExportSchema,
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/src/commands/config/export-schema.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { defineCommand, generateToolSchema } from "bailian-cli-core";
import { defineCommand, generateToolSchema, type Command } from "bailian-cli-core";
import type { Config } from "bailian-cli-core";
import type { GlobalFlags } from "bailian-cli-core";
import { BailianError } from "bailian-cli-core";
Expand All@@ -7,7 +7,7 @@ import { ExitCode } from "bailian-cli-core";
/**
* Commands that are infrastructure/auth-related and not suitable as Agent tools.
*/
const SKIP_PREFIXES = ["auth ", "config ", "update"];
const SKIP_PREFIXES = ["auth ", "config ", "update", "plugin "];

export default defineCommand({
name: "config export-schema",
Expand All@@ -22,7 +22,8 @@ export default defineCommand({
],
examples: ["bl config export-schema", 'bl config export-schema --command "video generate"'],
async run(config: Config, flags: GlobalFlags) {
const { commands } = await import("../catalog.ts");
const { loadCommandCatalog } = await import("../../load-commands.ts");
const { commands } = await loadCommandCatalog();
const targetCommand = flags.command as string | undefined;

if (targetCommand) {
Expand All@@ -35,8 +36,7 @@ export default defineCommand({
return;
}

// Export all suitable commands
const allCommands = Object.values(commands);
const allCommands = Object.values(commands) as Command[];
const schemas = allCommands
.filter((c) => !SKIP_PREFIXES.some((p) => c.name.startsWith(p)))
.map((c) => generateToolSchema(c));
Expand Down
43 changes: 43 additions & 0 deletions packages/cli/src/commands/plugin/install.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { installPlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin install",
description: "Install a bailian-cli plugin package into ~/.bailian/plugins",
usage: "bl plugin install <package>",
options: [],
examples: [
"bl plugin install @ali/bailian-plugin-agent",
"bl plugin install bailian-plugin-agent",
],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const packageSpec = positional?.[0];
if (!packageSpec) {
throw new BailianError(
"Missing plugin package name.",
ExitCode.USAGE,
"bl plugin install <package>",
);
}

const name = await installPlugin(packageSpec);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ installed: name }, null, 2) + "\n");
return;
}
process.stdout.write(`Installed plugin: ${name}\n`);
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/link.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { linkPlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin link",
description: "Link a local bailian-cli plugin directory",
usage: "bl plugin link <path>",
examples: ["bl plugin link ../bailian-plugin-agent"],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const pluginPath = positional?.[0];
if (!pluginPath) {
throw new BailianError("Missing plugin path.", ExitCode.USAGE, "bl plugin link <path>");
}

await linkPlugin(pluginPath);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ linked: pluginPath }, null, 2) + "\n");
return;
}
process.stdout.write(`Linked plugin at ${pluginPath}\n`);
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/list.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { defineCommand, type Config, type GlobalFlags } from "bailian-cli-core";
import { listPlugins } from "../../plugins/manager.ts";

export default defineCommand({
name: "plugin list",
description: "List installed and discovered bailian-cli plugins",
usage: "bl plugin list",
examples: ["bl plugin list"],
async run(_config: Config, flags: GlobalFlags) {
const { plugins, errors } = await listPlugins();
const format = flags.output === "json" ? "json" : "text";

if (format === "json") {
process.stdout.write(JSON.stringify({ plugins, errors }, null, 2) + "\n");
return;
}

if (plugins.length === 0) {
process.stdout.write("No plugins installed.\n");
} else {
process.stdout.write("Plugins:\n");
for (const p of plugins) {
process.stdout.write(` ${p.name} (${p.source})${p.version ? ` @ ${p.version}` : ""}\n`);
process.stdout.write(` ${p.root}\n`);
}
}

if (errors.length > 0) {
process.stderr.write("\nPlugin errors:\n");
for (const e of errors) {
process.stderr.write(` ${e.plugin}: ${e.message}\n`);
}
}
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/remove.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { removePlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin remove",
description: "Remove an installed bailian-cli plugin",
usage: "bl plugin remove <name>",
examples: ["bl plugin remove bailian-plugin-agent"],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const name = positional?.[0];
if (!name) {
throw new BailianError("Missing plugin name.", ExitCode.USAGE, "bl plugin remove <name>");
}

await removePlugin(name);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ removed: name }, null, 2) + "\n");
return;
}
process.stdout.write(`Removed plugin: ${name}\n`);
},
});
158 changes: 158 additions & 0 deletions packages/cli/src/load-commands.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
import { commands as builtinCommands } from "./commands/catalog.ts";
import {
computeFingerprint,
fingerprintMatches,
isPluginCommandsCacheDisabled,
pruneCache,
readCommandsCache,
writeCommandsCache,
type CachedPluginEntry,
type CommandsCache,
COMMANDS_CACHE_SCHEMA,
} from "./plugins/cache.ts";
import { discoverPlugins } from "./plugins/discover.ts";
import { mergeCommands, type PluginCommandEntry } from "./plugins/priority.ts";
import {
extractCommandMeta,
filterValidNoAuthSetup,
lazyCommandFromMeta,
scanPluginCommands,
} from "./plugins/scan.ts";
import type { CommandCatalog, DiscoveredPlugin, PluginLoadError } from "./plugins/types.ts";
import { CLI_VERSION } from "./version.ts";

let cachedCatalog: CommandCatalog | undefined;

function expandNoAuthSetup(paths: string[]): string[][] {
return paths.map((p) => p.split(/\s+/).filter(Boolean));
}

/** 带盘缓存的插件命令加载 */
async function loadPluginCommandsWithCache(plugins: DiscoveredPlugin[]): Promise<{
entries: PluginCommandEntry[];
pluginErrors: PluginLoadError[];
noAuthSetup: string[][];
}> {
const pluginErrors: PluginLoadError[] = [];
const noAuthSetup: string[][] = [];
const entries: PluginCommandEntry[] = [];

const useCache = !isPluginCommandsCacheDisabled();
const diskCache = useCache ? await readCommandsCache() : undefined;
const cacheValid = diskCache?.cliVersion === CLI_VERSION;
let needsWrite = useCache && !cacheValid;

const nextPlugins: Record<string, CachedPluginEntry> = {};

for (const plugin of plugins) {
const fingerprint = computeFingerprint(plugin);
const cached = useCache && cacheValid ? diskCache!.plugins[plugin.name] : undefined;

if (cached && fingerprintMatches(cached.fingerprint, fingerprint)) {
for (const paths of expandNoAuthSetup(cached.noAuthSetup)) {
noAuthSetup.push(paths);
}
for (const meta of cached.commands) {
entries.push({
path: meta.commandPath,
command: lazyCommandFromMeta(meta),
plugin,
});
}
nextPlugins[plugin.name] = cached;
continue;
}

if (useCache) needsWrite = true;

const { commands: scanned, error: scanError } = await scanPluginCommands(plugin);
const scanFailed = scanError !== undefined;
if (scanError) pluginErrors.push(scanError);

const metas = [];
let loadFailed = false;
for (const item of scanned) {
const meta = await extractCommandMeta(item);
if (!meta) {
pluginErrors.push({
plugin: plugin.name,
message: `Could not load command module: ${item.commandPath}`,
});
loadFailed = true;
continue;
}
metas.push(meta);
entries.push({
path: meta.commandPath,
command: lazyCommandFromMeta(meta),
plugin,
});
}

const { paths: validNoAuthPaths, errors: noAuthErrors } = filterValidNoAuthSetup(
plugin,
scanned.map((item) => item.commandPath),
);
pluginErrors.push(...noAuthErrors);
for (const paths of expandNoAuthSetup(validNoAuthPaths)) {
noAuthSetup.push(paths);
}

// Do not cache partial or failed scans so the next startup retries loading.
const canCache = !scanFailed && !loadFailed;
if (useCache && canCache) {
nextPlugins[plugin.name] = {
fingerprint,
commands: metas,
noAuthSetup: validNoAuthPaths,
};
}
}

if (needsWrite && useCache) {
const cache: CommandsCache = {
schema: COMMANDS_CACHE_SCHEMA,
cliVersion: CLI_VERSION,
plugins: pruneCache(
nextPlugins,
plugins.map((p) => p.name),
),
};
await writeCommandsCache(cache);
}

return { entries, pluginErrors, noAuthSetup };
}

/**
* Load the command catalog.
* @returns The command catalog.
*/
export async function loadCommandCatalog(): Promise<CommandCatalog> {
if (cachedCatalog) return cachedCatalog;

const plugins = await discoverPlugins();
const {
entries: pluginEntries,
pluginErrors: scanErrors,
noAuthSetup: pluginNoAuth,
} = await loadPluginCommandsWithCache(plugins);

const { commands, pluginErrors: mergeErrors } = mergeCommands(builtinCommands, pluginEntries);

cachedCatalog = {
commands,
noAuthSetup: pluginNoAuth,
plugins,
pluginErrors: [...scanErrors, ...mergeErrors],
};

return cachedCatalog;
}

/**
* Reset the command catalog cache.
*/
export function resetCommandCatalogCache(): void {
cachedCatalog = undefined;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat(cli): add plugin system with allowlist policy by hopelynd · Pull Request #40 · modelstudioai/cli · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions packages/cli/src/commands/catalog.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,10 @@ import usageFree from "./usage/free.ts";
import pipelineRun from "./pipeline/run.ts";
import pipelineValidate from "./pipeline/validate.ts";
import advisorRecommend from "./advisor/recommend.ts";
import pluginList from "./plugin/list.ts";
import pluginInstall from "./plugin/install.ts";
import pluginLink from "./plugin/link.ts";
import pluginRemove from "./plugin/remove.ts";

/** Command registry map (no dependency on registry.ts — safe for build-time import). */
export const commands: Record<string, Command> = {
Expand DownExpand Up@@ -76,6 +80,10 @@ export const commands: Record<string, Command> = {
"usage free": usageFree,
"pipeline run": pipelineRun,
"pipeline validate": pipelineValidate,
"plugin list": pluginList,
"plugin install": pluginInstall,
"plugin link": pluginLink,
"plugin remove": pluginRemove,
"config show": configShow,
"config set": configSet,
"config export-schema": configExportSchema,
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/src/commands/config/export-schema.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { defineCommand, generateToolSchema } from "bailian-cli-core";
import { defineCommand, generateToolSchema, type Command } from "bailian-cli-core";
import type { Config } from "bailian-cli-core";
import type { GlobalFlags } from "bailian-cli-core";
import { BailianError } from "bailian-cli-core";
Expand All@@ -7,7 +7,7 @@ import { ExitCode } from "bailian-cli-core";
/**
* Commands that are infrastructure/auth-related and not suitable as Agent tools.
*/
const SKIP_PREFIXES = ["auth ", "config ", "update"];
const SKIP_PREFIXES = ["auth ", "config ", "update", "plugin "];

export default defineCommand({
name: "config export-schema",
Expand All@@ -22,7 +22,8 @@ export default defineCommand({
],
examples: ["bl config export-schema", 'bl config export-schema --command "video generate"'],
async run(config: Config, flags: GlobalFlags) {
const { commands } = await import("../catalog.ts");
const { loadCommandCatalog } = await import("../../load-commands.ts");
const { commands } = await loadCommandCatalog();
const targetCommand = flags.command as string | undefined;

if (targetCommand) {
Expand All@@ -35,8 +36,7 @@ export default defineCommand({
return;
}

// Export all suitable commands
const allCommands = Object.values(commands);
const allCommands = Object.values(commands) as Command[];
const schemas = allCommands
.filter((c) => !SKIP_PREFIXES.some((p) => c.name.startsWith(p)))
.map((c) => generateToolSchema(c));
Expand Down
43 changes: 43 additions & 0 deletions packages/cli/src/commands/plugin/install.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { installPlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin install",
description: "Install a bailian-cli plugin package into ~/.bailian/plugins",
usage: "bl plugin install <package>",
options: [],
examples: [
"bl plugin install @ali/bailian-plugin-agent",
"bl plugin install bailian-plugin-agent",
],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const packageSpec = positional?.[0];
if (!packageSpec) {
throw new BailianError(
"Missing plugin package name.",
ExitCode.USAGE,
"bl plugin install <package>",
);
}

const name = await installPlugin(packageSpec);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ installed: name }, null, 2) + "\n");
return;
}
process.stdout.write(`Installed plugin: ${name}\n`);
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/link.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { linkPlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin link",
description: "Link a local bailian-cli plugin directory",
usage: "bl plugin link <path>",
examples: ["bl plugin link ../bailian-plugin-agent"],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const pluginPath = positional?.[0];
if (!pluginPath) {
throw new BailianError("Missing plugin path.", ExitCode.USAGE, "bl plugin link <path>");
}

await linkPlugin(pluginPath);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ linked: pluginPath }, null, 2) + "\n");
return;
}
process.stdout.write(`Linked plugin at ${pluginPath}\n`);
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/list.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { defineCommand, type Config, type GlobalFlags } from "bailian-cli-core";
import { listPlugins } from "../../plugins/manager.ts";

export default defineCommand({
name: "plugin list",
description: "List installed and discovered bailian-cli plugins",
usage: "bl plugin list",
examples: ["bl plugin list"],
async run(_config: Config, flags: GlobalFlags) {
const { plugins, errors } = await listPlugins();
const format = flags.output === "json" ? "json" : "text";

if (format === "json") {
process.stdout.write(JSON.stringify({ plugins, errors }, null, 2) + "\n");
return;
}

if (plugins.length === 0) {
process.stdout.write("No plugins installed.\n");
} else {
process.stdout.write("Plugins:\n");
for (const p of plugins) {
process.stdout.write(` ${p.name} (${p.source})${p.version ? ` @ ${p.version}` : ""}\n`);
process.stdout.write(` ${p.root}\n`);
}
}

if (errors.length > 0) {
process.stderr.write("\nPlugin errors:\n");
for (const e of errors) {
process.stderr.write(` ${e.plugin}: ${e.message}\n`);
}
}
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/remove.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { removePlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin remove",
description: "Remove an installed bailian-cli plugin",
usage: "bl plugin remove <name>",
examples: ["bl plugin remove bailian-plugin-agent"],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const name = positional?.[0];
if (!name) {
throw new BailianError("Missing plugin name.", ExitCode.USAGE, "bl plugin remove <name>");
}

await removePlugin(name);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ removed: name }, null, 2) + "\n");
return;
}
process.stdout.write(`Removed plugin: ${name}\n`);
},
});
158 changes: 158 additions & 0 deletions packages/cli/src/load-commands.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
import { commands as builtinCommands } from "./commands/catalog.ts";
import {
computeFingerprint,
fingerprintMatches,
isPluginCommandsCacheDisabled,
pruneCache,
readCommandsCache,
writeCommandsCache,
type CachedPluginEntry,
type CommandsCache,
COMMANDS_CACHE_SCHEMA,
} from "./plugins/cache.ts";
import { discoverPlugins } from "./plugins/discover.ts";
import { mergeCommands, type PluginCommandEntry } from "./plugins/priority.ts";
import {
extractCommandMeta,
filterValidNoAuthSetup,
lazyCommandFromMeta,
scanPluginCommands,
} from "./plugins/scan.ts";
import type { CommandCatalog, DiscoveredPlugin, PluginLoadError } from "./plugins/types.ts";
import { CLI_VERSION } from "./version.ts";

let cachedCatalog: CommandCatalog | undefined;

function expandNoAuthSetup(paths: string[]): string[][] {
return paths.map((p) => p.split(/\s+/).filter(Boolean));
}

/** 带盘缓存的插件命令加载 */
async function loadPluginCommandsWithCache(plugins: DiscoveredPlugin[]): Promise<{
entries: PluginCommandEntry[];
pluginErrors: PluginLoadError[];
noAuthSetup: string[][];
}> {
const pluginErrors: PluginLoadError[] = [];
const noAuthSetup: string[][] = [];
const entries: PluginCommandEntry[] = [];

const useCache = !isPluginCommandsCacheDisabled();
const diskCache = useCache ? await readCommandsCache() : undefined;
const cacheValid = diskCache?.cliVersion === CLI_VERSION;
let needsWrite = useCache && !cacheValid;

const nextPlugins: Record<string, CachedPluginEntry> = {};

for (const plugin of plugins) {
const fingerprint = computeFingerprint(plugin);
const cached = useCache && cacheValid ? diskCache!.plugins[plugin.name] : undefined;

if (cached && fingerprintMatches(cached.fingerprint, fingerprint)) {
for (const paths of expandNoAuthSetup(cached.noAuthSetup)) {
noAuthSetup.push(paths);
}
for (const meta of cached.commands) {
entries.push({
path: meta.commandPath,
command: lazyCommandFromMeta(meta),
plugin,
});
}
nextPlugins[plugin.name] = cached;
continue;
}

if (useCache) needsWrite = true;

const { commands: scanned, error: scanError } = await scanPluginCommands(plugin);
const scanFailed = scanError !== undefined;
if (scanError) pluginErrors.push(scanError);

const metas = [];
let loadFailed = false;
for (const item of scanned) {
const meta = await extractCommandMeta(item);
if (!meta) {
pluginErrors.push({
plugin: plugin.name,
message: `Could not load command module: ${item.commandPath}`,
});
loadFailed = true;
continue;
}
metas.push(meta);
entries.push({
path: meta.commandPath,
command: lazyCommandFromMeta(meta),
plugin,
});
}

const { paths: validNoAuthPaths, errors: noAuthErrors } = filterValidNoAuthSetup(
plugin,
scanned.map((item) => item.commandPath),
);
pluginErrors.push(...noAuthErrors);
for (const paths of expandNoAuthSetup(validNoAuthPaths)) {
noAuthSetup.push(paths);
}

// Do not cache partial or failed scans so the next startup retries loading.
const canCache = !scanFailed && !loadFailed;
if (useCache && canCache) {
nextPlugins[plugin.name] = {
fingerprint,
commands: metas,
noAuthSetup: validNoAuthPaths,
};
}
}

if (needsWrite && useCache) {
const cache: CommandsCache = {
schema: COMMANDS_CACHE_SCHEMA,
cliVersion: CLI_VERSION,
plugins: pruneCache(
nextPlugins,
plugins.map((p) => p.name),
),
};
await writeCommandsCache(cache);
}

return { entries, pluginErrors, noAuthSetup };
}

/**
* Load the command catalog.
* @returns The command catalog.
*/
export async function loadCommandCatalog(): Promise<CommandCatalog> {
if (cachedCatalog) return cachedCatalog;

const plugins = await discoverPlugins();
const {
entries: pluginEntries,
pluginErrors: scanErrors,
noAuthSetup: pluginNoAuth,
} = await loadPluginCommandsWithCache(plugins);

const { commands, pluginErrors: mergeErrors } = mergeCommands(builtinCommands, pluginEntries);

cachedCatalog = {
commands,
noAuthSetup: pluginNoAuth,
plugins,
pluginErrors: [...scanErrors, ...mergeErrors],
};

return cachedCatalog;
}

/**
* Reset the command catalog cache.
*/
export function resetCommandCatalogCache(): void {
cachedCatalog = undefined;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(cli): add plugin system with allowlist policy by hopelynd · Pull Request #40 · modelstudioai/cli · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions packages/cli/src/commands/catalog.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,10 @@ import usageFree from "./usage/free.ts";
import pipelineRun from "./pipeline/run.ts";
import pipelineValidate from "./pipeline/validate.ts";
import advisorRecommend from "./advisor/recommend.ts";
import pluginList from "./plugin/list.ts";
import pluginInstall from "./plugin/install.ts";
import pluginLink from "./plugin/link.ts";
import pluginRemove from "./plugin/remove.ts";

/** Command registry map (no dependency on registry.ts — safe for build-time import). */
export const commands: Record<string, Command> = {
Expand DownExpand Up@@ -76,6 +80,10 @@ export const commands: Record<string, Command> = {
"usage free": usageFree,
"pipeline run": pipelineRun,
"pipeline validate": pipelineValidate,
"plugin list": pluginList,
"plugin install": pluginInstall,
"plugin link": pluginLink,
"plugin remove": pluginRemove,
"config show": configShow,
"config set": configSet,
"config export-schema": configExportSchema,
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/src/commands/config/export-schema.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { defineCommand, generateToolSchema } from "bailian-cli-core";
import { defineCommand, generateToolSchema, type Command } from "bailian-cli-core";
import type { Config } from "bailian-cli-core";
import type { GlobalFlags } from "bailian-cli-core";
import { BailianError } from "bailian-cli-core";
Expand All@@ -7,7 +7,7 @@ import { ExitCode } from "bailian-cli-core";
/**
* Commands that are infrastructure/auth-related and not suitable as Agent tools.
*/
const SKIP_PREFIXES = ["auth ", "config ", "update"];
const SKIP_PREFIXES = ["auth ", "config ", "update", "plugin "];

export default defineCommand({
name: "config export-schema",
Expand All@@ -22,7 +22,8 @@ export default defineCommand({
],
examples: ["bl config export-schema", 'bl config export-schema --command "video generate"'],
async run(config: Config, flags: GlobalFlags) {
const { commands } = await import("../catalog.ts");
const { loadCommandCatalog } = await import("../../load-commands.ts");
const { commands } = await loadCommandCatalog();
const targetCommand = flags.command as string | undefined;

if (targetCommand) {
Expand All@@ -35,8 +36,7 @@ export default defineCommand({
return;
}

// Export all suitable commands
const allCommands = Object.values(commands);
const allCommands = Object.values(commands) as Command[];
const schemas = allCommands
.filter((c) => !SKIP_PREFIXES.some((p) => c.name.startsWith(p)))
.map((c) => generateToolSchema(c));
Expand Down
43 changes: 43 additions & 0 deletions packages/cli/src/commands/plugin/install.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { installPlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin install",
description: "Install a bailian-cli plugin package into ~/.bailian/plugins",
usage: "bl plugin install <package>",
options: [],
examples: [
"bl plugin install @ali/bailian-plugin-agent",
"bl plugin install bailian-plugin-agent",
],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const packageSpec = positional?.[0];
if (!packageSpec) {
throw new BailianError(
"Missing plugin package name.",
ExitCode.USAGE,
"bl plugin install <package>",
);
}

const name = await installPlugin(packageSpec);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ installed: name }, null, 2) + "\n");
return;
}
process.stdout.write(`Installed plugin: ${name}\n`);
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/link.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { linkPlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin link",
description: "Link a local bailian-cli plugin directory",
usage: "bl plugin link <path>",
examples: ["bl plugin link ../bailian-plugin-agent"],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const pluginPath = positional?.[0];
if (!pluginPath) {
throw new BailianError("Missing plugin path.", ExitCode.USAGE, "bl plugin link <path>");
}

await linkPlugin(pluginPath);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ linked: pluginPath }, null, 2) + "\n");
return;
}
process.stdout.write(`Linked plugin at ${pluginPath}\n`);
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/list.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { defineCommand, type Config, type GlobalFlags } from "bailian-cli-core";
import { listPlugins } from "../../plugins/manager.ts";

export default defineCommand({
name: "plugin list",
description: "List installed and discovered bailian-cli plugins",
usage: "bl plugin list",
examples: ["bl plugin list"],
async run(_config: Config, flags: GlobalFlags) {
const { plugins, errors } = await listPlugins();
const format = flags.output === "json" ? "json" : "text";

if (format === "json") {
process.stdout.write(JSON.stringify({ plugins, errors }, null, 2) + "\n");
return;
}

if (plugins.length === 0) {
process.stdout.write("No plugins installed.\n");
} else {
process.stdout.write("Plugins:\n");
for (const p of plugins) {
process.stdout.write(` ${p.name} (${p.source})${p.version ? ` @ ${p.version}` : ""}\n`);
process.stdout.write(` ${p.root}\n`);
}
}

if (errors.length > 0) {
process.stderr.write("\nPlugin errors:\n");
for (const e of errors) {
process.stderr.write(` ${e.plugin}: ${e.message}\n`);
}
}
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/remove.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { removePlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin remove",
description: "Remove an installed bailian-cli plugin",
usage: "bl plugin remove <name>",
examples: ["bl plugin remove bailian-plugin-agent"],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const name = positional?.[0];
if (!name) {
throw new BailianError("Missing plugin name.", ExitCode.USAGE, "bl plugin remove <name>");
}

await removePlugin(name);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ removed: name }, null, 2) + "\n");
return;
}
process.stdout.write(`Removed plugin: ${name}\n`);
},
});
158 changes: 158 additions & 0 deletions packages/cli/src/load-commands.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
import { commands as builtinCommands } from "./commands/catalog.ts";
import {
computeFingerprint,
fingerprintMatches,
isPluginCommandsCacheDisabled,
pruneCache,
readCommandsCache,
writeCommandsCache,
type CachedPluginEntry,
type CommandsCache,
COMMANDS_CACHE_SCHEMA,
} from "./plugins/cache.ts";
import { discoverPlugins } from "./plugins/discover.ts";
import { mergeCommands, type PluginCommandEntry } from "./plugins/priority.ts";
import {
extractCommandMeta,
filterValidNoAuthSetup,
lazyCommandFromMeta,
scanPluginCommands,
} from "./plugins/scan.ts";
import type { CommandCatalog, DiscoveredPlugin, PluginLoadError } from "./plugins/types.ts";
import { CLI_VERSION } from "./version.ts";

let cachedCatalog: CommandCatalog | undefined;

function expandNoAuthSetup(paths: string[]): string[][] {
return paths.map((p) => p.split(/\s+/).filter(Boolean));
}

/** 带盘缓存的插件命令加载 */
async function loadPluginCommandsWithCache(plugins: DiscoveredPlugin[]): Promise<{
entries: PluginCommandEntry[];
pluginErrors: PluginLoadError[];
noAuthSetup: string[][];
}> {
const pluginErrors: PluginLoadError[] = [];
const noAuthSetup: string[][] = [];
const entries: PluginCommandEntry[] = [];

const useCache = !isPluginCommandsCacheDisabled();
const diskCache = useCache ? await readCommandsCache() : undefined;
const cacheValid = diskCache?.cliVersion === CLI_VERSION;
let needsWrite = useCache && !cacheValid;

const nextPlugins: Record<string, CachedPluginEntry> = {};

for (const plugin of plugins) {
const fingerprint = computeFingerprint(plugin);
const cached = useCache && cacheValid ? diskCache!.plugins[plugin.name] : undefined;

if (cached && fingerprintMatches(cached.fingerprint, fingerprint)) {
for (const paths of expandNoAuthSetup(cached.noAuthSetup)) {
noAuthSetup.push(paths);
}
for (const meta of cached.commands) {
entries.push({
path: meta.commandPath,
command: lazyCommandFromMeta(meta),
plugin,
});
}
nextPlugins[plugin.name] = cached;
continue;
}

if (useCache) needsWrite = true;

const { commands: scanned, error: scanError } = await scanPluginCommands(plugin);
const scanFailed = scanError !== undefined;
if (scanError) pluginErrors.push(scanError);

const metas = [];
let loadFailed = false;
for (const item of scanned) {
const meta = await extractCommandMeta(item);
if (!meta) {
pluginErrors.push({
plugin: plugin.name,
message: `Could not load command module: ${item.commandPath}`,
});
loadFailed = true;
continue;
}
metas.push(meta);
entries.push({
path: meta.commandPath,
command: lazyCommandFromMeta(meta),
plugin,
});
}

const { paths: validNoAuthPaths, errors: noAuthErrors } = filterValidNoAuthSetup(
plugin,
scanned.map((item) => item.commandPath),
);
pluginErrors.push(...noAuthErrors);
for (const paths of expandNoAuthSetup(validNoAuthPaths)) {
noAuthSetup.push(paths);
}

// Do not cache partial or failed scans so the next startup retries loading.
const canCache = !scanFailed && !loadFailed;
if (useCache && canCache) {
nextPlugins[plugin.name] = {
fingerprint,
commands: metas,
noAuthSetup: validNoAuthPaths,
};
}
}

if (needsWrite && useCache) {
const cache: CommandsCache = {
schema: COMMANDS_CACHE_SCHEMA,
cliVersion: CLI_VERSION,
plugins: pruneCache(
nextPlugins,
plugins.map((p) => p.name),
),
};
await writeCommandsCache(cache);
}

return { entries, pluginErrors, noAuthSetup };
}

/**
* Load the command catalog.
* @returns The command catalog.
*/
export async function loadCommandCatalog(): Promise<CommandCatalog> {
if (cachedCatalog) return cachedCatalog;

const plugins = await discoverPlugins();
const {
entries: pluginEntries,
pluginErrors: scanErrors,
noAuthSetup: pluginNoAuth,
} = await loadPluginCommandsWithCache(plugins);

const { commands, pluginErrors: mergeErrors } = mergeCommands(builtinCommands, pluginEntries);

cachedCatalog = {
commands,
noAuthSetup: pluginNoAuth,
plugins,
pluginErrors: [...scanErrors, ...mergeErrors],
};

return cachedCatalog;
}

/**
* Reset the command catalog cache.
*/
export function resetCommandCatalogCache(): void {
cachedCatalog = undefined;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(cli): add plugin system with allowlist policy by hopelynd · Pull Request #40 · modelstudioai/cli · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions packages/cli/src/commands/catalog.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,10 @@ import usageFree from "./usage/free.ts";
import pipelineRun from "./pipeline/run.ts";
import pipelineValidate from "./pipeline/validate.ts";
import advisorRecommend from "./advisor/recommend.ts";
import pluginList from "./plugin/list.ts";
import pluginInstall from "./plugin/install.ts";
import pluginLink from "./plugin/link.ts";
import pluginRemove from "./plugin/remove.ts";

/** Command registry map (no dependency on registry.ts — safe for build-time import). */
export const commands: Record<string, Command> = {
Expand DownExpand Up@@ -76,6 +80,10 @@ export const commands: Record<string, Command> = {
"usage free": usageFree,
"pipeline run": pipelineRun,
"pipeline validate": pipelineValidate,
"plugin list": pluginList,
"plugin install": pluginInstall,
"plugin link": pluginLink,
"plugin remove": pluginRemove,
"config show": configShow,
"config set": configSet,
"config export-schema": configExportSchema,
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/src/commands/config/export-schema.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { defineCommand, generateToolSchema } from "bailian-cli-core";
import { defineCommand, generateToolSchema, type Command } from "bailian-cli-core";
import type { Config } from "bailian-cli-core";
import type { GlobalFlags } from "bailian-cli-core";
import { BailianError } from "bailian-cli-core";
Expand All@@ -7,7 +7,7 @@ import { ExitCode } from "bailian-cli-core";
/**
* Commands that are infrastructure/auth-related and not suitable as Agent tools.
*/
const SKIP_PREFIXES = ["auth ", "config ", "update"];
const SKIP_PREFIXES = ["auth ", "config ", "update", "plugin "];

export default defineCommand({
name: "config export-schema",
Expand All@@ -22,7 +22,8 @@ export default defineCommand({
],
examples: ["bl config export-schema", 'bl config export-schema --command "video generate"'],
async run(config: Config, flags: GlobalFlags) {
const { commands } = await import("../catalog.ts");
const { loadCommandCatalog } = await import("../../load-commands.ts");
const { commands } = await loadCommandCatalog();
const targetCommand = flags.command as string | undefined;

if (targetCommand) {
Expand All@@ -35,8 +36,7 @@ export default defineCommand({
return;
}

// Export all suitable commands
const allCommands = Object.values(commands);
const allCommands = Object.values(commands) as Command[];
const schemas = allCommands
.filter((c) => !SKIP_PREFIXES.some((p) => c.name.startsWith(p)))
.map((c) => generateToolSchema(c));
Expand Down
43 changes: 43 additions & 0 deletions packages/cli/src/commands/plugin/install.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { installPlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin install",
description: "Install a bailian-cli plugin package into ~/.bailian/plugins",
usage: "bl plugin install <package>",
options: [],
examples: [
"bl plugin install @ali/bailian-plugin-agent",
"bl plugin install bailian-plugin-agent",
],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const packageSpec = positional?.[0];
if (!packageSpec) {
throw new BailianError(
"Missing plugin package name.",
ExitCode.USAGE,
"bl plugin install <package>",
);
}

const name = await installPlugin(packageSpec);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ installed: name }, null, 2) + "\n");
return;
}
process.stdout.write(`Installed plugin: ${name}\n`);
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/link.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { linkPlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin link",
description: "Link a local bailian-cli plugin directory",
usage: "bl plugin link <path>",
examples: ["bl plugin link ../bailian-plugin-agent"],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const pluginPath = positional?.[0];
if (!pluginPath) {
throw new BailianError("Missing plugin path.", ExitCode.USAGE, "bl plugin link <path>");
}

await linkPlugin(pluginPath);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ linked: pluginPath }, null, 2) + "\n");
return;
}
process.stdout.write(`Linked plugin at ${pluginPath}\n`);
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/list.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { defineCommand, type Config, type GlobalFlags } from "bailian-cli-core";
import { listPlugins } from "../../plugins/manager.ts";

export default defineCommand({
name: "plugin list",
description: "List installed and discovered bailian-cli plugins",
usage: "bl plugin list",
examples: ["bl plugin list"],
async run(_config: Config, flags: GlobalFlags) {
const { plugins, errors } = await listPlugins();
const format = flags.output === "json" ? "json" : "text";

if (format === "json") {
process.stdout.write(JSON.stringify({ plugins, errors }, null, 2) + "\n");
return;
}

if (plugins.length === 0) {
process.stdout.write("No plugins installed.\n");
} else {
process.stdout.write("Plugins:\n");
for (const p of plugins) {
process.stdout.write(` ${p.name} (${p.source})${p.version ? ` @ ${p.version}` : ""}\n`);
process.stdout.write(` ${p.root}\n`);
}
}

if (errors.length > 0) {
process.stderr.write("\nPlugin errors:\n");
for (const e of errors) {
process.stderr.write(` ${e.plugin}: ${e.message}\n`);
}
}
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/remove.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { removePlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin remove",
description: "Remove an installed bailian-cli plugin",
usage: "bl plugin remove <name>",
examples: ["bl plugin remove bailian-plugin-agent"],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const name = positional?.[0];
if (!name) {
throw new BailianError("Missing plugin name.", ExitCode.USAGE, "bl plugin remove <name>");
}

await removePlugin(name);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ removed: name }, null, 2) + "\n");
return;
}
process.stdout.write(`Removed plugin: ${name}\n`);
},
});
158 changes: 158 additions & 0 deletions packages/cli/src/load-commands.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
import { commands as builtinCommands } from "./commands/catalog.ts";
import {
computeFingerprint,
fingerprintMatches,
isPluginCommandsCacheDisabled,
pruneCache,
readCommandsCache,
writeCommandsCache,
type CachedPluginEntry,
type CommandsCache,
COMMANDS_CACHE_SCHEMA,
} from "./plugins/cache.ts";
import { discoverPlugins } from "./plugins/discover.ts";
import { mergeCommands, type PluginCommandEntry } from "./plugins/priority.ts";
import {
extractCommandMeta,
filterValidNoAuthSetup,
lazyCommandFromMeta,
scanPluginCommands,
} from "./plugins/scan.ts";
import type { CommandCatalog, DiscoveredPlugin, PluginLoadError } from "./plugins/types.ts";
import { CLI_VERSION } from "./version.ts";

let cachedCatalog: CommandCatalog | undefined;

function expandNoAuthSetup(paths: string[]): string[][] {
return paths.map((p) => p.split(/\s+/).filter(Boolean));
}

/** 带盘缓存的插件命令加载 */
async function loadPluginCommandsWithCache(plugins: DiscoveredPlugin[]): Promise<{
entries: PluginCommandEntry[];
pluginErrors: PluginLoadError[];
noAuthSetup: string[][];
}> {
const pluginErrors: PluginLoadError[] = [];
const noAuthSetup: string[][] = [];
const entries: PluginCommandEntry[] = [];

const useCache = !isPluginCommandsCacheDisabled();
const diskCache = useCache ? await readCommandsCache() : undefined;
const cacheValid = diskCache?.cliVersion === CLI_VERSION;
let needsWrite = useCache && !cacheValid;

const nextPlugins: Record<string, CachedPluginEntry> = {};

for (const plugin of plugins) {
const fingerprint = computeFingerprint(plugin);
const cached = useCache && cacheValid ? diskCache!.plugins[plugin.name] : undefined;

if (cached && fingerprintMatches(cached.fingerprint, fingerprint)) {
for (const paths of expandNoAuthSetup(cached.noAuthSetup)) {
noAuthSetup.push(paths);
}
for (const meta of cached.commands) {
entries.push({
path: meta.commandPath,
command: lazyCommandFromMeta(meta),
plugin,
});
}
nextPlugins[plugin.name] = cached;
continue;
}

if (useCache) needsWrite = true;

const { commands: scanned, error: scanError } = await scanPluginCommands(plugin);
const scanFailed = scanError !== undefined;
if (scanError) pluginErrors.push(scanError);

const metas = [];
let loadFailed = false;
for (const item of scanned) {
const meta = await extractCommandMeta(item);
if (!meta) {
pluginErrors.push({
plugin: plugin.name,
message: `Could not load command module: ${item.commandPath}`,
});
loadFailed = true;
continue;
}
metas.push(meta);
entries.push({
path: meta.commandPath,
command: lazyCommandFromMeta(meta),
plugin,
});
}

const { paths: validNoAuthPaths, errors: noAuthErrors } = filterValidNoAuthSetup(
plugin,
scanned.map((item) => item.commandPath),
);
pluginErrors.push(...noAuthErrors);
for (const paths of expandNoAuthSetup(validNoAuthPaths)) {
noAuthSetup.push(paths);
}

// Do not cache partial or failed scans so the next startup retries loading.
const canCache = !scanFailed && !loadFailed;
if (useCache && canCache) {
nextPlugins[plugin.name] = {
fingerprint,
commands: metas,
noAuthSetup: validNoAuthPaths,
};
}
}

if (needsWrite && useCache) {
const cache: CommandsCache = {
schema: COMMANDS_CACHE_SCHEMA,
cliVersion: CLI_VERSION,
plugins: pruneCache(
nextPlugins,
plugins.map((p) => p.name),
),
};
await writeCommandsCache(cache);
}

return { entries, pluginErrors, noAuthSetup };
}

/**
* Load the command catalog.
* @returns The command catalog.
*/
export async function loadCommandCatalog(): Promise<CommandCatalog> {
if (cachedCatalog) return cachedCatalog;

const plugins = await discoverPlugins();
const {
entries: pluginEntries,
pluginErrors: scanErrors,
noAuthSetup: pluginNoAuth,
} = await loadPluginCommandsWithCache(plugins);

const { commands, pluginErrors: mergeErrors } = mergeCommands(builtinCommands, pluginEntries);

cachedCatalog = {
commands,
noAuthSetup: pluginNoAuth,
plugins,
pluginErrors: [...scanErrors, ...mergeErrors],
};

return cachedCatalog;
}

/**
* Reset the command catalog cache.
*/
export function resetCommandCatalogCache(): void {
cachedCatalog = undefined;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' feat(cli): add plugin system with allowlist policy by hopelynd · Pull Request #40 · modelstudioai/cli · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions packages/cli/src/commands/catalog.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,10 @@ import usageFree from "./usage/free.ts";
import pipelineRun from "./pipeline/run.ts";
import pipelineValidate from "./pipeline/validate.ts";
import advisorRecommend from "./advisor/recommend.ts";
import pluginList from "./plugin/list.ts";
import pluginInstall from "./plugin/install.ts";
import pluginLink from "./plugin/link.ts";
import pluginRemove from "./plugin/remove.ts";

/** Command registry map (no dependency on registry.ts — safe for build-time import). */
export const commands: Record<string, Command> = {
Expand DownExpand Up@@ -76,6 +80,10 @@ export const commands: Record<string, Command> = {
"usage free": usageFree,
"pipeline run": pipelineRun,
"pipeline validate": pipelineValidate,
"plugin list": pluginList,
"plugin install": pluginInstall,
"plugin link": pluginLink,
"plugin remove": pluginRemove,
"config show": configShow,
"config set": configSet,
"config export-schema": configExportSchema,
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/src/commands/config/export-schema.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { defineCommand, generateToolSchema } from "bailian-cli-core";
import { defineCommand, generateToolSchema, type Command } from "bailian-cli-core";
import type { Config } from "bailian-cli-core";
import type { GlobalFlags } from "bailian-cli-core";
import { BailianError } from "bailian-cli-core";
Expand All@@ -7,7 +7,7 @@ import { ExitCode } from "bailian-cli-core";
/**
* Commands that are infrastructure/auth-related and not suitable as Agent tools.
*/
const SKIP_PREFIXES = ["auth ", "config ", "update"];
const SKIP_PREFIXES = ["auth ", "config ", "update", "plugin "];

export default defineCommand({
name: "config export-schema",
Expand All@@ -22,7 +22,8 @@ export default defineCommand({
],
examples: ["bl config export-schema", 'bl config export-schema --command "video generate"'],
async run(config: Config, flags: GlobalFlags) {
const { commands } = await import("../catalog.ts");
const { loadCommandCatalog } = await import("../../load-commands.ts");
const { commands } = await loadCommandCatalog();
const targetCommand = flags.command as string | undefined;

if (targetCommand) {
Expand All@@ -35,8 +36,7 @@ export default defineCommand({
return;
}

// Export all suitable commands
const allCommands = Object.values(commands);
const allCommands = Object.values(commands) as Command[];
const schemas = allCommands
.filter((c) => !SKIP_PREFIXES.some((p) => c.name.startsWith(p)))
.map((c) => generateToolSchema(c));
Expand Down
43 changes: 43 additions & 0 deletions packages/cli/src/commands/plugin/install.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { installPlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin install",
description: "Install a bailian-cli plugin package into ~/.bailian/plugins",
usage: "bl plugin install <package>",
options: [],
examples: [
"bl plugin install @ali/bailian-plugin-agent",
"bl plugin install bailian-plugin-agent",
],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const packageSpec = positional?.[0];
if (!packageSpec) {
throw new BailianError(
"Missing plugin package name.",
ExitCode.USAGE,
"bl plugin install <package>",
);
}

const name = await installPlugin(packageSpec);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ installed: name }, null, 2) + "\n");
return;
}
process.stdout.write(`Installed plugin: ${name}\n`);
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/link.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { linkPlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin link",
description: "Link a local bailian-cli plugin directory",
usage: "bl plugin link <path>",
examples: ["bl plugin link ../bailian-plugin-agent"],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const pluginPath = positional?.[0];
if (!pluginPath) {
throw new BailianError("Missing plugin path.", ExitCode.USAGE, "bl plugin link <path>");
}

await linkPlugin(pluginPath);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ linked: pluginPath }, null, 2) + "\n");
return;
}
process.stdout.write(`Linked plugin at ${pluginPath}\n`);
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/list.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { defineCommand, type Config, type GlobalFlags } from "bailian-cli-core";
import { listPlugins } from "../../plugins/manager.ts";

export default defineCommand({
name: "plugin list",
description: "List installed and discovered bailian-cli plugins",
usage: "bl plugin list",
examples: ["bl plugin list"],
async run(_config: Config, flags: GlobalFlags) {
const { plugins, errors } = await listPlugins();
const format = flags.output === "json" ? "json" : "text";

if (format === "json") {
process.stdout.write(JSON.stringify({ plugins, errors }, null, 2) + "\n");
return;
}

if (plugins.length === 0) {
process.stdout.write("No plugins installed.\n");
} else {
process.stdout.write("Plugins:\n");
for (const p of plugins) {
process.stdout.write(` ${p.name} (${p.source})${p.version ? ` @ ${p.version}` : ""}\n`);
process.stdout.write(` ${p.root}\n`);
}
}

if (errors.length > 0) {
process.stderr.write("\nPlugin errors:\n");
for (const e of errors) {
process.stderr.write(` ${e.plugin}: ${e.message}\n`);
}
}
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/remove.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { removePlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin remove",
description: "Remove an installed bailian-cli plugin",
usage: "bl plugin remove <name>",
examples: ["bl plugin remove bailian-plugin-agent"],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const name = positional?.[0];
if (!name) {
throw new BailianError("Missing plugin name.", ExitCode.USAGE, "bl plugin remove <name>");
}

await removePlugin(name);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ removed: name }, null, 2) + "\n");
return;
}
process.stdout.write(`Removed plugin: ${name}\n`);
},
});
158 changes: 158 additions & 0 deletions packages/cli/src/load-commands.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
import { commands as builtinCommands } from "./commands/catalog.ts";
import {
computeFingerprint,
fingerprintMatches,
isPluginCommandsCacheDisabled,
pruneCache,
readCommandsCache,
writeCommandsCache,
type CachedPluginEntry,
type CommandsCache,
COMMANDS_CACHE_SCHEMA,
} from "./plugins/cache.ts";
import { discoverPlugins } from "./plugins/discover.ts";
import { mergeCommands, type PluginCommandEntry } from "./plugins/priority.ts";
import {
extractCommandMeta,
filterValidNoAuthSetup,
lazyCommandFromMeta,
scanPluginCommands,
} from "./plugins/scan.ts";
import type { CommandCatalog, DiscoveredPlugin, PluginLoadError } from "./plugins/types.ts";
import { CLI_VERSION } from "./version.ts";

let cachedCatalog: CommandCatalog | undefined;

function expandNoAuthSetup(paths: string[]): string[][] {
return paths.map((p) => p.split(/\s+/).filter(Boolean));
}

/** 带盘缓存的插件命令加载 */
async function loadPluginCommandsWithCache(plugins: DiscoveredPlugin[]): Promise<{
entries: PluginCommandEntry[];
pluginErrors: PluginLoadError[];
noAuthSetup: string[][];
}> {
const pluginErrors: PluginLoadError[] = [];
const noAuthSetup: string[][] = [];
const entries: PluginCommandEntry[] = [];

const useCache = !isPluginCommandsCacheDisabled();
const diskCache = useCache ? await readCommandsCache() : undefined;
const cacheValid = diskCache?.cliVersion === CLI_VERSION;
let needsWrite = useCache && !cacheValid;

const nextPlugins: Record<string, CachedPluginEntry> = {};

for (const plugin of plugins) {
const fingerprint = computeFingerprint(plugin);
const cached = useCache && cacheValid ? diskCache!.plugins[plugin.name] : undefined;

if (cached && fingerprintMatches(cached.fingerprint, fingerprint)) {
for (const paths of expandNoAuthSetup(cached.noAuthSetup)) {
noAuthSetup.push(paths);
}
for (const meta of cached.commands) {
entries.push({
path: meta.commandPath,
command: lazyCommandFromMeta(meta),
plugin,
});
}
nextPlugins[plugin.name] = cached;
continue;
}

if (useCache) needsWrite = true;

const { commands: scanned, error: scanError } = await scanPluginCommands(plugin);
const scanFailed = scanError !== undefined;
if (scanError) pluginErrors.push(scanError);

const metas = [];
let loadFailed = false;
for (const item of scanned) {
const meta = await extractCommandMeta(item);
if (!meta) {
pluginErrors.push({
plugin: plugin.name,
message: `Could not load command module: ${item.commandPath}`,
});
loadFailed = true;
continue;
}
metas.push(meta);
entries.push({
path: meta.commandPath,
command: lazyCommandFromMeta(meta),
plugin,
});
}

const { paths: validNoAuthPaths, errors: noAuthErrors } = filterValidNoAuthSetup(
plugin,
scanned.map((item) => item.commandPath),
);
pluginErrors.push(...noAuthErrors);
for (const paths of expandNoAuthSetup(validNoAuthPaths)) {
noAuthSetup.push(paths);
}

// Do not cache partial or failed scans so the next startup retries loading.
const canCache = !scanFailed && !loadFailed;
if (useCache && canCache) {
nextPlugins[plugin.name] = {
fingerprint,
commands: metas,
noAuthSetup: validNoAuthPaths,
};
}
}

if (needsWrite && useCache) {
const cache: CommandsCache = {
schema: COMMANDS_CACHE_SCHEMA,
cliVersion: CLI_VERSION,
plugins: pruneCache(
nextPlugins,
plugins.map((p) => p.name),
),
};
await writeCommandsCache(cache);
}

return { entries, pluginErrors, noAuthSetup };
}

/**
* Load the command catalog.
* @returns The command catalog.
*/
export async function loadCommandCatalog(): Promise<CommandCatalog> {
if (cachedCatalog) return cachedCatalog;

const plugins = await discoverPlugins();
const {
entries: pluginEntries,
pluginErrors: scanErrors,
noAuthSetup: pluginNoAuth,
} = await loadPluginCommandsWithCache(plugins);

const { commands, pluginErrors: mergeErrors } = mergeCommands(builtinCommands, pluginEntries);

cachedCatalog = {
commands,
noAuthSetup: pluginNoAuth,
plugins,
pluginErrors: [...scanErrors, ...mergeErrors],
};

return cachedCatalog;
}

/**
* Reset the command catalog cache.
*/
export function resetCommandCatalogCache(): void {
cachedCatalog = undefined;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(cli): add plugin system with allowlist policy by hopelynd · Pull Request #40 · modelstudioai/cli · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions packages/cli/src/commands/catalog.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,10 @@ import usageFree from "./usage/free.ts";
import pipelineRun from "./pipeline/run.ts";
import pipelineValidate from "./pipeline/validate.ts";
import advisorRecommend from "./advisor/recommend.ts";
import pluginList from "./plugin/list.ts";
import pluginInstall from "./plugin/install.ts";
import pluginLink from "./plugin/link.ts";
import pluginRemove from "./plugin/remove.ts";

/** Command registry map (no dependency on registry.ts — safe for build-time import). */
export const commands: Record<string, Command> = {
Expand DownExpand Up@@ -76,6 +80,10 @@ export const commands: Record<string, Command> = {
"usage free": usageFree,
"pipeline run": pipelineRun,
"pipeline validate": pipelineValidate,
"plugin list": pluginList,
"plugin install": pluginInstall,
"plugin link": pluginLink,
"plugin remove": pluginRemove,
"config show": configShow,
"config set": configSet,
"config export-schema": configExportSchema,
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/src/commands/config/export-schema.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { defineCommand, generateToolSchema } from "bailian-cli-core";
import { defineCommand, generateToolSchema, type Command } from "bailian-cli-core";
import type { Config } from "bailian-cli-core";
import type { GlobalFlags } from "bailian-cli-core";
import { BailianError } from "bailian-cli-core";
Expand All@@ -7,7 +7,7 @@ import { ExitCode } from "bailian-cli-core";
/**
* Commands that are infrastructure/auth-related and not suitable as Agent tools.
*/
const SKIP_PREFIXES = ["auth ", "config ", "update"];
const SKIP_PREFIXES = ["auth ", "config ", "update", "plugin "];

export default defineCommand({
name: "config export-schema",
Expand All@@ -22,7 +22,8 @@ export default defineCommand({
],
examples: ["bl config export-schema", 'bl config export-schema --command "video generate"'],
async run(config: Config, flags: GlobalFlags) {
const { commands } = await import("../catalog.ts");
const { loadCommandCatalog } = await import("../../load-commands.ts");
const { commands } = await loadCommandCatalog();
const targetCommand = flags.command as string | undefined;

if (targetCommand) {
Expand All@@ -35,8 +36,7 @@ export default defineCommand({
return;
}

// Export all suitable commands
const allCommands = Object.values(commands);
const allCommands = Object.values(commands) as Command[];
const schemas = allCommands
.filter((c) => !SKIP_PREFIXES.some((p) => c.name.startsWith(p)))
.map((c) => generateToolSchema(c));
Expand Down
43 changes: 43 additions & 0 deletions packages/cli/src/commands/plugin/install.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { installPlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin install",
description: "Install a bailian-cli plugin package into ~/.bailian/plugins",
usage: "bl plugin install <package>",
options: [],
examples: [
"bl plugin install @ali/bailian-plugin-agent",
"bl plugin install bailian-plugin-agent",
],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const packageSpec = positional?.[0];
if (!packageSpec) {
throw new BailianError(
"Missing plugin package name.",
ExitCode.USAGE,
"bl plugin install <package>",
);
}

const name = await installPlugin(packageSpec);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ installed: name }, null, 2) + "\n");
return;
}
process.stdout.write(`Installed plugin: ${name}\n`);
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/link.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { linkPlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin link",
description: "Link a local bailian-cli plugin directory",
usage: "bl plugin link <path>",
examples: ["bl plugin link ../bailian-plugin-agent"],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const pluginPath = positional?.[0];
if (!pluginPath) {
throw new BailianError("Missing plugin path.", ExitCode.USAGE, "bl plugin link <path>");
}

await linkPlugin(pluginPath);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ linked: pluginPath }, null, 2) + "\n");
return;
}
process.stdout.write(`Linked plugin at ${pluginPath}\n`);
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/list.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { defineCommand, type Config, type GlobalFlags } from "bailian-cli-core";
import { listPlugins } from "../../plugins/manager.ts";

export default defineCommand({
name: "plugin list",
description: "List installed and discovered bailian-cli plugins",
usage: "bl plugin list",
examples: ["bl plugin list"],
async run(_config: Config, flags: GlobalFlags) {
const { plugins, errors } = await listPlugins();
const format = flags.output === "json" ? "json" : "text";

if (format === "json") {
process.stdout.write(JSON.stringify({ plugins, errors }, null, 2) + "\n");
return;
}

if (plugins.length === 0) {
process.stdout.write("No plugins installed.\n");
} else {
process.stdout.write("Plugins:\n");
for (const p of plugins) {
process.stdout.write(` ${p.name} (${p.source})${p.version ? ` @ ${p.version}` : ""}\n`);
process.stdout.write(` ${p.root}\n`);
}
}

if (errors.length > 0) {
process.stderr.write("\nPlugin errors:\n");
for (const e of errors) {
process.stderr.write(` ${e.plugin}: ${e.message}\n`);
}
}
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/remove.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { removePlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin remove",
description: "Remove an installed bailian-cli plugin",
usage: "bl plugin remove <name>",
examples: ["bl plugin remove bailian-plugin-agent"],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const name = positional?.[0];
if (!name) {
throw new BailianError("Missing plugin name.", ExitCode.USAGE, "bl plugin remove <name>");
}

await removePlugin(name);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ removed: name }, null, 2) + "\n");
return;
}
process.stdout.write(`Removed plugin: ${name}\n`);
},
});
158 changes: 158 additions & 0 deletions packages/cli/src/load-commands.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
import { commands as builtinCommands } from "./commands/catalog.ts";
import {
computeFingerprint,
fingerprintMatches,
isPluginCommandsCacheDisabled,
pruneCache,
readCommandsCache,
writeCommandsCache,
type CachedPluginEntry,
type CommandsCache,
COMMANDS_CACHE_SCHEMA,
} from "./plugins/cache.ts";
import { discoverPlugins } from "./plugins/discover.ts";
import { mergeCommands, type PluginCommandEntry } from "./plugins/priority.ts";
import {
extractCommandMeta,
filterValidNoAuthSetup,
lazyCommandFromMeta,
scanPluginCommands,
} from "./plugins/scan.ts";
import type { CommandCatalog, DiscoveredPlugin, PluginLoadError } from "./plugins/types.ts";
import { CLI_VERSION } from "./version.ts";

let cachedCatalog: CommandCatalog | undefined;

function expandNoAuthSetup(paths: string[]): string[][] {
return paths.map((p) => p.split(/\s+/).filter(Boolean));
}

/** 带盘缓存的插件命令加载 */
async function loadPluginCommandsWithCache(plugins: DiscoveredPlugin[]): Promise<{
entries: PluginCommandEntry[];
pluginErrors: PluginLoadError[];
noAuthSetup: string[][];
}> {
const pluginErrors: PluginLoadError[] = [];
const noAuthSetup: string[][] = [];
const entries: PluginCommandEntry[] = [];

const useCache = !isPluginCommandsCacheDisabled();
const diskCache = useCache ? await readCommandsCache() : undefined;
const cacheValid = diskCache?.cliVersion === CLI_VERSION;
let needsWrite = useCache && !cacheValid;

const nextPlugins: Record<string, CachedPluginEntry> = {};

for (const plugin of plugins) {
const fingerprint = computeFingerprint(plugin);
const cached = useCache && cacheValid ? diskCache!.plugins[plugin.name] : undefined;

if (cached && fingerprintMatches(cached.fingerprint, fingerprint)) {
for (const paths of expandNoAuthSetup(cached.noAuthSetup)) {
noAuthSetup.push(paths);
}
for (const meta of cached.commands) {
entries.push({
path: meta.commandPath,
command: lazyCommandFromMeta(meta),
plugin,
});
}
nextPlugins[plugin.name] = cached;
continue;
}

if (useCache) needsWrite = true;

const { commands: scanned, error: scanError } = await scanPluginCommands(plugin);
const scanFailed = scanError !== undefined;
if (scanError) pluginErrors.push(scanError);

const metas = [];
let loadFailed = false;
for (const item of scanned) {
const meta = await extractCommandMeta(item);
if (!meta) {
pluginErrors.push({
plugin: plugin.name,
message: `Could not load command module: ${item.commandPath}`,
});
loadFailed = true;
continue;
}
metas.push(meta);
entries.push({
path: meta.commandPath,
command: lazyCommandFromMeta(meta),
plugin,
});
}

const { paths: validNoAuthPaths, errors: noAuthErrors } = filterValidNoAuthSetup(
plugin,
scanned.map((item) => item.commandPath),
);
pluginErrors.push(...noAuthErrors);
for (const paths of expandNoAuthSetup(validNoAuthPaths)) {
noAuthSetup.push(paths);
}

// Do not cache partial or failed scans so the next startup retries loading.
const canCache = !scanFailed && !loadFailed;
if (useCache && canCache) {
nextPlugins[plugin.name] = {
fingerprint,
commands: metas,
noAuthSetup: validNoAuthPaths,
};
}
}

if (needsWrite && useCache) {
const cache: CommandsCache = {
schema: COMMANDS_CACHE_SCHEMA,
cliVersion: CLI_VERSION,
plugins: pruneCache(
nextPlugins,
plugins.map((p) => p.name),
),
};
await writeCommandsCache(cache);
}

return { entries, pluginErrors, noAuthSetup };
}

/**
* Load the command catalog.
* @returns The command catalog.
*/
export async function loadCommandCatalog(): Promise<CommandCatalog> {
if (cachedCatalog) return cachedCatalog;

const plugins = await discoverPlugins();
const {
entries: pluginEntries,
pluginErrors: scanErrors,
noAuthSetup: pluginNoAuth,
} = await loadPluginCommandsWithCache(plugins);

const { commands, pluginErrors: mergeErrors } = mergeCommands(builtinCommands, pluginEntries);

cachedCatalog = {
commands,
noAuthSetup: pluginNoAuth,
plugins,
pluginErrors: [...scanErrors, ...mergeErrors],
};

return cachedCatalog;
}

/**
* Reset the command catalog cache.
*/
export function resetCommandCatalogCache(): void {
cachedCatalog = undefined;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' feat(cli): add plugin system with allowlist policy by hopelynd · Pull Request #40 · modelstudioai/cli · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions packages/cli/src/commands/catalog.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,10 @@ import usageFree from "./usage/free.ts";
import pipelineRun from "./pipeline/run.ts";
import pipelineValidate from "./pipeline/validate.ts";
import advisorRecommend from "./advisor/recommend.ts";
import pluginList from "./plugin/list.ts";
import pluginInstall from "./plugin/install.ts";
import pluginLink from "./plugin/link.ts";
import pluginRemove from "./plugin/remove.ts";

/** Command registry map (no dependency on registry.ts — safe for build-time import). */
export const commands: Record<string, Command> = {
Expand DownExpand Up@@ -76,6 +80,10 @@ export const commands: Record<string, Command> = {
"usage free": usageFree,
"pipeline run": pipelineRun,
"pipeline validate": pipelineValidate,
"plugin list": pluginList,
"plugin install": pluginInstall,
"plugin link": pluginLink,
"plugin remove": pluginRemove,
"config show": configShow,
"config set": configSet,
"config export-schema": configExportSchema,
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/src/commands/config/export-schema.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { defineCommand, generateToolSchema } from "bailian-cli-core";
import { defineCommand, generateToolSchema, type Command } from "bailian-cli-core";
import type { Config } from "bailian-cli-core";
import type { GlobalFlags } from "bailian-cli-core";
import { BailianError } from "bailian-cli-core";
Expand All@@ -7,7 +7,7 @@ import { ExitCode } from "bailian-cli-core";
/**
* Commands that are infrastructure/auth-related and not suitable as Agent tools.
*/
const SKIP_PREFIXES = ["auth ", "config ", "update"];
const SKIP_PREFIXES = ["auth ", "config ", "update", "plugin "];

export default defineCommand({
name: "config export-schema",
Expand All@@ -22,7 +22,8 @@ export default defineCommand({
],
examples: ["bl config export-schema", 'bl config export-schema --command "video generate"'],
async run(config: Config, flags: GlobalFlags) {
const { commands } = await import("../catalog.ts");
const { loadCommandCatalog } = await import("../../load-commands.ts");
const { commands } = await loadCommandCatalog();
const targetCommand = flags.command as string | undefined;

if (targetCommand) {
Expand All@@ -35,8 +36,7 @@ export default defineCommand({
return;
}

// Export all suitable commands
const allCommands = Object.values(commands);
const allCommands = Object.values(commands) as Command[];
const schemas = allCommands
.filter((c) => !SKIP_PREFIXES.some((p) => c.name.startsWith(p)))
.map((c) => generateToolSchema(c));
Expand Down
43 changes: 43 additions & 0 deletions packages/cli/src/commands/plugin/install.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { installPlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin install",
description: "Install a bailian-cli plugin package into ~/.bailian/plugins",
usage: "bl plugin install <package>",
options: [],
examples: [
"bl plugin install @ali/bailian-plugin-agent",
"bl plugin install bailian-plugin-agent",
],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const packageSpec = positional?.[0];
if (!packageSpec) {
throw new BailianError(
"Missing plugin package name.",
ExitCode.USAGE,
"bl plugin install <package>",
);
}

const name = await installPlugin(packageSpec);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ installed: name }, null, 2) + "\n");
return;
}
process.stdout.write(`Installed plugin: ${name}\n`);
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/link.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { linkPlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin link",
description: "Link a local bailian-cli plugin directory",
usage: "bl plugin link <path>",
examples: ["bl plugin link ../bailian-plugin-agent"],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const pluginPath = positional?.[0];
if (!pluginPath) {
throw new BailianError("Missing plugin path.", ExitCode.USAGE, "bl plugin link <path>");
}

await linkPlugin(pluginPath);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ linked: pluginPath }, null, 2) + "\n");
return;
}
process.stdout.write(`Linked plugin at ${pluginPath}\n`);
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/list.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { defineCommand, type Config, type GlobalFlags } from "bailian-cli-core";
import { listPlugins } from "../../plugins/manager.ts";

export default defineCommand({
name: "plugin list",
description: "List installed and discovered bailian-cli plugins",
usage: "bl plugin list",
examples: ["bl plugin list"],
async run(_config: Config, flags: GlobalFlags) {
const { plugins, errors } = await listPlugins();
const format = flags.output === "json" ? "json" : "text";

if (format === "json") {
process.stdout.write(JSON.stringify({ plugins, errors }, null, 2) + "\n");
return;
}

if (plugins.length === 0) {
process.stdout.write("No plugins installed.\n");
} else {
process.stdout.write("Plugins:\n");
for (const p of plugins) {
process.stdout.write(` ${p.name} (${p.source})${p.version ? ` @ ${p.version}` : ""}\n`);
process.stdout.write(` ${p.root}\n`);
}
}

if (errors.length > 0) {
process.stderr.write("\nPlugin errors:\n");
for (const e of errors) {
process.stderr.write(` ${e.plugin}: ${e.message}\n`);
}
}
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/remove.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { removePlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin remove",
description: "Remove an installed bailian-cli plugin",
usage: "bl plugin remove <name>",
examples: ["bl plugin remove bailian-plugin-agent"],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const name = positional?.[0];
if (!name) {
throw new BailianError("Missing plugin name.", ExitCode.USAGE, "bl plugin remove <name>");
}

await removePlugin(name);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ removed: name }, null, 2) + "\n");
return;
}
process.stdout.write(`Removed plugin: ${name}\n`);
},
});
158 changes: 158 additions & 0 deletions packages/cli/src/load-commands.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
import { commands as builtinCommands } from "./commands/catalog.ts";
import {
computeFingerprint,
fingerprintMatches,
isPluginCommandsCacheDisabled,
pruneCache,
readCommandsCache,
writeCommandsCache,
type CachedPluginEntry,
type CommandsCache,
COMMANDS_CACHE_SCHEMA,
} from "./plugins/cache.ts";
import { discoverPlugins } from "./plugins/discover.ts";
import { mergeCommands, type PluginCommandEntry } from "./plugins/priority.ts";
import {
extractCommandMeta,
filterValidNoAuthSetup,
lazyCommandFromMeta,
scanPluginCommands,
} from "./plugins/scan.ts";
import type { CommandCatalog, DiscoveredPlugin, PluginLoadError } from "./plugins/types.ts";
import { CLI_VERSION } from "./version.ts";

let cachedCatalog: CommandCatalog | undefined;

function expandNoAuthSetup(paths: string[]): string[][] {
return paths.map((p) => p.split(/\s+/).filter(Boolean));
}

/** 带盘缓存的插件命令加载 */
async function loadPluginCommandsWithCache(plugins: DiscoveredPlugin[]): Promise<{
entries: PluginCommandEntry[];
pluginErrors: PluginLoadError[];
noAuthSetup: string[][];
}> {
const pluginErrors: PluginLoadError[] = [];
const noAuthSetup: string[][] = [];
const entries: PluginCommandEntry[] = [];

const useCache = !isPluginCommandsCacheDisabled();
const diskCache = useCache ? await readCommandsCache() : undefined;
const cacheValid = diskCache?.cliVersion === CLI_VERSION;
let needsWrite = useCache && !cacheValid;

const nextPlugins: Record<string, CachedPluginEntry> = {};

for (const plugin of plugins) {
const fingerprint = computeFingerprint(plugin);
const cached = useCache && cacheValid ? diskCache!.plugins[plugin.name] : undefined;

if (cached && fingerprintMatches(cached.fingerprint, fingerprint)) {
for (const paths of expandNoAuthSetup(cached.noAuthSetup)) {
noAuthSetup.push(paths);
}
for (const meta of cached.commands) {
entries.push({
path: meta.commandPath,
command: lazyCommandFromMeta(meta),
plugin,
});
}
nextPlugins[plugin.name] = cached;
continue;
}

if (useCache) needsWrite = true;

const { commands: scanned, error: scanError } = await scanPluginCommands(plugin);
const scanFailed = scanError !== undefined;
if (scanError) pluginErrors.push(scanError);

const metas = [];
let loadFailed = false;
for (const item of scanned) {
const meta = await extractCommandMeta(item);
if (!meta) {
pluginErrors.push({
plugin: plugin.name,
message: `Could not load command module: ${item.commandPath}`,
});
loadFailed = true;
continue;
}
metas.push(meta);
entries.push({
path: meta.commandPath,
command: lazyCommandFromMeta(meta),
plugin,
});
}

const { paths: validNoAuthPaths, errors: noAuthErrors } = filterValidNoAuthSetup(
plugin,
scanned.map((item) => item.commandPath),
);
pluginErrors.push(...noAuthErrors);
for (const paths of expandNoAuthSetup(validNoAuthPaths)) {
noAuthSetup.push(paths);
}

// Do not cache partial or failed scans so the next startup retries loading.
const canCache = !scanFailed && !loadFailed;
if (useCache && canCache) {
nextPlugins[plugin.name] = {
fingerprint,
commands: metas,
noAuthSetup: validNoAuthPaths,
};
}
}

if (needsWrite && useCache) {
const cache: CommandsCache = {
schema: COMMANDS_CACHE_SCHEMA,
cliVersion: CLI_VERSION,
plugins: pruneCache(
nextPlugins,
plugins.map((p) => p.name),
),
};
await writeCommandsCache(cache);
}

return { entries, pluginErrors, noAuthSetup };
}

/**
* Load the command catalog.
* @returns The command catalog.
*/
export async function loadCommandCatalog(): Promise<CommandCatalog> {
if (cachedCatalog) return cachedCatalog;

const plugins = await discoverPlugins();
const {
entries: pluginEntries,
pluginErrors: scanErrors,
noAuthSetup: pluginNoAuth,
} = await loadPluginCommandsWithCache(plugins);

const { commands, pluginErrors: mergeErrors } = mergeCommands(builtinCommands, pluginEntries);

cachedCatalog = {
commands,
noAuthSetup: pluginNoAuth,
plugins,
pluginErrors: [...scanErrors, ...mergeErrors],
};

return cachedCatalog;
}

/**
* Reset the command catalog cache.
*/
export function resetCommandCatalogCache(): void {
cachedCatalog = undefined;
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); feat(cli): add plugin system with allowlist policy by hopelynd · Pull Request #40 · modelstudioai/cli · GitHub
Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions packages/cli/src/commands/catalog.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,6 +39,10 @@ import usageFree from "./usage/free.ts";
import pipelineRun from "./pipeline/run.ts";
import pipelineValidate from "./pipeline/validate.ts";
import advisorRecommend from "./advisor/recommend.ts";
import pluginList from "./plugin/list.ts";
import pluginInstall from "./plugin/install.ts";
import pluginLink from "./plugin/link.ts";
import pluginRemove from "./plugin/remove.ts";

/** Command registry map (no dependency on registry.ts — safe for build-time import). */
export const commands: Record<string, Command> = {
Expand DownExpand Up@@ -76,6 +80,10 @@ export const commands: Record<string, Command> = {
"usage free": usageFree,
"pipeline run": pipelineRun,
"pipeline validate": pipelineValidate,
"plugin list": pluginList,
"plugin install": pluginInstall,
"plugin link": pluginLink,
"plugin remove": pluginRemove,
"config show": configShow,
"config set": configSet,
"config export-schema": configExportSchema,
Expand Down
10 changes: 5 additions & 5 deletions packages/cli/src/commands/config/export-schema.ts
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { defineCommand, generateToolSchema } from "bailian-cli-core";
import { defineCommand, generateToolSchema, type Command } from "bailian-cli-core";
import type { Config } from "bailian-cli-core";
import type { GlobalFlags } from "bailian-cli-core";
import { BailianError } from "bailian-cli-core";
Expand All@@ -7,7 +7,7 @@ import { ExitCode } from "bailian-cli-core";
/**
* Commands that are infrastructure/auth-related and not suitable as Agent tools.
*/
const SKIP_PREFIXES = ["auth ", "config ", "update"];
const SKIP_PREFIXES = ["auth ", "config ", "update", "plugin "];

export default defineCommand({
name: "config export-schema",
Expand All@@ -22,7 +22,8 @@ export default defineCommand({
],
examples: ["bl config export-schema", 'bl config export-schema --command "video generate"'],
async run(config: Config, flags: GlobalFlags) {
const { commands } = await import("../catalog.ts");
const { loadCommandCatalog } = await import("../../load-commands.ts");
const { commands } = await loadCommandCatalog();
const targetCommand = flags.command as string | undefined;

if (targetCommand) {
Expand All@@ -35,8 +36,7 @@ export default defineCommand({
return;
}

// Export all suitable commands
const allCommands = Object.values(commands);
const allCommands = Object.values(commands) as Command[];
const schemas = allCommands
.filter((c) => !SKIP_PREFIXES.some((p) => c.name.startsWith(p)))
.map((c) => generateToolSchema(c));
Expand Down
43 changes: 43 additions & 0 deletions packages/cli/src/commands/plugin/install.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { installPlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin install",
description: "Install a bailian-cli plugin package into ~/.bailian/plugins",
usage: "bl plugin install <package>",
options: [],
examples: [
"bl plugin install @ali/bailian-plugin-agent",
"bl plugin install bailian-plugin-agent",
],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const packageSpec = positional?.[0];
if (!packageSpec) {
throw new BailianError(
"Missing plugin package name.",
ExitCode.USAGE,
"bl plugin install <package>",
);
}

const name = await installPlugin(packageSpec);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ installed: name }, null, 2) + "\n");
return;
}
process.stdout.write(`Installed plugin: ${name}\n`);
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/link.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { linkPlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin link",
description: "Link a local bailian-cli plugin directory",
usage: "bl plugin link <path>",
examples: ["bl plugin link ../bailian-plugin-agent"],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const pluginPath = positional?.[0];
if (!pluginPath) {
throw new BailianError("Missing plugin path.", ExitCode.USAGE, "bl plugin link <path>");
}

await linkPlugin(pluginPath);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ linked: pluginPath }, null, 2) + "\n");
return;
}
process.stdout.write(`Linked plugin at ${pluginPath}\n`);
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/list.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import { defineCommand, type Config, type GlobalFlags } from "bailian-cli-core";
import { listPlugins } from "../../plugins/manager.ts";

export default defineCommand({
name: "plugin list",
description: "List installed and discovered bailian-cli plugins",
usage: "bl plugin list",
examples: ["bl plugin list"],
async run(_config: Config, flags: GlobalFlags) {
const { plugins, errors } = await listPlugins();
const format = flags.output === "json" ? "json" : "text";

if (format === "json") {
process.stdout.write(JSON.stringify({ plugins, errors }, null, 2) + "\n");
return;
}

if (plugins.length === 0) {
process.stdout.write("No plugins installed.\n");
} else {
process.stdout.write("Plugins:\n");
for (const p of plugins) {
process.stdout.write(` ${p.name} (${p.source})${p.version ? ` @ ${p.version}` : ""}\n`);
process.stdout.write(` ${p.root}\n`);
}
}

if (errors.length > 0) {
process.stderr.write("\nPlugin errors:\n");
for (const e of errors) {
process.stderr.write(` ${e.plugin}: ${e.message}\n`);
}
}
},
});
35 changes: 35 additions & 0 deletions packages/cli/src/commands/plugin/remove.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
import {
BailianError,
ExitCode,
defineCommand,
type Config,
type GlobalFlags,
} from "bailian-cli-core";
import { removePlugin } from "../../plugins/manager.ts";
import { resetCommandCatalogCache } from "../../load-commands.ts";
import { createRegistry, resetRegistry } from "../../registry.ts";

export default defineCommand({
name: "plugin remove",
description: "Remove an installed bailian-cli plugin",
usage: "bl plugin remove <name>",
examples: ["bl plugin remove bailian-plugin-agent"],
async run(_config: Config, flags: GlobalFlags) {
const positional = flags._positional as string[] | undefined;
const name = positional?.[0];
if (!name) {
throw new BailianError("Missing plugin name.", ExitCode.USAGE, "bl plugin remove <name>");
}

await removePlugin(name);
resetCommandCatalogCache();
resetRegistry();
await createRegistry();

if (flags.output === "json") {
process.stdout.write(JSON.stringify({ removed: name }, null, 2) + "\n");
return;
}
process.stdout.write(`Removed plugin: ${name}\n`);
},
});
158 changes: 158 additions & 0 deletions packages/cli/src/load-commands.ts
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,158 @@
import { commands as builtinCommands } from "./commands/catalog.ts";
import {
computeFingerprint,
fingerprintMatches,
isPluginCommandsCacheDisabled,
pruneCache,
readCommandsCache,
writeCommandsCache,
type CachedPluginEntry,
type CommandsCache,
COMMANDS_CACHE_SCHEMA,
} from "./plugins/cache.ts";
import { discoverPlugins } from "./plugins/discover.ts";
import { mergeCommands, type PluginCommandEntry } from "./plugins/priority.ts";
import {
extractCommandMeta,
filterValidNoAuthSetup,
lazyCommandFromMeta,
scanPluginCommands,
} from "./plugins/scan.ts";
import type { CommandCatalog, DiscoveredPlugin, PluginLoadError } from "./plugins/types.ts";
import { CLI_VERSION } from "./version.ts";

let cachedCatalog: CommandCatalog | undefined;

function expandNoAuthSetup(paths: string[]): string[][] {
return paths.map((p) => p.split(/\s+/).filter(Boolean));
}

/** 带盘缓存的插件命令加载 */
async function loadPluginCommandsWithCache(plugins: DiscoveredPlugin[]): Promise<{
entries: PluginCommandEntry[];
pluginErrors: PluginLoadError[];
noAuthSetup: string[][];
}> {
const pluginErrors: PluginLoadError[] = [];
const noAuthSetup: string[][] = [];
const entries: PluginCommandEntry[] = [];

const useCache = !isPluginCommandsCacheDisabled();
const diskCache = useCache ? await readCommandsCache() : undefined;
const cacheValid = diskCache?.cliVersion === CLI_VERSION;
let needsWrite = useCache && !cacheValid;

const nextPlugins: Record<string, CachedPluginEntry> = {};

for (const plugin of plugins) {
const fingerprint = computeFingerprint(plugin);
const cached = useCache && cacheValid ? diskCache!.plugins[plugin.name] : undefined;

if (cached && fingerprintMatches(cached.fingerprint, fingerprint)) {
for (const paths of expandNoAuthSetup(cached.noAuthSetup)) {
noAuthSetup.push(paths);
}
for (const meta of cached.commands) {
entries.push({
path: meta.commandPath,
command: lazyCommandFromMeta(meta),
plugin,
});
}
nextPlugins[plugin.name] = cached;
continue;
}

if (useCache) needsWrite = true;

const { commands: scanned, error: scanError } = await scanPluginCommands(plugin);
const scanFailed = scanError !== undefined;
if (scanError) pluginErrors.push(scanError);

const metas = [];
let loadFailed = false;
for (const item of scanned) {
const meta = await extractCommandMeta(item);
if (!meta) {
pluginErrors.push({
plugin: plugin.name,
message: `Could not load command module: ${item.commandPath}`,
});
loadFailed = true;
continue;
}
metas.push(meta);
entries.push({
path: meta.commandPath,
command: lazyCommandFromMeta(meta),
plugin,
});
}

const { paths: validNoAuthPaths, errors: noAuthErrors } = filterValidNoAuthSetup(
plugin,
scanned.map((item) => item.commandPath),
);
pluginErrors.push(...noAuthErrors);
for (const paths of expandNoAuthSetup(validNoAuthPaths)) {
noAuthSetup.push(paths);
}

// Do not cache partial or failed scans so the next startup retries loading.
const canCache = !scanFailed && !loadFailed;
if (useCache && canCache) {
nextPlugins[plugin.name] = {
fingerprint,
commands: metas,
noAuthSetup: validNoAuthPaths,
};
}
}

if (needsWrite && useCache) {
const cache: CommandsCache = {
schema: COMMANDS_CACHE_SCHEMA,
cliVersion: CLI_VERSION,
plugins: pruneCache(
nextPlugins,
plugins.map((p) => p.name),
),
};
await writeCommandsCache(cache);
}

return { entries, pluginErrors, noAuthSetup };
}

/**
* Load the command catalog.
* @returns The command catalog.
*/
export async function loadCommandCatalog(): Promise<CommandCatalog> {
if (cachedCatalog) return cachedCatalog;

const plugins = await discoverPlugins();
const {
entries: pluginEntries,
pluginErrors: scanErrors,
noAuthSetup: pluginNoAuth,
} = await loadPluginCommandsWithCache(plugins);

const { commands, pluginErrors: mergeErrors } = mergeCommands(builtinCommands, pluginEntries);

cachedCatalog = {
commands,
noAuthSetup: pluginNoAuth,
plugins,
pluginErrors: [...scanErrors, ...mergeErrors],
};

return cachedCatalog;
}

/**
* Reset the command catalog cache.
*/
export function resetCommandCatalogCache(): void {
cachedCatalog = undefined;
}
Loading