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

@@ -24,7 +24,6 @@ import type { GBrainConfig } from './core/config.ts';
 import type { AIGatewayConfig } from './core/ai/types.ts';
 import type { BrainEngine } from './core/engine.ts';
 import { operations, OperationError } from './core/operations.ts';
-import { resolveSourceIdEngineFree } from './core/source-resolver.ts';
 import { formatVolunteeredPage } from './core/context/volunteer.ts';
 import type { Operation, OperationContext } from './core/operations.ts';
 import { shouldForceExitAfterMain, finishCliTeardown, flushThenExit, currentExitCode, setCliExitVerdict } from './core/cli-force-exit.ts';
@@ -383,15 +382,6 @@ async function main() {
     if (op.localOnly) {
       refuseThinClient(command, cfgPre!.remote_mcp!.mcp_url);
     }
-    // #2098: the local path resolves --source / GBRAIN_SOURCE / .gbrain-source
-    // inside makeContext (ctx.sourceId), which this route never reaches — so
-    // scope must be mapped onto the op's source_id wire param before the call.
-    try {
-      applyThinClientSourceScope(op, params);
-    } catch (e: unknown) {
-      console.error(e instanceof Error ? e.message : String(e));
-      process.exit(1);
-    }
     await runThinClientRouted(op, params, cfgPre!, cliOpts);
     return;
   }
@@ -812,60 +802,6 @@ export function parseOpArgs(op: Operation, args: string[]): Record<string, unkno
   return params;
 }
 
-/**
- * #2098: thin-client source scoping. Locally, --source / GBRAIN_SOURCE /
- * .gbrain-source resolve to ctx.sourceId in makeContext; the thin-client
- * route short-circuits before that, so `gbrain query --source X` against a
- * remote brain silently searched unscoped. This runs the engine-free tiers
- * (flag → env → dotfile; the DB-backed tiers can't run without an engine —
- * the server's grant scoping covers the rest) and maps the result onto the
- * op's `source_id` wire param.
- *
- * Ops that declare their OWN `source` param (facts add, etc.) are left
- * untouched — their --source is an op param, not scope. An explicit --source
- * on an op with no source_id wire param throws (loud beats silent drop);
- * ambient env/dotfile scope with nowhere to send it is ignored, matching the
- * pre-fix behavior for non-scopeable ops. Exported for tests.
- */
-// Ops whose `source_id` wire param is NOT read-scope semantics: get_skill's
-// source_id flips the lookup from host catalog to brain-resident-pack
-// (getResidentSkillDetail). Ambient env/dotfile scope must never leak into
-// these; an explicit --source-id still passes through untouched above.
-const NON_SCOPE_SOURCE_ID_OPS = new Set(['get_skill']);
-
-export function applyThinClientSourceScope(
-  op: Operation,
-  params: Record<string, unknown>,
-  cwd?: string,
-): void {
-  if ('source' in op.params) return; // the op owns --source; not a scope flag
-  const explicit = typeof params.source === 'string' && params.source.length > 0
-    ? (params.source as string)
-    : null;
-  delete params.source; // never a wire param on these ops — don't leak it
-  // Explicit per-call scope already on the wire wins over ambient tiers.
-  if (params.source_id !== undefined || params.all_sources === true) {
-    if (explicit) {
-      throw new Error('Pass either --source or --source-id/--all-sources, not both.');
-    }
-    return;
-  }
-  const resolved = resolveSourceIdEngineFree(explicit, cwd);
-  if (!resolved) return;
-  if (!('source_id' in op.params) || NON_SCOPE_SOURCE_ID_OPS.has(op.name)) {
-    if (explicit) {
-      const hint = NON_SCOPE_SOURCE_ID_OPS.has(op.name)
-        ? `(its source_id parameter is not a scope filter; pass --source-id explicitly if you mean it)`
-        : `(the remote op has no source_id parameter; the server scopes it to your grant)`;
-      throw new Error(
-        `gbrain ${op.cliHints?.name || op.name} does not accept --source on a thin-client install ${hint}.`,
-      );
-    }
-    return; // ambient env/dotfile scope with nowhere to send it
-  }
-  params.source_id = resolved;
-}
-
 async function makeContext(engine: BrainEngine, params: Record<string, unknown>): Promise<OperationContext> {
   // v0.31.8 (D11): resolve sourceId via the canonical 6-tier chain. Honors
   // --source / GBRAIN_SOURCE / .gbrain-source / path-match / brain default /

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` });

src/core/source-resolver.ts

@@ -160,33 +160,6 @@ export async function resolveSourceId(
   return 'default';
 }
 
-/**
- * Engine-free tiers (1-3) of the resolution chain: explicit flag →
- * GBRAIN_SOURCE env → .gbrain-source dotfile walk. Used by the thin-client
- * CLI path (#2098), which has no local engine to run tiers 4-6 or
- * assertSourceExists against — the remote server enforces existence + grant.
- * Returns null when no engine-free tier fires.
- */
-export function resolveSourceIdEngineFree(
-  explicit: string | null | undefined,
-  cwd: string = process.cwd(),
-): string | null {
-  if (explicit) {
-    if (!SOURCE_ID_RE.test(explicit)) {
-      throw new Error(`Invalid --source value "${explicit}". Must match [a-z0-9-]{1,32}.`);
-    }
-    return explicit;
-  }
-  const env = process.env.GBRAIN_SOURCE;
-  if (env && env.length > 0) {
-    if (!SOURCE_ID_RE.test(env)) {
-      throw new Error(`Invalid GBRAIN_SOURCE value "${env}". Must match [a-z0-9-]{1,32}.`);
-    }
-    return env;
-  }
-  return readDotfileWalk(cwd);
-}
-
 /**
  * Returns the id of the SINGLE registered non-default source with a
  * local_path, when exactly one such row exists. Returns null when:

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/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');

test/thin-client-source-scope.test.ts

@@ -1,142 +0,0 @@
-/**
- * #2098: thin-client routing dropped --source / GBRAIN_SOURCE / .gbrain-source.
- *
- * The local CLI path resolves source scope in makeContext (ctx.sourceId); the
- * thin-client route short-circuits before that and sent params verbatim, so
- * `gbrain query --source X` against a remote brain silently searched unscoped
- * (the server op ignores the unknown `source` key).
- *
- * applyThinClientSourceScope runs the engine-free tiers (flag → env → dotfile)
- * and maps the result onto the op's `source_id` wire param. These tests fail
- * without the fix (params.source_id stays undefined / params.source leaks).
- */
-
-import { describe, test, expect } from 'bun:test';
-import { mkdtempSync, rmSync, writeFileSync } from 'fs';
-import { join } from 'path';
-import { tmpdir } from 'os';
-import { applyThinClientSourceScope, parseOpArgs } from '../src/cli.ts';
-import { operationsByName } from '../src/core/operations.ts';
-import { withEnv } from './helpers/with-env.ts';
-
-const queryOp = operationsByName.query;
-
-describe('applyThinClientSourceScope (#2098)', () => {
-  test('--source maps onto the query op wire param source_id', async () => {
-    await withEnv({ GBRAIN_SOURCE: undefined }, () => {
-      const params = parseOpArgs(queryOp, ['find things', '--source', 'wiki']);
-      expect(params.source).toBe('wiki'); // pre-fix state: wrong key
-      applyThinClientSourceScope(queryOp, params, '/');
-      expect(params.source_id).toBe('wiki');
-      expect('source' in params).toBe(false); // never leaks the unknown key
-    });
-  });
-
-  test('GBRAIN_SOURCE env tier fires when no flag is passed', async () => {
-    await withEnv({ GBRAIN_SOURCE: 'gstack' }, () => {
-      const params = parseOpArgs(queryOp, ['find things']);
-      applyThinClientSourceScope(queryOp, params, '/');
-      expect(params.source_id).toBe('gstack');
-    });
-  });
-
-  test('.gbrain-source dotfile tier fires when flag and env are absent', async () => {
-    await withEnv({ GBRAIN_SOURCE: undefined }, () => {
-      const tmp = mkdtempSync(join(tmpdir(), 'gbrain-thin-scope-'));
-      try {
-        writeFileSync(join(tmp, '.gbrain-source'), 'essays\n');
-        const params = parseOpArgs(queryOp, ['find things']);
-        applyThinClientSourceScope(queryOp, params, tmp);
-        expect(params.source_id).toBe('essays');
-      } finally {
-        rmSync(tmp, { recursive: true, force: true });
-      }
-    });
-  });
-
-  test('explicit --source-id on the wire wins over ambient env scope', async () => {
-    await withEnv({ GBRAIN_SOURCE: 'gstack' }, () => {
-      const params = parseOpArgs(queryOp, ['find things', '--source-id', 'wiki']);
-      applyThinClientSourceScope(queryOp, params, '/');
-      expect(params.source_id).toBe('wiki');
-    });
-  });
-
-  test('--source together with --source-id is rejected loudly', async () => {
-    await withEnv({ GBRAIN_SOURCE: undefined }, () => {
-      const params = parseOpArgs(queryOp, ['q', '--source', 'a', '--source-id', 'b']);
-      expect(() => applyThinClientSourceScope(queryOp, params, '/')).toThrow(/not both/);
-    });
-  });
-
-  test('invalid --source value is rejected loudly', async () => {
-    await withEnv({ GBRAIN_SOURCE: undefined }, () => {
-      const params = parseOpArgs(queryOp, ['q', '--source', 'Bad_Value!']);
-      expect(() => applyThinClientSourceScope(queryOp, params, '/')).toThrow(/Invalid --source/);
-    });
-  });
-
-  test('--source on an op with no source_id wire param errors instead of silently dropping', async () => {
-    await withEnv({ GBRAIN_SOURCE: undefined }, () => {
-      const op = operationsByName.add_tag;
-      expect('source_id' in op.params).toBe(false);
-      const params = { slug: 'x', tag: 'y', source: 'wiki' };
-      expect(() => applyThinClientSourceScope(op, params, '/')).toThrow(/--source/);
-    });
-  });
-
-  test('ambient env scope on an op with no source_id wire param is ignored (no throw)', async () => {
-    await withEnv({ GBRAIN_SOURCE: 'wiki' }, () => {
-      const op = operationsByName.add_tag;
-      const params: Record<string, unknown> = { slug: 'x', tag: 'y' };
-      applyThinClientSourceScope(op, params, '/');
-      expect(params.source_id).toBeUndefined();
-    });
-  });
-
-  test('ops that declare their OWN source param are left untouched', async () => {
-    await withEnv({ GBRAIN_SOURCE: undefined }, () => {
-      const op = operationsByName.put_raw_data;
-      expect('source' in op.params).toBe(true);
-      const params: Record<string, unknown> = { slug: 'x', source: 'crustdata', data: {} };
-      applyThinClientSourceScope(op, params, '/');
-      expect(params.source).toBe('crustdata');
-      expect(params.source_id).toBeUndefined();
-    });
-  });
-
-  test('get_skill: ambient scope never leaks into its non-scope source_id param', async () => {
-    await withEnv({ GBRAIN_SOURCE: 'wiki' }, () => {
-      const op = operationsByName.get_skill;
-      expect('source_id' in op.params).toBe(true); // has the param, but it is a mode switch
-      const params: Record<string, unknown> = { name: 'ingest' };
-      applyThinClientSourceScope(op, params, '/');
-      expect(params.source_id).toBeUndefined(); // would flip host catalog → brain-pack lookup
-    });
-  });
-
-  test('get_skill: explicit --source errors instead of masquerading as --source-id', async () => {
-    await withEnv({ GBRAIN_SOURCE: undefined }, () => {
-      const op = operationsByName.get_skill;
-      const params: Record<string, unknown> = { name: 'ingest', source: 'wiki' };
-      expect(() => applyThinClientSourceScope(op, params, '/')).toThrow(/--source-id/);
-    });
-  });
-
-  test('get_skill: explicit --source-id passes through untouched', async () => {
-    await withEnv({ GBRAIN_SOURCE: 'gstack' }, () => {
-      const op = operationsByName.get_skill;
-      const params: Record<string, unknown> = { name: 'ingest', source_id: 'wiki' };
-      applyThinClientSourceScope(op, params, '/');
-      expect(params.source_id).toBe('wiki');
-    });
-  });
-
-  test('no scope from any tier leaves params unchanged', async () => {
-    await withEnv({ GBRAIN_SOURCE: undefined }, () => {
-      const params = parseOpArgs(queryOp, ['find things']);
-      applyThinClientSourceScope(queryOp, params, '/');
-      expect(params.source_id).toBeUndefined();
-    });
-  });
-});