@rashidee/co2 1.3.30 → 1.3.32

package/dist/index.js

@@ -6809,8 +6809,8 @@ var {
 // package.json
 var package_default = {
   name: "@rashidee/co2",
-  version: "1.3.30",
-  description: "Compound Context Studio \xC3\u0192\xC6\u2019\xC3\u2020\xE2\u20AC\u2122\xC3\u0192\xE2\u20AC\u0161\xC3\u201A\xC2\xA2\xC3\u0192\xC6\u2019\xC3\u201A\xC2\xA2\xC3\u0192\xC2\xA2\xC3\xA2\xE2\u20AC\u0161\xC2\xAC\xC3\u2026\xC2\xA1\xC3\u0192\xE2\u20AC\u0161\xC3\u201A\xC2\xAC\xC3\u0192\xC6\u2019\xC3\u201A\xC2\xA2\xC3\u0192\xC2\xA2\xC3\xA2\xE2\u201A\xAC\xC5\xA1\xC3\u201A\xC2\xAC\xC3\u0192\xE2\u20AC\u0161\xC3\u201A\xC2\x9D self-hosted team context authoring for CO2 projects",
+  version: "1.3.32",
+  description: "Compound Context Studio \xC3\u0192\xC6\u2019\xC3\u2020\xE2\u20AC\u2122\xC3\u0192\xE2\u20AC\xA0\xC3\xA2\xE2\u201A\xAC\xE2\u201E\xA2\xC3\u0192\xC6\u2019\xC3\xA2\xE2\u201A\xAC\xC2\xA0\xC3\u0192\xC2\xA2\xC3\xA2\xE2\u20AC\u0161\xC2\xAC\xC3\xA2\xE2\u20AC\u017E\xC2\xA2\xC3\u0192\xC6\u2019\xC3\u2020\xE2\u20AC\u2122\xC3\u0192\xC2\xA2\xC3\xA2\xE2\u20AC\u0161\xC2\xAC\xC3\u2026\xC2\xA1\xC3\u0192\xC6\u2019\xC3\xA2\xE2\u201A\xAC\xC5\xA1\xC3\u0192\xE2\u20AC\u0161\xC3\u201A\xC2\xA2\xC3\u0192\xC6\u2019\xC3\u2020\xE2\u20AC\u2122\xC3\u0192\xE2\u20AC\xA0\xC3\xA2\xE2\u201A\xAC\xE2\u201E\xA2\xC3\u0192\xC6\u2019\xC3\xA2\xE2\u201A\xAC\xC5\xA1\xC3\u0192\xE2\u20AC\u0161\xC3\u201A\xC2\xA2\xC3\u0192\xC6\u2019\xC3\u2020\xE2\u20AC\u2122\xC3\u0192\xE2\u20AC\u0161\xC3\u201A\xC2\xA2\xC3\u0192\xC6\u2019\xC3\u201A\xC2\xA2\xC3\u0192\xC2\xA2\xC3\xA2\xE2\u20AC\u0161\xC2\xAC\xC3\u2026\xC2\xA1\xC3\u0192\xE2\u20AC\u0161\xC3\u201A\xC2\xAC\xC3\u0192\xC6\u2019\xC3\xA2\xE2\u201A\xAC\xC2\xA6\xC3\u0192\xE2\u20AC\u0161\xC3\u201A\xC2\xA1\xC3\u0192\xC6\u2019\xC3\u2020\xE2\u20AC\u2122\xC3\u0192\xC2\xA2\xC3\xA2\xE2\u20AC\u0161\xC2\xAC\xC3\u2026\xC2\xA1\xC3\u0192\xC6\u2019\xC3\xA2\xE2\u201A\xAC\xC5\xA1\xC3\u0192\xE2\u20AC\u0161\xC3\u201A\xC2\xAC\xC3\u0192\xC6\u2019\xC3\u2020\xE2\u20AC\u2122\xC3\u0192\xE2\u20AC\xA0\xC3\xA2\xE2\u201A\xAC\xE2\u201E\xA2\xC3\u0192\xC6\u2019\xC3\xA2\xE2\u201A\xAC\xC5\xA1\xC3\u0192\xE2\u20AC\u0161\xC3\u201A\xC2\xA2\xC3\u0192\xC6\u2019\xC3\u2020\xE2\u20AC\u2122\xC3\u0192\xE2\u20AC\u0161\xC3\u201A\xC2\xA2\xC3\u0192\xC6\u2019\xC3\u201A\xC2\xA2\xC3\u0192\xC2\xA2\xC3\xA2\xE2\u201A\xAC\xC5\xA1\xC3\u201A\xC2\xAC\xC3\u0192\xE2\u20AC\xA6\xC3\u201A\xC2\xA1\xC3\u0192\xC6\u2019\xC3\xA2\xE2\u201A\xAC\xC5\xA1\xC3\u0192\xE2\u20AC\u0161\xC3\u201A\xC2\xAC\xC3\u0192\xC6\u2019\xC3\u2020\xE2\u20AC\u2122\xC3\u0192\xC2\xA2\xC3\xA2\xE2\u20AC\u0161\xC2\xAC\xC3\u2026\xC2\xA1\xC3\u0192\xC6\u2019\xC3\xA2\xE2\u201A\xAC\xC5\xA1\xC3\u0192\xE2\u20AC\u0161\xC3\u201A\xC2\x9D self-hosted team context authoring for CO2 projects",
   type: "module",
   license: "MIT",
   publishConfig: {
@@ -23211,19 +23211,30 @@ function getOrCreateSetup(db, projectId, userId) {
   const now = (/* @__PURE__ */ new Date()).toISOString();
   return db.insert(cicdSetups).values({ projectId, status: "draft", createdBy: userId, createdAt: now, updatedAt: now }).returning().get();
 }
-function buildPlanRequestMarkdown(projectName, appNames, relativePath) {
+function buildPlanRequestMarkdown(projectName, appNames, relativePath, guidance) {
+  const trimmedGuidance = guidance?.trim() ?? "";
+  const guidanceSection = trimmedGuidance ? `## User Guidance
+
+The following guidance was authored by the user and is AUTHORITATIVE \u2014 honor it over inferred
+defaults wherever they conflict, and note in the plan's Rationale where guidance overrode
+inference. \`shared_context/...\` links reference files under the project's \`shared_context/\`
+folder \u2014 read them for additional context.
+
+${trimmedGuidance}
+
+` : "";
   return `# CI/CD Deployment Plan Request \u2014 ${projectName}
 
 ## Instructions
 
 Infer a deployment plan for every application listed below. Read the project's
 \`ENVIRONMENT.md\`, \`DEVTOOL.md\`, \`CLAUDE.md\` (# Custom Applications, # Port Allocation)
-and each application's \`context/specification/SPECIFICATION.md\`. Decide per application:
+and each application's \`context/specification/SPECIFICATION.md\`.${trimmedGuidance ? " Honor the `## User Guidance` section below." : ""} Decide per application:
 deployment method (container vs bare process), build command, start command, stop mechanism,
 port and health-check URL. Write the plan to \`${CICD_PLAN_RELATIVE}\` with a top-level
 \`**Status**: IN PROGRESS\` header, flipped to \`COMPLETED\` when the plan is finished.
 
-## Applications
+${guidanceSection}## Applications
 
 ${appNames.map((n) => `- ${n}`).join("\n")}
 
@@ -23234,7 +23245,13 @@ ${appNames.map((n) => `- ${n}`).join("\n")}
 \`\`\`
 `;
 }
-function requestPlan(db, workspacePath, projectId, userId) {
+function resetToDraft(db, projectId, userId) {
+  const setup = getOrCreateSetup(db, projectId, userId);
+  stopCicdWatcher(setup.id, "plan");
+  stopCicdWatcher(setup.id, "generation");
+  db.update(cicdSetups).set({ status: "draft", updatedAt: (/* @__PURE__ */ new Date()).toISOString() }).where(eq(cicdSetups.id, setup.id)).run();
+}
+function requestPlan(db, workspacePath, projectId, userId, guidance) {
   const setup = getOrCreateSetup(db, projectId, userId);
   stopCicdWatcher(setup.id, "generation");
   const project = requireProject(db, projectId);
@@ -23250,7 +23267,8 @@ function requestPlan(db, workspacePath, projectId, userId) {
     buildPlanRequestMarkdown(
       project.name,
       apps.map((a) => a.name),
-      relative3
+      relative3,
+      guidance
     ),
     "utf8"
   );
@@ -23475,12 +23493,33 @@ function cicdRoutes(db, workspacePath, studioPort) {
       return errorResponse3(c, e);
     }
   });
-  app.post("/:projectId/plan", (c) => {
+  app.post("/:projectId/reset", (c) => {
+    const projectId = parseProjectId(c);
+    if (projectId === null) return c.json({ code: "INVALID_ID" }, 400);
+    const user = c.get("user");
+    if (!user) return c.json({ code: "UNAUTHORIZED" }, 401);
+    try {
+      resetToDraft(db, projectId, user.id);
+      stopCicdApp(db, projectId);
+      return c.json({ ok: true });
+    } catch (e) {
+      return errorResponse3(c, e);
+    }
+  });
+  app.post("/:projectId/plan", async (c) => {
     const projectId = parseProjectId(c);
     if (projectId === null) return c.json({ code: "INVALID_ID" }, 400);
     const user = c.get("user");
+    let guidance;
+    try {
+      const body = await c.req.json();
+      if (typeof body.guidance === "string" && body.guidance.trim() !== "") {
+        guidance = body.guidance.slice(0, 2e4);
+      }
+    } catch {
+    }
     try {
-      const result = requestPlan(db, workspacePath, projectId, user.id);
+      const result = requestPlan(db, workspacePath, projectId, user.id, guidance);
       stopCicdApp(db, projectId);
       return c.json(result, 201);
     } catch (e) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rashidee/co2",
-  "version": "1.3.30",
-  "description": "Compound Context Studio — self-hosted team context authoring for CO2 projects",
+  "version": "1.3.32",
+  "description": "Compound Context Studio — self-hosted team context authoring for CO2 projects",
   "type": "module",
   "license": "MIT",
   "publishConfig": {

package/plugin/.claude-plugin/marketplace.json

@@ -4,15 +4,15 @@
     "name": "Rashidee M.Rashid"
   },
   "metadata": {
-    "description": "Compound Context (CO2) Workflow — an opinionated context engineering methodology for AI-driven software development",
-    "version": "1.0.2"
+    "description": "Compound Context (CO2) Workflow — an opinionated context engineering methodology for AI-driven software development",
+    "version": "1.0.3"
   },
   "plugins": [
     {
       "name": "co2-skills",
       "source": "./",
-      "description": "Compound Context Skills — generates data models, HTML mockups, technical specifications, test specifications, and orchestrates full-stack development from Agile user stories.",
-      "version": "1.8.4",
+      "description": "Compound Context Skills — generates data models, HTML mockups, technical specifications, test specifications, and orchestrates full-stack development from Agile user stories.",
+      "version": "1.8.7",
       "author": {
         "name": "Rashidee M.Rashid"
       },

package/plugin/.claude-plugin/plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "co2-skills",
-  "version": "1.8.5",
-  "description": "Compound Context Skills — an opinionated context engineering methodology for AI-driven software development. Generates data models, HTML mockups, technical specifications, test specifications, and orchestrates full-stack development from Agile user stories.",
+  "version": "1.8.7",
+  "description": "Compound Context Skills — an opinionated context engineering methodology for AI-driven software development. Generates data models, HTML mockups, technical specifications, test specifications, and orchestrates full-stack development from Agile user stories.",
   "author": {
     "name": "Rashidee M.Rashid"
   },

package/plugin/skills/util-gencicdscript/SKILL.md

@@ -9,16 +9,19 @@ description: >
   cicd/app/ — a zero-npm-dependency node:http app (server.js + cicd.config.json) rendering a
   bare light-themed page (no header/sidebar/footer, iframe-embeddable) with one nav tab per
   application: a controls bar (status badge, clickable app URL opening a new tab, a Config
-  button, and Build / Start / Stop / Deploy buttons) above that application's log streamed live
+  button, and MODE-DEPENDENT lifecycle buttons from the plan's per-application execution mode:
+  `process` → Build / Start / Stop (+ Push to Docker when planned); `docker` → Build / Push to
+  Docker / Redeploy; `k8s` → Build / Update Manifest / Deploy to K8s) above that application's
+  log streamed live
   over a built-in zero-dependency WebSocket (bounded tail + backpressure drop server-side, trimmed
   DOM buffer client-side — no leaks/OOM). The Config button opens a modal listing the application's
   runtime config files (from the plan's `## Application Configs`) — each with its source
   (ENVIRONMENT.md-derived vs an existing .env/.env-* file), present/MISSING status, required keys
   and full live content — for troubleshooting; and before Build/Start the app materializes any
   missing plan-managed config file into the application folder so it always starts with complete
-  configuration. Build and Deploy commands come from the approved plan (inferred
-  from ENVIRONMENT.md/DEVTOOL.md — e.g. Spring Boot jar vs Docker image; deploy via web-server
-  copy, docker run or kubectl apply, or none). Controls are disabled for any application that
+  configuration. All lifecycle commands come verbatim from the approved plan (inferred
+  from ENVIRONMENT.md/DEVTOOL.md and the plan's execution modes; k8s manifests were generated by
+  depgen-k8s at planning time). Controls are disabled for any application that
   has never completed a conductor-develop workflow run (checked against the studio's
   /api/cicd-guard endpoint using the spawn-env token). Health/port probing marks apps already
   running — even ones started outside this app. There is NO version selector and there are NO
@@ -67,8 +70,8 @@ Read `references/cicd-app-template.md` for the complete file templates. Produce:
 
 1. `cicd/app/cicd.config.json` — from the plan's tables:
    `{ "port": <CI/CD app port>, "generatedAt": "<current ISO-8601 UTC>", "docker": { "registry" } | null, "apps": [{ "name", "folder",
-   "method", "port", "build", "start", "stop", "deployMethod", "deploy", "health", "image",
-   "dockerfile", "configs" }], "infra": [{ "id", "name",
+   "mode", "port", "build", "start", "stop", "push", "redeploy", "updateManifest", "deploy",
+   "health", "image", "dockerfile", "configs" }], "infra": [{ "id", "name",
    "host", "port", "url", "description" }] }` — `generatedAt` MUST be the actual time you generate
    this file (a fresh value on EVERY run — never copy a previous one): the running server pins the
    value it booted with and shows a "restart required" banner when a later regeneration moves it
@@ -79,9 +82,12 @@ Read `references/cicd-app-template.md` for the complete file templates. Produce:
    `## Dockerfiles` section, or `{ "path": "Dockerfile", "content": null }` for an `existing`
    one (`null` entirely when the app has no image). Copy managed Dockerfile bodies verbatim.
    Commands are copied verbatim from the plan and run as-is — there is NO `{VERSION}` token
-   or any other placeholder substitution. `deployMethod` is the plan's Deploy Method column
-   (`none|web-server|docker|kubernetes`) and `deploy` its command (`null` when the method is
-   `none`). The `infra` array comes from the plan's `## Infrastructure` table (one entry per
+   or any other placeholder substitution. `mode` is the plan's Mode column
+   (`process|docker|k8s`); `start`/`stop`/`push`/`redeploy`/`updateManifest`/`deploy` come from
+   their plan columns, `null` wherever the cell is `-` — the generated page renders per
+   application ONLY the buttons whose command exists, per mode (`process`: Build/Start/Stop
+   + Push; `docker`: Build/Push/Redeploy; `k8s`: Build/Update Manifest/Deploy to K8s).
+   The `infra` array comes from the plan's `## Infrastructure` table (one entry per
    row); `url` is `null` when the Console URL cell is `-`. Emit `"infra": []` when the plan's
    Infrastructure table is empty — never invent services the plan does not list.
    - `configs` — the runtime config files each application reads at start, from the plan's
@@ -162,19 +168,28 @@ port, application count) and STOP — the studio starts/embeds the app.
   3rd-party services, each with a live TCP-reachability dot (polled) and a console link when a
   `url` is set. Infrastructure is never built/started/stopped/deployed (no lifecycle controls,
   no develop gate); the link is hidden when `infra` is empty.
-- Build/Start/Stop/Deploy run the plan's commands, each with the APPLICATION FOLDER
+- Every lifecycle button runs the plan's command, each with the APPLICATION FOLDER
   (`<project>/<folder>`) as working directory — command paths are relative to the application
-  folder (e.g. `java -jar target\app.jar`), never to the project root. Deploy renders only
-  when the plan assigned a deploy method other than `none`.
+  folder (e.g. `java -jar target\app.jar`), never to the project root.
+- **Mode-dependent buttons (MANDATORY)**: the controls bar renders per application EXACTLY the
+  button set of its `mode` — `process`: Build / Start / Stop, plus Push to Docker when `push`
+  is set; `docker`: Build / Push to Docker / Redeploy (NO Start/Stop — Redeploy owns the
+  container lifecycle); `k8s`: Build / Update Manifest / Deploy to K8s (NO Start/Stop — pods
+  run in the cluster, and the running badge shows a neutral `k8s` phase instead of the local
+  port probe). A button whose command is `null` never renders. Rendering a Start/Stop pair for
+  a docker/k8s application is a defect — it misleads the user into thinking the app executes
+  directly on this machine.
 - **NO version UI, NO All-apps buttons, NO command substitution**: the page carries NO
-  version dropdown or any other version choice, and NO Build All / Start All / Stop All
-  buttons — Build/Start/Stop/Deploy are per-application only and always operate on the
-  CURRENT working tree, running the plan's commands verbatim (no `{VERSION}` or other token
-  substitution). Never render a version control and never check out code.
+  version dropdown or any other version choice, and NO all-application bulk buttons — every
+  lifecycle button is per-application only and always operates on the CURRENT working tree,
+  running the plan's commands verbatim (no `{VERSION}` or other token substitution). Never
+  render a version control and never check out code.
 - **Dockerfile materialization**: before Build, when an app's `dockerfile.content` is set and
   no file exists at its path in the application folder, the server writes it (never
   overwriting an existing Dockerfile — mirror of the managed-config rule). Build never
-  pushes an image; pushing belongs to a `docker` deploy command.
+  pushes an image in `process`/`docker` mode — pushing is the Push button's command; the
+  `k8s` Build is the one exception (its plan command appends the push so the cluster pulls
+  the fresh image).
 - Develop gate: controls stay disabled for an application that never completed a
   conductor-develop run — checked via `${CO2_STUDIO_URL}/api/cicd-guard/${CO2_PROJECT_ID}`
   with the CO2_GUARD_TOKEN from the spawn env (refreshed every 30 s, last answer cached).

package/plugin/skills/util-gencicdscript/references/cicd-app-template.md

@@ -293,24 +293,29 @@ function buildApp(app) {
   })
 }
 
-function deployApp(app) {
-  if (activity.has(app.name) || !app.deploy) return
-  activity.set(app.name, 'deploying'); lastError.delete(app.name)
-  runLogged(app, app.deploy, (code) => {
+// One-shot lifecycle commands (deploy / push / redeploy / update-manifest) share one runner:
+// one activity slot per app, exit code surfaced as the app's error. The activity label doubles
+// as the client badge phase while the command runs.
+function runOnce(app, label, cmd) {
+  if (activity.has(app.name) || !cmd) return
+  activity.set(app.name, label); lastError.delete(app.name)
+  runLogged(app, cmd, (code) => {
     activity.delete(app.name)
-    if (code !== 0) lastError.set(app.name, `deploy exited ${code} — see log`)
-    else logLine(app, `deploy OK (${app.deployMethod})`)
+    if (code !== 0) lastError.set(app.name, `${label} exited ${code} — see log`)
+    else logLine(app, `${label} OK`)
   })
 }
+function deployApp(app) { runOnce(app, 'deploying', app.deploy) }
+function pushApp(app) { runOnce(app, 'pushing', app.push) }
+function redeployApp(app) { runOnce(app, 'redeploying', app.redeploy) }
+function updateManifestApp(app) { runOnce(app, 'updating', app.updateManifest) }
 
+// Start exists only for mode=process apps (docker mode redeploys the container, k8s mode
+// rolls the cluster workload) — the plan carries no start command for the other modes.
 function startApp(app) {
-  if (running.get(app.name) || activity.has(app.name)) return
+  if (running.get(app.name) || activity.has(app.name) || !app.start) return
   failed.delete(app.name); lastError.delete(app.name)
   ensureConfigs(app)
-  if (app.method === 'container') {
-    runLogged(app, app.start, () => {})
-    saveState(); return
-  }
   const child = runLogged(app, app.start, (code) => {
     running.delete(app.name)
     // A user-requested Stop exits nonzero (killed) — that is not a failure.
@@ -427,7 +432,8 @@ body{font-family:system-ui,sans-serif;margin:0;background:#f6f7f9;color:#1c2128;
 .dot.running{background:#1c8a4a}.dot.failed{background:#c23b3b}.dot.building,.dot.deploying{background:#c9922a}
 .bar{display:flex;gap:8px;align-items:center;padding:10px 12px;background:#fff;border-bottom:1px solid #e1e5ea;flex-wrap:wrap}
 .badge{font-size:10px;text-transform:uppercase;border-radius:99px;padding:2px 8px;color:#fff;background:#8a94a0}
-.badge.running{background:#1c8a4a}.badge.failed{background:#c23b3b}.badge.building,.badge.deploying{background:#c9922a}
+.badge.running{background:#1c8a4a}.badge.failed{background:#c23b3b}.badge.k8s{background:#3a6fc4}
+.badge.building,.badge.deploying,.badge.pushing,.badge.redeploying,.badge.updating{background:#c9922a}
 .url{font-size:12px;color:#1a66d0;text-decoration:underline;word-break:break-all}
 button{background:#fff;color:#1c2128;border:1px solid #c6cdd6;border-radius:6px;padding:4px 12px;font-size:12px;cursor:pointer}
 button:hover:enabled{background:#eef1f5}
@@ -491,17 +497,25 @@ function renderBar(){
   // Fail OPEN — only a definitive "never developed" (false) disables controls; unknown (null)
   // leaves them enabled so an unverifiable studio never locks the user out (Defect 2c/4).
   const gate = a.developedOnce !== false
-  const busy = a.phase==='building'||a.phase==='deploying'
+  const mode = a.mode || 'process'
+  const busy = a.phase==='building'||a.phase==='deploying'||a.phase==='pushing'||a.phase==='redeploying'||a.phase==='updating'
+  // Mode-dependent controls: process → Build/Start/Stop (+ Push when planned);
+  // docker → Build/Push/Redeploy; k8s → Build/Update Manifest/Deploy to K8s. Rendering a
+  // Start/Stop pair for a docker/k8s app is a defect — it misleads the user into thinking
+  // the application executes directly on this machine.
   document.getElementById('bar').innerHTML = \`
     <span class="badge \${a.phase}">\${a.phase}\${a.external?' (external)':''}</span>
-    <span class="meta">\${a.method} · port \${a.port}</span>
-    <a class="url" href="\${url}" target="_blank" rel="noreferrer">\${url}</a>
+    <span class="meta">\${mode} · port \${a.port}</span>
+    \${mode!=='k8s'?\`<a class="url" href="\${url}" target="_blank" rel="noreferrer">\${url}</a>\`:''}
     <span style="flex:1"></span>
     <button onclick="openConfig()" title="Show this application's runtime configuration files">Config</button>
-    <button onclick="act('build')" \${!gate||busy||a.phase==='running'?'disabled':''} title="\${a.image?'Builds the app AND the docker image '+a.image+':latest':'Runs the plan build command'}">Build</button>
-    <button onclick="act('start')" \${!gate||busy||a.phase==='running'?'disabled':''}>Start</button>
-    <button onclick="act('stop')" \${a.phase!=='running'?'disabled':''}>Stop</button>
-    \${a.deploy?\`<button onclick="act('deploy')" \${!gate||busy?'disabled':''}>Deploy (\${a.deployMethod})</button>\`:''}\`
+    <button onclick="act('build')" \${!gate||busy||(mode==='process'&&a.phase==='running')?'disabled':''} title="\${a.image?'Builds the app AND the docker image '+a.image+':latest':'Runs the plan build command'}">Build</button>
+    \${mode==='process'?\`<button onclick="act('start')" \${!gate||busy||a.phase==='running'?'disabled':''}>Start</button>
+    <button onclick="act('stop')" \${a.phase!=='running'?'disabled':''}>Stop</button>\`:''}
+    \${(mode==='process'&&a.push)||mode==='docker'?\`<button onclick="act('push')" \${!gate||busy||!a.push?'disabled':''}>Push to Docker</button>\`:''}
+    \${mode==='docker'?\`<button onclick="act('redeploy')" \${!gate||busy||!a.redeploy?'disabled':''}>Redeploy</button>\`:''}
+    \${mode==='k8s'?\`<button onclick="act('update-manifest')" \${!gate||busy||!a.updateManifest?'disabled':''}>Update Manifest</button>
+    <button onclick="act('deploy')" \${!gate||busy||!a.deploy?'disabled':''}>Deploy to K8s</button>\`:''}\`
   const notice = document.getElementById('notice')
   if (a.developedOnce === false) {
     notice.textContent = 'This application has not been developed through the workflow yet — run conductor-feature-develop first.'
@@ -659,12 +673,17 @@ const server = http.createServer(async (req, res) => {
   }
   if (req.method === 'GET' && req.url === '/api/state') {
     const apps = await Promise.all(loadConfig().apps.map(async (a) => {
+      const mode = a.mode || 'process'
       const healthy = await probe(a)
-      const phase = activity.get(a.name) || (healthy ? 'running' : failed.has(a.name) ? 'failed' : 'stopped')
+      // k8s apps run in the cluster, not on this machine — the local port probe is
+      // meaningless, so their idle phase is a neutral 'k8s' badge.
+      const phase = activity.get(a.name)
+        || (mode === 'k8s' ? 'k8s' : healthy ? 'running' : failed.has(a.name) ? 'failed' : 'stopped')
       const dev = developInfo(a)
       return {
-        name: a.name, method: a.method, port: a.port, phase,
-        deploy: !!a.deploy, deployMethod: a.deployMethod || 'none',
+        name: a.name, mode, port: a.port, phase,
+        deploy: !!a.deploy, push: !!a.push, redeploy: !!a.redeploy,
+        updateManifest: !!a.updateManifest,
         image: a.image || null,
         external: healthy && !running.has(a.name),
         developedOnce: dev.val, developSource: dev.src,
@@ -689,7 +708,7 @@ const server = http.createServer(async (req, res) => {
     return json(res, 200, { configs: (app.configs || []).map((c) => readConfig(app, c)) })
   }
   const path = (req.url || '').split('?')[0]
-  const m = path.match(/^\/api\/apps\/([^/]+)\/(build|start|stop|deploy)$/)
+  const m = path.match(/^\/api\/apps\/([^/]+)\/(build|start|stop|deploy|push|redeploy|update-manifest)$/)
   if (m && req.method === 'POST') {
     const app = loadConfig().apps.find((a) => a.name === decodeURIComponent(m[1]))
     if (!app) return json(res, 404, { error: 'unknown app' })
@@ -700,6 +719,9 @@ const server = http.createServer(async (req, res) => {
     if (m[2] === 'build') buildApp(app)
     else if (m[2] === 'start') startApp(app)
     else if (m[2] === 'deploy') deployApp(app)
+    else if (m[2] === 'push') pushApp(app)
+    else if (m[2] === 'redeploy') redeployApp(app)
+    else if (m[2] === 'update-manifest') updateManifestApp(app)
     else await stopApp(app)
     return json(res, 200, { ok: true })
   }
@@ -743,9 +765,12 @@ Top-level `"generatedAt"` is an ISO-8601 UTC timestamp **stamped fresh on every
 (Defect 1): the running server pins the value it booted with and flags a "restart required" banner
 once a regeneration moves it forward, so a stale in-place-replaced process is self-diagnosing. It
 MUST change on each run — use the actual generation time (e.g. `new Date().toISOString()`).
-`deployMethod`/`deploy` come from the plan's Deploy columns (`deploy` is `null` when the method
-is `none`). `infra[].url` is `null` for a headless service (Console URL cell `-`); emit
-`"infra": []` when the plan declares no supporting services.
+`mode` is the plan's Mode column (`process|docker|k8s`) and decides the rendered button set;
+`start`/`stop`/`push`/`redeploy`/`updateManifest`/`deploy` come from their plan columns and are
+`null` wherever the plan cell is `-` (a `null` command's button never renders — `process` apps
+carry start/stop and optionally push; `docker` apps carry push/redeploy; `k8s` apps carry
+updateManifest/deploy). `infra[].url` is `null` for a headless service (Console URL cell `-`);
+emit `"infra": []` when the plan declares no supporting services.
 
 Docker fields (from the plan's `## Docker` / `## Dockerfiles` sections): top-level
 `"docker": { "registry": "<repo>" }` or `null` when the plan is not dockerized. Per app,
@@ -776,13 +801,15 @@ verbatim (this is a local dev CI/CD app).
     {
       "name": "my-app",
       "folder": "my-app",
-      "method": "process",
+      "mode": "k8s",
       "port": 3000,
-      "build": "rm -rf dist && pnpm install && pnpm build && docker build --no-cache -t registry.example.com/team/my-app:latest .",
-      "start": "node dist/index.js",
-      "stop": "process-kill",
-      "deployMethod": "kubernetes",
-      "deploy": "kubectl apply -f my-app/k8s/",
+      "build": "rm -rf dist && pnpm install && pnpm build && docker build --no-cache -t registry.example.com/team/my-app:latest . && docker push registry.example.com/team/my-app:latest",
+      "start": null,
+      "stop": null,
+      "push": null,
+      "redeploy": null,
+      "updateManifest": "kubectl apply -f k8s/",
+      "deploy": "kubectl rollout restart deployment/my-app",
       "health": "http://127.0.0.1:3000/",
       "image": "registry.example.com/team/my-app",
       "dockerfile": {

package/plugin/skills/util-plancicd/SKILL.md

@@ -6,11 +6,14 @@ description: >
   Infer a local-deployment plan for every custom application of a CO2 project and write it to
   cicd/CICD_PLAN.md for human review in Compound Context Studio. Reads the project's
   ENVIRONMENT.md and DEVTOOL.md, CLAUDE.md (# Custom Applications, # Port Allocation) and each
-  application's context/specification/SPECIFICATION.md, then decides per application: deployment
-  method (container vs bare process), build command (e.g. Spring Boot jar vs Docker image),
-  start command, stop mechanism, deploy method + command (none / web-server copy / docker run /
-  kubectl apply — only when the environment calls for one), port and health-check URL, plus a
-  port for the generated CI/CD app itself. When Docker AND a docker repo/registry are both
+  application's context/specification/SPECIFICATION.md, then decides per application its
+  EXECUTION MODE — `process` (runs directly on this machine: Build / Start / Stop buttons, plus
+  Push-to-Docker when a registry is configured), `docker` (deployed as a docker container on
+  this machine: Build / Push-to-Docker / Redeploy buttons), or `k8s` (deployed to Kubernetes:
+  Build / Update-Manifest / Deploy-to-K8s buttons) — with the mode-appropriate commands, port
+  and health-check URL, plus a port for the generated CI/CD app itself. For every k8s-mode
+  application it TRIGGERS the depgen-k8s skill to generate the required Dockerfile + manifests
+  into `<app_folder>/k8s/` before the plan is written. When Docker AND a docker repo/registry are both
   configured (DEVTOOL.md + ENVIRONMENT.md), it additionally plans the docker-image build path:
   per-application image names under the repo, Build commands extended with
   `docker build --no-cache -t <image>:latest` (clean image build, no version token — the generated
@@ -53,7 +56,7 @@ If the argument is missing or the file does not exist, STOP and tell the user to
 
 | Logical file | Path |
 |---|---|
-| Plan request | `<argument>` |
+| Plan request | `<argument>` (may carry a `## User Guidance` section — authoritative human input) |
 | Environment | `ENVIRONMENT.md` (project root) |
 | Dev tools | `DEVTOOL.md` (project root) |
 | Project context | `CLAUDE.md` (project root; `source/CLAUDE.md` fallback) |
@@ -65,6 +68,13 @@ If the argument is missing or the file does not exist, STOP and tell the user to
 ## Phase 1 — Gather
 
 1. Read the plan-request markdown; its `## Applications` list is the authoritative application set.
+1a. **User guidance**: when the plan-request markdown carries a `## User Guidance` section, treat
+   its content as AUTHORITATIVE human input — honor it over inferred defaults wherever the two
+   conflict (e.g. a forced deployment method, specific build/start/deploy commands, target hosts,
+   ports). If the guidance contains `shared_context/...` markdown links, read those files (paths
+   relative to the project root) as additional context. Record every place guidance overrode
+   inference in the plan's `## Rationale` section (e.g. "container deployment per user guidance").
+   No `## User Guidance` section → plan exactly as before.
 2. Read `ENVIRONMENT.md` (registries, credentials, external services) and `DEVTOOL.md`
    (installed tools + paths: node/pnpm/docker/kubectl/python versions).
 2a. **Docker facts**: record whether Docker is installed (DEVTOOL.md) AND whether
@@ -99,8 +109,23 @@ If the argument is missing or the file does not exist, STOP and tell the user to
   root. All paths inside build/start/stop/deploy commands must therefore be relative to the
   application folder (`mvn -q package`, `java -jar target\app.jar`) — never prefixed with the
   application folder itself (`skolafund_middleware\target\...` is WRONG).
-- **Method**: `container` only when Docker appears in DEVTOOL.md AND the stack has a sensible
-  container path; otherwise `process` (bare local process — the default for a dev VM).
+- **Execution mode (drives the generated app's BUTTON SET)** — decide per application HOW this
+  machine runs/ships it: `process` | `docker` | `k8s`. Honor `## User Guidance` first; else
+  infer from ENVIRONMENT.md/DEVTOOL.md:
+  - `k8s` — the deployment target is Kubernetes (kubectl + a cluster/kubeconfig configured, or
+    guidance says so). Requires Docker + a registry (the cluster pulls the pushed image).
+    Buttons: **Build / Update Manifest / Deploy to K8s** — no Start/Stop (pods run in the
+    cluster, not on this machine).
+  - `docker` — the application runs on this machine AS a docker container (Docker installed
+    and the container is the run mode). Buttons: **Build / Push to Docker / Redeploy** — no
+    bare Start/Stop (Redeploy owns the container lifecycle).
+  - `process` — bare local process, the dev-VM default. Buttons: **Build / Start / Stop**,
+    plus **Push to Docker** only when the docker-image path (below) is active.
+- **depgen-k8s trigger (k8s mode only, MANDATORY)**: for EVERY k8s-mode application, invoke the
+  depgen-k8s skill BEFORE writing the plan —
+  `Skill(skill: "co2-skills:depgen-k8s", args: "<application name>")` — so the required
+  Dockerfile and Kubernetes manifests exist in `<app_folder>/k8s/`; the plan's Update-Manifest/
+  Deploy commands reference those generated files. Never hand-author k8s manifests here.
 - **Build command (ALWAYS a CLEAN build)**: the Build button must produce a from-scratch build so
   no stale artifact from a previous run can ever be started or shipped — use the stack's CLEAN
   lifecycle, never an incremental one:
@@ -113,21 +138,32 @@ If the argument is missing or the file does not exist, STOP and tell the user to
   - Laravel/PHP with a front-end build → `rm -rf public/build && composer install && npm ci && npm run build`;
     plain PHP with no build step → `composer install`.
   Use tool paths from DEVTOOL.md when the tool is not on PATH.
-- **Start command**: the stack's production-ish local start (e.g. `node dist/index.js`,
-  `java -jar target/<artifact>.jar`, `php artisan serve --port <port>`); `docker build`/
-  `docker run` pair when method=container. For jar-based stacks, resolve the EXACT artifact
+- **Start command (`process` mode only — `-` for docker/k8s)**: the stack's production-ish
+  local start (e.g. `node dist/index.js`, `java -jar target/<artifact>.jar`,
+  `php artisan serve --port <port>`). For jar-based stacks, resolve the EXACT artifact
   filename — read the pom/gradle build config: a Maven `<finalName>` means
   `target/<finalName>.jar` with NO version suffix (Spring Boot repackage keeps that name and
   leaves a `.jar.original` beside it — never reference the `.original`). Never guess
   `<app>-<version>.jar` and never use a `target/*.jar` glob (shell-dependent, breaks on
   Windows cmd).
-- **Stop**: `process-kill` for bare processes; `docker stop <name>` for containers.
-- **Deploy** (method + command): only when ENVIRONMENT.md/DEVTOOL.md show a deployment target —
-  `kubernetes` (`kubectl apply -f <app>/k8s/` when kubectl + a cluster/kubeconfig appear),
-  `docker` (`docker run`/`docker compose up -d` when the image is the deliverable),
-  `web-server` (copy the built artifact into the configured web/app server, e.g. nginx html
-  root or Tomcat webapps, when one is configured). Default **`none`** — a bare local process
-  needs no deploy step beyond Start; never invent a target the config does not name.
+- **Stop (`process` mode only — `-` for docker/k8s)**: `process-kill`.
+- **Per-mode lifecycle commands** (each recorded in its own plan column; `-` when the mode does
+  not use it — the generated app renders ONLY the buttons whose command exists):
+  - **Push** (`docker push <image>:latest`) — `docker` mode always; `process` mode only when
+    the docker-image path is active (the Build already produced the image). `-` for k8s
+    (pushing is folded into the k8s Build so the cluster can pull the fresh image).
+  - **Redeploy** (`docker` mode) — replace the running container with the freshly built
+    `latest` image: `docker rm -f <container> ; docker run -d --name <container>
+    -p <port>:<port> <env/volume flags> <image>:latest` (or `docker compose up -d` when a
+    compose file is the run mode). The container name defaults to the app folder name.
+  - **Update Manifest** (`k8s` mode) — apply the depgen-k8s-generated manifests to the
+    cluster: `kubectl apply -f k8s/` (namespace flag when ENVIRONMENT.md names one).
+  - **Deploy** (`k8s` mode) — roll the workload onto the freshly pushed image:
+    `kubectl rollout restart deployment/<app> -n <ns>` (match the deployment name in the
+    generated manifests). For `process`/`docker` the Deploy column is `-` — those modes ship
+    via Push/Redeploy, and a bare local process needs no deploy step beyond Start.
+  - **k8s Build** additionally appends the push — `<app build> && docker build --no-cache
+    -t <image>:latest . && docker push <image>:latest` — the cluster pulls from the registry.
 - **Docker image** (only when Gather 2a found Docker + a docker repo — otherwise skip this
   bullet entirely):
   - **Image name**: `<repo>/<app_folder>` — the application folder name, lowercased, with
@@ -138,9 +174,10 @@ If the argument is missing or the file does not exist, STOP and tell the user to
     clean build too, so no stale layer survives. Commands carry NO `{VERSION}` token or
     any other placeholder — the generated CI/CD app runs them verbatim; only the current
     working tree is ever built and images are always tagged `latest`.
-    Build never pushes — pushing belongs to a `docker` Deploy method.
-  - **Container start/deploy**: when method=container, reference `<image>:latest` in the
-    start/deploy commands too, so the freshly built tag is what runs.
+    Build never pushes in `process`/`docker` mode — pushing is the Push button's job
+    (k8s Build is the one exception: it appends the push so the cluster can pull).
+  - **Container redeploy**: in `docker` mode, reference `<image>:latest` in the Redeploy
+    command so the freshly built tag is what runs.
   - **Dockerfile**: if the application folder already has a `Dockerfile`, use it as-is
     (`existing`). Otherwise author a stack-appropriate Dockerfile (node / spring-boot /
     laravel — same stack detection as depgen-k8s) into the plan's `## Dockerfiles` section
@@ -222,9 +259,13 @@ inner ```env config block renders — the plan file itself uses a normal 3-backt
 
 ## Deployment Decisions
 
-| Application | Folder | Method | Port | Build | Start | Stop | Deploy Method | Deploy | Health |
-|---|---|---|---|---|---|---|---|---|---|
-| <name> | <folder> | process|container | <port> | `<cmd>` | `<cmd>` | process-kill|docker stop | none|web-server|docker|kubernetes | `<cmd or ->` | <url> |
+| Application | Folder | Mode | Port | Build | Start | Stop | Push | Redeploy | Update Manifest | Deploy | Health |
+|---|---|---|---|---|---|---|---|---|---|---|---|
+| <name> | <folder> | process|docker|k8s | <port> | `<cmd>` | `<cmd or ->` | process-kill|- | `<cmd or ->` | `<cmd or ->` | `<cmd or ->` | `<cmd or ->` | <url> |
+
+> **Mode → buttons**: the generated CI/CD app renders per application exactly the buttons whose
+> command exists — `process`: Build / Start / Stop (+ Push to Docker when Push is set);
+> `docker`: Build / Push to Docker / Redeploy; `k8s`: Build / Update Manifest / Deploy to K8s.
 
 > **Running-detection**: the generated CI/CD app determines "is it running?" by a TCP connect to
 > each application's **Port** on both IPv4 (`127.0.0.1`) and IPv6 (`::1`) loopback plus the

package/static/assets/{abnfDiagram-VRR7QNED-DSKqrKDc.js → abnfDiagram-VRR7QNED-Bz30rK4w.js}

@@ -1 +1 @@
-import{g as p,r as u,d as a}from"./chunk-MOJQB5TN-mvV9BYhY.js";import{p as f}from"./chunk-JWPE2WC7-k6i1JgiV.js";import{_ as n,l as o}from"./index-BkSOIYhD.js";import{M as c,b as d}from"./cynefin-VYW2F7L2-DLa7zwol.js";var v=d().RailroadAbnf.parser.LangiumParser,l=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("*"),i=t?parseInt(t,10):0,m=s?parseInt(s,10):1/0;return{min:i,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 l(e.element);case"AbnfOptionalGroup":return{type:"optional",element:l(e.element)};default:throw new Error(`Unsupported ABNF primary node: ${e.$type}`)}},"transformPrimary"),P=n(e=>({name:e.name,definition:l(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}},w={parser:R,db:a,renderer:u,styles:p};export{w as diagram};
+import{g as p,r as u,d as a}from"./chunk-MOJQB5TN-B3bjiMAY.js";import{p as f}from"./chunk-JWPE2WC7-BZ9dVylx.js";import{_ as n,l as o}from"./index-BWq7zKXB.js";import{M as c,b as d}from"./cynefin-VYW2F7L2-Dzy0NABg.js";var v=d().RailroadAbnf.parser.LangiumParser,l=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("*"),i=t?parseInt(t,10):0,m=s?parseInt(s,10):1/0;return{min:i,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 l(e.element);case"AbnfOptionalGroup":return{type:"optional",element:l(e.element)};default:throw new Error(`Unsupported ABNF primary node: ${e.$type}`)}},"transformPrimary"),P=n(e=>({name:e.name,definition:l(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}},w={parser:R,db:a,renderer:u,styles:p};export{w as diagram};

package/static/assets/{arc-Do0QnZNS.js → arc-K9O7tO8Y.js}

@@ -1 +1 @@
-import{Y as ln,$ as an,a0 as y,a1 as tn,a2 as F,a3 as q,a4 as _,a5 as un,a6 as rn,a7 as J,a8 as o,a9 as j,aa as sn,ab as on,ac as fn}from"./index-BkSOIYhD.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(fn(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)-an,c=A.apply(this,arguments)-an,B=un(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=_(un(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<rn)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(on((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-rn/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 y,a1 as tn,a2 as F,a3 as q,a4 as _,a5 as un,a6 as rn,a7 as J,a8 as o,a9 as j,aa as sn,ab as on,ac as fn}from"./index-BWq7zKXB.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(fn(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)-an,c=A.apply(this,arguments)-an,B=un(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=_(un(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<rn)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(on((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-rn/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};