npm - @rashidee/co2 - Versions diffs - 1.3.17 → 1.3.18 - Mend

@rashidee/co2 1.3.17 → 1.3.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/dist/index.js +1 -1
package/package.json +1 -1
package/plugin/skills/util-gencicdscript/SKILL.md +13 -21
package/plugin/skills/util-gencicdscript/references/cicd-app-template.md +23 -90
package/plugin/skills/util-plancicd/SKILL.md +7 -14

package/dist/index.js CHANGED Viewed

@@ -6809,7 +6809,7 @@ var {
 // package.json
 var package_default = {
   name: "@rashidee/co2",
-  version: "1.3.17",
+  version: "1.3.18",
   description: "Compound Context Studio \u2014 self-hosted team context authoring for CO2 projects",
   type: "module",
   license: "MIT",

package/package.json CHANGED Viewed

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

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

@@ -21,12 +21,12 @@ description: >
   copy, docker run or kubectl apply, or none). 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 — every control
-  operates on the current working tree, and the {VERSION} token in commands auto-resolves to
-  the project's current version (studio guard's latest semver, fallback `latest`) — docker
-  images are tagged <repo>/<app>:<version> when the plan's Docker section is active (managed
-  Dockerfiles materialized before Build when missing; Build never pushes) — and Build All /
-  Start All / Stop All buttons operate every eligible application at once (sequential builds). When the approved plan declares an `## Infrastructure` list, the
+  running — even ones started outside this app. There is NO version selector and there are NO
+  Build All / Start All / Stop All buttons — every control operates per application on the
+  current working tree, and the plan's commands run verbatim (no {VERSION} or other token
+  substitution) — docker images are tagged <repo>/<app>:latest when the plan's Docker section
+  is active (managed Dockerfiles materialized before Build when missing; Build never
+  pushes). When the approved plan declares an `## Infrastructure` list, the
   main page shows an "Infrastructure" link that opens a separate status-only page listing every
   supporting 3rd-party service with a live TCP-reachability indicator and a console link. Writes cicd/CICD_GENERATION.md with `**Status**:` IN PROGRESS →
   COMPLETED so the studio watcher detects completion. Idempotent — re-running regenerates
@@ -75,9 +75,8 @@ Read `references/cicd-app-template.md` for the complete file templates. Produce:
    `{ "path": "Dockerfile", "content": "<body>" }` for a `managed` Dockerfile from the plan's
    `## 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 may carry the literal `{VERSION}` token — copy it verbatim; the generated app
-   substitutes it at execution with the project's CURRENT version (studio guard's latest
-   semver, `v` prefix stripped, fallback `latest`) — never via any user-facing selector. `deployMethod` is the plan's Deploy Method column
+   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
    row); `url` is `null` when the Console URL cell is `-`. Emit `"infra": []` when the plan's
@@ -164,22 +163,15 @@ port, application count) and STOP — the studio starts/embeds the app.
   (`<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`.
-- **NO version selector — current codebase only**: the page carries NO version dropdown or
-  any other version choice. Build/Start/Stop/Deploy (and the All buttons) always operate on
-  the CURRENT working tree — there is nothing else they could build. The literal `{VERSION}`
-  token in commands is resolved AUTOMATICALLY at execution time to the project's current
-  version: the FIRST entry of the studio guard response's `versions` array (already polled
-  every 30 s; latest first), minus its `v` prefix, falling back to `latest` when the studio
-  is unreachable. Never render a UI control for it and never check out code.
+- **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.
 - **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.
-- **All-apps controls**: the top bar carries **Build All**, **Start All** and **Stop All**
-  buttons. Build All builds eligible apps SEQUENTIALLY (one at a time — honest logs, no CPU
-  storm); Start All starts every eligible stopped app; Stop All stops every running app.
-  Eligible = develop-gate not failed, not busy, and (for build/start) not already running;
-  ineligible apps are skipped silently — per-tab badges show progress.
 - 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 CHANGED Viewed

@@ -66,7 +66,6 @@ function currentBranch() {
 // its tab controls are disabled. Refreshed every 30 s; the last known answer is kept when the
 // studio is briefly unreachable, and `null` (never fetched) disables controls with a hint.
 let guardApps = null // Map lower(name|folder) -> developedOnce
-let guardVersions = [] // project versions (semver strings, studio order — latest first)
 async function refreshGuard() {
   if (!PROJECT_ID) return
   try {
@@ -77,8 +76,6 @@ async function refreshGuard() {
       guardApps = new Map()
       for (const a of g.applications) guardApps.set(String(a.name).toLowerCase(), !!a.developedOnce)
     }
-    // The topbar version selector's choices — the {VERSION} tag substituted into commands.
-    if (Array.isArray(g.versions)) guardVersions = g.versions.map((v) => String(v.semver)).filter(Boolean)
   } catch {}
 }
 function developedOnce(app) {
@@ -229,13 +226,6 @@ function tcpProbe(host, port, timeout = 1000) {
   })
 }
-// {VERSION} token substitution — the version comes from the page's topbar selector (the
-// studio guard's versions, latest preselected). Tag-only: never checks out code. The `v`
-// prefix is stripped so docker tags read `1.2.0`, not `v1.2.0`.
-function subst(cmd, version) {
-  return String(cmd || '').replaceAll('{VERSION}', String(version || 'latest').replace(/^v/, ''))
-}
 // Managed Dockerfile from the plan's ## Dockerfiles — written before Build only when the
 // application folder has none (an existing Dockerfile is never overwritten).
 function ensureDockerfile(app) {
@@ -249,38 +239,37 @@ function ensureDockerfile(app) {
   } catch (e) { logLine(app, `dockerfile: FAILED to write — ${e.message}`) }
 }
-function buildApp(app, version, onDone) {
-  if (activity.has(app.name)) { onDone && onDone(); return }
+function buildApp(app) {
+  if (activity.has(app.name)) return
   activity.set(app.name, 'building'); lastError.delete(app.name)
   ensureConfigs(app)
   ensureDockerfile(app)
-  runLogged(app, subst(app.build, version), (code) => {
+  runLogged(app, app.build, (code) => {
     activity.delete(app.name)
     if (code !== 0) lastError.set(app.name, `build exited ${code} — see log`)
     else logLine(app, 'build OK')
-    onDone && onDone()
   })
 }
-function deployApp(app, version) {
+function deployApp(app) {
   if (activity.has(app.name) || !app.deploy) return
   activity.set(app.name, 'deploying'); lastError.delete(app.name)
-  runLogged(app, subst(app.deploy, version), (code) => {
+  runLogged(app, app.deploy, (code) => {
     activity.delete(app.name)
     if (code !== 0) lastError.set(app.name, `deploy exited ${code} — see log`)
     else logLine(app, `deploy OK (${app.deployMethod})`)
   })
 }
-function startApp(app, version) {
+function startApp(app) {
   if (running.get(app.name) || activity.has(app.name)) return
   failed.delete(app.name); lastError.delete(app.name)
   ensureConfigs(app)
   if (app.method === 'container') {
-    runLogged(app, subst(app.start, version), () => {})
+    runLogged(app, app.start, () => {})
     saveState(); return
   }
-  const child = runLogged(app, subst(app.start, version), (code) => {
+  const child = runLogged(app, app.start, (code) => {
     running.delete(app.name)
     // A user-requested Stop exits nonzero (killed) — that is not a failure.
     if (code !== 0 && !stopping.delete(app.name)) {
@@ -327,9 +316,9 @@ function killByPort(port) {
   } catch { return false }
 }
-function stopApp(app, version) {
+function stopApp(app) {
   if (app.method === 'container' && app.stop && app.stop !== 'process-kill') {
-    const stopCmd = subst(app.stop, version)
+    const stopCmd = app.stop
     try { execFileSync(stopCmd.split(' ')[0], stopCmd.split(' ').slice(1), { cwd: PROJECT_DIR }) } catch {}
   } else {
     const child = running.get(app.name)
@@ -368,7 +357,6 @@ body{font-family:system-ui,sans-serif;margin:0;background:#f6f7f9;color:#1c2128;
 .badge.running{background:#1c8a4a}.badge.failed{background:#c23b3b}.badge.building,.badge.deploying{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}
-select{background:#fff;color:#1c2128;border:1px solid #c6cdd6;border-radius:6px;padding:3px 6px;font-size:12px}
 button:hover:enabled{background:#eef1f5}
 button:disabled{opacity:.4;cursor:default}
 .notice{padding:4px 12px;font-size:11px;color:#8a5a00;background:#fff7e6;display:none}
@@ -389,10 +377,6 @@ button:disabled{opacity:.4;cursor:default}
 .cfg pre{background:#0f1216;color:#d7dde4;font-size:11px;padding:8px 10px;border-radius:6px;overflow:auto;max-height:320px;white-space:pre-wrap;margin:4px 0 0}
 </style></head><body>
 <div class="top"><strong>CI/CD</strong><span id="branch" class="meta"></span>
-<span class="meta">version</span><select id="ver" title="Tag substituted into {VERSION} in commands (docker image tag)"><option value="">latest</option></select>
-<button onclick="actAll('build')" title="Build every eligible application, one at a time">Build All</button>
-<button onclick="actAll('start')" title="Start every eligible stopped application">Start All</button>
-<button onclick="actAll('stop')" title="Stop every running application">Stop All</button>
 <span style="flex:1"></span><a id="infralink" class="url" href="infra" target="_blank" rel="noreferrer" style="display:none">Infrastructure ↗</a></div>
 <div class="tabs" id="tabs"></div>
 <div class="bar" id="bar"></div>
@@ -431,7 +415,7 @@ function renderBar(){
     <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+':<version>':'Runs the plan build command'}">Build</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>\`:''}\`
@@ -461,7 +445,10 @@ function setActive(name){
 function openWs(name){
   // Path-relative + scheme-aware so the stream works direct (:5000/) AND behind the studio's
   // /api/cicd/<id>/app-proxy/ prefix (which tunnels the upgrade), also under HTTPS.
-  ws = new WebSocket((location.protocol==='https:'?'wss://':'ws://')+location.host+location.pathname.replace(/\/$/,'')+'/ws?app='+encodeURIComponent(name))
+  // NO backslash/regex here on purpose: this string is inside server.js's PAGE template literal,
+  // where a client-side regex like /\/$/ cooks to //$/ (a line comment) and kills the script.
+  var base = location.pathname.endsWith('/') ? location.pathname.slice(0, -1) : location.pathname
+  ws = new WebSocket((location.protocol==='https:'?'wss://':'ws://')+location.host+base+'/ws?app='+encodeURIComponent(name))
   ws.onmessage = e => appendLog(e.data)
   ws.onclose = () => { ws = null; if (active === name) wsTimer = setTimeout(() => openWs(name), 2000) }
 }
@@ -501,35 +488,17 @@ async function openConfig(){
 function closeConfig(){ document.getElementById('cfgModal').classList.remove('open') }
 document.addEventListener('keydown', e => { if (e.key === 'Escape') closeConfig() })
-// Topbar version selector — the studio guard's project versions (latest first). Repopulated
-// only when the list changes so the user's selection survives the 3 s poll.
-let verChoices = ''
-function renderVersions(versions){
-  const sel = document.getElementById('ver')
-  const list = (versions && versions.length ? versions : []).join('|')
-  if (list === verChoices) return
-  verChoices = list
-  sel.innerHTML = (versions && versions.length ? versions : ['latest'])
-    .map((v, i) => '<option value="'+esc(v)+'"'+(i===0?' selected':'')+'>'+esc(v)+'</option>').join('')
-}
-function selectedVersion(){ return document.getElementById('ver').value || '' }
 async function refresh(){
   const s = await fetch('api/state').then(r => r.json()).catch(() => null)
   if (!s) return
   state = s
   document.getElementById('branch').textContent = s.currentBranch ? 'branch: '+s.currentBranch : ''
   document.getElementById('infralink').style.display = s.hasInfra ? 'inline' : 'none'
-  renderVersions(s.versions)
   if (!active && s.apps.length) setActive(s.apps[0].name)
   renderTabs(); renderBar()
 }
 async function act(op){
-  await fetch('api/apps/'+encodeURIComponent(active)+'/'+op+'?version='+encodeURIComponent(selectedVersion()), { method: 'POST' })
-  refresh()
-}
-async function actAll(op){
-  await fetch('api/all/'+op+'?version='+encodeURIComponent(selectedVersion()), { method: 'POST' })
+  await fetch('api/apps/'+encodeURIComponent(active)+'/'+op, { method: 'POST' })
   refresh()
 }
 // Rescan immediately when the user returns to this page (tab focus / regained visibility), so
@@ -614,7 +583,6 @@ const server = http.createServer(async (req, res) => {
     return json(res, 200, {
       currentBranch: currentBranch(),
       hasInfra: (loadConfig().infra || []).length > 0,
-      versions: guardVersions,
       apps,
     })
   }
@@ -624,10 +592,6 @@ const server = http.createServer(async (req, res) => {
     if (!app) return json(res, 404, { error: 'unknown app' })
     return json(res, 200, { configs: (app.configs || []).map((c) => readConfig(app, c)) })
   }
-  // ?version=<semver> on every action — the topbar selection, substituted into {VERSION}.
-  const reqVersion = (() => {
-    try { return new URL(req.url, 'http://x').searchParams.get('version') || '' } catch { return '' }
-  })()
   const path = (req.url || '').split('?')[0]
   const m = path.match(/^\/api\/apps\/([^/]+)\/(build|start|stop|deploy)$/)
   if (m && req.method === 'POST') {
@@ -636,42 +600,12 @@ const server = http.createServer(async (req, res) => {
     if (m[2] !== 'stop' && developedOnce(app) === false) {
       return json(res, 409, { error: 'application has not completed a develop workflow run' })
     }
-    if (m[2] === 'build') buildApp(app, reqVersion)
-    else if (m[2] === 'start') startApp(app, reqVersion)
-    else if (m[2] === 'deploy') deployApp(app, reqVersion)
-    else stopApp(app, reqVersion)
+    if (m[2] === 'build') buildApp(app)
+    else if (m[2] === 'start') startApp(app)
+    else if (m[2] === 'deploy') deployApp(app)
+    else stopApp(app)
     return json(res, 200, { ok: true })
   }
-  // All-apps controls. Eligible = develop gate not failed and not mid-build/deploy; build and
-  // start additionally skip apps already running. Builds run SEQUENTIALLY (honest logs, no
-  // CPU storm); start/stop fire together. Ineligible apps are skipped silently.
-  const all = path.match(/^\/api\/all\/(build|start|stop)$/)
-  if (all && req.method === 'POST') {
-    const op = all[1]
-    const apps = loadConfig().apps
-    if (op === 'stop') {
-      for (const a of apps) {
-        if (running.has(a.name)) stopApp(a, reqVersion)
-        else probe(a).then((up) => { if (up) stopApp(a, reqVersion) })
-      }
-      return json(res, 200, { ok: true })
-    }
-    const eligible = []
-    for (const a of apps) {
-      if (developedOnce(a) === false || activity.has(a.name)) continue
-      if (await probe(a)) continue // already running — skip for build AND start
-      eligible.push(a)
-    }
-    if (op === 'start') {
-      for (const a of eligible) startApp(a, reqVersion)
-      return json(res, 200, { ok: true, count: eligible.length })
-    }
-    // op === 'build' — sequential chain: each build starts when the previous one exits.
-    const queue = [...eligible]
-    const next = () => { const a = queue.shift(); if (a) buildApp(a, reqVersion, next) }
-    next()
-    return json(res, 200, { ok: true, count: eligible.length })
-  }
   json(res, 404, { error: 'not found' })
 })
@@ -718,9 +652,8 @@ Docker fields (from the plan's `## Docker` / `## Dockerfiles` sections): top-lev
 `"dockerfile"` is `{ "path": "Dockerfile", "content": "<managed body>" }` for a `managed`
 Dockerfile (materialized before Build when missing — never overwriting), or
 `{ "path": "Dockerfile", "content": null }` for an `existing` one (`null` entirely when the
-app has no image). Commands may carry the literal `{VERSION}` token — copied verbatim; the
-server substitutes the topbar-selected version (semver sans `v`, fallback `latest`) at
-execution time.
+app has no image). Commands are copied verbatim from the plan and run as-is — no `{VERSION}`
+or any other token substitution.
 Each app also carries a `configs` array — the runtime config files the application reads at start,
 from the plan's `## Application Configs` section (one entry per file). Fields:
@@ -743,7 +676,7 @@ verbatim (this is a local dev CI/CD app).
       "folder": "my-app",
       "method": "process",
       "port": 3000,
-      "build": "pnpm install && pnpm build && docker build -t registry.example.com/team/my-app:{VERSION} .",
+      "build": "pnpm install && pnpm build && docker build -t registry.example.com/team/my-app:latest .",
       "start": "node dist/index.js",
       "stop": "process-kill",
       "deployMethod": "kubernetes",

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

@@ -13,8 +13,8 @@ description: >
   port for the generated CI/CD app itself. 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 -t <image>:{VERSION}` (the {VERSION} token is auto-resolved by the generated
-  CI/CD app to the project's current version), and a managed Dockerfile authored into the plan's
+  `docker build -t <image>:latest` (no version token — the generated CI/CD app runs commands
+  verbatim on the current working tree), and a managed Dockerfile authored into the plan's
   `## Dockerfiles` section for any dockerized application lacking one (materialized before
   Build, never overwriting an existing file). It also infers each application's RUNTIME CONFIG — the
   config files its start command reads (e.g. `.env`), deciding per file whether the values come
@@ -124,13 +124,12 @@ If the argument is missing or the file does not exist, STOP and tell the user to
     any character docker rejects replaced by `-` (keep a leading `<number>_` prefix as-is;
     e.g. `registry.example.com/team/skolafund_web`).
   - **Build**: append the image build to the app build —
-    `<app build> && docker build -t <image>:{VERSION} .` The literal `{VERSION}` token is
-    the contract: the generated CI/CD app substitutes the project's CURRENT version
-    (semver without the `v` prefix; `latest` fallback) into commands at execution time —
-    there is no user-facing version selector; only the current codebase is ever built.
+    `<app build> && docker build -t <image>:latest .` 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>:{VERSION}` in the
-    start/deploy commands too, so the current version's tag is what runs.
+  - **Container start/deploy**: when method=container, reference `<image>:latest` in the
+    start/deploy commands too, 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
@@ -221,12 +220,6 @@ inner ```env config block renders — the plan file itself uses a normal 3-backt
 > **Health** host — so an app is detected whichever family it binds. Use a `localhost` Health host
 > for Node/Vite/Next apps (they bind IPv6 `::1`) and `127.0.0.1` for JVM apps.
-> **`{VERSION}` token**: Build/Start/Deploy commands may contain the literal `{VERSION}`;
-> the generated CI/CD app replaces it with the project's CURRENT version (semver without
-> the `v` prefix, `latest` when unknown) at execution time — no user-facing selector.
-> Used by the docker-image path to tag images; tag-only — the code built is always the
-> working tree.
 ## Docker
 Written only from Gather 2a. When Docker or a docker repo is absent, write the section as: