Skip to content

armgit / Orkas

Public Imported from GitHub
0

Orkas is an open-source (MIT), local-first AI team for your desktop: a Commander turns your goal into to-dos and coordinates 16 built-in specialist agents plus Claude Code, Codex, OpenCode, OpenClaw and Hermes, with projects, scheduled automations and connectors. Free app for macOS & Windows; built-in models or your own keys.

Constrain agent name charset so @-mentions don't truncate

claw2935faae36fe9
diff --git a/src/main/features/agents.ts b/src/main/features/agents.ts
index c8ad4754..5d9ac0da 100644
--- a/src/main/features/agents.ts
+++ b/src/main/features/agents.ts
@@ -281,6 +281,39 @@ function assertAgentNameAllowed(name: string): void {
err.code = 'E_AGENT_NAME_RESERVED';
throw err;
}
+ assertAgentNameCharsetValid(name);
+}
+
+// Agent names must round-trip through the @-mention regex used by the
+// router (`router.ts::TOKEN_CLASS = [A-Za-z0-9_一-鿿-]`) — slashes,
+// backslashes, dots, parens, control chars etc. either truncate the
+// match (so `@Agent/Skill搜罗大师` only matches `Agent`) or escape the
+// alternation arm at the regex stage. We additionally cap length and
+// allow a single internal space so multi-word display names
+// ("Code Review Helper") still resolve via the alternation. Leading /
+// trailing whitespace is rejected because UIs render names raw — stray
+// whitespace looks like a typo nobody can see to fix.
+const NAME_TOKEN_RE = /^[A-Za-z0-9_一-鿿-]+(?: [A-Za-z0-9_一-鿿-]+)*$/;
+const NAME_MAX_LENGTH = 50;
+function assertAgentNameCharsetValid(name: string): void {
+ if (name == null) return;
+ const trimmed = String(name);
+ if (!trimmed.trim()) return;
+ if (trimmed !== trimmed.trim()) {
+ const err: any = new Error(`agent name has leading or trailing whitespace`);
+ err.code = 'E_AGENT_NAME_INVALID';
+ throw err;
+ }
+ if (trimmed.length > NAME_MAX_LENGTH) {
+ const err: any = new Error(`agent name longer than ${NAME_MAX_LENGTH} characters`);
+ err.code = 'E_AGENT_NAME_TOO_LONG';
+ throw err;
+ }
+ if (!NAME_TOKEN_RE.test(trimmed)) {
+ const err: any = new Error(`agent name contains unsupported characters (only letters, digits, hyphen, underscore, CJK, and single internal spaces are allowed)`);
+ err.code = 'E_AGENT_NAME_INVALID';
+ throw err;
+ }
}
/** Reject names already in use by another agent (custom OR builtin).
diff --git a/src/renderer/locales/en.json b/src/renderer/locales/en.json
index e448700a..791a8eaf 100644
--- a/src/renderer/locales/en.json
+++ b/src/renderer/locales/en.json
@@ -231,6 +231,8 @@
"agents.input_desc_needed": "Please enter a summary",
"agents.name_reserved": "That name is reserved by the system (Commander). Pick another.",
"agents.name_taken": "That name is already used by another agent. Pick another.",
+ "agents.name_invalid": "Name may only contain letters, digits, underscores, hyphens, CJK characters, and single internal spaces",
+ "agents.name_too_long": "Name too long (max 50 characters)",
"agents.ext_cli_needed": "Pick an external agent first",
"agents.create_failed": "Create failed",
"agents.seed_workflow": "Help me refine this agent",
diff --git a/src/renderer/locales/zh.json b/src/renderer/locales/zh.json
index 0e22cbbe..1c1ea2ec 100644
--- a/src/renderer/locales/zh.json
+++ b/src/renderer/locales/zh.json
@@ -231,6 +231,8 @@
"agents.input_desc_needed": "请输入简介",
"agents.name_reserved": "该名称为系统保留(指挥官 / 总指挥),请换一个",
"agents.name_taken": "该名称已被其他智能体使用,请换一个",
+ "agents.name_invalid": "名称只支持字母、数字、下划线、横线、中文,词之间允许单个空格",
+ "agents.name_too_long": "名称过长(最多 50 个字符)",
"agents.ext_cli_needed": "请先选择外接智能体",
"agents.create_failed": "创建失败",
"agents.seed_workflow": "帮我完善这个智能体",
diff --git a/src/renderer/modules/agents.js b/src/renderer/modules/agents.js
index c1580da4..8ad759d1 100644
--- a/src/renderer/modules/agents.js
+++ b/src/renderer/modules/agents.js
@@ -29,6 +29,22 @@ function _isReservedAgentName(name) {
return _RESERVED_AGENT_NAMES.has(key);
}
+// Mirror of `agents.ts::NAME_TOKEN_RE` so the form rejects junk before
+// the round-trip. Charset must round-trip through the bus's @-mention
+// regex; see backend for the full reasoning. UIs may still surface
+// server errors (E_AGENT_NAME_INVALID / E_AGENT_NAME_TOO_LONG) when
+// the LLM-driven path produces a bad name.
+const _NAME_TOKEN_RE = /^[A-Za-z0-9_一-鿿-]+(?: [A-Za-z0-9_一-鿿-]+)*$/;
+const _NAME_MAX_LENGTH = 50;
+function _isValidAgentNameCharset(name) {
+ const v = String(name || '');
+ const trimmed = v.trim();
+ if (!trimmed) return true;
+ if (v !== trimmed) return false;
+ if (trimmed.length > _NAME_MAX_LENGTH) return false;
+ return _NAME_TOKEN_RE.test(trimmed);
+}
+
async function loadAgents(forceRefresh) {
if (_agentsCache && !forceRefresh) { renderAgentsList(_agentsCache); return; }
try {
@@ -731,6 +747,12 @@ async function _flushAgentFieldSave() {
if (nameEl && _selectedAgent.name) nameEl.innerText = _selectedAgent.name;
return;
}
+ if (field === 'name' && !_isValidAgentNameCharset(value)) {
+ await uiAlert(t('agents.name_invalid'));
+ const nameEl = document.getElementById('agents-detail-name');
+ if (nameEl && _selectedAgent.name) nameEl.innerText = _selectedAgent.name;
+ return;
+ }
try {
const res = await apiFetch(`/api/agents/${encodeURIComponent(_selectedAgent.id)}/update`, {
method: 'PUT',
@@ -925,6 +947,12 @@ async function _saveCreateAgent({ msgEl }) {
document.getElementById('agent-name-input').focus();
return;
}
+ if (!_isValidAgentNameCharset(name)) {
+ msgEl.textContent = t('agents.name_invalid');
+ msgEl.className = 'form-msg err';
+ document.getElementById('agent-name-input').focus();
+ return;
+ }
if (!description) {
msgEl.textContent = t('agents.input_desc_needed');
msgEl.className = 'form-msg err';
@@ -981,6 +1009,12 @@ async function _saveExternalAgent({ msgEl }) {
document.getElementById('agent-ext-name-input').focus();
return;
}
+ if (!_isValidAgentNameCharset(name)) {
+ msgEl.textContent = t('agents.name_invalid');
+ msgEl.className = 'form-msg err';
+ document.getElementById('agent-ext-name-input').focus();
+ return;
+ }
if (!desc) {
msgEl.textContent = t('agents.input_desc_needed');
msgEl.className = 'form-msg err';
@@ -1039,6 +1073,8 @@ function _agentCreateErrorMessage(data) {
const code = data.code;
if (code === 'E_AGENT_NAME_TAKEN') return t('agents.name_taken');
if (code === 'E_AGENT_NAME_RESERVED') return t('agents.name_reserved');
+ if (code === 'E_AGENT_NAME_INVALID') return t('agents.name_invalid');
+ if (code === 'E_AGENT_NAME_TOO_LONG') return t('agents.name_too_long');
return data.error || '';
}