diff --git a/agent/cmd/mc-agent/uidist/index.html b/agent/cmd/mc-agent/uidist/index.html index 2a495125..d552cbfa 100644 --- a/agent/cmd/mc-agent/uidist/index.html +++ b/agent/cmd/mc-agent/uidist/index.html @@ -103,7 +103,7 @@ ${u} Please report this to https://github.com/markedjs/marked.`,u){const c="

An error occurred:

"+fn(s.message+"",!0)+"
";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.name===ze)&&R.jsx("option",{value:ze,children:ze})]}),d.usage?`上下文 ${d.usage.used} / ${d.usage.size} tokens`:""]})]})]}),Q&&R.jsx("div",{className:"modal-backdrop",onClick:()=>F(null),children:R.jsxs("div",{className:"modal",onClick:v=>v.stopPropagation(),children:[R.jsxs("div",{className:"modal-head",children:[R.jsx("b",{children:Q.path}),R.jsx("button",{className:"ghost",onClick:()=>F(null),children:"关闭"})]}),R.jsx(ym,{text:Q.text})]})}),ie&&R.jsx("div",{className:"modal-backdrop",onClick:()=>ye(null),children:R.jsxs("div",{className:"modal",onClick:v=>v.stopPropagation(),children:[R.jsxs("div",{className:"modal-head",children:[R.jsxs("b",{children:["子代理会话 ",ie]}),R.jsx("button",{className:"ghost",onClick:()=>ye(null),children:"关闭"})]}),R.jsx(km,{id:ie})]})}),le&&R.jsx(wm,{models:re,onClose:()=>Ce(!1),onCreated:v=>{Ce(!1),De().then(()=>be(v.id,v.model))}})]})}function km({id:u}){const[o,s]=ce.useState(_u),[c,d]=ce.useState("连接中…");return ce.useEffect(()=>{const h=If(u,{onFrames:E=>s(k=>Kf(k,E)),onStatus:E=>d(E)});return()=>h.close()},[u]),R.jsxs("div",{className:"child-log",children:[R.jsx("div",{className:"hint",children:c}),o.items.map((h,E)=>R.jsx(bf,{item:h,onPermAnswer:()=>{}},E))]})}function wm({models:u,onClose:o,onCreated:s}){var Q;const[c,d]=ce.useState(""),[h,E]=ce.useState(!1),[k,C]=ce.useState(((Q=u.find(F=>F.default))==null?void 0:Q.name)??""),[S,N]=ce.useState(""),[M,A]=ce.useState(!1),J=async()=>{if(!(!c.trim()||M)){A(!0),N("");try{s(await Bp(c.trim(),h,k))}catch(F){N("创建失败: "+(F instanceof Error?F.message:F)),A(!1)}}};return R.jsx("div",{className:"modal-backdrop",onClick:o,children:R.jsxs("div",{className:"modal narrow",onClick:F=>F.stopPropagation(),children:[R.jsx("h3",{children:"新建会话"}),R.jsx("p",{className:"hint",children:"工作区目录(本机绝对路径)"}),R.jsx("input",{type:"text",autoFocus:!0,value:c,placeholder:"/home/you/dev/project",onChange:F=>d(F.target.value),onKeyDown:F=>F.key==="Enter"&&void J()}),u.length>1&&R.jsxs(R.Fragment,{children:[R.jsx("p",{className:"hint",style:{marginTop:12},children:"模型"}),R.jsx("select",{className:"model-select wide",value:k,onChange:F=>C(F.target.value),children:u.map(F=>R.jsxs("option",{value:F.name,children:[F.name,F.default?"(默认)":""]},F.name))})]}),R.jsxs("label",{className:"hint check",children:[R.jsx("input",{type:"checkbox",checked:h,onChange:F=>E(F.target.checked)}),"在隔离 worktree 中执行(需为 git 仓库)"]}),S&&R.jsx("div",{className:"sysline err",children:S}),R.jsxs("div",{className:"modal-actions",children:[R.jsx("button",{className:"ghost",onClick:o,children:"取消"}),R.jsx("button",{className:"primary",disabled:M,onClick:()=>void J(),children:"创建"})]})]})})}Fp.createRoot(document.getElementById("root")).render(R.jsx(ce.StrictMode,{children:R.jsx(vm,{})})); +`]},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.name)),ze&&!re.some(v=>v.name===ze)&&R.jsx("option",{value:ze,children:ze})]}),d.usage?`上下文 ${d.usage.used} / ${d.usage.size} tokens`:""]})]})]}),Q&&R.jsx("div",{className:"modal-backdrop",onClick:()=>F(null),children:R.jsxs("div",{className:"modal",onClick:v=>v.stopPropagation(),children:[R.jsxs("div",{className:"modal-head",children:[R.jsx("b",{children:Q.path}),R.jsx("button",{className:"ghost",onClick:()=>F(null),children:"关闭"})]}),R.jsx(ym,{text:Q.text})]})}),ie&&R.jsx("div",{className:"modal-backdrop",onClick:()=>ye(null),children:R.jsxs("div",{className:"modal",onClick:v=>v.stopPropagation(),children:[R.jsxs("div",{className:"modal-head",children:[R.jsxs("b",{children:["子代理会话 ",ie]}),R.jsx("button",{className:"ghost",onClick:()=>ye(null),children:"关闭"})]}),R.jsx(km,{id:ie})]})}),le&&R.jsx(wm,{models:re,onClose:()=>Ce(!1),onCreated:v=>{Ce(!1),De().then(()=>be(v.id,v.model))}})]})}function km({id:u}){const[o,s]=ce.useState(_u),[c,d]=ce.useState("连接中…");return ce.useEffect(()=>{const h=If(u,{onFrames:E=>s(k=>Kf(k,E)),onStatus:E=>d(E)});return()=>h.close()},[u]),R.jsxs("div",{className:"child-log",children:[R.jsx("div",{className:"hint",children:c}),o.items.map((h,E)=>R.jsx(bf,{item:h,onPermAnswer:()=>{}},E))]})}function wm({models:u,onClose:o,onCreated:s}){var Q;const[c,d]=ce.useState(""),[h,E]=ce.useState(!1),[k,C]=ce.useState(((Q=u.find(F=>F.default))==null?void 0:Q.name)??""),[S,N]=ce.useState(""),[M,A]=ce.useState(!1),J=async()=>{if(!(!c.trim()||M)){A(!0),N("");try{s(await Bp(c.trim(),h,k))}catch(F){N("创建失败: "+(F instanceof Error?F.message:F)),A(!1)}}};return R.jsx("div",{className:"modal-backdrop",onClick:o,children:R.jsxs("div",{className:"modal narrow",onClick:F=>F.stopPropagation(),children:[R.jsx("h3",{children:"新建会话"}),R.jsx("p",{className:"hint",children:"工作区目录(本机绝对路径)"}),R.jsx("input",{type:"text",autoFocus:!0,value:c,placeholder:"/home/you/dev/project",onChange:F=>d(F.target.value),onKeyDown:F=>F.key==="Enter"&&!F.nativeEvent.isComposing&&void J()}),u.length>1&&R.jsxs(R.Fragment,{children:[R.jsx("p",{className:"hint",style:{marginTop:12},children:"模型"}),R.jsx("select",{className:"model-select wide",value:k,onChange:F=>C(F.target.value),children:u.map(F=>R.jsxs("option",{value:F.name,children:[F.name,F.default?"(默认)":""]},F.name))})]}),R.jsxs("label",{className:"hint check",children:[R.jsx("input",{type:"checkbox",checked:h,onChange:F=>E(F.target.checked)}),"在隔离 worktree 中执行(需为 git 仓库)"]}),S&&R.jsx("div",{className:"sysline err",children:S}),R.jsxs("div",{className:"modal-actions",children:[R.jsx("button",{className:"ghost",onClick:o,children:"取消"}),R.jsx("button",{className:"primary",disabled:M,onClick:()=>void J(),children:"创建"})]})]})})}Fp.createRoot(document.getElementById("root")).render(R.jsx(ce.StrictMode,{children:R.jsx(vm,{})})); diff --git a/agent/internal/mcp/tool.go b/agent/internal/mcp/tool.go index 1fa95e3d..0343baed 100644 --- a/agent/internal/mcp/tool.go +++ b/agent/internal/mcp/tool.go @@ -4,6 +4,7 @@ import ( "context" "encoding/json" "fmt" + "hash/fnv" "strings" "time" @@ -21,8 +22,43 @@ type agentTool struct { } // ToolName MCP 工具的内核侧名称:mcp____。 +// 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) } diff --git a/agent/internal/mcp/tool_test.go b/agent/internal/mcp/tool_test.go new file mode 100644 index 00000000..888390e8 --- /dev/null +++ b/agent/internal/mcp/tool_test.go @@ -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("不同原名净化后撞名") + } +} diff --git a/agent/ui/src/App.tsx b/agent/ui/src/App.tsx index 9664bb2d..b5c26b5c 100644 --- a/agent/ui/src/App.tsx +++ b/agent/ui/src/App.tsx @@ -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 && ( <>