@wjarka/cezarion 0.16.0 → 0.17.0

package/dist/skills.js

@@ -1,9 +1,9 @@
 import { readdir, readFile, realpath, stat } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { join, resolve, basename, dirname, extname } from 'node:path';
-import { gatedSkillsRepos } from './config.js';
+import { teamSkillRefSchema } from './contract/index.js';
 import { getTeamSkillsCached } from './skills-remote.js';
-import { readWorkspaceUiState } from './workspace/ui-state.js';
+import { readProjectUiState } from './ui-state.js';
 /* Precedence order — earlier dirs win name collisions. `npx skills` writes
    the canonical copy to `.agents/skills/<name>/SKILL.md` and mirrors it into
    each agent's dir (often as symlinks) — scanning them all and deduping by
@@ -23,15 +23,8 @@ export const SKILL_DIRS = [
     { dir: '.cursor/skills', source: 'agents' },
     { dir: '.opencode/skills', source: 'agents' },
 ];
-/* Deliberately `homedir()` and not `agentHomePaths().claude`: these do NOT follow an
-   agent profile (`src/core/agent-profiles.ts`). A skill is CONTENT — a playbook — not
-   identity, and a second Claude login is not a second skill library. `npx skills`, which
-   writes the `~/.claude/skills` mirror, is profile-unaware for the same reason.
-
-   Resolved at catalog-read time (not module load) so a test can plant fixtures under a
-   temp `$HOME`. #366: empty under vitest — the same `process.env.VITEST` seam #365 uses
-   for the vendor team source — so the unit suite does not merge the developer's real
-   `~/.agents/skills` / `~/.claude/skills`. Production is unchanged. */
+/* Global skill libraries follow the user home, not an agent account. Resolve at read time;
+   under vitest omit real global sources so tests cannot read the developer’s library. */
 function globalSkillDirs() {
     if (process.env.VITEST)
         return [];
@@ -41,35 +34,27 @@ function globalSkillDirs() {
     ];
 }
 /**
- * Discover the merged skill catalog for a repo. Name collisions resolve
- * local-first: `.ai/cezar/skills` → `.ai/skills` → `.agents/skills` + agent
- * mirrors → global (`~/.agents/skills`, `~/.claude/skills`) → team repo
- * ("the user's repo is the source of truth"). Missing directories are fine —
- * an empty catalog is fully supported (steps fall back to their plain
- * prompt). Team skills come from the in-process cache; the first call starts
- * a background load so nothing here ever waits on the network.
+ * Discover skills local-first, then global and cached team sources. Missing sources and an
+ * empty catalog are valid; network loading stays in the background.
+ *
+ * Off-list: `disabledTeamSkills` in this project's `.ai/cezar/ui-state.json` names team skills
+ * by source repo and name. They are dropped from the team list before de-duplication, so the
+ * same name from another source still shows. Only the project's own file is read, and an absent
+ * or malformed list switches nothing off. This is the single chokepoint, so the decision is
+ * identical for every consumer — catalog, composer picker, planner, runner — and companion
+ * provisioning applies it too.
  *
- * Opt-out gate: skills from a *default* (vendor) skills repo — `open-mercato/skills`
- * for the zero-config majority, see `gatedSkillsRepos` — appear unless the user has
- * curated them away. `importedSkills` in the GLOBAL `~/.cezar/ui-state.json` (not the
- * per-repo file — the selection describes the person and must not depend on the launch
- * directory, multi-project workspace) is a tri-state: ABSENT means "not curated" and
- * every default skill shows (the historical behavior — no upgrade break for existing
- * installs); a PRESENT array (even `[]`) means the user has taken control and only those
- * names show. A repo that sets its own `skillsRepos` gates nothing regardless. This is the
- * single chokepoint, so the decision is identical for every consumer — catalog, composer
- * picker, planner, runner.
+ * Caller-supplied builtin skills come last; discovered skills of the same name take precedence.
  */
-export async function discoverSkills(repoRoot) {
-    const [lists, gatedRepos, uiState] = await Promise.all([
+export async function discoverSkills(repoRoot, options = {}) {
+    const [lists, uiState] = await Promise.all([
         Promise.all([
             ...SKILL_DIRS.map(({ dir, source }) => readMarkdownSkills(resolve(repoRoot, dir), source)),
             ...globalSkillDirs().map(({ dir, source }) => readMarkdownSkills(dir, source)),
         ]),
-        gatedSkillsRepos(repoRoot),
-        readWorkspaceUiState(),
+        readProjectUiState(repoRoot),
     ]);
-    const teamSkills = filterImportedTeamSkills(getTeamSkillsCached(repoRoot), gatedRepos, readImportedSkills(uiState));
+    const teamSkills = filterDisabledTeamSkills(getTeamSkillsCached(repoRoot), readDisabledTeamSkills(uiState));
     const merged = [];
     const seen = new Set();
     for (const skills of [...lists, teamSkills]) {
@@ -81,36 +66,40 @@ export async function discoverSkills(repoRoot) {
         }
     }
     merged.sort((a, b) => a.name.localeCompare(b.name));
+    for (const skill of options.builtin ?? []) {
+        if (seen.has(skill.name))
+            continue;
+        seen.add(skill.name);
+        merged.push({ ...skill });
+    }
     return merged;
 }
 /**
- * The imported team-skill names from a raw `ui-state.json` object, as a tri-state:
- * `undefined` means the key is absent — "not curated", so every default skill shows
- * (the opt-out default that keeps existing installs whole); an array (even empty) is
- * the user's explicit selection. Defensive because the file is user-editable: a value
- * that is not an array degrades to `undefined` (keep all — the safe, backward-compatible
- * reading), and non-string / empty entries inside an array are dropped rather than thrown on.
+ * The switched-off team skills from a raw `ui-state.json` object. Defensive because the file is
+ * user-editable: a value that is not an array reads as `[]`, and entries that do not parse as a
+ * `{ repo, name }` ref are dropped rather than thrown on.
  */
-export function readImportedSkills(uiState) {
-    const value = uiState.importedSkills;
+export function readDisabledTeamSkills(uiState) {
+    const value = uiState.disabledTeamSkills;
     if (!Array.isArray(value))
-        return undefined;
-    return value.filter((name) => typeof name === 'string' && name.length > 0);
+        return [];
+    const refs = [];
+    for (const entry of value) {
+        const parsed = teamSkillRefSchema.safeParse(entry);
+        if (parsed.success)
+            refs.push(parsed.data);
+    }
+    return refs;
 }
 /**
- * The opt-out gate: keep every team skill whose repo is NOT gated (a repo with its own
- * configured `skillsRepos` — auto-loads everything). For skills from a gated default
- * (vendor) repo, `importedSkills === undefined` keeps them ALL (not curated — the
- * historical behavior), while a present array keeps only the named ones. Local skills
- * carry no `team` and are always kept. Pure so the gate is unit-testable without a
- * network clone (the gated set is a const default otherwise).
+ * Drop every team skill the project switched off, matched on source repo AND name. Local skills
+ * carry no `team` and are always kept. Pure, so it is testable without a network clone.
  */
-export function filterImportedTeamSkills(teamSkills, gatedRepos, importedSkills) {
-    // Not curated → the full default catalog still appears (no upgrade break).
-    if (importedSkills === undefined)
+export function filterDisabledTeamSkills(teamSkills, disabled) {
+    if (disabled.length === 0)
         return [...teamSkills];
-    const imported = new Set(importedSkills);
-    return teamSkills.filter((skill) => !skill.team || !gatedRepos.has(skill.team.repo) || imported.has(skill.name));
+    const off = new Set(disabled.map((ref) => JSON.stringify([ref.repo, ref.name])));
+    return teamSkills.filter((skill) => !skill.team || !off.has(JSON.stringify([skill.team.repo, skill.name])));
 }
 /**
  * Walk a skills dir for entrypoints, following directory symlinks. Once a

package/dist/skills.js.map

@@ -1 +1 @@
-{"version":3,"file":"skills.js","sourceRoot":"","sources":["../src/skills.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAC;AA8B/D;;;;;;;;;oDASoD;AACpD,MAAM,CAAC,MAAM,UAAU,GAAoD;IACzE,EAAE,GAAG,EAAE,kBAAkB,EAAE,MAAM,EAAE,OAAO,EAAE;IAC5C,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,EAAE;IACnC,EAAE,GAAG,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,EAAE;IAC3C,EAAE,GAAG,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,EAAE;IAC3C,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,EAAE,QAAQ,EAAE;IAC1C,EAAE,GAAG,EAAE,gBAAgB,EAAE,MAAM,EAAE,QAAQ,EAAE;IAC3C,EAAE,GAAG,EAAE,kBAAkB,EAAE,MAAM,EAAE,QAAQ,EAAE;CAC9C,CAAC;AAEF;;;;;;;;uEAQuE;AACvE,SAAS,eAAe;IACtB,IAAI,OAAO,CAAC,GAAG,CAAC,MAAM;QAAE,OAAO,EAAE,CAAC;IAClC,OAAO;QACL,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,gBAAgB,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE;QAC5D,EAAE,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,gBAAgB,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE;KAC7D,CAAC;AACJ,CAAC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,QAAgB;IACnD,MAAM,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC;YACV,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,kBAAkB,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;YAC1F,GAAG,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;SAC/E,CAAC;QACF,gBAAgB,CAAC,QAAQ,CAAC;QAC1B,oBAAoB,EAAE;KACvB,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,wBAAwB,CACzC,mBAAmB,CAAC,QAAQ,CAAC,EAC7B,UAAU,EACV,kBAAkB,CAAC,OAAO,CAAC,CAC5B,CAAC;IACF,MAAM,MAAM,GAAY,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,MAAM,IAAI,CAAC,GAAG,KAAK,EAAE,UAAU,CAAC,EAAE,CAAC;QAC5C,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC;gBAAE,SAAS;YACnC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACrB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACrB,CAAC;IACH,CAAC;IACD,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IACpD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,kBAAkB,CAAC,OAAgC;IACjE,MAAM,KAAK,GAAG,OAAO,CAAC,cAAc,CAAC;IACrC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAC;IAC5C,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAkB,EAAE,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAC7F,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,wBAAwB,CACtC,UAA4B,EAC5B,UAA+B,EAC/B,cAA6C;IAE7C,2EAA2E;IAC3E,IAAI,cAAc,KAAK,SAAS;QAAE,OAAO,CAAC,GAAG,UAAU,CAAC,CAAC;IACzD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,CAAC;IACzC,OAAO,UAAU,CAAC,MAAM,CACtB,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CACvF,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,eAAe,CAC5B,GAAW,EACX,KAAa,EACb,OAAoB;IAEpB,IAAI,KAAK,GAAG,CAAC;QAAE,OAAO,EAAE,CAAC;IACzB,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC,CAAC,kCAAkC;IAC/C,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACjC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAElB,IAAI,OAAO,CAAC;IACZ,IAAI,CAAC;QACH,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;IACD,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;IACtE,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QAC7C,IAAI,CAAC;YACH,IAAI,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE;gBAAE,OAAO,CAAC,SAAS,CAAC,CAAC;QAC3D,CAAC;QAAC,MAAM,CAAC;YACP,uEAAuE;QACzE,CAAC;IACH,CAAC;IAED,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;QACnC,IAAI,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;QAChC,IAAI,KAAK,CAAC,cAAc,EAAE,EAAE,CAAC;YAC3B,IAAI,CAAC;gBACH,KAAK,GAAG,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,wBAAwB;YACpE,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS,CAAC,mBAAmB;YAC/B,CAAC;QACH,CAAC;QACD,IAAI,KAAK,EAAE,CAAC;YACV,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,eAAe,CAAC,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QACnE,CAAC;aAAM,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,KAAK,KAAK,EAAE,CAAC;YACvD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,KAAK,UAAU,kBAAkB,CAAC,GAAW,EAAE,MAAuB;IACpE,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IACvD,MAAM,MAAM,GAAY,EAAE,CAAC;IAC3B,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE,CAAC;QAC5B,IAAI,GAAW,CAAC;QAChB,IAAI,CAAC;YACH,GAAG,GAAG,MAAM,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;QACxC,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,MAAM,EAAE,WAAW,EAAE,IAAI,EAAE,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC;QACpD,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QACjD,iEAAiE;QACjE,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACpF,MAAM,IAAI,GACR,OAAO,WAAW,CAAC,IAAI,KAAK,QAAQ,IAAI,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE;YAC7D,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE;YACzB,CAAC,CAAC,QAAQ,CAAC;QACf,MAAM,WAAW,GACf,OAAO,WAAW,CAAC,WAAW,KAAK,QAAQ,IAAI,WAAW,CAAC,WAAW,CAAC,IAAI,EAAE;YAC3E,CAAC,CAAC,WAAW,CAAC,WAAW,CAAC,IAAI,EAAE;YAChC,CAAC,CAAC,SAAS,CAAC;QAChB,MAAM,WAAW,GAAG,WAAW,CAAC,WAAW,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1E,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;IAC/E,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAID;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAW;IAI1C,0EAA0E;IAC1E,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IACzC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;QAAE,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAErE,uEAAuE;IACvE,2DAA2D;IAC3D,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC;IAC5C,IAAI,OAAO,KAAK,CAAC,CAAC;QAAE,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;IAE1D,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;IACrC,MAAM,cAAc,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC;IACzE,MAAM,IAAI,GAAG,cAAc,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,cAAc,GAAG,CAAC,CAAC,CAAC;IAEzE,MAAM,WAAW,GAAqC,EAAE,CAAC;IACzD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACtC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS;QAC1D,MAAM,CAAC,GAAG,4BAA4B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClD,IAAI,CAAC,CAAC;YAAE,SAAS;QACjB,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC,CAAW,CAAC;QAC3B,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;QAEjC,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;YAChB,MAAM,KAAK,GAAa,EAAE,CAAC;YAC3B,OAAO,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;gBACnE,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;gBAC7E,CAAC,EAAE,CAAC;YACN,CAAC;YACD,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;YACzB,SAAS;QACX,CAAC;QAED,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC/C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YACvC,WAAW,CAAC,GAAG,CAAC,GAAG,KAAK;gBACtB,CAAC,CAAC,KAAK;qBACF,KAAK,CAAC,GAAG,CAAC;qBACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;qBACjC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;gBAChC,CAAC,CAAC,EAAE,CAAC;YACP,SAAS;QACX,CAAC;QAED,WAAW,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;IACvC,CAAC;IAED,OAAO,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;AAC/B,CAAC;AAED,SAAS,WAAW,CAAC,CAAS;IAC5B,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACrF,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACxB,CAAC;IACD,OAAO,CAAC,CAAC;AACX,CAAC"}
+{"version":3,"file":"skills.js","sourceRoot":"","sources":["../src/skills.ts"],"names":[],"mappings":"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"}

package/dist/subcommands.d.ts

@@ -0,0 +1,11 @@
+/**
+ * The CLI subcommands that take flags of their own, so `index.ts` runs them before its global
+ * parseArgs: their flags are not cockpit flags (#504, #774, #1576). Each module loads only when
+ * its command runs.
+ */
+export type SubcommandRunner = (argv: string[], env: NodeJS.ProcessEnv) => Promise<number>;
+export declare const SUBCOMMAND_NAMES: readonly ['discover', 'artifact', 'task', 'automation', 'webhook', 'worker'];
+/** The runner for `name`, or nothing when `name` is not a subcommand. */
+export declare function loadSubcommand(name: string | undefined): Promise<SubcommandRunner | undefined>;
+/** Run `argv[0]` when it names a subcommand and answer its exit code; anything else is not ours. */
+export declare function runSubcommand(argv: string[], env: NodeJS.ProcessEnv): Promise<number | undefined>;

package/dist/subcommands.js

@@ -0,0 +1,24 @@
+/**
+ * The CLI subcommands that take flags of their own, so `index.ts` runs them before its global
+ * parseArgs: their flags are not cockpit flags (#504, #774, #1576). Each module loads only when
+ * its command runs.
+ */
+export const SUBCOMMAND_NAMES = ['discover', 'artifact', 'task', 'automation', 'webhook', 'worker'];
+/** The runner for `name`, or nothing when `name` is not a subcommand. */
+export async function loadSubcommand(name) {
+    switch (name) {
+        case 'discover': return (await import('./discovery/cli.js')).runDiscoverCommand;
+        case 'artifact': return (await import('./artifacts/cli.js')).runArtifactCommand;
+        case 'task': return (await import('./task-cli/cli.js')).runTaskCommand;
+        case 'automation': return (await import('./automations/automation-cli.js')).runAutomationCommand;
+        case 'webhook': return (await import('./webhooks/cli.js')).runWebhookCommand;
+        case 'worker': return (await import('./delegation/cli.js')).runWorkerCommand;
+        default: return undefined;
+    }
+}
+/** Run `argv[0]` when it names a subcommand and answer its exit code; anything else is not ours. */
+export async function runSubcommand(argv, env) {
+    const run = await loadSubcommand(argv[0]);
+    return run ? run(argv.slice(1), env) : undefined;
+}
+//# sourceMappingURL=subcommands.js.map

package/dist/subcommands.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"subcommands.js","sourceRoot":"","sources":["../src/subcommands.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,QAAQ,CAAU,CAAC;AAE7G,yEAAyE;AACzE,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAwB;IAC3D,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,UAAU,EAAE,OAAO,CAAC,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,kBAAkB,CAAC;QAChF,KAAK,UAAU,EAAE,OAAO,CAAC,MAAM,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,kBAAkB,CAAC;QAChF,KAAK,MAAM,EAAE,OAAO,CAAC,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,cAAc,CAAC;QACvE,KAAK,YAAY,EAAE,OAAO,CAAC,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAAC,CAAC,oBAAoB,CAAC;QACjG,KAAK,SAAS,EAAE,OAAO,CAAC,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,iBAAiB,CAAC;QAC7E,KAAK,QAAQ,EAAE,OAAO,CAAC,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC,CAAC,gBAAgB,CAAC;QAC7E,SAAS,OAAO,SAAS,CAAC;IAC5B,CAAC;AACH,CAAC;AAED,oGAAoG;AACpG,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,IAAc,EAAE,GAAsB;IACxE,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,OAAO,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACnD,CAAC"}

package/dist/task-cli/cli.js

@@ -2,9 +2,15 @@ import { randomUUID } from 'node:crypto';
 import { open as openFile } from 'node:fs/promises';
 import { resolve } from 'node:path';
 import { parseArgs } from 'node:util';
-import { apiRunSchema, archiveFinishedResponseSchema, cancelResponseSchema, changesPayloadSchema, finishResponseSchema, messageResponseSchema, runHistoryContextSchema, runRecordSchema, runStatusSchema, skillSchema, } from '../contract/index.js';
+import { apiRunSchema, archiveFinishedResponseSchema, cancelResponseSchema, finishResponseSchema, messageResponseSchema, runRecordSchema, runStatusSchema, } from '../contract/index.js';
+import { changesPayloadSchema } from '../contract/index.js';
+import { pendingAskOf } from '../contract/index.js';
+import { asksQuestion } from '../contract/index.js';
+import { runHistoryContextSchema } from '../contract/index.js';
+import { skillSchema } from '../contract/index.js';
 import { openUrl } from '../open-url.js';
-import { skillFlagIssue, skillTaskSteps } from '../workflows/types.js';
+import { RUNNER_IDS } from '../core/agent-runner.js';
+import { runnerFlag, skillFlagIssue, skillTaskSteps } from '../workflows/types.js';
 import { discoverCockpit } from './discovery.js';
 import { handoffUrl, invalidResponse, refuse, request, TaskCliError, threadUrl } from './http.js';
 import { projectListRow, projectStatus } from './projections.js';
@@ -25,7 +31,7 @@ const TASK_TEXT_MAX_CHARS = 100_000;
 const DEFAULT_TIMEOUT_SECONDS = 600;
 const MAX_TIMEOUT_SECONDS = 1_800;
 const TIMEOUT_FLAG = { type: 'string', help: `<1-${MAX_TIMEOUT_SECONDS}>  Give up after this many seconds (default ${DEFAULT_TIMEOUT_SECONDS}).` };
-/** Shared by `wait` and `start --wait` (#553): attention is the default, settled the opt-in. */
+/** Shared by `wait`, `start --wait` (#553) and `log --follow` (#931): attention is the default, settled the opt-in. */
 const UNTIL_FLAG = { type: 'string', help: '<attention|settled> attention (default): stop when the task needs you or ends; settled: terminal status only.' };
 export const OPERATIONS = {
     start: {
@@ -37,10 +43,13 @@ export const OPERATIONS = {
             'request-id': { type: 'string', help: '<UUID>     Retry-safe id; reuse it when retrying this start.' },
             workflow: { type: 'string', help: '<name>       Workflow (default quick-task).' },
             skill: { type: 'string', help: '<name>          Run one discovered skill instead of a workflow.' },
-            backend: { type: 'string', help: '<id>          claude | codex | opencode | pi | cursor | omp.' },
+            runner: { type: 'string', help: `<id>           ${RUNNER_IDS.join(' | ')}.` },
+            backend: { type: 'string', help: '<id>          Alias of --runner.' },
             model: { type: 'string', help: '<model>         Model override.' },
             effort: { type: 'string', help: '<level>       Reasoning effort.' },
             autonomous: { type: 'boolean', help: '         Never park for input; run to completion.' },
+            'archive-when-done': { type: 'boolean', help: '  Archive after Done (default off); with --auto-merge-pr, merge first.' },
+            'auto-merge-pr': { type: 'boolean', help: '      Merge the task PR after Done when current-head CI and GitHub rules pass (default off); may mark a draft ready.' },
             'no-worktree': { type: 'boolean', help: '      Run in the repo working tree, not a worktree.' },
             wait: { type: 'boolean', help: '               Then wait until the task needs you or ends (see wait).' },
             until: UNTIL_FLAG,
@@ -73,7 +82,8 @@ export const OPERATIONS = {
         flags: {
             since: { type: 'string', help: '<seq>           Only events after this seq.' },
             'max-chars': { type: 'string', help: '<n>        Keep the newest lines within n characters (default 8000).' },
-            follow: { type: 'boolean', help: '             Keep streaming until the task ends or the timeout.' },
+            follow: { type: 'boolean', help: '             Keep streaming until the task needs you or ends (see wait), or the timeout.' },
+            until: UNTIL_FLAG,
             'timeout-seconds': TIMEOUT_FLAG,
         },
     },
@@ -130,24 +140,29 @@ export const OPERATIONS = {
  * `attention` and `attentionLabel` come from the cockpit's own attention function (the
  * contract's `deriveAttention`), so what the CLI says a run needs is what Needs You shows.
  */
-const ATTENTION_HELP_OPERATIONS = new Set(['start', 'wait', 'status', 'list']);
+const ATTENTION_HELP_OPERATIONS = new Set(['start', 'wait', 'status', 'list', 'log']);
 const ATTENTION_HELP = [
     'Attention — when a task needs you:',
-    '  status, list and wait carry `attention` (the cockpit bucket) and `attentionLabel` (its phrase),',
-    '  derived by the same function as the cockpit\'s Needs You. Read those, not the raw status:',
-    '  - `waiting` is attention even when hasPendingHumanAsk is false (a finished turn parks the task);',
-    '    never clear a task on hasPendingHumanAsk alone.',
-    '  - `running` with activity `monitoring` is neither settled nor attention: the agent is still',
-    '    working on its own sub-agents or a watched command. attention: running.',
+    '  status, list, wait and log --follow carry `attention` (the cockpit bucket) and',
+    '  `attentionLabel` (its phrase), derived by the same function as the cockpit\'s Needs You.',
+    '  Read those, not the raw status:',
+    '  - `waiting` is attention even when no question is pending (a finished turn parks the task);',
+    '    a pending question also shows as `question` on status, its context as `questionContext`.',
+    '  - `waiting` on its own open PR or timer wait (attentionLabel "waiting for CI", "waiting for merge" or "monitoring")',
+    '    is neither settled nor attention: the agent is still watching what it registered. attention: running.',
     '  - a task parked on its own workers ("waiting on 2 workers") is attention: none; keep waiting.',
-    '  - attention: waiting | error | permission ends a wait; attentionLabel says why ("needs you",',
-    '    "needs review", "failed").',
+    '  - a task held by a provider usage limit ("usage limit, resumes <ISO time>") is attention: none;',
+    '    it resumes itself at that time.',
+    '  - attention: waiting | error | permission ends a wait or a follow; attentionLabel says why',
+    '    ("needs you", "needs review", "failed").',
     '  --until attention (default) stops when the task needs you or ends. --until settled is the',
     '  opt-in for autonomous runs and bots that want terminal state only (done/review/failed/cancelled).',
     '  cez task wait <id>                   # default: stops when the task needs you',
     '  cez task wait <id> --until settled   # terminal status only',
     "  cez task start '…' --wait            # returns as soon as the agent parks for follow-up",
     "  cez task start '…' --wait --autonomous --until settled   # runs to completion, then returns",
+    '  cez task log <id> --follow             # default: stops when the task needs you',
+    '  cez task log <id> --follow --until settled   # streams until a terminal status',
     '',
 ];
 function usage() {
@@ -166,6 +181,7 @@ export function taskHelp(operation) {
         flags.set(flag, spec);
     return [
         'cezar task — start, watch and steer cockpit tasks from the terminal', '', 'Usage:',
+        '  cez task [--url <origin> | --repo <dir>] <operation> …',
         ...names.flatMap((name) => {
             const op = OPERATIONS[name];
             return [`  cez task ${name} ${op.args}`.trimEnd(), `    ${op.description}`];
@@ -200,7 +216,7 @@ export function taskHelp(operation) {
         ] : []),
         'Commands find the running cockpit that serves this checkout (ports 4321-4370) and print JSON.',
         'notify: with a task webhook set in Settings → General, start notifies it unless --no-notify;',
-        'the webhook gets task.status, task.question, task.activity and task.subscribed POSTs.',
+        'the webhook gets task.status, task.question and task.subscribed POSTs.',
         'Exit codes: 0 ok (wait/start --wait: done, review, or stopped for attention) · 1 task failed/cancelled',
         'or message not delivered · 2 no cockpit or refused · 3 timed out · 64 usage error.',
     ].join('\n');
@@ -248,7 +264,34 @@ async function textArgument(io, operation, positional, file, what) {
     return text;
 }
 function parseOperation(argv) {
-    const [name, ...rest] = argv;
+    // Only COMMON belongs before the operation. Keep the operation's existing strict
+    // parseArgs path below, including its handling of positionals and repeated flags.
+    const leading = {};
+    let index = 0;
+    while (argv[index]?.startsWith('-')) {
+        const token = argv[index];
+        const equals = token.indexOf('=');
+        const option = equals === -1 ? token : token.slice(0, equals);
+        const flag = option === '-h' ? 'help' : option.startsWith('--') ? option.slice(2) : option;
+        if (!Object.hasOwn(COMMON, flag)) {
+            usageError(`unknown option '${option}' before the operation; only --url, --repo and --help go there`);
+        }
+        if (leading[flag] !== undefined)
+            usageError(`duplicate option '--${flag}'`);
+        if (COMMON[flag].type === 'boolean') {
+            if (equals !== -1)
+                usageError(`option '${option}' does not take a value`);
+            leading[flag] = true;
+        }
+        else {
+            const value = equals === -1 ? argv[++index] : token.slice(equals + 1);
+            if (value === undefined || value === '' || value.startsWith('--'))
+                usageError(`option '${option}' requires a value`);
+            leading[flag] = value;
+        }
+        index += 1;
+    }
+    const name = argv[index];
     if (name === undefined)
         usageError('missing operation');
     const operation = OPERATIONS[name];
@@ -257,12 +300,17 @@ function parseOperation(argv) {
     const options = Object.fromEntries(Object.entries({ ...operation.flags, ...COMMON }).map(([flag, spec]) => [flag, { type: spec.type, ...(spec.multiple ? { multiple: true } : {}) }]));
     let parsed;
     try {
-        parsed = parseArgs({ args: rest, options, allowPositionals: true, strict: true });
+        parsed = parseArgs({ args: argv.slice(index + 1), options, allowPositionals: true, strict: true });
     }
     catch (error) {
         usageError(`${name}: ${error instanceof Error ? error.message : 'invalid arguments'}`);
     }
     const values = parsed.values;
+    for (const [flag, value] of Object.entries(leading)) {
+        if (values[flag] !== undefined)
+            usageError(`duplicate option '--${flag}'`);
+        values[flag] = value;
+    }
     if (!values.help) {
         const [min, max] = operation.positionals;
         if (parsed.positionals.length < min)
@@ -318,11 +366,16 @@ function validateFlags(name, values) {
         });
         if (issue)
             usageError(issue);
+        const runner = runnerFlag({ runner: values.runner, backend: values.backend });
+        if (runner.issue)
+            usageError(runner.issue);
         if (values.notify && values['no-notify'])
             usageError('--notify and --no-notify cannot be used together');
         if (values.until !== undefined && !values.wait)
             usageError('--until needs --wait');
     }
+    if (name === 'log' && values.until !== undefined && !values.follow)
+        usageError('--until needs --follow');
     if (name === 'notify') {
         if (values.message !== undefined && values['message-file'] !== undefined)
             usageError('notify takes the note as --message or --message-file, not both');
@@ -335,7 +388,7 @@ function validateFlags(name, values) {
     }
     if (name === 'wait')
         oneOf(values.mode, 'mode', ['any', 'all'], 'all');
-    if (name === 'wait' || name === 'start')
+    if (name === 'wait' || name === 'start' || name === 'log')
         waitUntil(values);
     if (name === 'log') {
         nonNegativeInt(values.since, 'since');
@@ -377,15 +430,13 @@ async function refuseWorkerNotify(cockpit, id) {
 async function pendingQuestion(cockpit, id) {
     const result = await request(cockpit, `/runs/${encodeURIComponent(id)}/history-context`);
     const context = runHistoryContextSchema.safeParse(result.data);
-    if (result.status !== 200 || !context.success)
-        return undefined;
-    const ask = [...context.data.contextEvents].reverse().find((event) => event.type === 'ask.requested');
-    return ask?.questions;
+    return result.status === 200 && context.success ? pendingAskOf(context.data.contextEvents) : undefined;
 }
 async function start(cockpit, io, values, task, print) {
     const waitMs = values.wait ? timeoutMs(values) : undefined;
     const requestId = values['request-id'] ?? randomUUID();
     const skill = values.skill;
+    const { runner } = runnerFlag({ runner: values.runner, backend: values.backend });
     // `--notify` is an explicit opt-in the server may refuse (no webhook: 400 with a hint). The
     // implicit default only opts in where the project has a webhook, so a bot on a fresh project
     // is never blocked (#589).
@@ -419,10 +470,12 @@ async function start(cockpit, io, values, task, print) {
             ...(skill === undefined
                 ? { workflow: values.workflow ?? 'quick-task' }
                 : { steps: skillTaskSteps(skill) }),
-            ...(values.backend === undefined ? {} : { runner: values.backend }),
+            ...(runner === undefined ? {} : { runner }),
             ...(values.model === undefined ? {} : { model: values.model }),
             ...(values.effort === undefined ? {} : { effort: values.effort }),
             ...(values.autonomous ? { autonomous: true } : {}),
+            ...(values['archive-when-done'] ? { archiveWhenDone: true } : {}),
+            ...(values['auto-merge-pr'] ? { autoMergePr: true } : {}),
             ...(values['no-worktree'] ? { worktree: false } : {}),
             ...(notify === undefined ? {} : { notify }),
             clientRequestId: requestId,
@@ -517,7 +570,7 @@ async function execute(name, cockpit, io, values, positionals, text, print) {
             // An unknown run is the history route's 404, passed through. Without --follow the replay
             // ends at its boundary; the deadline is only a backstop there.
             return readLog(cockpit, id, {
-                afterSeq: since, maxChars, follow: values.follow === true,
+                afterSeq: since, maxChars, follow: values.follow === true, until: waitUntil(values),
                 deadline: Date.now() + (values.follow ? timeoutMs(values) : 45_000),
                 print: (line) => io.stdout(line),
             });
@@ -528,7 +581,7 @@ async function execute(name, cockpit, io, values, positionals, text, print) {
                 print(run);
                 return EXIT.ok;
             }
-            const question = run.hasPendingHumanAsk ? await pendingQuestion(cockpit, id) : undefined;
+            const question = asksQuestion(run) ? await pendingQuestion(cockpit, id) : undefined;
             print({ ...projectStatus(run, threadUrl(cockpit, id), question), handoffUrl: handoffUrl(cockpit, id) });
             return EXIT.ok;
         }