agim-cli 1.2.150 → 1.2.152

package/CHANGELOG.md

@@ -4,6 +4,128 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.2.152] - 2026-06-15
+
+### Changed (后台 skills 管理体验)
+
+针对 v1.2.151 后两个反馈做体验优化：
+
+#### Q1 — installed 页按 5 bucket 分组 + 默认折叠 + 顶部搜索
+
+364 个 skill 一根长 list 渲染太重；改成 loader 已有的 5 bucket 分组，
+大组默认折叠：
+
+- **Framework**（agim-* 4 条，默认展开）
+- **Agim builtin**（github / weather / 等 8 条，默认展开）
+- **Workspace**（运营者亲装 ~122 条，默认折叠）
+- **ECC 推荐池**（20 条，默认展开）
+- **ECC 余下**（~210 条，默认折叠）
+
+顶部加搜索框（按 name + description 模糊匹配）。搜索激活时所有匹配桶
+强制展开，并在每个桶头显示命中数 badge。
+
+#### Q2 — injection 页 Refresh 升级为"重建默认注入词"
+
+v1.2.151 的 Refresh 按钮只 refetch React Query，没真正失效 loader 5min cache
+——运营者刚新增 skill 后看到的 auto 还是旧的。改成两步：
+1. POST `/api/agim-skills/refresh`（loader 重扫磁盘 + invalidate cache）
+2. refetch `/api/agim-skills/injection`（拿到 fresh auto block）
+
+不影响 override（覆盖文件不动）。
+
+按钮文案：中文"重建默认注入词" / 英文"Rebuild auto block"。
+
+### Files
+
+- `src/web/agim-skills-api.ts` — `handleList` 返回多加 `bucket: 0..4`（复用 `rankSkillBucket`）
+- `src/web-app/src/hooks/use-agim-skills.ts` — `AgimSkillMeta.bucket?: 0|1|2|3|4`
+- `src/web-app/src/routes/settings/agim-skills/installed.tsx` — `SkillsList` 重构为 bucket 分组 + 折叠 + 顶部搜索；导入 ChevronDown / ChevronRight / Search 图标
+- `src/web-app/src/routes/settings/agim-skills/injection.tsx` — 新增 `useAgimSkillsRefresh` 依赖；`onRefresh` 改两步语义；按钮文案改成"重建"
+- `src/web-app/src/i18n/locales/{zh,en}/settings.json` — 新增 `agimSkills.group.*` / `searchPlaceholder` / `searchEmpty` + `skillInjection.rebuild*` / `rebuiltToast`
+
+### Tests
+
+- API list 测试 (`agim-skills-api.test.ts` 13/13 旧 + 6 v1.2.151) + loader (42/42) → 61/61 全过
+- backend typecheck 干净；SPA typecheck 仅遗留 search.tsx 错误（不在本 PR）
+- SPA build 干净
+
+## [1.2.151] - 2026-06-13
+
+### Changed (skills injection — workspace 完整注入铁律 + 编辑入口)
+
+v1.2.150 的 cluster 压缩对 workspace 太狠：35 个 `fin-data-*` 折成一行
+`fin-data-* (35): name1 · name2 · …` 后 LLM 路由质量下降——只剩名字猜，没了
+description 关键词。运营者亲装的 workspace skill 是最强 "我要用" 信号，
+不应该为省 token 牺牲精度。
+
+#### 铁律：workspace 完整注入，不折叠
+
+`buildSkillsSummary` 拆出 `buildAutoInjectionBlock(all)`，bucket 3（workspace）
+重新走 `renderSkillRow`（完整描述行）：
+
+- bucket 0/1/3 全部 full row（agim 框架 / agim builtin / **workspace**）
+- bucket 2 ECC picks 仍 full row（20 个 curated 推荐）
+- 只有 bucket 4（ECC remainder 210 个）才 cluster
+
+#### 渲染顺序调整：0 → 1 → 3 → 2 → 4
+
+workspace 排在 ECC picks 之前。运营者亲装 > 框架预选 > ECC remainder。
+
+#### cluster refine bug fix
+
+旧实现遇到"所有成员都在单个 sub-key 下"（例如全部 `fin-data-*` skill 都共享
+2 段前缀）时 bottom out 不再递归，导致 fin-data 全部折成一行 cluster。
+现在加分支：单 sub-key 占全部成员时自动 `segDepth+1` 继续细分，
+所以 `fin-data-aspd-*` / `fin-data-stock-*` / `fin-data-fund-*` 会拆成
+独立 cluster 而非合并。
+
+#### 编辑入口：~/.agim/skill-injection-override.md
+
+运营者可以覆盖自动生成的 skill 块。文件存在且非空时，**全文替换** auto block
+（路由头 + always-on body 保留）。三个 helper：
+`readInjectionOverride / writeInjectionOverride / deleteInjectionOverride`。
+环境变量 `IMHUB_SKILLS_INJECTION_OVERRIDE_PATH` 可改路径（测试用）。
+
+#### Admin API + SPA 页
+
+- `GET /api/agim-skills/injection` → 返回 `{ auto, override, overrideActive, overridePath, maxOverrideChars }`
+- `PUT /api/agim-skills/injection` body `{ body: string }` → 写 override（空 body=删除；>40k 字符 413）
+- `DELETE /api/agim-skills/injection` → 清除 override
+- 受现有 `/api/agim-skills/*` admin allowlist 守卫
+- 新页面 `/settings/agim-skills/injection`：auto 只读 textarea + override 可编辑 textarea +
+  Save / Clear / Copy-auto / Refresh 按钮 + 字符计数 + ≥10k 警告
+- 中英 i18n 全套
+
+#### 新增 env knob
+
+- `IMHUB_SKILLS_ECC_PICKS=name1,name2,...` 覆盖默认 20 picks（推荐池）
+- `IMHUB_SKILLS_INJECT_ECC_REMAINDER=on|off|name-list`：
+  - `on`（默认）：cluster 模式
+  - `off`：完全抑制 ECC remainder 块（省 token）
+  - 逗号分隔白名单：只保留指定 skill
+
+### Files
+
+- `src/core/skills/loader.ts` — workspace 完整注入 + 顺序调整 + refine bug fix +
+  env knob 解析（`resolveEccTopPicks` / `resolveEccRemainderMode`）+
+  override 文件 helper（read / write / delete / `injectionOverridePath`）+
+  `buildAutoInjectionBlock` 导出供 API 预览
+- `src/web/agim-skills-api.ts` — 新 GET/PUT/DELETE `/api/agim-skills/injection`
+- `src/web/agim-skills-api.test.ts` — +5 case（GET 元数据 / PUT 保存 / DELETE / 空 body=删 / 413 超限）
+- `src/web-app/src/hooks/use-agim-skills.ts` — `useSkillInjection / Save / Delete`
+- `src/web-app/src/routes/settings/agim-skills/injection.tsx` — 新页面
+- `src/web-app/src/routes/settings/agim-skills/layout.tsx` — tab 新增"系统提示注入"
+- `src/web-app/src/router.tsx` — 注册新 route
+- `src/web-app/src/i18n/locales/{zh,en}/settings.json` — `skillInjection.*` 文案
+- `src/core/skills/loader.test.ts` — +5 case（refine 单 sub-key 递归 / picks env / remainder off / remainder allowlist / override 全文替换）；2 case 旧断言更新（workspace 不聚类 / workspace 排在 ECC picks 前）
+
+### Tests
+
+- `loader.test.ts`：42/42 全过
+- `agim-skills-api.test.ts`：19/19 全过
+- typecheck 干净（search.tsx 是历史遗留，不归本 PR）
+- SPA build 干净（`injection-*.js` chunk 已生成）
+
 ## [1.2.150] - 2026-06-12
 
 ### Changed (skills system-prompt injection — cluster-aware compression)

package/dist/core/skills/loader.d.ts

@@ -104,6 +104,40 @@ export declare function getSkillByName(name: string): SkillMeta | null;
  *  unknown name OR read failure. Honors the MAX_SKILL_BODY_CHARS cap;
  *  oversize files come back truncated with a `[truncated …]` footer. */
 export declare function readSkillBody(name: string): string | null;
+/**
+ * v1.2.151 — Resolve the active ECC top-pick set. Operators can override
+ * via `IMHUB_SKILLS_ECC_PICKS=name1,name2,...`. An empty or unset value
+ * falls back to the default 20-name list. Validation is intentionally
+ * forgiving: unknown names pass through (they just become no-ops when
+ * the named skill isn't installed).
+ */
+export declare function resolveEccTopPicks(): ReadonlySet<string>;
+/**
+ * v1.2.151 — ECC remainder injection policy. Default `on` emits the
+ * cluster block. `off` suppresses it entirely (token-saving for ops
+ * who only want the recommended picks). A comma-list value flips to
+ * "allowlist" mode: only remainder skills in the list are emitted.
+ */
+type EccRemainderMode = {
+    mode: 'on';
+} | {
+    mode: 'off';
+} | {
+    mode: 'allowlist';
+    names: Set<string>;
+};
+export declare function resolveEccRemainderMode(): EccRemainderMode;
+export declare function injectionOverridePath(): string;
+/** Read the override file. Returns the trimmed body, or null when the
+ *  file is missing / empty / unreadable. Never throws. */
+export declare function readInjectionOverride(): string | null;
+/** Write (or replace) the override file. The caller is responsible for
+ *  authorization — this is a thin filesystem helper. Returns true on
+ *  success, false on any disk error. */
+export declare function writeInjectionOverride(body: string): boolean;
+/** Delete the override file. Returns true when a file was actually
+ *  removed (or already gone), false on filesystem error. */
+export declare function deleteInjectionOverride(): boolean;
 /**
  * v1.2.149 — Rank a skill into one of four buckets for system-prompt
  * injection. Lower rank wins (fills the visible 32 first). Within a
@@ -165,5 +199,25 @@ export declare function clusterSkills(skills: ReadonlyArray<SkillMeta>, minSize?
     clusters: SkillCluster[];
     singletons: SkillMeta[];
 };
+/**
+ * v1.2.151 — Build the auto-generated tier-1 block (no header, no
+ * always-on bodies — caller wraps). Separated so the SPA editor can
+ * preview "what would auto produce right now" via the admin API.
+ *
+ * Bucket render order:
+ *   0 framework → 1 builtin → **3 workspace** → 2 ECC picks → 4 ECC remainder
+ *
+ * Operator-installed workspace skills out-rank ECC pinned picks because
+ * they are the strongest "I want this" signal. ECC picks (curated
+ * harness vocabulary) come right after so the LLM still has them
+ * within reach. ECC remainder lives at the bottom as the on-demand
+ * pool.
+ *
+ * Buckets 0/1/2/3 all emit full rows (renderSkillRow). Only bucket 4
+ * (ECC remainder) clusters — and even then, the cluster path can be
+ * disabled or scoped via `IMHUB_SKILLS_INJECT_ECC_REMAINDER`.
+ */
+export declare function buildAutoInjectionBlock(all: ReadonlyArray<SkillMeta>): string;
 export declare function buildSkillsSummary(): string;
+export {};
 //# sourceMappingURL=loader.d.ts.map

package/dist/core/skills/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/skills/loader.ts"],"names":[],"mappings":"AAiDA;;sEAEsE;AACtE,eAAO,MAAM,oBAAoB,QAAS,CAAA;AAE1C;;gDAEgD;AAChD,eAAO,MAAM,qBAAqB,MAAM,CAAA;AAExC;;oDAEoD;AACpD,eAAO,MAAM,mBAAmB,KAAK,CAAA;AAErC,MAAM,WAAW,SAAS;IACxB,IAAI,EAAE,MAAM,CAAA;IACZ,WAAW,EAAE,MAAM,CAAA;IACnB,4EAA4E;IAC5E,MAAM,EAAE,WAAW,GAAG,SAAS,CAAA;IAC/B,mEAAmE;IACnE,GAAG,EAAE,MAAM,CAAA;IACX;;2DAEuD;IACvD,MAAM,EAAE,OAAO,CAAA;IACf;qCACiC;IACjC,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB;0DACsD;IACtD,WAAW,EAAE,MAAM,EAAE,CAAA;IACrB;;0EAEsE;IACtE,SAAS,EAAE,OAAO,CAAA;IAClB,qDAAqD;IACrD,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B;;mEAE+D;IAC/D,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAmCD,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,WAAW,GAAG,QAAQ,CAAA;AA4BxD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,kBAAkB,IAAI,MAAM,EAAE,CAiB7C;AAED;sEACsE;AACtE,wBAAgB,oBAAoB,IAAI;IACtC,IAAI,EAAE,UAAU,CAAA;IAChB,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,EAAE,CAAA;IACnB,WAAW,EAAE,MAAM,CAAA;CACpB,CAOA;AAuBD,wEAAwE;AACxE,wBAAgB,qBAAqB,IAAI,IAAI,CAE5C;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAmB3E;AAED;;;;;GAKG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAajD;AAYD;;oDAEoD;AACpD,wBAAgB,UAAU,IAAI,SAAS,EAAE,CAExC;AAED;;6BAE6B;AAC7B,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAE7D;AAED;;wEAEwE;AACxE,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAYzD;AAkDD;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,eAAe,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,CAsBpD;AAED;;;;;;GAMG;AACH,MAAM,WAAW,YAAY;IAC3B,8DAA8D;IAC9D,MAAM,EAAE,MAAM,CAAA;IACd,yDAAyD;IACzD,KAAK,EAAE,MAAM,EAAE,CAAA;IACf;gEAC4D;IAC5D,WAAW,EAAE,MAAM,CAAA;CACpB;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,aAAa,CAAC,SAAS,CAAC,EAChC,OAAO,SAAI,GACV;IAAE,QAAQ,EAAE,YAAY,EAAE,CAAC;IAAC,UAAU,EAAE,SAAS,EAAE,CAAA;CAAE,CAsFvD;AA4BD,wBAAgB,kBAAkB,IAAI,MAAM,CA8G3C"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/core/skills/loader.ts"],"names":[],"mappings":"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"}

package/dist/core/skills/loader.js

@@ -315,7 +315,7 @@ export function readSkillBody(name) {
  *
  * Add / remove freely — this is a curated list, not a registry.
  */
-const ECC_TOP_PICKS = new Set([
+const ECC_TOP_PICKS_DEFAULT = new Set([
     // Agent harness engineering (11)
     'agentic-engineering', 'agent-eval', 'agent-introspection-debugging',
     'agent-harness-construction', 'autonomous-agent-harness', 'autonomous-loops',
@@ -326,6 +326,105 @@ const ECC_TOP_PICKS = new Set([
     'code-tour', 'tdd-workflow', 'security-review', 'benchmark',
     'article-writing', 'content-engine',
 ]);
+/**
+ * v1.2.151 — Resolve the active ECC top-pick set. Operators can override
+ * via `IMHUB_SKILLS_ECC_PICKS=name1,name2,...`. An empty or unset value
+ * falls back to the default 20-name list. Validation is intentionally
+ * forgiving: unknown names pass through (they just become no-ops when
+ * the named skill isn't installed).
+ */
+export function resolveEccTopPicks() {
+    const raw = (process.env.IMHUB_SKILLS_ECC_PICKS || '').trim();
+    if (!raw)
+        return ECC_TOP_PICKS_DEFAULT;
+    const names = raw.split(/[,;\s]+/).map((s) => s.trim()).filter(Boolean);
+    if (names.length === 0)
+        return ECC_TOP_PICKS_DEFAULT;
+    return new Set(names);
+}
+export function resolveEccRemainderMode() {
+    const raw = (process.env.IMHUB_SKILLS_INJECT_ECC_REMAINDER || '').trim().toLowerCase();
+    if (!raw || raw === 'on' || raw === '1' || raw === 'true')
+        return { mode: 'on' };
+    if (raw === 'off' || raw === '0' || raw === 'false')
+        return { mode: 'off' };
+    // Anything else is treated as a comma/whitespace-separated allowlist.
+    const names = raw.split(/[,;\s]+/).map((s) => s.trim()).filter(Boolean);
+    if (names.length === 0)
+        return { mode: 'on' };
+    return { mode: 'allowlist', names: new Set(names) };
+}
+// ─── v1.2.151 — operator-tunable injection override ────────────────────
+//
+// Operators frequently want to nudge the auto-generated skills block —
+// pin a specific skill higher, hide one that's noisy, add a routing
+// hint about a custom env, etc. Rather than expanding the env-knob
+// surface for every dimension, agim accepts a verbatim text file at
+// `~/.agim/skill-injection-override.md` that REPLACES the auto block.
+//
+// When the file exists and is non-empty, buildSkillsSummary returns:
+//   - the standard "[agim tool routing — skills first]" header
+//   - the override file contents (verbatim, trimmed)
+//   - the always-on skill bodies (unchanged)
+//
+// The auto-generated block (priority buckets + clusters) is suppressed.
+// Tests and CI override the path via IMHUB_SKILLS_INJECTION_OVERRIDE_PATH
+// to avoid polluting the operator's real ~/.agim/.
+//
+// Editor entrypoint: the SPA page `/settings/skill-injection` calls
+// admin endpoints to read auto + read/write/delete the override.
+const INJECTION_OVERRIDE_FILENAME = 'skill-injection-override.md';
+export function injectionOverridePath() {
+    const override = process.env.IMHUB_SKILLS_INJECTION_OVERRIDE_PATH;
+    if (override)
+        return override;
+    return join(AGIM_HOME, INJECTION_OVERRIDE_FILENAME);
+}
+/** Read the override file. Returns the trimmed body, or null when the
+ *  file is missing / empty / unreadable. Never throws. */
+export function readInjectionOverride() {
+    const path = injectionOverridePath();
+    try {
+        if (!existsSync(path))
+            return null;
+        const raw = readFileSync(path, 'utf-8').trim();
+        return raw || null;
+    }
+    catch (err) {
+        log.warn({ event: 'skills.injection_override.read_failed', path, err: String(err) });
+        return null;
+    }
+}
+/** Write (or replace) the override file. The caller is responsible for
+ *  authorization — this is a thin filesystem helper. Returns true on
+ *  success, false on any disk error. */
+export function writeInjectionOverride(body) {
+    const path = injectionOverridePath();
+    try {
+        mkdirSync(dirname(path), { recursive: true });
+        writeFileSync(path, body, 'utf-8');
+        return true;
+    }
+    catch (err) {
+        log.warn({ event: 'skills.injection_override.write_failed', path, err: String(err) });
+        return false;
+    }
+}
+/** Delete the override file. Returns true when a file was actually
+ *  removed (or already gone), false on filesystem error. */
+export function deleteInjectionOverride() {
+    const path = injectionOverridePath();
+    try {
+        if (!existsSync(path))
+            return true;
+        rmSync(path, { force: true });
+        return true;
+    }
+    catch (err) {
+        log.warn({ event: 'skills.injection_override.delete_failed', path, err: String(err) });
+        return false;
+    }
+}
 /**
  * v1.2.149 — Rank a skill into one of four buckets for system-prompt
  * injection. Lower rank wins (fills the visible 32 first). Within a
@@ -368,7 +467,7 @@ export function rankSkillBucket(s) {
     const isEcc = s.source === 'builtin'
         && (s.description.startsWith('[ECC] ') || /^ECC\b/i.test(s.origin ?? ''));
     if (isEcc)
-        return ECC_TOP_PICKS.has(s.name) ? 2 : 4;
+        return resolveEccTopPicks().has(s.name) ? 2 : 4;
     if (s.source === 'workspace')
         return 3;
     // non-ECC builtin (agim's own small in-tree pack)
@@ -441,6 +540,14 @@ export function clusterSkills(skills, minSize = 3) {
                     used.add(s.name);
             }
         }
+        else if (qualified.length === 1 && sub.size === 1) {
+            // v1.2.151 — single sub-key contains ALL members (e.g. all `fin-*`
+            // are `fin-data-*` at depth 2). Recurse deeper to split by depth+1
+            // instead of collapsing into a single coarse `fin-data-*` group.
+            // Without this fix, 69 fin-data skills land in one cluster and
+            // the LLM can't tell aspd / stock / fund families apart by name.
+            refine(sub.get(qualified[0]), segDepth + 1);
+        }
         else {
             emitCluster(group, segDepth - 1);
         }
@@ -513,118 +620,136 @@ const BUCKET_HEADINGS = {
     3: 'Workspace skills (operator-installed business)',
     4: 'ECC remainder (read full description via mcp__imhub__read_skill)',
 };
-export function buildSkillsSummary() {
-    const all = listSkills();
-    if (all.length === 0)
-        return '';
-    // v1.2.150 — bucket + cluster-aware emission.
-    //   Buckets 0, 1, 2: render each skill as an individual row with full
-    //     description. Small + curated; the LLM needs the granularity.
-    //   Bucket 3 (workspace): cluster when ≥ MIN_CLUSTER_SIZE share a
-    //     prefix; otherwise individual rows. Lets operators with one big
-    //     namespace (`fin-data-*`) get all names visible without burning
-    //     dozens of full-description tokens.
-    //   Bucket 4 (ECC remainder): always cluster aggressively + only
-    //     emit name list (no per-cluster trigger hint) since this is the
-    //     "you can read these on demand" pool. We still show every name
-    //     so the LLM knows the surface.
+/**
+ * v1.2.137 — Routing rule prepended to every turn's skill block.
+ * v1.2.151 — Extracted into a constant so the override path and the
+ * auto path share the same header verbatim.
+ */
+const SKILLS_ROUTING_HEADER = [
+    '[agim tool routing — skills first]',
+    'Before calling any generic tool (web_fetch / web_search / native_exec /',
+    'shell-style commands), you MUST scan the skill list below. If any entry\'s',
+    'description matches the user\'s intent — even loosely — you MUST call',
+    'mcp__imhub__read_skill(\'<name>\') first to load that skill\'s body. Skill',
+    'bodies contain dedicated tools, endpoints, or queries that produce',
+    'higher-quality, structured results than free-text web pages for the',
+    'same intent. Falling back to the generic tool is only valid when:',
+    '  (a) no skill description plausibly matches, OR',
+    '  (b) you already read a relevant skill and its body explicitly says',
+    '      "this skill is not suitable for X" or lacks the needed coverage.',
+    'This is a routing discipline, not a hint. Skipping it counts as a',
+    'tool-routing error in this conversation.',
+].join('\n');
+/**
+ * v1.2.151 — Render one skill as a tier-1 row with full description.
+ * The body is defensive against malformed YAML block-scalar leakage.
+ *
+ * NOTE: workspace skills (bucket 3) MUST always go through this path
+ * — operator-installed business skills are an "I want this" signal
+ * from the deployment, so we keep their full descriptions for routing
+ * precision regardless of how many there are. The token cost is real
+ * but intentional; operators with 100+ workspace skills can use the
+ * SPA `/settings/skill-injection` editor to prune (see override path).
+ */
+function renderSkillRow(s) {
+    const reason = s.available ? '' : ` (unavailable: ${s.unavailableReason ?? 'requires not met'})`;
+    const flag = s.always ? ' [always]' : '';
+    const descClean = (s.description || '').trim();
+    const description = descClean && descClean !== '>-' && descClean !== '|'
+        ? descClean
+        : '(no description in SKILL.md — read body via mcp__imhub__read_skill)';
+    return `- ${s.name}: ${description}${reason}${flag}`;
+}
+/** Inline `always: true` skill bodies. Shared between override + auto. */
+function appendAlwaysOnBodies(all, lines) {
+    const alwaysOn = all.filter((s) => s.always && s.available);
+    for (const s of alwaysOn) {
+        const body = readSkillBody(s.name);
+        if (!body)
+            continue;
+        lines.push('');
+        lines.push(`### Always-on skill: ${s.name}`);
+        lines.push(body);
+    }
+}
+/**
+ * v1.2.151 — Build the auto-generated tier-1 block (no header, no
+ * always-on bodies — caller wraps). Separated so the SPA editor can
+ * preview "what would auto produce right now" via the admin API.
+ *
+ * Bucket render order:
+ *   0 framework → 1 builtin → **3 workspace** → 2 ECC picks → 4 ECC remainder
+ *
+ * Operator-installed workspace skills out-rank ECC pinned picks because
+ * they are the strongest "I want this" signal. ECC picks (curated
+ * harness vocabulary) come right after so the LLM still has them
+ * within reach. ECC remainder lives at the bottom as the on-demand
+ * pool.
+ *
+ * Buckets 0/1/2/3 all emit full rows (renderSkillRow). Only bucket 4
+ * (ECC remainder) clusters — and even then, the cluster path can be
+ * disabled or scoped via `IMHUB_SKILLS_INJECT_ECC_REMAINDER`.
+ */
+export function buildAutoInjectionBlock(all) {
     const byBucket = { 0: [], 1: [], 2: [], 3: [], 4: [] };
     for (const s of all)
         byBucket[rankSkillBucket(s)].push(s);
     for (const b of [0, 1, 2, 3, 4]) {
         byBucket[b].sort((a, b2) => a.name.localeCompare(b2.name));
     }
-    const lines = [
-        // v1.2.137 — routing rule, prepended to the skill list. Applies to
-        // ALL agents (native / claude-code / codex / cursor / opencode) because
-        // the router wraps this block into every turn's prompt. The rule is
-        // intentionally generic — it references the skill list itself, never
-        // any specific skill name, so users with zero skills installed see
-        // an empty block (early return above) and aren't burdened with the
-        // rule text. The "MUST" framing + explicit fallback whitelist is
-        // tuned to be hard enough that models don't drift back to web_fetch
-        // out of habit when a relevant skill exists.
-        '[agim tool routing — skills first]',
-        'Before calling any generic tool (web_fetch / web_search / native_exec /',
-        'shell-style commands), you MUST scan the skill list below. If any entry\'s',
-        'description matches the user\'s intent — even loosely — you MUST call',
-        'mcp__imhub__read_skill(\'<name>\') first to load that skill\'s body. Skill',
-        'bodies contain dedicated tools, endpoints, or queries that produce',
-        'higher-quality, structured results than free-text web pages for the',
-        'same intent. Falling back to the generic tool is only valid when:',
-        '  (a) no skill description plausibly matches, OR',
-        '  (b) you already read a relevant skill and its body explicitly says',
-        '      "this skill is not suitable for X" or lacks the needed coverage.',
-        'This is a routing discipline, not a hint. Skipping it counts as a',
-        'tool-routing error in this conversation.',
-        '',
-        '[agim skills available — read full body with mcp__imhub__read_skill(name)]',
-    ];
-    // Helper: render one skill as an individual row with full description.
-    // Same shape as v1.2.149; defensive fallback for malformed descriptions.
-    const renderRow = (s) => {
-        const reason = s.available ? '' : ` (unavailable: ${s.unavailableReason ?? 'requires not met'})`;
-        const flag = s.always ? ' [always]' : '';
-        const descClean = (s.description || '').trim();
-        const description = descClean && descClean !== '>-' && descClean !== '|'
-            ? descClean
-            : '(no description in SKILL.md — read body via mcp__imhub__read_skill)';
-        return `- ${s.name}: ${description}${reason}${flag}`;
-    };
-    // Buckets 0, 1, 2: individual rows (curated, small).
-    for (const b of [0, 1, 2]) {
+    const lines = ['[agim skills available — read full body with mcp__imhub__read_skill(name)]'];
+    // Render order: 0 framework, 1 builtin, 3 workspace, 2 ECC picks.
+    // Workspace before ECC picks per v1.2.151 iron rule: operator-installed
+    // business skills rank above framework-curated harness picks.
+    for (const b of [0, 1, 3, 2]) {
         const items = byBucket[b];
         if (items.length === 0)
             continue;
         lines.push('');
         lines.push(`## ${BUCKET_HEADINGS[b]} (${items.length})`);
         for (const s of items)
-            lines.push(renderRow(s));
+            lines.push(renderSkillRow(s));
     }
-    // Bucket 3 (workspace): cluster when MIN_CLUSTER_SIZE shared prefix,
-    // else individual rows. Per-cluster trigger hint included (the LLM is
-    // most likely to route into this bucket on operator-domain queries).
-    const ws = byBucket[3];
-    if (ws.length > 0) {
-        lines.push('');
-        lines.push(`## ${BUCKET_HEADINGS[3]} (${ws.length})`);
-        const { clusters, singletons } = clusterSkills(ws, 3);
-        for (const c of clusters) {
-            lines.push(`- ${c.prefix}-* (${c.names.length}): ${c.names.join(' · ')}`);
-            if (c.triggerHint)
-                lines.push(`  → ${c.triggerHint}`);
-        }
-        for (const s of singletons)
-            lines.push(renderRow(s));
-    }
-    // Bucket 4 (ECC remainder): cluster aggressively, name-only (no per-
-    // cluster trigger hint — these are the "on-demand" pool, the LLM gets
-    // a per-skill description if it actually calls read_skill).
+    // Bucket 4 (ECC remainder) — cluster, with operator opt-out / allowlist.
     const eccRem = byBucket[4];
     if (eccRem.length > 0) {
-        lines.push('');
-        lines.push(`## ${BUCKET_HEADINGS[4]} (${eccRem.length})`);
-        const { clusters, singletons } = clusterSkills(eccRem, 3);
-        for (const c of clusters) {
-            lines.push(`- ${c.prefix}-* (${c.names.length}): ${c.names.join(' · ')}`);
-        }
-        if (singletons.length > 0) {
-            const names = singletons.map((s) => s.name).join(' · ');
-            lines.push(`- (other ECC, ${singletons.length}): ${names}`);
+        const remainderMode = resolveEccRemainderMode();
+        const filtered = remainderMode.mode === 'off' ? []
+            : remainderMode.mode === 'allowlist'
+                ? eccRem.filter((s) => remainderMode.names.has(s.name))
+                : eccRem;
+        if (filtered.length > 0) {
+            lines.push('');
+            lines.push(`## ${BUCKET_HEADINGS[4]} (${filtered.length})`);
+            const { clusters, singletons } = clusterSkills(filtered, 3);
+            for (const c of clusters) {
+                lines.push(`- ${c.prefix}-* (${c.names.length}): ${c.names.join(' · ')}`);
+            }
+            if (singletons.length > 0) {
+                const names = singletons.map((s) => s.name).join(' · ');
+                lines.push(`- (other ECC, ${singletons.length}): ${names}`);
+            }
         }
     }
-    // Inline `always: true` skills' full bodies regardless of bucket.
-    // Cheap when few; operators opt-in by marking `always: true` in their
-    // SKILL.md, which is rare.
-    const alwaysOn = all.filter((s) => s.always && s.available);
-    for (const s of alwaysOn) {
-        const body = readSkillBody(s.name);
-        if (!body)
-            continue;
-        lines.push('');
-        lines.push(`### Always-on skill: ${s.name}`);
-        lines.push(body);
+    return lines.join('\n');
+}
+export function buildSkillsSummary() {
+    const all = listSkills();
+    if (all.length === 0)
+        return '';
+    // v1.2.151 — operator override path: if `~/.agim/skill-injection-
+    // override.md` exists, return its body verbatim (still wrapped by
+    // the routing header + always-on bodies). The auto block is
+    // suppressed; the operator gets full editorial control. The SPA at
+    // `/settings/skill-injection` is the recommended way to author this.
+    const override = readInjectionOverride();
+    if (override) {
+        const lines = [SKILLS_ROUTING_HEADER, '', override];
+        appendAlwaysOnBodies(all, lines);
+        return `${lines.join('\n')}\n`;
     }
+    const lines = [SKILLS_ROUTING_HEADER, '', buildAutoInjectionBlock(all)];
+    appendAlwaysOnBodies(all, lines);
     return `${lines.join('\n')}\n`;
 }
 // ─── Scanning ────────────────────────────────────────────────────────