chainlesschain 0.162.34 → 0.162.36

package/src/runtime/mcp-config.js

@@ -16,6 +16,11 @@
 
 import fs from "fs";
 import { MCPClient } from "../harness/mcp-client.js";
+import {
+  discoverIdeServer,
+  ideServerToMcpConfig,
+  isInIdeTerminal,
+} from "../lib/ide-bridge.js";
 
 /**
  * Normalize a parsed config object into a `{ name: serverConfig }` map.
@@ -61,21 +66,58 @@ export async function setupMcpFromConfig(servers, deps = {}) {
   const writeErr = deps.writeErr || (() => {});
   const createClient = deps.createClient || (() => new MCPClient());
 
-  const mcpClient = createClient();
-  const extraToolDefinitions = [];
-  const externalToolExecutors = {};
-  const externalToolDescriptors = {};
-  const connected = [];
+  // `deps.into` lets a second batch (e.g. registered servers) accumulate into
+  // the SAME client + channel objects as a first batch (e.g. --mcp-config), so
+  // the agent loop sees one mcpClient with every server's tools.
+  const result = deps.into || {
+    mcpClient: createClient(),
+    extraToolDefinitions: [],
+    externalToolExecutors: {},
+    externalToolDescriptors: {},
+    connected: [],
+  };
+  const {
+    mcpClient,
+    extraToolDefinitions,
+    externalToolExecutors,
+    externalToolDescriptors,
+    connected,
+  } = result;
 
   for (const [name, cfg] of Object.entries(servers)) {
-    let result;
+    // Skip a name already connected — an earlier batch (ad-hoc --mcp-config)
+    // wins over a later one (registered) on a clash.
+    if (mcpClient.servers?.has?.(name)) continue;
+    // Inject a stored OAuth bearer token for remote servers (`cc mcp login`),
+    // unless the config already supplies an Authorization header. Best-effort:
+    // no token / a refresh failure just connects unauthenticated.
+    let connectCfg = cfg;
+    if (
+      cfg.url &&
+      !cfg.headers?.Authorization &&
+      !cfg.headers?.authorization
+    ) {
+      try {
+        const { ensureValidToken } = await import("../lib/mcp-oauth.js");
+        const token = await ensureValidToken(cfg.url);
+        if (token) {
+          connectCfg = {
+            ...cfg,
+            headers: { ...cfg.headers, Authorization: `Bearer ${token}` },
+          };
+        }
+      } catch {
+        // OAuth wiring is best-effort
+      }
+    }
+    let res;
     try {
-      result = await mcpClient.connect(name, cfg);
+      res = await mcpClient.connect(name, connectCfg);
     } catch (err) {
       writeErr(`  mcp: failed to connect "${name}": ${err.message}\n`);
       continue;
     }
-    const tools = Array.isArray(result?.tools) ? result.tools : [];
+    const tools = Array.isArray(res?.tools) ? res.tools : [];
     connected.push({ server: name, tools: tools.length });
     for (const t of tools) {
       if (!t || !t.name) continue;
@@ -102,13 +144,7 @@ export async function setupMcpFromConfig(servers, deps = {}) {
     }
   }
 
-  return {
-    mcpClient,
-    extraToolDefinitions,
-    externalToolExecutors,
-    externalToolDescriptors,
-    connected,
-  };
+  return result;
 }
 
 /**
@@ -138,6 +174,116 @@ export async function loadMcpConfig(filePath, deps = {}) {
   return setupMcpFromConfig(servers, deps);
 }
 
+/**
+ * Connect MCP servers registered with `cc mcp add` (the persistent mcp_servers
+ * table). By default only `--auto-connect` servers are surfaced; pass
+ * `deps.all` for every registered server. Best-effort — returns `deps.into`
+ * (or null) on no db / no servers / any read error, never throws.
+ *
+ * @param {object} rawDb  better-sqlite3 handle (e.g. ctx.db.getDatabase())
+ * @param {object} [deps] { writeErr, all, into, makeServerConfig }
+ */
+export async function loadRegisteredMcp(rawDb, deps = {}) {
+  if (!rawDb) return deps.into || null;
+  let rows;
+  try {
+    let make = deps.makeServerConfig;
+    if (!make) {
+      const { MCPServerConfig } = await import("../harness/mcp-client.js");
+      make = (db) => new MCPServerConfig(db);
+    }
+    const cfg = make(rawDb);
+    rows = deps.all ? cfg.list() : cfg.getAutoConnect();
+  } catch {
+    return deps.into || null; // registry unavailable — non-fatal
+  }
+  const servers = {};
+  for (const r of rows || []) {
+    if (!r || !r.name) continue;
+    servers[r.name] = {
+      command: r.command,
+      args: r.args,
+      env: r.env,
+      url: r.url,
+      transport: r.transport,
+      headers: r.headers,
+    };
+  }
+  if (Object.keys(servers).length === 0) return deps.into || null;
+  return setupMcpFromConfig(servers, deps);
+}
+
+/**
+ * Discover a running IDE's MCP server (lockfile / env fast-path) and connect it
+ * as the reserved server `ide`. Best-effort: returns `deps.into` (or null) on
+ * no IDE found / bad config, never throws. An explicit user registration of a
+ * server named `ide` wins — IDE auto-discovery yields with a one-line warning.
+ *
+ * @param {object} opts  { cwd?, env?, force? }
+ * @param {object} [deps] { writeErr, into, discoverIdeServer, ideServerToMcpConfig }
+ */
+export async function loadIdeMcp(opts = {}, deps = {}) {
+  const discover = deps.discoverIdeServer || discoverIdeServer;
+  const toCfg = deps.ideServerToMcpConfig || ideServerToMcpConfig;
+  const lock = discover({
+    cwd: opts.cwd,
+    env: opts.env,
+    force: opts.force === true,
+  });
+  if (!lock) return deps.into || null;
+  if (deps.into?.mcpClient?.servers?.has?.("ide")) {
+    (deps.writeErr || (() => {}))(
+      `  ide: server "ide" already registered explicitly — ` +
+        `skipping IDE auto-discovery\n`,
+    );
+    return deps.into;
+  }
+  const cfg = toCfg(lock);
+  if (!cfg) return deps.into || null;
+  return setupMcpFromConfig({ ide: cfg }, deps);
+}
+
+/**
+ * Resolve the full MCP tool surface for one agent run: the ad-hoc
+ * `--mcp-config` file (if any) PLUS registered auto-connect servers (unless
+ * disabled) PLUS an auto-discovered IDE bridge, connected into a single client.
+ * Returns the combined `{mcpClient, extraToolDefinitions, ...}` or null when
+ * there's nothing. Throws only on a bad `--mcp-config` file (explicit request).
+ *
+ * IDE discovery: default ON only inside an IDE integrated terminal; `ide:true`
+ * (`--ide`) forces it; `ide:false` (`--no-ide`) disables it.
+ *
+ * @param {object} args { mcpConfigPath?, db?, includeRegistered=true, allRegistered=false, ide?, cwd?, env? }
+ * @param {object} [deps] { writeErr, loadMcpConfig, loadRegisteredMcp, loadIdeMcp, isInIdeTerminal }
+ */
+export async function resolveAgentMcp(args = {}, deps = {}) {
+  const doFile = deps.loadMcpConfig || loadMcpConfig;
+  const doReg = deps.loadRegisteredMcp || loadRegisteredMcp;
+  const doIde = deps.loadIdeMcp || loadIdeMcp;
+  let result = null;
+  if (args.mcpConfigPath) {
+    result = await doFile(args.mcpConfigPath, deps); // fail-fast on bad file
+  }
+  if (args.includeRegistered !== false && args.db) {
+    result = await doReg(args.db, {
+      ...deps,
+      all: args.allRegistered === true,
+      into: result || undefined,
+    });
+  }
+  if (args.ide !== false) {
+    const env = args.env || process.env;
+    const inIde = (deps.isInIdeTerminal || isInIdeTerminal)(env);
+    if (args.ide === true || inIde) {
+      result = await doIde(
+        { cwd: args.cwd, env, force: args.ide === true },
+        { ...deps, into: result || undefined },
+      );
+    }
+  }
+  return result;
+}
+
 // ─── --permission-prompt-tool (programmable headless approval) ──────────────
 //
 // Claude-Code parity: instead of headless fail-closed (auto-deny risky tools),

package/src/runtime/policies/agent-policy.js

@@ -34,6 +34,7 @@ export function resolveAgentPolicy({
     appendSystemPrompt: overrides.appendSystemPrompt || null,
     fallbackModel: overrides.fallbackModel || null,
     mcpConfig: overrides.mcpConfig || null,
+    useRegisteredMcp: overrides.useRegisteredMcp !== false,
   };
 }
 

package/src/runtime/system-prompt.js

@@ -51,10 +51,15 @@ export function resolvePromptText(value, opts = {}) {
  * @returns {string}
  */
 export function composeSystemPrompt(base, opts = {}) {
-  const { systemPrompt, appendSystemPrompt } = opts;
+  const { systemPrompt, appendSystemPrompt, outputStyle } = opts;
   let result = systemPrompt ? systemPrompt : base || "";
   if (appendSystemPrompt) {
     result = result ? `${result}\n\n${appendSystemPrompt}` : appendSystemPrompt;
   }
+  // An output-style persona (Claude-Code `/output-style`) is appended last so it
+  // colours the final behaviour without losing the base coding instructions.
+  if (outputStyle) {
+    result = result ? `${result}\n\n${outputStyle}` : outputStyle;
+  }
   return result;
 }

package/src/assets/web-panel/assets/MobileProjects-CUxONYre.js

@@ -1 +0,0 @@
-import{I as n,J as g,c as l,K as r,N as u,P as h,U as o,R as t,Q as m}from"./vendor-BvqAck49.js";import{_ as v,b}from"./index-DKquNxL2.js";import{a7 as y,M}from"./icons-DP3uiYxy.js";const B={__name:"MobileProjects",setup(p,{expose:i}){i();const c=u(),{t:e}=b();function a(){c.push("/projects")}function _(){c.push("/mobile-bridge")}const s={router:c,t:e,goToProjects:a,goToMobileBridge:_,get useRouter(){return u},get useI18n(){return b},get MobileOutlined(){return M},get FolderOutlined(){return y}};return Object.defineProperty(s,"__isScriptSetup",{enumerable:!1,value:!0}),s}},x={class:"mobile-projects-placeholder"},O={class:"title"},k={class:"subtitle"},w={class:"explainer"};function T(p,i,c,e,a,_){const s=n("a-alert"),d=n("a-button"),f=n("a-space"),P=n("a-empty"),j=n("a-card");return h(),g("div",x,[l(j,null,{default:r(()=>[l(P,{description:!1},{image:r(()=>[l(e.MobileOutlined,{style:{fontSize:"64px",color:"#bfbfbf"}})]),default:r(()=>[o("h2",O,t(e.t("mobileProjects.title")),1),o("p",k,t(e.t("mobileProjects.subtitle")),1),l(s,{message:e.t("mobileProjects.v02Banner"),type:"info","show-icon":"",class:"banner"},null,8,["message"]),o("div",w,[o("h3",null,t(e.t("mobileProjects.currentDirection")),1),o("p",null,t(e.t("mobileProjects.currentDirectionBody")),1),o("ul",null,[o("li",null,t(e.t("mobileProjects.stepPhone")),1),o("li",null,t(e.t("mobileProjects.stepTap")),1),o("li",null,t(e.t("mobileProjects.stepPull")),1)]),o("h3",null,t(e.t("mobileProjects.reverseDirection")),1),o("p",null,t(e.t("mobileProjects.reverseDirectionBody")),1)]),l(f,{class:"actions"},{default:r(()=>[l(d,{type:"primary",onClick:e.goToProjects},{default:r(()=>[l(e.FolderOutlined),m(" "+t(e.t("mobileProjects.viewLocalProjects")),1)]),_:1}),l(d,{onClick:e.goToMobileBridge},{default:r(()=>[l(e.MobileOutlined),m(" "+t(e.t("mobileProjects.checkBridge")),1)]),_:1})]),_:1})]),_:1})]),_:1})])}const N=v(B,[["render",T],["__scopeId","data-v-9262cc45"],["__file","/tmp/cc-web-panel-mVe8qC/repo/packages/web-panel/src/views/MobileProjects.vue"]]);export{N as default};

package/src/assets/web-panel/assets/Tasks-CExqxzL6.js

@@ -1 +0,0 @@
-import{E as B,b as z,r as D,I as p,J as c,U as _,c as n,K as a,S,V as w,o as P,x as V,P as i,Q as g,R as r,F as h,Z as F}from"./vendor-BvqAck49.js";import{u as R,_ as O}from"./index-DKquNxL2.js";import{R as E}from"./icons-DP3uiYxy.js";const I=B("tasks",()=>{const k=D([]),l=D(!1);let u=null,e=null;const x=z(()=>k.value.filter(t=>t.status==="running")),b=z(()=>k.value.filter(t=>t.status==="pending")),y=z(()=>k.value.filter(t=>t.status==="completed"||t.status==="failed"||t.status==="timeout"));async function f(){const t=R();l.value=!0;try{const s=await t.sendRaw({type:"tasks-list"});s&&Array.isArray(s.tasks)&&(k.value=s.tasks)}catch{}finally{l.value=!1}}async function o(t){const s=R();try{await s.sendRaw({type:"tasks-stop",taskId:t})}catch{}finally{await f()}}const d=D(null);function m(t=5e3){v(),f(),u=setInterval(f,t),T()}function v(){u&&(clearInterval(u),u=null),e&&(e(),e=null)}function T(){const t=R();if(e)return;const s=C=>{C.type==="task:notification"&&C.payload?.task&&(d.value=C.payload.task,f(),setTimeout(()=>{d.value=null},8e3))};e=t.onRuntimeEvent(s)}function N(t){return!t||t<0?"-":t<1e3?`${t}ms`:t<6e4?`${(t/1e3).toFixed(1)}s`:`${(t/6e4).toFixed(1)}m`}function A(t){switch(t){case"running":return"processing";case"pending":return"default";case"completed":return"success";case"failed":return"error";case"timeout":return"warning";default:return"default"}}return{tasks:k,loading:l,running:x,pending:b,completed:y,lastNotification:d,fetchTasks:f,stopTask:o,startPolling:m,stopPolling:v,formatDuration:N,getStatusColor:A}}),U={__name:"Tasks",setup(k,{expose:l}){l();const u=I(),e=[{title:"状态",key:"status",width:90},{title:"描述",key:"description",ellipsis:!0},{title:"类型",dataIndex:"type",width:100},{title:"耗时",key:"duration",width:90},{title:"创建时间",key:"createdAt",width:180},{title:"结果",key:"result",ellipsis:!0},{title:"操作",key:"action",width:80}];function x(o){return o.status==="running"&&o.startedAt?u.formatDuration(Date.now()-o.startedAt):o.completedAt&&o.startedAt?u.formatDuration(o.completedAt-o.startedAt):"-"}function b(o){return o?new Date(o).toLocaleString():"-"}function y(o,d){return o?o.length>d?`${o.slice(0,d)}...`:o:""}P(()=>u.startPolling(5e3)),V(()=>u.stopPolling());const f={store:u,columns:e,getDuration:x,formatTime:b,truncate:y,onMounted:P,onUnmounted:V,get ReloadOutlined(){return E},get useTasksStore(){return I}};return Object.defineProperty(f,"__isScriptSetup",{enumerable:!1,value:!0}),f}},L={class:"page-header"},j={key:0,class:"error-text"},q={key:1},J={class:"task-header"},K={class:"task-desc"},M={class:"task-id"},Q={class:"task-meta"},W=["title"],Z={key:0,class:"error-text"},G={key:1,class:"success-text"},H={key:2,class:"muted-text"};function X(k,l,u,e,x,b){const y=p("a-button"),f=p("a-space"),o=p("a-alert"),d=p("a-statistic"),m=p("a-card"),v=p("a-col"),T=p("a-row"),N=p("a-tag"),A=p("a-table");return i(),c("div",null,[_("div",L,[l[3]||(l[3]=_("div",null,[_("h2",{class:"page-title"},"后台任务"),_("p",{class:"page-sub"},"查看后台任务队列、实时通知和任务执行结果。")],-1)),n(f,null,{default:a(()=>[n(y,{ghost:"",loading:e.store.loading,onClick:l[0]||(l[0]=t=>e.store.fetchTasks())},{icon:a(()=>[n(e.ReloadOutlined)]),default:a(()=>[l[2]||(l[2]=g(" 刷新 ",-1))]),_:1},8,["loading"])]),_:1})]),e.store.lastNotification?(i(),S(o,{key:0,type:e.store.lastNotification.status==="completed"?"success":"error","show-icon":"",closable:"",class:"banner",onClose:l[1]||(l[1]=t=>e.store.lastNotification=null)},{message:a(()=>[g(" 任务"+r(e.store.lastNotification.status==="completed"?"完成":"结束")+"： "+r(e.store.lastNotification.description||e.store.lastNotification.id.slice(0,16)),1)]),description:a(()=>[e.store.lastNotification.error?(i(),c("span",j,r(e.store.lastNotification.error),1)):e.store.lastNotification.result?(i(),c("span",q,r(e.truncate(String(e.store.lastNotification.result),120)),1)):w("v-if",!0)]),_:1},8,["type"])):w("v-if",!0),n(T,{gutter:[16,16],class:"stats-row"},{default:a(()=>[n(v,{xs:12,sm:6},{default:a(()=>[n(m,{class:"stat-card",size:"small"},{default:a(()=>[n(d,{title:"全部任务",value:e.store.tasks.length},null,8,["value"])]),_:1})]),_:1}),n(v,{xs:12,sm:6},{default:a(()=>[n(m,{class:"stat-card",size:"small"},{default:a(()=>[n(d,{title:"运行中",value:e.store.running.length},null,8,["value"])]),_:1})]),_:1}),n(v,{xs:12,sm:6},{default:a(()=>[n(m,{class:"stat-card",size:"small"},{default:a(()=>[n(d,{title:"等待中",value:e.store.pending.length},null,8,["value"])]),_:1})]),_:1}),n(v,{xs:12,sm:6},{default:a(()=>[n(m,{class:"stat-card",size:"small"},{default:a(()=>[n(d,{title:"已完成",value:e.store.completed.length},null,8,["value"])]),_:1})]),_:1})]),_:1}),e.store.running.length>0?(i(),S(m,{key:1,title:"运行中的任务",class:"panel-card",size:"small"},{default:a(()=>[(i(!0),c(h,null,F(e.store.running,t=>(i(),c("div",{key:t.id,class:"task-item running"},[_("div",J,[n(N,{color:e.store.getStatusColor(t.status)},{default:a(()=>[g(r(t.status.toUpperCase()),1)]),_:2},1032,["color"]),_("span",K,r(t.description),1),_("span",M,r(t.id.slice(0,16)),1)]),_("div",Q,[_("span",null,"类型: "+r(t.type||"-"),1),_("span",null,"已运行: "+r(e.store.formatDuration(Date.now()-t.startedAt)),1),n(y,{size:"small",danger:"",onClick:s=>e.store.stopTask(t.id)},{default:a(()=>[...l[4]||(l[4]=[g("停止",-1)])]),_:1},8,["onClick"])])]))),128))]),_:1})):w("v-if",!0),n(m,{class:"panel-card"},{default:a(()=>[n(A,{columns:e.columns,"data-source":e.store.tasks,pagination:{pageSize:15,size:"small"},loading:e.store.loading,"row-key":"id",size:"small"},{bodyCell:a(({column:t,record:s})=>[t.key==="status"?(i(),S(N,{key:0,color:e.store.getStatusColor(s.status)},{default:a(()=>[g(r(s.status),1)]),_:2},1032,["color"])):t.key==="description"?(i(),c("span",{key:1,title:s.command},r(s.description),9,W)):t.key==="duration"?(i(),c(h,{key:2},[g(r(e.getDuration(s)),1)],64)):t.key==="createdAt"?(i(),c(h,{key:3},[g(r(e.formatTime(s.createdAt)),1)],64)):t.key==="result"?(i(),c(h,{key:4},[s.error?(i(),c("span",Z,r(e.truncate(s.error,60)),1)):s.result?(i(),c("span",G,r(e.truncate(String(s.result),60)),1)):(i(),c("span",H,"-"))],64)):t.key==="action"?(i(),c(h,{key:5},[s.status==="running"?(i(),S(y,{key:0,size:"small",danger:"",onClick:C=>e.store.stopTask(s.id)},{default:a(()=>[...l[5]||(l[5]=[g(" 停止 ",-1)])]),_:1},8,["onClick"])):w("v-if",!0)],64)):w("v-if",!0)]),_:1},8,["data-source","loading"])]),_:1})])}const et=O(U,[["render",X],["__scopeId","data-v-da5ff6a2"],["__file","/tmp/cc-web-panel-mVe8qC/repo/packages/web-panel/src/views/Tasks.vue"]]);export{et as default};

package/src/assets/web-panel/assets/devWarning-DQYatsRR.js

@@ -1 +0,0 @@
-import{O as r}from"./index-DKquNxL2.js";const o=((n,a,e)=>{r(n,`[ant-design-vue: ${a}] ${e}`)});export{o as d};

package/src/assets/web-panel/assets/index-Bv_y1Ud7.js

@@ -1 +0,0 @@
-import{C as o}from"./Col-Dqxb4wSE.js";import{U as t}from"./index-DKquNxL2.js";import"./vendor-BvqAck49.js";import"./index-5hlO2-JQ.js";import"./icons-DP3uiYxy.js";const s=t(o);export{s as default};

package/src/assets/web-panel/assets/index-CZZnSJEX.js

@@ -1 +0,0 @@
-import{A as o}from"./Row-ClExmBn3.js";import{U as t}from"./index-DKquNxL2.js";import"./vendor-BvqAck49.js";import"./responsiveObserve-Cf0kI_vN.js";import"./useFlexGapSupport-BdCwAfNU.js";import"./styleChecker-BLMhoHJ5.js";import"./index-5hlO2-JQ.js";import"./icons-DP3uiYxy.js";const l=t(o);export{l as default};