mirror of
https://github.com/QwenLM/qwen-code.git
synced 2026-04-28 11:41:04 +00:00
* refactor(cli): replace slash command whitelist with capability-based filtering (Phase 1)
## Summary
Replace the hardcoded ALLOWED_BUILTIN_COMMANDS_NON_INTERACTIVE whitelist with a
unified, capability-based command metadata model. This is Phase 1 of the slash
command architecture refactor described in docs/design/slash-command/.
## Key changes
### New types (types.ts)
- Add ExecutionMode ('interactive' | 'non_interactive' | 'acp')
- Add CommandSource ('builtin-command' | 'bundled-skill' | 'skill-dir-command' |
'plugin-command' | 'mcp-prompt')
- Add CommandType ('prompt' | 'local' | 'local-jsx')
- Extend SlashCommand interface with: source, sourceLabel, commandType,
supportedModes, userInvocable, modelInvocable, argumentHint, whenToUse,
examples (all optional, backward-compatible)
### New module (commandUtils.ts + commandUtils.test.ts)
- getEffectiveSupportedModes(): 3-priority inference
(explicit supportedModes > commandType > CommandKind fallback)
- filterCommandsForMode(): replaces filterCommandsForNonInteractive()
- 18 unit tests
### Whitelist removal (nonInteractiveCliCommands.ts)
- Remove ALLOWED_BUILTIN_COMMANDS_NON_INTERACTIVE constant
- Remove filterCommandsForNonInteractive() function
- Replace with CommandService.getCommandsForMode(mode)
### CommandService enhancements (CommandService.ts)
- Add getCommandsForMode(mode: ExecutionMode): filters by mode, excludes hidden
- Add getModelInvocableCommands(): reserved for Phase 3 model tool-call use
### Built-in command annotations (41 files)
Annotate every built-in command with commandType:
- commandType='local' + supportedModes all-modes: btw, bug, compress, context,
init, summary (replaces the 6-command whitelist)
- commandType='local' interactive-only: export, memory, plan, insight
- commandType='local-jsx' interactive-only: all remaining ~31 commands
### Loader metadata injection (4 files)
Each loader stamps source/sourceLabel/commandType/modelInvocable on every
command it emits:
- BuiltinCommandLoader: source='builtin-command', modelInvocable=false
- BundledSkillLoader: source='bundled-skill', commandType='prompt',
modelInvocable=true
- command-factory (FileCommandLoader): source per extension/user origin,
commandType='prompt', modelInvocable=!extensionName
- McpPromptLoader: source='mcp-prompt', commandType='prompt', modelInvocable=true
### Bug fix
MCP_PROMPT commands were incorrectly excluded from non-interactive/ACP modes by
the old whitelist logic. commandType='prompt' now correctly allows them in all
modes.
### Session.ts / nonInteractiveHelpers.ts
- ACP session calls getAvailableCommands with explicit 'acp' mode
- Remove allowedBuiltinCommandNames parameter from buildSystemMessage() —
capability filtering is now self-contained in CommandService
* fix test ci
* fix memory command
* fix: pass 'non_interactive' mode explicitly to getAvailableCommands
- Fix critical bug in nonInteractiveHelpers.ts: loadSlashCommandNames was
calling getAvailableCommands without specifying mode, causing it to default
to 'acp' instead of 'non_interactive'. Commands with supportedModes that
include 'non_interactive' but not 'acp' would be silently excluded.
- Apply the same fix in systemController.ts for the same reason.
- Update test mock to delegate filtering to production filterCommandsForMode()
instead of duplicating the logic inline, preventing divergence.
Fixes review comments by wenshao and tanzhenxin on PR #3283.
* fix: resolve TypeScript type error in nonInteractiveHelpers.test.ts
* fix test ci
258 lines
7.5 KiB
TypeScript
258 lines
7.5 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2025 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
import type { SlashCommand, CommandContext } from './types.js';
|
|
import { CommandKind } from './types.js';
|
|
import { MessageType } from '../types.js';
|
|
import * as fs from 'node:fs';
|
|
import * as os from 'node:os';
|
|
import * as path from 'node:path';
|
|
import {
|
|
loadServerHierarchicalMemory,
|
|
ConditionalRulesRegistry,
|
|
} from '@qwen-code/qwen-code-core';
|
|
import { t } from '../../i18n/index.js';
|
|
|
|
export function expandHomeDir(p: string): string {
|
|
if (!p) {
|
|
return '';
|
|
}
|
|
let expandedPath = p;
|
|
if (p.toLowerCase().startsWith('%userprofile%')) {
|
|
expandedPath = os.homedir() + p.substring('%userprofile%'.length);
|
|
} else if (p === '~' || p.startsWith('~/')) {
|
|
expandedPath = os.homedir() + p.substring(1);
|
|
}
|
|
return path.normalize(expandedPath);
|
|
}
|
|
|
|
/**
|
|
* Returns directory path completions for the given partial argument.
|
|
* Supports comma-separated paths by completing only the last segment.
|
|
*/
|
|
export function getDirPathCompletions(partialArg: string): string[] {
|
|
const lastComma = partialArg.lastIndexOf(',');
|
|
const prefix = lastComma >= 0 ? partialArg.substring(0, lastComma + 1) : '';
|
|
const partial =
|
|
lastComma >= 0
|
|
? partialArg.substring(lastComma + 1).trimStart()
|
|
: partialArg;
|
|
|
|
const trimmed = partial.trim();
|
|
if (!trimmed) return [];
|
|
|
|
const expanded = trimmed.startsWith('~')
|
|
? trimmed.replace(/^~/, os.homedir())
|
|
: trimmed;
|
|
const endsWithSep = expanded.endsWith('/') || expanded.endsWith(path.sep);
|
|
const searchDir = endsWithSep ? expanded : path.dirname(expanded);
|
|
const namePrefix = endsWithSep ? '' : path.basename(expanded);
|
|
|
|
try {
|
|
return fs
|
|
.readdirSync(searchDir, { withFileTypes: true })
|
|
.filter(
|
|
(e) =>
|
|
e.isDirectory() &&
|
|
e.name.startsWith(namePrefix) &&
|
|
!e.name.startsWith('.'),
|
|
)
|
|
.map((e) => prefix + path.join(searchDir, e.name))
|
|
.slice(0, 8);
|
|
} catch {
|
|
return [];
|
|
}
|
|
}
|
|
|
|
export const directoryCommand: SlashCommand = {
|
|
name: 'directory',
|
|
altNames: ['dir'],
|
|
get description() {
|
|
return t('Manage workspace directories');
|
|
},
|
|
kind: CommandKind.BUILT_IN,
|
|
commandType: 'local-jsx',
|
|
subCommands: [
|
|
{
|
|
name: 'add',
|
|
get description() {
|
|
return t(
|
|
'Add directories to the workspace. Use comma to separate multiple paths',
|
|
);
|
|
},
|
|
kind: CommandKind.BUILT_IN,
|
|
commandType: 'local-jsx',
|
|
completion: async (_context: CommandContext, partialArg: string) =>
|
|
getDirPathCompletions(partialArg),
|
|
action: async (context: CommandContext, args: string) => {
|
|
const {
|
|
ui: { addItem },
|
|
services: { config },
|
|
} = context;
|
|
const [...rest] = args.split(' ');
|
|
|
|
if (!config) {
|
|
addItem(
|
|
{
|
|
type: MessageType.ERROR,
|
|
text: t('Configuration is not available.'),
|
|
},
|
|
Date.now(),
|
|
);
|
|
return;
|
|
}
|
|
|
|
const workspaceContext = config.getWorkspaceContext();
|
|
|
|
const pathsToAdd = rest
|
|
.join(' ')
|
|
.split(',')
|
|
.filter((p) => p);
|
|
if (pathsToAdd.length === 0) {
|
|
addItem(
|
|
{
|
|
type: MessageType.ERROR,
|
|
text: t('Please provide at least one path to add.'),
|
|
},
|
|
Date.now(),
|
|
);
|
|
return;
|
|
}
|
|
|
|
if (config.isRestrictiveSandbox()) {
|
|
return {
|
|
type: 'message' as const,
|
|
messageType: 'error' as const,
|
|
content: t(
|
|
'The /directory add command is not supported in restrictive sandbox profiles. Please use --include-directories when starting the session instead.',
|
|
),
|
|
};
|
|
}
|
|
|
|
const added: string[] = [];
|
|
const errors: string[] = [];
|
|
|
|
for (const pathToAdd of pathsToAdd) {
|
|
try {
|
|
workspaceContext.addDirectory(expandHomeDir(pathToAdd.trim()));
|
|
added.push(pathToAdd.trim());
|
|
} catch (e) {
|
|
const error = e as Error;
|
|
errors.push(
|
|
t("Error adding '{{path}}': {{error}}", {
|
|
path: pathToAdd.trim(),
|
|
error: error.message,
|
|
}),
|
|
);
|
|
}
|
|
}
|
|
|
|
try {
|
|
if (config.shouldLoadMemoryFromIncludeDirectories()) {
|
|
const { memoryContent, fileCount, conditionalRules, projectRoot } =
|
|
await loadServerHierarchicalMemory(
|
|
config.getWorkingDir(),
|
|
[
|
|
...config.getWorkspaceContext().getDirectories(),
|
|
...pathsToAdd,
|
|
],
|
|
config.getFileService(),
|
|
config.getExtensionContextFilePaths(),
|
|
config.getFolderTrust(),
|
|
context.services.settings.merged.context?.importFormat ||
|
|
'tree', // Use setting or default to 'tree'
|
|
config.getContextRuleExcludes(),
|
|
);
|
|
config.setUserMemory(memoryContent);
|
|
config.setGeminiMdFileCount(fileCount);
|
|
config.setConditionalRulesRegistry(
|
|
new ConditionalRulesRegistry(conditionalRules, projectRoot),
|
|
);
|
|
context.ui.setGeminiMdFileCount(fileCount);
|
|
}
|
|
addItem(
|
|
{
|
|
type: MessageType.INFO,
|
|
text: t(
|
|
'Successfully added QWEN.md files from the following directories if there are:\n- {{directories}}',
|
|
{
|
|
directories: added.join('\n- '),
|
|
},
|
|
),
|
|
},
|
|
Date.now(),
|
|
);
|
|
} catch (error) {
|
|
errors.push(
|
|
t('Error refreshing memory: {{error}}', {
|
|
error: (error as Error).message,
|
|
}),
|
|
);
|
|
}
|
|
|
|
if (added.length > 0) {
|
|
const gemini = config.getGeminiClient();
|
|
if (gemini) {
|
|
await gemini.addDirectoryContext();
|
|
}
|
|
addItem(
|
|
{
|
|
type: MessageType.INFO,
|
|
text: t('Successfully added directories:\n- {{directories}}', {
|
|
directories: added.join('\n- '),
|
|
}),
|
|
},
|
|
Date.now(),
|
|
);
|
|
}
|
|
|
|
if (errors.length > 0) {
|
|
addItem(
|
|
{ type: MessageType.ERROR, text: errors.join('\n') },
|
|
Date.now(),
|
|
);
|
|
}
|
|
return;
|
|
},
|
|
},
|
|
{
|
|
name: 'show',
|
|
get description() {
|
|
return t('Show all directories in the workspace');
|
|
},
|
|
kind: CommandKind.BUILT_IN,
|
|
commandType: 'local-jsx',
|
|
action: async (context: CommandContext) => {
|
|
const {
|
|
ui: { addItem },
|
|
services: { config },
|
|
} = context;
|
|
if (!config) {
|
|
addItem(
|
|
{
|
|
type: MessageType.ERROR,
|
|
text: t('Configuration is not available.'),
|
|
},
|
|
Date.now(),
|
|
);
|
|
return;
|
|
}
|
|
const workspaceContext = config.getWorkspaceContext();
|
|
const directories = workspaceContext.getDirectories();
|
|
const directoryList = directories.map((dir) => `- ${dir}`).join('\n');
|
|
addItem(
|
|
{
|
|
type: MessageType.INFO,
|
|
text: t('Current workspace directories:\n{{directories}}', {
|
|
directories: directoryList,
|
|
}),
|
|
},
|
|
Date.now(),
|
|
);
|
|
},
|
|
},
|
|
],
|
|
};
|