ci: raise unit-test matrix shard timeout 15 -> 20 min

Shard 4 runs ~14.5 min on master (dream.test.ts at ~29s/test dominates
its wallclock) and hit the 15-min job timeout twice on this PR with
1328 tests passing and 0 failing — the gate then failed on
'gated job did not succeed (got cancelled)'. Real fix is re-mining
scripts/test-weights.json to rebalance the shards; this unblocks CI.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

.github/workflows/test.yml

@@ -206,7 +206,11 @@ jobs:
     needs: cache-check
     if: needs.cache-check.outputs.hit != 'true'
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    # 20 (was 15): shard 4 runs ~14.5 min on master (dream.test.ts ~29s/test
+    # dominates it) and hits the 15-min ceiling on slower runners, cancelling
+    # mid-run with 0 test failures. Rebalancing via
+    # scripts/mine-shard-weights.ts is the real fix; this stops the bleeding.
+    timeout-minutes: 20
     strategy:
       fail-fast: false
       matrix:

src/cli.ts

@@ -2387,7 +2387,7 @@ JOBS (Minions)
   jobs get <id>                       Job details + history
   jobs cancel <id>                    Cancel job
   jobs retry <id>                     Re-queue failed/dead job
-  jobs prune [--older-than 30d] [--status s,..]  Clean old terminal jobs (0d = no age floor)
+  jobs prune [--older-than 30d]       Clean old jobs
   jobs stats                          Job health dashboard
   jobs work [--queue Q]               Start worker daemon (Postgres only)
 

src/commands/jobs.ts

@@ -106,21 +106,6 @@ export function parseMaxRssFlag(args: string[]): number | undefined {
   return parsed;
 }
 
-/** Terminal statuses `jobs prune --status` accepts (PR #2282). Matches what
- *  queue.prune can safely delete; anything else (waiting/active/…) is live. */
-export const PRUNE_STATUSES = ['completed', 'failed', 'dead', 'cancelled'] as const satisfies readonly MinionJobStatus[];
-
-/** Parse a `--status a,b,c` value into prune statuses. Throws on any value
- *  outside PRUNE_STATUSES (fail-fast, mirrors parseNiceValue). */
-export function parsePruneStatuses(raw: string): MinionJobStatus[] {
-  const requested = raw.split(',').map(s => s.trim()).filter(Boolean);
-  const invalid = requested.filter(s => !(PRUNE_STATUSES as readonly string[]).includes(s));
-  if (requested.length === 0 || invalid.length > 0) {
-    throw new Error(`--status accepts a comma-separated subset of [${PRUNE_STATUSES.join(', ')}]${invalid.length ? `. Invalid: ${invalid.join(', ')}` : ''}`);
-  }
-  return requested as MinionJobStatus[];
-}
-
 /** Parse `--nice N` (then `GBRAIN_NICE` env). Returns:
  *  - undefined if absent (no priority change — inherit)
  *  - the validated integer in [-20, 19] otherwise
@@ -223,9 +208,7 @@ USAGE
   gbrain jobs get <id>
   gbrain jobs cancel <id>
   gbrain jobs retry <id>
-  gbrain jobs prune [--older-than 30d] [--status completed,failed,dead,cancelled]
-                            (--older-than 0d = no age floor: deletes ALL
-                             matching terminal jobs; pair with --status)
+  gbrain jobs prune [--older-than 30d]
   gbrain jobs delete <id>
   gbrain jobs stats
   gbrain jobs smoke
@@ -617,27 +600,16 @@ HANDLER TYPES (built in)
     case 'prune': {
       const olderThanStr = parseFlag(args, '--older-than') ?? '30d';
       const days = parseInt(olderThanStr, 10);
-      if (isNaN(days) || days < 0) {
-        console.error('Error: --older-than must be a non-negative number (days). Example: --older-than 30d; --older-than 0d removes the age floor (deletes ALL matching terminal jobs).');
+      if (isNaN(days) || days <= 0) {
+        console.error('Error: --older-than must be a positive number (days). Example: --older-than 30d');
         process.exit(1);
       }
-      const statusFlag = parseFlag(args, '--status');
-      let statuses: MinionJobStatus[] | undefined;
-      if (statusFlag !== undefined) {
-        try { statuses = parsePruneStatuses(statusFlag); }
-        catch (e) { console.error(`Error: ${e instanceof Error ? e.message : String(e)}`); process.exit(1); }
-      }
 
       try { await queue.ensureSchema(); }
       catch (e) { console.error(e instanceof Error ? e.message : String(e)); process.exit(1); }
 
-      const count = await queue.prune({
-        olderThan: new Date(Date.now() - days * 86400000),
-        ...(statuses ? { status: statuses } : {}),
-      });
-      const statusLabel = statuses ? statuses.join('+') : 'completed+dead+cancelled';
-      const ageLabel = days === 0 ? 'regardless of age' : `older than ${days} days`;
-      console.log(`Pruned ${count} ${statusLabel} jobs ${ageLabel}.`);
+      const count = await queue.prune({ olderThan: new Date(Date.now() - days * 86400000) });
+      console.log(`Pruned ${count} jobs older than ${days} days.`);
       break;
     }
 

src/core/skill-manifest.ts

@@ -23,6 +23,15 @@
  * hold conventions and shared rule files, not skills. Files like
  * `_brain-filing-rules.md` live at the root and are not considered
  * skills by either loader.
+ *
+ * ClawHub-installed workspace skills (#1767): a skill dir carrying
+ * `.clawhub/origin.json` is an externally-managed runtime integration
+ * (e.g. an email or catalog skill), not a gbrain-routable skill. The
+ * derive path SKIPS those so `gbrain doctor` resolver_health doesn't
+ * hard-fail on them — UNLESS the skill's SKILL.md frontmatter declares
+ * `triggers:`, which is the explicit opt-in to gbrain routing (and the
+ * same surface that makes it reachable). An explicit manifest.json that
+ * lists a ClawHub skill also keeps strict checking (verbatim path).
  */
 
 import { existsSync, readFileSync, readdirSync, statSync } from 'fs';
@@ -60,9 +69,27 @@ function parseSkillName(skillMdPath: string): string | null {
   }
 }
 
+/**
+ * Does the SKILL.md frontmatter declare a `triggers:` key? A ClawHub-
+ * installed skill that ships gbrain `triggers:` has explicitly opted in
+ * to gbrain routing and gets full resolver checks (#1767).
+ */
+function declaresTriggers(skillMdPath: string): boolean {
+  try {
+    const content = readFileSync(skillMdPath, 'utf-8');
+    const fmMatch = content.match(/^---\n([\s\S]*?)\n---/);
+    if (!fmMatch) return false;
+    return /^triggers:/m.test(fmMatch[1]);
+  } catch {
+    return false;
+  }
+}
+
 /**
  * Walk skillsDir, return every `<skillsDir>/<dir>/SKILL.md` as a
- * ManifestEntry. Dotfile and underscore-prefixed dirs are skipped.
+ * ManifestEntry. Dotfile and underscore-prefixed dirs are skipped, as
+ * are ClawHub-installed external skills that haven't opted in to gbrain
+ * routing via `triggers:` frontmatter (#1767).
  */
 function deriveManifest(skillsDir: string): ManifestEntry[] {
   const out: ManifestEntry[] = [];
@@ -93,6 +120,12 @@ function deriveManifest(skillsDir: string): ManifestEntry[] {
     const skillMd = join(subdirAbs, 'SKILL.md');
     if (!existsSync(skillMd)) continue;
 
+    // ClawHub-installed external skill (#1767): skip unless it opts in
+    // to gbrain routing by declaring `triggers:` in its frontmatter.
+    if (existsSync(join(subdirAbs, '.clawhub', 'origin.json')) && !declaresTriggers(skillMd)) {
+      continue;
+    }
+
     const frontmatterName = parseSkillName(skillMd);
     const name = frontmatterName && frontmatterName !== '' ? frontmatterName : entry;
     out.push({ name, path: `${entry}/SKILL.md` });

test/check-resolvable.test.ts

@@ -382,6 +382,35 @@ describe("DRY detection — checkResolvable", () => {
   });
 });
 
+describe("#1767 — ClawHub workspace skills are not resolver-required", () => {
+  let dir: string;
+  afterEachCleanup(() => dir && rmSync(dir, { recursive: true, force: true }));
+
+  test("ClawHub skill without gbrain metadata produces no unreachable/mece_gap", () => {
+    dir = mkdtempSync(join(tmpdir(), "gbrain-clawhub-"));
+    // Native gbrain skill: routable via frontmatter triggers. No manifest.json
+    // (the OpenClaw derive path from the issue repro).
+    mkdirSync(join(dir, "query"), { recursive: true });
+    writeFileSync(
+      join(dir, "query", "SKILL.md"),
+      `---\nname: query\ndescription: test\ntriggers:\n  - "what do we know"\n---\n\n# query\n`
+    );
+    // ClawHub-installed integration: no triggers, no resolver row.
+    mkdirSync(join(dir, "agentmail", ".clawhub"), { recursive: true });
+    writeFileSync(
+      join(dir, "agentmail", ".clawhub", "origin.json"),
+      JSON.stringify({ registry: "https://clawhub.ai", slug: "agentmail" })
+    );
+    writeFileSync(join(dir, "agentmail", "SKILL.md"), `---\nname: agentmail\ndescription: email integration\n---\n\n# agentmail\n`);
+
+    const report = checkResolvable(dir);
+    const agentmailIssues = report.issues.filter(i => i.skill === "agentmail");
+    expect(agentmailIssues).toEqual([]);
+    expect(report.ok).toBe(true);
+    expect(report.summary.total_skills).toBe(1);
+  });
+});
+
 describe("v0.22.4 regression — actual repo skills/ has 0 errors", () => {
   test("repo skills/ pass check-resolvable cleanly (zero errors AND zero warnings)", () => {
     // The v0.22.4 (Part A) contract was zero warnings AND zero errors.

test/jobs-prune-flags.test.ts

@@ -1,30 +0,0 @@
-/**
- * Unit tests for parsePruneStatuses (PR #2282) — `jobs prune --status` parsing.
- */
-
-import { describe, test, expect } from 'bun:test';
-import { parsePruneStatuses, PRUNE_STATUSES } from '../src/commands/jobs.ts';
-
-describe('parsePruneStatuses', () => {
-  test('parses a single status', () => {
-    expect(parsePruneStatuses('failed')).toEqual(['failed']);
-  });
-
-  test('parses a comma-separated list with whitespace', () => {
-    expect(parsePruneStatuses(' completed, dead ')).toEqual(['completed', 'dead']);
-  });
-
-  test('accepts every documented terminal status', () => {
-    expect(parsePruneStatuses(PRUNE_STATUSES.join(','))).toEqual([...PRUNE_STATUSES]);
-  });
-
-  test('throws on non-terminal statuses', () => {
-    expect(() => parsePruneStatuses('waiting')).toThrow(/Invalid: waiting/);
-    expect(() => parsePruneStatuses('completed,active')).toThrow(/Invalid: active/);
-  });
-
-  test('throws on empty value', () => {
-    expect(() => parsePruneStatuses('')).toThrow(/comma-separated subset/);
-    expect(() => parsePruneStatuses(',')).toThrow(/comma-separated subset/);
-  });
-});

test/minions.test.ts

@@ -702,32 +702,6 @@ describe('MinionQueue: Prune', () => {
     const count = await queue.prune({ olderThan: new Date(Date.now() + 86400000) }); // future date = prune everything old enough
     expect(count).toBe(1); // only the cancelled one
   });
-
-  // PR #2282: `jobs prune --status` passes an explicit status subset through.
-  test('status filter prunes only the requested terminal statuses', async () => {
-    const cancelled = await queue.add('sync', {});
-    await queue.cancelJob(cancelled.id);
-    const dead = await queue.add('embed', {}, { max_attempts: 1 });
-    await queue.claim('tok1', 30000, 'default', ['embed']);
-    await queue.failJob(dead.id, 'tok1', 'boom', 'dead');
-
-    const count = await queue.prune({ olderThan: new Date(Date.now() + 86400000), status: ['dead'] });
-    expect(count).toBe(1); // only the dead one
-
-    const remaining = await queue.getJobs({ status: 'cancelled' });
-    expect(remaining.length).toBe(1);
-  });
-
-  // PR #2282: `--older-than 0d` = no age floor — olderThan of "now" deletes
-  // terminal jobs that finished moments ago.
-  test('olderThan now (0d semantics) prunes just-terminated jobs', async () => {
-    const job = await queue.add('sync', {});
-    await queue.cancelJob(job.id);
-    await new Promise(r => setTimeout(r, 5)); // ensure updated_at < now
-
-    const count = await queue.prune({ olderThan: new Date() });
-    expect(count).toBe(1);
-  });
 });
 
 // --- Stats (1 test) ---

test/skill-manifest.test.ts

@@ -166,6 +166,55 @@ describe('loadOrDeriveManifest', () => {
     expect(r.skills.map(s => s.name)).toEqual(['apple', 'mango', 'zebra']);
   });
 
+  // #1767 — ClawHub-installed workspace skills are external integrations,
+  // not gbrain-routable skills. The derive path skips them unless they
+  // opt in via `triggers:` frontmatter.
+  it('skips ClawHub-origin skills without triggers frontmatter (#1767)', () => {
+    const dir = scratch();
+    writeSkill(dir, 'query', 'query');
+    writeSkill(dir, 'agentmail', 'agentmail');
+    mkdirSync(join(dir, 'agentmail', '.clawhub'), { recursive: true });
+    writeFileSync(
+      join(dir, 'agentmail', '.clawhub', 'origin.json'),
+      JSON.stringify({ registry: 'https://clawhub.ai', slug: 'agentmail' })
+    );
+    const r = loadOrDeriveManifest(dir);
+    expect(r.derived).toBe(true);
+    expect(r.skills.map(s => s.name)).toEqual(['query']);
+  });
+
+  it('includes ClawHub-origin skills that opt in via triggers frontmatter (#1767)', () => {
+    const dir = scratch();
+    writeSkill(dir, 'agentmail', 'agentmail');
+    mkdirSync(join(dir, 'agentmail', '.clawhub'), { recursive: true });
+    writeFileSync(
+      join(dir, 'agentmail', '.clawhub', 'origin.json'),
+      JSON.stringify({ registry: 'https://clawhub.ai', slug: 'agentmail' })
+    );
+    writeFileSync(
+      join(dir, 'agentmail', 'SKILL.md'),
+      `---\nname: agentmail\ndescription: test\ntriggers:\n  - "send email"\n---\n\n# agentmail\n`
+    );
+    const r = loadOrDeriveManifest(dir);
+    expect(r.derived).toBe(true);
+    expect(r.skills.map(s => s.name)).toEqual(['agentmail']);
+  });
+
+  it('keeps ClawHub-origin skills listed in an explicit manifest.json (#1767)', () => {
+    // Explicit manifest.json is a deliberate declaration — strict checking stays.
+    const dir = scratch();
+    writeSkill(dir, 'agentmail', 'agentmail');
+    mkdirSync(join(dir, 'agentmail', '.clawhub'), { recursive: true });
+    writeFileSync(
+      join(dir, 'agentmail', '.clawhub', 'origin.json'),
+      JSON.stringify({ registry: 'https://clawhub.ai', slug: 'agentmail' })
+    );
+    writeManifest(dir, { skills: [{ name: 'agentmail', path: 'agentmail/SKILL.md' }] });
+    const r = loadOrDeriveManifest(dir);
+    expect(r.derived).toBe(false);
+    expect(r.skills.map(s => s.name)).toEqual(['agentmail']);
+  });
+
   it('treats dirs without SKILL.md as not-a-skill', () => {
     const dir = scratch();
     writeSkill(dir, 'query', 'query');