@simonyea/holysheep-cli 2.1.61 → 2.1.63

package/dist/configure-worker.js

@@ -3760,6 +3760,15 @@ var require_openclaw = __commonJS({
       get hint() {
         return `Bridge + Gateway \u5DF2\u914D\u7F6E\uFF0C\u9ED8\u8BA4\u6A21\u578B\u4E3A ${getConfiguredPrimaryModel() || OPENCLAW_DEFAULT_MODEL}`;
       },
+      // [v2.1.63] Top-level launchCmd so the hs web CLI panel can show a 启动 button.
+      // Returns the gateway-start command on the configured port.
+      get launchCmd() {
+        try {
+          return getLaunchCommand();
+        } catch {
+          return "openclaw gateway";
+        }
+      },
       get launchSteps() {
         const bridgePort = getConfiguredBridgePort();
         const port = getConfiguredGatewayPort();
@@ -4090,7 +4099,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@simonyea/holysheep-cli",
-      version: "2.1.61",
+      version: "2.1.63",
       description: "Claude Code/Cursor/Cline API relay for China \u2014 \xA51=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
       scripts: {
         build: "node scripts/build.mjs",

package/dist/index.js

@@ -12,7 +12,7 @@ var require_package = __commonJS({
   "package.json"(exports2, module2) {
     module2.exports = {
       name: "@simonyea/holysheep-cli",
-      version: "2.1.61",
+      version: "2.1.63",
       description: "Claude Code/Cursor/Cline API relay for China \u2014 \xA51=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
       scripts: {
         build: "node scripts/build.mjs",
@@ -4306,6 +4306,15 @@ var require_openclaw = __commonJS({
       get hint() {
         return `Bridge + Gateway \u5DF2\u914D\u7F6E\uFF0C\u9ED8\u8BA4\u6A21\u578B\u4E3A ${getConfiguredPrimaryModel() || OPENCLAW_DEFAULT_MODEL}`;
       },
+      // [v2.1.63] Top-level launchCmd so the hs web CLI panel can show a 启动 button.
+      // Returns the gateway-start command on the configured port.
+      get launchCmd() {
+        try {
+          return getLaunchCommand();
+        } catch {
+          return "openclaw gateway";
+        }
+      },
       get launchSteps() {
         const bridgePort = getConfiguredBridgePort();
         const port = getConfiguredGatewayPort();
@@ -6453,6 +6462,7 @@ var require_gemini_cli = __commonJS({
         return SETTINGS_FILE;
       },
       hint: "Gemini CLI \u4E0D\u652F\u6301 HolySheep \u4E2D\u7EE7\uFF0C\u9700\u4F7F\u7528 Google \u5B98\u65B9 Gemini API Key",
+      launchCmd: "gemini",
       installCmd: "npm install -g @google/gemini-cli",
       docsUrl: "https://github.com/google-gemini/gemini-cli",
       envVarFormat: "gemini",
@@ -9434,13 +9444,42 @@ var require_aionui_wrapper = __commonJS({
       // Only run on /guid (onboarding) and any agent-picker dialogs (we widen
       // it because the picker also appears in chat). Easy heuristic: any page.
       var nodes = document.querySelectorAll('button, li, [role=menuitem], [role=option], [role=listitem], div');
+      var geminiNodes = [];
       for(var i=0;i<nodes.length;i++){
         var hit = shouldHide(nodes[i]);
         if(hit){
           nodes[i].style.display='none';
           nodes[i].dataset.hsHidden=hit;
+          continue;
         }
-      }
+        // [v2.1.62] Move Gemini to the end of its sibling list. gemini is an
+        // AionUi-internal agent (not in acpTypes), so the .sort() injected
+        // there can't reach it. Detect by exact-ish text match and re-parent.
+        if(!nodes[i].dataset.hsMovedGemini){
+          var t = (nodes[i].textContent||'').trim();
+          // Match "Gemini" / "Gemini CLI" / "Gemini API" but not "gemini-with-google-auth" deep DOM
+          if(t.length<=40 && /^Gemini( |$|CLI|API|-)/i.test(t)){
+            // Pick the right granularity: a leaf-ish picker item, not the page heading
+            var role = nodes[i].getAttribute && nodes[i].getAttribute('role');
+            var tag = nodes[i].tagName;
+            var isPick = role==='menuitem'||role==='option'||role==='listitem'||tag==='LI'||tag==='BUTTON'||
+                         (tag==='DIV'&&nodes[i].children.length<=8&&t.length<60);
+            if(isPick) geminiNodes.push(nodes[i]);
+          }
+        }
+      }
+      // Re-parent each gemini item to be the last child of its parent. Done
+      // after the scan so we don't perturb iteration. Tag dataset to avoid
+      // re-moving on the next observer tick.
+      geminiNodes.forEach(function(g){
+        try{
+          var p = g.parentNode;
+          if(!p) return;
+          if(p.lastChild===g){g.dataset.hsMovedGemini='1';return}
+          p.appendChild(g); // moves existing node to the end
+          g.dataset.hsMovedGemini='1';
+        }catch(e){}
+      });
     }
     sweep();
     if(typeof MutationObserver==='function'){
@@ -9479,9 +9518,13 @@ var require_aionui_wrapper = __commonJS({
           var statusBadge=t.installed?(t.configured?'<span style="color:#22c55e">\u25CF\u5DF2\u914D\u7F6E</span>':'<span style="color:#f59e0b">\u25CF\u5DF2\u88C5\u672A\u914D\u7F6E</span>'):'<span style="color:#9ca3af">\u25CB\u672A\u5B89\u88C5</span>';
           var verText=t.version?'<span style="color:#888;font-size:11px">v'+t.version+'</span>':'';
           var btns='';
-          if(!t.installed&&t.canAutoInstall)btns+='<button data-act="install" data-id="'+t.id+'" style="margin-left:6px;padding:3px 8px;font-size:11px;background:#3b82f6;color:#fff;border:0;border-radius:3px;cursor:pointer">\u5B89\u88C5</button>';
-          if(t.installed&&t.canUpgrade)btns+='<button data-act="upgrade" data-id="'+t.id+'" style="margin-left:6px;padding:3px 8px;font-size:11px;background:#22c55e;color:#fff;border:0;border-radius:3px;cursor:pointer">\u5347\u7EA7</button>';
-          if(t.installed&&!t.configured)btns+='<button data-act="configure" data-id="'+t.id+'" style="margin-left:6px;padding:3px 8px;font-size:11px;background:#8b5cf6;color:#fff;border:0;border-radius:3px;cursor:pointer">\u914D\u7F6E</button>';
+          var btnSty='margin-left:4px;padding:3px 8px;font-size:11px;color:#fff;border:0;border-radius:3px;cursor:pointer';
+          if(!t.installed&&t.canAutoInstall)btns+='<button data-act="install" data-id="'+t.id+'" style="'+btnSty+';background:#3b82f6">\u5B89\u88C5</button>';
+          // [v2.1.63] Always show \u5347\u7EA7 button for any installed canUpgrade tool
+          if(t.installed&&t.canUpgrade)btns+='<button data-act="upgrade" data-id="'+t.id+'" style="'+btnSty+';background:#22c55e">\u5347\u7EA7</button>';
+          if(t.installed&&!t.configured)btns+='<button data-act="configure" data-id="'+t.id+'" style="'+btnSty+';background:#8b5cf6">\u914D\u7F6E</button>';
+          // [v2.1.63] \u542F\u52A8 button \u2014 installed + has launchCmd (covers OpenClaw etc.)
+          if(t.installed&&t.launchCmd)btns+='<button data-act="launch" data-id="'+t.id+'" style="'+btnSty+';background:#f59e0b">\u542F\u52A8</button>';
           return '<div style="padding:8px 0;border-bottom:1px solid #eee;display:flex;justify-content:space-between;align-items:center"><div><b>'+t.name+'</b> '+statusBadge+' '+verText+'</div><div>'+btns+'</div></div>';
         }).join('')+'<div style="padding-top:10px"><button id="hs-cli-upgrade-all" style="width:100%;padding:8px;background:#16a34a;color:#fff;border:0;border-radius:4px;cursor:pointer;font-weight:600">\u4E00\u952E\u5347\u7EA7\u5168\u90E8\u5DF2\u5B89\u88C5\u7684 CLI</button></div>';
         Array.prototype.forEach.call(panel.querySelectorAll('button[data-act]'),function(b){
@@ -9491,6 +9534,33 @@ var require_aionui_wrapper = __commonJS({
         if(allBtn)allBtn.addEventListener('click',function(){runAllUpgrade(allBtn)});
       }
       function runAction(act,id,b){
+        // [v2.1.63] launch returns plain JSON (not SSE) with { url, ... }
+        if(act==='launch'){
+          b.disabled=true;b.style.opacity='.5';b.textContent='\u542F\u52A8\u4E2D...';
+          logEl.style.display='block';logEl.textContent='\u6B63\u5728\u542F\u52A8 '+id+'...\\n';
+          fetch('/api/holysheep/tool/launch',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({toolId:id})})
+            .then(function(r){return r.json()})
+            .then(function(j){
+              b.disabled=false;b.style.opacity='1';
+              if(j&&j.url){
+                logEl.textContent+='\u5DF2\u542F\u52A8: '+j.url+'\\n';
+                b.textContent='\u2713 \u5DF2\u542F\u52A8';
+                try{ window.open(j.url,'_blank') }catch(e){}
+              }else if(j&&j.success===false){
+                logEl.textContent+='\u542F\u52A8\u5931\u8D25: '+(j.message||j.error||'unknown')+'\\n';
+                b.textContent='\u2717 \u5931\u8D25 (\u91CD\u8BD5)';
+              }else{
+                logEl.textContent+=JSON.stringify(j)+'\\n';
+                b.textContent='\u2713 \u5DF2\u542F\u52A8';
+              }
+              setTimeout(loadTools,500);
+            })
+            .catch(function(e){
+              b.disabled=false;b.style.opacity='1';b.textContent='\u2717 \u5931\u8D25 (\u91CD\u8BD5)';
+              logEl.textContent+='\u8BF7\u6C42\u5931\u8D25: '+e.message+'\\n';
+            });
+          return;
+        }
         b.disabled=true;b.style.opacity='.5';b.textContent=act==='install'?'\u5B89\u88C5\u4E2D...':act==='upgrade'?'\u5347\u7EA7\u4E2D...':'\u914D\u7F6E\u4E2D...';
         logEl.style.display='block';logEl.textContent='';
         var path=act==='install'?'tool/install':act==='upgrade'?'tool/upgrade':'tool/configure';
@@ -9589,7 +9659,7 @@ var require_aionui_wrapper = __commonJS({
         const re = new RegExp(`(${id}:\\{[^{}]*?enabled:)!0`, "g");
         out = out.replace(re, "$1!1");
       }
-      const PRIORITY = ["codex", "claude", "opencode"];
+      const PRIORITY = ["codex", "claude", "opencode", "droid"];
       const priorityJs = JSON.stringify(PRIORITY);
       const filterMapRe = /(Object\.entries\([a-z]\)\.filter\(\([^)]*\)=>[^)]*\))\.map\(/;
       const m = out.match(filterMapRe);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.1.61",
+  "version": "2.1.63",
   "description": "Claude Code/Cursor/Cline API relay for China — ¥1=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
   "scripts": {
     "build": "node scripts/build.mjs",