mirror of
https://github.com/chaitin/MonkeyCode.git
synced 2026-11-22 11:28:46 +08:00
fix(agent): MCP 中文名工具净化 + 输入法组合态误发送
- MCP 工具名 mcp__<server>__<tool> 各段净化为 ^[a-zA-Z0-9_-]+: 合法名零改写(既有 --allow/持久化权限规则不受影响);非法字符连段折叠为 单下划线并追加原名 FNV 短哈希(不同原名不撞名、跨会话稳定);展示层仍用 原始名。修复中文命名的 MCP server 导致整个请求被网关 502 拒绝 - UI 输入框 Enter 发送加 isComposing 守卫:输入法选字/确认候选不再误发送 (对话 composer 与新建会话输入框)
This commit is contained in:
1 parent
1760f88a1e
commit
4947abb8b4
4 files changed
+82
-4
No files matched your search
@@ -103,7 +103,7 @@ ${u}</tr>
|
||||
Please report this to https://github.com/markedjs/marked.`,u){const c="<p>An error occurred:</p><pre>"+fn(s.message+"",!0)+"</pre>";return o?Promise.resolve(c):c}if(o)return Promise.reject(s);throw s}}},xr=new im;function me(u,o){return xr.parse(u,o)}me.options=me.setOptions=function(u){return xr.setOptions(u),me.defaults=xr.defaults,jf(me.defaults),me};me.getDefaults=Nu;me.defaults=_r;me.use=function(...u){return xr.use(...u),me.defaults=xr.defaults,jf(me.defaults),me};me.walkTokens=function(u,o){return xr.walkTokens(u,o)};me.parseInline=xr.parseInline;me.Parser=Nn;me.parser=Nn.parse;me.Renderer=_o;me.TextRenderer=Du;me.Lexer=Cn;me.lexer=Cn.lex;me.Tokenizer=xo;me.Hooks=wo;me.parse=me;me.options;me.setOptions;me.use;me.walkTokens;me.parseInline;Nn.parse;Cn.lex;const _u={items:[],running:!1,usage:null,streamKind:"",turnEnded:!1,model:""},om={approved:"已允许",denied:"已拒绝",timeout:"已超时(按拒绝处理)",cancelled:"已取消"};function sm(u){switch(u){case"allowed":return"已允许";case"rejected":return"已拒绝";case"expired":return"(已过期)";default:return om[u]??u}}function Af(u,o,s){const c=u.items.slice(),d=c[c.length-1];return u.streamKind===o&&d&&d.kind===o?c[c.length-1]={...d,text:d.text+s}:c.push({kind:o,text:s}),{...u,items:c,streamKind:o}}function al(u,o){return{...u,items:[...u.items,o],streamKind:""}}function Pf(u){return u.map(o=>o.kind==="perm"&&o.state==="open"?{...o,state:"expired"}:o)}function um(u,o,s){const c=u.items.slice();for(let d=c.length-1;d>=0;d--){const h=c[d];if(!(h.kind!=="tool"||h.tcId!==o)){switch(s.kind){case"subagent_tool":{const E=(h.subItems??[]).slice(),k=E.findIndex(S=>S.id===s.id),C={id:s.id??String(E.length),title:s.title??"",status:s.status??"run"};k>=0?E[k]={...C,title:C.title||E[k].title}:E.push(C),c[d]={...h,subItems:E};break}case"output":c[d]={...h,lastLine:s.line};break;case"child_session":c[d]={...h,childSessionId:s.childSessionId};break}return{...u,items:c}}}return u}function am(u,o){var s,c;switch(o.sessionUpdate){case"agent_message_chunk":return Af(u,"agent",((s=o.content)==null?void 0:s.text)??"");case"agent_thought_chunk":return Af(u,"thought",((c=o.content)==null?void 0:c.text)??"");case"tool_call":return al(u,{kind:"tool",tcId:o.toolCallId??"",title:o.title||o.kind||"工具调用",status:"run",out:""});case"tool_call_update":{if(o.status==="in_progress")return o.progress?um(u,o.toolCallId??"",o.progress):u;const d=u.items.slice();for(let h=d.length-1;h>=0;h--){const E=d[h];if(E.kind==="tool"&&E.tcId===o.toolCallId){const k=typeof o.rawOutput=="string"?o.rawOutput.split(`
|
||||
`)[0].slice(0,160):"";d[h]={...E,status:o.status==="completed"?"ok":"fail",out:k,lastLine:void 0};break}}return{...u,items:d}}case"plan":{const d=u.items.slice();for(let h=d.length-1;h>=0;h--)if(d[h].kind==="plan")return d[h]={kind:"plan",entries:o.entries??[]},{...u,items:d,streamKind:""};return al(u,{kind:"plan",entries:o.entries??[]})}case"llm_call_retry":return al(u,{kind:"sys",text:`模型调用重试 #${o.attempt??"?"}: ${o.message??""}`});case"usage_update":return{...u,usage:{used:o.used??0,size:o.size??0}};case"model_update":{const d=o.model??"";return{...al(u,{kind:"sys",text:`模型已切换为 ${d}`}),model:d}}default:return u}}function cm(u,o){switch(o.type){case"task-started":return{...u,running:!0};case"task-ended":return{...u,running:!1,streamKind:"",turnEnded:!0,items:[...Pf(u.items),{kind:"sys",text:"— 本轮结束 —"}]};case"task-error":{const s=ni(o);return{...u,running:!1,streamKind:"",items:[...Pf(u.items),{kind:"sys",text:"✗ "+((s==null?void 0:s.error)||"未知错误"),error:!0}]}}case"user-input":{const s=ni(o);let c="";try{c=s!=null&&s.content?Tu(s.content):""}catch{c=(s==null?void 0:s.content)??""}return al(u,{kind:"user",text:c})}case"permission-req":{const s=ni(o);return s!=null&&s.id?al(u,{kind:"perm",id:s.id,title:s.title??"",tool:s.tool??"",state:"open"}):u}case"permission-resolved":{const s=ni(o);return s!=null&&s.id?{...u,items:u.items.map(c=>c.kind==="perm"&&c.id===s.id&&c.state==="open"?{...c,state:s.outcome??"expired"}:c)}:u}case"task-running":if(o.kind==="acp_event"){const s=ni(o);if(s!=null&&s.update)return am(u,s.update)}return u;default:return u}}function Kf(u,o){let s=u;for(const c of o)s=cm(s,c);return s}function fm(u,o,s){return{...u,items:u.items.map(c=>c.kind==="perm"&&c.id===o&&c.state==="open"?{...c,state:s?"allowed":"rejected"}:c)}}me.setOptions({gfm:!0,breaks:!0});function dm({text:u}){const o=ce.useMemo(()=>_h.sanitize(me.parse(u,{async:!1})),[u]);return R.jsx("div",{className:"md",dangerouslySetInnerHTML:{__html:o}})}function pm({meta:u,active:o,onClick:s}){return R.jsxs("div",{className:"sess"+(o?" active":""),onClick:s,children:[R.jsx("div",{className:"sess-title",children:u.title||"(未命名)"}),R.jsxs("div",{className:"sess-meta",children:[R.jsx("span",{className:"dot st-"+u.status,title:u.status}),R.jsx("span",{className:"sess-dir",children:u.workdir}),R.jsxs("span",{children:["· ",u.turns,"轮"]})]})]})}function hm({entries:u}){const o=s=>s==="completed"?"☑":s==="in_progress"?"◐":"☐";return R.jsx("div",{className:"plan",children:u.map((s,c)=>R.jsxs("div",{className:"plan-item "+s.status,children:[R.jsx("span",{className:"plan-mark",children:o(s.status)})," ",s.content]},c))})}function Lf(u){return u==="run"?"◌":u==="ok"?"✓":"✗"}function mm({item:u,onOpenChild:o}){var s;return R.jsxs("div",{className:"tool-block",children:[R.jsxs("div",{className:"tool",children:[R.jsx("span",{className:"tool-dot "+u.status,children:Lf(u.status)}),R.jsx("span",{className:"tool-name",children:u.title}),u.out&&R.jsx("span",{className:"tool-out",children:u.out}),u.childSessionId&&o&&R.jsx("button",{className:"link",onClick:()=>o(u.childSessionId),children:"查看子会话"})]}),(s=u.subItems)==null?void 0:s.map(c=>R.jsxs("div",{className:"tool sub",children:[R.jsx("span",{className:"sub-arrow",children:"↳"}),R.jsx("span",{className:"tool-dot "+c.status,children:Lf(c.status)}),R.jsx("span",{className:"tool-out",children:c.title})]},c.id)),u.status==="run"&&u.lastLine&&R.jsxs("div",{className:"tool sub",children:[R.jsx("span",{className:"sub-arrow",children:"↳"}),R.jsx("span",{className:"tool-out live",children:u.lastLine})]})]})}function gm({item:u,onAnswer:o}){return R.jsxs("div",{className:"perm",children:[R.jsxs("div",{className:"perm-q",children:["⚠ 请求执行:",R.jsx("b",{children:u.title})," ",R.jsxs("span",{className:"hint",children:["(",u.tool,")"]})]}),u.state==="open"?R.jsxs("div",{className:"perm-btns",children:[R.jsx("button",{onClick:()=>o(u.id,"allow"),children:"允许"}),R.jsx("button",{className:"ghost",onClick:()=>o(u.id,"always"),children:"本会话始终"}),R.jsx("button",{className:"ghost",onClick:()=>o(u.id,"persist"),children:"此项目永久"}),R.jsx("button",{className:"danger",onClick:()=>o(u.id,"deny"),children:"拒绝"})]}):R.jsx("div",{className:"hint",children:sm(u.state)})]})}function bf({item:u,onPermAnswer:o,onOpenChild:s}){switch(u.kind){case"user":return R.jsx("div",{className:"msg user",children:u.text});case"agent":return R.jsx("div",{className:"msg agent",children:R.jsx(dm,{text:u.text})});case"thought":return R.jsx("div",{className:"msg thought",children:u.text});case"tool":return R.jsx(mm,{item:u,onOpenChild:s});case"plan":return R.jsx(hm,{entries:u.entries});case"sys":return R.jsx("div",{className:"sysline"+(u.error?" err":""),children:u.text});case"perm":return R.jsx(gm,{item:u,onAnswer:o})}}function ym({text:u}){const o=u.split(`
|
||||
`);return R.jsx("pre",{className:"diff",children:o.map((s,c)=>{let d="";return s.startsWith("+++")||s.startsWith("---")||s.startsWith("diff ")||s.startsWith("index ")?d="diff-meta":s.startsWith("@@")?d="diff-hunk":s.startsWith("+")?d="diff-add":s.startsWith("-")&&(d="diff-del"),R.jsxs("span",{className:d,children:[s,`
|
||||
`]},c)})})}function vm(){var g;const[u,o]=ce.useState([]),[s,c]=ce.useState(null),[d,h]=ce.useState(_u),[E,k]=ce.useState("未连接"),[C,S]=ce.useState("chat"),[N,M]=ce.useState(null),[A,J]=ce.useState(""),[Q,F]=ce.useState(null),[le,Ce]=ce.useState(!1),[Ke,$e]=ce.useState(""),[ie,ye]=ce.useState(null),[re,pe]=ce.useState([]),[ze,mt]=ce.useState(""),we=ce.useRef(null),St=ce.useRef(null),He=ce.useRef(!0),De=ce.useCallback(async()=>{const v=await Up();return o(v),v},[]),rt=ce.useCallback(async()=>{const v=we.current;if(v)try{const U=await v.call("repo_file_changes");U.error?(J(U.error),M([])):(J(""),M(U.result??[]))}catch(U){J(U instanceof Error?U.message:String(U)),M([])}},[]),be=ce.useCallback((v,U)=>{var K;(K=we.current)==null||K.close(),c(v),h(_u),M(null),J(""),S("chat"),mt(U??""),localStorage.setItem("mc.lastSession",v),we.current=If(v,{onFrames:ne=>h(oe=>Kf(oe,ne)),onStatus:ne=>k(ne)}),De()},[De]);ce.useEffect(()=>($p().then(pe).catch(()=>{}),De().then(v=>{const U=localStorage.getItem("mc.lastSession"),K=v.find(ne=>ne.id===U);K&&be(K.id,K.model)}).catch(v=>k("无法连接服务: "+(v instanceof Error?v.message:v))),()=>{var v;return(v=we.current)==null?void 0:v.close()}),[]),ce.useEffect(()=>{d.model&&mt(d.model)},[d.model]),ce.useEffect(()=>{d.turnEnded&&(h(v=>({...v,turnEnded:!1})),rt(),De())},[d.turnEnded,rt,De]),ce.useEffect(()=>{const v=St.current;v&&He.current&&(v.scrollTop=v.scrollHeight)},[d.items]);const We=()=>{const v=St.current;v&&(He.current=v.scrollHeight-v.scrollTop-v.clientHeight<40)},ve=()=>{const v=Ke.trim();!v||d.running||!we.current||we.current.send("user-input",{content:yu(v)})&&$e("")},j=(v,U)=>{var ne;const K=U!=="deny";(ne=we.current)!=null&&ne.send("permission-resp",{id:v,approved:K,remember:U==="always"||U==="persist",persist:U==="persist"})&&h(oe=>fm(oe,v,K))},b=async v=>{if(!(!we.current||!v||v===ze))try{const U=await we.current.call("session_set_model",{model:v});if(U.error){k("⚠ 切换模型失败: "+U.error);return}mt(v),De()}catch(U){k("⚠ 切换模型失败: "+(U instanceof Error?U.message:U))}},B=async v=>{var U;F({path:v,text:"加载中…"});try{const K=await we.current.call("repo_file_diff",{path:v});F({path:v,text:K.error?"✗ "+K.error:((U=K.result)==null?void 0:U.diff)||"(无差异)"})}catch(K){F({path:v,text:"✗ "+(K instanceof Error?K.message:K)})}};return R.jsxs("div",{className:"app",children:[R.jsxs("aside",{className:"side",children:[R.jsxs("div",{className:"brand",children:[R.jsx("span",{className:"brand-name",children:"MonkeyCode"}),R.jsx("span",{className:"hint",children:"本地内核"})]}),R.jsx("button",{className:"primary wide",onClick:()=>Ce(!0),children:"+ 新建会话"}),R.jsxs("div",{className:"sessions",children:[u.map(v=>R.jsx(pm,{meta:v,active:v.id===s,onClick:()=>be(v.id,v.model)},v.id)),u.length===0&&R.jsx("div",{className:"hint pad",children:"暂无会话"})]}),R.jsx("button",{className:"ghost wide settings-btn",onClick:()=>Hp(v=>k("⚠ "+v)),children:"⚙ 设置"})]}),R.jsxs("main",{className:"main",children:[R.jsxs("nav",{className:"tabs",children:[R.jsx("button",{className:"tab"+(C==="chat"?" active":""),onClick:()=>S("chat"),children:"对话"}),R.jsxs("button",{className:"tab"+(C==="changes"?" active":""),onClick:()=>{S("changes"),rt()},children:["改动",N&&N.length>0?` (${N.length})`:""]})]}),C==="chat"?R.jsxs("div",{className:"log",ref:St,onScroll:We,children:[s===null&&R.jsx("div",{className:"sysline",children:"选择或创建一个会话开始"}),d.items.map((v,U)=>R.jsx(bf,{item:v,onPermAnswer:j,onOpenChild:ye},U))]}):R.jsxs("div",{className:"changes",children:[N===null&&R.jsx("div",{className:"sysline",children:"加载中…"}),A&&R.jsx("div",{className:"sysline err",children:A}),N&&!A&&N.length===0&&R.jsx("div",{className:"sysline",children:"无改动(或非 git 仓库)"}),N==null?void 0:N.map(v=>R.jsxs("div",{className:"chg",onClick:()=>void B(v.path),children:[R.jsx("span",{className:"chg-st "+v.status,children:v.status}),R.jsx("span",{children:v.path})]},v.path))]}),R.jsxs("div",{className:"composer",children:[R.jsx("textarea",{value:Ke,placeholder:"输入任务…(Enter 发送,Shift+Enter 换行)",onChange:v=>$e(v.target.value),onKeyDown:v=>{v.key==="Enter"&&!v.shiftKey&&(v.preventDefault(),ve())}}),R.jsx("button",{className:"primary",disabled:d.running||!s,onClick:ve,children:"发送"}),R.jsx("button",{className:"danger",disabled:!d.running,onClick:()=>{var v;return(v=we.current)==null?void 0:v.send("user-cancel",{})},children:"停止"})]}),R.jsxs("footer",{className:"status",children:[R.jsx("span",{children:E}),R.jsxs("span",{className:"status-right",children:[s&&re.length>0&&R.jsxs("select",{className:"model-select",value:ze||((g=re.find(v=>v.default))==null?void 0:g.name)||"",disabled:d.running,title:d.running?"轮次执行中,结束后可切换":"切换本会话模型(下一轮生效)",onChange:v=>void b(v.target.value),children:[re.map(v=>R.jsx("option",{value:v.name,children:v.name},v.name)),ze&&!re.some(v=>v.nameLine truncated
|
||||
`]},c)})})}function vm(){var g;const[u,o]=ce.useState([]),[s,c]=ce.useState(null),[d,h]=ce.useState(_u),[E,k]=ce.useState("未连接"),[C,S]=ce.useState("chat"),[N,M]=ce.useState(null),[A,J]=ce.useState(""),[Q,F]=ce.useState(null),[le,Ce]=ce.useState(!1),[Ke,$e]=ce.useState(""),[ie,ye]=ce.useState(null),[re,pe]=ce.useState([]),[ze,mt]=ce.useState(""),we=ce.useRef(null),St=ce.useRef(null),He=ce.useRef(!0),De=ce.useCallback(async()=>{const v=await Up();return o(v),v},[]),rt=ce.useCallback(async()=>{const v=we.current;if(v)try{const U=await v.call("repo_file_changes");U.error?(J(U.error),M([])):(J(""),M(U.result??[]))}catch(U){J(U instanceof Error?U.message:String(U)),M([])}},[]),be=ce.useCallback((v,U)=>{var K;(K=we.current)==null||K.close(),c(v),h(_u),M(null),J(""),S("chat"),mt(U??""),localStorage.setItem("mc.lastSession",v),we.current=If(v,{onFrames:ne=>h(oe=>Kf(oe,ne)),onStatus:ne=>k(ne)}),De()},[De]);ce.useEffect(()=>($p().then(pe).catch(()=>{}),De().then(v=>{const U=localStorage.getItem("mc.lastSession"),K=v.find(ne=>ne.id===U);K&&be(K.id,K.model)}).catch(v=>k("无法连接服务: "+(v instanceof Error?v.message:v))),()=>{var v;return(v=we.current)==null?void 0:v.close()}),[]),ce.useEffect(()=>{d.model&&mt(d.model)},[d.model]),ce.useEffect(()=>{d.turnEnded&&(h(v=>({...v,turnEnded:!1})),rt(),De())},[d.turnEnded,rt,De]),ce.useEffect(()=>{const v=St.current;v&&He.current&&(v.scrollTop=v.scrollHeight)},[d.items]);const We=()=>{const v=St.current;v&&(He.current=v.scrollHeight-v.scrollTop-v.clientHeight<40)},ve=()=>{const v=Ke.trim();!v||d.running||!we.current||we.current.send("user-input",{content:yu(v)})&&$e("")},j=(v,U)=>{var ne;const K=U!=="deny";(ne=we.current)!=null&&ne.send("permission-resp",{id:v,approved:K,remember:U==="always"||U==="persist",persist:U==="persist"})&&h(oe=>fm(oe,v,K))},b=async v=>{if(!(!we.current||!v||v===ze))try{const U=await we.current.call("session_set_model",{model:v});if(U.error){k("⚠ 切换模型失败: "+U.error);return}mt(v),De()}catch(U){k("⚠ 切换模型失败: "+(U instanceof Error?U.message:U))}},B=async v=>{var U;F({path:v,text:"加载中…"});try{const K=await we.current.call("repo_file_diff",{path:v});F({path:v,text:K.error?"✗ "+K.error:((U=K.result)==null?void 0:U.diff)||"(无差异)"})}catch(K){F({path:v,text:"✗ "+(K instanceof Error?K.message:K)})}};return R.jsxs("div",{className:"app",children:[R.jsxs("aside",{className:"side",children:[R.jsxs("div",{className:"brand",children:[R.jsx("span",{className:"brand-name",children:"MonkeyCode"}),R.jsx("span",{className:"hint",children:"本地内核"})]}),R.jsx("button",{className:"primary wide",onClick:()=>Ce(!0),children:"+ 新建会话"}),R.jsxs("div",{className:"sessions",children:[u.map(v=>R.jsx(pm,{meta:v,active:v.id===s,onClick:()=>be(v.id,v.model)},v.id)),u.length===0&&R.jsx("div",{className:"hint pad",children:"暂无会话"})]}),R.jsx("button",{className:"ghost wide settings-btn",onClick:()=>Hp(v=>k("⚠ "+v)),children:"⚙ 设置"})]}),R.jsxs("main",{className:"main",children:[R.jsxs("nav",{className:"tabs",children:[R.jsx("button",{className:"tab"+(C==="chat"?" active":""),onClick:()=>S("chat"),children:"对话"}),R.jsxs("button",{className:"tab"+(C==="changes"?" active":""),onClick:()=>{S("changes"),rt()},children:["改动",N&&N.length>0?` (${N.length})`:""]})]}),C==="chat"?R.jsxs("div",{className:"log",ref:St,onScroll:We,children:[s===null&&R.jsx("div",{className:"sysline",children:"选择或创建一个会话开始"}),d.items.map((v,U)=>R.jsx(bf,{item:v,onPermAnswer:j,onOpenChild:ye},U))]}):R.jsxs("div",{className:"changes",children:[N===null&&R.jsx("div",{className:"sysline",children:"加载中…"}),A&&R.jsx("div",{className:"sysline err",children:A}),N&&!A&&N.length===0&&R.jsx("div",{className:"sysline",children:"无改动(或非 git 仓库)"}),N==null?void 0:N.map(v=>R.jsxs("div",{className:"chg",onClick:()=>void B(v.path),children:[R.jsx("span",{className:"chg-st "+v.status,children:v.status}),R.jsx("span",{children:v.path})]},v.path))]}),R.jsxs("div",{className:"composer",children:[R.jsx("textarea",{value:Ke,placeholder:"输入任务…(Enter 发送,Shift+Enter 换行)",onChange:v=>$e(v.target.value),onKeyDown:v=>{v.key==="Enter"&&!v.shiftKey&&!v.nativeEvent.isComposing&&(v.preventDefault(),ve())}}),R.jsx("button",{className:"primary",disabled:d.running||!s,onClick:ve,children:"发送"}),R.jsx("button",{className:"danger",disabled:!d.running,onClick:()=>{var v;return(v=we.current)==null?void 0:v.send("user-cancel",{})},children:"停止"})]}),R.jsxs("footer",{className:"status",children:[R.jsx("span",{children:E}),R.jsxs("span",{className:"status-right",children:[s&&re.length>0&&R.jsxs("select",{className:"model-select",value:ze||((g=re.find(v=>v.default))==null?void 0:g.name)||"",disabled:d.running,title:d.running?"轮次执行中,结束后可切换":"切换本会话模型(下一轮生效)",onChange:v=>void b(v.target.value),children:[re.map(v=>R.jsx("option",{value:v.name,children:v.name},v.nLine truncated
|
||||
<style rel="stylesheet" crossorigin>:root{--bg: #0e1013;--panel: #16191f;--panel-2: #1c2028;--border: #262b35;--fg: #e8eaed;--dim: #8b93a3;--accent: #4f8cff;--accent-dim: #2a4a85;--green: #3fb950;--red: #f85149;--amber: #d29922;--radius: 10px}*{box-sizing:border-box}html,body,#root{height:100%}body{margin:0;background:var(--bg);color:var(--fg);font:14px/1.65 -apple-system,Segoe UI,PingFang SC,Microsoft YaHei,sans-serif}button{background:var(--panel-2);color:var(--fg);border:1px solid var(--border);border-radius:8px;padding:7px 14px;cursor:pointer;font:inherit;transition:background .15s,border-color .15s}button:hover:not(:disabled){border-color:var(--accent)}button:disabled{opacity:.4;cursor:default}button.primary{background:var(--accent);border-color:var(--accent);color:#fff}button.primary:hover:not(:disabled){background:#6ba0ff}button.danger{background:transparent;border-color:var(--red);color:var(--red)}button.danger:hover:not(:disabled){background:#f851491f}button.ghost{background:transparent}button.wide{width:100%}input[type=text],textarea{background:var(--panel);color:var(--fg);border:1px solid var(--border);border-radius:8px;padding:9px 11px;font:inherit;width:100%}input[type=text]:focus,textarea:focus{outline:none;border-color:var(--accent)}.hint{color:var(--dim);font-size:12px}.pad{padding:8px}.app{display:flex;height:100vh}.side{width:272px;flex-shrink:0;border-right:1px solid var(--border);padding:14px 12px;display:flex;flex-direction:column;gap:10px;background:var(--panel)}.brand{display:flex;align-items:baseline;gap:8px;padding:0 2px 4px}.brand-name{font-size:16px;font-weight:650;letter-spacing:.2px}.sessions{flex:1;overflow-y:auto;display:flex;flex-direction:column;gap:6px}.sess{padding:9px 10px;border:1px solid var(--border);border-radius:var(--radius);cursor:pointer;background:var(--bg);transition:border-color .15s}.sess:hover,.sess.active{border-color:var(--accent)}.sess.active{background:var(--panel-2)}.sess-title{font-size:13px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.sess-meta{color:var(--dim);font-size:11px;display:flex;align-items:center;gap:5px}.sess-dir{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;max-width:130px}.dot{width:7px;height:7px;border-radius:50%;background:var(--dim);flex-shrink:0}.dot.st-running{background:var(--accent)}.dot.st-finished{background:var(--green)}.dot.st-error{background:var(--red)}.dot.st-interrupted{background:var(--amber)}.main{flex:1;display:flex;flex-direction:column;min-width:0}.tabs{display:flex;gap:2px;border-bottom:1px solid var(--border);padding:0 14px}.tab{background:transparent;border:0;border-bottom:2px solid transparent;border-radius:0;color:var(--dim);padding:10px 14px}.tab:hover{border-color:transparent;color:var(--fg)}.tab.active{color:var(--fg);border-bottom-color:var(--accent)}.log,.changes{flex:1;overflow-y:auto;padding:18px 22px}.msg{margin:10px 0;max-width:92%;word-break:break-word}.msg.user{margin-left:auto;background:var(--accent-dim);border-radius:12px 12px 3px;padding:10px 13px;white-space:pre-wrap}.msg.thought{color:var(--dim);font-size:13px;border-left:2px solid var(--border);padding-left:10px;white-space:pre-wrap}.md>:first-child{margin-top:0}.md>:last-child{margin-bottom:0}.md pre{background:var(--panel);border:1px solid var(--border);border-radius:8px;padding:10px 12px;overflow-x:auto;font-size:13px}.md code{background:var(--panel-2);border-radius:4px;padding:1px 5px;font-size:13px}.md pre code{background:transparent;padding:0}.md table{border-collapse:collapse}.md th,.md td{border:1px solid var(--border);padding:4px 10px}.md a{color:var(--accent)}.md blockquote{border-left:3px solid var(--border);margin-left:0;padding-left:12px;color:var(--dim)}.tool-block{margin:3px 0}.tool{color:var(--dim);font-size:13px;margin:3px 0;display:flex;gap:7px;align-items:baseline}.tool.sub{margin:1px 0 1px 14px;font-size:12.5px}.sub-arrow{color:var(--border)}.tool-out.live{color:var(--dim);font-style:italic}button.link{background:transparent;border:0;color:var(--accent);padding:0 4px;font-size:12px;text-decoration:underline}.child-log{overflow-y:auto;flex:1;padding-right:6px}.tool-dot.run{color:var(--accent)}.tool-dot.ok{color:var(--green)}.tool-dot.fail{color:var(--red)}.tool-name{color:#79b8ff}.tool-out{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.plan{border:1px solid var(--border);border-radius:var(--radius);padding:10px 14px;margin:10px 0;background:var(--panel);font-size:13px}.plan-item.completed{color:var(--dim);text-decoration:line-through}.plan-item.in_progress{color:var(--accent)}.plan-mark{display:inline-block;width:18px}.sysline{color:var(--dim);font-size:12px;text-align:center;margin:10px 0}.sysline.err{color:var(--red)}.perm{border:1px solid var(--amber);border-radius:var(--radius);padding:12px 14px;margin:10px 0;background:#d2992214}.perm-q{margin-bottom:9px}.perm-btns{display:flex;gap:8px;flex-wrap:wrap}.chg{display:flex;gap:9px;align-items:center;padding:7px 9px;border-radius:7px;cLine truncated
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@@ -4,6 +4,7 @@ import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"hash/fnv"
|
||||
"strings"
|
||||
"time"
|
||||
|
||||
@@ -21,8 +22,43 @@ type agentTool struct {
|
||||
}
|
||||
|
||||
// ToolName MCP 工具的内核侧名称:mcp__<server>__<tool>。
|
||||
// LLM API 要求工具名匹配 ^[a-zA-Z0-9_-]+$,server/tool 名可能含中文、点号等
|
||||
// (设置页或 mcp.json 里用户随意起名),各段先净化再拼接。
|
||||
func ToolName(server, tool string) string {
|
||||
return "mcp__" + server + "__" + tool
|
||||
return "mcp__" + sanitizePart(server) + "__" + sanitizePart(tool)
|
||||
}
|
||||
|
||||
// sanitizePart 把名字净化为 [a-zA-Z0-9_-]+:非法字符连段折叠为单个下划线;
|
||||
// 一旦发生改写,追加原名的确定性短哈希——既保证不同原名不会撞名
|
||||
// (如两个中文名都被折叠),又保证跨会话稳定(权限持久化规则不失效)。
|
||||
func sanitizePart(s string) string {
|
||||
var b strings.Builder
|
||||
dirty := false
|
||||
prevUnderscore := false
|
||||
for _, r := range s {
|
||||
valid := r == '-' || r == '_' ||
|
||||
(r >= '0' && r <= '9') || (r >= 'a' && r <= 'z') || (r >= 'A' && r <= 'Z')
|
||||
if valid {
|
||||
b.WriteRune(r)
|
||||
prevUnderscore = r == '_'
|
||||
continue
|
||||
}
|
||||
dirty = true
|
||||
if !prevUnderscore {
|
||||
b.WriteByte('_')
|
||||
prevUnderscore = true
|
||||
}
|
||||
}
|
||||
if !dirty {
|
||||
return s
|
||||
}
|
||||
h := fnv.New32a()
|
||||
_, _ = h.Write([]byte(s))
|
||||
out := strings.Trim(b.String(), "_")
|
||||
if out == "" {
|
||||
return fmt.Sprintf("x%08x", h.Sum32())
|
||||
}
|
||||
return fmt.Sprintf("%s_%08x", out, h.Sum32())
|
||||
}
|
||||
|
||||
func (t *agentTool) Name() string { return ToolName(t.server.Name, t.tool.Name) }
|
||||
|
||||
@@ -0,0 +1,41 @@
|
||||
package mcp
|
||||
|
||||
import (
|
||||
"regexp"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestToolNameSanitize(t *testing.T) {
|
||||
valid := regexp.MustCompile(`^[a-zA-Z0-9_-]+$`)
|
||||
cases := []struct{ server, tool string }{
|
||||
{"websearch", "web_search"}, // 全合法:保持原样
|
||||
{"百智搜索", "web_search"}, // 中文 server 名
|
||||
{"my.server", "tool.name"}, // 点号
|
||||
{"联网 搜索", "查 询"}, // 中文 + 空格
|
||||
{"", ""}, // 极端空名
|
||||
{"a b", "a-b"},
|
||||
}
|
||||
seen := map[string]bool{}
|
||||
for _, c := range cases {
|
||||
name := ToolName(c.server, c.tool)
|
||||
if !valid.MatchString(name) {
|
||||
t.Fatalf("ToolName(%q,%q)=%q 不匹配 LLM 工具名正则", c.server, c.tool, name)
|
||||
}
|
||||
if seen[name] {
|
||||
t.Fatalf("撞名: %q", name)
|
||||
}
|
||||
seen[name] = true
|
||||
}
|
||||
// 合法名零改写(既有 --allow/持久化规则不受影响)
|
||||
if got := ToolName("websearch", "web_search"); got != "mcp__websearch__web_search" {
|
||||
t.Fatalf("合法名被改写: %q", got)
|
||||
}
|
||||
// 确定性:同名多次调用结果一致
|
||||
if ToolName("百智搜索", "查询") != ToolName("百智搜索", "查询") {
|
||||
t.Fatal("净化结果不稳定")
|
||||
}
|
||||
// 不同原名(即使净化后骨架相同)不撞名
|
||||
if ToolName("搜索A", "t") == ToolName("搜索B", "t") {
|
||||
t.Fatal("不同原名净化后撞名")
|
||||
}
|
||||
}
|
||||
@@ -240,7 +240,8 @@ export default function App() {
|
||||
placeholder="输入任务…(Enter 发送,Shift+Enter 换行)"
|
||||
onChange={(e) => setInput(e.target.value)}
|
||||
onKeyDown={(e) => {
|
||||
if (e.key === "Enter" && !e.shiftKey) {
|
||||
// 输入法组合态(选字/确认候选)的 Enter 不发送
|
||||
if (e.key === "Enter" && !e.shiftKey && !e.nativeEvent.isComposing) {
|
||||
e.preventDefault();
|
||||
send();
|
||||
}
|
||||
@@ -386,7 +387,7 @@ function NewSessionDialog({
|
||||
value={workdir}
|
||||
placeholder="/home/you/dev/project"
|
||||
onChange={(e) => setWorkdir(e.target.value)}
|
||||
onKeyDown={(e) => e.key === "Enter" && void create()}
|
||||
onKeyDown={(e) => e.key === "Enter" && !e.nativeEvent.isComposing && void create()}
|
||||
/>
|
||||
{models.length > 1 && (
|
||||
<>
|
||||
|
||||
Reference in new issue
Block a user