@yorz/cli 0.11.1 → 0.11.3

package/dist/cli/index.js

@@ -34,7 +34,7 @@ import { ModelRuntime, SessionManager as SessionManager$1, createAgentSession }
 import { createInterface as createInterface$1 } from "node:readline/promises";
 import MarkdownIt from "markdown-it";
 const name = "@yorz/cli";
-const version = "0.11.1";
+const version = "0.11.3";
 const type = "module";
 const description = "";
 const bin = { "yorz": "./dist/cli/index.js" };
@@ -3682,6 +3682,7 @@ class PowerInhibitController {
   globalConfigPath;
   platform;
   spawnCommand;
+  watchPid;
   runningSessions = /* @__PURE__ */ new Set();
   currentMode = "system-default";
   process = null;
@@ -3689,6 +3690,7 @@ class PowerInhibitController {
   constructor(opts = {}) {
     this.globalConfigPath = opts.globalConfigPath;
     this.platform = opts.platform ?? platform();
+    this.watchPid = opts.watchPid ?? process.pid;
     this.spawnCommand = opts.spawnCommand ?? // win32 下经 withHiddenWindowsConsole 附加 windowsHide，避免 PowerShell 弹出可见控制台。
     ((command, args, options) => spawn(command, args, withHiddenWindowsConsole(options, this.platform)));
   }
@@ -3751,9 +3753,10 @@ class PowerInhibitController {
   }
   commandFor(mode) {
     if (this.platform === "darwin") {
+      const assert = mode === "prevent-display-sleep" ? "-d" : "-i";
       return {
         command: "caffeinate",
-        args: mode === "prevent-display-sleep" ? ["-d"] : ["-i"]
+        args: [assert, "-w", String(this.watchPid)]
       };
     }
     if (this.platform === "linux") {
@@ -3762,8 +3765,9 @@ class PowerInhibitController {
         args: [
           `--what=${mode === "prevent-display-sleep" ? "idle" : "idle:sleep"}`,
           "--why=YorZ agent task running",
-          "sleep",
-          "infinity"
+          "sh",
+          "-c",
+          `while kill -0 ${this.watchPid} 2>/dev/null; do sleep 2; done`
         ]
       };
     }
@@ -3776,7 +3780,7 @@ class PowerInhibitController {
           "-ExecutionPolicy",
           "Bypass",
           "-Command",
-          windowsExecutionStateScript(flags)
+          windowsExecutionStateScript(flags, this.watchPid)
         ]
       };
     }
@@ -3792,13 +3796,16 @@ class PowerInhibitController {
     }
   }
 }
-function windowsExecutionStateScript(flags) {
+function windowsExecutionStateScript(flags, watchPid) {
   return [
     `$signature = '[DllImport("kernel32.dll")] public static extern uint SetThreadExecutionState(uint esFlags);';`,
     "$native = Add-Type -MemberDefinition $signature -Name YorZPowerInhibit -Namespace YorZ -PassThru;",
     "try {",
     `  [void]$native::SetThreadExecutionState(${flags});`,
-    "  while ($true) { Start-Sleep -Seconds 3600; }",
+    "  while ($true) {",
+    `    if ($null -eq (Get-Process -Id ${watchPid} -ErrorAction SilentlyContinue)) { break; }`,
+    "    Start-Sleep -Seconds 2;",
+    "  }",
     "} finally {",
     "  [void]$native::SetThreadExecutionState(0x80000000);",
     "}"
@@ -16400,6 +16407,16 @@ function printCapabilityUrl(capabilityUrl) {
   console.log(divider);
   console.log("");
 }
+function printExposeHint(port) {
+  console.log("");
+  console.log("Expose to the internet:");
+  console.log(`  tailscale funnel --bg ${port}`);
+}
+function printStopHint() {
+  console.log("");
+  console.log("Stop the service:");
+  console.log(`  yorz serve stop`);
+}
 async function start(opts = {}) {
   const host = opts.host?.trim() || DEFAULT_HOST;
   if (!isLoopbackHost(host)) {
@@ -16439,7 +16456,7 @@ async function start(opts = {}) {
     `YorZ Service ready at ${url} (${projects.length} project${projects.length === 1 ? "" : "s"})`
   );
   printCapabilityUrl(capabilityUrl);
-  log$1().info(`Expose to the internet: tailscale funnel ${port.port}`);
+  printExposeHint(port.port);
   for (const p of projects) {
     log$1().info(`  - ${p.name} -> ${p.path}`);
   }
@@ -16555,6 +16572,7 @@ const RUNTIME_FILE = "runtime.json";
 const START_LOCK_DIR = "serve.lock";
 const START_WAIT_MS = 5e3;
 const RESTART_DELAY_MS = 500;
+const RESTART_READY_WAIT_MS = RESTART_DELAY_MS + START_WAIT_MS + 1e4;
 function backgroundStdio() {
   try {
     const dir = resolveLogDir();
@@ -16624,7 +16642,7 @@ function startBackgroundServe(opts) {
       const existing = live[0];
       console.log(`YorZ Service is already running in background (pid=${existing.pid}).`);
       console.log(`Open ${existing.url}`);
-      console.log(`Stop with: yorz serve stop`);
+      printStopHint();
       return {
         background: true,
         reused: true,
@@ -16658,11 +16676,11 @@ function startBackgroundServe(opts) {
       try {
         const masterToken = await createAuthStore().getMasterToken();
         printCapabilityUrl(`${url}?token=${masterToken}`);
-        console.log(`Expose to the internet: tailscale funnel ${port}`);
+        printExposeHint(port);
       } catch {
       }
     }
-    console.log(`Stop with: yorz serve stop`);
+    printStopHint();
     return {
       background: true,
       pid: servicePid,
@@ -16722,8 +16740,35 @@ async function runRestartServe(opts = {}) {
   }
   const entry = process.argv[1];
   if (!entry) throw new Error("Cannot resolve CLI entrypoint for restart");
+  const previousPids = new Set((await readLiveProcesses()).map((p) => p.pid));
   spawnBackgroundWorker([entry, ...restartWorkerArgs(opts)], "ignore");
   console.log(`YorZ Service restart scheduled.`);
+  const runtime = await waitForRestartedRuntime(previousPids, RESTART_READY_WAIT_MS);
+  if (!runtime) {
+    log().warn("timed out waiting for restarted runtime.json", {
+      timeoutMs: RESTART_READY_WAIT_MS
+    });
+    console.log("YorZ Service is restarting; run `yorz serve` to view the access link once ready.");
+    return;
+  }
+  console.log(`YorZ Service restarted in background (pid=${runtime.pid}).`);
+  try {
+    const masterToken = await createAuthStore().getMasterToken();
+    printCapabilityUrl(`${runtime.url}?token=${masterToken}`);
+    printExposeHint(runtime.port);
+  } catch {
+  }
+  printStopHint();
+}
+async function waitForRestartedRuntime(previousPids, timeoutMs) {
+  const until = Date.now() + timeoutMs;
+  while (Date.now() < until) {
+    const live = await readLiveProcesses();
+    const fresh = live.find((p) => !previousPids.has(p.pid));
+    if (fresh) return fresh;
+    await sleep(100);
+  }
+  return null;
 }
 async function ensureSkillsInstalledWithLog(cwd) {
   const results = await ensureSkillsInstalled({ cwd });

package/dist/gui/assets/{abnfDiagram-VRR7QNED-CrYeUOte.js → abnfDiagram-VRR7QNED-DtSU3ngQ.js}

@@ -1 +1 @@
-import{g as p,r as u,d as a}from"./chunk-MOJQB5TN-6YLCN06q.js";import{p as f}from"./chunk-JWPE2WC7-CraZ7jFm.js";import{_ as n,l as o}from"./mermaid.core-DX3ME3Gu.js";import{M as c,b as d}from"./cynefin-VYW2F7L2-s57zhU6p.js";import"./index-CIhgEaUY.js";var v=d().RailroadAbnf.parser.LangiumParser,i=n(e=>{const r=e.alternatives.map(g);return r.length===1?r[0]:{type:"choice",alternatives:r}},"transformAlternation"),g=n(e=>{const r=e.elements.map(y);return r.length===1?r[0]:{type:"sequence",elements:r}},"transformConcatenation"),b=n(e=>{if(e.includes("*")){const[t,s]=e.split("*"),l=t?parseInt(t,10):0,m=s?parseInt(s,10):1/0;return{min:l,max:m}}const r=parseInt(e,10);return{min:r,max:r}},"parseRepeat"),y=n(e=>{const r=A(e.primary);if(!e.repeat)return r;const{min:t,max:s}=b(e.repeat);return t===0&&s===1?{type:"optional",element:r}:{type:"repetition",element:r,min:t,max:s}},"transformElement"),A=n(e=>{switch(e.$type){case"AbnfStringLiteral":return{type:"terminal",value:e.value};case"AbnfNumVal":return{type:"terminal",value:e.value};case"AbnfRuleName":return{type:"nonterminal",name:e.name};case"AbnfGroup":return i(e.element);case"AbnfOptionalGroup":return{type:"optional",element:i(e.element)};default:throw new Error(`Unsupported ABNF primary node: ${e.$type}`)}},"transformPrimary"),P=n(e=>({name:e.name,definition:i(e.definition)}),"transformRule"),h=n(e=>{f(e,a),e.title&&a.setTitle(e.title),e.rules.map(r=>a.addRule(P(r)))},"populateDb"),R={parse:n(e=>{a.clear(),o.debug("[ABNF Parser] Starting Langium parse");const r=v.parse(e);if(r.lexerErrors.length>0||r.parserErrors.length>0)throw new c(r);const t=r.value;o.debug("[ABNF Parser] Parsed rules:",t.rules.length),h(t),o.debug("[ABNF Parser] Parse complete")},"parse"),parser:{yy:a}},B={parser:R,db:a,renderer:u,styles:p};export{B as diagram};
+import{g as p,r as u,d as a}from"./chunk-MOJQB5TN-CPi3KKXd.js";import{p as f}from"./chunk-JWPE2WC7-CtquO2Pi.js";import{_ as n,l as o}from"./mermaid.core-zrsL0eKy.js";import{M as c,b as d}from"./cynefin-VYW2F7L2-DFbKYidG.js";import"./index-uPv9Gxpv.js";var v=d().RailroadAbnf.parser.LangiumParser,i=n(e=>{const r=e.alternatives.map(g);return r.length===1?r[0]:{type:"choice",alternatives:r}},"transformAlternation"),g=n(e=>{const r=e.elements.map(y);return r.length===1?r[0]:{type:"sequence",elements:r}},"transformConcatenation"),b=n(e=>{if(e.includes("*")){const[t,s]=e.split("*"),l=t?parseInt(t,10):0,m=s?parseInt(s,10):1/0;return{min:l,max:m}}const r=parseInt(e,10);return{min:r,max:r}},"parseRepeat"),y=n(e=>{const r=A(e.primary);if(!e.repeat)return r;const{min:t,max:s}=b(e.repeat);return t===0&&s===1?{type:"optional",element:r}:{type:"repetition",element:r,min:t,max:s}},"transformElement"),A=n(e=>{switch(e.$type){case"AbnfStringLiteral":return{type:"terminal",value:e.value};case"AbnfNumVal":return{type:"terminal",value:e.value};case"AbnfRuleName":return{type:"nonterminal",name:e.name};case"AbnfGroup":return i(e.element);case"AbnfOptionalGroup":return{type:"optional",element:i(e.element)};default:throw new Error(`Unsupported ABNF primary node: ${e.$type}`)}},"transformPrimary"),P=n(e=>({name:e.name,definition:i(e.definition)}),"transformRule"),h=n(e=>{f(e,a),e.title&&a.setTitle(e.title),e.rules.map(r=>a.addRule(P(r)))},"populateDb"),R={parse:n(e=>{a.clear(),o.debug("[ABNF Parser] Starting Langium parse");const r=v.parse(e);if(r.lexerErrors.length>0||r.parserErrors.length>0)throw new c(r);const t=r.value;o.debug("[ABNF Parser] Parsed rules:",t.rules.length),h(t),o.debug("[ABNF Parser] Parse complete")},"parse"),parser:{yy:a}},B={parser:R,db:a,renderer:u,styles:p};export{B as diagram};

package/dist/{gui-mobile/assets/arc-COfmweHD.js → gui/assets/arc-CI62Cyo2.js}

@@ -1 +1 @@
-import{Y as ln,$ as an,a0 as F,a1 as q,a2 as j,a3 as un,a4 as y,a5 as tn,a6 as J,a7 as _,a8 as rn,a9 as o,aa as on,ab as sn,ac as fn}from"./mermaid.core-Ce5BT8um.js";function cn(l){return l.innerRadius}function yn(l){return l.outerRadius}function gn(l){return l.startAngle}function dn(l){return l.endAngle}function mn(l){return l&&l.padAngle}function pn(l,h,I,D,v,A,z,a){var O=I-l,i=D-h,n=z-v,d=a-A,u=d*O-n*i;if(!(u*u<y))return u=(n*(h-A)-d*(l-v))/u,[l+u*O,h+u*i]}function U(l,h,I,D,v,A,z){var a=l-I,O=h-D,i=(z?A:-A)/J(a*a+O*O),n=i*O,d=-i*a,u=l+n,s=h+d,f=I+n,c=D+d,B=(u+f)/2,t=(s+c)/2,m=f-u,g=c-s,R=m*m+g*g,T=v-A,P=u*c-f*s,S=(g<0?-1:1)*J(on(0,T*T*R-P*P)),Y=(P*g-m*S)/R,$=(-P*m-g*S)/R,w=(P*g+m*S)/R,p=(-P*m+g*S)/R,x=Y-B,e=$-t,r=w-B,C=p-t;return x*x+e*e>r*r+C*C&&(Y=w,$=p),{cx:Y,cy:$,x01:-n,y01:-d,x11:Y*(v/T-1),y11:$*(v/T-1)}}function hn(){var l=cn,h=yn,I=j(0),D=null,v=gn,A=dn,z=mn,a=null,O=ln(i);function i(){var n,d,u=+l.apply(this,arguments),s=+h.apply(this,arguments),f=v.apply(this,arguments)-un,c=A.apply(this,arguments)-un,B=rn(c-f),t=c>f;if(a||(a=n=O()),s<u&&(d=s,s=u,u=d),!(s>y))a.moveTo(0,0);else if(B>tn-y)a.moveTo(s*F(f),s*q(f)),a.arc(0,0,s,f,c,!t),u>y&&(a.moveTo(u*F(c),u*q(c)),a.arc(0,0,u,c,f,t));else{var m=f,g=c,R=f,T=c,P=B,S=B,Y=z.apply(this,arguments)/2,$=Y>y&&(D?+D.apply(this,arguments):J(u*u+s*s)),w=_(rn(s-u)/2,+I.apply(this,arguments)),p=w,x=w,e,r;if($>y){var C=sn($/u*q(Y)),K=sn($/s*q(Y));(P-=C*2)>y?(C*=t?1:-1,R+=C,T-=C):(P=0,R=T=(f+c)/2),(S-=K*2)>y?(K*=t?1:-1,m+=K,g-=K):(S=0,m=g=(f+c)/2)}var G=s*F(m),H=s*q(m),L=u*F(T),M=u*q(T);if(w>y){var N=s*F(g),Q=s*q(g),V=u*F(R),W=u*q(R),E;if(B<an)if(E=pn(G,H,V,W,N,Q,L,M)){var X=G-E[0],Z=H-E[1],b=N-E[0],k=Q-E[1],nn=1/q(fn((X*b+Z*k)/(J(X*X+Z*Z)*J(b*b+k*k)))/2),en=J(E[0]*E[0]+E[1]*E[1]);p=_(w,(u-en)/(nn-1)),x=_(w,(s-en)/(nn+1))}else p=x=0}S>y?x>y?(e=U(V,W,G,H,s,x,t),r=U(N,Q,L,M,s,x,t),a.moveTo(e.cx+e.x01,e.cy+e.y01),x<w?a.arc(e.cx,e.cy,x,o(e.y01,e.x01),o(r.y01,r.x01),!t):(a.arc(e.cx,e.cy,x,o(e.y01,e.x01),o(e.y11,e.x11),!t),a.arc(0,0,s,o(e.cy+e.y11,e.cx+e.x11),o(r.cy+r.y11,r.cx+r.x11),!t),a.arc(r.cx,r.cy,x,o(r.y11,r.x11),o(r.y01,r.x01),!t))):(a.moveTo(G,H),a.arc(0,0,s,m,g,!t)):a.moveTo(G,H),!(u>y)||!(P>y)?a.lineTo(L,M):p>y?(e=U(L,M,N,Q,u,-p,t),r=U(G,H,V,W,u,-p,t),a.lineTo(e.cx+e.x01,e.cy+e.y01),p<w?a.arc(e.cx,e.cy,p,o(e.y01,e.x01),o(r.y01,r.x01),!t):(a.arc(e.cx,e.cy,p,o(e.y01,e.x01),o(e.y11,e.x11),!t),a.arc(0,0,u,o(e.cy+e.y11,e.cx+e.x11),o(r.cy+r.y11,r.cx+r.x11),t),a.arc(r.cx,r.cy,p,o(r.y11,r.x11),o(r.y01,r.x01),!t))):a.arc(0,0,u,T,R,t)}if(a.closePath(),n)return a=null,n+""||null}return i.centroid=function(){var n=(+l.apply(this,arguments)+ +h.apply(this,arguments))/2,d=(+v.apply(this,arguments)+ +A.apply(this,arguments))/2-an/2;return[F(d)*n,q(d)*n]},i.innerRadius=function(n){return arguments.length?(l=typeof n=="function"?n:j(+n),i):l},i.outerRadius=function(n){return arguments.length?(h=typeof n=="function"?n:j(+n),i):h},i.cornerRadius=function(n){return arguments.length?(I=typeof n=="function"?n:j(+n),i):I},i.padRadius=function(n){return arguments.length?(D=n==null?null:typeof n=="function"?n:j(+n),i):D},i.startAngle=function(n){return arguments.length?(v=typeof n=="function"?n:j(+n),i):v},i.endAngle=function(n){return arguments.length?(A=typeof n=="function"?n:j(+n),i):A},i.padAngle=function(n){return arguments.length?(z=typeof n=="function"?n:j(+n),i):z},i.context=function(n){return arguments.length?(a=n??null,i):a},i}export{hn as d};
+import{Y as ln,$ as an,a0 as F,a1 as q,a2 as j,a3 as un,a4 as y,a5 as tn,a6 as J,a7 as _,a8 as rn,a9 as o,aa as on,ab as sn,ac as fn}from"./mermaid.core-zrsL0eKy.js";function cn(l){return l.innerRadius}function yn(l){return l.outerRadius}function gn(l){return l.startAngle}function dn(l){return l.endAngle}function mn(l){return l&&l.padAngle}function pn(l,h,I,D,v,A,z,a){var O=I-l,i=D-h,n=z-v,d=a-A,u=d*O-n*i;if(!(u*u<y))return u=(n*(h-A)-d*(l-v))/u,[l+u*O,h+u*i]}function U(l,h,I,D,v,A,z){var a=l-I,O=h-D,i=(z?A:-A)/J(a*a+O*O),n=i*O,d=-i*a,u=l+n,s=h+d,f=I+n,c=D+d,B=(u+f)/2,t=(s+c)/2,m=f-u,g=c-s,R=m*m+g*g,T=v-A,P=u*c-f*s,S=(g<0?-1:1)*J(on(0,T*T*R-P*P)),Y=(P*g-m*S)/R,$=(-P*m-g*S)/R,w=(P*g+m*S)/R,p=(-P*m+g*S)/R,x=Y-B,e=$-t,r=w-B,C=p-t;return x*x+e*e>r*r+C*C&&(Y=w,$=p),{cx:Y,cy:$,x01:-n,y01:-d,x11:Y*(v/T-1),y11:$*(v/T-1)}}function hn(){var l=cn,h=yn,I=j(0),D=null,v=gn,A=dn,z=mn,a=null,O=ln(i);function i(){var n,d,u=+l.apply(this,arguments),s=+h.apply(this,arguments),f=v.apply(this,arguments)-un,c=A.apply(this,arguments)-un,B=rn(c-f),t=c>f;if(a||(a=n=O()),s<u&&(d=s,s=u,u=d),!(s>y))a.moveTo(0,0);else if(B>tn-y)a.moveTo(s*F(f),s*q(f)),a.arc(0,0,s,f,c,!t),u>y&&(a.moveTo(u*F(c),u*q(c)),a.arc(0,0,u,c,f,t));else{var m=f,g=c,R=f,T=c,P=B,S=B,Y=z.apply(this,arguments)/2,$=Y>y&&(D?+D.apply(this,arguments):J(u*u+s*s)),w=_(rn(s-u)/2,+I.apply(this,arguments)),p=w,x=w,e,r;if($>y){var C=sn($/u*q(Y)),K=sn($/s*q(Y));(P-=C*2)>y?(C*=t?1:-1,R+=C,T-=C):(P=0,R=T=(f+c)/2),(S-=K*2)>y?(K*=t?1:-1,m+=K,g-=K):(S=0,m=g=(f+c)/2)}var G=s*F(m),H=s*q(m),L=u*F(T),M=u*q(T);if(w>y){var N=s*F(g),Q=s*q(g),V=u*F(R),W=u*q(R),E;if(B<an)if(E=pn(G,H,V,W,N,Q,L,M)){var X=G-E[0],Z=H-E[1],b=N-E[0],k=Q-E[1],nn=1/q(fn((X*b+Z*k)/(J(X*X+Z*Z)*J(b*b+k*k)))/2),en=J(E[0]*E[0]+E[1]*E[1]);p=_(w,(u-en)/(nn-1)),x=_(w,(s-en)/(nn+1))}else p=x=0}S>y?x>y?(e=U(V,W,G,H,s,x,t),r=U(N,Q,L,M,s,x,t),a.moveTo(e.cx+e.x01,e.cy+e.y01),x<w?a.arc(e.cx,e.cy,x,o(e.y01,e.x01),o(r.y01,r.x01),!t):(a.arc(e.cx,e.cy,x,o(e.y01,e.x01),o(e.y11,e.x11),!t),a.arc(0,0,s,o(e.cy+e.y11,e.cx+e.x11),o(r.cy+r.y11,r.cx+r.x11),!t),a.arc(r.cx,r.cy,x,o(r.y11,r.x11),o(r.y01,r.x01),!t))):(a.moveTo(G,H),a.arc(0,0,s,m,g,!t)):a.moveTo(G,H),!(u>y)||!(P>y)?a.lineTo(L,M):p>y?(e=U(L,M,N,Q,u,-p,t),r=U(G,H,V,W,u,-p,t),a.lineTo(e.cx+e.x01,e.cy+e.y01),p<w?a.arc(e.cx,e.cy,p,o(e.y01,e.x01),o(r.y01,r.x01),!t):(a.arc(e.cx,e.cy,p,o(e.y01,e.x01),o(e.y11,e.x11),!t),a.arc(0,0,u,o(e.cy+e.y11,e.cx+e.x11),o(r.cy+r.y11,r.cx+r.x11),t),a.arc(r.cx,r.cy,p,o(r.y11,r.x11),o(r.y01,r.x01),!t))):a.arc(0,0,u,T,R,t)}if(a.closePath(),n)return a=null,n+""||null}return i.centroid=function(){var n=(+l.apply(this,arguments)+ +h.apply(this,arguments))/2,d=(+v.apply(this,arguments)+ +A.apply(this,arguments))/2-an/2;return[F(d)*n,q(d)*n]},i.innerRadius=function(n){return arguments.length?(l=typeof n=="function"?n:j(+n),i):l},i.outerRadius=function(n){return arguments.length?(h=typeof n=="function"?n:j(+n),i):h},i.cornerRadius=function(n){return arguments.length?(I=typeof n=="function"?n:j(+n),i):I},i.padRadius=function(n){return arguments.length?(D=n==null?null:typeof n=="function"?n:j(+n),i):D},i.startAngle=function(n){return arguments.length?(v=typeof n=="function"?n:j(+n),i):v},i.endAngle=function(n){return arguments.length?(A=typeof n=="function"?n:j(+n),i):A},i.padAngle=function(n){return arguments.length?(z=typeof n=="function"?n:j(+n),i):z},i.context=function(n){return arguments.length?(a=n??null,i):a},i}export{hn as d};