@haus-tech/haus-workflow 6.2.0 → 6.4.0

package/library/global/skills/request/scripts/korning.mjs

@@ -957,7 +957,7 @@ export function korAgent({ agent, modell, prompt, fil, maxTurer, ctx }) {
     let tidsgransMs = null
     let timer = null
     let samtidiga = null
-    const avsluta = ({ exitCode, spawnfel = null }) => {
+    const avslutaAgent = ({ exitCode, spawnfel = null }) => {
       if (klar) return
       klar = true
       if (timer !== null) clearTimeout(timer)
@@ -991,9 +991,9 @@ export function korAgent({ agent, modell, prompt, fil, maxTurer, ctx }) {
         .then(
           (r) => {
             stdout = String(r?.stdout ?? '')
-            avsluta({ exitCode: r?.exitCode ?? 0 })
+            avslutaAgent({ exitCode: r?.exitCode ?? 0 })
           },
-          (e) => avsluta({ exitCode: null, spawnfel: e?.message ?? String(e) }),
+          (e) => avslutaAgent({ exitCode: null, spawnfel: e?.message ?? String(e) }),
         )
       return
     }
@@ -1004,7 +1004,7 @@ export function korAgent({ agent, modell, prompt, fil, maxTurer, ctx }) {
         stdio: ['pipe', 'pipe', 'pipe'],
       })
     } catch (e) {
-      avsluta({ exitCode: null, spawnfel: e.message })
+      avslutaAgent({ exitCode: null, spawnfel: e.message })
       return
     }
     ctx.barn.add(barn)
@@ -1024,11 +1024,11 @@ export function korAgent({ agent, modell, prompt, fil, maxTurer, ctx }) {
     })
     barn.on('error', (e) => {
       ctx.barn.delete(barn)
-      avsluta({ exitCode: null, spawnfel: e.message })
+      avslutaAgent({ exitCode: null, spawnfel: e.message })
     })
     barn.on('close', (code) => {
       ctx.barn.delete(barn)
-      avsluta({ exitCode: code })
+      avslutaAgent({ exitCode: code })
     })
     barn.stdin.on('error', () => {})
     barn.stdin.end(prompt)
@@ -1415,6 +1415,9 @@ const forstaRubrikI = (text) => {
 
 const INTERVJU_RE = /^INTERVJU KRÄVS:\s*(.*)$/u
 
+/** Svarets första rad läst som `INTERVJU KRÄVS: <skäl>`, matchen eller null. */
+const lasIntervju = (svar) => INTERVJU_RE.exec(svar.trim().split('\n')[0].trim())
+
 /** Designern (ADR-0156 beslut 1 och 6): ett agentsteg som skriver ett utkast
  *  eller svarar `INTERVJU KRÄVS:`. Returnerar `{ status: null }` när ett
  *  utkast bokfördes (eller steget inte gäller), `stopp` på INTERVJU KRÄVS
@@ -1449,8 +1452,28 @@ export async function korDesigner(del, ctx) {
     ctx,
   })
   if (!res.ok) return { status: 'ofärdig', orsak: `design: ${res.orsak}` }
-  const svar = utanYttreStaket(res.text)
-  const intervju = INTERVJU_RE.exec(svar.trim().split('\n')[0].trim())
+  let svar = utanYttreStaket(res.text)
+  let intervju = lasIntervju(svar)
+  // #746: ett INTERVJU KRÄVS utan skäl är ett scriptbevisat brott (stopp
+  // vägrar ett tomt --orsak). Det prövas före varje skrivning: EN
+  // omdispatch (ADR-0092), sedan ofärdig, och inget kvitto i postens katalog.
+  if (ctx.post && intervju && intervju[1].trim() === '') {
+    const brist = '- INTERVJU KRÄVS: saknar skäl; skriv skälet efter kolonet på samma rad'
+    logg(`BROTT ${delNamn(ctx, del.dir)} designer: INTERVJU KRÄVS utan skäl, omdispatch`)
+    const om = await korAgent({
+      agent: 'request-designer',
+      modell: ctx.modell,
+      prompt: omdispatchPrompt(prompt, [brist]),
+      fil: `steg/1${del.nr}-designer-omdispatch.json`,
+      maxTurer: MAX_TURER.designer,
+      ctx,
+    })
+    if (!om.ok) return { status: 'ofärdig', orsak: `design: ${om.orsak}` }
+    svar = utanYttreStaket(om.text)
+    intervju = lasIntervju(svar)
+    if (intervju && intervju[1].trim() === '')
+      return { status: 'ofärdig', orsak: 'design: INTERVJU KRÄVS utan skäl efter omdispatchen' }
+  }
   if (intervju) {
     const orsak = `intervju krävs: ${intervju[1].trim()}`
     logg(`STOPP ${delNamn(ctx, del.dir)} ${orsak}`)
@@ -2106,12 +2129,20 @@ function arkiveraDubbel(del, n, k1, k2, ctx) {
   const diff = jam.rader.map((r) => r.replace(/^- /, ''))
   skrivPris(del, huvud, vinnaren)
   skrivPris(del, run2, andra)
-  addRun(del.dir, scorerRad(vinnaren, huvud, { doubleRun, note: scorerNote(vinnaren) }), ctx)
+  // #754: på en OLIKA står diffraderna på körning 1:s runs-rad, som i det
+  // manuella flödet (SKILL.md bedöm steg 6). Arkiv skrivna före #754 bär dem
+  // på körning 2:s rad; detaljer <post> state visar båda.
+  const olikaDiff = (k) => (jam.verdikt === 'OLIKA' && k === k1 ? diff : [])
+  addRun(
+    del.dir,
+    scorerRad(vinnaren, huvud, { doubleRun, note: scorerNote(vinnaren, olikaDiff(vinnaren)) }),
+    ctx,
+  )
   addRun(
     del.dir,
     scorerRad(andra, run2, {
       doubleRun,
-      note: scorerNote(andra, jam.verdikt === 'OLIKA' ? diff : []),
+      note: scorerNote(andra, olikaDiff(andra)),
       // En OLIKA har ingen gällande fil att peka på förrän domen är fälld.
       ...(jam.verdikt === 'OLIKA' ? {} : { supersededBy: huvud }),
     }),
@@ -2230,7 +2261,7 @@ function postStatus(ctx, korStatus) {
  *  en dödad korning.mjs, och korning.json skrivs aldrig, så både pengarna och
  *  mätningen försvinner tyst. Kör aldrig återstoden av flödet: en avbruten
  *  körning ÄR ofärdig. */
-function avbryt(ctx, allaSteg, nyckel, signal) {
+export function avbryt(ctx, allaSteg, nyckel, signal, { exit = process.exit } = {}) {
   const antal = ctx.barn.size
   for (const barn of ctx.barn) barn.kill('SIGTERM')
   skrivKorningsjson(ctx, allaSteg)
@@ -2253,7 +2284,9 @@ function avbryt(ctx, allaSteg, nyckel, signal) {
     if (r.status !== 0) logg(`VARNING experiment --status ofärdig: ${felText(r)}`)
   }
   logg(`AVBRUTEN ${signal}: ${antal} barnprocess(er) dödade, korning.json skriven`)
-  process.exit(SIGNAL_EXIT)
+  // #748: samma STATUS-rad som avslutet, så startaren läser mer än exitkoden.
+  if (ctx.post) process.stdout.write('STATUS: ofärdig\n')
+  exit(SIGNAL_EXIT)
 }
 
 /** Vaktens intervall: startaren prövas var 30:e sekund. */

package/library/global/skills/request/scripts/lib.mjs

@@ -623,17 +623,31 @@ export const avvikelseEtikett = (text) => {
 }
 
 /**
- * Fritexten efter etiketten på samma rad, utan inledande skiljetecken, eller
- * null när raden saknas eller bara bär etiketten. precheck skriver den som
- * `AVVIKELSE-TEXT:` så orkestratorn kan se en designkonflikt (texten börjar
- * med `design conflict:`, #596) utan att läsa filen själv.
+ * Fritexten efter etiketten, utan inledande skiljetecken eller streck
+ * (bindestreck, U+2012, U+2013, U+2014; #753), eller null när raden saknas
+ * eller ingen text följer. Bär etikettraden ingen text läses första
+ * icke-tomma raden efter den, utom när den raden är nästa fält (`**…:**`)
+ * eller en rubrik (#753). Etiketten själv läses lika strikt som förut.
+ * precheck skriver texten som `AVVIKELSE-TEXT:` så orkestratorn kan se en
+ * designkonflikt (texten börjar med `design conflict:`, #596) utan att läsa
+ * filen själv.
  */
 export const avvikelseText = (text) => {
   const rad = granskareRadRe('Avvikelse mot specen').source
-  const m = new RegExp(`${rad}[ \\t]*\\p{L}+[ \\t.,;:!?]*(.*)$`, 'imu').exec(String(text))
+  const skilje = '[ \\t.,;:!?\\-\\u2012\\u2013\\u2014]*'
+  const str = String(text)
+  const m = new RegExp(`${rad}[ \\t]*\\p{L}+${skilje}(.*)$`, 'imu').exec(str)
   if (!m) return null
   const rest = m[1].trim()
-  return rest === '' ? null : rest
+  if (rest !== '') return rest
+  const nasta = str
+    .slice(m.index + m[0].length)
+    .split(/\r?\n/)
+    .map((l) => l.trim())
+    .find((l) => l !== '')
+  if (nasta === undefined || /^\*\*[^*]+:\*\*|^#/u.test(nasta)) return null
+  const foljande = nasta.replace(new RegExp(`^${skilje}`, 'u'), '').trim()
+  return foljande === '' ? null : foljande
 }
 
 /**

package/library/global/skills/request/scripts/svep.mjs

@@ -504,11 +504,11 @@ export async function korVarv({ gid, modell, expDir, repoRot, konto, claude, pag
   )
   if (prov.status !== 0) varningar.push(`proveniens: ${felText(prov)}`)
 
-  let usd = null
+  let belopp = null
   let modellfel = null
   try {
     const korning = JSON.parse(readFileSync(path.join(katalog, 'korning.json'), 'utf8'))
-    if (typeof korning.total_cost_usd === 'number') usd = korning.total_cost_usd
+    if (typeof korning.total_cost_usd === 'number') belopp = korning.total_cost_usd
     if (exitCode === 0) {
       // korning.mjs har redan gjort verifieringen per steg (modellverifiering);
       // svepets egen verifieraModeller är reserven när det fältet saknas
@@ -543,9 +543,9 @@ export async function korVarv({ gid, modell, expDir, repoRot, konto, claude, pag
   }
   const orsak = avg.orsak ?? inre?.orsak ?? null
   ut(
-    `KLAR ${gid} ${modell} ${avg.status} ${wall_ms}ms${usd !== null ? ` ${usd.toFixed(4)} USD` : ''}`,
+    `KLAR ${gid} ${modell} ${avg.status} ${wall_ms}ms${belopp !== null ? ` ${belopp.toFixed(4)} USD` : ''}`,
   )
-  return { modell, status: avg.status, orsak, korning: nyckel, wall_ms, usd, varningar }
+  return { modell, status: avg.status, orsak, korning: nyckel, wall_ms, usd: belopp, varningar }
 }
 
 /** `väntar på dom` omvärderas: sparr exit 0 på alla löv betyder att domen är

package/library/schemas/localdev.v2.schema.json

@@ -0,0 +1,369 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://github.com/WeAreHausTech/haus-workflow/library/schemas/localdev.v2.schema.json",
+  "title": "haus localdev.yml (version 2)",
+  "description": "The CLI-parsed part of .haus-workflow/localdev.yml (ADR-0163). Only `version`, `instance` and the templates in `env` are validated by the CLI (src/workspace/env/manifest.ts, which is the enforcement); every other top-level key is agent-interpreted by the clone skill and left open here. Templates: {{slug}}, {{port.<name>}}, {{db.<name>}}, {{redis.<name>.db}}, {{search.<name>.prefix}}, {{site.<name>.url|host|root}}.",
+  "type": "object",
+  "properties": {
+    "version": {
+      "enum": [1, 2]
+    },
+    "instance": {
+      "type": "object",
+      "additionalProperties": false,
+      "description": "Per-worktree environment. A repo file may declare only ports and processes.",
+      "properties": {
+        "ports": {
+          "type": "object",
+          "propertyNames": {
+            "type": "string",
+            "pattern": "^[a-z0-9][a-z0-9_-]*$"
+          },
+          "additionalProperties": {
+            "type": "integer",
+            "minimum": 1,
+            "maximum": 65535
+          },
+          "maxProperties": 20,
+          "description": "name -> main-checkout port; a worktree gets lease base + declaration index"
+        },
+        "datastores": {
+          "type": "object",
+          "propertyNames": {
+            "type": "string",
+            "pattern": "^[a-z0-9][a-z0-9_-]*$"
+          },
+          "additionalProperties": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": ["engine"],
+            "properties": {
+              "engine": {
+                "enum": [
+                  "mariadb",
+                  "mysql",
+                  "postgres",
+                  "redis",
+                  "elasticsearch",
+                  "opensearch",
+                  "mssql"
+                ]
+              },
+              "compose": {
+                "type": "object",
+                "additionalProperties": false,
+                "required": ["project", "service"],
+                "properties": {
+                  "project": {
+                    "type": "string",
+                    "minLength": 1
+                  },
+                  "service": {
+                    "type": "string",
+                    "minLength": 1
+                  },
+                  "file": {
+                    "type": "string",
+                    "minLength": 1,
+                    "description": "Compose file, relative to the workspace root, passed as -f when env up has to create the engine (for a non-default name such as docker-compose.local.yml)."
+                  }
+                }
+              },
+              "native": {
+                "type": "object",
+                "additionalProperties": false,
+                "required": ["host", "port"],
+                "description": "An engine on the host, outside Docker (mariadb, mysql, elasticsearch, opensearch). haus never starts it; SQL credentials come only from MYSQL_USER / MYSQL_PWD or ~/.my.cnf.",
+                "properties": {
+                  "host": {
+                    "type": "string",
+                    "pattern": "^[A-Za-z0-9._:-]+$"
+                  },
+                  "port": {
+                    "type": "integer",
+                    "minimum": 1,
+                    "maximum": 65535
+                  },
+                  "client": {
+                    "type": "string",
+                    "pattern": "^[A-Za-z0-9._/+-]+$",
+                    "description": "mysql/mariadb client: a command on PATH or an absolute path (default: mysql or mariadb on PATH)"
+                  }
+                }
+              },
+              "port": {
+                "type": "integer",
+                "minimum": 1,
+                "maximum": 65535,
+                "description": "The engine port. Optional with native: (defaults to native.port)."
+              },
+              "isolation": {
+                "enum": ["database", "db-index", "key-prefix", "prefix", "container"],
+                "description": "Default per engine: database (SQL, mssql included), db-index (redis), prefix (search). container has no driver yet."
+              },
+              "prefix": {
+                "type": "string",
+                "description": "The main checkout's index or key prefix (default empty)."
+              }
+            },
+            "oneOf": [
+              {
+                "required": ["compose", "port"]
+              },
+              {
+                "required": ["native"]
+              }
+            ]
+          }
+        },
+        "databases": {
+          "type": "object",
+          "propertyNames": {
+            "type": "string",
+            "pattern": "^[a-z0-9][a-z0-9_-]*$"
+          },
+          "additionalProperties": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": ["on", "name"],
+            "properties": {
+              "on": {
+                "type": "string",
+                "description": "A datastore name"
+              },
+              "name": {
+                "type": "string",
+                "minLength": 1
+              },
+              "perWorktree": {
+                "enum": ["clone", "empty"],
+                "default": "clone"
+              }
+            }
+          }
+        },
+        "sites": {
+          "type": "object",
+          "propertyNames": {
+            "type": "string",
+            "pattern": "^[a-z0-9][a-z0-9_-]*$"
+          },
+          "additionalProperties": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": ["kind", "root", "host"],
+            "properties": {
+              "kind": {
+                "const": "herd"
+              },
+              "mode": {
+                "enum": ["per-worktree", "shared-lock"],
+                "default": "per-worktree"
+              },
+              "root": {
+                "type": "string",
+                "minLength": 1,
+                "description": "Relative path inside the repo; no leading / and no .."
+              },
+              "host": {
+                "type": "string",
+                "minLength": 1,
+                "description": "May use templates, e.g. {{slug}}.shop.se"
+              },
+              "mainHost": {
+                "type": "string",
+                "description": "The main checkout's host (default: basename of root)"
+              },
+              "secure": {
+                "type": "boolean",
+                "default": false
+              },
+              "php": {
+                "type": ["string", "number"]
+              },
+              "copy": {
+                "enum": ["cow", "none"],
+                "description": "cow clones the main docroot; none uses the worktree folder as it is (the default, and required, for bedrock-env and laravel-env, whose root is a member repo)."
+              },
+              "share": {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "minLength": 1
+                }
+              },
+              "plugins": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "string",
+                  "minLength": 1
+                }
+              },
+              "config": {
+                "type": "object",
+                "additionalProperties": false,
+                "required": ["kind"],
+                "properties": {
+                  "kind": {
+                    "enum": ["wp-config-override", "bedrock-env", "laravel-env"],
+                    "description": "wp-config-override writes wp-config.haus-instance.php; bedrock-env and laravel-env write the defines into the site repo's .env (instance-owned keys)."
+                  },
+                  "defines": {
+                    "type": "object",
+                    "propertyNames": {
+                      "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
+                    },
+                    "additionalProperties": {
+                      "type": "string"
+                    }
+                  }
+                }
+              },
+              "after": {
+                "type": "array",
+                "items": {
+                  "type": "string",
+                  "minLength": 1
+                }
+              }
+            }
+          }
+        },
+        "processes": {
+          "type": "object",
+          "propertyNames": {
+            "type": "string",
+            "pattern": "^[a-z0-9][a-z0-9_-]*$"
+          },
+          "additionalProperties": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": ["start"],
+            "properties": {
+              "repo": {
+                "type": "string",
+                "description": "Required in the workspace file; defaults to the owning repo in a repo file. In a single-repo project (ADR-0167), the folder inside the repo the process runs in (`.` for the root)"
+              },
+              "start": {
+                "type": "string",
+                "minLength": 1
+              },
+              "port": {
+                "type": "string",
+                "description": "A name from instance.ports"
+              },
+              "health": {
+                "type": "string"
+              },
+              "healthTimeoutSec": {
+                "type": "number",
+                "exclusiveMinimum": 0,
+                "default": 120
+              },
+              "optional": {
+                "type": "boolean",
+                "default": false
+              }
+            }
+          }
+        },
+        "copyLocal": {
+          "type": "array",
+          "items": {
+            "type": "object",
+            "additionalProperties": false,
+            "required": ["repo", "path"],
+            "properties": {
+              "repo": {
+                "type": "string",
+                "minLength": 1
+              },
+              "path": {
+                "type": "string",
+                "minLength": 1,
+                "description": "Relative path inside the repo; no leading / and no .."
+              }
+            }
+          }
+        },
+        "teardown": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "minLength": 1
+          },
+          "description": "Shell commands (templated) env down --destroy and env gc --write run after stopping processes and before dropping databases; workspace file only, must be idempotent"
+        },
+        "after": {
+          "type": "array",
+          "items": {
+            "type": "string",
+            "minLength": 1
+          },
+          "description": "Shell commands (templated) env up runs once per environment in the worktree root, after the .env files and .haus-env.json are written (for example seeding a per-worktree bucket from the main one, ADR-0167); a failed one is retried by the next env up; workspace file only, must be idempotent"
+        }
+      }
+    },
+    "env": {
+      "type": "array",
+      "items": {
+        "type": "object",
+        "required": ["sinks"],
+        "properties": {
+          "value": {
+            "type": ["string", "number"]
+          },
+          "source": {
+            "type": "object",
+            "required": ["provides"],
+            "properties": {
+              "repo": {
+                "type": "string"
+              },
+              "provides": {
+                "type": "string"
+              }
+            }
+          },
+          "sinks": {
+            "type": "array",
+            "items": {
+              "type": "object",
+              "required": ["repo", "key"],
+              "properties": {
+                "repo": {
+                  "type": "string",
+                  "minLength": 1,
+                  "description": "A member repo (id or folder) in a workspace; in a single-repo project (ADR-0167) a folder inside the repo in canonical form, `.` for the root or `apps/server` for a monorepo app, whose .env receives the key"
+                },
+                "key": {
+                  "type": "string",
+                  "pattern": "^[A-Za-z_][A-Za-z0-9_]*$"
+                }
+              }
+            }
+          }
+        },
+        "anyOf": [
+          {
+            "required": ["value"]
+          },
+          {
+            "required": ["source"]
+          }
+        ]
+      }
+    }
+  },
+  "if": {
+    "required": ["instance"]
+  },
+  "then": {
+    "properties": {
+      "version": {
+        "const": 2
+      }
+    },
+    "required": ["version"]
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haus-tech/haus-workflow",
-  "version": "6.2.0",
+  "version": "6.4.0",
   "description": "Haus AI workflow CLI for Claude Code.",
   "type": "module",
   "bin": {
@@ -16,6 +16,7 @@
     "scripts/postinstall.mjs",
     "library/global",
     "library/catalog",
+    "library/schemas",
     "README.md",
     "CHANGELOG.md",
     "docs/before-you-start.md",
@@ -28,6 +29,7 @@
     "test:quick": "node scripts/test-fast.mjs --quick",
     "test:full": "node scripts/run-tests.mjs tests/**/*.test.js",
     "test:coverage": "c8 yarn test:full",
+    "test:integration": "HAUS_INTEGRATION=1 node scripts/run-tests.mjs tests/integration/*.int.test.js",
     "coverage:check": "c8 --check-coverage yarn test:full",
     "lint": "eslint src --cache --cache-location .eslintcache",
     "format:check": "prettier --check --cache --cache-location .prettiercache .",