@yorz/cli 0.9.2 → 0.9.3

package/dist/cli/index.js

@@ -7,11 +7,11 @@ import { createHash, randomUUID, randomBytes } from "node:crypto";
 import { existsSync, openSync, closeSync, statSync, readSync, mkdirSync, watch, createReadStream } from "node:fs";
 import { execFile, spawn, execFileSync } from "node:child_process";
 import { promisify } from "node:util";
+import { fileURLToPath } from "node:url";
 import { serve } from "@hono/node-server";
 import { isIP } from "node:net";
 import { Hono } from "hono";
 import { streamSSE } from "hono/streaming";
-import { fileURLToPath } from "node:url";
 import trash from "trash";
 import matter from "gray-matter";
 import chokidar from "chokidar";
@@ -23,7 +23,7 @@ import { createOpencode } from "@opencode-ai/sdk";
 import { createInterface as createInterface$1 } from "node:readline/promises";
 import MarkdownIt from "markdown-it";
 const name = "@yorz/cli";
-const version = "0.9.2";
+const version = "0.9.3";
 const type = "module";
 const description = "";
 const bin = { "yorz": "./dist/cli/index.js" };
@@ -2352,12 +2352,6 @@ function normalizeAgent(value) {
   if (kind === "inherit") return { kind: "inherit" };
   if (kind === "opencode") return { kind: "opencode" };
   if (kind === "codex") return { kind: "codex" };
-  if (kind === "custom") {
-    const cmd = typeof obj.cmd === "string" ? obj.cmd.trim() : "";
-    if (!cmd) return { kind: "claude" };
-    const args = Array.isArray(obj.args) ? obj.args.filter((a) => typeof a === "string") : [];
-    return { kind: "custom", cmd, args };
-  }
   return { kind: "claude" };
 }
 function normalizeSpecsDir(value) {
@@ -3595,27 +3589,7 @@ function parseAgent(value) {
   if (kind === "claude") return { value: { kind: "claude" } };
   if (kind === "opencode") return { value: { kind: "opencode" } };
   if (kind === "codex") return { value: { kind: "codex" } };
-  if (kind === "custom") {
-    const cmd = obj.cmd;
-    if (typeof cmd !== "string" || !cmd.trim()) {
-      return { error: "agent.cmd required when kind=custom" };
-    }
-    if (cmd.length > 500) return { error: "agent.cmd too long (max 500)" };
-    const argsRaw = obj.args;
-    let args = [];
-    if (argsRaw !== void 0) {
-      if (!Array.isArray(argsRaw)) return { error: "agent.args must be an array of strings" };
-      args = [];
-      for (const a of argsRaw) {
-        if (typeof a !== "string") return { error: "agent.args entries must be strings" };
-        if (a.length > 500) return { error: "agent.args entry too long (max 500)" };
-        args.push(a);
-      }
-      if (args.length > 64) return { error: "agent.args too many entries (max 64)" };
-    }
-    return { value: { kind: "custom", cmd: cmd.trim(), args } };
-  }
-  return { error: "agent.kind must be inherit | claude | opencode | codex | custom" };
+  return { error: "agent.kind must be inherit | claude | opencode | codex" };
 }
 function parseSpecsDir(value) {
   const fallback = defaultProjectConfig().specsDir;
@@ -7265,7 +7239,19 @@ class OpenCodeAdapter {
   booting = null;
   async ensure() {
     if (!this.booting) {
-      this.booting = createOpencode({ hostname: "127.0.0.1" }).catch((err) => {
+      this.booting = createOpencode({
+        hostname: "127.0.0.1",
+        port: 0,
+        config: {
+          permission: {
+            edit: "allow",
+            bash: "allow",
+            webfetch: "allow",
+            doom_loop: "allow",
+            external_directory: "allow"
+          }
+        }
+      }).catch((err) => {
         this.booting = null;
         throw err;
       });
@@ -8524,17 +8510,14 @@ function startBackgroundServe(opts) {
     const entry = process.argv[1];
     if (!entry) throw new Error("Cannot resolve CLI entrypoint for background service");
     const stdio = backgroundStdio();
-    const child = spawnWithoutWindow(process.execPath, [entry, "serve", ...backgroundArgs(opts)], {
-      detached: true,
-      stdio: stdio.stdio
-    });
-    child.unref();
+    const child = spawnBackgroundWorker([entry, "serve", ...backgroundArgs(opts)], stdio.stdio);
     log().info("background service spawned", {
       pid: child.pid,
+      viaLauncher: process.platform === "win32",
       stdioFile: stdio.path,
       logFile: getLogger().filePath
     });
-    const runtime = await waitForRuntime(child.pid, START_WAIT_MS);
+    const runtime = await waitForRuntime(void 0, START_WAIT_MS);
     if (!runtime) {
       log().warn("timed out waiting for runtime.json", {
         pid: child.pid,
@@ -8543,12 +8526,13 @@ function startBackgroundServe(opts) {
     }
     const port = runtime?.port ?? opts.port ?? DEFAULT_SERVE_PORT;
     const url = runtime?.url ?? `http://localhost:${port}/`;
-    console.log(`YorZ Service started in background (pid=${child.pid ?? "unknown"}).`);
+    const servicePid = runtime?.pid ?? child.pid;
+    console.log(`YorZ Service started in background (pid=${servicePid ?? "unknown"}).`);
     console.log(`Open ${url}${runtime ? "" : ` (or the next free port if ${port} is busy).`}`);
     console.log(`Stop with: yorz serve stop`);
     return {
       background: true,
-      pid: child.pid,
+      pid: servicePid,
       url,
       port
     };
@@ -8575,6 +8559,26 @@ function restartWorkerArgs(opts) {
   args.push("--skip-skill-check");
   return args;
 }
+function resolveServeLauncherPath() {
+  return join(dirname(fileURLToPath(import.meta.url)), "serve-launcher.cjs");
+}
+function backgroundWorkerSpawnArgv(launcherPath, execPath, workerArgv) {
+  return [launcherPath, "--", execPath, ...workerArgv];
+}
+function spawnBackgroundWorker(workerArgv, stdio) {
+  if (process.platform === "win32") {
+    const launcher = spawnWithoutWindow(
+      process.execPath,
+      backgroundWorkerSpawnArgv(resolveServeLauncherPath(), process.execPath, workerArgv),
+      { detached: true, stdio }
+    );
+    launcher.unref();
+    return launcher;
+  }
+  const child = spawnWithoutWindow(process.execPath, workerArgv, { detached: true, stdio });
+  child.unref();
+  return child;
+}
 async function runRestartServe(opts = {}) {
   silenceConsoleMirror();
   if (opts.worker) {
@@ -8585,12 +8589,8 @@ async function runRestartServe(opts = {}) {
   }
   const entry = process.argv[1];
   if (!entry) throw new Error("Cannot resolve CLI entrypoint for restart");
-  const child = spawnWithoutWindow(process.execPath, [entry, ...restartWorkerArgs(opts)], {
-    detached: true,
-    stdio: "ignore"
-  });
-  child.unref();
-  console.log(`YorZ Service restart scheduled (pid=${child.pid ?? "unknown"}).`);
+  spawnBackgroundWorker([entry, ...restartWorkerArgs(opts)], "ignore");
+  console.log(`YorZ Service restart scheduled.`);
 }
 async function ensureSkillsInstalledWithLog(cwd) {
   const results = await ensureSkillsInstalled({ cwd });
@@ -8762,7 +8762,7 @@ async function waitForRuntime(pid, timeoutMs) {
   const until = Date.now() + timeoutMs;
   while (Date.now() < until) {
     const live = await readLiveProcesses();
-    const match = live.find((p) => pid === void 0 || p.pid === pid);
+    const match = live.find((p) => pid === void 0);
     if (match) return match;
     await sleep(100);
   }
@@ -8923,12 +8923,18 @@ async function readWindowsProcessSnapshot(pid) {
       "if ($null -eq $p) { exit 1 }",
       "$p | Select-Object CommandLine,CreationDate | ConvertTo-Json -Compress"
     ].join("; ");
-    const { stdout } = await execFileAsync("powershell.exe", [
-      "-NoProfile",
-      "-NonInteractive",
-      "-Command",
-      script
-    ]);
+    const { stdout } = await execFileAsync(
+      "powershell.exe",
+      [
+        "-NoProfile",
+        "-NonInteractive",
+        "-Command",
+        script
+      ],
+      // 后台 Service 进程（detached，无控制台）内执行时，缺 windowsHide 会弹出
+      // 可见的 PowerShell 窗口；前台终端调用则继承控制台，本就无影响。
+      { windowsHide: true }
+    );
     const parsed = JSON.parse(stdout.trim());
     const commandLine = typeof parsed.CommandLine === "string" ? parsed.CommandLine : "";
     const processStartedAt = typeof parsed.CreationDate === "string" ? parsed.CreationDate : void 0;

package/dist/cli/serve-launcher.cjs

@@ -0,0 +1,56 @@
+/**
+ * Windows 后台 Service 的中间 launcher（CommonJS，不参与打包，构建时原样复制到
+ * dist/cli/）。
+ *
+ * 为什么需要它：后台 worker 若以 DETACHED_PROCESS 直接启动，进程没有任何控制台，
+ * 它内部 SDK 裸 spawn 的 console 子程序（codex / opencode server 等）会被
+ * Windows 分配**可见**控制台——这就是启动服务 / 切 session 时闪现空白 cmd 弹窗
+ * 的根源。
+ *
+ * 解法：launcher 用 CREATE_NO_WINDOW（Node 的 windowsHide + 非 detached）拉起
+ * worker。CREATE_NO_WINDOW 的进程持有一个"无窗口的控制台"，worker 内 SDK 裸
+ * spawn 的 console 子程序继承它，不再新建可见窗口。
+ *
+ * launcher 随后**驻留为 worker 的父进程守卫**：不主动退出，直到 worker 退出才
+ * 退出（并把 worker 的退出状态写入 stderr，即 serve-stdio.log）。这样 worker
+ * 始终是有父进程的普通子进程，不依赖"孤儿进程在各类终端/安全软件环境下能否
+ * 存活"的语义差异；`yorz serve stop` 终止 worker 后 launcher 自然退出，不残留。
+ * 代价是常驻一个空闲的 node 进程。
+ *
+ * 用法：node serve-launcher.cjs -- <execPath> <workerArgs...>
+ * worker 的 stdio 通过 'inherit' 接管 launcher 的 fd 0/1/2，而 launcher 自身的
+ * stdio 由调用方（serve.ts）定向到服务日志文件——worker 的未捕获输出因此仍落
+ * 到 serve-stdio.log，与旧的直接传 fd 语义一致。
+ *
+ * 已知坑（实测）：worker 的 stdio 不能用 `stdio: ['ignore', 1, 2]` 数字 fd
+ * 形式——Windows 上该路径的 handle 传递会让 worker 静默死在初始化阶段；
+ * 'inherit' 走 libuv 的专门路径，实测正常。
+ */
+'use strict'
+
+const { spawn } = require('child_process')
+
+const sep = process.argv.indexOf('--')
+const workerArgv = sep === -1 ? [] : process.argv.slice(sep + 1)
+if (workerArgv.length < 2) {
+  process.stderr.write('[serve-launcher] missing worker argv after "--"\n')
+  process.exit(1)
+}
+// workerArgv 形如 [execPath, ...args]；spawn 的 file 与 args 必须拆开——
+// 若把 execPath 留在 args 里，node 会把它当作脚本路径执行而立即失败。
+const [workerExecutable, ...workerArgs] = workerArgv
+
+// 关键：非 detached + windowsHide => CREATE_NO_WINDOW => worker 拥有无窗口控制台。
+const child = spawn(workerExecutable, workerArgs, {
+  windowsHide: true,
+  stdio: 'inherit',
+})
+child.once('error', (err) => {
+  process.stderr.write(`[serve-launcher] failed to start worker: ${err}\n`)
+  process.exit(1)
+})
+child.once('exit', (code, signal) => {
+  // worker 无论正常停止还是崩溃，launcher 都随之退出，保持父进程树干净。
+  process.stderr.write(`[serve-launcher] worker exited code=${code} signal=${signal}\n`)
+  process.exit(0)
+})

package/dist/gui/assets/{abnfDiagram-VRR7QNED-CvFCe3r_.js → abnfDiagram-VRR7QNED-BXdYbq3y.js}

@@ -1 +1 @@
-import{g as p,r as u,d as a}from"./chunk-MOJQB5TN-CC4tXc_1.js";import{p as f}from"./chunk-JWPE2WC7-wFaiogOx.js";import{_ as n,l as o}from"./mermaid.core-rkuoyu1Y.js";import{M as c,b as d}from"./cynefin-VYW2F7L2-BKxPBlKv.js";import"./index-CkGO8Fpq.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-kCAEgJRp.js";import{p as f}from"./chunk-JWPE2WC7-BjMvMllJ.js";import{_ as n,l as o}from"./mermaid.core-_0eTmAI-.js";import{M as c,b as d}from"./cynefin-VYW2F7L2-DzMBSujh.js";import"./index-oIjkNbg4.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-BBWQwcOX.js → gui/assets/arc-BDaL1Z0T.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-Cery4OJZ.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-_0eTmAI-.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};