chore: whitespace to retrigger CI

The return-path fix in this PR resolves the bug where A2A replies landed
in the newest session instead of the originating one. Update the test
assertion from documenting the broken state to asserting the fixed state:
response now lands in Slack (origin) not Discord (newest).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

.agents/skills

@@ -1 +0,0 @@
-../.claude/skills

.claude/skills/add-atomic-chat-tool/REMOVE.md

@@ -1,49 +0,0 @@
-# Remove Atomic Chat
-
-Idempotent — safe to run even if some steps were never applied.
-
-## 1. Delete the copied files (both trees)
-
-```bash
-rm -f container/agent-runner/src/atomic-chat-mcp-stdio.ts \
-      container/agent-runner/src/atomic-chat-registration.test.ts \
-      src/atomic-chat-env.ts \
-      src/atomic-chat-wiring.test.ts
-```
-
-## 2. Unregister the MCP server
-
-In `container/agent-runner/src/index.ts`, remove the `atomic_chat: { … }` entry from the `mcpServers` object (leave `nanoclaw` and any other entries).
-
-## 3. Revert the host-side edits in `src/container-runner.ts`
-
-- Remove the `import { atomicChatEnvArgs } from './atomic-chat-env.js';` import.
-- Remove the `args.push(...atomicChatEnvArgs());` line that follows the `TZ` env line.
-- Restore the `container.stderr` logger to its single-line `log.debug(line, …)` form (remove the `[ATOMIC]` info-level branch).
-
-## 4. Remove env vars
-
-Remove the Atomic Chat block from `.env.example`, and the `ATOMIC_CHAT_*` lines from `.env` if you set them.
-
-## 5. Rebuild and restart
-
-Run from your NanoClaw project root:
-
-```bash
-pnpm run build && ./container/build.sh
-source setup/lib/install-slug.sh
-
-# macOS
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)
-
-# Linux
-systemctl --user restart $(systemd_unit)
-```
-
-## Verification
-
-After removal, confirm the tool is gone — in a wired agent, asking it to "list atomic chat models" should report no such tool, and the logs should show no `[ATOMIC]` lines after the last restart:
-
-```bash
-grep "\[ATOMIC\]" logs/nanoclaw.log | tail -5
-```

.claude/skills/add-atomic-chat-tool/SKILL.md

@@ -13,7 +13,7 @@ Tools exposed:
 
 Model management (download, delete) is done through the **Atomic Chat desktop UI** — the app is a fork of Jan and manages its own model library.
 
-The skill ships the MCP server source (and its test) in this folder and copies them into the agent-runner tree at install time, then registers the server in `index.ts` and forwards host env vars in `container-runner.ts`. Registering the server is enough to expose its tools — the agent's allow-pattern (`mcp__atomic_chat__*`) is derived from the registered server name.
+The skill ships the MCP server source in this folder and copies it into the agent-runner tree at install time, then wires it up with small edits to `index.ts`, `providers/claude.ts`, and `container-runner.ts`. No branch merge — all edits are additive and idempotent.
 
 ## Phase 1: Pre-flight
 
@@ -39,19 +39,10 @@ If the request fails:
 
 ## Phase 2: Apply Code Changes
 
-### Copy the skill's source and tests into both trees
-
-This skill reaches into both the container (Bun) tree and the host (Node) tree, so its
-files go into both, alongside the integration points they cover.
+### Copy the MCP server source
 
 ```bash
-S=.claude/skills/add-atomic-chat-tool
-# Container (Bun) tree — the MCP server and the registration wiring test
-cp $S/atomic-chat-mcp-stdio.ts        container/agent-runner/src/atomic-chat-mcp-stdio.ts
-cp $S/atomic-chat-registration.test.ts container/agent-runner/src/atomic-chat-registration.test.ts
-# Host (Node) tree — the env-forwarding helper and the wiring test
-cp $S/atomic-chat-env.ts              src/atomic-chat-env.ts
-cp $S/atomic-chat-wiring.test.ts      src/atomic-chat-wiring.test.ts
+cp .claude/skills/add-atomic-chat-tool/atomic-chat-mcp-stdio.ts container/agent-runner/src/atomic-chat-mcp-stdio.ts
 ```
 
 ### Register the MCP server in the agent-runner
@@ -88,31 +79,40 @@ Add an `atomic_chat` entry alongside `nanoclaw`:
   };
 ```
 
-`atomic-chat-registration.test.ts` asserts this entry is present and points at the server module — the tool only appears to the agent if it is registered here.
+### Add the tool glob to the allowlist
+
+Edit `container/agent-runner/src/providers/claude.ts`. Find `'mcp__nanoclaw__*',` in the `TOOL_ALLOWLIST` array and add `'mcp__atomic_chat__*',` on the following line:
+
+```ts
+  'mcp__nanoclaw__*',
+  'mcp__atomic_chat__*',
+];
+```
 
 ### Forward host env vars into the container
 
-The env-forwarding logic lives in the copied `src/atomic-chat-env.ts` (`atomicChatEnvArgs()`), so the reach-in into `buildContainerArgs` is a single call.
-
-Import it in `src/container-runner.ts` (alongside the other local imports):
-
-```ts
-import { atomicChatEnvArgs } from './atomic-chat-env.js';
-```
-
-Then, in `buildContainerArgs`, find the `TZ` env line and add the call right after it:
+Edit `src/container-runner.ts` in `buildContainerArgs`. Find the `TZ` env line:
 
 ```ts
   args.push('-e', `TZ=${TIMEZONE}`);
-  args.push(...atomicChatEnvArgs());
 ```
 
-`atomic-chat-wiring.test.ts` asserts this `args.push(...atomicChatEnvArgs())` call exists inside `buildContainerArgs`.
+Add ATOMIC_CHAT forwarding right after it:
+
+```ts
+  args.push('-e', `TZ=${TIMEZONE}`);
+
+  // Atomic Chat MCP tool: forward host overrides if set (default is host.docker.internal:1337).
+  if (process.env.ATOMIC_CHAT_HOST) {
+    args.push('-e', `ATOMIC_CHAT_HOST=${process.env.ATOMIC_CHAT_HOST}`);
+  }
+  if (process.env.ATOMIC_CHAT_API_KEY) {
+    args.push('-e', `ATOMIC_CHAT_API_KEY=${process.env.ATOMIC_CHAT_API_KEY}`);
+  }
+```
 
 ### Surface `[ATOMIC]` log lines at info level
 
-> **Shared block.** This rewrites the `container.stderr` logger, which other local-model tools (e.g. `add-ollama-tool` for `[OLLAMA]`) also edit to surface their own prefix. Touch only the `[ATOMIC]` branch and leave the rest of the block intact, so the edits coexist and removal restores it cleanly.
-
 In the same file, find the stderr logger:
 
 ```ts
@@ -157,18 +157,10 @@ Append to `.env.example`:
 ```bash
 pnpm run build
 pnpm exec tsc -p container/agent-runner/tsconfig.json --noEmit
-# Host tree: buildContainerArgs wiring
-pnpm exec vitest run src/atomic-chat-wiring.test.ts
-# Container tree: index.ts registration
-(cd container/agent-runner && bun test src/atomic-chat-registration.test.ts)
 ./container/build.sh
 ```
 
-All must be clean before proceeding. The wiring and registration tests confirm the two
-integration points — the `buildContainerArgs` call and the `index.ts` registration — are
-actually in place; a failure means one drifted. (The MCP server's own request/response
-behavior against Atomic Chat is the author's build-time concern, not part of these tests —
-verify it manually in Phase 4.)
+All three must be clean before proceeding.
 
 ## Phase 3: Configure
 
@@ -190,12 +182,9 @@ ATOMIC_CHAT_API_KEY=sk-...
 
 ### Restart the service
 
-Run from your NanoClaw project root:
-
 ```bash
-source setup/lib/install-slug.sh
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)  # macOS
-# Linux: systemctl --user restart $(systemd_unit)
+launchctl kickstart -k gui/$(id -u)/com.nanoclaw  # macOS
+# Linux: systemctl --user restart nanoclaw
 ```
 
 ## Phase 4: Verify
@@ -226,8 +215,9 @@ Look for:
 
 The agent is looking for a CLI that doesn't exist instead of using the MCP tools. This means:
 1. The MCP server wasn't copied — check `container/agent-runner/src/atomic-chat-mcp-stdio.ts` exists
-2. The MCP server wasn't registered — check `container/agent-runner/src/index.ts` has the `atomic_chat` entry in `mcpServers` (the allow-pattern is derived from this, so registration is the only thing to check)
-3. The container wasn't rebuilt — run `./container/build.sh`
+2. The MCP server wasn't registered — check `container/agent-runner/src/index.ts` has the `atomic_chat` entry in `mcpServers`
+3. The allowlist wasn't updated — check `container/agent-runner/src/providers/claude.ts` includes `mcp__atomic_chat__*` in `TOOL_ALLOWLIST`
+4. The container wasn't rebuilt — run `./container/build.sh`
 
 ### "Failed to connect to Atomic Chat"
 

.claude/skills/add-atomic-chat-tool/atomic-chat-env.ts

@@ -1,18 +0,0 @@
-/**
- * Host-side env forwarding for the Atomic Chat MCP tool. Returns the Docker `-e`
- * arguments that pass any `ATOMIC_CHAT_*` host overrides into the container.
- *
- * Lives in its own file so the reach-in in `container-runner.ts` is a single call
- * (`args.push(...atomicChatEnvArgs())`) and this logic is behavior-testable in
- * isolation, without invoking the OneCLI-entangled `buildContainerArgs`.
- */
-export function atomicChatEnvArgs(): string[] {
-  const args: string[] = [];
-  if (process.env.ATOMIC_CHAT_HOST) {
-    args.push('-e', `ATOMIC_CHAT_HOST=${process.env.ATOMIC_CHAT_HOST}`);
-  }
-  if (process.env.ATOMIC_CHAT_API_KEY) {
-    args.push('-e', `ATOMIC_CHAT_API_KEY=${process.env.ATOMIC_CHAT_API_KEY}`);
-  }
-  return args;
-}

.claude/skills/add-atomic-chat-tool/atomic-chat-registration.test.ts

@@ -1,65 +0,0 @@
-/**
- * Wiring test for the MCP-server registration integration point (container/Bun tree).
- *
- * The handlers are behavior-tested in atomic-chat-mcp-stdio.test.ts, but that does not
- * prove the server is registered — delete the index.ts entry and the tool simply never
- * appears, yet the handler test stays green. index.ts is the container boot entry and is
- * not cheaply invocable, so we assert the registration structurally: the `mcpServers`
- * object literal has an `atomic_chat` property whose command runs `atomic-chat-mcp-stdio.ts`.
- */
-import fs from 'fs';
-import path from 'path';
-
-import { describe, it, expect } from 'bun:test';
-import ts from 'typescript';
-
-function sourceFile(): ts.SourceFile {
-  const p = path.join(import.meta.dir, 'index.ts');
-  return ts.createSourceFile(p, fs.readFileSync(p, 'utf8'), ts.ScriptTarget.Latest, true);
-}
-
-/** Find the object literal assigned to `const mcpServers = { ... }`. */
-function mcpServersLiteral(sf: ts.SourceFile): ts.ObjectLiteralExpression | undefined {
-  let found: ts.ObjectLiteralExpression | undefined;
-  const visit = (node: ts.Node) => {
-    if (
-      ts.isVariableDeclaration(node) &&
-      ts.isIdentifier(node.name) &&
-      node.name.text === 'mcpServers' &&
-      node.initializer &&
-      ts.isObjectLiteralExpression(node.initializer)
-    ) {
-      found = node.initializer;
-    }
-    if (!found) ts.forEachChild(node, visit);
-  };
-  visit(sf);
-  return found;
-}
-
-function property(obj: ts.ObjectLiteralExpression, name: string): ts.PropertyAssignment | undefined {
-  return obj.properties.find(
-    (p): p is ts.PropertyAssignment =>
-      ts.isPropertyAssignment(p) &&
-      ((ts.isIdentifier(p.name) && p.name.text === name) ||
-        (ts.isStringLiteral(p.name) && p.name.text === name)),
-  );
-}
-
-describe('index.ts registers the atomic_chat MCP server', () => {
-  const obj = mcpServersLiteral(sourceFile());
-
-  it('finds the mcpServers object literal', () => {
-    expect(obj).toBeDefined();
-  });
-
-  it('has an atomic_chat entry', () => {
-    expect(obj && property(obj, 'atomic_chat')).toBeDefined();
-  });
-
-  it('points atomic_chat at atomic-chat-mcp-stdio.ts', () => {
-    const entry = obj && property(obj, 'atomic_chat');
-    const text = entry ? entry.getText() : '';
-    expect(text).toContain('atomic-chat-mcp-stdio.ts');
-  });
-});

.claude/skills/add-atomic-chat-tool/atomic-chat-wiring.test.ts

@@ -1,69 +0,0 @@
-/**
- * Wiring test for the host-side env-forwarding integration point (host/vitest tree).
- *
- * The env helper is behavior-tested in atomic-chat-env.test.ts, but that does not prove
- * buildContainerArgs actually uses it — a direct unit test stays green even if the reach-in
- * is deleted. buildContainerArgs is entangled with OneCLI and not cheaply invocable, so we
- * assert the integration structurally: inside buildContainerArgs there is an
- * `args.push(...atomicChatEnvArgs())` call. Delete the reach-in and this goes red.
- */
-import fs from 'fs';
-import path from 'path';
-
-import { describe, it, expect } from 'vitest';
-import ts from 'typescript';
-
-function sourceFile(): ts.SourceFile {
-  const p = path.resolve(process.cwd(), 'src/container-runner.ts');
-  return ts.createSourceFile(p, fs.readFileSync(p, 'utf8'), ts.ScriptTarget.Latest, true);
-}
-
-function findFunction(sf: ts.SourceFile, name: string): ts.FunctionDeclaration | undefined {
-  let found: ts.FunctionDeclaration | undefined;
-  const visit = (node: ts.Node) => {
-    if (ts.isFunctionDeclaration(node) && node.name?.text === name) found = node;
-    if (!found) ts.forEachChild(node, visit);
-  };
-  visit(sf);
-  return found;
-}
-
-/** Is this node `args.push(...atomicChatEnvArgs())`? */
-function isSpreadPushOfEnvArgs(node: ts.Node): boolean {
-  if (!ts.isCallExpression(node)) return false;
-  const callee = node.expression;
-  if (
-    !ts.isPropertyAccessExpression(callee) ||
-    callee.name.text !== 'push' ||
-    !ts.isIdentifier(callee.expression) ||
-    callee.expression.text !== 'args'
-  ) {
-    return false;
-  }
-  return node.arguments.some(
-    (arg) =>
-      ts.isSpreadElement(arg) &&
-      ts.isCallExpression(arg.expression) &&
-      ts.isIdentifier(arg.expression.expression) &&
-      arg.expression.expression.text === 'atomicChatEnvArgs',
-  );
-}
-
-describe('container-runner.ts wires in atomicChatEnvArgs', () => {
-  const sf = sourceFile();
-  const fn = findFunction(sf, 'buildContainerArgs');
-
-  it('finds buildContainerArgs', () => {
-    expect(fn).toBeDefined();
-  });
-
-  it('calls args.push(...atomicChatEnvArgs()) inside buildContainerArgs', () => {
-    let wired = false;
-    const visit = (node: ts.Node) => {
-      if (isSpreadPushOfEnvArgs(node)) wired = true;
-      if (!wired) ts.forEachChild(node, visit);
-    };
-    if (fn?.body) visit(fn.body);
-    expect(wired).toBe(true);
-  });
-});

.claude/skills/add-audit/REMOVE.md

@@ -1,52 +0,0 @@
-# Remove /add-audit
-
-Reverses every change the skill made. Safe to re-run even if some pieces are
-already gone. Run from the NanoClaw project root.
-
-## 1. Delete the copied files
-
-```bash
-rm -rf src/audit
-rm -f src/cli/dispatch.audit.ts src/cli/dispatch.audit.test.ts
-rm -f src/cli/resources/audit.ts
-rm -f src/audit-wiring.test.ts
-```
-
-## 2. Revert the dispatch composition
-
-In `src/cli/dispatch.ts`, delete (not comment out) the three edits the skill
-made:
-
-1. The import line: `import { withAudit } from './dispatch.audit.js';`
-2. The composition block (comment + `export const dispatch = withAudit(dispatchInner);`)
-3. Rename the dispatcher back — change `async function dispatchInner(` to
-   `export async function dispatch(`
-
-## 3. Unregister the resource
-
-Delete the `import './audit.js';` line from `src/cli/resources/index.ts`.
-
-## 4. Remove the settings
-
-Delete the `AUDIT_ENABLED` and `AUDIT_RETENTION_DAYS` lines from `.env`.
-
-## 5. Rebuild and restart
-
-```bash
-pnpm run build
-source setup/lib/install-slug.sh
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)   # macOS
-# systemctl --user restart $(systemd_unit)             # Linux
-```
-
-## Day-files
-
-`data/audit/*.ndjson` are the operator's records and are deliberately left in
-place. To purge them too:
-
-```bash
-rm -rf data/audit
-```
-
-No dependency was added, nothing under `container/` was touched, and no DB
-schema changed — there is nothing else to undo.

.claude/skills/add-audit/SKILL.md

@@ -1,211 +0,0 @@
----
-name: add-audit
-description: Add an opt-in local audit log for the ncl command surface — every dispatch outcome on both transports (host socket and container), including scope denials, approval holds, and approved replays, written as SIEM-shaped append-only NDJSON day-files under data/audit/. Read back with `ncl audit list`; plug exporters in via registerAuditHook. Off until AUDIT_ENABLED=true.
----
-
-# /add-audit — Local Audit Log (ncl surface)
-
-Records one canonical audit event for every command that reaches the `ncl`
-dispatcher — human over the host socket or agent over the container transport
-— including denials. Both transports converge on the exported `dispatch`, so
-one composition covers the whole surface: there is no second door.
-
-```
-ncl (host socket) ──┐
-                    ├─→ dispatch = withAudit(dispatchInner) ─→ one NDJSON line
-container cli_request ┘        │                               data/audit/<UTC-day>.ndjson
-approved replay (grant) ───────┘
-```
-
-What one event carries: `actor` (`host:<os-user>` or the agent group),
-`origin` (transport, session, channel), dotted `action` from the guard
-catalog (e.g. `groups.config.add-mcp-server`), touched/attempted `resources`,
-`outcome` (`success · failure · denied · pending`), `correlation_id` (the
-approval id on gated chains — the pending event and the approved replay share
-it, so `--correlation <id>` returns the whole chain), and redacted `details`.
-
-Scope of this increment: the ncl dispatch surface only. Approval-lifecycle
-events (request/decision as their own events), OneCLI credential holds, and
-channel/sender events are later increments — they attach to `src/audit/` as
-pure adds (new `*.audit.ts` adapters and observer subscriptions).
-
-## Steps
-
-### 0. Pre-flight (idempotency)
-
-The apply is safe to re-run; every step below is guarded. Skip to
-**Enable** if all of these already hold:
-
-- `src/audit/` exists
-- `src/cli/resources/index.ts` contains `import './audit.js';`
-- `src/cli/dispatch.ts` contains `export const dispatch = withAudit(dispatchInner);`
-
-Before editing, verify the reach-in targets still exist: `src/cli/dispatch.ts`
-must contain `export async function dispatch(` (or the already-applied
-composition), and `src/cli/resources/index.ts` must be the resource barrel (a
-list of `import './<resource>.js';` lines). If either has moved, stop and
-adapt rather than guessing.
-
-### 1. Copy the payload
-
-From the NanoClaw project root:
-
-```bash
-cp -R "${CLAUDE_SKILL_DIR}/add/src/." src/
-```
-
-What lands (mirrors of the destination paths):
-
-- `src/audit/` — the domain-free leaf: event schema (`types.ts`), env config
-  (`config.ts`), redactor, NDJSON day-file store, emit seam, post-write hooks,
-  reader, boot/maintenance wiring, vocabulary — plus its tests.
-- `src/cli/dispatch.audit.ts` — the CLI adapter: `withAudit` middleware and
-  the actor/origin/resource mapping (+ `dispatch.audit.test.ts`).
-- `src/cli/resources/audit.ts` — the read-only `ncl audit` resource.
-- `src/audit-wiring.test.ts` — goes red if either core edit below is deleted
-  or drifts.
-
-### 2. Register the resource
-
-Append to `src/cli/resources/index.ts` (skip if the line is already present):
-
-```typescript
-import './audit.js';
-```
-
-### 3. Compose the dispatch middleware
-
-This is the skill's one functional reach-in, in `src/cli/dispatch.ts`. Three
-small edits:
-
-1. Add the import (next to the other `./` imports):
-
-   ```typescript
-   import { withAudit } from './dispatch.audit.js';
-   ```
-
-2. Rename the dispatcher declaration — change
-
-   ```typescript
-   export async function dispatch(
-   ```
-
-   to
-
-   ```typescript
-   async function dispatchInner(
-   ```
-
-3. Directly after that function's closing brace (before the
-   `registerApprovalHandler('cli_command', …)` block), add:
-
-   ```typescript
-   // Audit middleware (installed by /add-audit): the exported dispatch is the
-   // wrapped function, so both transports and the approved replay below all
-   // pass the one composition.
-   export const dispatch = withAudit(dispatchInner);
-   ```
-
-The composition must live at the definition site (not at the import sites):
-the approved-replay handler in the same file calls `dispatch(...)` too, and
-only the wrapped export covers it. `src/audit-wiring.test.ts` asserts exactly
-this shape via the TypeScript AST.
-
-Loading `dispatch.audit.ts` also boots the audit log: on an enabled box it
-asserts `data/audit/` is writable (refusing to start beats a silent audit
-gap), runs the boot retention prune, and arms an unref'd maintenance timer.
-Nothing else in core changes — no `index.ts` or `host-sweep.ts` edits.
-
-### 4. Enable
-
-Add the two settings to `.env` (idempotent — overwrite or append):
-
-```bash
-grep -q '^AUDIT_ENABLED=' .env && sed -i.bak 's/^AUDIT_ENABLED=.*/AUDIT_ENABLED=true/' .env && rm -f .env.bak || echo 'AUDIT_ENABLED=true' >> .env
-grep -q '^AUDIT_RETENTION_DAYS=' .env || echo 'AUDIT_RETENTION_DAYS=90' >> .env
-```
-
-`AUDIT_ENABLED` is the master switch — off (or absent) means `emitAuditEvent`
-is a no-op and `data/audit/` is never created. `AUDIT_RETENTION_DAYS`: day
-files strictly older than the horizon are hard-deleted (unlinked) at boot and
-once per UTC day; `0` = keep forever; unset = 90.
-
-### 5. Build and test
-
-Run `build` before the tests — it's what catches a missed copy or a drifted
-import path across the whole composed tree:
-
-```bash
-pnpm run build
-pnpm exec vitest run src/audit src/cli/dispatch.audit.test.ts src/audit-wiring.test.ts
-pnpm test
-```
-
-### 6. Restart the service
-
-```bash
-source setup/lib/install-slug.sh
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)   # macOS
-# systemctl --user restart $(systemd_unit)             # Linux
-```
-
-### 7. Verify (runtime smoke)
-
-```bash
-ncl groups list                     # any command — this one is now an audit event
-cat data/audit/$(date -u +%F).ndjson | tail -1
-ncl audit list --limit 5
-```
-
-The last line of the day-file is the `groups.list` event you just caused.
-
-## Reading it back
-
-```
-ncl audit list [--actor <id>] [--action <name-or-prefix>] [--resource <id-or-type>]
-               [--outcome success|failure|denied|pending|approved|rejected]
-               [--since 7d|24h|30m|ISO] [--until …] [--correlation <approval-id>]
-               [--limit N] [--format ndjson]
-```
-
-Newest first, default limit 100. `--action groups.config` matches the whole
-dotted subtree. `--format ndjson` streams the stored lines verbatim — pipe to
-a file for SIEM import. On a disabled box the command errors with
-`audit log is disabled — set AUDIT_ENABLED=true` rather than returning an
-empty list that would read as "no actions happened".
-
-The resource is deliberately **not** on the group-scope allowlist: audit
-spans agent groups, so group-scoped agents are refused before the handler
-(fails closed). Host callers and `cli_scope: global` agents only.
-
-## Redaction, failure posture, exporters
-
-- Every event's `details` passes a recursive key-pattern redactor
-  (`/(token|secret|key|password|credential|auth|bearer)/i` → `[REDACTED]`,
-  ~2 KB per-value cap) at the single emit seam.
-- Fail-open + loud: a failed append is `log.error`'d and the audited action
-  proceeds. At boot, an enabled box refuses to start if `data/audit/` isn't
-  writable.
-- In-process exporters register via `registerAuditHook` (from
-  `src/audit/index.js`) — post-write hooks that fire only after the local
-  append succeeds, so an external system can never be ahead of the source of
-  truth. Ship one as its own `/add-*` skill; declare `/add-audit` as its
-  dependency.
-
-## Troubleshooting
-
-- **Host won't start, banner names the audit directory** — `AUDIT_ENABLED=true`
-  but `data/audit/` isn't writable. Fix permissions or disable audit.
-- **`audit log is disabled — set AUDIT_ENABLED=true`** — the read-back guard;
-  enable in `.env` and restart.
-- **An agent gets "CLI access is scoped to this agent group" for `ncl audit`**
-  — by design; grant the group `cli_scope: global` only if it should read
-  cross-group history.
-- **`pnpm test` on an enabled box adds a few events to today's day-file** —
-  expected: the base dispatch tests drive real dispatches. Harmless noise;
-  the audit test suites themselves write only to temp dirs or capture buffers.
-
-## Removal
-
-See [REMOVE.md](REMOVE.md) — reverses every change; existing day-files are
-left in place (they're the operator's records).

.claude/skills/add-audit/add/src/audit-wiring.test.ts

@@ -1,136 +0,0 @@
-/**
- * Wiring tests for the /add-audit skill's two core edits — they go red if
- * either edit is deleted or drifts:
- *
- *  1. src/cli/dispatch.ts — the exported dispatch must be the composed
- *     `withAudit(dispatchInner)` (AST check: only the definition-site
- *     composition covers both transports AND the in-module approved replay).
- *  2. src/cli/resources/index.ts — the audit resource must register through
- *     the real barrel (behavior check), stay OFF the group-scope allowlist,
- *     and leave the guard conformance walk clean.
- *
- * Plus the emit invariant the module's discipline rests on: emitAuditEvent
- * appears only in src/audit/ and *.audit.ts adapter files.
- */
-import fs from 'fs';
-import path from 'path';
-import ts from 'typescript';
-import { describe, expect, it } from 'vitest';
-
-// Same production barrels the boot conformance walk sees (mirrors
-// src/guard/conformance.test.ts).
-import './cli/commands/index.js';
-import './modules/index.js';
-import './cli/delivery-action.js';
-import './cli/dispatch.js';
-
-import { commandGuard, GROUP_SCOPE_RESOURCES, lookup } from './cli/registry.js';
-import { grantContinuationGaps } from './guard-conformance.js';
-
-describe('audit resource registration (barrel wiring)', () => {
-  it('registers audit-list through the real resource barrel', () => {
-    const cmd = lookup('audit-list');
-    expect(cmd).toBeDefined();
-    expect(cmd?.action).toBe('audit.list');
-    expect(cmd?.access).toBe('open');
-  });
-
-  it('derives a guard-catalog entry for the audit command', () => {
-    const guard = commandGuard('audit-list');
-    expect(guard.action).toBe('audit.list');
-  });
-
-  it('is NOT on the group-scope allowlist — group-scoped agents fail closed', () => {
-    expect(GROUP_SCOPE_RESOURCES.has('audit')).toBe(false);
-  });
-
-  it('leaves the boot conformance walk clean with the audit resource registered', () => {
-    expect(grantContinuationGaps()).toEqual([]);
-  });
-});
-
-describe('dispatch composition (AST wiring)', () => {
-  const source = fs.readFileSync(path.resolve('src/cli/dispatch.ts'), 'utf8');
-  const sf = ts.createSourceFile('dispatch.ts', source, ts.ScriptTarget.Latest, true);
-
-  const hasExportModifier = (node: ts.HasModifiers): boolean =>
-    (ts.getModifiers(node) ?? []).some((m) => m.kind === ts.SyntaxKind.ExportKeyword);
-
-  let importsWithAudit = false;
-  let innerDeclaredUnexported = false;
-  let exportsWrappedDispatch = false;
-  let exportsUnwrappedDispatchFn = false;
-
-  sf.forEachChild((node) => {
-    if (
-      ts.isImportDeclaration(node) &&
-      ts.isStringLiteral(node.moduleSpecifier) &&
-      node.moduleSpecifier.text === './dispatch.audit.js'
-    ) {
-      const named = node.importClause?.namedBindings;
-      if (named && ts.isNamedImports(named) && named.elements.some((e) => e.name.text === 'withAudit')) {
-        importsWithAudit = true;
-      }
-    }
-    if (ts.isFunctionDeclaration(node) && node.name?.text === 'dispatchInner') {
-      innerDeclaredUnexported = !hasExportModifier(node);
-    }
-    if (ts.isFunctionDeclaration(node) && node.name?.text === 'dispatch' && hasExportModifier(node)) {
-      exportsUnwrappedDispatchFn = true;
-    }
-    if (ts.isVariableStatement(node) && hasExportModifier(node)) {
-      for (const decl of node.declarationList.declarations) {
-        if (
-          ts.isIdentifier(decl.name) &&
-          decl.name.text === 'dispatch' &&
-          decl.initializer &&
-          ts.isCallExpression(decl.initializer) &&
-          ts.isIdentifier(decl.initializer.expression) &&
-          decl.initializer.expression.text === 'withAudit' &&
-          decl.initializer.arguments.length === 1 &&
-          ts.isIdentifier(decl.initializer.arguments[0]) &&
-          decl.initializer.arguments[0].text === 'dispatchInner'
-        ) {
-          exportsWrappedDispatch = true;
-        }
-      }
-    }
-  });
-
-  it('imports withAudit from the audit adapter', () => {
-    expect(importsWithAudit).toBe(true);
-  });
-
-  it('keeps the inner dispatcher unexported (the guarded path is the only path)', () => {
-    expect(innerDeclaredUnexported).toBe(true);
-  });
-
-  it('exports dispatch as withAudit(dispatchInner)', () => {
-    expect(exportsWrappedDispatch).toBe(true);
-    expect(exportsUnwrappedDispatchFn).toBe(false);
-  });
-});
-
-describe('emit invariant', () => {
-  it('emitAuditEvent appears only in src/audit/ and *.audit.ts files', () => {
-    const srcRoot = path.resolve('src');
-    const offenders: string[] = [];
-    const walk = (dir: string): void => {
-      for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
-        const full = path.join(dir, entry.name);
-        if (entry.isDirectory()) {
-          walk(full);
-          continue;
-        }
-        if (!entry.name.endsWith('.ts')) continue;
-        const rel = path.relative(srcRoot, full).split(path.sep).join('/');
-        if (rel === 'audit-wiring.test.ts') continue; // this file names the symbol
-        if (rel.startsWith('audit/')) continue;
-        if (/\.audit(\.test)?\.ts$/.test(rel)) continue;
-        if (fs.readFileSync(full, 'utf8').includes('emitAuditEvent')) offenders.push(rel);
-      }
-    };
-    walk(srcRoot);
-    expect(offenders).toEqual([]);
-  });
-});

.claude/skills/add-audit/add/src/audit/config.ts

@@ -1,30 +0,0 @@
-/**
- * Audit env config (installed by /add-audit) — the two audit vars, read the
- * same way src/config.ts reads every host setting (readEnvFile from .env,
- * with process.env taking precedence). Kept audit-owned so installing the
- * skill never edits core config.ts: the feature's whole footprint in core is
- * the dispatch composition in dispatch.ts and the resource-barrel import.
- */
-import { readEnvFile } from '../env.js';
-
-const envConfig = readEnvFile(['AUDIT_ENABLED', 'AUDIT_RETENTION_DAYS']);
-
-/**
- * Master switch. Off by default — nothing is persisted (and data/audit/ is
- * never created) until an operator sets AUDIT_ENABLED=true.
- */
-export const AUDIT_ENABLED = (process.env.AUDIT_ENABLED || envConfig.AUDIT_ENABLED) === 'true';
-
-/**
- * Day-file retention horizon in days; consulted only when audit is enabled.
- * Unset or unparseable → 90. An explicit 0 (or negative) = keep forever.
- */
-function parseRetentionDays(raw: string | undefined): number {
-  if (raw === undefined || raw.trim() === '') return 90;
-  const n = Number.parseInt(raw, 10);
-  return Number.isNaN(n) ? 90 : n;
-}
-
-export const AUDIT_RETENTION_DAYS = parseRetentionDays(
-  process.env.AUDIT_RETENTION_DAYS || envConfig.AUDIT_RETENTION_DAYS,
-);

.claude/skills/add-audit/add/src/audit/emit.ts

@@ -1,43 +0,0 @@
-/**
- * The single emit seam. Adapters import emitAuditEvent from here directly
- * (it is deliberately not re-exported by the barrel): only src/audit/ and
- * `*.audit.ts` adapter files may call it — grep holds the invariant.
- *
- * The opt-in check lives here, so the whole feature switches at one point.
- * Fail-open + loud: a failed append (or a throwing input thunk) is
- * log.error'd and the audited action proceeds.
- */
-import { randomUUID } from 'crypto';
-
-import { log } from '../log.js';
-import { AUDIT_ENABLED } from './config.js';
-import { notifyAuditHooks } from './hooks.js';
-import { redactDetails } from './redact.js';
-import { appendAuditLine } from './store.js';
-import type { AuditEvent, AuditEventInput } from './types.js';
-
-export function emitAuditEvent(input: AuditEventInput | (() => AuditEventInput)): void {
-  if (!AUDIT_ENABLED) return; // The one opt-in check — the whole feature switches here.
-  try {
-    if (typeof input === 'function') input = input();
-    const event: AuditEvent = {
-      event_id: randomUUID(),
-      time: new Date().toISOString(),
-      schema_version: 1,
-      actor: { ...input.actor, email: null, user_id: null, group_ids: null },
-      origin: input.origin,
-      action: input.action,
-      resources: input.resources,
-      outcome: input.outcome,
-      correlation_id: input.correlationId ?? null,
-      details: redactDetails(input.details ?? {}),
-    };
-    const line = JSON.stringify(event);
-    appendAuditLine(line);
-    notifyAuditHooks(event, line);
-    // eslint-disable-next-line no-catch-all/no-catch-all -- fail-open is the posture: an audit failure must never take down the audited action
-  } catch (err) {
-    const action = typeof input === 'function' ? undefined : input.action;
-    log.error('Audit append failed — action proceeding (fail-open)', { action, err });
-  }
-}

.claude/skills/add-audit/add/src/audit/hooks.test.ts

@@ -1,203 +0,0 @@
-/**
- * Post-write hook contract: hooks observe the LOG (fire only after a
- * successful append, exported ⊆ written), failures are isolated everywhere,
- * and the lifecycle (init/maintain/shutdown) behaves.
- */
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-const state = vi.hoisted(() => ({ enabled: true, appendThrows: false, appended: [] as string[] }));
-
-vi.mock('../config.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../config.js')>();
-  return {
-    ...actual,
-    DATA_DIR: '/tmp/nanoclaw-test-hooks-unused',
-  };
-});
-
-vi.mock('./config.js', () => ({
-  get AUDIT_ENABLED() {
-    return state.enabled;
-  },
-  AUDIT_RETENTION_DAYS: 90,
-}));
-
-vi.mock('./store.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('./store.js')>();
-  return {
-    ...actual,
-    appendAuditLine: (line: string) => {
-      if (state.appendThrows) throw new Error('disk full');
-      state.appended.push(line);
-    },
-  };
-});
-
-vi.mock('../log.js', () => ({
-  log: { debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn(), fatal: vi.fn() },
-}));
-
-let hooks: typeof import('./hooks.js');
-let emit: typeof import('./emit.js');
-let log: (typeof import('../log.js'))['log'];
-
-beforeEach(async () => {
-  state.enabled = true;
-  state.appendThrows = false;
-  state.appended.length = 0;
-  vi.resetModules(); // fresh hook registry per test
-  hooks = await import('./hooks.js');
-  emit = await import('./emit.js');
-  log = (await import('../log.js')).log;
-  vi.clearAllMocks();
-});
-
-afterEach(() => {
-  vi.clearAllMocks();
-});
-
-const EVENT_INPUT = {
-  actor: { type: 'human' as const, id: 'host:test' },
-  origin: { transport: 'socket' as const },
-  action: 'groups.list',
-  resources: [{ type: 'agent_group' }],
-  outcome: 'success' as const,
-  details: { limit: 5 },
-};
-
-describe('post-write notification', () => {
-  it('calls a registered hook with the parsed event and the exact stored line', () => {
-    const seen: Array<{ event: import('./types.js').AuditEvent; line: string }> = [];
-    hooks.registerAuditHook({ name: 'demo', onEvent: (event, line) => seen.push({ event, line }) });
-
-    emit.emitAuditEvent(EVENT_INPUT);
-
-    expect(state.appended).toHaveLength(1);
-    expect(seen).toHaveLength(1);
-    expect(seen[0].line).toBe(state.appended[0]);
-    expect(JSON.parse(seen[0].line)).toEqual(seen[0].event);
-    expect(seen[0].event.action).toBe('groups.list');
-  });
-
-  it('does NOT call hooks when the local append fails — exported ⊆ written', () => {
-    const onEvent = vi.fn();
-    hooks.registerAuditHook({ name: 'demo', onEvent });
-    state.appendThrows = true;
-
-    expect(() => emit.emitAuditEvent(EVENT_INPUT)).not.toThrow(); // action still proceeds
-    expect(onEvent).not.toHaveBeenCalled();
-    expect(log.error).toHaveBeenCalledWith(expect.stringContaining('Audit append failed'), expect.anything());
-  });
-
-  it('does NOT call hooks when audit is disabled', () => {
-    const onEvent = vi.fn();
-    hooks.registerAuditHook({ name: 'demo', onEvent });
-    state.enabled = false;
-
-    emit.emitAuditEvent(EVENT_INPUT);
-
-    expect(state.appended).toHaveLength(0);
-    expect(onEvent).not.toHaveBeenCalled();
-  });
-
-  it('isolates a throwing hook: the write survives, later hooks still run, the action proceeds', () => {
-    const second = vi.fn();
-    hooks.registerAuditHook({
-      name: 'broken',
-      onEvent: () => {
-        throw new Error('exporter exploded');
-      },
-    });
-    hooks.registerAuditHook({ name: 'healthy', onEvent: second });
-
-    expect(() => emit.emitAuditEvent(EVENT_INPUT)).not.toThrow();
-
-    expect(state.appended).toHaveLength(1); // the log has the event regardless
-    expect(second).toHaveBeenCalledTimes(1);
-    expect(log.error).toHaveBeenCalledWith(
-      expect.stringContaining('Audit hook threw'),
-      expect.objectContaining({ hook: 'broken', action: 'groups.list' }),
-    );
-  });
-});
-
-describe('lifecycle', () => {
-  it('initAuditHooks surfaces a failing init as a fatal error naming the hook', () => {
-    hooks.registerAuditHook({ name: 'ok', onEvent: () => {}, init: vi.fn() });
-    hooks.registerAuditHook({
-      name: 'bad-boot',
-      onEvent: () => {},
-      init: () => {
-        throw new Error('no route to collector');
-      },
-    });
-
-    expect(() => hooks.initAuditHooks()).toThrow(/audit hook "bad-boot" failed to initialize.*no route/);
-  });
-
-  it('maintainAuditHooks calls every maintain and isolates throws', () => {
-    const m1 = vi.fn(() => {
-      throw new Error('flush failed');
-    });
-    const m2 = vi.fn();
-    hooks.registerAuditHook({ name: 'a', onEvent: () => {}, maintain: m1 });
-    hooks.registerAuditHook({ name: 'b', onEvent: () => {}, maintain: m2 });
-    hooks.registerAuditHook({ name: 'c', onEvent: () => {} }); // no maintain — fine
-
-    expect(() => hooks.maintainAuditHooks()).not.toThrow();
-    expect(m1).toHaveBeenCalledTimes(1);
-    expect(m2).toHaveBeenCalledTimes(1);
-    expect(log.error).toHaveBeenCalledWith(
-      expect.stringContaining('maintenance failed'),
-      expect.objectContaining({ hook: 'a' }),
-    );
-  });
-
-  it('shutdownAuditHooks awaits async shutdowns and isolates throws', async () => {
-    const order: string[] = [];
-    hooks.registerAuditHook({
-      name: 'a',
-      onEvent: () => {},
-      shutdown: async () => {
-        await Promise.resolve();
-        order.push('a');
-      },
-    });
-    hooks.registerAuditHook({
-      name: 'b',
-      onEvent: () => {},
-      shutdown: () => {
-        throw new Error('handle already closed');
-      },
-    });
-    hooks.registerAuditHook({
-      name: 'c',
-      onEvent: () => {},
-      shutdown: () => {
-        order.push('c');
-      },
-    });
-
-    await hooks.shutdownAuditHooks();
-
-    expect(order).toEqual(['a', 'c']);
-    expect(log.error).toHaveBeenCalledWith(
-      expect.stringContaining('shutdown failed'),
-      expect.objectContaining({ hook: 'b' }),
-    );
-  });
-
-  it('maintainAudit skips hook maintenance when audit is disabled', async () => {
-    const init = await import('./init.js');
-    const maintain = vi.fn();
-    hooks.registerAuditHook({ name: 'a', onEvent: () => {}, maintain });
-
-    state.enabled = false;
-    init.maintainAudit();
-    expect(maintain).not.toHaveBeenCalled();
-
-    state.enabled = true;
-    init.maintainAudit();
-    expect(maintain).toHaveBeenCalledTimes(1);
-  });
-});

.claude/skills/add-audit/add/src/audit/hooks.ts

@@ -1,92 +0,0 @@
-/**
- * Post-write audit hooks — the in-process extension seam.
- *
- * A hook observes the audit LOG, not the event stream: `onEvent` fires only
- * after an event has been durably appended to the local day-file, so anything
- * a hook exports is guaranteed to exist in the source of truth
- * (exported ⊆ written). If the local append fails, hooks are not called —
- * and a hook that misses events (crash, restart) catches up by reading the
- * day-files, which is the at-least-once story.
- *
- * Registration follows the tree's observer idiom (registerApprovalResolvedHandler,
- * registerResponseHandler, …): an in-tree or skill-installed module calls
- * `registerAuditHook(...)` at import time — no core edits, and credentials or
- * transport for an external system live in that module, never here.
- */
-import { log } from '../log.js';
-import type { AuditEvent } from './types.js';
-
-export interface AuditHook {
-  /** Short identifier used in logs and lifecycle errors. */
-  name: string;
-  /**
-   * Called after a successful local append. `line` is the exact stored bytes
-   * (one NDJSON line, no trailing newline); `event` is the parsed record.
-   * MUST be fast and non-blocking — this runs on the audited action's call
-   * path. A real exporter buffers here and does its IO from `maintain`/its own
-   * timers. Throwing is tolerated: isolated and logged, never propagated.
-   */
-  onEvent(event: AuditEvent, line: string): void;
-  /** Boot hook, called only when audit is enabled. Throw = host refuses to start. */
-  init?(): void;
-  /** Periodic maintenance — called from the audit maintenance timer (enabled boxes only). */
-  maintain?(): void;
-  /** Graceful-shutdown hook (flush buffers, close handles). */
-  shutdown?(): void | Promise<void>;
-}
-
-const hooks: AuditHook[] = [];
-
-export function registerAuditHook(hook: AuditHook): void {
-  hooks.push(hook);
-}
-
-/** Fan out one written event to every hook, isolating failures per hook. */
-export function notifyAuditHooks(event: AuditEvent, line: string): void {
-  for (const hook of hooks) {
-    try {
-      hook.onEvent(event, line);
-      // eslint-disable-next-line no-catch-all/no-catch-all -- isolation is the contract: one bad hook must not affect the log, other hooks, or the audited action
-    } catch (err) {
-      log.error('Audit hook threw — event is safely in the log', { hook: hook.name, action: event.action, err });
-    }
-  }
-}
-
-/** Boot lifecycle. A hook that can't start is a silent-export-gap risk — fatal. */
-export function initAuditHooks(): void {
-  for (const hook of hooks) {
-    try {
-      hook.init?.();
-    } catch (err) {
-      throw new Error(
-        `audit hook "${hook.name}" failed to initialize: ${err instanceof Error ? err.message : String(err)}`,
-        { cause: err },
-      );
-    }
-  }
-}
-
-/** Periodic lifecycle — maintenance, isolated per hook. */
-export function maintainAuditHooks(): void {
-  for (const hook of hooks) {
-    try {
-      hook.maintain?.();
-      // eslint-disable-next-line no-catch-all/no-catch-all -- one hook's maintenance failure must not stop the others (or the timer)
-    } catch (err) {
-      log.error('Audit hook maintenance failed', { hook: hook.name, err });
-    }
-  }
-}
-
-/** Shutdown lifecycle — awaited by the host's graceful shutdown. */
-export async function shutdownAuditHooks(): Promise<void> {
-  for (const hook of hooks) {
-    try {
-      await hook.shutdown?.();
-      // eslint-disable-next-line no-catch-all/no-catch-all -- shutdown must drain every hook even when one throws
-    } catch (err) {
-      log.error('Audit hook shutdown failed', { hook: hook.name, err });
-    }
-  }
-}

.claude/skills/add-audit/add/src/audit/index.ts

@@ -1,18 +0,0 @@
-/**
- * Opt-in local audit log — installed by /add-audit.
- *
- * This directory is a domain-free leaf: the event schema, the emit seam, the
- * store, the reader, post-write hooks, and shared vocabulary. What gets
- * audited — and how each domain describes itself — lives in the domain-owned
- * `*.audit.ts` adapter files next to the code they observe. Business logic
- * contains zero audit calls.
- *
- * emitAuditEvent is deliberately NOT re-exported here: adapters import it
- * from './emit.js' directly, and only src/audit/ + `*.audit.ts` may call it.
- */
-export * from './types.js';
-export { redactDetails } from './redact.js';
-export { AUDIT_DIR } from './store.js';
-export { AUDIT_ENABLED, AUDIT_RETENTION_DAYS } from './config.js';
-export { initAuditLog, maintainAudit } from './init.js';
-export { type AuditHook, registerAuditHook } from './hooks.js';

.claude/skills/add-audit/add/src/audit/init.ts

@@ -1,54 +0,0 @@
-/**
- * Boot-time audit wiring, self-contained (installed by /add-audit).
- *
- * initAuditLog() runs at module load of the CLI audit adapter
- * (cli/dispatch.audit.ts) — i.e. during the host's barrel phase, before the
- * CLI server or any delivery poll accepts work — because dispatch.ts, which
- * both transports import, composes withAudit at module scope. When enabled:
- * assert data/audit/ is writable (refusing to start beats running with a
- * silent audit gap), run the boot prune, start the registered post-write
- * hooks, and arm the maintenance timer.
- *
- * The timer owns the daily cadence in-module (checked hourly; the prune
- * itself fires at most once per UTC day) so installing the skill touches
- * dispatch.ts and the resource barrel only — no host-sweep edit. It is
- * unref'd: it never keeps the process alive.
- */
-import { log } from '../log.js';
-import { onShutdown } from '../response-registry.js';
-import { AUDIT_ENABLED, AUDIT_RETENTION_DAYS } from './config.js';
-import { initAuditHooks, maintainAuditHooks, shutdownAuditHooks } from './hooks.js';
-import { assertAuditWritable, AUDIT_DIR, markPrunedToday, pruneAuditLog, pruneAuditLogIfDue } from './store.js';
-
-const MAINTENANCE_INTERVAL_MS = 60 * 60 * 1000;
-
-let initialized = false;
-
-export function initAuditLog(): void {
-  if (!AUDIT_ENABLED || initialized) return;
-  initialized = true;
-  try {
-    assertAuditWritable();
-  } catch (err) {
-    throw new Error(
-      `AUDIT_ENABLED=true but the audit directory is not writable: ${AUDIT_DIR} (${err instanceof Error ? err.message : String(err)})`,
-      { cause: err },
-    );
-  }
-  pruneAuditLog();
-  markPrunedToday();
-  initAuditHooks(); // throw → boot fails, same posture as the writability assert
-  onShutdown(() => shutdownAuditHooks());
-  setInterval(maintainAudit, MAINTENANCE_INTERVAL_MS).unref();
-  log.info('Audit log enabled', { dir: AUDIT_DIR, retentionDays: AUDIT_RETENTION_DAYS });
-}
-
-/**
- * One maintenance tick: retention prune (throttled to once per UTC day
- * internally) plus every hook's periodic maintenance. No-op when audit is
- * disabled. Exported so a future scheduler can drive it too.
- */
-export function maintainAudit(): void {
-  pruneAuditLogIfDue();
-  if (AUDIT_ENABLED) maintainAuditHooks();
-}

.claude/skills/add-audit/add/src/audit/reader.test.ts

@@ -1,153 +0,0 @@
-import fs from 'fs';
-import os from 'os';
-import path from 'path';
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-const state = vi.hoisted(() => ({ dataDir: '', enabled: true }));
-
-vi.mock('../config.js', () => ({
-  get DATA_DIR() {
-    return state.dataDir;
-  },
-}));
-
-vi.mock('./config.js', () => ({
-  get AUDIT_ENABLED() {
-    return state.enabled;
-  },
-  AUDIT_RETENTION_DAYS: 90,
-}));
-
-vi.mock('../log.js', () => ({
-  log: { debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn(), fatal: vi.fn() },
-}));
-
-let reader: typeof import('./reader.js');
-let store: typeof import('./store.js');
-
-beforeEach(async () => {
-  state.dataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'audit-reader-'));
-  state.enabled = true;
-  vi.resetModules();
-  store = await import('./store.js');
-  reader = await import('./reader.js');
-});
-
-afterEach(() => {
-  fs.rmSync(state.dataDir, { recursive: true, force: true });
-});
-
-function dayString(daysAgo: number): string {
-  return store.utcDay(new Date(Date.now() - daysAgo * 24 * 60 * 60 * 1000));
-}
-
-function isoAt(daysAgo: number, tag: number): string {
-  const base = new Date(Date.now() - daysAgo * 24 * 60 * 60 * 1000);
-  return `${base.toISOString().slice(0, 10)}T10:00:0${tag}.000Z`;
-}
-
-let seq = 0;
-function seedEvent(daysAgo: number, overrides: Record<string, unknown> = {}): Record<string, unknown> {
-  seq += 1;
-  const event = {
-    event_id: `e-${seq}`,
-    time: isoAt(daysAgo, seq % 10),
-    schema_version: 1,
-    actor: { type: 'human', id: 'host:moshe', email: null, user_id: null, group_ids: null },
-    origin: { transport: 'socket' },
-    action: 'groups.list',
-    resources: [{ type: 'agent_group', id: 'ag-1' }],
-    outcome: 'success',
-    correlation_id: null,
-    details: {},
-    ...overrides,
-  };
-  const dir = path.join(state.dataDir, 'audit');
-  fs.mkdirSync(dir, { recursive: true });
-  fs.appendFileSync(path.join(dir, `${dayString(daysAgo)}.ndjson`), JSON.stringify(event) + '\n');
-  return event;
-}
-
-describe('listAuditEvents', () => {
-  it('throws the disabled error rather than returning an empty list', () => {
-    state.enabled = false;
-    expect(() => reader.listAuditEvents({})).toThrow('audit log is disabled — set AUDIT_ENABLED=true');
-  });
-
-  it('returns flat rows newest-first across day-files, honoring --limit', () => {
-    seedEvent(2, { event_id: 'old' });
-    seedEvent(1, { event_id: 'mid-a' });
-    seedEvent(1, { event_id: 'mid-b' });
-    seedEvent(0, { event_id: 'new' });
-
-    const rows = reader.listAuditEvents({}) as Array<Record<string, unknown>>;
-    expect(rows.map((r) => r.event_id)).toEqual(['new', 'mid-b', 'mid-a', 'old']);
-    expect(rows[0]).toMatchObject({ actor: 'host:moshe', action: 'groups.list', outcome: 'success' });
-    expect(rows[0].resources).toBe('agent_group:ag-1');
-
-    const limited = reader.listAuditEvents({ limit: 2 }) as Array<Record<string, unknown>>;
-    expect(limited.map((r) => r.event_id)).toEqual(['new', 'mid-b']);
-  });
-
-  it('filters by actor, outcome, correlation, and resource (id or type)', () => {
-    seedEvent(0, { event_id: 'a', actor: { type: 'agent', id: 'ag-1' }, outcome: 'denied' });
-    seedEvent(0, { event_id: 'b', correlation_id: 'appr-9', resources: [{ type: 'approval', id: 'appr-9' }] });
-    seedEvent(0, { event_id: 'c', resources: [{ type: 'user', id: 'slack:U1' }] });
-
-    expect((reader.listAuditEvents({ actor: 'ag-1' }) as unknown[]).length).toBe(1);
-    expect((reader.listAuditEvents({ outcome: 'denied' }) as unknown[]).length).toBe(1);
-    expect((reader.listAuditEvents({ correlation: 'appr-9' }) as unknown[]).length).toBe(1);
-    expect((reader.listAuditEvents({ resource: 'slack:U1' }) as unknown[]).length).toBe(1);
-    expect((reader.listAuditEvents({ resource: 'approval' }) as unknown[]).length).toBe(1);
-  });
-
-  it('matches actions exactly or by dotted prefix', () => {
-    seedEvent(0, { event_id: 'cfg', action: 'groups.config.add-mcp-server' });
-    seedEvent(0, { event_id: 'list', action: 'groups.list' });
-    seedEvent(0, { event_id: 'other', action: 'sessions.list' });
-
-    expect((reader.listAuditEvents({ action: 'groups' }) as unknown[]).length).toBe(2);
-    expect((reader.listAuditEvents({ action: 'groups.config' }) as unknown[]).length).toBe(1);
-    expect((reader.listAuditEvents({ action: 'groups.list' }) as unknown[]).length).toBe(1);
-    // Prefix means dotted segments, not substrings.
-    expect((reader.listAuditEvents({ action: 'group' }) as unknown[]).length).toBe(0);
-  });
-
-  it('applies --since/--until with relative and ISO forms', () => {
-    seedEvent(5, { event_id: 'old' });
-    seedEvent(0, { event_id: 'recent' });
-
-    const relative = reader.listAuditEvents({ since: '2d' }) as Array<Record<string, unknown>>;
-    expect(relative.map((r) => r.event_id)).toEqual(['recent']);
-
-    const iso = reader.listAuditEvents({ until: dayString(2) }) as Array<Record<string, unknown>>;
-    expect(iso.map((r) => r.event_id)).toEqual(['old']);
-
-    expect(() => reader.listAuditEvents({ since: 'yesterdayish' })).toThrow('invalid --since');
-  });
-
-  it('--format ndjson returns the stored lines verbatim', () => {
-    const seeded = seedEvent(0, { event_id: 'x1' });
-    const out = reader.listAuditEvents({ format: 'ndjson' });
-    expect(typeof out).toBe('string');
-    expect(JSON.parse(out as string)).toEqual(seeded);
-    expect(() => reader.listAuditEvents({ format: 'csv' })).toThrow('invalid --format');
-  });
-
-  it('skips malformed stored lines and still returns the rest', () => {
-    seedEvent(0, { event_id: 'good' });
-    fs.appendFileSync(path.join(state.dataDir, 'audit', `${dayString(0)}.ndjson`), 'not-json\n');
-
-    const rows = reader.listAuditEvents({}) as Array<Record<string, unknown>>;
-    expect(rows.map((r) => r.event_id)).toEqual(['good']);
-  });
-
-  it('rejects an unknown --outcome value', () => {
-    expect(() => reader.listAuditEvents({ outcome: 'meh' })).toThrow('invalid --outcome');
-  });
-
-  it('returns empty when nothing has been recorded yet', () => {
-    expect(reader.listAuditEvents({})).toEqual([]);
-  });
-});

.claude/skills/add-audit/add/src/audit/reader.ts

@@ -1,160 +0,0 @@
-/**
- * Read-back for `ncl audit list` — a newest-first stream-scan over the
- * day-files. No index: fine at v1 volume, and adding one later doesn't change
- * the store. NDJSON export returns the stored lines verbatim.
- */
-import fs from 'fs';
-import path from 'path';
-
-import { log } from '../log.js';
-import { AUDIT_ENABLED } from './config.js';
-import { AUDIT_DIR, utcDay } from './store.js';
-import type { AuditEvent, AuditOutcome } from './types.js';
-
-const OUTCOMES: ReadonlySet<string> = new Set(['success', 'failure', 'denied', 'pending', 'approved', 'rejected']);
-const DAY_FILE_RE = /^(\d{4}-\d{2}-\d{2})\.ndjson$/;
-const DEFAULT_LIMIT = 100;
-
-export interface AuditQuery {
-  actor?: string;
-  /** Exact action or dotted prefix (`groups` matches `groups.config.update`). */
-  action?: string;
-  /** Matches any resources[] entry by id or by type. */
-  resource?: string;
-  outcome?: AuditOutcome;
-  sinceMs?: number;
-  untilMs?: number;
-  correlation?: string;
-  limit: number;
-}
-
-/** `7d` / `24h` / `30m` relative to now, or an ISO date/datetime (UTC). */
-export function parseTimeFlag(value: string, flag: string): number {
-  const rel = /^(\d+)([dhm])$/.exec(value);
-  if (rel) {
-    const n = Number(rel[1]);
-    const unitMs = rel[2] === 'd' ? 86_400_000 : rel[2] === 'h' ? 3_600_000 : 60_000;
-    return Date.now() - n * unitMs;
-  }
-  const abs = Date.parse(value);
-  if (!Number.isNaN(abs)) return abs;
-  throw new Error(`invalid ${flag} value "${value}" — use e.g. 7d, 24h, 30m, or an ISO date`);
-}
-
-/** Newest first across files and within each file, up to q.limit. */
-export function queryAuditEvents(q: AuditQuery): { events: AuditEvent[]; lines: string[] } {
-  const events: AuditEvent[] = [];
-  const lines: string[] = [];
-  let malformed = 0;
-
-  for (const { day, file } of dayFilesNewestFirst()) {
-    if (events.length >= q.limit) break;
-    // Whole-day skip: a file can't match a window its day lies outside.
-    if (q.sinceMs !== undefined && day < utcDay(new Date(q.sinceMs))) continue;
-    if (q.untilMs !== undefined && day > utcDay(new Date(q.untilMs))) continue;
-
-    let content: string;
-    try {
-      content = fs.readFileSync(file, 'utf8');
-      // eslint-disable-next-line no-catch-all/no-catch-all -- a torn/pruned day-file must not fail the whole query
-    } catch (err) {
-      log.warn('Audit reader failed to read day-file', { file, err });
-      continue;
-    }
-    const fileLines = content.split('\n').filter((l) => l.trim() !== '');
-    // Lines within a file are chronological — walk backwards for newest-first.
-    for (let i = fileLines.length - 1; i >= 0 && events.length < q.limit; i--) {
-      let event: AuditEvent;
-      try {
-        event = JSON.parse(fileLines[i]) as AuditEvent;
-        // eslint-disable-next-line no-catch-all/no-catch-all -- malformed stored lines are skipped (counted + warned below)
-      } catch {
-        malformed++;
-        continue;
-      }
-      if (!matches(event, q)) continue;
-      events.push(event);
-      lines.push(fileLines[i]);
-    }
-  }
-
-  if (malformed > 0) {
-    log.warn('Audit reader skipped malformed lines', { malformed });
-  }
-  return { events, lines };
-}
-
-function dayFilesNewestFirst(): Array<{ day: string; file: string }> {
-  let entries: string[];
-  try {
-    entries = fs.readdirSync(AUDIT_DIR);
-    // eslint-disable-next-line no-catch-all/no-catch-all -- no audit dir yet means no events, not an error
-  } catch {
-    return [];
-  }
-  return entries
-    .map((e) => DAY_FILE_RE.exec(e))
-    .filter((m): m is RegExpExecArray => m !== null)
-    .map((m) => ({ day: m[1], file: path.join(AUDIT_DIR, m[0]) }))
-    .sort((a, b) => (a.day < b.day ? 1 : -1));
-}
-
-function matches(event: AuditEvent, q: AuditQuery): boolean {
-  if (q.actor !== undefined && event.actor?.id !== q.actor) return false;
-  if (q.action !== undefined && event.action !== q.action && !event.action?.startsWith(q.action + '.')) return false;
-  if (q.outcome !== undefined && event.outcome !== q.outcome) return false;
-  if (q.correlation !== undefined && event.correlation_id !== q.correlation) return false;
-  if (q.resource !== undefined) {
-    const hit = (event.resources ?? []).some((r) => r.id === q.resource || r.type === q.resource);
-    if (!hit) return false;
-  }
-  const t = Date.parse(event.time ?? '');
-  if (q.sinceMs !== undefined && !(t >= q.sinceMs)) return false;
-  if (q.untilMs !== undefined && !(t <= q.untilMs)) return false;
-  return true;
-}
-
-/**
- * `ncl audit list` handler. Disabled → an explicit error: an empty list would
- * read as "no actions happened", which is a different truth than "not
- * recording". `--format ndjson` returns the stored lines verbatim (the human
- * formatter passes strings through); default returns flat rows for the table.
- */
-export function listAuditEvents(args: Record<string, unknown>): string | Array<Record<string, unknown>> {
-  if (!AUDIT_ENABLED) {
-    throw new Error('audit log is disabled — set AUDIT_ENABLED=true');
-  }
-
-  const format = args.format !== undefined ? String(args.format) : '';
-  if (format && format !== 'ndjson') {
-    throw new Error(`invalid --format "${format}" — only "ndjson" is supported`);
-  }
-  const outcome = args.outcome !== undefined ? String(args.outcome) : undefined;
-  if (outcome !== undefined && !OUTCOMES.has(outcome)) {
-    throw new Error(`invalid --outcome "${outcome}" — one of: ${[...OUTCOMES].join(', ')}`);
-  }
-
-  const q: AuditQuery = {
-    actor: args.actor !== undefined ? String(args.actor) : undefined,
-    action: args.action !== undefined ? String(args.action) : undefined,
-    resource: args.resource !== undefined ? String(args.resource) : undefined,
-    outcome: outcome as AuditOutcome | undefined,
-    correlation: args.correlation !== undefined ? String(args.correlation) : undefined,
-    sinceMs: args.since !== undefined ? parseTimeFlag(String(args.since), '--since') : undefined,
-    untilMs: args.until !== undefined ? parseTimeFlag(String(args.until), '--until') : undefined,
-    limit: args.limit !== undefined ? Math.max(1, Number(args.limit) || DEFAULT_LIMIT) : DEFAULT_LIMIT,
-  };
-
-  const { events, lines } = queryAuditEvents(q);
-  if (format === 'ndjson') return lines.join('\n');
-
-  return events.map((e) => ({
-    time: e.time,
-    actor: e.actor?.id ?? '',
-    action: e.action,
-    resources: (e.resources ?? []).map((r) => (r.id ? `${r.type}:${r.id}` : r.type)).join(' '),
-    outcome: e.outcome,
-    correlation: e.correlation_id ?? '',
-    event_id: e.event_id,
-  }));
-}

.claude/skills/add-audit/add/src/audit/redact.test.ts

@@ -1,69 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-import { redactDetails } from './redact.js';
-
-describe('redactDetails', () => {
-  it('masks sensitive keys at any depth, case-insensitively', () => {
-    const out = redactDetails({
-      name: 'notion',
-      env: { NOTION_TOKEN: 'secret-value', SAFE_VALUE: 'ok' },
-      nested: { Authorization: 'Bearer abc', list: [{ 'api-key': 'k' }, { plain: 'p' }] },
-      password: 'hunter2',
-    });
-    expect(out).toEqual({
-      name: 'notion',
-      env: { NOTION_TOKEN: '[REDACTED]', SAFE_VALUE: 'ok' },
-      nested: { Authorization: '[REDACTED]', list: [{ 'api-key': '[REDACTED]' }, { plain: 'p' }] },
-      password: '[REDACTED]',
-    });
-  });
-
-  it('matches the documented key pattern (token|secret|key|password|credential|auth|bearer)', () => {
-    const out = redactDetails({
-      access_token: 'x',
-      clientSecret: 'x',
-      ssh_key: 'x',
-      credentials: 'x',
-      oauth_flow: 'x',
-      bearerValue: 'x',
-      username: 'moshe',
-    });
-    expect(Object.entries(out).filter(([, v]) => v === '[REDACTED]')).toHaveLength(6);
-    expect(out.username).toBe('moshe');
-  });
-
-  it('never recurses into a masked key — the whole value is replaced', () => {
-    const out = redactDetails({ auth: { inner: 'visible?' } });
-    expect(out.auth).toBe('[REDACTED]');
-  });
-
-  it('truncates strings over 2 KB post-redaction', () => {
-    const long = 'a'.repeat(5000);
-    const out = redactDetails({ blob: long, short: 'b' });
-    expect(out.blob).toBe('a'.repeat(2048) + '…[truncated]');
-    expect(out.short).toBe('b');
-  });
-
-  it('passes non-string scalars through untouched', () => {
-    const out = redactDetails({ n: 42, b: true, z: null, u: undefined });
-    expect(out).toEqual({ n: 42, b: true, z: null, u: undefined });
-  });
-
-  it('caps depth (cycle guard) without throwing', () => {
-    const cyclic: Record<string, unknown> = { a: 1 };
-    cyclic.self = cyclic;
-    const out = redactDetails(cyclic);
-    let cursor: unknown = out;
-    for (let i = 0; i < 20 && typeof cursor === 'object' && cursor !== null; i++) {
-      cursor = (cursor as Record<string, unknown>).self;
-    }
-    expect(cursor).toBe('[MAX_DEPTH]');
-  });
-
-  it('does not mutate the input', () => {
-    const input = { token: 'x', nested: { list: ['a'.repeat(3000)] } };
-    const snapshot = JSON.parse(JSON.stringify(input));
-    redactDetails(input);
-    expect(input).toEqual(snapshot);
-  });
-});

.claude/skills/add-audit/add/src/audit/redact.ts

@@ -1,32 +0,0 @@
-/**
- * The one redactor, applied to every event's `details` at the emit seam —
- * guarding current and future surfaces by default. Key-pattern mask plus a
- * per-value size cap; message bodies are never passed in (emit sites record
- * shape only — the audit log is a governance record, not a chat archive).
- */
-
-const SENSITIVE_KEY = /(token|secret|key|password|credential|auth|bearer)/i;
-const MAX_VALUE_CHARS = 2048;
-const MAX_DEPTH = 8;
-
-export function redactDetails(details: Record<string, unknown>): Record<string, unknown> {
-  return redactObject(details, 0);
-}
-
-function redactObject(obj: Record<string, unknown>, depth: number): Record<string, unknown> {
-  const out: Record<string, unknown> = {};
-  for (const [k, v] of Object.entries(obj)) {
-    out[k] = SENSITIVE_KEY.test(k) ? '[REDACTED]' : redactValue(v, depth + 1);
-  }
-  return out;
-}
-
-function redactValue(value: unknown, depth: number): unknown {
-  if (typeof value === 'string') {
-    return value.length > MAX_VALUE_CHARS ? `${value.slice(0, MAX_VALUE_CHARS)}…[truncated]` : value;
-  }
-  if (value === null || typeof value !== 'object') return value;
-  if (depth > MAX_DEPTH) return '[MAX_DEPTH]';
-  if (Array.isArray(value)) return value.map((v) => redactValue(v, depth + 1));
-  return redactObject(value as Record<string, unknown>, depth);
-}

.claude/skills/add-audit/add/src/audit/store.test.ts

@@ -1,187 +0,0 @@
-import fs from 'fs';
-import os from 'os';
-import path from 'path';
-
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-
-// Core config (DATA_DIR) and the audit config (toggles) are mocked so
-// store/emit resolve a per-test temp DATA_DIR and audit switches. Getters
-// keep the values live across vi.resetModules().
-const state = vi.hoisted(() => ({ dataDir: '', enabled: true, retention: 90 }));
-
-vi.mock('../config.js', () => ({
-  get DATA_DIR() {
-    return state.dataDir;
-  },
-}));
-
-vi.mock('./config.js', () => ({
-  get AUDIT_ENABLED() {
-    return state.enabled;
-  },
-  get AUDIT_RETENTION_DAYS() {
-    return state.retention;
-  },
-}));
-
-vi.mock('../log.js', () => ({
-  log: { debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn(), fatal: vi.fn() },
-}));
-
-let store: typeof import('./store.js');
-let emit: typeof import('./emit.js');
-let log: (typeof import('../log.js'))['log'];
-
-beforeEach(async () => {
-  state.dataDir = fs.mkdtempSync(path.join(os.tmpdir(), 'audit-store-'));
-  state.enabled = true;
-  state.retention = 90;
-  vi.resetModules();
-  store = await import('./store.js');
-  emit = await import('./emit.js');
-  log = (await import('../log.js')).log;
-  vi.clearAllMocks();
-});
-
-afterEach(() => {
-  fs.chmodSync(path.join(state.dataDir), 0o700);
-  const auditDir = path.join(state.dataDir, 'audit');
-  if (fs.existsSync(auditDir)) fs.chmodSync(auditDir, 0o700);
-  fs.rmSync(state.dataDir, { recursive: true, force: true });
-});
-
-function auditDir(): string {
-  return path.join(state.dataDir, 'audit');
-}
-
-function writeDayFile(day: string, lines = 1): void {
-  fs.mkdirSync(auditDir(), { recursive: true });
-  fs.writeFileSync(path.join(auditDir(), `${day}.ndjson`), '{"x":1}\n'.repeat(lines));
-}
-
-function dayString(daysAgo: number): string {
-  return store.utcDay(new Date(Date.now() - daysAgo * 24 * 60 * 60 * 1000));
-}
-
-const EVENT_INPUT = {
-  actor: { type: 'human' as const, id: 'host:test' },
-  origin: { transport: 'socket' as const },
-  action: 'groups.list',
-  resources: [{ type: 'agent_group' }],
-  outcome: 'success' as const,
-};
-
-describe('appendAuditLine', () => {
-  it("appends one line to today's UTC day-file, creating the directory lazily", () => {
-    expect(fs.existsSync(auditDir())).toBe(false);
-    store.appendAuditLine('{"a":1}');
-    store.appendAuditLine('{"b":2}');
-    const file = path.join(auditDir(), `${store.utcDay()}.ndjson`);
-    expect(fs.readFileSync(file, 'utf8')).toBe('{"a":1}\n{"b":2}\n');
-  });
-});
-
-describe('emitAuditEvent', () => {
-  it('writes a schema_version-1 record with envelope fields and null enrichment', () => {
-    emit.emitAuditEvent({ ...EVENT_INPUT, details: { limit: 100 } });
-    const file = path.join(auditDir(), `${store.utcDay()}.ndjson`);
-    const record = JSON.parse(fs.readFileSync(file, 'utf8').trim());
-    expect(record).toMatchObject({
-      schema_version: 1,
-      actor: { type: 'human', id: 'host:test', email: null, user_id: null, group_ids: null },
-      origin: { transport: 'socket' },
-      action: 'groups.list',
-      outcome: 'success',
-      correlation_id: null,
-      details: { limit: 100 },
-    });
-    expect(record.event_id).toMatch(/^[0-9a-f-]{36}$/);
-    expect(new Date(record.time).toISOString()).toBe(record.time);
-  });
-
-  it('redacts details at the emit seam', () => {
-    emit.emitAuditEvent({ ...EVENT_INPUT, details: { env: { API_TOKEN: 'x' } } });
-    const file = path.join(auditDir(), `${store.utcDay()}.ndjson`);
-    expect(fs.readFileSync(file, 'utf8')).toContain('"API_TOKEN":"[REDACTED]"');
-  });
-
-  it('is a no-op when audit is disabled — the directory is never created', () => {
-    state.enabled = false;
-    emit.emitAuditEvent(EVENT_INPUT);
-    expect(fs.existsSync(auditDir())).toBe(false);
-  });
-
-  it('fails open and loud when the append fails', () => {
-    fs.mkdirSync(auditDir(), { recursive: true });
-    fs.chmodSync(auditDir(), 0o500);
-    expect(() => emit.emitAuditEvent(EVENT_INPUT)).not.toThrow();
-    expect(log.error).toHaveBeenCalledWith(
-      expect.stringContaining('Audit append failed'),
-      expect.objectContaining({ action: 'groups.list' }),
-    );
-  });
-});
-
-describe('assertAuditWritable', () => {
-  it('creates the directory and probes it with a zero-byte append', () => {
-    store.assertAuditWritable();
-    expect(fs.existsSync(path.join(auditDir(), `${store.utcDay()}.ndjson`))).toBe(true);
-  });
-
-  it('throws when the directory is not writable', () => {
-    fs.mkdirSync(auditDir(), { recursive: true });
-    fs.chmodSync(auditDir(), 0o500);
-    expect(() => store.assertAuditWritable()).toThrow();
-  });
-});
-
-describe('pruneAuditLog', () => {
-  it('unlinks only day-files strictly older than the horizon', () => {
-    writeDayFile(dayString(100));
-    writeDayFile(dayString(91));
-    writeDayFile(dayString(90));
-    writeDayFile(dayString(1));
-    fs.writeFileSync(path.join(auditDir(), 'not-a-day-file.txt'), 'keep');
-    fs.writeFileSync(path.join(auditDir(), '2026-01-01.ndjson.bak'), 'keep');
-    store.pruneAuditLog(90);
-    const left = fs.readdirSync(auditDir()).sort();
-    expect(left).toEqual(
-      [`${dayString(90)}.ndjson`, `${dayString(1)}.ndjson`, '2026-01-01.ndjson.bak', 'not-a-day-file.txt'].sort(),
-    );
-  });
-
-  it('keeps forever when retention is 0', () => {
-    writeDayFile(dayString(400));
-    store.pruneAuditLog(0);
-    expect(fs.existsSync(path.join(auditDir(), `${dayString(400)}.ndjson`))).toBe(true);
-  });
-
-  it('is a no-op when the audit directory does not exist', () => {
-    expect(() => store.pruneAuditLog(90)).not.toThrow();
-  });
-});
-
-describe('pruneAuditLogIfDue', () => {
-  it('prunes at most once per UTC day', () => {
-    writeDayFile(dayString(100));
-    store.pruneAuditLogIfDue();
-    expect(fs.existsSync(path.join(auditDir(), `${dayString(100)}.ndjson`))).toBe(false);
-    writeDayFile(dayString(100));
-    store.pruneAuditLogIfDue();
-    expect(fs.existsSync(path.join(auditDir(), `${dayString(100)}.ndjson`))).toBe(true);
-  });
-
-  it('does nothing when audit is disabled', () => {
-    state.enabled = false;
-    writeDayFile(dayString(100));
-    store.pruneAuditLogIfDue();
-    expect(fs.existsSync(path.join(auditDir(), `${dayString(100)}.ndjson`))).toBe(true);
-  });
-
-  it('does nothing after markPrunedToday until the day rolls over', () => {
-    store.markPrunedToday();
-    writeDayFile(dayString(100));
-    store.pruneAuditLogIfDue();
-    expect(fs.existsSync(path.join(auditDir(), `${dayString(100)}.ndjson`))).toBe(true);
-  });
-});

.claude/skills/add-audit/add/src/audit/store.ts

@@ -1,81 +0,0 @@
-/**
- * Day-file store — daily NDJSON files under data/audit/, host process is the
- * single writer. Append-only is structural: nothing here can update a line,
- * and retention is unlinking whole files (a literal hard delete). Both
- * transports converge host-side, so single-writer holds by construction.
- *
- * This module throws on fs failure; the fail-open posture (log.error, action
- * proceeds) lives in emit.ts, and the boot-time strictness (refuse to start)
- * lives in init.ts.
- */
-import fs from 'fs';
-import path from 'path';
-
-import { DATA_DIR } from '../config.js';
-import { log } from '../log.js';
-import { AUDIT_ENABLED, AUDIT_RETENTION_DAYS } from './config.js';
-
-export const AUDIT_DIR = path.join(DATA_DIR, 'audit');
-const DAY_FILE_RE = /^(\d{4}-\d{2}-\d{2})\.ndjson$/;
-const DAY_MS = 24 * 60 * 60 * 1000;
-
-export function utcDay(d: Date = new Date()): string {
-  return d.toISOString().slice(0, 10);
-}
-
-export function dayFilePath(day: string): string {
-  return path.join(AUDIT_DIR, `${day}.ndjson`);
-}
-
-/** The single append point. Throws on fs failure — emitAuditEvent catches. */
-export function appendAuditLine(line: string): void {
-  fs.mkdirSync(AUDIT_DIR, { recursive: true });
-  fs.appendFileSync(dayFilePath(utcDay()), line + '\n');
-}
-
-/** Boot-time writability assert — a zero-byte append is a true write probe. */
-export function assertAuditWritable(): void {
-  fs.mkdirSync(AUDIT_DIR, { recursive: true });
-  fs.appendFileSync(dayFilePath(utcDay()), '');
-}
-
-/** Unlink day-files strictly older than (today UTC − retentionDays). 0 or negative = keep forever. */
-export function pruneAuditLog(retentionDays: number = AUDIT_RETENTION_DAYS): void {
-  if (retentionDays <= 0) return;
-  let entries: string[];
-  try {
-    entries = fs.readdirSync(AUDIT_DIR);
-    // eslint-disable-next-line no-catch-all/no-catch-all -- no audit dir yet means nothing to prune, not an error
-  } catch {
-    return;
-  }
-  const horizon = utcDay(new Date(Date.now() - retentionDays * DAY_MS));
-  let pruned = 0;
-  for (const entry of entries) {
-    const m = DAY_FILE_RE.exec(entry);
-    if (!m || m[1] >= horizon) continue;
-    try {
-      fs.unlinkSync(path.join(AUDIT_DIR, entry));
-      pruned++;
-      // eslint-disable-next-line no-catch-all/no-catch-all -- one stuck file must not stop the prune of the others
-    } catch (err) {
-      log.error('Audit prune failed to unlink day-file', { file: entry, err });
-    }
-  }
-  if (pruned > 0) log.info('Audit retention pruned day-files', { pruned, retentionDays });
-}
-
-let lastPruneDay: string | null = null;
-
-/** Retention prune, throttled to once per UTC day — safe to call every tick. */
-export function pruneAuditLogIfDue(): void {
-  if (!AUDIT_ENABLED || AUDIT_RETENTION_DAYS <= 0) return;
-  const today = utcDay();
-  if (lastPruneDay === today) return;
-  lastPruneDay = today;
-  pruneAuditLog();
-}
-
-export function markPrunedToday(): void {
-  lastPruneDay = utcDay();
-}

.claude/skills/add-audit/add/src/audit/types.ts

@@ -1,60 +0,0 @@
-/**
- * Canonical audit event — one flat, SIEM-shaped record per action.
- *
- * Fields are chosen so they project losslessly onto OCSF and Elastic ECS
- * (the two schemas SIEMs converge on); the store keeps the neutral shape and
- * a future forwarder pays the translation once, at the edge. `schema_version`
- * covers evolution — additive changes only within a version.
- */
-
-export type AuditActorType = 'human' | 'agent' | 'system';
-
-export interface AuditActor {
-  type: AuditActorType;
-  /** `host:<os-user>` | `<channel>:<handle>` | agent group id | `host` (system). */
-  id: string;
-}
-
-export interface AuditOrigin {
-  transport: 'socket' | 'container' | 'channel';
-  session_id?: string;
-  messaging_group_id?: string;
-  channel?: string;
-}
-
-export interface AuditResource {
-  type: string;
-  /** Omitted when only the attempted type is known (e.g. a denied list). */
-  id?: string;
-}
-
-export type AuditOutcome = 'success' | 'failure' | 'denied' | 'pending' | 'approved' | 'rejected';
-
-/** What emit sites provide. Envelope fields are stamped by emitAuditEvent. */
-export interface AuditEventInput {
-  actor: AuditActor;
-  origin: AuditOrigin;
-  /** Dotted namespaced verb, e.g. `groups.config.add-mcp-server`. */
-  action: string;
-  resources: AuditResource[];
-  outcome: AuditOutcome;
-  /** The approval id on gated chains; null/omitted otherwise. */
-  correlationId?: string | null;
-  details?: Record<string, unknown>;
-}
-
-export interface AuditEvent {
-  event_id: string;
-  time: string;
-  schema_version: 1;
-  actor: AuditActor & { email: null; user_id: null; group_ids: null };
-  origin: AuditOrigin;
-  action: string;
-  resources: AuditResource[];
-  outcome: AuditOutcome;
-  correlation_id: string | null;
-  details: Record<string, unknown>;
-}
-
-/** Actor for timer/sweep-driven outcomes (expiries, startup sweeps). */
-export const SYSTEM_ACTOR: AuditActor = { type: 'system', id: 'host' };

.claude/skills/add-audit/add/src/audit/vocab.ts

@@ -1,39 +0,0 @@
-/**
- * Domain-free event vocabulary — actor and origin constructors shared by the
- * domain-owned `*.audit.ts` adapters (the CLI adapter today; approval and
- * channel adapters attach here in later increments). Pure derivation; nothing
- * here writes the log.
- *
- * Leaf rule: this module (like the rest of src/audit/) may depend on node,
- * config/log, shared types, and the db read layer — never on src/cli/* or
- * src/modules/*. Domain-specific mapping (CLI resources, approval payloads)
- * lives in the adapter file of the domain that owns it.
- */
-import os from 'os';
-
-import { getMessagingGroup } from '../db/messaging-groups.js';
-import type { AuditOrigin } from './types.js';
-
-/**
- * Host callers stamp `host:<install user>` daemon-side: the ncl socket is
- * 0600 and owned by the install user, so the identity is accurate by
- * construction without peer credentials.
- */
-export function hostUser(): string {
-  try {
-    return os.userInfo().username;
-    // eslint-disable-next-line no-catch-all/no-catch-all -- os.userInfo throws on exotic hosts; a fallback actor id beats no audit event
-  } catch {
-    return process.env.USER || 'unknown';
-  }
-}
-
-export function containerOrigin(sessionId: string, messagingGroupId: string | null): AuditOrigin {
-  const origin: AuditOrigin = { transport: 'container', session_id: sessionId };
-  if (messagingGroupId) {
-    origin.messaging_group_id = messagingGroupId;
-    const channel = getMessagingGroup(messagingGroupId)?.channel_type;
-    if (channel) origin.channel = channel;
-  }
-  return origin;
-}

.claude/skills/add-audit/add/src/cli/dispatch.audit.test.ts

@@ -1,297 +0,0 @@
-/**
- * Audit middleware behavior of the exported dispatch — what gets recorded,
- * for whom, and how gated chains correlate. Drives the real wrapped dispatch
- * (real registry, real guard); audit is force-enabled and the store's append
- * is captured. DB reads and approval delivery are mocked.
- */
-import os from 'os';
-import { beforeEach, describe, expect, it, vi } from 'vitest';
-
-import type { PendingApproval } from '../types.js';
-
-const appended = vi.hoisted(() => ({ lines: [] as string[] }));
-const pendingRows = vi.hoisted(() => ({ rows: [] as unknown[] }));
-
-vi.mock('../audit/config.js', () => ({
-  AUDIT_ENABLED: true,
-  AUDIT_RETENTION_DAYS: 90,
-}));
-
-// Neutralize the adapter's module-scope boot (writability assert, prune,
-// maintenance timer) — the middleware is the unit under test here.
-vi.mock('../audit/init.js', () => ({
-  initAuditLog: vi.fn(),
-  maintainAudit: vi.fn(),
-}));
-
-vi.mock('../audit/store.js', async (importOriginal) => {
-  const actual = await importOriginal<typeof import('../audit/store.js')>();
-  return {
-    ...actual,
-    appendAuditLine: (line: string) => {
-      appended.lines.push(line);
-    },
-  };
-});
-
-vi.mock('../log.js', () => ({
-  log: { debug: vi.fn(), info: vi.fn(), warn: vi.fn(), error: vi.fn(), fatal: vi.fn() },
-}));
-
-const mockGetContainerConfig = vi.fn();
-vi.mock('../db/container-configs.js', () => ({
-  getContainerConfig: (...args: unknown[]) => mockGetContainerConfig(...args),
-}));
-
-vi.mock('../db/agent-groups.js', () => ({
-  getAgentGroup: vi.fn(() => ({ id: 'g1', name: 'Group One' })),
-}));
-
-const mockGetPendingApproval = vi.fn();
-vi.mock('../db/sessions.js', () => ({
-  getSession: vi.fn(() => ({ id: 's1', agent_group_id: 'g1', messaging_group_id: 'mg1' })),
-  getPendingApproval: (...args: unknown[]) => mockGetPendingApproval(...args),
-  getPendingApprovalsByAction: () => pendingRows.rows,
-}));
-
-vi.mock('../db/messaging-groups.js', () => ({
-  getMessagingGroup: vi.fn(() => ({ channel_type: 'slack' })),
-}));
-
-const mockGetResource = vi.fn();
-vi.mock('./crud.js', () => ({
-  getResource: (...args: unknown[]) => mockGetResource(...args),
-}));
-
-vi.mock('../modules/approvals/index.js', () => ({
-  registerApprovalHandler: vi.fn(),
-  requestApproval: vi.fn(async () => undefined),
-}));
-
-import { register } from './registry.js';
-
-register({
-  name: 'groups-test',
-  description: 'echo command on the groups resource',
-  action: 'groups.test',
-  resource: 'groups',
-  access: 'open',
-  parseArgs: (raw) => raw,
-  handler: async (args) => ({ echo: args }),
-});
-
-register({
-  name: 'groups-get',
-  description: 'echo command for dash-joined id resolution',
-  action: 'groups.get',
-  resource: 'groups',
-  access: 'open',
-  parseArgs: (raw) => raw,
-  handler: async (args) => ({ echo: args }),
-});
-
-register({
-  name: 'wirings-list',
-  description: 'not on the group-scope allowlist',
-  action: 'wirings.list',
-  resource: 'wirings',
-  access: 'open',
-  parseArgs: (raw) => raw,
-  handler: async () => [],
-});
-
-register({
-  name: 'groups-fail',
-  description: 'handler that throws',
-  action: 'groups.fail',
-  resource: 'groups',
-  access: 'open',
-  parseArgs: (raw) => raw,
-  handler: async () => {
-    throw new Error('boom');
-  },
-});
-
-register({
-  name: 'groups-gated',
-  description: 'approval-gated command',
-  action: 'groups.gated',
-  resource: 'groups',
-  access: 'approval',
-  parseArgs: (raw) => raw,
-  handler: async () => 'ran',
-});
-
-import { dispatch } from './dispatch.js';
-import type { CallerContext } from './frame.js';
-
-const AGENT_CTX: CallerContext = { caller: 'agent', sessionId: 's1', agentGroupId: 'g1', messagingGroupId: 'mg1' };
-
-function grantRow(frameId: string, command: string): PendingApproval {
-  return {
-    approval_id: 'appr-123-abc',
-    session_id: 's1',
-    request_id: 'appr-123-abc',
-    action: 'cli_command',
-    payload: JSON.stringify({ frame: { id: frameId, command, args: {} }, callerContext: AGENT_CTX }),
-    created_at: new Date().toISOString(),
-    agent_group_id: 'g1',
-    channel_type: null,
-    platform_id: null,
-    platform_message_id: null,
-    expires_at: null,
-    status: 'pending',
-    title: 'CLI: groups-gated',
-    options_json: '[]',
-    approver_user_id: null,
-  };
-}
-
-function events(): Array<Record<string, any>> {
-  return appended.lines.map((l) => JSON.parse(l));
-}
-
-beforeEach(() => {
-  vi.clearAllMocks();
-  appended.lines.length = 0;
-  pendingRows.rows = [];
-  mockGetContainerConfig.mockReturnValue({ cli_scope: 'group' });
-  mockGetResource.mockImplementation((plural: string) => (plural === 'groups' ? { scopeField: 'id' } : undefined));
-});
-
-describe('withAudit(dispatch)', () => {
-  it('records a success event for a host caller with socket origin and host actor', async () => {
-    const resp = await dispatch({ id: '1', command: 'groups-test', args: { foo: 'bar' } }, { caller: 'host' });
-
-    expect(resp.ok).toBe(true);
-    const [event] = events();
-    expect(event).toMatchObject({
-      schema_version: 1,
-      actor: { type: 'human', id: `host:${os.userInfo().username}`, email: null },
-      origin: { transport: 'socket' },
-      action: 'groups.test',
-      outcome: 'success',
-      correlation_id: null,
-      details: { foo: 'bar' },
-    });
-  });
-
-  it('records effective args after group auto-fill, with container origin and channel', async () => {
-    await dispatch({ id: '1', command: 'groups-test', args: {} }, AGENT_CTX);
-
-    const [event] = events();
-    expect(event.actor).toMatchObject({ type: 'agent', id: 'g1' });
-    expect(event.origin).toEqual({
-      transport: 'container',
-      session_id: 's1',
-      messaging_group_id: 'mg1',
-      channel: 'slack',
-    });
-    expect(event.details).toMatchObject({ id: 'g1', agent_group_id: 'g1', group: 'g1' });
-    expect(event.resources).toContainEqual({ type: 'agent_group', id: 'g1' });
-  });
-
-  it('records a denied event for a scope denial, naming the attempted resource type', async () => {
-    const resp = await dispatch({ id: '1', command: 'wirings-list', args: {} }, AGENT_CTX);
-
-    expect(resp.ok).toBe(false);
-    const [event] = events();
-    expect(event).toMatchObject({
-      action: 'wirings.list',
-      outcome: 'denied',
-      resources: [{ type: 'wirings' }],
-      details: { error: 'forbidden' },
-    });
-    expect(event.details.reason).toContain('scoped');
-  });
-
-  it('records a failure event when the handler throws', async () => {
-    await dispatch({ id: '1', command: 'groups-fail', args: {} }, { caller: 'host' });
-
-    const [event] = events();
-    expect(event).toMatchObject({ action: 'groups.fail', outcome: 'failure', details: { error: 'handler-error' } });
-    expect(event.details.reason).toContain('boom');
-  });
-
-  it('records a hold as a pending event correlated to the approval row it created', async () => {
-    pendingRows.rows = [grantRow('1', 'groups-gated')];
-
-    const resp = await dispatch({ id: '1', command: 'groups-gated', args: {} }, AGENT_CTX);
-
-    expect(resp.ok).toBe(false);
-    if (!resp.ok) expect(resp.error.code).toBe('approval-pending');
-    const [event] = events();
-    expect(event).toMatchObject({
-      action: 'groups.gated',
-      outcome: 'pending',
-      correlation_id: 'appr-123-abc',
-    });
-    expect(event.resources).toContainEqual({ type: 'approval', id: 'appr-123-abc' });
-    expect(event.details.error).toBeUndefined();
-  });
-
-  it('records an uncorrelated pending event when no approval row was created (no approver)', async () => {
-    pendingRows.rows = [];
-
-    await dispatch({ id: '1', command: 'groups-gated', args: {} }, AGENT_CTX);
-
-    const [event] = events();
-    expect(event).toMatchObject({ outcome: 'pending', correlation_id: null });
-  });
-
-  it('records an approved replay as success with the grant approval id as correlation_id', async () => {
-    const grant = grantRow('9', 'groups-gated');
-    mockGetPendingApproval.mockReturnValue(grant);
-
-    const resp = await dispatch({ id: '9', command: 'groups-gated', args: {} }, AGENT_CTX, { grant });
-
-    expect(resp.ok).toBe(true);
-    const [event] = events();
-    expect(event).toMatchObject({
-      action: 'groups.gated',
-      outcome: 'success',
-      correlation_id: 'appr-123-abc',
-    });
-    expect(event.resources).toContainEqual({ type: 'approval', id: 'appr-123-abc' });
-  });
-
-  it('records unknown commands as cli.unknown-command with the raw name in details', async () => {
-    await dispatch({ id: '1', command: 'nope-nothing', args: {} }, { caller: 'host' });
-
-    const [event] = events();
-    expect(event).toMatchObject({
-      action: 'cli.unknown-command',
-      outcome: 'failure',
-      resources: [],
-      details: { command: 'nope-nothing', error: 'unknown-command' },
-    });
-  });
-
-  it('records the resolved command and id for dash-joined positional ids', async () => {
-    const uuid = '550e8400-e29b-41d4-a716-446655440000';
-    await dispatch({ id: '1', command: `groups-get-${uuid}`, args: {} }, { caller: 'host' });
-
-    const [event] = events();
-    expect(event).toMatchObject({ action: 'groups.get', outcome: 'success' });
-    expect(event.resources).toContainEqual({ type: 'agent_group', id: uuid });
-    expect(event.details.id).toBe(uuid);
-  });
-
-  it('normalizes hyphenated arg keys in details', async () => {
-    await dispatch({ id: '1', command: 'groups-test', args: { 'dry-run': 'true' } }, { caller: 'host' });
-
-    const [event] = events();
-    expect(event.details).toMatchObject({ dry_run: 'true' });
-  });
-
-  it('parses JSON string args so the redactor reaches their inner keys', async () => {
-    await dispatch(
-      { id: '1', command: 'groups-test', args: { env: '{"NOTION_TOKEN":"tok-123","SAFE":"ok"}', note: '{not json' } },
-      { caller: 'host' },
-    );
-
-    const [event] = events();
-    expect(event.details.env).toEqual({ NOTION_TOKEN: '[REDACTED]', SAFE: 'ok' });
-    expect(event.details.note).toBe('{not json');
-  });
-});

.claude/skills/add-audit/add/src/cli/dispatch.audit.ts

@@ -1,238 +0,0 @@
-/**
- * CLI audit adapter (installed by /add-audit) — owns how the dispatcher
- * describes itself to the audit log: the dispatch middleware plus the
- * CLI-specific actor/origin/resource mapping. Composed in dispatch.ts as
- * `export const dispatch = withAudit(dispatchInner)`; business logic there
- * contains zero audit calls.
- *
- * Loading this module also boots the audit log (writability assert, boot
- * prune, hook lifecycle, maintenance timer): dispatch.ts is imported by both
- * transports during the host's barrel phase, so initAuditLog() runs before
- * any command is accepted — and an enabled box with an unwritable
- * data/audit/ refuses to start.
- */
-import { emitAuditEvent } from '../audit/emit.js';
-import { initAuditLog } from '../audit/init.js';
-import { type AuditActor, type AuditOrigin, type AuditOutcome, type AuditResource } from '../audit/types.js';
-import { containerOrigin, hostUser } from '../audit/vocab.js';
-import { getContainerConfig } from '../db/container-configs.js';
-import { getPendingApprovalsByAction } from '../db/sessions.js';
-import type { PendingApproval } from '../types.js';
-import { getResource } from './crud.js';
-import type { CallerContext, RequestFrame, ResponseFrame } from './frame.js';
-import { type CommandDef, lookup } from './registry.js';
-
-initAuditLog();
-
-// ── CLI mapping ──
-
-/**
- * Host callers stamp `host:<install user>` daemon-side (the ncl socket is
- * 0600 and owned by the install user); container callers are their agent group.
- */
-export function actorForCaller(ctx: CallerContext): AuditActor {
-  return ctx.caller === 'host' ? { type: 'human', id: `host:${hostUser()}` } : { type: 'agent', id: ctx.agentGroupId };
-}
-
-export function originForCaller(ctx: CallerContext): AuditOrigin {
-  if (ctx.caller === 'host') return { transport: 'socket' };
-  return containerOrigin(ctx.sessionId, ctx.messagingGroupId || null);
-}
-
-/**
- * Frame-level args use `--hyphen-keys`; recorded details use the same
- * underscore form the parsed handlers see. Mirrors crud's normalizeArgs
- * (kept local so audit doesn't depend on a module tests commonly mock).
- */
-export function normalizeArgKeys(raw: Record<string, unknown>): Record<string, unknown> {
-  const out: Record<string, unknown> = {};
-  for (const [k, v] of Object.entries(raw)) {
-    out[k.replace(/-/g, '_')] = v;
-  }
-  return out;
-}
-
-/** CLI resource plural → audit resource type, where the singular isn't it. */
-const RESOURCE_TYPE_OVERRIDES: Record<string, string> = {
-  groups: 'agent_group',
-  'messaging-groups': 'messaging_group',
-  'dropped-messages': 'dropped_message',
-  'user-dms': 'user_dm',
-};
-
-/**
- * Derive touched/attempted resources from a command's effective args. Generic
- * by design: `id` → the command's own resource, group/user args → their
- * types, and a bare `{type}` entry when nothing else is known (a denied
- * `users list` still names what was attempted).
- */
-export function resourcesForCli(cmd: CommandDef, args: Record<string, unknown>): AuditResource[] {
-  if (!cmd.resource) return [];
-  const type = RESOURCE_TYPE_OVERRIDES[cmd.resource] ?? getResource(cmd.resource)?.name ?? cmd.resource;
-
-  const out: AuditResource[] = [];
-  const push = (t: string, id: unknown): void => {
-    if (typeof id !== 'string' || !id) return;
-    if (!out.some((r) => r.type === t && r.id === id)) out.push({ type: t, id });
-  };
-  push(type, args.id);
-  push('agent_group', args.agent_group_id ?? args.group);
-  push('user', args.user);
-  if (out.length === 0) out.push({ type });
-  return out;
-}
-
-// ── Dispatch mechanics, mirrored for the record ──
-// Dispatch resolves the command and auto-fills args on a local copy of the
-// frame that never leaves it, so the middleware mirrors the two documented
-// mechanics below. The copies are mechanical, and drift only ever degrades a
-// record's detail (a fallback action name, a missing auto-filled arg) — never
-// dispatch behavior, and never an outcome.
-
-/**
- * Mirror of dispatch's command resolution: exact lookup, then the longest
- * registered dash-prefix with the remainder recorded as --id.
- */
-function resolveForRecord(req: RequestFrame): { cmd?: CommandDef; args: Record<string, unknown> } {
-  const direct = lookup(req.command);
-  if (direct) return { cmd: direct, args: req.args };
-  let shortened = req.command;
-  let idx: number;
-  while ((idx = shortened.lastIndexOf('-')) > 0) {
-    shortened = shortened.slice(0, idx);
-    const fallback = lookup(shortened);
-    if (fallback) {
-      const tail = req.command.slice(shortened.length + 1);
-      return { cmd: fallback, args: { ...req.args, id: req.args.id ?? tail } };
-    }
-  }
-  return { args: req.args };
-}
-
-/**
- * Mirror of dispatch's group-scope arg auto-fill, so the record shows the
- * effective args the handler saw (e.g. which agent group a bare
- * `sessions list` actually listed).
- */
-function effectiveArgs(
-  cmd: CommandDef | undefined,
-  args: Record<string, unknown>,
-  ctx: CallerContext,
-): Record<string, unknown> {
-  if (ctx.caller !== 'agent') return args;
-  if ((getContainerConfig(ctx.agentGroupId)?.cli_scope ?? 'group') !== 'group') return args;
-  const fill: Record<string, unknown> = {
-    agent_group_id: args.agent_group_id ?? ctx.agentGroupId,
-    group: args.group ?? ctx.agentGroupId,
-  };
-  if (cmd?.resource === 'groups' || cmd?.resource === 'destinations') {
-    fill.id = args.id ?? ctx.agentGroupId;
-  }
-  return { ...args, ...fill };
-}
-
-/**
- * CLI args arrive as strings, so a JSON-object/array value (e.g.
- * `--env '{"NOTION_TOKEN":"…"}'`) would reach the redactor as one opaque
- * string under an innocent key and its inner secret keys would survive.
- * Recording the parsed form lets the redactor walk inside — the audit log's
- * "secrets never land" property depends on it for exactly this flow.
- */
-function parseJsonishValues(args: Record<string, unknown>): Record<string, unknown> {
-  const out: Record<string, unknown> = {};
-  for (const [k, v] of Object.entries(args)) {
-    if (typeof v === 'string' && (v.startsWith('{') || v.startsWith('['))) {
-      try {
-        out[k] = JSON.parse(v);
-        continue;
-        // eslint-disable-next-line no-catch-all/no-catch-all -- not JSON after all: record the string as-is
-      } catch {
-        /* fall through */
-      }
-    }
-    out[k] = v;
-  }
-  return out;
-}
-
-/**
- * The approval row a hold just created for this frame — it gives the pending
- * event the same correlation_id the approved replay will carry as its guard
- * grant. requestApproval keeps the minted id internal, so the row is
- * recovered by the frame id it stored in its payload; no row (e.g. no
- * configured approver) → the hold is still recorded, uncorrelated.
- */
-function holdApprovalIdFor(frameId: string): string | null {
-  const rows = getPendingApprovalsByAction('cli_command');
-  for (let i = rows.length - 1; i >= 0; i--) {
-    try {
-      const payload = JSON.parse(rows[i].payload) as { frame?: { id?: string } };
-      if (payload.frame?.id === frameId) return rows[i].approval_id;
-      // eslint-disable-next-line no-catch-all/no-catch-all -- a row with an unparseable payload is simply not this frame's hold
-    } catch {
-      continue;
-    }
-  }
-  return null;
-}
-
-// ── The dispatch middleware ──
-
-type DispatchInner = (
-  req: RequestFrame,
-  ctx: CallerContext,
-  opts?: { grant?: PendingApproval },
-) => Promise<ResponseFrame>;
-
-/**
- * Dispatch middleware — the exported `dispatch` is the wrapped function, so
- * the socket server, the container delivery-action, and the in-module
- * approved replay are all covered by the one composition.
- *
- * Outcome derives from the response frame: ok → success, forbidden → denied
- * (captures pre-handler scope denials), approval-pending → pending (the
- * record of a hold), anything else → failure. Correlation is the approval id:
- * an approved replay carries the approval row as its guard grant
- * (opts.grant), and a fresh hold is correlated by recovering the row it just
- * created — so `--correlation <approval-id>` returns the whole gated chain.
- */
-export function withAudit(inner: DispatchInner): DispatchInner {
-  return async (req, ctx, opts = {}) => {
-    const res = await inner(req, ctx, opts);
-    emitAuditEvent(() => {
-      const resolved = resolveForRecord(req);
-      const cmd = resolved.cmd;
-      const pending = !res.ok && res.error.code === 'approval-pending';
-      const outcome: AuditOutcome = res.ok
-        ? 'success'
-        : res.error.code === 'forbidden'
-          ? 'denied'
-          : pending
-            ? 'pending'
-            : 'failure';
-      // A denial records the attempt as asked (raw args): nothing ran, so the
-      // auto-fill never conceptually happened — and a cross-group attempt
-      // must show the foreign id the caller passed, not a filled-in own-group.
-      const args = normalizeArgKeys(outcome === 'denied' ? resolved.args : effectiveArgs(cmd, resolved.args, ctx));
-      const correlationId = opts.grant?.approval_id ?? (pending ? holdApprovalIdFor(req.id) : null);
-      const details: Record<string, unknown> = parseJsonishValues(args);
-      if (!res.ok && !pending) {
-        details.error = res.error.code;
-        details.reason = res.error.message;
-      }
-      if (!cmd) details.command = req.command;
-      const resources = cmd ? resourcesForCli(cmd, args) : [];
-      if (correlationId) resources.push({ type: 'approval', id: correlationId });
-      return {
-        actor: actorForCaller(ctx),
-        origin: originForCaller(ctx),
-        action: cmd ? (cmd.action ?? `cli.${cmd.name}`) : 'cli.unknown-command',
-        resources,
-        outcome,
-        correlationId,
-        details,
-      };
-    });
-    return res;
-  };
-}

.claude/skills/add-audit/add/src/cli/resources/audit.ts

@@ -1,56 +0,0 @@
-import { listAuditEvents } from '../../audit/reader.js';
-import { registerResource } from '../crud.js';
-
-/**
- * Read-only audit resource (installed by /add-audit). The "table" is the
- * NDJSON day-file store — no generic CRUD verbs are declared, so it is never
- * queried as SQL; `list` is a custom operation backed by the audit reader.
- *
- * Deliberately NOT on the group-scope allowlist (GROUP_SCOPE_RESOURCES):
- * audit spans agent groups, so group-scoped agents are refused before the
- * handler — the resource is host + `cli_scope: global` only, by omission
- * (fails closed).
- */
-registerResource({
-  name: 'audit_event',
-  plural: 'audit',
-  table: '(data/audit/*.ndjson)',
-  description: 'Local audit log — one event per ncl command. Newest first. Requires AUDIT_ENABLED=true.',
-  idColumn: 'event_id',
-  columns: [
-    { name: 'actor', type: 'string', description: 'Filter: exact actor id (host:<user>, <channel>:<handle>, agent group id)' },
-    { name: 'action', type: 'string', description: 'Filter: exact action or dotted prefix (e.g. groups.config)' },
-    { name: 'resource', type: 'string', description: 'Filter: matches any event resource by id or type' },
-    {
-      name: 'outcome',
-      type: 'string',
-      description: 'Filter: event outcome',
-      enum: ['success', 'failure', 'denied', 'pending', 'approved', 'rejected'],
-    },
-    { name: 'since', type: 'string', description: 'Window start: 7d / 24h / 30m relative, or ISO date' },
-    { name: 'until', type: 'string', description: 'Window end: same formats as --since' },
-    { name: 'correlation', type: 'string', description: 'Filter: approval id tying a gated chain together' },
-    { name: 'limit', type: 'number', description: 'Max events (default 100, newest first)' },
-    { name: 'format', type: 'string', description: 'Output format', enum: ['ndjson'] },
-  ],
-  operations: {},
-  customOperations: {
-    list: {
-      access: 'open',
-      description: 'Query audit events, newest first. --format ndjson streams the stored lines for SIEM export.',
-      examples: [
-        'ncl audit list --outcome denied --since 7d',
-        'ncl audit list --correlation appr-1751970000000-x1y2z3',
-        'ncl audit list --action groups.config --format ndjson',
-      ],
-      handler: async (args) => listAuditEvents(args),
-      formatHuman: (data) => {
-        // NDJSON export prints the stored lines verbatim; for the table view
-        // this throws so dispatch falls back to the row objects, which every
-        // client already renders.
-        if (typeof data === 'string') return data;
-        throw new Error('render rows client-side');
-      },
-    },
-  },
-});

.claude/skills/add-clidash/REMOVE.md

@@ -1,22 +0,0 @@
-# Remove /add-clidash
-
-clidash is fully self-contained, so removal is a single directory delete. It
-made no edits to NanoClaw `src/`, added no dependency, and wired into nothing.
-
-```bash
-# Stop the service first if you set one up:
-systemctl --user disable --now clidash 2>/dev/null || true
-rm -f ~/.config/systemd/user/clidash.service
-
-# Remove the tool:
-rm -rf tools/clidash
-```
-
-If you added the config to `.gitignore` in step 2 of the install, remove that
-line too:
-
-```
-tools/clidash/clidash.config.json
-```
-
-Nothing else needs reverting.

.claude/skills/add-clidash/SKILL.md

@@ -1,168 +0,0 @@
----
-name: add-clidash
-description: Add clidash — a zero-dependency, read-only web dashboard that derives its tabs and tables at runtime from any CLI that lists resources as JSON. Ships pre-wired for NanoClaw's ncl CLI (agent groups, sessions, channels, users, roles), plus message-activity charts, a log tail, and a read-only file viewer for group skills/CLAUDE.md/profiles.
----
-
-# /add-clidash — CLI-derived read-only dashboard
-
-clidash is a small, read-only web dashboard. You point it at any CLI that can
-list resources as JSON (NanoClaw's `ncl`, `docker`, `kubectl`, …) and it builds
-the dashboard at runtime: one tab per resource, a generic table over whatever
-columns the rows have. A new `ncl` resource becomes a new tab and a new column
-becomes a new table column with **zero code changes**.
-
-It ships pre-wired for NanoClaw's `ncl` CLI and adds three NanoClaw-aware
-panels driven entirely by config:
-
-- **Agents overview** — status cards joining groups + sessions + messaging
-  groups + wirings (green <15m / amber <2h / red older).
-- **Activity** — per-session inbound/outbound message totals and a daily series,
-  read directly from the session DBs (`ncl` has no messages resource).
-- **Logs** — last N lines of allowlisted host log files.
-- **Files** — a read-only viewer for group skills, `CLAUDE.md`, and profiles.
-
-## Why it's safe
-
-clidash is **read-only by construction**: the server can only `execFile` the
-argv templates in its config. `{resource}` is the sole substitution and is
-allowlist-validated against the discovered/static resource set before exec —
-never a shell, no free-form input reaches argv. There is no auth; **the network
-is the auth boundary** — it binds `127.0.0.1` by default. Only ever bind a
-private interface (e.g. a tailnet IP), never a public one.
-
-It's distinct from `/add-dashboard` (which pushes JSON snapshots to a separate
-`@nanoco/nanoclaw-dashboard` npm package): clidash has **zero dependencies**, no
-build step, no push pipeline, and no edits to NanoClaw source — it just reads
-`ncl` and the session DBs.
-
-## Steps
-
-### 1. Copy the tool into place
-
-clidash is fully self-contained — copy the whole directory in:
-
-`tools/` is not a standard NanoClaw directory and `cp -R` won't create it, so
-make it first:
-
-```bash
-mkdir -p tools
-cp -R .claude/skills/add-clidash/add/tools/clidash tools/clidash
-```
-
-That is the only file change this skill makes. Nothing in NanoClaw `src/` is
-touched, no dependency is added.
-
-### 2. Create the config
-
-The example config is pre-wired for NanoClaw with paths relative to the repo
-root, so it works as-is when you run clidash from `tools/clidash/`:
-
-```bash
-cd tools/clidash
-cp clidash.config.example.json clidash.config.json
-```
-
-`clidash.config.json` is your local config — add it to `.gitignore` if you
-don't want to commit install-specific paths:
-
-```bash
-echo 'tools/clidash/clidash.config.json' >> ../../.gitignore
-```
-
-The example assumes `ncl` is built at `bin/ncl`. If `bin/ncl` doesn't exist,
-build it first (`pnpm run build`) or point `clis.ncl.bin` at the right path.
-
-### 3. Test
-
-Tests use a stub CLI — no real `ncl` or `docker` needed:
-
-```bash
-npm test
-```
-
-All tests should pass (Node ≥ 22.5, `node:test`, zero dependencies).
-
-### 4. Run and verify
-
-```bash
-node server.js          # serves http://127.0.0.1:4690
-```
-
-In another shell, confirm it's live and that `ncl` discovery worked:
-
-```bash
-curl -s http://127.0.0.1:4690/api/clis | head -c 400      # CLIs + discovered resources
-curl -s http://127.0.0.1:4690/api/r/ncl/groups | head -c 400   # a real resource table
-```
-
-Then open `http://127.0.0.1:4690/` in a browser. You should see the Agents
-overview plus a tab per `ncl` resource.
-
-### 5. (Optional) Run as a service
-
-clidash binds `127.0.0.1` by default. To reach it from other devices, bind a
-private (e.g. tailnet) IP via the `BIND` env var or `bind` in config — never a
-public interface.
-
-```ini
-# ~/.config/systemd/user/clidash.service   (Linux)
-[Unit]
-Description=clidash read-only CLI dashboard
-
-[Service]
-WorkingDirectory=%h/nanoclaw/tools/clidash
-ExecStart=/usr/bin/node %h/nanoclaw/tools/clidash/server.js
-Environment=BIND=127.0.0.1
-Restart=on-failure
-
-[Install]
-WantedBy=default.target
-```
-
-```bash
-systemctl --user enable --now clidash
-```
-
-On macOS, wrap `node server.js` (with `WorkingDirectory` = `tools/clidash`) in a
-launchd plist the same way the main NanoClaw service is configured.
-
-## Configuration reference
-
-`clidash.config.json` keys (see `tools/clidash/README.md` and
-`clidash.config.example.json` for the full shape):
-
-| Key | Purpose |
-|-----|---------|
-| `port`, `bind`, `refreshSeconds` | server bind + UI auto-refresh cadence |
-| `clis.<name>.bin` / `cwd` / `env` | how to invoke the CLI (`bin` is relative to `cwd`) |
-| `clis.<name>.discover` or `resources` | runtime discovery (`ncl help`) vs a static resource list |
-| `clis.<name>.list` | argv template; `{resource}` is the only substitution |
-| `clis.<name>.output` | `json` or `jsonlines` (docker/kubectl style) |
-| `clis.<name>.unwrap` | dot-path into a response envelope (e.g. `data`) |
-| `clis.<name>.enrich`/`badges`/`summary` | table decorations (ID→name joins, status colors, summary cards) |
-| `activity` | `sessionsRoot` + `days` for the message-activity charts |
-| `logs` | `dir`, `tailLines`, and an allowlist of `files` to tail |
-| `docs` | file viewer: `root`, a `deny` glob list, and `collections` of glob patterns |
-
-Adding a second CLI is config-only — e.g. `docker` is included as a `jsonlines`
-example. View plugins (`views/<cli>-<view>.js`) are the only per-CLI code and
-are optional.
-
-## Troubleshooting
-
-- **`ENOENT` / config not found** — run from `tools/clidash/` and make sure you
-  copied `clidash.config.example.json` to `clidash.config.json` (step 2), or set
-  `CLIDASH_CONFIG=/abs/path.json`.
-- **No `ncl` resources / discovery empty** — `bin/ncl` isn't built or the path
-  is wrong. Build it (`pnpm run build`) or fix `clis.ncl.bin`.
-- **docker tab errors** — the docker daemon isn't running, or remove the
-  `docker` CLI from config if you don't need it.
-- **Can't reach it from another device** — it binds `127.0.0.1`; set
-  `BIND=<private-ip>` (tailnet), never a public interface.
-- **Empty Activity/Logs/Files** — check that `activity.sessionsRoot`,
-  `logs.dir`, and `docs.root` resolve to your NanoClaw root (relative to where
-  you launch `node server.js`).
-
-## Removal
-
-See [REMOVE.md](REMOVE.md).

.claude/skills/add-clidash/add/tools/clidash/README.md

@@ -1,109 +0,0 @@
-# clidash
-
-CLI-agnostic **read-only** web dashboard. Point it at any CLI that can list
-resources as JSON and it derives the dashboard at runtime: one tab per
-resource, a generic table over whatever columns the rows have. New resource →
-new tab; new column → new table column; **zero code changes**.
-
-It ships pre-wired for NanoClaw's `ncl` CLI (agent groups, sessions, messaging
-groups, wirings, users, roles, …) plus `docker`, but the same config shape
-works for any list-as-JSON CLI.
-
-- **Zero dependencies** — Node built-ins only (Node ≥ 22.5, for `node:sqlite`),
-  no build step,
-  vanilla-JS frontend.
-- **Read-only by construction** — the server can only `execFile` the configured
-  argv templates; `{resource}` is the sole substitution and is validated
-  against the discovered/static resource allowlist. Never a shell.
-- **Standalone** — no imports from NanoClaw source; the core is extractable to
-  its own repo. The NanoClaw-specific knowledge lives entirely in the config
-  and in the `views/ncl-overview.js` view plugin.
-
-## Run
-
-```bash
-cp clidash.config.example.json clidash.config.json   # then edit paths if needed
-node server.js                                        # uses ./clidash.config.json
-CLIDASH_CONFIG=/path/to.json node server.js
-PORT=4690 BIND=127.0.0.1 node server.js               # env overrides
-```
-
-Run it from `tools/clidash/`; the example config uses paths relative to the
-NanoClaw root two levels up, so it works out of the box once `ncl` is built.
-
-## Configure (`clidash.config.json`)
-
-```jsonc
-{
-  "port": 4690,
-  "bind": "127.0.0.1",          // never a public interface; a tailnet IP at most
-  "refreshSeconds": 60,
-  "clis": {
-    "ncl": {
-      "bin": "bin/ncl",                                        // relative to cwd below
-      "cwd": "../..",                                           // the NanoClaw root
-      "discover": { "args": ["help"], "parser": "ncl-help" },   // runtime resource discovery
-      "list": ["{resource}", "list", "--json"],                 // argv template
-      "output": "json",          // or "jsonlines" (docker/kubectl style)
-      "unwrap": "data"           // dot-path into a response envelope
-    },
-    "docker": {
-      "bin": "docker",
-      "resources": ["ps", "images"],          // static alternative to discover
-      "list": ["{resource}", "--format", "{{json .}}"],
-      "output": "jsonlines"
-    }
-  }
-}
-```
-
-`{resource}` may appear as a whole argv element or inside one — e.g. a remote
-CLI via ssh: `"list": ["-i", "key.pem", "user@host", "ncl {resource} list --json"]`.
-
-Per-CLI `env` (merged over the server's env) and `cwd` are supported. See
-`clidash.config.example.json` for the full NanoClaw config, including the
-`enrich`/`badges`/`summary` table decorations and the `activity`/`logs`/`docs`
-sections.
-
-## API
-
-| Route | Returns |
-|---|---|
-| `GET /api/clis` | configured CLIs + discovered/static resources (discovery cached 60s) |
-| `GET /api/r/<cli>/<resource>` | `{ok, rows, fetchedAt}` — coalesced, 10s exec timeout |
-| `GET /api/view/<cli>/<view>` | curated view plugin from `views/<cli>-<view>.js` |
-
-View plugins are the only per-CLI *code*, and optional: a default-exported
-async function receiving `{ fetch }` (bound to that CLI) returning JSON.
-`views/ncl-overview.js` joins groups + sessions + messaging-groups + wirings
-into per-agent status cards (green <15m / amber <2h / red older).
-
-## Test
-
-```bash
-npm test            # unit + integration (node:test, stub CLI — no real CLI needed)
-./test/smoke.sh     # against a running instance
-```
-
-## Deploy as a service
-
-clidash binds `127.0.0.1` by default. To reach it from other devices, bind a
-private (e.g. tailnet) IP — **never a public interface**; the network is the
-auth boundary. Example systemd user service:
-
-```ini
-# ~/.config/systemd/user/clidash.service
-[Unit]
-Description=clidash read-only CLI dashboard
-
-[Service]
-WorkingDirectory=%h/nanoclaw/tools/clidash
-ExecStart=/usr/bin/node %h/nanoclaw/tools/clidash/server.js
-Environment=BIND=127.0.0.1
-Restart=on-failure
-
-[Install]
-WantedBy=default.target
-```
-
-Then `systemctl --user enable --now clidash`.

.claude/skills/add-clidash/add/tools/clidash/activity.js

@@ -1,80 +0,0 @@
-// Message-activity reader for clidash.
-//
-// ncl has no `messages` resource — message data lives in the per-session SQLite
-// DBs (`data/v2-sessions/<group>/<session>/{inbound,outbound}.db`). We read them
-// read-only with Node's built-in `node:sqlite` (no new dependency) and aggregate
-// per-session in/out totals + a daily time-series for charting.
-
-import { readdirSync, existsSync } from 'node:fs';
-import { join } from 'node:path';
-import { DatabaseSync } from 'node:sqlite';
-
-// Timestamps come in two shapes across tables: SQLite "YYYY-MM-DD HH:MM:SS" (UTC)
-// and already-ISO "YYYY-MM-DDTHH:MM:SS.sssZ". Normalize to a comparable ISO form
-// so date-bucketing and max("last") work regardless of which a row used.
-function normTs(ts) {
-  if (typeof ts !== 'string' || ts.length < 10) return null;
-  if (ts.includes('T')) return ts; // already ISO
-  return `${ts.replace(' ', 'T')}Z`;
-}
-
-function readTable(dbPath, table) {
-  let db;
-  try {
-    db = new DatabaseSync(dbPath, { readOnly: true });
-    const rows = db.prepare(`SELECT timestamp FROM ${table}`).all();
-    const byDay = new Map();
-    let last = null;
-    for (const r of rows) {
-      const ts = normTs(r.timestamp);
-      if (!ts) continue;
-      const day = ts.slice(0, 10); // ISO date prefix
-      byDay.set(day, (byDay.get(day) ?? 0) + 1);
-      if (last === null || ts > last) last = ts;
-    }
-    return { total: rows.length, byDay, last };
-  } catch {
-    return { total: 0, byDay: new Map(), last: null }; // missing/locked/corrupt → skip
-  } finally {
-    try { db?.close(); } catch { /* already closed */ }
-  }
-}
-
-function listDirs(path) {
-  try {
-    return readdirSync(path, { withFileTypes: true }).filter((e) => e.isDirectory()).map((e) => e.name);
-  } catch {
-    return [];
-  }
-}
-
-/**
- * Aggregate message activity across all session DBs under `sessionsRoot`.
- * @returns {{ sessions: Array, series: Array<{date,in,out}> }}
- *   sessions — per session: { agent_group_id, session_id, in, out, lastActivity }
- *   series   — one bucket per day for the last `days` days (UTC, newest last)
- */
-export function collectActivity(sessionsRoot, days, now) {
-  const dates = [];
-  for (let i = days - 1; i >= 0; i--) {
-    dates.push(new Date(now.getTime() - i * 86_400_000).toISOString().slice(0, 10));
-  }
-  const series = new Map(dates.map((d) => [d, { date: d, in: 0, out: 0 }]));
-  const sessions = [];
-
-  for (const group of listDirs(sessionsRoot)) {
-    for (const session of listDirs(join(sessionsRoot, group))) {
-      const base = join(sessionsRoot, group, session);
-      // a real session dir has at least one of the two message DBs; skip shared
-      // scaffolding dirs like `.claude-shared` that don't.
-      if (!existsSync(join(base, 'inbound.db')) && !existsSync(join(base, 'outbound.db'))) continue;
-      const inb = readTable(join(base, 'inbound.db'), 'messages_in');
-      const out = readTable(join(base, 'outbound.db'), 'messages_out');
-      const lastActivity = [inb.last, out.last].filter(Boolean).sort().at(-1) ?? null;
-      sessions.push({ agent_group_id: group, session_id: session, in: inb.total, out: out.total, lastActivity });
-      for (const [day, n] of inb.byDay) series.get(day)?.in !== undefined && (series.get(day).in += n);
-      for (const [day, n] of out.byDay) series.get(day)?.out !== undefined && (series.get(day).out += n);
-    }
-  }
-  return { sessions, series: dates.map((d) => series.get(d)) };
-}

.claude/skills/add-clidash/add/tools/clidash/clidash.config.example.json

@@ -1,106 +0,0 @@
-{
-  "port": 4690,
-  "bind": "127.0.0.1",
-  "refreshSeconds": 60,
-  "clis": {
-    "ncl": {
-      "bin": "bin/ncl",
-      "cwd": "../..",
-      "discover": { "args": ["help"], "parser": "ncl-help" },
-      "list": ["{resource}", "list", "--json"],
-      "output": "json",
-      "unwrap": "data",
-      "commands": {
-        "get": ["{resource}", "get", "--id", "{id}", "--json"],
-        "config-get": ["groups", "config", "get", "--id", "{id}", "--json"]
-      },
-      "help": ["{resource}", "help"],
-      "enrich": {
-        "sessions": {
-          "agent_group_id": { "ref": "groups", "label": "name" },
-          "messaging_group_id": { "ref": "messaging-groups", "label": "name" }
-        },
-        "wirings": {
-          "agent_group_id": { "ref": "groups", "label": "name" },
-          "messaging_group_id": { "ref": "messaging-groups", "label": "name" }
-        },
-        "roles": {
-          "agent_group_id": { "ref": "groups", "label": "name" },
-          "user_id": { "ref": "users", "label": "display_name" },
-          "granted_by": { "ref": "users", "label": "display_name" }
-        },
-        "members": {
-          "agent_group_id": { "ref": "groups", "label": "name" },
-          "user_id": { "ref": "users", "label": "display_name" }
-        },
-        "destinations": {
-          "agent_group_id": { "ref": "groups", "label": "name" }
-        },
-        "user-dms": {
-          "user_id": { "ref": "users", "label": "display_name" },
-          "messaging_group_id": { "ref": "messaging-groups", "label": "name" }
-        }
-      },
-      "badges": {
-        "container_status": { "running": "green", "idle": "green", "starting": "amber", "stopped": "gray", "error": "red" },
-        "status": { "active": "green", "stopped": "gray", "error": "red", "pending": "amber" }
-      },
-      "summary": {
-        "sessions": "container_status",
-        "messaging-groups": "channel_type",
-        "roles": "role",
-        "users": "kind",
-        "destinations": "target_type",
-        "dropped-messages": "reason"
-      }
-    },
-    "docker": {
-      "bin": "docker",
-      "resources": ["ps", "images"],
-      "list": ["{resource}", "--format", "{{json .}}"],
-      "output": "jsonlines"
-    }
-  },
-  "activity": {
-    "sessionsRoot": "../../data/v2-sessions",
-    "days": 14
-  },
-  "logs": {
-    "dir": "../../logs",
-    "tailLines": 500,
-    "files": [
-      { "name": "nanoclaw.log", "label": "host log" },
-      { "name": "nanoclaw.error.log", "label": "errors" }
-    ]
-  },
-  "docs": {
-    "root": "../..",
-    "deny": ["node_modules", ".env", "*token*", "*secret*", "*.pem", "*.key", "*.lock", "pnpm-lock.yaml"],
-    "collections": [
-      {
-        "name": "skills",
-        "label": "Skills",
-        "lang": "markdown",
-        "patterns": ["groups/*/skills/*/SKILL.md", "container/skills/*/SKILL.md"]
-      },
-      {
-        "name": "claude-md",
-        "label": "CLAUDE.md",
-        "lang": "markdown",
-        "patterns": ["groups/*/CLAUDE.md", "groups/*/CLAUDE.local.md"]
-      },
-      {
-        "name": "profiles",
-        "label": "Profiles",
-        "lang": "json",
-        "patterns": ["groups/*/profile.json"]
-      },
-      {
-        "name": "conversations",
-        "label": "Conversations",
-        "lang": "markdown",
-        "patterns": ["groups/*/conversations/*.md"]
-      }
-    ]
-  }
-}

.claude/skills/add-clidash/add/tools/clidash/docs.js

@@ -1,102 +0,0 @@
-// Read-only file viewer for clidash.
-//
-// Surfaces on-disk documents (skills, CLAUDE.md, profile.json, conversations)
-// that are NOT ncl resources. Same security posture as the rest of clidash:
-// only files matching a configured collection's glob patterns are listable or
-// readable; a deny-list blocks secrets; path traversal is impossible because a
-// requested path must be a member of the freshly-globbed allow-set.
-
-import { readdirSync, realpathSync } from 'node:fs';
-import { join, resolve, sep } from 'node:path';
-
-// Convert one glob segment to an anchored regex. `*` matches any run of
-// non-slash chars (so it works both as a whole segment and inside a filename,
-// e.g. `CLAUDE*.md`). All other regex metacharacters are escaped.
-function segToRegExp(seg) {
-  const esc = seg.replace(/[.+^${}()|[\]\\?]/g, '\\$&').replace(/\*/g, '[^/]*');
-  return new RegExp('^' + esc + '$');
-}
-
-// A path is denied if any of its segments matches any deny glob.
-function isDenied(relPath, deny) {
-  const segs = relPath.split('/');
-  return deny.some((d) => {
-    const re = segToRegExp(d);
-    return segs.some((s) => re.test(s));
-  });
-}
-
-// Directed walk: descend only entries matching each successive pattern segment.
-function walk(root, rel, segs, depth, out, deny) {
-  if (depth >= segs.length) return;
-  let entries;
-  try {
-    entries = readdirSync(join(root, rel), { withFileTypes: true });
-  } catch {
-    return;
-  }
-  const re = segToRegExp(segs[depth]);
-  const last = depth === segs.length - 1;
-  for (const e of entries) {
-    if (e.name === '.' || e.name === '..') continue;
-    if (!re.test(e.name)) continue;
-    const childRel = rel ? `${rel}/${e.name}` : e.name;
-    if (isDenied(childRel, deny)) continue;
-    if (last) {
-      if (e.isFile()) out.add(childRel);
-    } else if (e.isDirectory()) {
-      walk(root, childRel, segs, depth + 1, out, deny);
-    }
-  }
-}
-
-/**
- * Relative paths under `root` matching any of `patterns`, minus `deny` matches.
- * Sorted, de-duplicated. Patterns use `*` per the segment rules above; no `**`.
- */
-export function globFiles(root, patterns, deny = []) {
-  const out = new Set();
-  for (const pattern of patterns) {
-    walk(root, '', pattern.split('/'), 0, out, deny);
-  }
-  return [...out].sort();
-}
-
-/**
- * Human-friendly grouping/label for a relative path.
- * `groups/<g>/...` → group `<g>`; `container/...` → group `shared`.
- */
-const CONTAINER_SEGS = new Set(['skills', 'conversations']); // redundant grouping dirs
-export function describeFile(relPath) {
-  const parts = relPath.split('/');
-  if (parts[0] === 'groups' && parts.length > 2) {
-    const rest = parts.slice(2).filter((s) => !CONTAINER_SEGS.has(s)).join('/');
-    return { group: parts[1], label: `${parts[1]} / ${rest}` };
-  }
-  if (parts[0] === 'container') {
-    const rest = parts.slice(2).filter((s) => !CONTAINER_SEGS.has(s)).join('/');
-    return { group: 'shared', label: `shared / ${rest}` };
-  }
-  return { group: '', label: relPath };
-}
-
-/**
- * Validate a requested doc path against a collection and return its absolute
- * path, or throw. A path is allowed only if it is a member of the collection's
- * freshly-globbed allow-set — this single check enforces the patterns, the
- * deny-list, and traversal safety at once.
- */
-export function resolveDoc(root, collection, relPath, deny = []) {
-  const allowed = new Set(globFiles(root, collection.patterns, deny));
-  if (!allowed.has(relPath)) {
-    throw new Error(`Path not allowed: ${relPath}`);
-  }
-  // Defence in depth: the resolved real path must still live under root.
-  const abs = resolve(root, relPath);
-  const rootReal = realpathSync(root);
-  const absReal = realpathSync(abs);
-  if (absReal !== rootReal && !absReal.startsWith(rootReal + sep)) {
-    throw new Error(`Path not allowed: ${relPath}`);
-  }
-  return abs;
-}

.claude/skills/add-clidash/add/tools/clidash/logs.js

@@ -1,18 +0,0 @@
-// Log tailing for clidash — reads the last N lines of an allowlisted log file
-// and strips ANSI color codes (the host logger writes colored output).
-
-import { readFile } from 'node:fs/promises';
-
-const ANSI_RE = /\x1b\[[0-9;]*m/g;
-
-/**
- * Last `maxLines` lines of a log file, ANSI-stripped.
- * @returns {{ lines: string[], text: string }}
- */
-export async function tailFile(path, maxLines) {
-  const raw = (await readFile(path, 'utf8')).replace(ANSI_RE, '');
-  const all = raw.split('\n');
-  if (all.length && all.at(-1) === '') all.pop(); // drop trailing newline's empty field
-  const lines = all.slice(-maxLines);
-  return { lines, text: lines.join('\n') };
-}

.claude/skills/add-clidash/add/tools/clidash/package.json

@@ -1,14 +0,0 @@
-{
-  "name": "clidash",
-  "version": "0.1.0",
-  "description": "CLI-agnostic read-only web dashboard — derives tabs and tables from any CLI that lists resources as JSON",
-  "type": "module",
-  "private": true,
-  "scripts": {
-    "start": "node server.js",
-    "test": "node --test 'test/*.test.js'"
-  },
-  "engines": {
-    "node": ">=22.5"
-  }
-}

.claude/skills/add-clidash/add/tools/clidash/parsers.js

@@ -1,101 +0,0 @@
-// Pluggable parsers for clidash.
-//
-// discoveryParsers — turn a CLI's "help"-style output into a resource list.
-// parseOutput / unwrapPath — turn a CLI's list output into rows.
-// All per-CLI knowledge beyond these small functions lives in clidash.config.json.
-
-/**
- * Discovery parsers, keyed by the `discover.parser` name in config.
- * Each receives the raw discovery output and returns
- * [{ name, description, verbs }] for resources that support `list`.
- * They must throw loudly on unrecognized formats — silent empty results
- * would render as silently-stale tabs.
- */
-export const discoveryParsers = {
-  /**
-   * Parses ncl's two-column help format:
-   *
-   *   Resources:
-   *     sessions             Session — the runtime unit. ...
-   *                          verbs: list, get
-   *   Commands:
-   *     help                 ...
-   */
-  'ncl-help'(text) {
-    const lines = String(text).split('\n');
-    const start = lines.findIndex((l) => l.trim() === 'Resources:');
-    if (start === -1) {
-      throw new Error('ncl-help parser: no "Resources:" section in output — format may have changed');
-    }
-    const resources = [];
-    let current = null;
-    for (let i = start + 1; i < lines.length; i++) {
-      const line = lines[i];
-      if (line.trim() === '') continue;
-      if (/^\S/.test(line)) break; // next top-level section, e.g. "Commands:"
-      const verbsMatch = line.match(/^\s+verbs:\s*(.+)$/);
-      if (verbsMatch && current) {
-        current.verbs = verbsMatch[1].split(',').map((v) => v.trim()).filter(Boolean);
-        continue;
-      }
-      const resMatch = line.match(/^  (\S+)\s{2,}(\S.*)$/);
-      if (resMatch) {
-        current = { name: resMatch[1], description: resMatch[2].trim(), verbs: [] };
-        resources.push(current);
-      }
-    }
-    return resources.filter((r) => r.verbs.includes('list'));
-  },
-};
-
-/**
- * Parses a CLI's list output per the config's `output` field.
- * - 'json'      — one JSON document.
- * - 'jsonlines' — one JSON object per line (docker/kubectl style).
- * Thrown errors carry the raw output on `err.raw` so the UI can show it.
- */
-export function parseOutput(text, format) {
-  if (format === 'json') {
-    try {
-      return JSON.parse(text);
-    } catch (e) {
-      const err = new Error(`Invalid JSON output: ${e.message}`);
-      err.raw = text;
-      throw err;
-    }
-  }
-  if (format === 'jsonlines') {
-    const rows = [];
-    const lines = String(text).split('\n');
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i].trim();
-      if (!line) continue;
-      try {
-        rows.push(JSON.parse(line));
-      } catch (e) {
-        const err = new Error(`Invalid JSON on line ${i + 1}: ${e.message}`);
-        err.raw = text;
-        throw err;
-      }
-    }
-    return rows;
-  }
-  throw new Error(`Unknown output format: ${format}`);
-}
-
-/**
- * Follows a dot-path into a response envelope (e.g. 'data' for ncl's
- * {id, ok, data} frame). No path → value passes through unchanged.
- * Missing path throws — a changed envelope must fail loudly.
- */
-export function unwrapPath(value, path) {
-  if (!path) return value;
-  let cur = value;
-  for (const key of path.split('.')) {
-    if (cur === null || typeof cur !== 'object' || !(key in cur)) {
-      throw new Error(`Unwrap path "${path}" not found in CLI output (missing "${key}")`);
-    }
-    cur = cur[key];
-  }
-  return cur;
-}

.claude/skills/add-clidash/add/tools/clidash/public/app.js

@@ -1,715 +0,0 @@
-// clidash frontend — vanilla JS, no build step.
-//
-// Layout: a left sidebar with top-level items (Overview, Activity) and grouped
-// sections (one per CLI — ncl, docker — and a Files section for on-disk docs).
-// Each page shows the exact command that produced it. Tables auto-derive from
-// `ncl <resource> list --json`; rows drill into their `get` detail.
-//
-// Refresh UX: on first load every resource of every CLI is prefetched so nav is
-// instant. 60s auto-refresh + a manual button. Background refreshes diff-and-
-// inject (the data DOM rebuilds only when the data signature changes).
-
-import { mdToHtml } from './md.js';
-
-const $ = (id) => document.getElementById(id);
-
-const state = {
-  clis: [],
-  docCollections: [],
-  activeView: 'overview',   // 'overview' | 'activity' | 'r:<cli>:<resource>' | 'doc:<collection>'
-  paused: false,
-  refreshSeconds: 60,
-  lastUpdated: null,
-  refreshing: false,
-  snapshots: new Map(),     // "cli/resource" -> { rows, fetchedAt, command }
-  errors: new Map(),
-  activity: null,           // { sessions, series }
-  activityConfigured: false,
-  activityCommand: null,
-  logs: [],                 // [{ name, label }]
-  logCache: new Map(),      // name -> { text, command }
-  activeDocPath: null,
-  openDocGroups: new Set(), // which doc groups (e.g. agents) are expanded
-  docCache: new Map(),
-  configCache: new Map(),   // groupId -> container config (for the overview page)
-  helpCache: new Map(),     // "cli/resource" -> help text | null (prefetched each cycle)
-  detail: null,
-  sidebarOpen: false,
-  renderedSig: null,
-};
-
-const SVG_NS = 'http://www.w3.org/2000/svg';
-function svg(tag, attrs = {}, children = []) {
-  const node = document.createElementNS(SVG_NS, tag);
-  for (const [k, v] of Object.entries(attrs)) node.setAttribute(k, v);
-  for (const c of [].concat(children)) if (c != null) node.append(c);
-  return node;
-}
-
-// Lucide-style inline icons (static trusted markup) — crisp, themeable via currentColor.
-const ICONS = {
-  overview: '<rect x="3" y="3" width="7" height="9" rx="1"/><rect x="14" y="3" width="7" height="5" rx="1"/><rect x="14" y="12" width="7" height="9" rx="1"/><rect x="3" y="16" width="7" height="5" rx="1"/>',
-  activity: '<path d="M3 3v18h18"/><path d="M18 17V9"/><path d="M13 17V5"/><path d="M8 17v-3"/>',
-  terminal: '<rect x="2" y="4" width="20" height="16" rx="2"/><path d="m6 9 3 3-3 3"/><path d="M13 15h4"/>',
-  box: '<path d="M21 8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16Z"/><path d="m3.3 7 8.7 5 8.7-5"/><path d="M12 22V12"/>',
-  folder: '<path d="M4 20h16a2 2 0 0 0 2-2V8a2 2 0 0 0-2-2h-7.9a2 2 0 0 1-1.69-.9L9.6 3.9A2 2 0 0 0 7.93 3H4a2 2 0 0 0-2 2v13c0 1.1.9 2 2 2Z"/>',
-  logs: '<path d="M15 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V7Z"/><path d="M14 2v5h5"/><path d="M8 13h8"/><path d="M8 17h5"/>',
-};
-function icon(name) {
-  const s = document.createElementNS(SVG_NS, 'svg');
-  s.setAttribute('viewBox', '0 0 24 24');
-  s.setAttribute('fill', 'none');
-  s.setAttribute('stroke', 'currentColor');
-  s.setAttribute('stroke-width', '1.8');
-  s.setAttribute('stroke-linecap', 'round');
-  s.setAttribute('stroke-linejoin', 'round');
-  s.innerHTML = ICONS[name] ?? '';
-  return s;
-}
-
-// ---------------------------------------------------------------- helpers
-
-const ISO_RE = /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}/;
-
-function relTime(iso) {
-  const ms = Date.now() - new Date(iso).getTime();
-  if (Number.isNaN(ms)) return iso;
-  const s = Math.round(ms / 1000);
-  if (s < 0) return new Date(iso).toLocaleString();
-  if (s < 60) return `${s}s ago`;
-  const m = Math.round(s / 60);
-  if (m < 60) return `${m}m ago`;
-  const h = Math.round(m / 60);
-  if (h < 48) return `${h}h ago`;
-  return `${Math.round(h / 24)}d ago`;
-}
-
-function coarseAgo(date) {
-  const s = (Date.now() - date.getTime()) / 1000;
-  if (s < 60) return 'less than a minute ago';
-  const m = Math.floor(s / 60);
-  if (m < 60) return m === 1 ? '1 minute ago' : `${m} minutes ago`;
-  const h = Math.floor(m / 60);
-  if (h < 24) return h === 1 ? '1 hour ago' : `${h} hours ago`;
-  const d = Math.floor(h / 24);
-  return d === 1 ? '1 day ago' : `${d} days ago`;
-}
-
-function staleness(lastActive) {
-  if (!lastActive) return 'gray';
-  const min = (Date.now() - new Date(lastActive).getTime()) / 60000;
-  if (Number.isNaN(min)) return 'gray';
-  return min < 15 ? 'green' : min < 120 ? 'amber' : 'red';
-}
-
-function el(tag, attrs = {}, children = []) {
-  const node = document.createElement(tag);
-  for (const [k, v] of Object.entries(attrs)) {
-    if (k === 'class') node.className = v;
-    else if (k.startsWith('on')) node.addEventListener(k.slice(2), v);
-    else node.setAttribute(k, v);
-  }
-  for (const child of [].concat(children)) {
-    if (child == null) continue;
-    node.append(child instanceof Node ? child : document.createTextNode(String(child)));
-  }
-  return node;
-}
-
-function fmtValue(value) {
-  if (value === null || value === undefined) return { text: 'null', cls: 'null' };
-  if (typeof value === 'string' && ISO_RE.test(value)) return { iso: value };
-  return { text: typeof value === 'object' ? JSON.stringify(value) : String(value) };
-}
-
-function cellFor(value) {
-  const f = fmtValue(value);
-  if (f.cls === 'null') return el('td', { class: 'null' }, 'null');
-  if (f.iso) {
-    return el('td', {}, el('span', { class: 'reltime', title: f.iso }, [
-      relTime(f.iso), el('span', { class: 'abs' }, f.iso.slice(0, 16).replace('T', ' ')),
-    ]));
-  }
-  if (f.text.length > 42) {
-    const span = el('span', { class: 'trunc', title: f.text }, f.text.slice(0, 39) + '…');
-    span.addEventListener('click', (e) => { e.stopPropagation(); span.textContent = f.text; span.classList.remove('trunc'); });
-    return el('td', {}, span);
-  }
-  return el('td', {}, f.text);
-}
-
-function kvRows(obj) {
-  return Object.entries(obj ?? {}).map(([k, v]) => {
-    let valEl;
-    if (v && typeof v === 'object') valEl = el('pre', { class: 'kv-json' }, JSON.stringify(v, null, 2));
-    else if (typeof v === 'string' && ISO_RE.test(v)) valEl = el('span', { class: 'reltime', title: v }, `${relTime(v)}  (${v.slice(0, 16).replace('T', ' ')})`);
-    else if (v === null || v === undefined) valEl = el('span', { class: 'null' }, 'null');
-    else valEl = el('span', {}, String(v));
-    return el('div', { class: 'kv-row' }, [el('span', { class: 'kv-key' }, k), valEl]);
-  });
-}
-
-function resolveRef(cliName, ref, id) {
-  const snap = state.snapshots.get(`${cliName}/${ref.ref}`);
-  const row = snap?.rows?.find((r) => String(r.id) === String(id));
-  return row ? (row[ref.label] ?? null) : null;
-}
-
-function badgeChip(value, colorMap) {
-  const color = colorMap[String(value).toLowerCase()] ?? 'gray';
-  return el('span', { class: `badge-status ${color}` }, [el('span', { class: `dot ${color}` }), String(value)]);
-}
-
-function buildCell(value, column, ctx) {
-  if (ctx.badges?.[column] && value != null && typeof value !== 'object') {
-    return el('td', {}, badgeChip(value, ctx.badges[column]));
-  }
-  if (ctx.enrich?.[column] && value != null) {
-    const name = resolveRef(ctx.cliName, ctx.enrich[column], value);
-    if (name != null) {
-      return el('td', { class: 'enriched', title: String(value) }, [
-        el('span', {}, String(name)), el('span', { class: 'raw-id' }, String(value)),
-      ]);
-    }
-  }
-  return cellFor(value);
-}
-
-function summaryBar(resource, rows, col, cli) {
-  let label = resource.replace(/-/g, ' ');
-  if (rows.length === 1 && label.endsWith('s')) label = label.slice(0, -1);
-  const bits = [el('span', { class: 'sum-count' }, `${rows.length} ${label}`)];
-  if (col && rows.some((r) => col in r)) {
-    const counts = new Map();
-    for (const r of rows) { const v = r[col] ?? '—'; counts.set(v, (counts.get(v) ?? 0) + 1); }
-    const colorMap = cli.badges?.[col];
-    for (const [v, n] of [...counts.entries()].sort((a, b) => b[1] - a[1])) {
-      bits.push(el('span', { class: 'sum-sep' }, '·'));
-      const c = colorMap?.[String(v).toLowerCase()] ?? null;
-      bits.push(c
-        ? el('span', { class: `badge-status ${c}` }, [el('span', { class: `dot ${c}` }), `${v} ×${n}`])
-        : el('span', { class: 'sum-chip' }, `${v} ×${n}`));
-    }
-  }
-  return el('div', { class: 'summary-bar' }, bits);
-}
-
-// ---------------------------------------------------------------- views
-
-const nclCli = () => state.clis.find((c) => c.name === 'ncl') ?? state.clis[0];
-function currentView() {
-  const v = state.activeView;
-  if (v === 'overview' || v === 'activity') return { type: v };
-  const m = v.match(/^r:([^:]+):(.+)$/);
-  if (m) return { type: 'resource', cli: m[1], resource: m[2] };
-  if (v.startsWith('doc:')) return { type: 'doc', collection: v.slice(4) };
-  if (v.startsWith('log:')) return { type: 'log', name: v.slice(4) };
-  return { type: 'overview' };
-}
-const activeCollection = () => {
-  const v = currentView();
-  return v.type === 'doc' ? state.docCollections.find((c) => c.name === v.collection) : null;
-};
-
-// ---------------------------------------------------------------- fetching
-
-async function fetchJson(url) {
-  const res = await fetch(url);
-  return res.json().catch(() => ({ ok: false, error: `Bad response from ${url}` }));
-}
-
-async function refresh(force = false) {
-  state.refreshing = true;
-  if (force) renderControls();
-
-  const [cliList, docList, logList] = await Promise.all([
-    fetchJson('/api/clis').catch(() => null),
-    fetchJson('/api/docs').catch(() => null),
-    fetchJson('/api/logs').catch(() => null),
-  ]);
-  if (cliList?.clis) {
-    state.clis = cliList.clis;
-    state.refreshSeconds = cliList.clis[0]?.refreshSeconds ?? state.refreshSeconds;
-  }
-  if (docList?.collections) state.docCollections = docList.collections;
-  if (logList?.files) state.logs = logList.files;
-
-  render(); // paint sidebar + active view's loading state immediately
-
-  const jobs = [];
-  jobs.push(fetchJson('/api/activity').then((body) => {
-    if (body.ok && body.configured) {
-      state.activity = { sessions: body.sessions, series: body.series };
-      state.activityConfigured = true; state.activityCommand = body.command ?? null;
-    } else state.activityConfigured = false;
-    render();
-  }));
-  for (const lg of state.logs) {
-    jobs.push(fetchJson(`/api/log/${encodeURIComponent(lg.name)}`).then((body) => {
-      if (body.ok) state.logCache.set(lg.name, { text: body.text, command: body.command });
-      render();
-    }));
-  }
-  for (const c of state.clis) {
-    for (const r of c.resources ?? []) {
-      const key = `${c.name}/${r.name}`;
-      jobs.push(fetchJson(`/api/r/${c.name}/${encodeURIComponent(r.name)}`).then((body) => {
-        if (body.ok) { state.snapshots.set(key, { rows: body.rows, fetchedAt: body.fetchedAt, command: body.command }); state.errors.set(key, null); }
-        else state.errors.set(key, body.raw ? `${body.error}\n\n${body.raw}` : body.error);
-        render();
-      }));
-      if (c.help) {
-        jobs.push(fetchJson(`/api/help/${c.name}/${encodeURIComponent(r.name)}`).then((body) => {
-          state.helpCache.set(key, body.ok ? body.text : null);
-          render();
-        }));
-      }
-    }
-  }
-  await Promise.all(jobs);
-
-  // per-group container config (for the Overview page) — small, refetched each cycle
-  const groups = state.snapshots.get('ncl/groups')?.rows ?? [];
-  await Promise.all(groups.map(async (g) => {
-    const c = await fetchJson(`/api/cmd/ncl/config-get?id=${encodeURIComponent(g.id)}`);
-    if (c.ok) state.configCache.set(g.id, c.data);
-  }));
-
-  state.lastUpdated = new Date();
-  state.refreshing = false;
-  render();
-}
-
-async function openDoc(collectionName, path) {
-  state.activeDocPath = path;
-  const key = `${collectionName}\0${path}`;
-  if (!state.docCache.has(key)) {
-    const body = await fetchJson(`/api/doc?c=${encodeURIComponent(collectionName)}&p=${encodeURIComponent(path)}`);
-    state.docCache.set(key, body.ok ? { lang: body.lang, content: body.content } : { lang: 'error', content: body.error || 'Failed to load' });
-  }
-  state.renderedSig = null;
-  render();
-}
-
-async function openDetail(cliName, resource, id) {
-  state.detail = { cli: cliName, resource, id, loading: true };
-  state.renderedSig = null;
-  render();
-  const rec = await fetchJson(`/api/cmd/${cliName}/get?resource=${encodeURIComponent(resource)}&id=${encodeURIComponent(id)}`);
-  let config = null;
-  if (resource === 'groups') {
-    const cg = await fetchJson(`/api/cmd/${cliName}/config-get?id=${encodeURIComponent(id)}`);
-    if (cg.ok) config = cg.data;
-  }
-  if (!state.detail || state.detail.id !== id) return;
-  state.detail = { cli: cliName, resource, id, record: rec.ok ? rec.data : null, error: rec.ok ? null : rec.error, config };
-  state.renderedSig = null;
-  render();
-}
-
-function closeDetail() { state.detail = null; state.renderedSig = null; render(); }
-
-// Help panel: the description (first paragraph) is always visible; the verbs +
-// fields (everything after the first blank line) sit behind a collapse.
-function helpPanel(text) {
-  if (text === null) return null; // explicitly no help
-  if (text === undefined) return el('div', { class: 'help-panel' }, el('div', { class: 'help-head dim' }, 'loading help…'));
-  const idx = text.indexOf('\n\n');
-  const head = (idx >= 0 ? text.slice(0, idx) : text).trim();
-  const body = idx >= 0 ? text.slice(idx + 2).trim() : '';
-  return el('div', { class: 'help-panel' }, [
-    el('div', { class: 'help-head' }, head),
-    body ? el('details', { class: 'help-more' }, [
-      el('summary', {}, 'verbs & fields'),
-      el('pre', { class: 'help-text' }, body),
-    ]) : null,
-  ]);
-}
-
-function go(view) {
-  state.activeView = view;
-  state.detail = null;
-  state.sidebarOpen = false;
-  state.renderedSig = null;
-  const v = currentView();
-  if (v.type === 'doc') {
-    const coll = state.docCollections.find((c) => c.name === v.collection);
-    const first = coll && (coll.name === 'conversations' ? coll.files.at(-1) : coll.files[0]); // newest conversation
-    state.activeDocPath = state.activeDocPath && coll?.files.some((f) => f.path === state.activeDocPath)
-      ? state.activeDocPath : (first?.path ?? null);
-    // expand only the group holding the active doc; the user picks the rest
-    const activeFile = coll?.files.find((f) => f.path === state.activeDocPath);
-    state.openDocGroups = new Set(activeFile ? [activeFile.group] : []);
-    render();
-    if (state.activeDocPath) openDoc(coll.name, state.activeDocPath);
-    return;
-  }
-  render();
-}
-
-// ---------------------------------------------------------------- rendering
-
-function dataSignature() {
-  const v = currentView();
-  const key = v.type === 'resource' ? `${v.cli}/${v.resource}` : null;
-  const coll = activeCollection();
-  return JSON.stringify({
-    view: state.activeView, clis: state.clis.map((c) => `${c.name}:${(c.resources || []).length}`),
-    activityConfigured: state.activityConfigured,
-    rows: key ? state.snapshots.get(key)?.rows ?? null : null,
-    rowsError: key ? state.errors.get(key) ?? null : null,
-    command: key ? state.snapshots.get(key)?.command ?? null : null,
-    help: key ? state.helpCache.get(key) ?? null : null,
-    overview: v.type === 'overview' ? {
-      groups: state.snapshots.get('ncl/groups')?.rows ?? null,
-      sessions: state.snapshots.get('ncl/sessions')?.rows ?? null,
-      configs: [...state.configCache.entries()],
-      activity: state.activity?.sessions ?? null,
-    } : null,
-    activity: v.type === 'activity' ? state.activity : null,
-    log: v.type === 'log' ? state.logCache.get(v.name)?.text ?? null : null,
-    docFiles: coll ? coll.files.map((f) => f.path) : null,
-    docPath: state.activeDocPath,
-    docGroupsOpen: coll ? [...state.openDocGroups] : null,
-    docContent: coll ? state.docCache.get(`${coll.name}\0${state.activeDocPath}`)?.content ?? null : null,
-    detail: state.detail, paused: state.paused, sidebarOpen: state.sidebarOpen,
-  });
-}
-
-function renderControls() {
-  $('updated').textContent = state.lastUpdated
-    ? `updated ${coarseAgo(state.lastUpdated)}${state.paused ? ' · paused' : ''}` : '';
-  $('refresh').classList.toggle('spinning', state.refreshing);
-}
-
-function render() {
-  renderControls();
-  const sig = dataSignature();
-  if (sig === state.renderedSig) return;
-  state.renderedSig = sig;
-
-  $('sidebar').classList.toggle('open', state.sidebarOpen);
-  $('scrim').hidden = !state.sidebarOpen;
-
-  renderNav();
-
-  const v = currentView();
-  const banner = $('banner');
-  const tabError = v.type === 'resource' ? state.errors.get(`${v.cli}/${v.resource}`) : null;
-  const cli = v.type === 'resource' ? state.clis.find((c) => c.name === v.cli) : null;
-  const bannerMsg = cli?.error ? `Discovery failed for ${v.cli}: ${cli.error}`
-    : (tabError ? `CLI unreachable — showing last good snapshot. ${tabError.split('\n')[0]}` : null);
-  banner.hidden = !bannerMsg;
-  banner.textContent = bannerMsg ?? '';
-
-  renderCmdline(v);
-  if (v.type === 'overview') renderOverviewPage();
-  else if (v.type === 'activity') renderActivity();
-  else if (v.type === 'doc') renderDocs();
-  else if (v.type === 'log') renderLogPage(v.name);
-  else renderTable(v.cli, v.resource);
-  renderDetail();
-}
-
-function navItem(label, view, cls = '', iconName = null) {
-  return el('button', {
-    class: `nav-item ${cls}` + (state.activeView === view ? ' active' : ''),
-    onclick: () => go(view),
-  }, [iconName ? icon(iconName) : null, el('span', {}, label)]);
-}
-
-function renderNav() {
-  const nav = $('nav');
-  const items = [navItem('Overview', 'overview', '', 'overview')];
-  if (state.activityConfigured) items.push(navItem('Activity', 'activity', '', 'activity'));
-
-  for (const cli of state.clis) {
-    items.push(el('div', { class: 'nav-section' }, [icon(cli.name === 'docker' ? 'box' : 'terminal'), el('span', {}, cli.name)]));
-    for (const r of cli.resources ?? []) {
-      items.push(navItem(r.name, `r:${cli.name}:${r.name}`, 'nav-sub'));
-    }
-  }
-  if (state.docCollections.length) {
-    items.push(el('div', { class: 'nav-section' }, [icon('folder'), el('span', {}, 'Files')]));
-    for (const coll of state.docCollections) {
-      items.push(navItem(coll.label, `doc:${coll.name}`, 'nav-sub'));
-    }
-  }
-  if (state.logs.length) {
-    items.push(el('div', { class: 'nav-section' }, [icon('logs'), el('span', {}, 'Logs')]));
-    for (const lg of state.logs) {
-      items.push(navItem(lg.label, `log:${lg.name}`, 'nav-sub'));
-    }
-  }
-  nav.replaceChildren(...items);
-}
-
-function renderCmdline(v) {
-  const bar = $('cmdline');
-  let cmd = null;
-  if (v.type === 'resource') cmd = state.snapshots.get(`${v.cli}/${v.resource}`)?.command;
-  else if (v.type === 'activity') cmd = state.activityCommand;
-  else if (v.type === 'doc') cmd = state.activeDocPath ? `file · ${state.activeDocPath}` : null;
-  else if (v.type === 'log') cmd = state.logCache.get(v.name)?.command ?? null;
-  else if (v.type === 'overview') cmd = 'derived · ncl groups/sessions/messaging-groups/wirings + config-get + activity';
-  bar.hidden = !cmd;
-  bar.textContent = cmd ? `$ ${cmd}` : '';
-}
-
-// ---- Overview page (rich agent cards) ----
-
-function renderOverviewPage() {
-  const content = $('content');
-  const groups = state.snapshots.get('ncl/groups')?.rows;
-  if (!groups) { content.replaceChildren(el('div', { class: 'empty' }, 'Loading…')); return; }
-  const sessions = state.snapshots.get('ncl/sessions')?.rows ?? [];
-  const wirings = state.snapshots.get('ncl/wirings')?.rows ?? [];
-  const mgs = state.snapshots.get('ncl/messaging-groups')?.rows ?? [];
-  const act = state.activity?.sessions ?? [];
-  const mgName = (id) => mgs.find((m) => m.id === id)?.name ?? mgs.find((m) => m.id === id)?.platform_id ?? id;
-
-  const field = (k, v, cls = '') => el('div', { class: 'ov-field' }, [el('span', { class: 'k' }, k), el('span', { class: `v ${cls}` }, v)]);
-
-  const cards = groups.map((g) => {
-    const gs = sessions.filter((s) => s.agent_group_id === g.id);
-    const lastActive = gs.map((s) => s.last_active).filter(Boolean).sort().at(-1) ?? null;
-    const container = gs.some((s) => s.container_status === 'running') ? 'running' : (gs[0]?.container_status ?? 'none');
-    const ga = act.filter((a) => a.agent_group_id === g.id);
-    const msgIn = ga.reduce((a, s) => a + s.in, 0), msgOut = ga.reduce((a, s) => a + s.out, 0);
-    const cfg = state.configCache.get(g.id);
-    const chans = wirings.filter((w) => w.agent_group_id === g.id).map((w) => `${mgs.find((m) => m.id === w.messaging_group_id)?.channel_type ?? '?'}: ${mgName(w.messaging_group_id)}`);
-    const status = staleness(lastActive);
-    const containerColor = container === 'running' ? 'green' : container === 'idle' ? 'green' : container === 'none' ? 'gray' : 'gray';
-
-    const fields = [
-      el('div', { class: 'ov-field' }, [el('span', { class: 'k' }, 'container'), badgeChip(container, { running: 'green', idle: 'green', stopped: 'gray', none: 'gray' })]),
-      field('sessions', String(gs.length)),
-      field('messages', `${msgIn} in · ${msgOut} out`),
-      field('last active', lastActive ? relTime(lastActive) : '—', lastActive ? '' : 'dim'),
-    ];
-    if (cfg) {
-      fields.push(field('provider / model', `${cfg.provider ?? 'claude'} / ${cfg.model ?? 'default'}`));
-      fields.push(el('div', { class: 'ov-field' }, [el('span', { class: 'k' }, 'cli scope'), badgeChip(cfg.cli_scope ?? 'group', { global: 'amber', group: 'green', disabled: 'gray' })]));
-      const pkgs = (cfg.packages_apt?.length ?? 0) + (cfg.packages_npm?.length ?? 0);
-      const mcp = Object.keys(cfg.mcp_servers ?? {}).length;
-      if (pkgs || mcp) fields.push(field('extras', `${pkgs} pkgs · ${mcp} mcp`));
-    }
-
-    return el('div', { class: 'ov-card' }, [
-      el('div', { class: 'ov-head' }, [
-        el('span', { class: `dot ${status}` }),
-        el('span', { class: 'ov-name' }, g.name),
-        el('span', { class: 'ov-folder' }, g.folder),
-      ]),
-      el('div', { class: 'ov-fields' }, fields),
-      el('div', { class: 'ov-chans' }, chans.map((c) => el('span', { class: 'badge' }, c))),
-    ]);
-  });
-
-  content.replaceChildren(
-    el('h2', { class: 'page-title' }, 'Agents overview'),
-    el('div', { class: 'ov-cards' }, cards),
-  );
-}
-
-// ---- Activity ----
-
-function renderActivity() {
-  const content = $('content');
-  const data = state.activity;
-  if (!data) { content.replaceChildren(el('div', { class: 'empty' }, 'Loading…')); return; }
-  const { series, sessions } = data;
-  const totalIn = series.reduce((a, d) => a + d.in, 0);
-  const totalOut = series.reduce((a, d) => a + d.out, 0);
-
-  const W = 720, H = 220, padL = 34, padB = 28, padT = 10;
-  const max = Math.max(1, ...series.map((d) => Math.max(d.in, d.out)));
-  const slot = (W - padL) / series.length;
-  const bw = Math.max(3, slot / 2 - 2);
-  const yOf = (vv) => padT + (H - padT - padB) * (1 - vv / max);
-  const chart = svg('svg', { viewBox: `0 0 ${W} ${H}`, class: 'activity-chart', preserveAspectRatio: 'none' });
-  for (const frac of [0, 0.5, 1]) {
-    const y = yOf(max * frac);
-    chart.append(svg('line', { x1: padL, y1: y, x2: W, y2: y, class: 'grid' }));
-    chart.append(svg('text', { x: padL - 6, y: y + 3, class: 'axis', 'text-anchor': 'end' }, String(Math.round(max * frac))));
-  }
-  series.forEach((d, i) => {
-    const x = padL + i * slot;
-    chart.append(svg('rect', { x: x + 1, y: yOf(d.in), width: bw, height: yOf(0) - yOf(d.in), class: 'bar-in' }, [svg('title', {}, `${d.date}: ${d.in} in`)]));
-    chart.append(svg('rect', { x: x + 1 + bw, y: yOf(d.out), width: bw, height: yOf(0) - yOf(d.out), class: 'bar-out' }, [svg('title', {}, `${d.date}: ${d.out} out`)]));
-    if (i % 2 === 0) chart.append(svg('text', { x: x + bw, y: H - 8, class: 'axis', 'text-anchor': 'middle' }, d.date.slice(5)));
-  });
-  const legend = el('div', { class: 'activity-legend' }, [
-    el('span', {}, [el('span', { class: 'lg in' }), `inbound (${totalIn})`]),
-    el('span', {}, [el('span', { class: 'lg out' }), `outbound (${totalOut})`]),
-    el('span', { class: 'dim' }, `last ${series.length} days`),
-  ]);
-  const sessRows = [...sessions].sort((a, b) => (b.lastActivity || '').localeCompare(a.lastActivity || '')).map((s) => {
-    const groupName = resolveRef('ncl', { ref: 'groups', label: 'name' }, s.agent_group_id) ?? s.agent_group_id;
-    return el('tr', {}, [
-      el('td', {}, groupName),
-      el('td', {}, el('span', { class: 'trunc', title: s.session_id }, s.session_id.slice(0, 22) + '…')),
-      el('td', { class: 'num' }, String(s.in)),
-      el('td', { class: 'num' }, String(s.out)),
-      el('td', {}, s.lastActivity ? el('span', { class: 'reltime', title: s.lastActivity }, relTime(s.lastActivity)) : el('span', { class: 'null' }, '—')),
-    ]);
-  });
-  content.replaceChildren(
-    el('h2', { class: 'page-title' }, 'Message activity'),
-    el('div', { class: 'activity-wrap' }, [
-      legend,
-      el('div', { class: 'chart-box' }, chart),
-      el('div', { class: 'table-wrap' }, el('table', { class: 'activity-table' }, [
-        el('thead', {}, el('tr', {}, ['agent', 'session', 'in', 'out', 'last activity'].map((h) => el('th', {}, h)))),
-        el('tbody', {}, sessRows),
-      ])),
-    ]),
-  );
-}
-
-// ---- Logs (tail of a log file) ----
-
-function renderLogPage(name) {
-  const content = $('content');
-  const label = state.logs.find((l) => l.name === name)?.label ?? name;
-  const cached = state.logCache.get(name);
-  if (!cached) { content.replaceChildren(el('h2', { class: 'page-title' }, label), el('div', { class: 'empty' }, 'Loading…')); return; }
-  const view = el('div', { class: 'log-view' });
-  for (const line of cached.text.split('\n')) {
-    const lvl = /\bERROR\b/i.test(line) ? 'err' : /\bWARN(ING)?\b/i.test(line) ? 'warn' : '';
-    view.append(el('div', { class: `log-line ${lvl}` }, line || ' '));
-  }
-  content.replaceChildren(el('h2', { class: 'page-title' }, label), el('div', { class: 'log-box' }, view));
-  // follow the tail — scroll to the newest line
-  requestAnimationFrame(() => { const b = content.querySelector('.log-box'); if (b) b.scrollTop = b.scrollHeight; });
-}
-
-// ---- Files (doc viewer) ----
-
-function renderDocs() {
-  const coll = activeCollection();
-  const content = $('content');
-  if (!coll) { content.replaceChildren(el('div', { class: 'empty' }, 'No documents.')); return; }
-  if (!coll.files.length) { content.replaceChildren(el('div', { class: 'empty' }, `No ${coll.label.toLowerCase()}.`)); return; }
-  // display name: drop the group prefix, the `/SKILL.md` tail (show the skill
-  // dir), and the .md extension — leaving e.g. "meeting-tagger" or "2026-06-13-…"
-  const itemName = (label) => {
-    let n = label.includes('/') ? label.split('/').slice(1).join('/').trim() : label;
-    return n.replace(/\/SKILL\.md$/, '').replace(/\.md$/, '') || label;
-  };
-  const newestFirst = coll.name === 'conversations';
-  const groups = new Map();
-  for (const f of coll.files) { if (!groups.has(f.group)) groups.set(f.group, []); groups.get(f.group).push(f); }
-  const toggleGroup = (g) => {
-    state.openDocGroups.has(g) ? state.openDocGroups.delete(g) : state.openDocGroups.add(g);
-    state.renderedSig = null; render();
-  };
-  const list = el('div', { class: 'doc-list' });
-  for (const [group, files] of groups) {
-    const open = state.openDocGroups.has(group);
-    list.append(el('button', { class: 'doc-group-toggle' + (open ? ' open' : ''), onclick: () => toggleGroup(group) }, [
-      el('span', { class: 'chev' }, open ? '▾' : '▸'),
-      el('span', { class: 'g-name' }, group || '—'),
-      el('span', { class: 'g-count' }, String(files.length)),
-    ]));
-    if (open) {
-      const ordered = newestFirst ? [...files].reverse() : files;
-      for (const f of ordered) {
-        list.append(el('button', { class: 'doc-item' + (f.path === state.activeDocPath ? ' active' : ''), title: f.path, onclick: () => openDoc(coll.name, f.path) }, itemName(f.label) || f.path));
-      }
-    }
-  }
-  const pane = el('div', { class: 'doc-content' });
-  const cached = state.activeDocPath ? state.docCache.get(`${coll.name}\0${state.activeDocPath}`) : null;
-  if (!state.activeDocPath) pane.append(el('div', { class: 'empty' }, 'Select a document.'));
-  else if (!cached) pane.append(el('div', { class: 'empty' }, 'Loading…'));
-  else if (cached.lang === 'error') pane.append(el('div', { class: 'tab-error' }, cached.content));
-  else if (cached.lang === 'json') {
-    let pretty = cached.content;
-    try { pretty = JSON.stringify(JSON.parse(cached.content), null, 2); } catch { /* keep raw */ }
-    pane.append(el('pre', { class: 'code json' }, pretty));
-  } else if (cached.lang === 'markdown') {
-    const md = el('div', { class: 'markdown' }); md.innerHTML = mdToHtml(cached.content); pane.append(md);
-  } else pane.append(el('pre', { class: 'code' }, cached.content));
-  content.replaceChildren(el('h2', { class: 'page-title' }, coll.label), el('div', { class: 'doc-viewer' }, [list, pane]));
-}
-
-// ---- resource table ----
-
-function renderTable(cliName, resource) {
-  const content = $('content');
-  const cli = state.clis.find((c) => c.name === cliName);
-  if (!cli) { content.replaceChildren(el('div', { class: 'empty' }, 'No such CLI.')); return; }
-  const key = `${cliName}/${resource}`;
-  const snapshot = state.snapshots.get(key);
-  const error = state.errors.get(key);
-  const canDrill = (cli.commands || []).includes('get');
-  const parts = [el('h2', { class: 'page-title' }, resource)];
-  if (cli.help) parts.push(helpPanel(state.helpCache.get(key)));
-  if (error && snapshot) parts.push(el('div', { class: 'stale-note' }, `⚠ live fetch failing — snapshot from ${new Date(snapshot.fetchedAt).toLocaleTimeString()}`));
-  if (!snapshot) {
-    parts.push(error ? el('div', { class: 'tab-error' }, [`Failed to load ${resource}.`, el('pre', {}, error)]) : el('div', { class: 'empty' }, 'Loading…'));
-    content.replaceChildren(...parts); return;
-  }
-  const rows = snapshot.rows;
-  parts.push(summaryBar(resource, rows, cli.summary?.[resource], cli));
-  if (rows.length === 0) { parts.push(el('div', { class: 'empty' }, `No ${resource}.`)); content.replaceChildren(...parts); return; }
-  const columns = [];
-  for (const row of rows) for (const k of Object.keys(row)) if (!columns.includes(k)) columns.push(k);
-  const ctx = { cliName, enrich: cli.enrich?.[resource], badges: cli.badges };
-  const body = rows.map((row) => {
-    const id = row.id; const canRow = canDrill && id != null;
-    return el('tr', { class: canRow ? 'drillable' : '', ...(canRow ? { onclick: () => openDetail(cliName, resource, String(id)) } : {}) },
-      columns.map((c) => buildCell(row[c], c, ctx)));
-  });
-  parts.push(el('div', { class: 'table-wrap' }, el('table', {}, [
-    el('thead', {}, el('tr', {}, columns.map((c) => el('th', {}, c)))),
-    el('tbody', {}, body),
-  ])));
-  content.replaceChildren(...parts);
-}
-
-// ---- drill-down detail overlay ----
-
-function renderDetail() {
-  const overlay = $('detail');
-  if (!state.detail) { overlay.hidden = true; overlay.replaceChildren(); return; }
-  overlay.hidden = false;
-  const d = state.detail;
-  const panel = el('div', { class: 'detail-panel' });
-  panel.append(el('div', { class: 'detail-head' }, [
-    el('div', {}, [el('span', { class: 'detail-res' }, d.resource), ' ', el('span', { class: 'detail-id' }, d.id)]),
-    el('button', { class: 'detail-close', onclick: closeDetail, title: 'Close' }, '✕'),
-  ]));
-  const sub = el('div', { class: 'detail-body' });
-  if (d.loading) sub.append(el('div', { class: 'empty' }, 'Loading…'));
-  else if (d.error) sub.append(el('div', { class: 'tab-error' }, d.error));
-  else if (d.record) sub.append(el('div', { class: 'kv' }, kvRows(d.record)));
-  if (d.config) {
-    sub.append(el('div', { class: 'detail-section' }, 'Container config'));
-    sub.append(el('div', { class: 'kv' }, kvRows(d.config)));
-  }
-  panel.append(sub);
-  overlay.replaceChildren(panel);
-}
-
-// ---------------------------------------------------------------- boot
-
-$('pause').addEventListener('click', () => {
-  state.paused = !state.paused;
-  $('pause').textContent = state.paused ? '▶ resume' : '⏸ pause';
-  $('pause').classList.toggle('paused', state.paused);
-  state.renderedSig = null; render();
-});
-$('refresh').addEventListener('click', () => { if (!state.refreshing) refresh(true); });
-$('hamburger').addEventListener('click', () => { state.sidebarOpen = !state.sidebarOpen; state.renderedSig = null; render(); });
-$('scrim').addEventListener('click', () => { state.sidebarOpen = false; state.renderedSig = null; render(); });
-$('detail').addEventListener('click', (e) => { if (e.target === $('detail')) closeDetail(); });
-document.addEventListener('keydown', (e) => { if (e.key === 'Escape') { if (state.detail) closeDetail(); else if (state.sidebarOpen) { state.sidebarOpen = false; state.renderedSig = null; render(); } } });
-
-async function tick() {
-  if (!state.paused) { try { await refresh(); } catch { /* keep snapshots; retry next tick */ } }
-  else renderControls();
-  setTimeout(tick, state.refreshSeconds * 1000);
-}
-tick();

.claude/skills/add-clidash/add/tools/clidash/public/favicon.svg

@@ -1,11 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
-  <defs>
-    <linearGradient id="bg" x1="0" y1="0" x2="0" y2="1">
-      <stop offset="0" stop-color="#141a24"/>
-      <stop offset="1" stop-color="#0b0e14"/>
-    </linearGradient>
-  </defs>
-  <rect width="32" height="32" rx="7.5" fill="url(#bg)"/>
-  <rect x="0.5" y="0.5" width="31" height="31" rx="7" fill="none" stroke="#2b3342" stroke-width="1"/>
-  <text x="16.2" y="20.8" font-family="monospace" font-size="15" font-weight="700" letter-spacing="-0.5" text-anchor="middle" fill="#5b9dff">ncl</text>
-</svg>

.claude/skills/add-clidash/add/tools/clidash/public/index.html

@@ -1,45 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>clidash</title>
-  <link rel="icon" type="image/svg+xml" href="/favicon.svg">
-  <link rel="icon" type="image/x-icon" href="/favicon.ico">
-  <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
-  <link rel="manifest" href="/site.webmanifest">
-  <meta name="theme-color" content="#0a0c11">
-  <link rel="preconnect" href="https://fonts.googleapis.com">
-  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
-  <link href="https://fonts.googleapis.com/css2?family=IBM+Plex+Mono:wght@400;500;600&family=IBM+Plex+Sans:wght@400;500;600;700&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="style.css">
-</head>
-<body>
-  <button id="hamburger" class="hamburger" title="Menu" aria-label="Toggle menu">
-    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round"><line x1="4" x2="20" y1="6" y2="6"/><line x1="4" x2="20" y1="12" y2="12"/><line x1="4" x2="20" y1="18" y2="18"/></svg>
-  </button>
-  <div id="scrim" class="scrim" hidden></div>
-
-  <div class="app">
-    <aside id="sidebar" class="sidebar">
-      <div class="brand"><h1>clidash</h1></div>
-      <div class="controls">
-        <button id="refresh" class="refresh" title="Refresh now">↻ refresh</button>
-        <button id="pause" class="pause" title="Pause auto-refresh">⏸ pause</button>
-      </div>
-      <div id="updated" class="updated"></div>
-      <nav id="nav" class="nav"></nav>
-    </aside>
-
-    <main class="main">
-      <div id="banner" class="banner" hidden></div>
-      <div id="cmdline" class="cmdline" hidden></div>
-      <section id="content" class="content"></section>
-    </main>
-  </div>
-
-  <div id="detail" class="detail-overlay" hidden></div>
-
-  <script type="module" src="app.js"></script>
-</body>
-</html>

.claude/skills/add-clidash/add/tools/clidash/public/md.js

@@ -1,68 +0,0 @@
-// Minimal, dependency-free, XSS-safe markdown → HTML for clidash's file viewer
-// (SKILL.md / CLAUDE.md). Pure string functions, no DOM — importable in both the
-// browser (app.js) and node tests.
-//
-// Safety model: the ENTIRE source is HTML-escaped first, so no raw markup from a
-// file can reach innerHTML. Markdown transforms then emit only tags this module
-// generates. Link hrefs are taken from the URL capture group and gated to an
-// http(s) scheme, so a `javascript:`/`data:` URL (or one smuggled via link text)
-// can never become an executable href.
-
-export function escapeHtml(s) {
-  return String(s).replace(/[&<>"']/g, (c) => (
-    { '&': '&amp;', '<': '&lt;', '>': '&gt;', '"': '&quot;', "'": '&#39;' }[c]
-  ));
-}
-
-export function mdToHtml(src) {
-  const lines = escapeHtml(src).split('\n');
-  const out = [];
-  let i = 0;
-  const inline = (t) => t
-    .replace(/`([^`]+)`/g, '<code>$1</code>')
-    .replace(/\*\*([^*]+)\*\*/g, '<strong>$1</strong>')
-    .replace(/\*([^*]+)\*/g, '<em>$1</em>')
-    .replace(/\[([^\]]+)\]\((https?:[^)\s]+)\)/g, (m, text, url) =>
-      /^https?:\/\//i.test(url) ? `<a href="${url}" target="_blank" rel="noopener noreferrer">${text}</a>` : m);
-  while (i < lines.length) {
-    const line = lines[i];
-    if (/^```/.test(line)) {
-      const buf = [];
-      i++;
-      while (i < lines.length && !/^```/.test(lines[i])) buf.push(lines[i++]);
-      i++;
-      out.push(`<pre class="code"><code>${buf.join('\n')}</code></pre>`);
-      continue;
-    }
-    const h = line.match(/^(#{1,6})\s+(.*)$/);
-    if (h) { out.push(`<h${h[1].length}>${inline(h[2])}</h${h[1].length}>`); i++; continue; }
-    if (/^\s*([-*])\s+/.test(line)) {
-      const items = [];
-      while (i < lines.length && /^\s*([-*])\s+/.test(lines[i])) {
-        items.push(`<li>${inline(lines[i].replace(/^\s*([-*])\s+/, ''))}</li>`);
-        i++;
-      }
-      out.push(`<ul>${items.join('')}</ul>`);
-      continue;
-    }
-    if (/^\s*\d+\.\s+/.test(line)) {
-      const items = [];
-      while (i < lines.length && /^\s*\d+\.\s+/.test(lines[i])) {
-        items.push(`<li>${inline(lines[i].replace(/^\s*\d+\.\s+/, ''))}</li>`);
-        i++;
-      }
-      out.push(`<ol>${items.join('')}</ol>`);
-      continue;
-    }
-    if (/^\s*(---+|\*\*\*+)\s*$/.test(line)) { out.push('<hr>'); i++; continue; }
-    if (/^\s*>\s?/.test(line)) { out.push(`<blockquote>${inline(line.replace(/^\s*>\s?/, ''))}</blockquote>`); i++; continue; }
-    if (line.trim() === '') { i++; continue; }
-    const para = [line];
-    i++;
-    while (i < lines.length && lines[i].trim() !== '' && !/^(#{1,6}\s|```|\s*[-*]\s|\s*\d+\.\s|\s*>)/.test(lines[i])) {
-      para.push(lines[i++]);
-    }
-    out.push(`<p>${inline(para.join(' '))}</p>`);
-  }
-  return out.join('\n');
-}

.claude/skills/add-clidash/add/tools/clidash/public/site.webmanifest

@@ -1,11 +0,0 @@
-{
-  "name": "clidash",
-  "short_name": "ncl",
-  "icons": [
-    { "src": "/icon-192.png", "sizes": "192x192", "type": "image/png" },
-    { "src": "/icon-512.png", "sizes": "512x512", "type": "image/png" }
-  ],
-  "theme_color": "#0a0c11",
-  "background_color": "#0a0c11",
-  "display": "standalone"
-}

.claude/skills/add-clidash/add/tools/clidash/public/style.css

@@ -1,328 +0,0 @@
-/* clidash — refined terminal-ops console.
-   IBM Plex superfamily (Sans for UI, Mono for the CLI identity), a deep layered
-   dark palette, real depth, and precise micro-interactions. */
-
-:root {
-  /* layered surfaces */
-  --bg: #0a0c11;
-  --bg-grad: #10141d;
-  --panel: #13171f;
-  --panel-2: #1a1f2a;
-  --border: #222834;
-  --border-strong: #2e3644;
-  /* text */
-  --text: #e8edf5;
-  --dim: #98a2b3;
-  --faint: #5c6675;
-  /* accent + semantics */
-  --accent: #5b9dff;
-  --accent-soft: rgba(91, 157, 255, 0.14);
-  --green: #4cc97a;
-  --amber: #e0a93a;
-  --red: #f76d6d;
-  --purple: #c08cff;
-  --gray: #6b7585;
-  /* shape + motion */
-  --radius: 11px;
-  --radius-sm: 8px;
-  --shadow-sm: 0 1px 2px rgba(0, 0, 0, 0.35);
-  --shadow: 0 6px 22px -8px rgba(0, 0, 0, 0.5);
-  --shadow-lg: 0 18px 44px -12px rgba(0, 0, 0, 0.6);
-  --ease: 160ms cubic-bezier(0.2, 0.6, 0.2, 1);
-  --font-sans: "IBM Plex Sans", -apple-system, system-ui, Segoe UI, sans-serif;
-  --font-mono: "IBM Plex Mono", ui-monospace, "SF Mono", Menlo, monospace;
-}
-
-* { box-sizing: border-box; margin: 0; padding: 0; }
-[hidden] { display: none !important; }
-
-html { scrollbar-color: var(--border-strong) transparent; }
-body {
-  background:
-    radial-gradient(120% 80% at 50% -10%, var(--bg-grad) 0%, transparent 55%),
-    var(--bg);
-  background-attachment: fixed;
-  color: var(--text);
-  font-family: var(--font-sans);
-  font-size: 14px;
-  line-height: 1.5;
-  -webkit-text-size-adjust: 100%;
-  -webkit-font-smoothing: antialiased;
-}
-
-::selection { background: var(--accent-soft); }
-:focus-visible { outline: 2px solid var(--accent); outline-offset: 2px; border-radius: 4px; }
-
-h1 {
-  font-family: var(--font-mono); font-size: 17px; font-weight: 600;
-  letter-spacing: -0.3px; color: var(--text);
-}
-h1::before { content: "▍"; color: var(--accent); margin-right: 4px; }
-
-/* ---- layout ---- */
-
-.app { display: flex; align-items: stretch; min-height: 100vh; min-height: 100dvh; }
-
-.sidebar {
-  width: 236px; flex-shrink: 0; height: 100vh; height: 100dvh;
-  position: sticky; top: 0; align-self: flex-start; overflow-y: auto;
-  background: linear-gradient(180deg, rgba(255, 255, 255, 0.015), transparent 200px), var(--bg);
-  border-right: 1px solid var(--border);
-  padding: 18px 12px 40px; display: flex; flex-direction: column; gap: 10px;
-}
-.sidebar .brand { padding: 2px 8px 6px; }
-.sidebar .controls { display: flex; gap: 8px; padding: 0 4px; }
-.sidebar .updated { color: var(--faint); font-size: 11.5px; padding: 0 8px; min-height: 16px; font-family: var(--font-mono); }
-
-.pause, .refresh {
-  flex: 1; background: var(--panel); border: 1px solid var(--border); border-radius: var(--radius-sm);
-  color: var(--dim); padding: 6px 10px; font-size: 12.5px; font-family: var(--font-mono);
-  cursor: pointer; transition: color var(--ease), border-color var(--ease), background var(--ease);
-}
-.pause:hover, .refresh:hover { color: var(--text); border-color: var(--border-strong); background: var(--panel-2); }
-.pause.paused { color: var(--amber); border-color: var(--amber); }
-.refresh.spinning { color: var(--accent); border-color: var(--accent); animation: pulse 0.85s ease-in-out infinite; }
-@keyframes pulse { 50% { opacity: 0.5; } }
-
-.nav { display: flex; flex-direction: column; gap: 1px; margin-top: 6px; }
-.nav-section {
-  color: var(--faint); font-size: 10.5px; text-transform: uppercase; letter-spacing: 1px;
-  font-weight: 600; margin: 16px 10px 5px; font-family: var(--font-mono);
-  display: flex; align-items: center; gap: 7px;
-}
-.nav-section svg { width: 13px; height: 13px; opacity: 0.7; }
-.nav-item {
-  display: flex; align-items: center; gap: 9px; text-align: left;
-  background: none; border: none; border-radius: var(--radius-sm);
-  color: var(--dim); padding: 7px 10px; font-size: 13.5px; cursor: pointer; width: 100%;
-  font-family: var(--font-sans); position: relative;
-  transition: color var(--ease), background var(--ease);
-}
-.nav-item svg { width: 16px; height: 16px; flex-shrink: 0; opacity: 0.85; }
-.nav-item:hover { background: var(--panel); color: var(--text); }
-.nav-item.active { background: var(--accent-soft); color: var(--text); }
-.nav-item.active::before {
-  content: ""; position: absolute; left: -12px; top: 50%; transform: translateY(-50%);
-  width: 3px; height: 18px; background: var(--accent); border-radius: 0 3px 3px 0;
-}
-.nav-item.nav-sub { padding-left: 16px; font-size: 13px; }
-.nav-item.nav-sub.active { color: var(--accent); }
-
-.hamburger {
-  display: none; position: fixed; top: 12px; left: 12px; z-index: 60;
-  background: var(--panel); border: 1px solid var(--border); border-radius: var(--radius-sm);
-  color: var(--text); width: 40px; height: 40px; cursor: pointer; align-items: center; justify-content: center;
-}
-.hamburger svg { width: 20px; height: 20px; }
-.scrim { display: none; }
-
-.main { flex: 1; min-width: 0; padding: 26px 28px 64px; max-width: 1500px; }
-.page-title {
-  font-size: 20px; font-weight: 600; letter-spacing: -0.4px; margin-bottom: 16px;
-  animation: fadeUp 0.3s var(--ease) both;
-}
-
-.banner {
-  background: rgba(247, 109, 109, 0.1); border: 1px solid rgba(247, 109, 109, 0.4);
-  border-radius: var(--radius-sm); color: var(--red); padding: 9px 14px; font-size: 13.5px; margin-bottom: 16px;
-}
-.cmdline {
-  font-family: var(--font-mono); font-size: 12px; color: var(--dim);
-  background: var(--panel); border: 1px solid var(--border); border-radius: var(--radius-sm);
-  padding: 9px 14px; margin-bottom: 18px; overflow-x: auto; white-space: nowrap; box-shadow: var(--shadow-sm);
-}
-.cmdline::first-letter { color: var(--green); }
-
-@keyframes fadeUp { from { opacity: 0; transform: translateY(7px); } }
-
-/* ---- overview cards ---- */
-
-.ov-cards { display: grid; grid-template-columns: repeat(auto-fill, minmax(310px, 1fr)); gap: 16px; }
-.ov-card {
-  background: linear-gradient(180deg, rgba(255, 255, 255, 0.018), transparent 40%), var(--panel);
-  border: 1px solid var(--border); border-radius: var(--radius); padding: 17px 19px;
-  box-shadow: var(--shadow); transition: border-color var(--ease), transform var(--ease);
-  animation: fadeUp 0.4s var(--ease) both;
-}
-.ov-card:nth-child(2) { animation-delay: 0.05s; }
-.ov-card:nth-child(3) { animation-delay: 0.1s; }
-.ov-card:nth-child(4) { animation-delay: 0.15s; }
-.ov-card:hover { border-color: var(--border-strong); transform: translateY(-2px); }
-.ov-head { display: flex; align-items: center; gap: 9px; margin-bottom: 14px; }
-.ov-head .ov-name { font-weight: 600; font-size: 15px; }
-.ov-head .ov-folder { color: var(--faint); font-size: 12px; font-family: var(--font-mono); }
-.ov-fields { display: flex; flex-direction: column; gap: 7px; }
-.ov-field { display: flex; justify-content: space-between; align-items: center; font-size: 13px; }
-.ov-field .k { color: var(--dim); }
-.ov-field .v { color: var(--text); font-variant-numeric: tabular-nums; } .ov-field .v.dim { color: var(--faint); }
-.ov-chans { display: flex; flex-wrap: wrap; gap: 6px; margin-top: 14px; }
-
-.dot, .ov-head .dot { width: 9px; height: 9px; border-radius: 50%; flex-shrink: 0; }
-.dot.green { background: var(--green); box-shadow: 0 0 8px -1px var(--green); }
-.dot.amber { background: var(--amber); box-shadow: 0 0 8px -1px var(--amber); }
-.dot.red { background: var(--red); box-shadow: 0 0 8px -1px var(--red); }
-.dot.gray { background: var(--gray); }
-
-.badge {
-  font-size: 11.5px; border: 1px solid var(--border-strong); border-radius: 99px;
-  padding: 2px 10px; color: var(--dim); background: var(--panel-2); font-family: var(--font-mono);
-}
-
-/* ---- status badges + enriched cells ---- */
-.badge-status { display: inline-flex; align-items: center; gap: 6px; font-size: 12.5px; }
-.badge-status .dot { width: 7px; height: 7px; }
-.badge-status.green { color: var(--green); } .badge-status.amber { color: var(--amber); }
-.badge-status.red { color: var(--red); } .badge-status.gray { color: var(--gray); }
-td.enriched span:first-child { color: var(--text); }
-td.enriched .raw-id { display: block; color: var(--faint); font-size: 11px; font-family: var(--font-mono); }
-
-/* ---- summary bar ---- */
-.summary-bar { display: flex; align-items: center; flex-wrap: wrap; gap: 8px; margin: 2px 0 16px; font-size: 13px; }
-.summary-bar .sum-count { color: var(--text); font-weight: 600; }
-.summary-bar .sum-sep { color: var(--border-strong); }
-.summary-bar .sum-chip { color: var(--dim); font-family: var(--font-mono); font-size: 12px; }
-
-/* ---- per-resource help panel ---- */
-.help-panel { margin-bottom: 18px; background: var(--panel); border: 1px solid var(--border); border-radius: var(--radius); padding: 13px 16px; box-shadow: var(--shadow-sm); }
-.help-head { color: var(--dim); font-size: 13px; line-height: 1.6; }
-.help-head.dim { color: var(--faint); }
-.help-more { margin-top: 9px; }
-.help-more > summary { cursor: pointer; color: var(--accent); font-size: 12px; list-style: none; user-select: none; font-family: var(--font-mono); }
-.help-more > summary::-webkit-details-marker { display: none; }
-.help-more > summary::before { content: "▸ "; }
-.help-more[open] > summary::before { content: "▾ "; }
-.help-text {
-  margin: 9px 0 0; background: var(--bg); border: 1px solid var(--border); border-radius: var(--radius-sm);
-  padding: 13px 15px; font-size: 12px; line-height: 1.6; color: var(--dim);
-  white-space: pre-wrap; overflow-x: auto; font-family: var(--font-mono);
-}
-
-/* ---- document viewer ---- */
-.doc-viewer { display: grid; grid-template-columns: 264px 1fr; gap: 20px; align-items: start; }
-.doc-list { display: flex; flex-direction: column; gap: 2px; max-height: 76vh; overflow-y: auto; padding-right: 4px; }
-.doc-group-toggle {
-  flex-shrink: 0; display: flex; align-items: center; gap: 7px; width: 100%;
-  background: none; border: none; cursor: pointer; text-align: left;
-  color: var(--dim); font-size: 11px; text-transform: uppercase; letter-spacing: 1px;
-  font-weight: 600; font-family: var(--font-mono); margin: 12px 0 4px; padding: 5px 8px;
-  border-radius: var(--radius-sm); transition: color var(--ease), background var(--ease);
-}
-.doc-group-toggle:first-child { margin-top: 0; }
-.doc-group-toggle:hover { color: var(--text); background: var(--panel); }
-.doc-group-toggle.open { color: var(--text); }
-.doc-group-toggle .chev { color: var(--accent); width: 10px; }
-.doc-group-toggle .g-name { flex: 1; }
-.doc-group-toggle .g-count {
-  color: var(--faint); background: var(--panel-2); border-radius: 99px;
-  padding: 1px 8px; font-size: 10.5px; letter-spacing: 0;
-}
-.doc-item {
-  flex-shrink: 0; text-align: left; background: none; border: none; border-radius: var(--radius-sm);
-  color: var(--dim); padding: 6px 11px; font-size: 13px; line-height: 1.5; cursor: pointer;
-  white-space: nowrap; overflow: hidden; text-overflow: ellipsis; transition: color var(--ease), background var(--ease);
-}
-.doc-item:hover { background: var(--panel); color: var(--text); }
-.doc-item.active { background: var(--accent-soft); color: var(--accent); }
-.doc-content {
-  background: var(--panel); border: 1px solid var(--border); border-radius: var(--radius);
-  padding: 22px 26px; min-height: 220px; max-height: 78vh; overflow-y: auto; box-shadow: var(--shadow);
-}
-
-.markdown { font-size: 14px; line-height: 1.7; color: var(--text); }
-.markdown h1, .markdown h2, .markdown h3, .markdown h4 { margin: 20px 0 8px; line-height: 1.3; font-family: var(--font-mono); }
-.markdown h1 { font-size: 21px; } .markdown h2 { font-size: 17px; color: var(--accent); } .markdown h3 { font-size: 15px; }
-.markdown h1:first-child, .markdown h2:first-child { margin-top: 0; }
-.markdown p { color: var(--text); margin: 8px 0; }
-.markdown ul, .markdown ol { margin: 8px 0 8px 22px; }
-.markdown li { margin: 3px 0; }
-.markdown a { color: var(--accent); }
-.markdown hr { border: none; border-top: 1px solid var(--border); margin: 18px 0; }
-.markdown blockquote { border-left: 3px solid var(--border-strong); padding-left: 12px; color: var(--dim); margin: 8px 0; }
-.markdown code { background: var(--bg); border: 1px solid var(--border); border-radius: 5px; padding: 1px 6px; font-size: 12.5px; font-family: var(--font-mono); }
-.markdown pre.code, .doc-content pre.code {
-  background: var(--bg); border: 1px solid var(--border); border-radius: var(--radius-sm);
-  padding: 14px; overflow-x: auto; font-size: 12.5px; line-height: 1.6; margin: 12px 0; font-family: var(--font-mono);
-}
-.markdown pre.code code { background: none; border: none; padding: 0; }
-.doc-content pre.json { color: var(--text); white-space: pre; font-family: var(--font-mono); }
-
-/* ---- activity ---- */
-.activity-wrap { max-width: 780px; }
-.activity-legend { display: flex; gap: 18px; align-items: center; margin-bottom: 12px; font-size: 13px; color: var(--dim); }
-.activity-legend .lg { display: inline-block; width: 11px; height: 11px; border-radius: 3px; margin-right: 6px; vertical-align: -1px; }
-.activity-legend .lg.in { background: var(--accent); } .activity-legend .lg.out { background: var(--purple); }
-.chart-box { background: var(--panel); border: 1px solid var(--border); border-radius: var(--radius); padding: 16px; margin-bottom: 20px; box-shadow: var(--shadow); }
-.activity-chart { width: 100%; height: 220px; display: block; }
-.activity-chart .bar-in { fill: var(--accent); } .activity-chart .bar-out { fill: var(--purple); }
-.activity-chart .grid { stroke: var(--border); stroke-width: 1; }
-.activity-chart .axis { fill: var(--faint); font-size: 9px; font-family: var(--font-mono); }
-.activity-table td.num, .activity-table th:nth-child(3), .activity-table th:nth-child(4) { text-align: right; }
-.activity-table td.num { font-variant-numeric: tabular-nums; }
-
-/* ---- log viewer ---- */
-.log-box {
-  background: var(--bg); border: 1px solid var(--border); border-radius: var(--radius);
-  max-height: 78vh; overflow: auto; padding: 12px 0; box-shadow: var(--shadow);
-}
-.log-view { font-family: var(--font-mono); font-size: 12px; line-height: 1.65; min-width: max-content; }
-.log-line { padding: 0 16px; white-space: pre; color: var(--dim); }
-.log-line:hover { background: var(--panel); }
-.log-line.err { color: var(--red); background: rgba(247, 109, 109, 0.06); }
-.log-line.warn { color: var(--amber); }
-
-/* ---- tables ---- */
-.table-wrap { overflow-x: auto; -webkit-overflow-scrolling: touch; border: 1px solid var(--border); border-radius: var(--radius); box-shadow: var(--shadow-sm); }
-table { border-collapse: collapse; width: 100%; font-size: 13px; }
-th, td { text-align: left; padding: 9px 14px; border-bottom: 1px solid var(--border); white-space: nowrap; }
-tbody tr:last-child td { border-bottom: none; }
-th { color: var(--dim); font-weight: 600; font-size: 10.5px; text-transform: uppercase; letter-spacing: 0.6px; position: sticky; top: 0; background: var(--panel-2); font-family: var(--font-mono); }
-td { font-variant-numeric: tabular-nums; }
-td.null { color: var(--faint); font-style: italic; }
-tr.drillable { cursor: pointer; transition: background var(--ease); }
-tr.drillable:hover td { background: var(--panel); }
-.reltime .abs { color: var(--faint); font-size: 11.5px; margin-left: 6px; font-family: var(--font-mono); }
-td .trunc { cursor: pointer; border-bottom: 1px dotted var(--faint); }
-.stale-note { color: var(--amber); font-size: 12.5px; margin-bottom: 8px; }
-.empty, .tab-error { color: var(--dim); padding: 26px 2px; font-size: 14px; }
-.tab-error { color: var(--red); }
-.tab-error pre { margin-top: 10px; background: var(--panel); border: 1px solid var(--border); border-radius: var(--radius-sm); padding: 12px; color: var(--dim); font-size: 12px; overflow-x: auto; white-space: pre-wrap; font-family: var(--font-mono); }
-
-/* ---- drill-down detail overlay ---- */
-.detail-overlay { position: fixed; inset: 0; background: rgba(2, 4, 8, 0.62); display: flex; justify-content: flex-end; z-index: 50; backdrop-filter: blur(2px); animation: fade 0.18s ease; }
-@keyframes fade { from { opacity: 0; } }
-.detail-panel { width: min(580px, 100%); height: 100%; background: var(--bg); border-left: 1px solid var(--border-strong); overflow-y: auto; box-shadow: var(--shadow-lg); animation: slideIn 0.22s var(--ease); }
-@keyframes slideIn { from { transform: translateX(24px); opacity: 0.6; } }
-.detail-head { display: flex; justify-content: space-between; align-items: center; padding: 17px 22px; border-bottom: 1px solid var(--border); position: sticky; top: 0; background: var(--bg); }
-.detail-res { font-weight: 600; font-size: 15px; }
-.detail-id { color: var(--dim); font-family: var(--font-mono); font-size: 13px; }
-.detail-close { background: none; border: 1px solid var(--border); border-radius: var(--radius-sm); color: var(--dim); width: 30px; height: 30px; cursor: pointer; font-size: 14px; transition: color var(--ease), border-color var(--ease); }
-.detail-close:hover { color: var(--text); border-color: var(--accent); }
-.detail-body { padding: 17px 22px 44px; }
-.detail-section { margin: 24px 0 8px; color: var(--faint); font-size: 10.5px; text-transform: uppercase; letter-spacing: 1px; font-weight: 600; border-top: 1px solid var(--border); padding-top: 17px; font-family: var(--font-mono); }
-.kv { display: flex; flex-direction: column; gap: 2px; }
-.kv-row { display: grid; grid-template-columns: 168px 1fr; gap: 12px; padding: 6px 0; border-bottom: 1px solid var(--border); font-size: 13px; }
-.kv-key { color: var(--dim); font-family: var(--font-mono); font-size: 12.5px; }
-.kv-json { background: var(--panel); border: 1px solid var(--border); border-radius: 6px; padding: 8px 10px; font-size: 12px; overflow-x: auto; margin: 0; font-family: var(--font-mono); }
-
-/* ---- mobile ---- */
-@media (max-width: 640px) {
-  .hamburger { display: flex; }
-  .sidebar {
-    position: fixed; top: 0; left: 0; z-index: 70; transform: translateX(-100%);
-    transition: transform 0.22s var(--ease); box-shadow: var(--shadow-lg);
-  }
-  .sidebar.open { transform: translateX(0); }
-  .scrim { display: block; position: fixed; inset: 0; background: rgba(2, 4, 8, 0.55); z-index: 65; backdrop-filter: blur(1px); }
-  .scrim[hidden] { display: none; }
-  .main { padding: 58px 16px 48px; }
-  .ov-cards { grid-template-columns: 1fr; }
-  .doc-viewer { grid-template-columns: 1fr; gap: 12px; }
-  .doc-list { max-height: 220px; flex-direction: row; flex-wrap: wrap; }
-  .doc-content { max-height: none; padding: 18px; }
-  .detail-panel { width: 100%; }
-  .kv-row { grid-template-columns: 1fr; gap: 2px; }
-}
-
-@media (prefers-reduced-motion: reduce) {
-  *, *::before, *::after { animation: none !important; transition: none !important; }
-}

.claude/skills/add-clidash/add/tools/clidash/server.js

@@ -1,437 +0,0 @@
-// clidash — CLI-agnostic read-only web dashboard.
-// Node built-ins only. All per-CLI knowledge lives in clidash.config.json;
-// the only per-CLI code is optional view plugins (views/) and discovery
-// parsers (parsers.js).
-//
-// Security model: the server can only exec the configured argv templates.
-// `{resource}` is the sole substitution and is validated against the
-// discovered/static resource set before exec. execFile, never a shell.
-
-import { createServer } from 'node:http';
-import { execFile } from 'node:child_process';
-import { readFile, readdir } from 'node:fs/promises';
-import { readFileSync } from 'node:fs';
-import { dirname, join, resolve, sep, basename } from 'node:path';
-import { fileURLToPath, pathToFileURL } from 'node:url';
-import { discoveryParsers, parseOutput, unwrapPath } from './parsers.js';
-import { globFiles, describeFile, resolveDoc } from './docs.js';
-import { collectActivity } from './activity.js';
-import { tailFile } from './logs.js';
-
-const MODULE_DIR = dirname(fileURLToPath(import.meta.url));
-const MAX_DOC_BYTES = 2 * 1024 * 1024; // cap a single served document at 2 MB
-
-const DEFAULTS = {
-  bind: '127.0.0.1',
-  port: 4690,
-  refreshSeconds: 60,
-  execTimeoutMs: 10_000,
-  discoveryTtlMs: 60_000,
-};
-
-const CONTENT_TYPES = {
-  '.html': 'text/html; charset=utf-8',
-  '.js': 'text/javascript; charset=utf-8',
-  '.css': 'text/css; charset=utf-8',
-  '.json': 'application/json; charset=utf-8',
-  '.svg': 'image/svg+xml',
-  '.png': 'image/png',
-  '.ico': 'image/x-icon',
-  '.webmanifest': 'application/manifest+json',
-};
-
-export function createApp(userConfig) {
-  const config = { ...DEFAULTS, ...userConfig };
-  const publicDir = resolve(config.publicDir ?? join(MODULE_DIR, 'public'));
-  const viewsDir = resolve(config.viewsDir ?? join(MODULE_DIR, 'views'));
-
-  // Human-readable form of a command, for display in the UI ("the command run").
-  const displayCmd = (bin, args) => `${basename(bin)} ${args.join(' ')}`;
-
-  // ---- exec --------------------------------------------------------------
-
-  function execCli(cliCfg, args, label) {
-    return new Promise((resolvePromise, rejectPromise) => {
-      execFile(cliCfg.bin, args, {
-        cwd: cliCfg.cwd,
-        timeout: config.execTimeoutMs,
-        maxBuffer: 32 * 1024 * 1024,
-        env: { ...process.env, ...cliCfg.env },
-      }, (error, stdout, stderr) => {
-        if (error) {
-          const timedOut = error.killed || error.signal === 'SIGTERM';
-          const detail = stderr.trim() || error.message;
-          const msg = timedOut
-            ? `${label} timed out after ${config.execTimeoutMs}ms`
-            : `${label} failed: ${detail}`;
-          rejectPromise(new Error(msg));
-          return;
-        }
-        resolvePromise(stdout);
-      });
-    });
-  }
-
-  // ---- resource discovery (cached, coalesced, keeps last good) -----------
-
-  const discoveryCache = new Map(); // cli -> { at, resources }
-  const discoveryInflight = new Map(); // cli -> Promise
-
-  async function discoverResources(cliName) {
-    const cliCfg = config.clis[cliName];
-    if (cliCfg.resources) {
-      return cliCfg.resources.map((name) =>
-        typeof name === 'string' ? { name, description: '' } : name,
-      );
-    }
-    const cached = discoveryCache.get(cliName);
-    if (cached && Date.now() - cached.at < config.discoveryTtlMs) return cached.resources;
-    if (discoveryInflight.has(cliName)) return discoveryInflight.get(cliName);
-
-    const parser = discoveryParsers[cliCfg.discover.parser];
-    if (!parser) throw new Error(`Unknown discovery parser: ${cliCfg.discover.parser}`);
-    const promise = execCli(cliCfg, cliCfg.discover.args, `${cliName} discovery`)
-      .then((stdout) => {
-        const resources = parser(stdout);
-        discoveryCache.set(cliName, { at: Date.now(), resources });
-        return resources;
-      })
-      .finally(() => discoveryInflight.delete(cliName));
-    discoveryInflight.set(cliName, promise);
-    return promise;
-  }
-
-  // ---- row fetching (coalesced per cli+resource) --------------------------
-
-  const listInflight = new Map(); // "cli\0resource" -> Promise
-
-  async function fetchRows(cliName, resourceName) {
-    const cliCfg = config.clis[cliName];
-    const resources = await discoverResources(cliName);
-    if (!resources.some((r) => r.name === resourceName)) {
-      const err = new Error(`Unknown resource "${resourceName}" for CLI "${cliName}"`);
-      err.statusCode = 404;
-      throw err;
-    }
-    const key = `${cliName}\0${resourceName}`;
-    if (listInflight.has(key)) return listInflight.get(key);
-
-    // {resource} may appear as a whole arg or inside one (e.g. an ssh remote
-    // command). Safe either way — the value is allowlist-validated above.
-    const args = cliCfg.list.map((a) => a.replaceAll('{resource}', resourceName));
-    const promise = execCli(cliCfg, args, `${cliName} ${resourceName} list`)
-      .then((stdout) => {
-        const parsed = parseOutput(stdout, cliCfg.output ?? 'json');
-        const rows = unwrapPath(parsed, cliCfg.unwrap);
-        if (!Array.isArray(rows)) {
-          const err = new Error(`${cliName} ${resourceName}: expected an array of rows`);
-          err.raw = stdout;
-          throw err;
-        }
-        return rows;
-      })
-      .finally(() => listInflight.delete(key));
-    listInflight.set(key, promise);
-    return promise;
-  }
-
-  // ---- detail commands (drill-down: get, config-get, …) -------------------
-
-  const cmdInflight = new Map();
-  const ID_RE = /^[A-Za-z0-9:_.-]+$/; // ncl ids / uuids; no shell metas (and execFile never shells)
-
-  async function runCommand(cliName, cmdName, resourceName, id) {
-    const cliCfg = config.clis[cliName];
-    const template = cliCfg.commands?.[cmdName];
-    if (!template) {
-      const err = new Error(`Unknown command "${cmdName}"`);
-      err.statusCode = 404;
-      throw err;
-    }
-    const needsResource = template.includes('{resource}');
-    if (needsResource) {
-      const resources = await discoverResources(cliName);
-      if (!resources.some((r) => r.name === resourceName)) {
-        const err = new Error(`Unknown resource "${resourceName}"`);
-        err.statusCode = 404;
-        throw err;
-      }
-    }
-    if (template.includes('{id}') && !ID_RE.test(id ?? '')) {
-      const err = new Error('Invalid id');
-      err.statusCode = 400;
-      throw err;
-    }
-    const key = `${cliName}\0${cmdName}\0${resourceName}\0${id}`;
-    if (cmdInflight.has(key)) return cmdInflight.get(key);
-    const args = template.map((a) => a.replaceAll('{resource}', resourceName ?? '').replaceAll('{id}', id ?? ''));
-    const promise = execCli(cliCfg, args, `${cliName} ${cmdName}`)
-      .then((stdout) => unwrapPath(parseOutput(stdout, cliCfg.output ?? 'json'), cliCfg.unwrap))
-      .finally(() => cmdInflight.delete(key));
-    cmdInflight.set(key, promise);
-    return promise;
-  }
-
-  // ---- per-resource help (raw text from `<cli> <resource> help`) -----------
-
-  const helpInflight = new Map();
-  async function runHelp(cliName, resourceName) {
-    const cliCfg = config.clis[cliName];
-    if (!cliCfg.help) { const e = new Error(`No help for "${cliName}"`); e.statusCode = 404; throw e; }
-    const resources = await discoverResources(cliName);
-    if (!resources.some((r) => r.name === resourceName)) {
-      const e = new Error(`Unknown resource "${resourceName}"`); e.statusCode = 404; throw e;
-    }
-    const key = `${cliName}\0${resourceName}`;
-    if (helpInflight.has(key)) return helpInflight.get(key);
-    const args = cliCfg.help.map((a) => a.replaceAll('{resource}', resourceName));
-    const promise = execCli(cliCfg, args, `${cliName} ${resourceName} help`).finally(() => helpInflight.delete(key));
-    helpInflight.set(key, promise);
-    return promise;
-  }
-
-  // ---- view plugins --------------------------------------------------------
-
-  async function listViews(cliName) {
-    try {
-      const files = await readdir(viewsDir);
-      return files
-        .filter((f) => f.startsWith(`${cliName}-`) && f.endsWith('.js'))
-        .map((f) => f.slice(cliName.length + 1, -3));
-    } catch {
-      return [];
-    }
-  }
-
-  async function runView(cliName, viewName) {
-    if (!/^[a-zA-Z0-9_-]+$/.test(viewName)) {
-      const err = new Error(`Invalid view name`);
-      err.statusCode = 404;
-      throw err;
-    }
-    const file = join(viewsDir, `${cliName}-${viewName}.js`);
-    let mod;
-    try {
-      mod = await import(pathToFileURL(file).href);
-    } catch (e) {
-      if (e.code === 'ERR_MODULE_NOT_FOUND') {
-        const err = new Error(`No view "${viewName}" for CLI "${cliName}"`);
-        err.statusCode = 404;
-        throw err;
-      }
-      throw e;
-    }
-    return mod.default({ fetch: (resource) => fetchRows(cliName, resource) });
-  }
-
-  // ---- http ----------------------------------------------------------------
-
-  function sendJson(res, status, body) {
-    const payload = JSON.stringify(body);
-    res.writeHead(status, { 'Content-Type': 'application/json; charset=utf-8' });
-    res.end(payload);
-  }
-
-  function sendError(res, err) {
-    const status = err.statusCode ?? 502;
-    const body = { ok: false, error: err.message };
-    if (err.raw !== undefined) body.raw = String(err.raw).slice(0, 64 * 1024);
-    sendJson(res, status, body);
-  }
-
-  async function serveStatic(res, urlPath) {
-    const relative = urlPath === '/' ? 'index.html' : decodeURIComponent(urlPath.slice(1));
-    const file = resolve(publicDir, relative);
-    if (file !== publicDir && !file.startsWith(publicDir + sep)) {
-      sendJson(res, 403, { ok: false, error: 'Forbidden' });
-      return;
-    }
-    try {
-      const content = await readFile(file);
-      const ext = file.slice(file.lastIndexOf('.'));
-      // always revalidate so a redeploy is picked up immediately (no stale JS/CSS)
-      res.writeHead(200, { 'Content-Type': CONTENT_TYPES[ext] ?? 'application/octet-stream', 'Cache-Control': 'no-cache' });
-      res.end(content);
-    } catch {
-      sendJson(res, 404, { ok: false, error: 'Not found' });
-    }
-  }
-
-  return createServer(async (req, res) => {
-    try {
-      if (req.method !== 'GET') {
-        sendJson(res, 405, { ok: false, error: 'Read-only dashboard: GET only' });
-        return;
-      }
-      const urlPath = req.url.split('?')[0];
-      const segments = urlPath.split('/').map((s) => decodeURIComponent(s));
-
-      if (urlPath === '/api/clis') {
-        const clis = await Promise.all(Object.keys(config.clis).map(async (name) => {
-          const entry = {
-            name,
-            refreshSeconds: config.refreshSeconds,
-            views: await listViews(name),
-            commands: Object.keys(config.clis[name].commands ?? {}),
-            enrich: config.clis[name].enrich ?? null,
-            badges: config.clis[name].badges ?? null,
-            summary: config.clis[name].summary ?? null,
-            help: !!config.clis[name].help,
-          };
-          try {
-            entry.resources = await discoverResources(name);
-          } catch (e) {
-            // keep last good discovery (≤TTL old) if we have one; always surface the error
-            entry.resources = discoveryCache.get(name)?.resources ?? [];
-            entry.error = e.message;
-          }
-          return entry;
-        }));
-        sendJson(res, 200, { clis });
-        return;
-      }
-
-      if (segments[1] === 'api' && segments[2] === 'r' && segments.length === 5) {
-        const [, , , cliName, resourceName] = segments;
-        if (!config.clis[cliName]) {
-          sendJson(res, 404, { ok: false, error: `Unknown CLI "${cliName}"` });
-          return;
-        }
-        const rows = await fetchRows(cliName, resourceName);
-        const cliCfg = config.clis[cliName];
-        const command = displayCmd(cliCfg.bin, cliCfg.list.map((a) => a.replaceAll('{resource}', resourceName)));
-        sendJson(res, 200, { ok: true, rows, command, fetchedAt: new Date().toISOString() });
-        return;
-      }
-
-      if (segments[1] === 'api' && segments[2] === 'cmd' && segments.length === 5) {
-        const [, , , cliName, cmdName] = segments;
-        if (!config.clis[cliName]) {
-          sendJson(res, 404, { ok: false, error: `Unknown CLI "${cliName}"` });
-          return;
-        }
-        const q = new URL(req.url, 'http://localhost').searchParams;
-        const data = await runCommand(cliName, cmdName, q.get('resource'), q.get('id'));
-        const tmpl = config.clis[cliName].commands?.[cmdName] ?? [];
-        const command = displayCmd(config.clis[cliName].bin,
-          tmpl.map((a) => a.replaceAll('{resource}', q.get('resource') ?? '').replaceAll('{id}', q.get('id') ?? '')));
-        sendJson(res, 200, { ok: true, data, command, fetchedAt: new Date().toISOString() });
-        return;
-      }
-
-      if (segments[1] === 'api' && segments[2] === 'help' && segments.length === 5) {
-        const [, , , cliName, resourceName] = segments;
-        if (!config.clis[cliName]) {
-          sendJson(res, 404, { ok: false, error: `Unknown CLI "${cliName}"` });
-          return;
-        }
-        const text = await runHelp(cliName, resourceName);
-        sendJson(res, 200, { ok: true, text });
-        return;
-      }
-
-      if (segments[1] === 'api' && segments[2] === 'view' && segments.length === 5) {
-        const [, , , cliName, viewName] = segments;
-        if (!config.clis[cliName]) {
-          sendJson(res, 404, { ok: false, error: `Unknown CLI "${cliName}"` });
-          return;
-        }
-        const result = await runView(cliName, viewName);
-        sendJson(res, 200, { ok: true, result, fetchedAt: new Date().toISOString() });
-        return;
-      }
-
-      // Log tails (allowlisted files under logs.dir).
-      if (urlPath === '/api/logs') {
-        sendJson(res, 200, { files: (config.logs?.files ?? []).map((f) => ({ name: f.name, label: f.label ?? f.name })) });
-        return;
-      }
-      if (segments[1] === 'api' && segments[2] === 'log' && segments.length === 4) {
-        const name = segments[3];
-        const file = config.logs?.files?.find((f) => f.name === name);
-        if (!file) { sendJson(res, 404, { ok: false, error: `Unknown log "${name}"` }); return; }
-        const lines = config.logs.tailLines ?? 400;
-        const { text } = await tailFile(join(config.logs.dir, name), lines);
-        sendJson(res, 200, { ok: true, text, command: `tail -n ${lines} ${join(config.logs.dir, name)}`, fetchedAt: new Date().toISOString() });
-        return;
-      }
-
-      // Message activity (read per-session DBs; ncl has no messages resource).
-      if (urlPath === '/api/activity') {
-        if (!config.activity) { sendJson(res, 200, { ok: true, configured: false }); return; }
-        const days = config.activity.days ?? 14;
-        const { sessions, series } = collectActivity(config.activity.sessionsRoot, days, new Date());
-        const command = `node:sqlite · ${config.activity.sessionsRoot}/*/*/{inbound,outbound}.db (last ${days}d)`;
-        sendJson(res, 200, { ok: true, configured: true, sessions, series, command, fetchedAt: new Date().toISOString() });
-        return;
-      }
-
-      // Read-only file viewer (skills, CLAUDE.md, profiles, conversations).
-      if (urlPath === '/api/docs') {
-        const docs = config.docs;
-        const collections = (docs?.collections ?? []).map((coll) => ({
-          name: coll.name,
-          label: coll.label ?? coll.name,
-          lang: coll.lang ?? 'text',
-          files: globFiles(docs.root, coll.patterns, docs.deny ?? []).map((path) => ({
-            path,
-            ...describeFile(path),
-          })),
-        }));
-        sendJson(res, 200, { collections });
-        return;
-      }
-
-      if (urlPath === '/api/doc') {
-        const docs = config.docs;
-        const query = new URL(req.url, 'http://localhost').searchParams;
-        const collName = query.get('c');
-        const relPath = query.get('p') ?? '';
-        const collection = docs?.collections?.find((c) => c.name === collName);
-        if (!collection) {
-          sendJson(res, 404, { ok: false, error: `Unknown collection "${collName}"` });
-          return;
-        }
-        let abs;
-        try {
-          abs = resolveDoc(docs.root, collection, relPath, docs.deny ?? []);
-        } catch {
-          sendJson(res, 404, { ok: false, error: 'Not found' });
-          return;
-        }
-        const content = await readFile(abs, 'utf8');
-        sendJson(res, 200, {
-          ok: true,
-          path: relPath,
-          lang: collection.lang ?? 'text',
-          content: content.length > MAX_DOC_BYTES ? content.slice(0, MAX_DOC_BYTES) : content,
-        });
-        return;
-      }
-
-      if (urlPath.startsWith('/api/')) {
-        sendJson(res, 404, { ok: false, error: 'Not found' });
-        return;
-      }
-
-      await serveStatic(res, urlPath);
-    } catch (err) {
-      sendError(res, err);
-    }
-  });
-}
-
-// ---- standalone entry point ------------------------------------------------
-
-const isMain = process.argv[1] && import.meta.url === pathToFileURL(resolve(process.argv[1])).href;
-if (isMain) {
-  const configPath = process.env.CLIDASH_CONFIG ?? join(MODULE_DIR, 'clidash.config.json');
-  const config = JSON.parse(readFileSync(configPath, 'utf8'));
-  if (process.env.PORT) config.port = Number(process.env.PORT);
-  if (process.env.BIND) config.bind = process.env.BIND;
-  const finalConfig = { ...DEFAULTS, ...config };
-  const server = createApp(finalConfig);
-  server.listen(finalConfig.port, finalConfig.bind, () => {
-    console.log(`clidash listening on http://${finalConfig.bind}:${finalConfig.port}`);
-  });
-}

.claude/skills/add-clidash/add/tools/clidash/test/activity-server.test.js

@@ -1,46 +0,0 @@
-import { test, before, after } from 'node:test';
-import assert from 'node:assert/strict';
-import { mkdtempSync, mkdirSync, rmSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { DatabaseSync } from 'node:sqlite';
-import { createApp } from '../server.js';
-
-let root;
-before(() => {
-  root = mkdtempSync(join(tmpdir(), 'clidash-actsrv-'));
-  mkdirSync(join(root, 'ag-1', 'sess-1'), { recursive: true });
-  const mk = (p, t, ts) => { const db = new DatabaseSync(p); db.exec(`CREATE TABLE ${t}(id TEXT, timestamp TEXT)`); const i = db.prepare(`INSERT INTO ${t} VALUES (?,?)`); ts.forEach((x, n) => i.run(String(n), x)); db.close(); };
-  const today = new Date().toISOString().slice(0, 10);
-  mk(join(root, 'ag-1', 'sess-1', 'inbound.db'), 'messages_in', [`${today} 09:00:00`, `${today} 10:00:00`]);
-  mk(join(root, 'ag-1', 'sess-1', 'outbound.db'), 'messages_out', [`${today} 09:05:00`]);
-});
-after(() => rmSync(root, { recursive: true, force: true }));
-
-async function withServer(config, fn) {
-  const server = createApp({ port: 0, bind: '127.0.0.1', clis: {}, ...config });
-  await new Promise((r) => server.listen(0, '127.0.0.1', r));
-  const base = `http://127.0.0.1:${server.address().port}`;
-  try { return await fn(base); } finally { await new Promise((r) => server.close(r)); }
-}
-
-test('/api/activity: returns per-session totals + a daily series', async () => {
-  await withServer({ activity: { sessionsRoot: root, days: 14 } }, async (base) => {
-    const body = await (await fetch(`${base}/api/activity`)).json();
-    assert.equal(body.ok, true);
-    assert.equal(body.configured, true);
-    assert.equal(body.series.length, 14);
-    assert.equal(body.sessions[0].in, 2);
-    assert.equal(body.sessions[0].out, 1);
-    assert.equal(body.series.at(-1).in, 2); // today
-    assert.equal(body.series.at(-1).out, 1);
-  });
-});
-
-test('/api/activity: not configured → configured:false, no crash', async () => {
-  await withServer({}, async (base) => {
-    const body = await (await fetch(`${base}/api/activity`)).json();
-    assert.equal(body.ok, true);
-    assert.equal(body.configured, false);
-  });
-});

.claude/skills/add-clidash/add/tools/clidash/test/activity.test.js

@@ -1,75 +0,0 @@
-import { test, before, after } from 'node:test';
-import assert from 'node:assert/strict';
-import { mkdtempSync, mkdirSync, rmSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { DatabaseSync } from 'node:sqlite';
-import { collectActivity } from '../activity.js';
-
-let root;
-const NOW = new Date('2026-06-14T12:00:00Z');
-
-function makeDb(path, table, timestamps) {
-  const db = new DatabaseSync(path);
-  db.exec(`CREATE TABLE ${table} (id TEXT, timestamp TEXT)`);
-  const ins = db.prepare(`INSERT INTO ${table} (id, timestamp) VALUES (?, ?)`);
-  timestamps.forEach((t, i) => ins.run(String(i), t));
-  db.close();
-}
-
-before(() => {
-  root = mkdtempSync(join(tmpdir(), 'clidash-act-'));
-  // session 1 (group ag-1): 3 inbound across 2 days, 2 outbound today
-  mkdirSync(join(root, 'ag-1', 'sess-1'), { recursive: true });
-  makeDb(join(root, 'ag-1', 'sess-1', 'inbound.db'), 'messages_in',
-    ['2026-06-14 09:01:23', '2026-06-14 10:00:00', '2026-06-13 08:00:00']);
-  makeDb(join(root, 'ag-1', 'sess-1', 'outbound.db'), 'messages_out',
-    ['2026-06-14 09:05:00', '2026-06-14 10:05:00']);
-  // session 2 (group ag-2): 1 inbound 20 days ago (outside 14d window), 0 outbound
-  mkdirSync(join(root, 'ag-2', 'sess-2'), { recursive: true });
-  makeDb(join(root, 'ag-2', 'sess-2', 'inbound.db'), 'messages_in', ['2026-05-25 08:00:00']);
-  makeDb(join(root, 'ag-2', 'sess-2', 'outbound.db'), 'messages_out', []);
-});
-
-after(() => rmSync(root, { recursive: true, force: true }));
-
-test('collectActivity: per-session in/out totals + last activity', () => {
-  const { sessions } = collectActivity(root, 14, NOW);
-  const s1 = sessions.find((s) => s.session_id === 'sess-1');
-  assert.equal(s1.agent_group_id, 'ag-1');
-  assert.equal(s1.in, 3);
-  assert.equal(s1.out, 2);
-  assert.equal(s1.lastActivity, '2026-06-14T10:05:00Z'); // normalized to ISO
-  const s2 = sessions.find((s) => s.session_id === 'sess-2');
-  assert.equal(s2.in, 1);
-  assert.equal(s2.out, 0);
-});
-
-test('collectActivity: series has one bucket per day for `days`, newest last', () => {
-  const { series } = collectActivity(root, 14, NOW);
-  assert.equal(series.length, 14);
-  assert.equal(series[0].date, '2026-06-01');
-  assert.equal(series[13].date, '2026-06-14');
-});
-
-test('collectActivity: counts land in the right day buckets', () => {
-  const { series } = collectActivity(root, 14, NOW);
-  const byDate = Object.fromEntries(series.map((d) => [d.date, d]));
-  assert.equal(byDate['2026-06-14'].in, 2);
-  assert.equal(byDate['2026-06-14'].out, 2);
-  assert.equal(byDate['2026-06-13'].in, 1);
-  assert.equal(byDate['2026-06-13'].out, 0);
-});
-
-test('collectActivity: messages outside the window are counted in totals but not the series', () => {
-  const { series, sessions } = collectActivity(root, 14, NOW);
-  const total = series.reduce((a, d) => a + d.in + d.out, 0);
-  assert.equal(total, 5);              // the 20-day-old message is excluded from series
-  assert.equal(sessions.find((s) => s.session_id === 'sess-2').in, 1); // but still in the total count
-});
-
-test('collectActivity: a dir with no message DBs is not a session (skipped)', () => {
-  mkdirSync(join(root, 'ag-1', '.claude-shared'), { recursive: true }); // scaffolding, no db files
-  const { sessions } = collectActivity(root, 14, NOW);
-  assert.ok(!sessions.some((s) => s.session_id === '.claude-shared'));
-});

.claude/skills/add-clidash/add/tools/clidash/test/cmd.test.js

@@ -1,91 +0,0 @@
-import { test, after } from 'node:test';
-import assert from 'node:assert/strict';
-import { mkdtempSync, readFileSync, rmSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { createApp } from '../server.js';
-
-const STUB = fileURLToPath(new URL('./fixtures/stub-cli.js', import.meta.url));
-const tmp = mkdtempSync(join(tmpdir(), 'clidash-cmd-'));
-after(() => rmSync(tmp, { recursive: true, force: true }));
-
-function cli(extra = {}) {
-  return {
-    bin: process.execPath,
-    discover: { args: [STUB, 'help'], parser: 'ncl-help' },
-    list: [STUB, '{resource}', 'list', '--json'],
-    output: 'json',
-    unwrap: 'data',
-    commands: {
-      get: [STUB, '{resource}', 'get', '{id}', '--json'],
-      'config-get': [STUB, 'groups', 'config', 'get', '--id', '{id}', '--json'],
-    },
-    ...extra,
-  };
-}
-
-async function withServer(clis, fn, extra = {}) {
-  const server = createApp({ port: 0, bind: '127.0.0.1', execTimeoutMs: 2000, clis, ...extra });
-  await new Promise((r) => server.listen(0, '127.0.0.1', r));
-  const base = `http://127.0.0.1:${server.address().port}`;
-  try { return await fn(base); } finally { await new Promise((r) => server.close(r)); }
-}
-
-test('/api/cmd: runs an allowlisted command with {resource} + {id}', async () => {
-  await withServer({ ncl: cli() }, async (base) => {
-    const body = await (await fetch(`${base}/api/cmd/ncl/get?resource=sessions&id=sess-123`)).json();
-    assert.equal(body.ok, true);
-    assert.equal(body.data.id, 'sessions-detail');
-    assert.match(body.data.args, /sessions get sess-123/);
-  });
-});
-
-test('/api/cmd: config-get needs no resource', async () => {
-  await withServer({ ncl: cli() }, async (base) => {
-    const body = await (await fetch(`${base}/api/cmd/ncl/config-get?id=ag-1`)).json();
-    assert.equal(body.ok, true);
-    assert.match(body.data.args, /groups config get --id ag-1/);
-  });
-});
-
-test('/api/cmd: unknown command name → 404 (allowlist)', async () => {
-  await withServer({ ncl: cli() }, async (base) => {
-    const res = await fetch(`${base}/api/cmd/ncl/delete?resource=groups&id=ag-1`);
-    assert.equal(res.status, 404);
-  });
-});
-
-test('/api/cmd: a {resource} not in the discovered set is rejected without exec', async () => {
-  const countFile = join(tmp, 'cmd-count.txt');
-  const c = cli();
-  c.env = { STUB_COUNT_FILE: countFile };
-  await withServer({ ncl: c }, async (base) => {
-    const res = await fetch(`${base}/api/cmd/ncl/get?resource=evil&id=x`);
-    assert.equal(res.status, 404);
-    // only discovery ran, never a get for the bogus resource
-    const calls = readFileSync(countFile, 'utf8').trim().split('\n');
-    assert.deepEqual(calls, ['help']);
-  });
-});
-
-test('/api/cmd: an id with illegal characters is rejected', async () => {
-  await withServer({ ncl: cli() }, async (base) => {
-    const res = await fetch(`${base}/api/cmd/ncl/get?resource=sessions&id=${encodeURIComponent('a b;rm -rf')}`);
-    assert.equal(res.status, 400);
-  });
-});
-
-test('/api/cmd: unknown cli → 404', async () => {
-  await withServer({ ncl: cli() }, async (base) => {
-    assert.equal((await fetch(`${base}/api/cmd/nope/get?resource=sessions&id=x`)).status, 404);
-  });
-});
-
-test('/api/cmd: a cli without a commands map → 404', async () => {
-  const c = cli();
-  delete c.commands;
-  await withServer({ ncl: c }, async (base) => {
-    assert.equal((await fetch(`${base}/api/cmd/ncl/get?resource=sessions&id=x`)).status, 404);
-  });
-});

.claude/skills/add-clidash/add/tools/clidash/test/css.test.js

@@ -1,20 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
-import { fileURLToPath } from 'node:url';
-
-const css = readFileSync(fileURLToPath(new URL('../public/style.css', import.meta.url)), 'utf8');
-
-// Regression: the `hidden` attribute must override author `display` rules.
-// `.detail-overlay` and `.cli-switcher` set `display:flex`, which beats the
-// browser's default `[hidden]{display:none}` — without this reset a hidden
-// overlay stays on top of the page and silently eats every click.
-test('style.css forces [hidden] to display:none with !important', () => {
-  assert.match(css, /\[hidden\]\s*\{\s*display:\s*none\s*!important;?\s*\}/);
-});
-
-// Guard the premise: if these stop using display:flex the reset is less load-
-// bearing, but this documents WHY the reset exists.
-test('the overlays that motivated the reset still use display:flex', () => {
-  assert.match(css, /\.detail-overlay\s*\{[^}]*display:\s*flex/);
-});

.claude/skills/add-clidash/add/tools/clidash/test/docs-server.test.js

@@ -1,111 +0,0 @@
-import { test, before, after } from 'node:test';
-import assert from 'node:assert/strict';
-import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { createApp } from '../server.js';
-
-let root;
-
-before(() => {
-  root = mkdtempSync(join(tmpdir(), 'clidash-docsrv-'));
-  const w = (rel, body) => {
-    const abs = join(root, rel);
-    mkdirSync(join(abs, '..'), { recursive: true });
-    writeFileSync(abs, body);
-  };
-  w('groups/alpha/skills/tagger/SKILL.md', '# tagger\nhello');
-  w('container/skills/welcome/SKILL.md', '# welcome');
-  w('groups/alpha/profile.json', '{"name":"Alpha"}');
-  w('groups/alpha/.env', 'SECRET=nope');
-});
-
-after(() => rmSync(root, { recursive: true, force: true }));
-
-function docsConfig() {
-  return {
-    port: 0,
-    bind: '127.0.0.1',
-    clis: {},
-    docs: {
-      root,
-      deny: ['node_modules', '.env', '*token*', '*secret*', '*.pem', '*.key'],
-      collections: [
-        { name: 'skills', label: 'Skills', lang: 'markdown', patterns: ['groups/*/skills/*/SKILL.md', 'container/skills/*/SKILL.md'] },
-        { name: 'profiles', label: 'Profiles', lang: 'json', patterns: ['groups/*/profile.json'] },
-      ],
-    },
-  };
-}
-
-async function withServer(config, fn) {
-  const server = createApp(config);
-  await new Promise((r) => server.listen(0, '127.0.0.1', r));
-  const base = `http://127.0.0.1:${server.address().port}`;
-  try {
-    return await fn(base);
-  } finally {
-    await new Promise((r) => server.close(r));
-  }
-}
-
-test('/api/docs: lists collections with their files', async () => {
-  await withServer(docsConfig(), async (base) => {
-    const body = await (await fetch(`${base}/api/docs`)).json();
-    const skills = body.collections.find((c) => c.name === 'skills');
-    assert.equal(skills.label, 'Skills');
-    assert.equal(skills.lang, 'markdown');
-    const paths = skills.files.map((f) => f.path);
-    assert.ok(paths.includes('groups/alpha/skills/tagger/SKILL.md'));
-    assert.ok(paths.includes('container/skills/welcome/SKILL.md'));
-    // each file carries a readable label + group
-    const f = skills.files.find((x) => x.path.includes('tagger'));
-    assert.equal(f.group, 'alpha');
-    assert.match(f.label, /tagger/);
-  });
-});
-
-test('/api/doc: returns file content + lang', async () => {
-  await withServer(docsConfig(), async (base) => {
-    const url = `${base}/api/doc?c=skills&p=${encodeURIComponent('groups/alpha/skills/tagger/SKILL.md')}`;
-    const body = await (await fetch(url)).json();
-    assert.equal(body.ok, true);
-    assert.equal(body.lang, 'markdown');
-    assert.match(body.content, /# tagger/);
-  });
-});
-
-test('/api/doc: a denied file is not readable even though it sits under root', async () => {
-  await withServer(docsConfig(), async (base) => {
-    // .env is excluded by the deny-list and not in any collection pattern
-    const coll = docsConfig();
-    coll.docs.collections.push({ name: 'all', label: 'All', lang: 'text', patterns: ['groups/*/*'] });
-    await withServer(coll, async (base2) => {
-      const res = await fetch(`${base2}/api/doc?c=all&p=${encodeURIComponent('groups/alpha/.env')}`);
-      assert.equal(res.status, 404);
-      assert.equal((await res.json()).ok, false);
-    });
-  });
-});
-
-test('/api/doc: path traversal is rejected', async () => {
-  await withServer(docsConfig(), async (base) => {
-    const res = await fetch(`${base}/api/doc?c=skills&p=${encodeURIComponent('../../../../etc/passwd')}`);
-    assert.equal(res.status, 404);
-    assert.equal((await res.json()).ok, false);
-  });
-});
-
-test('/api/doc: unknown collection → 404', async () => {
-  await withServer(docsConfig(), async (base) => {
-    const res = await fetch(`${base}/api/doc?c=nope&p=x`);
-    assert.equal(res.status, 404);
-  });
-});
-
-test('/api/docs: absent docs config → empty collections, no crash', async () => {
-  await withServer({ port: 0, bind: '127.0.0.1', clis: {} }, async (base) => {
-    const body = await (await fetch(`${base}/api/docs`)).json();
-    assert.deepEqual(body.collections, []);
-  });
-});

.claude/skills/add-clidash/add/tools/clidash/test/docs.test.js

@@ -1,111 +0,0 @@
-import { test, before, after } from 'node:test';
-import assert from 'node:assert/strict';
-import { mkdtempSync, mkdirSync, writeFileSync, rmSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { globFiles, describeFile, resolveDoc } from '../docs.js';
-
-let root;
-
-before(() => {
-  root = mkdtempSync(join(tmpdir(), 'clidash-docs-'));
-  const w = (rel, body = 'x') => {
-    const abs = join(root, rel);
-    mkdirSync(join(abs, '..'), { recursive: true });
-    writeFileSync(abs, body);
-  };
-  w('groups/alpha/skills/example-skill/SKILL.md', '# example-skill\nbody');
-  w('groups/alpha/skills/tagger/SKILL.md');
-  w('groups/alpha/CLAUDE.md', '# Alpha');
-  w('groups/alpha/CLAUDE.local.md');
-  w('groups/alpha/profile.json', '{"name":"Alpha"}');
-  w('groups/alpha/conversations/2026-06-01.md');
-  w('groups/bravo/skills/tagger/SKILL.md');
-  w('groups/bravo/profile.json');
-  w('container/skills/agent-browser/SKILL.md');
-  w('container/skills/welcome/SKILL.md');
-  // things that must NEVER be served
-  w('groups/alpha/.env', 'SECRET=1');
-  w('groups/alpha/skills/example-skill/node_modules/dep/SKILL.md');
-  w('groups/alpha/notion-token.txt', 'ntn_xxx');
-});
-
-after(() => rmSync(root, { recursive: true, force: true }));
-
-const DENY = ['node_modules', '.env', '*token*', '*secret*', '*.pem', '*.key'];
-
-// --------------------------------------------------------------- globFiles
-
-test('globFiles: matches a nested *-segment pattern', () => {
-  const files = globFiles(root, ['groups/*/skills/*/SKILL.md'], DENY);
-  assert.deepEqual(files, [
-    'groups/alpha/skills/example-skill/SKILL.md',
-    'groups/alpha/skills/tagger/SKILL.md',
-    'groups/bravo/skills/tagger/SKILL.md',
-  ]);
-});
-
-test('globFiles: multiple patterns union, sorted', () => {
-  const files = globFiles(root, ['groups/*/skills/*/SKILL.md', 'container/skills/*/SKILL.md'], DENY);
-  assert.ok(files.includes('container/skills/agent-browser/SKILL.md'));
-  assert.ok(files.includes('groups/alpha/skills/example-skill/SKILL.md'));
-});
-
-test('globFiles: wildcard inside a filename segment', () => {
-  const files = globFiles(root, ['groups/*/CLAUDE*.md'], DENY);
-  assert.deepEqual(files, ['groups/alpha/CLAUDE.local.md', 'groups/alpha/CLAUDE.md']);
-});
-
-test('globFiles: deny list excludes node_modules and secret-ish files', () => {
-  const files = globFiles(root, ['groups/*/skills/*/**', 'groups/*/*'], DENY);
-  assert.ok(!files.some((f) => f.includes('node_modules')));
-  assert.ok(!files.some((f) => f.endsWith('.env')));
-  assert.ok(!files.some((f) => f.includes('token')));
-});
-
-test('globFiles: no match returns empty array', () => {
-  assert.deepEqual(globFiles(root, ['nope/*/x.md'], DENY), []);
-});
-
-// ------------------------------------------------------------- describeFile
-
-test('describeFile: per-group skill → group + readable label', () => {
-  const d = describeFile('groups/alpha/skills/tagger/SKILL.md');
-  assert.equal(d.group, 'alpha');
-  assert.match(d.label, /alpha/);
-  assert.match(d.label, /tagger/);
-});
-
-test('describeFile: container skill → shared', () => {
-  const d = describeFile('container/skills/agent-browser/SKILL.md');
-  assert.equal(d.group, 'shared');
-  assert.match(d.label, /agent-browser/);
-});
-
-// --------------------------------------------------------------- resolveDoc
-
-const SKILLS = { name: 'skills', patterns: ['groups/*/skills/*/SKILL.md', 'container/skills/*/SKILL.md'] };
-
-test('resolveDoc: returns an absolute path for an allowed file', () => {
-  const abs = resolveDoc(root, SKILLS, 'groups/alpha/skills/example-skill/SKILL.md', DENY);
-  assert.ok(abs.endsWith('/groups/alpha/skills/example-skill/SKILL.md'));
-  assert.ok(abs.startsWith(root));
-});
-
-test('resolveDoc: rejects a path not matching the collection patterns', () => {
-  assert.throws(() => resolveDoc(root, SKILLS, 'groups/alpha/profile.json', DENY), /not allowed/i);
-});
-
-test('resolveDoc: rejects path traversal', () => {
-  assert.throws(() => resolveDoc(root, SKILLS, '../../etc/passwd', DENY), /not allowed/i);
-  assert.throws(() => resolveDoc(root, SKILLS, 'groups/alpha/skills/../../../.env', DENY), /not allowed/i);
-});
-
-test('resolveDoc: rejects an absolute path', () => {
-  assert.throws(() => resolveDoc(root, SKILLS, '/etc/passwd', DENY), /not allowed/i);
-});
-
-test('resolveDoc: a denied file is not resolvable even if pattern-shaped', () => {
-  const coll = { name: 'all', patterns: ['groups/*/*'] };
-  assert.throws(() => resolveDoc(root, coll, 'groups/alpha/.env', DENY), /not allowed/i);
-});

.claude/skills/add-clidash/add/tools/clidash/test/fixtures/ncl-help.txt

@@ -1,28 +0,0 @@
-Resources:
-  approvals            Pending approval — in-flight approval cards waiting for an admin response. Created by requestApproval() (self-mod install_packages/add_mcp_server) and OneCLI credential approval flow. Rows are deleted after the admin approves/rejects or the request expires.
-                       verbs: list, get
-  destinations         Agent destination — per-agent routing entry and ACL. Each row authorizes an agent to send messages to a target (channel or another agent) and assigns a local name the agent uses to address it. Names are scoped to the source agent — two agents can have different local names for the same target. Created automatically when wiring channels or when agents create child agents.
-                       verbs: list, add, remove
-  dropped-messages     Dropped message log — tracks messages that were dropped by the router or access gate. Aggregates by (channel_type, platform_id) with a running count. Reasons include: no_agent_wired (no wiring exists), no_agent_engaged (wiring exists but engage rules didn't fire), unknown_sender_strict (sender not recognized, strict policy), unknown_sender_request_approval (sender not recognized, approval requested).
-                       verbs: list
-  groups               Agent group — a logical agent identity. Each group has its own workspace folder (CLAUDE.md, skills, container config), conversation history, and container image. Multiple messaging groups can be wired to one agent group.
-                       verbs: list, get, create, update, delete, restart, config get, config update, config add-mcp-server, config remove-mcp-server, config add-package, config remove-package
-  members              Agent group member — grants an unprivileged user permission to interact with an agent group. Users with admin or owner roles on the group are implicitly members and do not need a separate membership row. Membership is checked by the router when sender_scope is "known".
-                       verbs: list, add, remove
-  messaging-groups     Messaging group — one chat or channel on one platform (a Telegram DM, a Discord channel, a Slack thread root, an email address). Identity is the (channel_type, platform_id) pair, which must be unique.
-                       verbs: list, get, create, update, delete
-  roles                User role — privilege grant. "owner" is always global and has full control. "admin" can be global (agent_group_id null) or scoped to a specific agent group. Admin at a group implies membership. Approval routing prefers admins/owners reachable on the same messaging platform as the request origin (e.g. a Telegram request routes the approval card to an admin on Telegram when possible).
-                       verbs: list, grant, revoke
-  sessions             Session — the runtime unit. Maps one (agent_group, messaging_group, thread) combination to a container with its own inbound.db and outbound.db. Created automatically by the router when a message arrives.
-                       verbs: list, get
-  user-dms             User DM cache — maps (user, channel_type) to the messaging group used for DM delivery. Populated lazily by ensureUserDm() when the host needs to cold-DM a user (approvals, pairing). For direct-addressable channels (Telegram, WhatsApp) the handle IS the DM chat ID. For resolution-required channels (Discord, Slack) the adapter's openDM resolves it.
-                       verbs: list
-  users                User — a messaging-platform identity. Each row is one sender on one channel. A single human may have multiple user rows across channels (no cross-channel linking yet).
-                       verbs: list, get, create, update
-  wirings              Wiring — connects a messaging group to an agent group. Determines which agent handles messages from which chat. The same messaging group can be wired to multiple agents; the same agent can be wired to multiple messaging groups.
-                       verbs: list, get, create, update, delete
-
-Commands:
-  help                 List available resources and commands.
-
-Run `ncl <resource> help` for detailed field information.

.claude/skills/add-clidash/add/tools/clidash/test/fixtures/stub-cli.js

@@ -1,57 +0,0 @@
-#!/usr/bin/env node
-// Stub CLI for clidash tests. Impersonates ncl (envelope json) or a
-// jsonlines CLI, with failure/slowness/garbage modes driven by env vars.
-import { readFileSync, appendFileSync } from 'node:fs';
-import { fileURLToPath } from 'node:url';
-
-const args = process.argv.slice(2);
-
-if (process.env.STUB_COUNT_FILE) {
-  appendFileSync(process.env.STUB_COUNT_FILE, args.join(' ') + '\n');
-}
-
-const sleepMs = Number(process.env.STUB_SLEEP_MS || 0);
-
-setTimeout(() => {
-  if (process.env.STUB_FAIL) {
-    process.stderr.write('boom: socket down\n');
-    process.exit(2);
-  }
-  if (args[0] === 'help') {
-    process.stdout.write(
-      readFileSync(fileURLToPath(new URL('./ncl-help.txt', import.meta.url)), 'utf8'),
-    );
-    process.exit(0);
-  }
-  if (args[1] === 'help') { // `<resource> help` → raw per-resource help text
-    process.stdout.write(`${args[0]}: help for ${args[0]}\n\nVerbs:\n  list\n  get <id>\n`);
-    process.exit(0);
-  }
-  if (process.env.STUB_RAW) {
-    process.stdout.write(process.env.STUB_RAW + '\n');
-    process.exit(0);
-  }
-  const resource = args[0];
-  // `get`/detail commands → single-object envelope
-  if (args.includes('get') || args.includes('config')) {
-    process.stdout.write(JSON.stringify({
-      id: 'req-1', ok: true,
-      data: { id: `${resource}-detail`, args: args.join(' '), extra: 'field' },
-    }) + '\n');
-    process.exit(0);
-  }
-  if (process.env.STUB_JSONLINES) {
-    process.stdout.write(JSON.stringify({ id: `${resource}-1`, name: 'row one' }) + '\n');
-    process.stdout.write(JSON.stringify({ id: `${resource}-2`, name: 'row two' }) + '\n');
-    process.exit(0);
-  }
-  process.stdout.write(JSON.stringify({
-    id: 'req-1',
-    ok: true,
-    data: [
-      { id: `${resource}-1`, name: 'row one' },
-      { id: `${resource}-2`, name: 'row two' },
-    ],
-  }) + '\n');
-  process.exit(0);
-}, sleepMs);

.claude/skills/add-clidash/add/tools/clidash/test/help.test.js

@@ -1,61 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { fileURLToPath } from 'node:url';
-import { createApp } from '../server.js';
-
-const STUB = fileURLToPath(new URL('./fixtures/stub-cli.js', import.meta.url));
-
-function cli(extra = {}) {
-  return {
-    bin: process.execPath,
-    discover: { args: [STUB, 'help'], parser: 'ncl-help' },
-    list: [STUB, '{resource}', 'list', '--json'],
-    output: 'json', unwrap: 'data',
-    help: [STUB, '{resource}', 'help'],
-    ...extra,
-  };
-}
-
-async function withServer(clis, fn) {
-  const server = createApp({ port: 0, bind: '127.0.0.1', execTimeoutMs: 2000, clis });
-  await new Promise((r) => server.listen(0, '127.0.0.1', r));
-  const base = `http://127.0.0.1:${server.address().port}`;
-  try { return await fn(base); } finally { await new Promise((r) => server.close(r)); }
-}
-
-test('/api/help: returns raw per-resource help text', async () => {
-  await withServer({ ncl: cli() }, async (base) => {
-    const body = await (await fetch(`${base}/api/help/ncl/sessions`)).json();
-    assert.equal(body.ok, true);
-    assert.match(body.text, /sessions: help for sessions/);
-    assert.match(body.text, /Verbs:/);
-  });
-});
-
-test('/api/help: undiscovered resource → 404', async () => {
-  await withServer({ ncl: cli() }, async (base) => {
-    assert.equal((await fetch(`${base}/api/help/ncl/evil`)).status, 404);
-  });
-});
-
-test('/api/help: a cli without a help template → 404', async () => {
-  const c = cli(); delete c.help;
-  await withServer({ ncl: c }, async (base) => {
-    assert.equal((await fetch(`${base}/api/help/ncl/sessions`)).status, 404);
-  });
-});
-
-test('/api/help: unknown cli → 404', async () => {
-  await withServer({ ncl: cli() }, async (base) => {
-    assert.equal((await fetch(`${base}/api/help/nope/sessions`)).status, 404);
-  });
-});
-
-test('/api/clis: reports help availability per cli', async () => {
-  const noHelp = cli(); delete noHelp.help;
-  await withServer({ ncl: cli(), docker: noHelp }, async (base) => {
-    const body = await (await fetch(`${base}/api/clis`)).json();
-    assert.equal(body.clis.find((c) => c.name === 'ncl').help, true);
-    assert.equal(body.clis.find((c) => c.name === 'docker').help, false);
-  });
-});

.claude/skills/add-clidash/add/tools/clidash/test/logs.test.js

@@ -1,75 +0,0 @@
-import { test, before, after } from 'node:test';
-import assert from 'node:assert/strict';
-import { mkdtempSync, writeFileSync, rmSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { tailFile } from '../logs.js';
-import { createApp } from '../server.js';
-
-let dir;
-before(() => {
-  dir = mkdtempSync(join(tmpdir(), 'clidash-logs-'));
-  // 10 lines, some with ANSI color codes
-  const lines = Array.from({ length: 10 }, (_, i) =>
-    `[12:00:0${i}] \x1b[32mINFO\x1b[39m line ${i}`);
-  writeFileSync(join(dir, 'app.log'), lines.join('\n') + '\n');
-  writeFileSync(join(dir, 'error.log'), 'boom\n');
-});
-after(() => rmSync(dir, { recursive: true, force: true }));
-
-test('tailFile: returns the last N lines, ANSI stripped, no trailing blank', async () => {
-  const { lines, text } = await tailFile(join(dir, 'app.log'), 3);
-  assert.equal(lines.length, 3);
-  assert.deepEqual(lines, ['[12:00:07] INFO line 7', '[12:00:08] INFO line 8', '[12:00:09] INFO line 9']);
-  assert.ok(!text.includes('\x1b'));
-});
-
-test('tailFile: maxLines larger than file returns all lines', async () => {
-  const { lines } = await tailFile(join(dir, 'app.log'), 100);
-  assert.equal(lines.length, 10);
-});
-
-// ---- server endpoints ----
-
-function cfg() {
-  return {
-    port: 0, bind: '127.0.0.1', clis: {},
-    logs: { dir, tailLines: 5, files: [{ name: 'app.log', label: 'app' }, { name: 'error.log', label: 'errors' }] },
-  };
-}
-async function withServer(config, fn) {
-  const server = createApp(config);
-  await new Promise((r) => server.listen(0, '127.0.0.1', r));
-  const base = `http://127.0.0.1:${server.address().port}`;
-  try { return await fn(base); } finally { await new Promise((r) => server.close(r)); }
-}
-
-test('/api/logs: lists the configured log files', async () => {
-  await withServer(cfg(), async (base) => {
-    const body = await (await fetch(`${base}/api/logs`)).json();
-    assert.deepEqual(body.files.map((f) => f.name), ['app.log', 'error.log']);
-  });
-});
-
-test('/api/logs: absent logs config → empty list', async () => {
-  await withServer({ port: 0, bind: '127.0.0.1', clis: {} }, async (base) => {
-    assert.deepEqual((await (await fetch(`${base}/api/logs`)).json()).files, []);
-  });
-});
-
-test('/api/log: returns the tail text + a tail command', async () => {
-  await withServer(cfg(), async (base) => {
-    const body = await (await fetch(`${base}/api/log/app.log`)).json();
-    assert.equal(body.ok, true);
-    assert.match(body.text, /line 9$/);
-    assert.equal(body.text.split('\n').length, 5); // tailLines
-    assert.match(body.command, /tail -n 5 .*app\.log/);
-  });
-});
-
-test('/api/log: a name not in the allowlist is rejected (no traversal)', async () => {
-  await withServer(cfg(), async (base) => {
-    assert.equal((await fetch(`${base}/api/log/${encodeURIComponent('../../etc/passwd')}`)).status, 404);
-    assert.equal((await fetch(`${base}/api/log/secrets.log`)).status, 404);
-  });
-});

.claude/skills/add-clidash/add/tools/clidash/test/md.test.js

@@ -1,63 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { escapeHtml, mdToHtml } from '../public/md.js';
-
-// ---- escaping -------------------------------------------------------------
-
-test('escapeHtml: neutralizes all HTML metacharacters', () => {
-  assert.equal(escapeHtml(`<script>"&'`), '&lt;script&gt;&quot;&amp;&#39;');
-});
-
-test('mdToHtml: raw HTML in source is escaped, never passed through', () => {
-  const html = mdToHtml('a <script>alert(1)</script> b');
-  assert.ok(!html.includes('<script>'));
-  assert.ok(html.includes('&lt;script&gt;'));
-});
-
-// ---- the security-sensitive part: links -----------------------------------
-
-test('mdToHtml: link href comes from the URL, label from the text', () => {
-  const html = mdToHtml('see [the docs](https://example.com/x)');
-  assert.match(html, /<a href="https:\/\/example\.com\/x" target="_blank" rel="noopener noreferrer">the docs<\/a>/);
-});
-
-test('mdToHtml: javascript: smuggled in link TEXT stays inert (never an href)', () => {
-  const html = mdToHtml('[javascript:alert(1)](https://safe.com)');
-  // href is the safe URL; the js string is only visible label text
-  assert.match(html, /href="https:\/\/safe\.com"/);
-  assert.ok(!/href="javascript:/i.test(html));
-});
-
-test('mdToHtml: a non-http(s) URL is not turned into a link', () => {
-  // javascript:/data: never match the (https?:...) capture, so the literal
-  // (escaped) markdown is left as-is — no anchor, no executable href.
-  const html = mdToHtml('[click](javascript:alert(1))');
-  assert.ok(!/<a /.test(html));
-  assert.ok(!/href="javascript:/i.test(html));
-});
-
-test('mdToHtml: an attribute-breakout attempt in the URL cannot escape the href', () => {
-  // The double-quote is escaped to &quot; before the regex runs, so it can never
-  // close an attribute. (Here the URL also has a space, so no anchor even forms.)
-  // The security property: no REAL attribute (with a literal quote) is injected.
-  const html = mdToHtml('[x](https://a" onmouseover="alert(1))');
-  assert.ok(!/<a/.test(html), 'malformed link must not produce an anchor');
-  assert.ok(!/onmouseover="/.test(html), 'no real (unescaped-quote) attribute injected');
-});
-
-test('mdToHtml: an escaped quote inside a matched URL stays inside the href, inert', () => {
-  // Even when a URL matches, any " in it is already &quot; (an entity), which
-  // does not terminate an HTML attribute value — so no breakout.
-  const html = mdToHtml('[x](https://a"onmouseover=alert)');
-  assert.ok(!/onmouseover="/.test(html));
-  if (/<a/.test(html)) assert.match(html, /href="https:\/\/a&quot;onmouseover=alert"/);
-});
-
-// ---- basic rendering sanity ----------------------------------------------
-
-test('mdToHtml: headings, code fences, lists render', () => {
-  const html = mdToHtml('# Title\n\n```\ncode\n```\n\n- a\n- b');
-  assert.match(html, /<h1>Title<\/h1>/);
-  assert.match(html, /<pre class="code"><code>code<\/code><\/pre>/);
-  assert.match(html, /<ul><li>a<\/li><li>b<\/li><\/ul>/);
-});

.claude/skills/add-clidash/add/tools/clidash/test/ncl-overview.test.js

@@ -1,70 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import overview from '../views/ncl-overview.js';
-
-const minutesAgo = (m) => new Date(Date.now() - m * 60_000).toISOString();
-
-// Shapes mirror real `ncl <resource> list --json` output.
-function makeFixtures({ alphaLastActive, bravoLastActive }) {
-  return {
-    groups: [
-      { id: 'ag-1', name: 'Alpha', folder: 'alpha', created_at: '2026-05-31T11:14:48.793Z' },
-      { id: 'ag-2', name: 'Bravo Team', folder: 'bravo', created_at: '2026-05-31T11:14:48.796Z' },
-      { id: 'ag-3', name: 'Orphan', folder: 'orphan', created_at: '2026-05-31T11:14:48.799Z' },
-    ],
-    sessions: [
-      { id: 'sess-1', agent_group_id: 'ag-1', messaging_group_id: 'mg-1', thread_id: null, status: 'active', container_status: 'stopped', last_active: alphaLastActive, created_at: '2026-05-31T11:14:51.911Z' },
-      { id: 'sess-2', agent_group_id: 'ag-2', messaging_group_id: 'mg-2', thread_id: null, status: 'active', container_status: 'running', last_active: bravoLastActive, created_at: '2026-05-31T11:14:51.973Z' },
-    ],
-    'messaging-groups': [
-      { id: 'mg-1', channel_type: 'telegram', platform_id: 'telegram:1', name: 'Alpha', is_group: 0 },
-      { id: 'mg-2', channel_type: 'telegram', platform_id: 'telegram:2', name: 'Bravo Team', is_group: 0 },
-    ],
-    wirings: [
-      { id: 'mga-1', messaging_group_id: 'mg-1', agent_group_id: 'ag-1', session_mode: 'shared' },
-      { id: 'mga-2', messaging_group_id: 'mg-2', agent_group_id: 'ag-2', session_mode: 'shared' },
-    ],
-  };
-}
-
-function fetchFrom(fixtures) {
-  return async (resource) => {
-    if (!(resource in fixtures)) throw new Error(`unexpected fetch: ${resource}`);
-    return fixtures[resource];
-  };
-}
-
-test('overview: one card per agent group with joined session + wiring data', async () => {
-  const fixtures = makeFixtures({ alphaLastActive: minutesAgo(5), bravoLastActive: minutesAgo(30) });
-  const result = await overview({ fetch: fetchFrom(fixtures) });
-  assert.equal(result.cards.length, 3);
-
-  const alpha = result.cards.find((c) => c.title === 'Alpha');
-  assert.equal(alpha.subtitle, 'alpha');
-  assert.equal(alpha.fields.container, 'stopped');
-  assert.equal(alpha.fields.sessions, 1);
-  assert.deepEqual(alpha.badges, ['telegram: Alpha']);
-
-  const bravo = result.cards.find((c) => c.title === 'Bravo Team');
-  assert.equal(bravo.fields.container, 'running');
-  assert.deepEqual(bravo.badges, ['telegram: Bravo Team']);
-});
-
-test('overview: staleness thresholds — green <15m, amber <2h, red older, gray never', async () => {
-  const fixtures = makeFixtures({ alphaLastActive: minutesAgo(5), bravoLastActive: minutesAgo(30) });
-  const result = await overview({ fetch: fetchFrom(fixtures) });
-  assert.equal(result.cards.find((c) => c.title === 'Alpha').status, 'green');
-  assert.equal(result.cards.find((c) => c.title === 'Bravo Team').status, 'amber');
-  assert.equal(result.cards.find((c) => c.title === 'Orphan').status, 'gray');
-
-  const stale = makeFixtures({ alphaLastActive: minutesAgo(300), bravoLastActive: minutesAgo(30) });
-  const result2 = await overview({ fetch: fetchFrom(stale) });
-  assert.equal(result2.cards.find((c) => c.title === 'Alpha').status, 'red');
-});
-
-test('overview: last_active is exposed for relative-time rendering', async () => {
-  const ts = minutesAgo(5);
-  const fixtures = makeFixtures({ alphaLastActive: ts, bravoLastActive: minutesAgo(30) });
-  const result = await overview({ fetch: fetchFrom(fixtures) });
-  assert.equal(result.cards.find((c) => c.title === 'Alpha').fields['last active'], ts);
-});

.claude/skills/add-clidash/add/tools/clidash/test/parsers.test.js

@@ -1,111 +0,0 @@
-import { test } from 'node:test';
-import assert from 'node:assert/strict';
-import { readFileSync } from 'node:fs';
-import { fileURLToPath } from 'node:url';
-import { discoveryParsers, parseOutput, unwrapPath } from '../parsers.js';
-
-const fixture = readFileSync(
-  fileURLToPath(new URL('./fixtures/ncl-help.txt', import.meta.url)),
-  'utf8',
-);
-
-// ---------------------------------------------------------------- ncl-help
-
-test('ncl-help: parses all listable resources from real captured output', () => {
-  const resources = discoveryParsers['ncl-help'](fixture);
-  assert.deepEqual(
-    resources.map((r) => r.name),
-    [
-      'approvals', 'destinations', 'dropped-messages', 'groups', 'members',
-      'messaging-groups', 'roles', 'sessions', 'user-dms', 'users', 'wirings',
-    ],
-  );
-});
-
-test('ncl-help: every parsed resource has a non-empty description and a list verb', () => {
-  const resources = discoveryParsers['ncl-help'](fixture);
-  for (const r of resources) {
-    assert.ok(r.description.length > 0, `${r.name} has empty description`);
-    assert.ok(r.verbs.includes('list'), `${r.name} missing list verb`);
-  }
-});
-
-test('ncl-help: parses verbs correctly, including multi-word verbs', () => {
-  const resources = discoveryParsers['ncl-help'](fixture);
-  const groups = resources.find((r) => r.name === 'groups');
-  assert.deepEqual(groups.verbs, [
-    'list', 'get', 'create', 'update', 'delete', 'restart',
-    'config get', 'config update', 'config add-mcp-server',
-    'config remove-mcp-server', 'config add-package', 'config remove-package',
-  ]);
-});
-
-test('ncl-help: excludes resources without a list verb', () => {
-  const input = [
-    'Resources:',
-    '  alpha                Has list.',
-    '                       verbs: list, get',
-    '  beta                 No list here.',
-    '                       verbs: grant, revoke',
-    '',
-  ].join('\n');
-  const resources = discoveryParsers['ncl-help'](input);
-  assert.deepEqual(resources.map((r) => r.name), ['alpha']);
-});
-
-test('ncl-help: ignores the Commands section (help is not a resource)', () => {
-  const resources = discoveryParsers['ncl-help'](fixture);
-  assert.ok(!resources.some((r) => r.name === 'help'));
-});
-
-test('ncl-help: throws loudly on unrecognized format', () => {
-  assert.throws(() => discoveryParsers['ncl-help']('totally not help output'), /Resources/);
-  assert.throws(() => discoveryParsers['ncl-help'](''), /Resources/);
-});
-
-// ------------------------------------------------------------- parseOutput
-
-test('parseOutput json: parses a single document', () => {
-  assert.deepEqual(parseOutput('{"a": 1}', 'json'), { a: 1 });
-});
-
-test('parseOutput json: throws on malformed input with raw output preserved', () => {
-  assert.throws(() => parseOutput('not json', 'json'), (err) => {
-    assert.match(err.message, /JSON/i);
-    assert.equal(err.raw, 'not json');
-    return true;
-  });
-});
-
-test('parseOutput jsonlines: one object per line, blank lines skipped', () => {
-  const text = '{"id":1}\n\n{"id":2}\n{"id":3}\n';
-  assert.deepEqual(parseOutput(text, 'jsonlines'), [{ id: 1 }, { id: 2 }, { id: 3 }]);
-});
-
-test('parseOutput jsonlines: throws on a malformed line', () => {
-  assert.throws(() => parseOutput('{"ok":1}\ngarbage\n', 'jsonlines'), /line 2/i);
-});
-
-test('parseOutput: rejects unknown format', () => {
-  assert.throws(() => parseOutput('{}', 'xml'), /format/i);
-});
-
-// -------------------------------------------------------------- unwrapPath
-
-test('unwrapPath: extracts the ncl {id, ok, data} envelope', () => {
-  const doc = { id: 'x', ok: true, data: [{ id: 'sess-1' }] };
-  assert.deepEqual(unwrapPath(doc, 'data'), [{ id: 'sess-1' }]);
-});
-
-test('unwrapPath: supports nested dot paths', () => {
-  assert.deepEqual(unwrapPath({ a: { b: [1, 2] } }, 'a.b'), [1, 2]);
-});
-
-test('unwrapPath: throws when the path is missing', () => {
-  assert.throws(() => unwrapPath({ ok: true }, 'data'), /data/);
-});
-
-test('unwrapPath: no path returns the value unchanged', () => {
-  const rows = [{ id: 1 }];
-  assert.equal(unwrapPath(rows, undefined), rows);
-});

.claude/skills/add-clidash/add/tools/clidash/test/server.test.js

@@ -1,240 +0,0 @@
-import { test, before, after } from 'node:test';
-import assert from 'node:assert/strict';
-import { mkdtempSync, writeFileSync, readFileSync, rmSync } from 'node:fs';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { createApp } from '../server.js';
-
-const STUB = fileURLToPath(new URL('./fixtures/stub-cli.js', import.meta.url));
-const tmp = mkdtempSync(join(tmpdir(), 'clidash-test-'));
-
-function stubCli(extra = {}) {
-  return {
-    bin: process.execPath,
-    discover: { args: [STUB, 'help'], parser: 'ncl-help' },
-    list: [STUB, '{resource}', 'list', '--json'],
-    output: 'json',
-    unwrap: 'data',
-    ...extra,
-  };
-}
-
-function makeConfig(clis, extra = {}) {
-  return { port: 0, bind: '127.0.0.1', execTimeoutMs: 2000, refreshSeconds: 10, clis, ...extra };
-}
-
-async function withServer(config, fn) {
-  const server = createApp(config);
-  await new Promise((resolve) => server.listen(0, '127.0.0.1', resolve));
-  const base = `http://127.0.0.1:${server.address().port}`;
-  try {
-    return await fn(base);
-  } finally {
-    await new Promise((resolve) => server.close(resolve));
-  }
-}
-
-after(() => rmSync(tmp, { recursive: true, force: true }));
-
-// ----------------------------------------------------------------- /api/clis
-
-test('/api/clis: lists configured CLIs with discovered resources', async () => {
-  await withServer(makeConfig({ stub: stubCli() }), async (base) => {
-    const res = await fetch(`${base}/api/clis`);
-    assert.equal(res.status, 200);
-    const body = await res.json();
-    assert.equal(body.clis.length, 1);
-    assert.equal(body.clis[0].name, 'stub');
-    assert.equal(body.clis[0].refreshSeconds, 10);
-    const names = body.clis[0].resources.map((r) => r.name);
-    assert.ok(names.includes('sessions'));
-    assert.ok(names.includes('groups'));
-    assert.equal(names.length, 11);
-  });
-});
-
-test('/api/clis: static resource list needs no discovery', async () => {
-  const cli = stubCli({ resources: ['alpha', 'beta'] });
-  delete cli.discover;
-  await withServer(makeConfig({ stub: cli }), async (base) => {
-    const body = await (await fetch(`${base}/api/clis`)).json();
-    assert.deepEqual(body.clis[0].resources.map((r) => r.name), ['alpha', 'beta']);
-  });
-});
-
-test('/api/clis: discovery failure reports a loud error', async () => {
-  const cli = stubCli();
-  cli.env = { STUB_FAIL: '1' };
-  await withServer(makeConfig({ stub: cli }), async (base) => {
-    const body = await (await fetch(`${base}/api/clis`)).json();
-    assert.equal(body.clis[0].resources.length, 0);
-    assert.match(body.clis[0].error, /boom/);
-  });
-});
-
-// ------------------------------------------------------------ /api/r/cli/res
-
-test('/api/r: returns unwrapped rows with fetchedAt', async () => {
-  await withServer(makeConfig({ stub: stubCli() }), async (base) => {
-    const res = await fetch(`${base}/api/r/stub/sessions`);
-    assert.equal(res.status, 200);
-    const body = await res.json();
-    assert.equal(body.ok, true);
-    assert.deepEqual(body.rows.map((r) => r.id), ['sessions-1', 'sessions-2']);
-    assert.ok(body.fetchedAt);
-  });
-});
-
-test('/api/r: rejects a resource not in the discovered set without exec', async () => {
-  const countFile = join(tmp, 'count-reject.txt');
-  const cli = stubCli();
-  cli.env = { STUB_COUNT_FILE: countFile };
-  await withServer(makeConfig({ stub: cli }), async (base) => {
-    const res = await fetch(`${base}/api/r/stub/evil%20--rm`);
-    assert.equal(res.status, 404);
-    const body = await res.json();
-    assert.equal(body.ok, false);
-    // only the discovery exec ran — never a list exec for the bogus resource
-    const calls = readFileSync(countFile, 'utf8').trim().split('\n');
-    assert.deepEqual(calls, ['help']);
-  });
-});
-
-test('/api/r: unknown cli → 404', async () => {
-  await withServer(makeConfig({ stub: stubCli() }), async (base) => {
-    const res = await fetch(`${base}/api/r/nope/sessions`);
-    assert.equal(res.status, 404);
-  });
-});
-
-test('/api/r: jsonlines CLI with static resources works', async () => {
-  const cli = {
-    bin: process.execPath,
-    resources: ['ps'],
-    list: [STUB, '{resource}'],
-    output: 'jsonlines',
-    env: { STUB_JSONLINES: '1' },
-  };
-  await withServer(makeConfig({ docker: cli }), async (base) => {
-    const body = await (await fetch(`${base}/api/r/docker/ps`)).json();
-    assert.equal(body.ok, true);
-    assert.deepEqual(body.rows.map((r) => r.id), ['ps-1', 'ps-2']);
-  });
-});
-
-test('/api/r: exec failure returns ok:false with stderr', async () => {
-  const cli = stubCli({ resources: ['sessions'] });
-  delete cli.discover;
-  cli.env = { STUB_FAIL: '1' };
-  await withServer(makeConfig({ stub: cli }), async (base) => {
-    const res = await fetch(`${base}/api/r/stub/sessions`);
-    assert.equal(res.status, 502);
-    const body = await res.json();
-    assert.equal(body.ok, false);
-    assert.match(body.error, /boom: socket down/);
-  });
-});
-
-test('/api/r: exec timeout returns ok:false naming the resource', async () => {
-  const cli = stubCli({ resources: ['sessions'] });
-  delete cli.discover;
-  cli.env = { STUB_SLEEP_MS: '5000' };
-  await withServer(makeConfig({ stub: cli }, { execTimeoutMs: 200 }), async (base) => {
-    const body = await (await fetch(`${base}/api/r/stub/sessions`)).json();
-    assert.equal(body.ok, false);
-    assert.match(body.error, /sessions/);
-    assert.match(body.error, /timed out/i);
-  });
-});
-
-test('/api/r: malformed CLI output returns the raw output', async () => {
-  const cli = stubCli({ resources: ['sessions'] });
-  delete cli.discover;
-  cli.env = { STUB_RAW: 'this is not json' };
-  await withServer(makeConfig({ stub: cli }), async (base) => {
-    const body = await (await fetch(`${base}/api/r/stub/sessions`)).json();
-    assert.equal(body.ok, false);
-    assert.match(body.raw, /this is not json/);
-  });
-});
-
-test('/api/r: concurrent requests for the same resource coalesce into one exec', async () => {
-  const countFile = join(tmp, 'count-coalesce.txt');
-  const cli = stubCli({ resources: ['sessions'] });
-  delete cli.discover;
-  cli.env = { STUB_COUNT_FILE: countFile, STUB_SLEEP_MS: '150' };
-  await withServer(makeConfig({ stub: cli }), async (base) => {
-    const bodies = await Promise.all(
-      Array.from({ length: 5 }, () => fetch(`${base}/api/r/stub/sessions`).then((r) => r.json())),
-    );
-    for (const body of bodies) assert.equal(body.ok, true);
-    const calls = readFileSync(countFile, 'utf8').trim().split('\n');
-    assert.equal(calls.length, 1);
-  });
-});
-
-// ------------------------------------------------------------- /api/view
-
-test('/api/view: runs a view plugin with a bound fetch helper', async () => {
-  const viewsDir = join(tmp, 'views');
-  writeFileSync(join(viewsDir, '..', 'placeholder'), ''); // ensure tmp exists
-  const { mkdirSync } = await import('node:fs');
-  mkdirSync(viewsDir, { recursive: true });
-  writeFileSync(
-    join(viewsDir, 'stub-overview.js'),
-    'export default async function ({ fetch }) {\n' +
-    '  const rows = await fetch("sessions");\n' +
-    '  return { count: rows.length, first: rows[0].id };\n' +
-    '}\n',
-  );
-  await withServer(makeConfig({ stub: stubCli() }, { viewsDir }), async (base) => {
-    const res = await fetch(`${base}/api/view/stub/overview`);
-    assert.equal(res.status, 200);
-    const body = await res.json();
-    assert.equal(body.ok, true);
-    assert.deepEqual(body.result, { count: 2, first: 'sessions-1' });
-  });
-});
-
-test('/api/view: missing view → 404; bad view name → 404', async () => {
-  await withServer(makeConfig({ stub: stubCli() }, { viewsDir: join(tmp, 'views') }), async (base) => {
-    assert.equal((await fetch(`${base}/api/view/stub/nope`)).status, 404);
-    assert.equal((await fetch(`${base}/api/view/stub/..%2F..%2Fserver`)).status, 404);
-  });
-});
-
-// ------------------------------------------------------------- static files
-
-test('GET /: serves the dashboard index.html', async () => {
-  await withServer(makeConfig({ stub: stubCli() }), async (base) => {
-    const res = await fetch(`${base}/`);
-    assert.equal(res.status, 200);
-    assert.match(res.headers.get('content-type'), /text\/html/);
-    assert.match(await res.text(), /clidash/i);
-  });
-});
-
-test('static: path traversal outside public/ is rejected', async () => {
-  await withServer(makeConfig({ stub: stubCli() }), async (base) => {
-    const res = await fetch(`${base}/..%2Fserver.js`);
-    assert.notEqual(res.status, 200);
-  });
-});
-
-test('/api/r: {resource} substitutes inside a larger argv string (ssh-remote pattern)', async () => {
-  const cli = {
-    bin: process.execPath,
-    resources: ['sessions'],
-    list: [STUB, 'wrapped-{resource}-arg', 'list'],
-    output: 'json',
-    unwrap: 'data',
-    env: { STUB_COUNT_FILE: join(tmp, 'count-embed.txt') },
-  };
-  await withServer(makeConfig({ stub: cli }), async (base) => {
-    const body = await (await fetch(`${base}/api/r/stub/sessions`)).json();
-    assert.equal(body.ok, true);
-    const calls = readFileSync(join(tmp, 'count-embed.txt'), 'utf8').trim();
-    assert.equal(calls, 'wrapped-sessions-arg list');
-  });
-});

.claude/skills/add-clidash/add/tools/clidash/test/smoke.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-# Smoke test against a running clidash instance (run on the VM after deploy).
-# Usage: ./test/smoke.sh [base-url]   (default http://127.0.0.1:4690)
-set -euo pipefail
-BASE="${1:-http://127.0.0.1:4690}"
-
-check() {
-  local label="$1" url="$2" pattern="$3"
-  if curl -fsS --max-time 15 "$url" | grep -q "$pattern"; then
-    echo "OK   $label"
-  else
-    echo "FAIL $label ($url did not match $pattern)"
-    exit 1
-  fi
-}
-
-check "/api/clis"             "$BASE/api/clis"             '"resources"'
-check "/api/r/ncl/sessions"   "$BASE/api/r/ncl/sessions"   '"ok":true'
-check "/api/view/ncl/overview" "$BASE/api/view/ncl/overview" '"ok":true'
-check "GET / (static UI)"     "$BASE/"                     'clidash'
-echo "smoke: all good"

.claude/skills/add-clidash/add/tools/clidash/views/ncl-overview.js

@@ -1,60 +0,0 @@
-// Curated "Agents overview" view for ncl: joins groups + sessions +
-// messaging-groups + wirings into per-agent cards. Returns the generic
-// card shape the frontend renders, so the UI itself stays CLI-agnostic:
-//   { title, cards: [{ title, subtitle, status, fields, badges }] }
-// status: green <15m since last_active, amber <2h, red older, gray never.
-
-const GREEN_MAX_MIN = 15;
-const AMBER_MAX_MIN = 120;
-
-function staleness(lastActive) {
-  if (!lastActive) return 'gray';
-  const ageMin = (Date.now() - new Date(lastActive).getTime()) / 60_000;
-  if (ageMin < GREEN_MAX_MIN) return 'green';
-  if (ageMin < AMBER_MAX_MIN) return 'amber';
-  return 'red';
-}
-
-export default async function overview({ fetch }) {
-  const [groups, sessions, messagingGroups, wirings] = await Promise.all([
-    fetch('groups'),
-    fetch('sessions'),
-    fetch('messaging-groups'),
-    fetch('wirings'),
-  ]);
-
-  const mgById = new Map(messagingGroups.map((mg) => [mg.id, mg]));
-
-  const cards = groups.map((group) => {
-    const groupSessions = sessions.filter((s) => s.agent_group_id === group.id);
-    const lastActive = groupSessions
-      .map((s) => s.last_active)
-      .filter(Boolean)
-      .sort()
-      .at(-1) ?? null;
-    const container = groupSessions.some((s) => s.container_status === 'running')
-      ? 'running'
-      : groupSessions[0]?.container_status ?? 'none';
-
-    const badges = wirings
-      .filter((w) => w.agent_group_id === group.id)
-      .map((w) => {
-        const mg = mgById.get(w.messaging_group_id);
-        return mg ? `${mg.channel_type}: ${mg.name ?? mg.platform_id}` : w.messaging_group_id;
-      });
-
-    return {
-      title: group.name,
-      subtitle: group.folder,
-      status: staleness(lastActive),
-      fields: {
-        container,
-        sessions: groupSessions.length,
-        'last active': lastActive,
-      },
-      badges,
-    };
-  });
-
-  return { title: 'Agents overview', cards };
-}

.claude/skills/add-codex/REMOVE.md

@@ -1,78 +0,0 @@
-# Remove the Codex agent provider
-
-Reverses every change `/add-codex` makes and returns every group to the default provider. Safe to run when partially installed — skip any step whose target is already absent.
-
-## 1. Switch codex groups back to the default
-
-List groups still on codex and switch each one (each group's `memory/` tree stays on disk and readable; run `/migrate-memory` per group if its memory should carry back to Claude — see [docs/provider-migration.md](../../docs/provider-migration.md)):
-
-```bash
-ncl groups list
-# for each group whose config shows provider=codex:
-ncl groups config update --id <group-id> --provider claude
-ncl groups restart --id <group-id>
-```
-
-## 2. Delete the barrel imports
-
-Delete (do not comment out) the `import './codex.js';` line from each of:
-
-- `src/providers/index.ts`
-- `container/agent-runner/src/providers/index.ts`
-- `setup/providers/index.ts`
-
-## 3. Delete every copied file
-
-```bash
-rm -f src/providers/codex.ts \
-      src/providers/codex-agents-md.ts \
-      src/providers/codex-registration.test.ts \
-      src/providers/codex-host-contribution.test.ts \
-      src/providers/codex-agents-md.test.ts \
-      container/agent-runner/src/providers/codex.ts \
-      container/agent-runner/src/providers/codex-app-server.ts \
-      container/agent-runner/src/providers/exchange-archive.ts \
-      container/agent-runner/src/providers/exchange-archive.test.ts \
-      container/agent-runner/src/providers/codex-registration.test.ts \
-      container/agent-runner/src/providers/codex.factory.test.ts \
-      container/agent-runner/src/providers/codex.turns.test.ts \
-      container/agent-runner/src/providers/codex-app-server.test.ts \
-      container/agent-runner/src/providers/codex-cli-tools.test.ts \
-      setup/providers/codex.ts \
-      setup/providers/codex.test.ts \
-      setup/providers/codex-registration.test.ts
-```
-
-This skill itself (`.claude/skills/add-codex/`) stays — it ships with trunk so the provider can be re-added later.
-
-`container/AGENTS.md` stays only if another installed provider uses agent surfaces; otherwise remove it too.
-
-## 4. Remove the CLI manifest entry
-
-Delete the `@openai/codex` entry from `container/cli-tools.json`:
-
-```bash
-node -e '
-  const fs = require("fs");
-  const file = "container/cli-tools.json";
-  const tools = JSON.parse(fs.readFileSync(file, "utf8")).filter((t) => t.name !== "@openai/codex");
-  const fmt = (t) => "  { " + Object.entries(t).map(([k, v]) => JSON.stringify(k) + ": " + JSON.stringify(v)).join(", ") + " }";
-  fs.writeFileSync(file, "[\n" + tools.map(fmt).join(",\n") + "\n]\n");
-'
-```
-
-## 5. Vault secret (optional)
-
-The ChatGPT/OpenAI secret in the OneCLI vault grants nothing once the provider is gone. To remove it: `onecli secrets list`, then `onecli secrets delete --id <id>` for the `chatgpt.com` / `api.openai.com` entry.
-
-## 6. Rebuild and verify
-
-```bash
-pnpm run build
-pnpm exec tsc -p container/agent-runner/tsconfig.json --noEmit
-./container/build.sh
-pnpm test
-cd container/agent-runner && bun test
-```
-
-All suites green and `ncl groups list` showing no codex groups means the removal is complete. Restart the service (`launchctl kickstart -k gui/$(id -u)/<label>` on macOS, `systemctl --user restart <unit>` on Linux).

.claude/skills/add-codex/SKILL.md

@@ -1,144 +1,161 @@
 ---
 name: add-codex
-description: Use Codex (OpenAI's codex app-server) as a full agent provider — planning, tool orchestration, MCP tools, server-side history, session resume — alongside or instead of Claude. ChatGPT subscription or OpenAI API key, vault-only via OneCLI. Per-group via `ncl groups config update --provider codex`. Distinct from using OpenAI as an MCP tool (where Claude remains the planner).
+description: Use Codex (CLI + AppServer) as the full agent provider — planning, tool orchestration, native compaction, MCP tools, session resume — in place of the Claude Agent SDK. ChatGPT subscription or OPENAI_API_KEY. Per-group via agent_provider. Distinct from using OpenAI as an MCP tool (where Claude remains the planner).
 ---
 
 # Codex agent provider
 
-> Shortcut: `pnpm exec tsx setup/index.ts --step provider-auth codex` performs this whole install (manifest-driven from the providers branch: files, barrels, CLI manifest entry, image rebuild) plus auth in one command. The steps below are the same operations, for agent-driven or manual application.
+NanoClaw runs agents in a long-lived **poll loop** inside the container. The backend is selected with **`AGENT_PROVIDER`** (`claude` | `opencode` | `codex` | `mock`).
 
-NanoClaw selects each group's agent backend from `container_configs.provider` (default `claude`). This skill installs the Codex provider: copy the payload from the `providers` branch, append one import to each of the three provider barrels, add the pinned Codex CLI to the container manifest (`container/cli-tools.json`), rebuild, then run the vault auth walk-through.
+Trunk ships with only the `claude` provider baked in. This skill copies the Codex provider files in from the `providers` branch, wires them into the host and container barrels, updates the Dockerfile to install the Codex CLI, and rebuilds the image.
 
-The provider runs `codex app-server` as a child process speaking JSON-RPC over stdio: native streaming, MCP tools, server-side conversation history (the continuation is a thread id, no on-disk transcript). Credentials are **vault-only**: OneCLI serves a sentinel `auth.json` stub into the container and swaps the real ChatGPT token or API key on the wire — no key in `.env`, nothing readable in the container.
+The Codex provider runs `codex app-server` as a child process and speaks JSON-RPC over stdio. That gives it native session resume, streaming events, MCP tool access, and `thread/compact/start` compaction — same feature bar as the Claude Agent SDK, without the Anthropic-only lock-in.
 
 ## Install
 
 ### Pre-flight
 
-Check whether the payload is already wired (a prior apply, or a trunk that still carries it). All of these present means installed — skip to **Authenticate**:
+If all of the following are already present, skip to **Configuration**:
 
-- `src/providers/codex.ts` and `src/providers/codex-agents-md.ts`
-- `container/agent-runner/src/providers/codex.ts` and `codex-app-server.ts`
-- `setup/providers/codex.ts`
-- `import './codex.js';` in `src/providers/index.ts`, `container/agent-runner/src/providers/index.ts`, and `setup/providers/index.ts`
-- an `@openai/codex` entry in `container/cli-tools.json`
+- `src/providers/codex.ts`
+- `container/agent-runner/src/providers/codex.ts`
+- `container/agent-runner/src/providers/codex-app-server.ts`
+- `container/agent-runner/src/providers/codex.factory.test.ts`
+- `import './codex.js';` line in `src/providers/index.ts`
+- `import './codex.js';` line in `container/agent-runner/src/providers/index.ts`
+- `ARG CODEX_VERSION` and `"@openai/codex@${CODEX_VERSION}"` in the pnpm global-install block in `container/Dockerfile`
 
-### Fetch and copy
+Missing pieces — continue below. All steps are idempotent; re-running is safe.
+
+### 1. Fetch the providers branch
 
 ```bash
 git fetch origin providers
 ```
 
-Copy each file with `git show origin/providers:<path> > <path>` (additive — never merge the branch):
+### 2. Copy the Codex source files
 
-Host (`src/providers/`):
-- `codex.ts` — provider contribution: per-group `.codex-shared` state dir, AGENTS.md compose, skill links
-- `codex-agents-md.ts` — AGENTS.md composition (32KB Codex cap: degrades by dropping the largest instruction sections, never blocks a spawn)
-- `codex-registration.test.ts` — barrel-driven host registration guard
-- `codex-host-contribution.test.ts` — drives the real contribution against a real test DB (the "consumes core" leg)
-- `codex-agents-md.test.ts` — cap-degradation behavior
-
-Container (`container/agent-runner/src/providers/`):
-- `codex.ts` — the provider (turn loop, steering, memory scaffold + `onExchangeComplete` archiving)
-- `codex-app-server.ts` — JSON-RPC child-process wrapper
-- `exchange-archive.ts` — per-exchange markdown writer the `onExchangeComplete` hook uses (provider-owned, not runner code)
-- `exchange-archive.test.ts` — writer behavior
-- `codex-registration.test.ts` — barrel-driven container registration guard
-- `codex.factory.test.ts`, `codex.turns.test.ts`, `codex-app-server.test.ts` — provider behavior
-- `codex-cli-tools.test.ts` — structural guard for the Codex entry in `container/cli-tools.json`
-
-Setup (`setup/providers/`):
-- `codex.ts` — picker entry self-registration + the vault auth walk-through + install check
-- `codex.test.ts` — install-check coverage
-- `codex-registration.test.ts` — barrel-driven setup registration guard
-
-Shared base (skip if present):
-- `container/AGENTS.md` — the runtime-contract base the composed AGENTS.md embeds
-
-### Wire the barrels
-
-Append `import './codex.js';` to each of:
-- `src/providers/index.ts`
-- `container/agent-runner/src/providers/index.ts`
-- `setup/providers/index.ts`
-
-### CLI manifest
-
-The agent's global Node CLIs install from `container/cli-tools.json` (a json-merge seam), not hand-edited Dockerfile layers. Add Codex by appending one entry — `@openai/codex` has no native postinstall, so no `onlyBuilt`:
+Wholesale copies (owned entirely by this skill — user edits to these files won't survive a re-run, as designed):
 
 ```bash
-node -e '
-  const fs = require("fs");
-  const file = "container/cli-tools.json";
-  const tools = JSON.parse(fs.readFileSync(file, "utf8"));
-  if (!tools.some((t) => t.name === "@openai/codex")) {
-    tools.push({ name: "@openai/codex", version: "0.138.0" });
-    const fmt = (t) => "  { " + Object.entries(t).map(([k, v]) => JSON.stringify(k) + ": " + JSON.stringify(v)).join(", ") + " }";
-    fs.writeFileSync(file, "[\n" + tools.map(fmt).join(",\n") + "\n]\n");
-  }
-'
+git show origin/providers:src/providers/codex.ts                                      > src/providers/codex.ts
+git show origin/providers:container/agent-runner/src/providers/codex.ts               > container/agent-runner/src/providers/codex.ts
+git show origin/providers:container/agent-runner/src/providers/codex-app-server.ts    > container/agent-runner/src/providers/codex-app-server.ts
+git show origin/providers:container/agent-runner/src/providers/codex.factory.test.ts  > container/agent-runner/src/providers/codex.factory.test.ts
 ```
 
-The version (`0.138.0`) is the canonical pin — keep it in sync with `setup/add-codex.sh`. The Dockerfile already installs every manifest entry via pinned `pnpm install -g`; no Dockerfile edit is needed.
+### 3. Append the self-registration imports
 
-### Build
+Each barrel gets one line — alphabetical placement keeps diffs small.
+
+`src/providers/index.ts`:
+
+```typescript
+import './codex.js';
+```
+
+`container/agent-runner/src/providers/index.ts`:
+
+```typescript
+import './codex.js';
+```
+
+### 4. Add the Codex CLI to the container Dockerfile
+
+Two edits to `container/Dockerfile`, both idempotent (skip if already present):
+
+**(a)** In the "Pin CLI versions" ARG block (around line 18), add after `ARG CLAUDE_CODE_VERSION=...`:
+
+```dockerfile
+ARG CODEX_VERSION=0.124.0
+```
+
+**(b)** Add a new standalone `RUN` block for the Codex CLI, after the existing per-CLI install blocks (around line 106, right after the `@anthropic-ai/claude-code` block). The Dockerfile splits each global CLI into its own layer for cache granularity — keep that pattern; do not collapse them into a single combined `pnpm install -g` call:
+
+```dockerfile
+RUN --mount=type=cache,target=/root/.cache/pnpm \
+    pnpm install -g "@openai/codex@${CODEX_VERSION}"
+```
+
+Note: **no agent-runner package dependency** — Codex is a CLI binary, not a library. Unlike OpenCode, there's nothing to add to `container/agent-runner/package.json`.
+
+### 5. Build
 
 ```bash
-pnpm run build
-pnpm exec tsc -p container/agent-runner/tsconfig.json --noEmit
-./container/build.sh
+pnpm run build                                         # host
+pnpm exec tsc -p container/agent-runner/tsconfig.json --noEmit   # container typecheck
+./container/build.sh                                   # agent image
 ```
 
-### Restart the host
+## Configuration
 
-The image rebuild does not reload the **host**. Codex's host contribution
-(`src/providers/codex.ts`) registers the `/home/node/.codex` bind mount + env
-passthrough, and the running host only picks it up on restart. Skip this and the
-first Codex turn fails with `EACCES` writing `/home/node/.codex/config.toml` —
-with no mount, Docker auto-creates the dir root-owned and the non-root container
-user can't write to it.
+Codex supports two primary auth paths and one experimental BYO-endpoint path. Pick the one that matches your setup.
+
+### Option A — ChatGPT subscription (recommended for individuals)
+
+On the host (not inside the container), run Codex's OAuth login:
 
 ```bash
-# macOS (launchd)
-launchctl kickstart -k gui/$(id -u)/com.nanoclaw
-# Linux (systemd)
-systemctl --user restart nanoclaw
+codex login
 ```
 
-### Validate
+This writes `~/.codex/auth.json` with a subscription token. The host-side Codex provider ([src/providers/codex.ts](../../../src/providers/codex.ts)) copies `auth.json` into a per-session `~/.codex` directory mounted into the container — your host's own Codex CLI is never touched.
+
+No `.env` variables required for this mode.
+
+### Option B — API key (recommended for CI or API billing)
+
+```env
+OPENAI_API_KEY=sk-...
+CODEX_MODEL=gpt-5.4-mini
+```
+
+The host forwards both variables into the container. If both subscription (`auth.json`) and `OPENAI_API_KEY` are present, Codex prefers the subscription.
+
+### Option C — BYO OpenAI-compatible endpoint (experimental)
+
+Codex's built-in `openai` provider honors the `OPENAI_BASE_URL` env var directly. Point it at any OpenAI-compatible endpoint — Groq, Together, self-hosted vLLM, an OpenAI proxy, etc.
+
+```env
+OPENAI_API_KEY=...
+OPENAI_BASE_URL=https://api.groq.com/openai/v1
+CODEX_MODEL=llama-3.3-70b-versatile
+```
+
+Codex also ships first-class local-runner flags — `codex --oss --local-provider ollama` or `--local-provider lmstudio` — that auto-detect a local server. To use those inside NanoClaw, set `CODEX_MODEL` to a model your local runner serves and add the corresponding base URL; see the Codex CLI docs for the full `model_provider = oss` configuration.
+
+**Experimental caveat:** tool-calling quality depends on the model and endpoint. Not every OpenAI-compat provider implements the full function-calling spec, and smaller models (< 30B) often struggle with multi-step tool orchestration. Test before committing.
+
+### Per group / per session
+
+Set `"provider": "codex"` in the group's **`container.json`** (`groups/<folder>/container.json`) — the in-container runner reads `provider` from there, not from the DB. The DB columns **`agent_groups.agent_provider`** and **`sessions.agent_provider`** (session overrides group) only drive host-side provider contribution — per-session `~/.codex` mount, `OPENAI_*` / `CODEX_MODEL` env passthrough — and do not propagate into `container.json` at spawn time. Set both, or just edit `container.json`; if they disagree, the runner uses `container.json` and the host-side resolver falls back through session → group → `container.json` → `'claude'`.
+
+`CODEX_MODEL` applies process-wide via `.env`; if you need different models for different groups, set them via `container_config.env` on the group.
+
+Extra MCP servers still come from **`NANOCLAW_MCP_SERVERS`** / `container_config.mcpServers` on the host. The runner merges them into the same `mcpServers` object passed to all providers.
+
+## Operational notes
+
+- **Spawn-per-query:** Codex's app-server is spawned fresh per query invocation, matching the OpenCode pattern. No long-lived daemon to keep healthy across sessions.
+- **Per-session `~/.codex` isolation:** each group gets its own copy of the host's `auth.json`. The container can rewrite `config.toml` freely on every wake without touching the host's Codex config.
+- **Native compaction:** kicks in automatically at 40K cumulative input tokens between turns, via `thread/compact/start`. If compaction fails, the provider logs and continues uncompacted — no fatal error.
+- **Approvals:** auto-accepted inside the container (the container is the sandbox; same posture as Claude/OpenCode).
+- **Mid-turn input:** Codex turns don't accept mid-turn messages. Follow-up `push()` calls queue and drain between turns, matching the OpenCode pattern. The poll-loop only pushes between turns anyway, so no messages are dropped.
+- **Stale thread recovery:** `isSessionInvalid` matches on stale-thread-ID errors (`thread not found`, `unknown thread`, etc.) so a cold-started app-server can recover cleanly when it sees a stored continuation it no longer has.
+
+## Verify
 
 ```bash
-pnpm vitest run src/providers/codex-registration.test.ts src/providers/codex-host-contribution.test.ts src/providers/codex-agents-md.test.ts setup/providers/
-cd container/agent-runner && bun test src/providers/
+grep -q "./codex.js" container/agent-runner/src/providers/index.ts && echo "container barrel: OK"
+grep -q "./codex.js" src/providers/index.ts && echo "host barrel: OK"
+grep -q "@openai/codex@" container/Dockerfile && echo "Dockerfile install: OK"
+cd container/agent-runner && bun test src/providers/codex.factory.test.ts && cd -
 ```
 
-The registration tests import only the real barrels — they go red if a barrel line is missing, a barrel fails to evaluate, or the payload is broken.
+After the image rebuild, set `agent_provider = 'codex'` on a test group and send a message. Successful round-trip looks like:
 
-## Authenticate
+- `init` event with a stable thread ID as continuation
+- One or more `activity` / `progress` events during the turn
+- `result` event with the model's reply
 
-> **Run this in a separate, real terminal — it is interactive.** It prompts for ChatGPT-subscription vs OpenAI-API-key and then drives a browser/device login, so it needs a TTY to answer prompts.
-
-```bash
-pnpm exec tsx setup/index.ts --step provider-auth codex
-```
-
-The same walk-through fresh installs get from the setup picker: ChatGPT subscription (browser login or device pairing) or an OpenAI API key, landed in the OneCLI vault. Idempotent — it short-circuits when a matching secret already exists. It finishes with the install check.
-
-## Use it
-
-Per group:
-
-```bash
-ncl groups config update --id <group-id> --provider codex
-ncl groups restart --id <group-id>
-```
-
-Switching is an operator action — run it from the host. Memory does NOT carry over automatically — each provider keeps its own store; run `/migrate-memory` to carry it across. See [docs/provider-migration.md](../../docs/provider-migration.md) for the carry-over table and rollback.
-
-There is no install-wide default provider. Setup's provider picker sets codex on the first agent it creates; creation itself is provider-agnostic (no `--provider` flag — provider is a DB property). Any group switches afterward via `ncl groups config update --provider` as above.
-
-## Troubleshooting
-
-- **Container dies at boot, channel silent:** `grep 'Container exited non-zero' logs/nanoclaw.error.log` — the `stderrTail` carries the reason (e.g. `Unknown provider: codex. Registered: claude` means the barrels aren't wired in the running build).
-- **In-channel `Error: spawn codex ENOENT` on every message:** the image predates the manifest entry — re-run `./container/build.sh`.
-- **Auth errors mid-conversation:** the vault secret is missing or stale — re-run `pnpm exec tsx setup/index.ts --step provider-auth codex` (subscription re-login updates the vault copy).
+If the agent hangs or errors, check `~/.codex/auth.json` exists on the host (Option A) or that `OPENAI_API_KEY` is forwarding correctly (Option B) — `docker exec` into a running container and `env | grep -i openai` to confirm.

.claude/skills/add-codex/codex-cli-tools.test.ts

@@ -1,39 +0,0 @@
-// Structural guard for the Codex CLI install in container/cli-tools.json.
-//
-// @openai/codex is a CLI *binary* installed from the global-CLI manifest (a
-// json-merge seam), not an importable package, so the barrel-driven
-// registration tests cannot see it. This test reads the real cli-tools.json
-// and asserts the @openai/codex entry is present and pinned to an exact
-// version. It goes red if the manifest entry is dropped or unpins.
-//
-// Runs under bun (same suite as the container registration test):
-//   cd container/agent-runner && bun test src/providers/codex-cli-tools.test.ts
-
-import { existsSync, readFileSync } from 'fs';
-import path from 'path';
-
-import { describe, it, expect } from 'bun:test';
-
-// container/agent-runner/src/providers/ -> container/cli-tools.json
-const MANIFEST = path.join(import.meta.dir, '..', '..', '..', 'cli-tools.json');
-const manifestPresent = existsSync(MANIFEST);
-
-// Read lazily — `describe.skipIf` still runs the body to register tests, so the
-// read has to be guarded for the bare-branch (no manifest) case.
-const tools: Array<{ name: string; version: string }> = manifestPresent
-  ? JSON.parse(readFileSync(MANIFEST, 'utf8'))
-  : [];
-const codex = tools.find((t) => t.name === '@openai/codex');
-
-// cli-tools.json is a trunk file; on the bare providers branch it isn't present,
-// so skip there. In an installed tree (trunk + this payload) it must carry the
-// pinned @openai/codex entry.
-describe.skipIf(!manifestPresent)('container/cli-tools.json codex CLI install', () => {
-  it('includes the @openai/codex entry', () => {
-    expect(codex).toBeDefined();
-  });
-
-  it('pins it to an exact semver (no latest, no ranges)', () => {
-    expect(codex?.version).toMatch(/^\d+\.\d+\.\d+(?:[-+][0-9A-Za-z.-]+)?$/);
-  });
-});

.claude/skills/add-dashboard/SKILL.md

@@ -28,34 +28,61 @@ NanoClaw (pusher)              Dashboard (npm package)
 pnpm install @nanoco/nanoclaw-dashboard
 ```
 
-### 2. Copy the pusher module and its tests
+### 2. Copy the pusher module
 
-Copy all three resource files into `src/`. The tests ship with the skill and run against the composed project — they're how you confirm the skill works and is wired in correctly.
+Copy the resource file into src:
 
 ```
-.claude/skills/add-dashboard/resources/dashboard-pusher.ts       → src/dashboard-pusher.ts
-.claude/skills/add-dashboard/resources/dashboard-pusher.test.ts  → src/dashboard-pusher.test.ts
-.claude/skills/add-dashboard/resources/dashboard-wiring.test.ts  → src/dashboard-wiring.test.ts
+.claude/skills/add-dashboard/resources/dashboard-pusher.ts → src/dashboard-pusher.ts
 ```
 
-- `dashboard-pusher.test.ts` — behavior: starts the pusher, posts a real snapshot to a fake dashboard.
-- `dashboard-wiring.test.ts` — the code edit in step 3: asserts (via the TS AST) that `index.ts` dynamically imports `./dashboard-pusher.js` and `await`s `startDashboard()` as colocated statements of `main()`, after DB init and before the boot-complete log. Delete or misplace the edit and this goes red.
+### 3. Add exports to src/db/index.ts
 
-### 3. Wire into src/index.ts
-
-This is the skill's one integration point, and it's deliberately minimal and self-contained: all the startup logic lives in `dashboard-pusher.ts`, and the import is **colocated** with the call so the whole edit is a single block in one place — there's no separate top-of-file import to add (or to remember to remove).
-
-Add this block inside `main()`, just before the `log.info('NanoClaw running')` line:
+Add these two export blocks if not already present:
 
 ```typescript
-  // Dashboard (optional; no-ops without DASHBOARD_SECRET)
-  const { startDashboard } = await import('./dashboard-pusher.js');
-  await startDashboard();
+// After the messaging-groups exports, add:
+export {
+  getMessagingGroupsByAgentGroup,
+} from './messaging-groups.js';
+
+// Before the credentials exports, add:
+export {
+  createDestination,
+  getDestinations,
+  getDestinationByName,
+  getDestinationByTarget,
+  hasDestination,
+  deleteDestination,
+} from './agent-destinations.js';
 ```
 
-`startDashboard()` reads `DASHBOARD_SECRET`/`DASHBOARD_PORT` itself and no-ops if the secret is unset, so nothing else in core needs to change.
+### 4. Wire into src/index.ts
 
-### 4. Add environment variables to .env
+Add the `readEnvFile` import at the top if not already present:
+
+```typescript
+import { readEnvFile } from './env.js';
+```
+
+Add after step 7 (OneCLI approval handler), before the `log.info('NanoClaw running')` line:
+
+```typescript
+  // 8. Dashboard (optional)
+  const dashboardEnv = readEnvFile(['DASHBOARD_SECRET', 'DASHBOARD_PORT']);
+  const dashboardSecret = process.env.DASHBOARD_SECRET || dashboardEnv.DASHBOARD_SECRET;
+  const dashboardPort = parseInt(process.env.DASHBOARD_PORT || dashboardEnv.DASHBOARD_PORT || '3100', 10);
+  if (dashboardSecret) {
+    const { startDashboard } = await import('@nanoco/nanoclaw-dashboard');
+    const { startDashboardPusher } = await import('./dashboard-pusher.js');
+    startDashboard({ port: dashboardPort, secret: dashboardSecret });
+    startDashboardPusher({ port: dashboardPort, secret: dashboardSecret, intervalMs: 60000 });
+  } else {
+    log.info('Dashboard disabled (no DASHBOARD_SECRET)');
+  }
+```
+
+### 5. Add environment variables to .env
 
 ```
 DASHBOARD_SECRET=<generate-a-random-secret>
@@ -64,23 +91,15 @@ DASHBOARD_PORT=3100
 
 Generate the secret: `node -e "console.log('nc-' + require('crypto').randomBytes(16).toString('hex'))"`
 
-### 5. Build, test, and restart
-
-Run from your NanoClaw project root:
+### 6. Build and restart
 
 ```bash
 pnpm run build
-pnpm exec vitest run src/dashboard-pusher.test.ts src/dashboard-wiring.test.ts   # behavior + wiring
-source setup/lib/install-slug.sh
-systemctl --user restart $(systemd_unit)              # Linux
-# or: launchctl kickstart -k gui/$(id -u)/$(launchd_label)  # macOS
+systemctl --user restart nanoclaw   # Linux
+# or: launchctl kickstart -k gui/$(id -u)/com.nanoclaw  # macOS
 ```
 
-Run `build` **before** the tests: it's what guards the `@nanoco/nanoclaw-dashboard` dependency. `dashboard-pusher.ts` reaches the package through `await import('@nanoco/nanoclaw-dashboard')`, so if step 4 was skipped, `pnpm run build` fails with `TS2307: Cannot find module`. The behavior test deliberately *mocks* that package — its `startDashboard` binds a real dashboard port, a side effect we don't want in a test — so the test alone would pass with the dependency missing. Build is therefore the leg that verifies the dependency is installed; keep it ahead of the tests in the validate step.
-
-### 6. Verify (runtime smoke check)
-
-Once the service is restarted, confirm the dashboard is live:
+### 7. Verify
 
 ```bash
 curl -s http://localhost:3100/api/status
@@ -110,15 +129,10 @@ Open `http://localhost:3100/dashboard` in a browser.
 
 ## Removal
 
-Reverse the apply steps. Safe to re-run even if some pieces are already gone.
-
-```bash
-rm -f src/dashboard-pusher.ts src/dashboard-pusher.test.ts src/dashboard-wiring.test.ts
-pnpm uninstall @nanoco/nanoclaw-dashboard 2>/dev/null || true
-```
-
-Then, by hand, remove the single dashboard block the skill added to `main()` in `src/index.ts` (the `// Dashboard (optional…)` comment, the `await import('./dashboard-pusher.js')` line, and the `await startDashboard();` call), and remove `DASHBOARD_SECRET` and `DASHBOARD_PORT` from `.env`.
-
 ```bash
+pnpm uninstall @nanoco/nanoclaw-dashboard
+rm src/dashboard-pusher.ts
+# Remove the dashboard block from src/index.ts
+# Remove DASHBOARD_SECRET and DASHBOARD_PORT from .env
 pnpm run build
 ```

.claude/skills/add-dashboard/resources/dashboard-pusher.test.ts

@@ -1,124 +0,0 @@
-/**
- * Integration test for the add-dashboard skill's integration point —
- * `startDashboard()`, the single call wired into src/index.ts.
- *
- * Archetype: in-process seam. It drives the *real* entry point against a
- * *real* (in-memory) central DB and a *fake* dashboard HTTP endpoint. The
- * only things stubbed are the external dashboard package (not needed to prove
- * the wiring) and env-file reads (so the test doesn't depend on the real
- * .env). This proves the skill works once applied: with a secret set it
- * collects a DB snapshot and posts it; with no secret it does nothing.
- *
- * Ships with the add-dashboard skill; apply copies it to src/ alongside the
- * pusher so it runs against the composed project.
- */
-import { describe, it, expect, beforeEach, afterEach, vi } from 'vitest';
-import fs from 'fs';
-import http from 'http';
-import type { AddressInfo } from 'net';
-
-vi.mock('./config.js', async () => {
-  const actual = await vi.importActual<typeof import('./config.js')>('./config.js');
-  return { ...actual, DATA_DIR: '/tmp/nanoclaw-test-dashboard', ASSISTANT_NAME: 'TestBot' };
-});
-// The dashboard server package isn't needed to prove the integration point.
-vi.mock('@nanoco/nanoclaw-dashboard', () => ({ startDashboard: vi.fn() }));
-// Don't read the real .env — the test controls config via process.env only.
-vi.mock('./env.js', () => ({ readEnvFile: () => ({}) }));
-
-const TEST_DIR = '/tmp/nanoclaw-test-dashboard';
-
-import { initTestDb, closeDb, runMigrations, createAgentGroup } from './db/index.js';
-import { startDashboard, stopDashboardPusher } from './dashboard-pusher.js';
-
-function now(): string {
-  return new Date().toISOString();
-}
-
-interface CapturedPost {
-  path: string;
-  auth: string | undefined;
-  body: Record<string, unknown>;
-}
-
-/** A fake dashboard server that captures the bodies the pusher POSTs. */
-function startFakeDashboard(): Promise<{ port: number; posts: CapturedPost[]; close: () => Promise<void> }> {
-  const posts: CapturedPost[] = [];
-  const server = http.createServer((req, res) => {
-    let raw = '';
-    req.on('data', (c) => { raw += c; });
-    req.on('end', () => {
-      let body: Record<string, unknown> = {};
-      try { body = JSON.parse(raw); } catch { /* leave empty */ }
-      posts.push({ path: req.url || '', auth: req.headers.authorization, body });
-      res.writeHead(200);
-      res.end('ok');
-    });
-  });
-  return new Promise((resolve) => {
-    server.listen(0, '127.0.0.1', () => {
-      const port = (server.address() as AddressInfo).port;
-      resolve({ port, posts, close: () => new Promise<void>((r) => server.close(() => r())) });
-    });
-  });
-}
-
-async function waitFor(pred: () => boolean, timeoutMs = 2000): Promise<void> {
-  const start = Date.now();
-  while (!pred()) {
-    if (Date.now() - start > timeoutMs) throw new Error('timed out waiting for condition');
-    await new Promise((r) => setTimeout(r, 20));
-  }
-}
-
-describe('add-dashboard integration point (startDashboard)', () => {
-  beforeEach(() => {
-    if (fs.existsSync(TEST_DIR)) fs.rmSync(TEST_DIR, { recursive: true });
-    const db = initTestDb();
-    runMigrations(db);
-  });
-
-  afterEach(() => {
-    stopDashboardPusher();
-    closeDb();
-    delete process.env.DASHBOARD_SECRET;
-    delete process.env.DASHBOARD_PORT;
-    if (fs.existsSync(TEST_DIR)) fs.rmSync(TEST_DIR, { recursive: true });
-  });
-
-  it('posts a snapshot of the seeded state when DASHBOARD_SECRET is set', async () => {
-    createAgentGroup({ id: 'ag-1', name: 'Test Agent', folder: 'test-agent', agent_provider: null, created_at: now() });
-
-    const dash = await startFakeDashboard();
-    process.env.DASHBOARD_SECRET = 'test-secret';
-    process.env.DASHBOARD_PORT = String(dash.port);
-
-    await startDashboard();
-
-    await waitFor(() => dash.posts.some((p) => p.path === '/api/ingest'));
-
-    const ingest = dash.posts.find((p) => p.path === '/api/ingest')!;
-    expect(ingest.auth).toBe('Bearer test-secret');
-    expect(ingest.body.assistant_name).toBe('TestBot');
-
-    const groups = ingest.body.agent_groups as Array<{ id: string }>;
-    expect(groups.map((g) => g.id)).toContain('ag-1');
-
-    for (const key of ['timestamp', 'sessions', 'channels', 'users', 'tokens', 'context_windows', 'activity', 'messages']) {
-      expect(ingest.body).toHaveProperty(key);
-    }
-
-    await dash.close();
-  });
-
-  it('does nothing when DASHBOARD_SECRET is not set', async () => {
-    const dash = await startFakeDashboard();
-    // no DASHBOARD_SECRET in env, and readEnvFile is stubbed to {}
-
-    await startDashboard();
-    await new Promise((r) => setTimeout(r, 100));
-
-    expect(dash.posts).toHaveLength(0);
-    await dash.close();
-  });
-});

.claude/skills/add-dashboard/resources/dashboard-pusher.ts

@@ -10,17 +10,15 @@ import Database from 'better-sqlite3';
 import { getAllAgentGroups, getAgentGroup } from './db/agent-groups.js';
 import { getSessionsByAgentGroup } from './db/sessions.js';
 import { getAllMessagingGroups, getMessagingGroupAgents } from './db/messaging-groups.js';
-import { getDestinations } from './modules/agent-to-agent/db/agent-destinations.js';
-import { getMembers } from './modules/permissions/db/agent-group-members.js';
-import { getAllUsers, getUser } from './modules/permissions/db/users.js';
-import { getUserRoles, getAdminsOfAgentGroup } from './modules/permissions/db/user-roles.js';
-import { getUserDmsForUser } from './modules/permissions/db/user-dms.js';
+import { getDestinations } from './db/agent-destinations.js';
+import { getMembers } from './db/agent-group-members.js';
+import { getAllUsers, getUser } from './db/users.js';
+import { getUserRoles, getAdminsOfAgentGroup } from './db/user-roles.js';
+import { getUserDmsForUser } from './db/user-dms.js';
 import { getActiveAdapters, getRegisteredChannelNames } from './channels/channel-registry.js';
 import { DATA_DIR, ASSISTANT_NAME } from './config.js';
 import { getDb } from './db/connection.js';
-import { getContainerConfig } from './db/container-configs.js';
 import { log } from './log.js';
-import { readEnvFile } from './env.js';
 
 interface PusherConfig {
   port: number;
@@ -58,26 +56,6 @@ export function stopDashboardPusher(): void {
   }
 }
 
-/**
- * Skill entry point — the single call wired into the host boot sequence.
- *
- * All of the dashboard's startup logic lives here, in the skill's own file,
- * so the integration point in src/index.ts is just `await startDashboard()`.
- * No-ops (and says so) when DASHBOARD_SECRET is unset.
- */
-export async function startDashboard(): Promise<void> {
-  const env = readEnvFile(['DASHBOARD_SECRET', 'DASHBOARD_PORT']);
-  const secret = process.env.DASHBOARD_SECRET || env.DASHBOARD_SECRET;
-  const port = parseInt(process.env.DASHBOARD_PORT || env.DASHBOARD_PORT || '3100', 10);
-  if (!secret) {
-    log.info('Dashboard disabled (no DASHBOARD_SECRET)');
-    return;
-  }
-  const { startDashboard: startServer } = await import('@nanoco/nanoclaw-dashboard');
-  startServer({ port, secret });
-  startDashboardPusher({ port, secret, intervalMs: 60000 });
-}
-
 /** Fire-and-forget POST to the dashboard. */
 function postJson(config: PusherConfig, urlPath: string, data: unknown): void {
   const body = JSON.stringify(data);
@@ -179,7 +157,7 @@ function collectAgentGroups() {
       name: g.name,
       folder: g.folder,
       agent_provider: g.agent_provider,
-      container_config: getContainerConfig(g.id) ?? null,
+      container_config: g.container_config ? JSON.parse(g.container_config) : null,
       sessionCount: sessions.length,
       runningSessions: running.length,
       wirings,

.claude/skills/add-dashboard/resources/dashboard-wiring.test.ts

@@ -1,81 +0,0 @@
-/**
- * Wiring test for the add-dashboard skill's code-edit integration point.
- *
- * The skill inserts one colocated block into src/index.ts (a dynamic
- * `import('./dashboard-pusher.js')` + `await startDashboard()` in main()). A
- * behavioral test of the pusher can't see whether that edit is actually
- * present and correctly placed — booting the real host is too heavy — so this
- * asserts the edit *structurally*, via the TypeScript AST. It verifies not
- * just that the call exists, but that:
- *   - the pusher module is dynamically imported by its correct path,
- *   - startDashboard() is awaited,
- *   - both are DIRECT statements of main()'s body (right scope/level, not
- *     nested or stranded in another function),
- *   - the import precedes the call, and the whole block sits after DB init
- *     and before the boot-complete log (right place).
- *
- * Delete or misplace the edit and this goes red. Combined with the unit test
- * (behavior of startDashboard) and the build (the call still type-checks),
- * the three together cover deletion, misplacement, drift, and behavior — for
- * a true code edit, with no registry required.
- *
- * Ships with the skill; apply copies it to src/.
- */
-import { describe, it, expect } from 'vitest';
-import fs from 'fs';
-import path from 'path';
-import ts from 'typescript';
-
-const indexPath = path.resolve(process.cwd(), 'src/index.ts');
-const source = fs.readFileSync(indexPath, 'utf8');
-const sf = ts.createSourceFile('index.ts', source, ts.ScriptTarget.Latest, true);
-
-function mainBody(): ts.NodeArray<ts.Statement> {
-  let body: ts.NodeArray<ts.Statement> | undefined;
-  sf.forEachChild((n) => {
-    if (ts.isFunctionDeclaration(n) && n.name?.text === 'main' && n.body) {
-      body = n.body.statements;
-    }
-  });
-  if (!body) throw new Error('main() not found in src/index.ts');
-  return body;
-}
-
-function isAwaitedStartDashboard(s: ts.Statement): boolean {
-  return (
-    ts.isExpressionStatement(s) &&
-    ts.isAwaitExpression(s.expression) &&
-    ts.isCallExpression(s.expression.expression) &&
-    ts.isIdentifier(s.expression.expression.expression) &&
-    s.expression.expression.expression.text === 'startDashboard'
-  );
-}
-
-/** `const { ... } = await import('./dashboard-pusher.js')` as a statement. */
-function isDynamicImportOfPusher(s: ts.Statement): boolean {
-  if (!ts.isVariableStatement(s)) return false;
-  const init = s.declarationList.declarations[0]?.initializer;
-  if (!init || !ts.isAwaitExpression(init) || !ts.isCallExpression(init.expression)) return false;
-  const call = init.expression;
-  if (call.expression.kind !== ts.SyntaxKind.ImportKeyword) return false;
-  const arg = call.arguments[0];
-  return !!arg && ts.isStringLiteral(arg) && arg.text === './dashboard-pusher.js';
-}
-
-describe('add-dashboard wiring in src/index.ts', () => {
-  it('dynamically imports the pusher and awaits startDashboard(), colocated in main(), after DB init and before the boot-complete log', () => {
-    const stmts = mainBody();
-    const importIdx = stmts.findIndex(isDynamicImportOfPusher);
-    const callIdx = stmts.findIndex(isAwaitedStartDashboard);
-    const migrateIdx = stmts.findIndex((s) => s.getText(sf).includes('runMigrations('));
-    const runningIdx = stmts.findIndex((s) => s.getText(sf).includes("log.info('NanoClaw running')"));
-
-    expect(importIdx, "dynamic import('./dashboard-pusher.js') must be a statement of main()").toBeGreaterThanOrEqual(0);
-    expect(callIdx, 'await startDashboard() must be a statement of main()').toBeGreaterThanOrEqual(0);
-    expect(migrateIdx, 'runMigrations() anchor not found').toBeGreaterThanOrEqual(0);
-    expect(runningIdx, 'boot-complete log anchor not found').toBeGreaterThanOrEqual(0);
-    expect(importIdx, 'the dynamic import must come after DB init').toBeGreaterThan(migrateIdx);
-    expect(callIdx, 'the call must come after its import (colocated)').toBeGreaterThan(importIdx);
-    expect(callIdx, 'startDashboard() must run before the boot-complete log').toBeLessThan(runningIdx);
-  });
-});

.claude/skills/add-deltachat/REMOVE.md

@@ -1,17 +1,11 @@
 # Remove DeltaChat
 
-## 1. Remove the adapter
+## 1. Disable the adapter
 
-Delete the self-registration import from `src/channels/index.ts` (skip if already gone):
+Comment out the import in `src/channels/index.ts`:
 
 ```typescript
-import './deltachat.js';
-```
-
-Then delete the copied adapter and its registration test:
-
-```bash
-rm -f src/channels/deltachat.ts src/channels/deltachat-registration.test.ts
+// import './deltachat.js';
 ```
 
 ## 2. Remove credentials
@@ -29,17 +23,14 @@ DC_SMTP_PORT
 
 ## 3. Rebuild and restart
 
-Run from your NanoClaw project root:
-
 ```bash
 pnpm run build
-source setup/lib/install-slug.sh
 
 # Linux
-systemctl --user restart $(systemd_unit)
+systemctl --user restart nanoclaw
 
 # macOS
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)
+launchctl kickstart -k gui/$(id -u)/com.nanoclaw
 ```
 
 ## 4. Remove account data (optional)

.claude/skills/add-deltachat/SKILL.md

@@ -14,7 +14,6 @@ The adapter drives the `@deltachat/stdio-rpc-server` JSON-RPC subprocess directl
 Skip to **Credentials** if all of these are already in place:
 
 - `src/channels/deltachat.ts` exists
-- `src/channels/deltachat-registration.test.ts` exists
 - `src/channels/index.ts` contains `import './deltachat.js';`
 - `@deltachat/stdio-rpc-server` is listed in `package.json` dependencies
 
@@ -26,11 +25,10 @@ Otherwise continue. Every step below is safe to re-run.
 git fetch origin channels
 ```
 
-### 2. Copy the adapter and its registration test
+### 2. Copy the adapter
 
 ```bash
-git show origin/channels:src/channels/deltachat.ts                 > src/channels/deltachat.ts
-git show origin/channels:src/channels/deltachat-registration.test.ts > src/channels/deltachat-registration.test.ts
+git show origin/channels:src/channels/deltachat.ts > src/channels/deltachat.ts
 ```
 
 ### 3. Append the self-registration import
@@ -47,17 +45,12 @@ import './deltachat.js';
 pnpm install @deltachat/stdio-rpc-server@2.49.0
 ```
 
-### 5. Build and validate
+### 5. Build
 
 ```bash
 pnpm run build
-pnpm exec vitest run src/channels/deltachat-registration.test.ts
 ```
 
-Both must be clean before proceeding. `deltachat-registration.test.ts` is the one integration test: it imports the real channel barrel and asserts the registry contains `deltachat`. It goes red if the `import './deltachat.js';` line is deleted or drifts, if the barrel fails to evaluate (so the channel genuinely would not register), or if `@deltachat/stdio-rpc-server` isn't installed (the import throws) — so it also implicitly verifies the dependency from step 4. Importing is safe: deltachat instantiates the rpc client only in `setup()` (at host startup), never at import.
-
-End-to-end message delivery against a real email account is verified manually once the service is running — see Wiring and Troubleshooting.
-
 ## Account Setup
 
 A dedicated email account is strongly recommended — it will accumulate DeltaChat-formatted messages and store encryption keys. Not all providers work well with DeltaChat; check https://providers.delta.chat/ before picking one.
@@ -105,16 +98,12 @@ The `/set-avatar` command (send an image with that caption) is the easiest way t
 
 ### Restart
 
-Run from your NanoClaw project root:
-
 ```bash
-source setup/lib/install-slug.sh
-
 # Linux
-systemctl --user restart $(systemd_unit)
+systemctl --user restart nanoclaw
 
 # macOS
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)
+launchctl kickstart -k gui/$(id -u)/com.nanoclaw
 ```
 
 On first start the adapter configures the email account (IMAP/SMTP credentials, calls `configure()`). Subsequent starts skip straight to `startIo()`. Account data is stored in `dc-account/` in the project root (or your `DC_ACCOUNT_DIR`).
@@ -243,7 +232,7 @@ Set `DC_SMTP_SECURITY=1` and `DC_SMTP_PORT=465` in `.env`, then restart.
 
 ```bash
 rm -f dc-account/accounts.lock
-systemctl --user restart "$(. setup/lib/install-slug.sh && systemd_unit)"
+systemctl --user restart nanoclaw
 ```
 
 ### Bot not responding after restart

.claude/skills/add-deltachat/VERIFY.md

@@ -0,0 +1,54 @@
+# Verify DeltaChat
+
+## 1. Check the adapter started
+
+```bash
+grep "Channel adapter started.*deltachat" logs/nanoclaw.log | tail -1
+```
+
+Expected: `Channel adapter started { channel: 'deltachat', type: 'deltachat' }`
+
+## 2. Check IMAP/SMTP connectivity
+
+Replace with your provider's hostnames from `.env`:
+
+```bash
+DC_IMAP=$(grep '^DC_IMAP_HOST=' .env | cut -d= -f2)
+DC_SMTP=$(grep '^DC_SMTP_HOST=' .env | cut -d= -f2)
+
+bash -c "echo >/dev/tcp/$DC_IMAP/993" && echo "IMAP open" || echo "IMAP blocked"
+bash -c "echo >/dev/tcp/$DC_SMTP/587" && echo "SMTP open" || echo "SMTP blocked"
+```
+
+## 3. End-to-end message test
+
+1. Open DeltaChat on your device
+2. Add the bot email address as a contact
+3. Send a message
+4. The bot should respond within a few seconds
+
+If nothing arrives, check:
+
+```bash
+grep "DeltaChat" logs/nanoclaw.log | tail -20
+grep "DeltaChat" logs/nanoclaw.error.log | tail -10
+```
+
+## 4. Check messaging group was created
+
+```bash
+pnpm exec tsx scripts/q.ts data/v2.db \
+  "SELECT id, platform_id, name FROM messaging_groups WHERE channel_type='deltachat' ORDER BY created_at DESC LIMIT 5"
+```
+
+If a row appears, the inbound routing is working. If not, the adapter isn't receiving the message — check logs for `DeltaChat: error handling incoming message`.
+
+## 5. Verify user access
+
+If the message arrived but the agent didn't respond, the sender may not have access:
+
+```bash
+pnpm exec tsx scripts/q.ts data/v2.db "SELECT id, display_name FROM users WHERE id LIKE 'deltachat:%'"
+```
+
+Grant access as shown in the SKILL.md "Grant user access" section.

.claude/skills/add-discord/REMOVE.md

@@ -1,40 +1,7 @@
 # Remove Discord
 
-Every step is idempotent — safe to re-run.
+1. Comment out `import './discord.js'` in `src/channels/index.ts`
+2. Remove `DISCORD_BOT_TOKEN` from `.env`
+3. Rebuild and restart
 
-## 1. Remove the adapter
-
-Delete the self-registration import from `src/channels/index.ts` (skip if already gone):
-
-```typescript
-import './discord.js';
-```
-
-Then delete the copied adapter and its registration test:
-
-```bash
-rm -f src/channels/discord.ts src/channels/discord-registration.test.ts
-```
-
-## 2. Remove credentials
-
-Remove `DISCORD_BOT_TOKEN`, `DISCORD_APPLICATION_ID`, and `DISCORD_PUBLIC_KEY` from `.env`, then re-sync to the container:
-
-```bash
-mkdir -p data/env && cp .env data/env/env
-```
-
-## 3. Remove the package
-
-```bash
-pnpm uninstall @chat-adapter/discord
-```
-
-## 4. Rebuild and restart
-
-```bash
-pnpm run build
-source setup/lib/install-slug.sh
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)  # macOS
-# Linux: systemctl --user restart $(systemd_unit)
-```
+No package to uninstall — Discord is built in.

.claude/skills/add-discord/SKILL.md

@@ -16,7 +16,6 @@ NanoClaw doesn't ship channels in trunk. This skill copies the Discord adapter i
 Skip to **Credentials** if all of these are already in place:
 
 - `src/channels/discord.ts` exists
-- `src/channels/discord-registration.test.ts` exists
 - `src/channels/index.ts` contains `import './discord.js';`
 - `@chat-adapter/discord` is listed in `package.json` dependencies
 
@@ -28,11 +27,10 @@ Otherwise continue. Every step below is safe to re-run.
 git fetch origin channels
 ```
 
-### 2. Copy the adapter and its registration test
+### 2. Copy the adapter
 
 ```bash
-git show origin/channels:src/channels/discord.ts                 > src/channels/discord.ts
-git show origin/channels:src/channels/discord-registration.test.ts > src/channels/discord-registration.test.ts
+git show origin/channels:src/channels/discord.ts > src/channels/discord.ts
 ```
 
 ### 3. Append the self-registration import
@@ -46,18 +44,15 @@ import './discord.js';
 ### 4. Install the adapter package (pinned)
 
 ```bash
-pnpm install @chat-adapter/discord@4.29.0
+pnpm install @chat-adapter/discord@4.27.0
 ```
 
-### 5. Build and validate
+### 5. Build
 
 ```bash
 pnpm run build
-pnpm exec vitest run src/channels/discord-registration.test.ts
 ```
 
-Both must be clean before proceeding. `discord-registration.test.ts` is the one integration test: it imports the real channel barrel and asserts the registry contains `discord`. It goes red if the `import './discord.js';` line is deleted or drifts, if the barrel fails to evaluate, or if `@chat-adapter/discord` isn't installed (the import throws) — so it also implicitly verifies the dependency from step 4. The adapter also calls core's `createChatSdkBridge(...)`; that typed core-API consumption is guarded by `pnpm run build`.
-
 ## Credentials
 
 ### Create Discord Bot

.claude/skills/add-discord/VERIFY.md

@@ -0,0 +1,3 @@
+# Verify Discord
+
+Send a message in a channel where the bot has access, or DM the bot directly. The bot should respond within a few seconds.

.claude/skills/add-emacs/REMOVE.md

@@ -1,63 +0,0 @@
-# Remove Emacs
-
-Every step is idempotent — safe to re-run.
-
-## 1. Remove the adapter
-
-Delete the self-registration import from `src/channels/index.ts` (skip if already gone):
-
-```typescript
-import './emacs.js';
-```
-
-Then delete the copied adapter, its tests, and the Lisp client:
-
-```bash
-rm -f src/channels/emacs.ts src/channels/emacs.test.ts src/channels/emacs-registration.test.ts emacs/nanoclaw.el
-```
-
-## 2. Remove credentials
-
-Remove the `EMACS_*` lines from `.env`:
-
-```bash
-EMACS_ENABLED
-EMACS_CHANNEL_PORT
-EMACS_AUTH_TOKEN
-EMACS_PLATFORM_ID
-```
-
-## 3. Rebuild and restart
-
-Run from your NanoClaw project root:
-
-```bash
-pnpm run build
-source setup/lib/install-slug.sh
-
-# Linux
-systemctl --user restart $(systemd_unit)
-
-# macOS
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)
-```
-
-## 4. Remove the Emacs config (optional)
-
-Remove the NanoClaw block from your Emacs config (`config.el`, `~/.spacemacs`, or `init.el`):
-
-```elisp
-;; NanoClaw — personal AI assistant channel
-(load-file "~/src/nanoclaw/emacs/nanoclaw.el")
-;; ...and the associated keybindings / nanoclaw-auth-token / nanoclaw-port settings
-```
-
-Reload your config or restart Emacs.
-
-## 5. Remove the messaging group (optional)
-
-To clean up the wired messaging group:
-
-```bash
-pnpm exec tsx scripts/q.ts data/v2.db "DELETE FROM messaging_group_agents WHERE messaging_group_id IN (SELECT id FROM messaging_groups WHERE channel_type='emacs'); DELETE FROM messaging_groups WHERE channel_type='emacs';"
-```

.claude/skills/add-emacs/SKILL.md

@@ -24,8 +24,6 @@ NanoClaw doesn't ship channels in trunk. This skill copies the Emacs adapter and
 Skip to **Enable** if all of these are already in place:
 
 - `src/channels/emacs.ts` exists
-- `src/channels/emacs.test.ts` exists
-- `src/channels/emacs-registration.test.ts` exists
 - `emacs/nanoclaw.el` exists
 - `src/channels/index.ts` contains `import './emacs.js';`
 
@@ -41,10 +39,9 @@ git fetch origin channels
 
 ```bash
 mkdir -p emacs
-git show origin/channels:src/channels/emacs.ts                    > src/channels/emacs.ts
-git show origin/channels:src/channels/emacs.test.ts              > src/channels/emacs.test.ts
-git show origin/channels:src/channels/emacs-registration.test.ts > src/channels/emacs-registration.test.ts
-git show origin/channels:emacs/nanoclaw.el                        > emacs/nanoclaw.el
+git show origin/channels:src/channels/emacs.ts      > src/channels/emacs.ts
+git show origin/channels:src/channels/emacs.test.ts > src/channels/emacs.test.ts
+git show origin/channels:emacs/nanoclaw.el          > emacs/nanoclaw.el
 ```
 
 ### 3. Append the self-registration import
@@ -55,16 +52,13 @@ Append to `src/channels/index.ts` (skip if the line is already present):
 import './emacs.js';
 ```
 
-### 4. Build and validate
+### 4. Build
 
 ```bash
 pnpm run build
-pnpm exec vitest run src/channels/emacs-registration.test.ts
 ```
 
-Both must be clean before proceeding. `emacs-registration.test.ts` is the one integration test: it imports the real channel barrel and asserts the registry contains `emacs`. It goes red if the `import './emacs.js';` line is deleted or drifts, or if the barrel fails to evaluate (so the channel genuinely would not register). The adapter uses only Node builtins (`http`), so there is no npm dependency to guard for this channel.
-
-End-to-end message delivery from a real Emacs buffer is verified manually once the service is running — see Verify and Troubleshooting.
+No npm package to install — the adapter uses only Node builtins (`http`).
 
 ## Enable
 
@@ -168,13 +162,10 @@ If you changed `EMACS_CHANNEL_PORT` from the default:
 
 ## Restart NanoClaw
 
-Run from your NanoClaw project root:
-
 ```bash
 pnpm run build
-source setup/lib/install-slug.sh
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)   # macOS
-# systemctl --user restart $(systemd_unit)             # Linux
+launchctl kickstart -k gui/$(id -u)/com.nanoclaw   # macOS
+# systemctl --user restart nanoclaw                # Linux
 ```
 
 ## Verify
@@ -249,7 +240,7 @@ grep -q "import './emacs.js'" src/channels/index.ts && echo "imported" || echo "
 
 ### No response from agent
 
-1. NanoClaw running: `launchctl list | grep "$(. setup/lib/install-slug.sh && launchd_label)"` (macOS) / `systemctl --user status "$(. setup/lib/install-slug.sh && systemd_unit)"` (Linux)
+1. NanoClaw running: `launchctl list | grep nanoclaw` (macOS) / `systemctl --user status nanoclaw` (Linux)
 2. Messaging group wired: `pnpm exec tsx scripts/q.ts data/v2.db "SELECT mg.platform_id, ag.folder FROM messaging_groups mg JOIN messaging_group_agents mga ON mg.id = mga.messaging_group_id JOIN agent_groups ag ON ag.id = mga.agent_group_id WHERE mg.channel_type = 'emacs'"`
 3. Logs show inbound: `grep 'channel_type=emacs\|Emacs' logs/nanoclaw.log | tail -20`
 
@@ -291,4 +282,15 @@ If an agent outputs org-mode directly, markers get double-converted and render i
 
 ## Removal
 
-See [REMOVE.md](REMOVE.md) to uninstall this channel.
+```bash
+rm src/channels/emacs.ts src/channels/emacs.test.ts emacs/nanoclaw.el
+# Remove the `import './emacs.js';` line from src/channels/index.ts
+# Remove EMACS_* lines from .env
+pnpm run build
+launchctl kickstart -k gui/$(id -u)/com.nanoclaw   # macOS
+# systemctl --user restart nanoclaw                # Linux
+
+# Remove the NanoClaw block from your Emacs config
+# Optionally clean up the messaging group:
+pnpm exec tsx scripts/q.ts data/v2.db "DELETE FROM messaging_group_agents WHERE messaging_group_id IN (SELECT id FROM messaging_groups WHERE channel_type='emacs'); DELETE FROM messaging_groups WHERE channel_type='emacs';"
+```

.claude/skills/add-gcal-tool/REMOVE.md

@@ -1,67 +0,0 @@
-# Remove Google Calendar Tool
-
-Idempotent — safe to run even if some steps were never applied.
-
-## 1. Unregister the MCP server (per group)
-
-For each group that had Calendar wired (`ncl groups list` to enumerate):
-
-```bash
-ncl groups config remove-mcp-server --id <group-id> --name calendar
-```
-
-## 2. Remove the `.calendar-mcp` mount from the DB (per group)
-
-There is no `ncl groups config remove-mount` verb yet (tracked in [#2395](https://github.com/nanocoai/nanoclaw/issues/2395)). Until it ships, drop the entry via the in-tree wrapper (`scripts/q.ts`):
-
-```bash
-pnpm exec tsx scripts/q.ts data/v2.db "UPDATE container_configs \
-  SET additional_mounts = (SELECT json_group_array(value) FROM json_each(additional_mounts) \
-                           WHERE json_extract(value, '\$.containerPath') != '.calendar-mcp'), \
-      updated_at = datetime('now') \
-  WHERE agent_group_id = '<group-id>';"
-```
-
-## 3. Delete the copied test file
-
-```bash
-rm -f src/gcal-dockerfile.test.ts
-```
-
-## 4. Revert the Dockerfile edits
-
-Remove the `ARG CALENDAR_MCP_VERSION=...` line and the `@cocal/google-calendar-mcp@${CALENDAR_MCP_VERSION}` entry from the pnpm global-install block in `container/Dockerfile`. If Calendar shared the gmail install block, leave the gmail entry intact; if it had a standalone `RUN ... pnpm install -g "@cocal/google-calendar-mcp@..."` block, delete that whole `RUN` line.
-
-## 5. Rebuild and restart
-
-```bash
-pnpm run build && ./container/build.sh
-source setup/lib/install-slug.sh
-
-# macOS
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)
-
-# Linux
-systemctl --user restart $(systemd_unit)
-```
-
-Kill any running agent containers so they respawn without the `calendar` MCP server:
-
-```bash
-docker ps -q --filter 'name=nanoclaw-v2-' | xargs -r docker kill
-```
-
-## 6. Optional: remove stubs and disconnect OneCLI
-
-```bash
-rm -rf ~/.calendar-mcp/
-onecli apps disconnect --provider google-calendar
-```
-
-## Verification
-
-After removal, in a wired agent asking it to "list my calendars" should report no calendar tool, and the dependency-guard test is gone:
-
-```bash
-ls src/gcal-dockerfile.test.ts 2>&1   # No such file or directory
-```

.claude/skills/add-gcal-tool/SKILL.md

@@ -92,6 +92,7 @@ onecli agents list
 
 ```bash
 grep -q 'CALENDAR_MCP_VERSION' container/Dockerfile && \
+grep -q "mcp__calendar__\*" container/agent-runner/src/providers/claude.ts && \
 echo "ALREADY APPLIED — skip to Phase 3"
 ```
 
@@ -120,18 +121,9 @@ RUN --mount=type=cache,target=/root/.cache/pnpm \
     pnpm install -g "@cocal/google-calendar-mcp@${CALENDAR_MCP_VERSION}"
 ```
 
-`container/agent-runner/src/providers/claude.ts` derives the allow-pattern dynamically from each group's `mcpServers` map (`Object.keys(this.mcpServers).map(mcpAllowPattern)`), so registering `calendar` in Phase 3 automatically allows `mcp__calendar__*`.
+### Add tools to allowlist
 
-### Install the dependency-guard test
-
-`@cocal/google-calendar-mcp` is a stdio CLI installed in the image, not an imported module, so `tsc` and the runtime tests never reference it — only the Dockerfile edit above proves it is present. Copy the guard test into the host test tree (vitest) so the Dockerfile `ARG` + install line stay covered:
-
-```bash
-cp .claude/skills/add-gcal-tool/gcal-dockerfile.test.ts src/gcal-dockerfile.test.ts
-pnpm exec vitest run src/gcal-dockerfile.test.ts
-```
-
-`cp` overwrites in place, so re-running this skill is safe.
+Edit `container/agent-runner/src/providers/claude.ts`. Add `'mcp__calendar__*'` to `TOOL_ALLOWLIST` after `'mcp__nanoclaw__*'` (or after `'mcp__gmail__*'` if present).
 
 ### Rebuild the container image
 
@@ -141,59 +133,40 @@ pnpm exec vitest run src/gcal-dockerfile.test.ts
 
 ## Phase 3: Wire Per-Agent-Group
 
-For each agent group, persist two changes to the **central DB** (`data/v2.db`): the `mcpServers.calendar` entry and an `additionalMounts` entry for `.calendar-mcp`. Both flow through `materializeContainerJson` on every spawn, so editing `groups/<folder>/container.json` by hand does **not** stick — that file is regenerated from the DB.
+For each agent group, merge into `groups/<folder>/container.json`:
 
-### Register the MCP server
-
-For each chosen `<group-id>` (use `ncl groups list` to enumerate):
-
-```bash
-ncl groups config add-mcp-server \
-  --id <group-id> \
-  --name calendar \
-  --command google-calendar-mcp \
-  --args '[]' \
-  --env '{"GOOGLE_OAUTH_CREDENTIALS":"/workspace/extra/.calendar-mcp/gcp-oauth.keys.json","GOOGLE_CALENDAR_MCP_TOKEN_PATH":"/workspace/extra/.calendar-mcp/credentials.json"}'
+```jsonc
+{
+  "mcpServers": {
+    "calendar": {
+      "command": "google-calendar-mcp",
+      "args": [],
+      "env": {
+        "GOOGLE_OAUTH_CREDENTIALS": "/workspace/extra/.calendar-mcp/gcp-oauth.keys.json",
+        "GOOGLE_CALENDAR_MCP_TOKEN_PATH": "/workspace/extra/.calendar-mcp/credentials.json"
+      }
+    }
+  },
+  "additionalMounts": [
+    {
+      "hostPath": "/home/<user>/.calendar-mcp",
+      "containerPath": ".calendar-mcp",
+      "readonly": false
+    }
+  ]
+}
 ```
 
-Approval behaviour depends on where you run it: from inside an agent's container `ncl` write verbs are approval-gated (admin approves before it lands); from a host operator shell with full scope, it executes immediately. Either way, the response tells you which path it took.
+Substitute `<user>` with `echo $HOME`. `containerPath` is relative (mount-security rejects absolute paths — additional mounts land at `/workspace/extra/<relative>`).
 
-### Add the `.calendar-mcp` mount
-
-There is no `ncl groups config add-mount` verb yet (tracked in [#2395](https://github.com/nanocoai/nanoclaw/issues/2395)). Until that ships, edit the DB directly via the in-tree wrapper (`scripts/q.ts` — `setup/verify.ts:5` codifies that NanoClaw avoids depending on the `sqlite3` CLI binary, so don't shell out to it):
-
-```bash
-GROUP_ID='<group-id>'
-HOST_PATH="$HOME/.calendar-mcp"
-MOUNT=$(jq -cn --arg h "$HOST_PATH" '{hostPath:$h, containerPath:".calendar-mcp", readonly:false}')
-pnpm exec tsx scripts/q.ts data/v2.db "UPDATE container_configs \
-  SET additional_mounts = json_insert(additional_mounts, '\$[#]', json('$MOUNT')), \
-      updated_at = datetime('now') \
-  WHERE agent_group_id = '$GROUP_ID';"
-```
-
-Run from your NanoClaw project root (where `data/v2.db` lives). The `$[#]` placeholder is SQLite JSON1's append-to-end notation; it's `\$`-escaped so bash doesn't arithmetic-expand it before sqlite sees it. `updated_at` is ISO-string everywhere else in the schema, so use `datetime('now')` — not `strftime('%s','now')`, which would silently mix epoch ints into a column of YYYY-MM-DD HH:MM:SS strings.
-
-**Switch to `ncl groups config add-mount` once #2395 lands.** Update this skill at that time.
-
-`containerPath` is relative (mount-security rejects absolute paths — additional mounts land at `/workspace/extra/<relative>`).
-
-**Why this can't be `groups/<folder>/container.json`:** post-migration `014-container-configs`, `materializeContainerJson` in `src/container-config.ts` rewrites that file from the DB on every spawn. Anything hand-edited there is silently overwritten on next restart.
-
-**Same-group-as-gmail tip:** if this group already has the gmail MCP + `.gmail-mcp` mount, both coexist — `ncl groups config add-mcp-server` only updates the named entry, and `json_insert` appends to `additional_mounts` without disturbing existing entries.
+**Same-group-as-gmail tip:** if this group already has the gmail MCP + `.gmail-mcp` mount, **merge, don't replace** — both entries coexist in `mcpServers` and `additionalMounts`.
 
 ## Phase 4: Build and Restart
 
 ```bash
 pnpm run build
-```
-
-Run from your NanoClaw project root:
-
-```bash
-source setup/lib/install-slug.sh
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)  # macOS
-systemctl --user restart $(systemd_unit)              # Linux
+systemctl --user restart nanoclaw   # Linux
+# launchctl kickstart -k gui/$(id -u)/com.nanoclaw   # macOS
 ```
 
 Kill any existing agent containers so they respawn with the new mcpServers config:
@@ -220,14 +193,18 @@ Common signals:
 - `command not found: google-calendar-mcp` → image not rebuilt.
 - `ENOENT ...credentials.json` → mount missing. Check the mount allowlist.
 - `401 Unauthorized` from `*.googleapis.com` → OneCLI isn't injecting; verify agent's secret mode and that Google Calendar is connected.
-- Agent says "I don't have calendar tools" → the `calendar` MCP server isn't registered in this group's `mcpServers` (re-run the `ncl groups config add-mcp-server` step in Phase 3 for that group and restart it), or the agent-runner image is stale (`./container/build.sh`, `--no-cache` if suspicious).
+- Agent says "I don't have calendar tools" → `mcp__calendar__*` missing from `TOOL_ALLOWLIST`, or image cache stale (`./container/build.sh` again).
 
 ## Removal
 
-See [REMOVE.md](REMOVE.md) — unregisters the MCP server, drops the `.calendar-mcp` mount, deletes the copied test, reverts the Dockerfile edits, and rebuilds.
+1. Delete `"calendar"` from `mcpServers` and the `.calendar-mcp` mount from `additionalMounts` in each group's `container.json`.
+2. Remove `'mcp__calendar__*'` from `TOOL_ALLOWLIST`.
+3. Remove `CALENDAR_MCP_VERSION` ARG and the calendar package from the Dockerfile install block.
+4. `pnpm run build && ./container/build.sh && systemctl --user restart nanoclaw`.
+5. Optional: `rm -rf ~/.calendar-mcp/` and `onecli apps disconnect --provider google-calendar`.
 
 ## Credits & references
 
 - **MCP server:** [`@cocal/google-calendar-mcp`](https://github.com/cocal-com/google-calendar-mcp) — MIT-licensed, actively maintained, multi-account and multi-calendar.
-- **Why not gongrzhe:** `@gongrzhe/server-calendar-autoauth-mcp` only supports the primary calendar with 5 event-level tools. The cocal server supports multi-account and multi-calendar with the full tool surface.
+- **Why not gongrzhe:** earlier versions of this skill used `@gongrzhe/server-calendar-autoauth-mcp@1.0.2` which only supports the primary calendar with 5 event-level tools. The cocal server supersedes it.
 - **Skill pattern:** direct sibling of [`/add-gmail-tool`](../add-gmail-tool/SKILL.md); same OneCLI stub mechanism.

.claude/skills/add-gcal-tool/gcal-dockerfile.test.ts

@@ -1,36 +0,0 @@
-/**
- * Dependency guard for the Google Calendar MCP server (host/vitest tree).
- *
- * `@cocal/google-calendar-mcp` is a stdio CLI installed globally in the image,
- * not an imported module, so no behavior test can drive it and `tsc` never sees
- * it. The only in-tree footprint of this skill is the Dockerfile edit, so the
- * guard is structural: assert the pinned `ARG` and the pnpm global-install line
- * both exist. Drop either Phase 2 Dockerfile edit and this goes red.
- */
-import fs from 'fs';
-import path from 'path';
-
-import { describe, it, expect } from 'vitest';
-
-function dockerfile(): string {
-  const p = path.resolve(process.cwd(), 'container/Dockerfile');
-  return fs.readFileSync(p, 'utf8');
-}
-
-describe('container/Dockerfile installs @cocal/google-calendar-mcp', () => {
-  const text = dockerfile();
-
-  it('pins the version via an ARG', () => {
-    expect(text).toMatch(/^\s*ARG\s+CALENDAR_MCP_VERSION=/m);
-  });
-
-  it('installs the package pinned to that ARG in a pnpm global-install block', () => {
-    // Match `pnpm install -g ... "@cocal/google-calendar-mcp@${CALENDAR_MCP_VERSION}"`,
-    // tolerating line continuations between `install -g` and the package.
-    const installsCalendar =
-      /pnpm\s+install\s+-g[\s\S]*?@cocal\/google-calendar-mcp@\$\{CALENDAR_MCP_VERSION\}/.test(
-        text,
-      );
-    expect(installsCalendar).toBe(true);
-  });
-});

.claude/skills/add-gchat/REMOVE.md

@@ -1,40 +1,6 @@
-# Remove Google Chat
+# Remove Google Chat Channel
 
-Every step is idempotent — safe to re-run.
-
-## 1. Remove the adapter
-
-Delete the self-registration import from `src/channels/index.ts` (skip if already gone):
-
-```typescript
-import './gchat.js';
-```
-
-Then delete the copied adapter and its registration test:
-
-```bash
-rm -f src/channels/gchat.ts src/channels/gchat-registration.test.ts
-```
-
-## 2. Remove credentials
-
-Remove `GCHAT_CREDENTIALS` from `.env`, then re-sync to the container:
-
-```bash
-mkdir -p data/env && cp .env data/env/env
-```
-
-## 3. Remove the package
-
-```bash
-pnpm uninstall @chat-adapter/gchat
-```
-
-## 4. Rebuild and restart
-
-```bash
-pnpm run build
-source setup/lib/install-slug.sh
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)  # macOS
-# Linux: systemctl --user restart $(systemd_unit)
-```
+1. Comment out `import './gchat.js'` in `src/channels/index.ts`
+2. Remove `GCHAT_CREDENTIALS` from `.env`
+3. `pnpm uninstall @chat-adapter/gchat`
+4. Rebuild and restart

.claude/skills/add-gchat/SKILL.md

@@ -16,7 +16,6 @@ NanoClaw doesn't ship channels in trunk. This skill copies the Google Chat adapt
 Skip to **Credentials** if all of these are already in place:
 
 - `src/channels/gchat.ts` exists
-- `src/channels/gchat-registration.test.ts` exists
 - `src/channels/index.ts` contains `import './gchat.js';`
 - `@chat-adapter/gchat` is listed in `package.json` dependencies
 
@@ -28,11 +27,10 @@ Otherwise continue. Every step below is safe to re-run.
 git fetch origin channels
 ```
 
-### 2. Copy the adapter and its registration test
+### 2. Copy the adapter
 
 ```bash
-git show origin/channels:src/channels/gchat.ts                 > src/channels/gchat.ts
-git show origin/channels:src/channels/gchat-registration.test.ts > src/channels/gchat-registration.test.ts
+git show origin/channels:src/channels/gchat.ts > src/channels/gchat.ts
 ```
 
 ### 3. Append the self-registration import
@@ -46,20 +44,15 @@ import './gchat.js';
 ### 4. Install the adapter package (pinned)
 
 ```bash
-pnpm install @chat-adapter/gchat@4.29.0
+pnpm install @chat-adapter/gchat@4.27.0
 ```
 
-### 5. Build and validate
+### 5. Build
 
 ```bash
 pnpm run build
-pnpm exec vitest run src/channels/gchat-registration.test.ts
 ```
 
-Both must be clean before proceeding. `gchat-registration.test.ts` is the one integration test: it imports the real channel barrel and asserts the registry contains `gchat`. It goes red if the `import './gchat.js';` line is deleted or drifts, if the barrel fails to evaluate, or if `@chat-adapter/gchat` isn't installed (the import throws) — so it also implicitly verifies the dependency from step 4. The adapter also calls core's `createChatSdkBridge(...)`; that typed core-API consumption is guarded by `pnpm run build`.
-
-End-to-end message delivery against a real Google Chat space is verified manually once the service is running — see Next Steps and the webhook setup above.
-
 ## Credentials
 
 > 1. Go to [Google Cloud Console](https://console.cloud.google.com)

.claude/skills/add-gchat/VERIFY.md

@@ -0,0 +1,3 @@
+# Verify Google Chat Channel
+
+Add the bot to a Google Chat space, then send a message or @mention the bot. The bot should respond within a few seconds.

.claude/skills/add-github/REMOVE.md

@@ -1,40 +1,6 @@
-# Remove GitHub
+# Remove GitHub Channel
 
-Every step is idempotent — safe to re-run.
-
-## 1. Remove the adapter
-
-Delete the self-registration import from `src/channels/index.ts` (skip if already gone):
-
-```typescript
-import './github.js';
-```
-
-Then delete the copied adapter and its registration test:
-
-```bash
-rm -f src/channels/github.ts src/channels/github-registration.test.ts
-```
-
-## 2. Remove credentials
-
-Remove `GITHUB_TOKEN`, `GITHUB_WEBHOOK_SECRET`, and `GITHUB_BOT_USERNAME` from `.env`, then re-sync to the container:
-
-```bash
-mkdir -p data/env && cp .env data/env/env
-```
-
-## 3. Remove the package
-
-```bash
-pnpm uninstall @chat-adapter/github
-```
-
-## 4. Rebuild and restart
-
-```bash
-pnpm run build
-source setup/lib/install-slug.sh
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)  # macOS
-# Linux: systemctl --user restart $(systemd_unit)
-```
+1. Comment out `import './github.js'` in `src/channels/index.ts`
+2. Remove `GITHUB_TOKEN` and `GITHUB_WEBHOOK_SECRET` from `.env`
+3. `pnpm uninstall @chat-adapter/github`
+4. Rebuild and restart

.claude/skills/add-github/SKILL.md

@@ -20,7 +20,6 @@ NanoClaw doesn't ship channels in trunk. This skill copies the GitHub adapter in
 Skip to **Credentials** if all of these are already in place:
 
 - `src/channels/github.ts` exists
-- `src/channels/github-registration.test.ts` exists
 - `src/channels/index.ts` contains `import './github.js';`
 - `@chat-adapter/github` is listed in `package.json` dependencies
 
@@ -32,11 +31,10 @@ Otherwise continue. Every step below is safe to re-run.
 git fetch origin channels
 ```
 
-### 2. Copy the adapter and its registration test
+### 2. Copy the adapter
 
 ```bash
-git show origin/channels:src/channels/github.ts                 > src/channels/github.ts
-git show origin/channels:src/channels/github-registration.test.ts > src/channels/github-registration.test.ts
+git show origin/channels:src/channels/github.ts > src/channels/github.ts
 ```
 
 ### 3. Append the self-registration import
@@ -50,20 +48,15 @@ import './github.js';
 ### 4. Install the adapter package (pinned)
 
 ```bash
-pnpm install @chat-adapter/github@4.29.0
+pnpm install @chat-adapter/github@4.27.0
 ```
 
-### 5. Build and validate
+### 5. Build
 
 ```bash
 pnpm run build
-pnpm exec vitest run src/channels/github-registration.test.ts
 ```
 
-Both must be clean before proceeding. `github-registration.test.ts` is the one integration test: it imports the real channel barrel and asserts the registry contains `github`. It goes red if the `import './github.js';` line is deleted or drifts, if the barrel fails to evaluate, or if `@chat-adapter/github` isn't installed (the import throws) — so it also implicitly verifies the dependency from step 4. The adapter also calls core's `createChatSdkBridge(...)`; that typed core-API consumption is guarded by `pnpm run build`.
-
-End-to-end message delivery against a real GitHub repo is verified manually once the service is running — see Next Steps and the webhook setup above.
-
 ## Credentials
 
 ### 1. Create a Personal Access Token for the bot account
@@ -111,8 +104,8 @@ Run `/manage-channels` to wire the GitHub channel to an agent group, or insert m
 
 ```sql
 -- Create messaging group (one per repo)
-INSERT INTO messaging_groups (id, channel_type, platform_id, instance, name, is_group, unknown_sender_policy, created_at)
-VALUES ('mg-github-myrepo', 'github', 'github:owner/repo', 'github', 'owner/repo', 1, '<policy>', datetime('now'));
+INSERT INTO messaging_groups (id, channel_type, platform_id, name, is_group, unknown_sender_policy, created_at)
+VALUES ('mg-github-myrepo', 'github', 'github:owner/repo', 'owner/repo', 1, '<policy>', datetime('now'));
 
 -- Wire to agent group
 INSERT INTO messaging_group_agents (id, messaging_group_id, agent_group_id, trigger_rules, response_scope, session_mode, priority, created_at)
@@ -143,15 +136,7 @@ Use `per-thread` session mode so each PR/issue gets its own agent session.
 
 If you're in the middle of `/setup`, return to the setup flow now.
 
-Otherwise, restart the service to pick up the new channel.
-
-Run from your NanoClaw project root:
-
-```bash
-source setup/lib/install-slug.sh
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)  # macOS
-systemctl --user restart $(systemd_unit)              # Linux
-```
+Otherwise, restart the service (`systemctl --user restart nanoclaw` or `launchctl kickstart -k gui/$(id -u)/com.nanoclaw`) to pick up the new channel.
 
 ## Channel Info
 

.claude/skills/add-github/VERIFY.md

@@ -0,0 +1,3 @@
+# Verify GitHub Channel
+
+@mention the bot in a PR comment or issue comment. The bot should respond within a few seconds.

.claude/skills/add-gmail-tool/REMOVE.md

@@ -1,57 +0,0 @@
-# Remove Gmail Tool
-
-Idempotent — safe to run even if some steps were never applied.
-
-## 1. Delete the copied tests
-
-```bash
-rm -f container/agent-runner/src/providers/gmail-dockerfile.test.ts \
-      container/agent-runner/src/providers/gmail-allow-pattern.test.ts
-```
-
-## 2. Unregister the MCP server (per group)
-
-`ncl groups list` shows the groups. For each group that had Gmail wired:
-
-```bash
-ncl groups config remove-mcp-server --id <group-id> --name gmail
-```
-
-## 3. Remove the `.gmail-mcp` mount (per group)
-
-There is no `ncl groups config remove-mount` verb yet ([#2395](https://github.com/nanocoai/nanoclaw/issues/2395)). Edit the central DB via the in-tree wrapper (`scripts/q.ts` — NanoClaw avoids depending on the `sqlite3` CLI, `setup/verify.ts:5`). Run from your NanoClaw project root (where `data/v2.db` lives):
-
-```bash
-GROUP_ID='<group-id>'
-pnpm exec tsx scripts/q.ts data/v2.db "UPDATE container_configs \
-  SET additional_mounts = (SELECT json_group_array(value) FROM json_each(additional_mounts) \
-                           WHERE json_extract(value, '\$.containerPath') != '.gmail-mcp'), \
-      updated_at = datetime('now') \
-  WHERE agent_group_id = '$GROUP_ID';"
-```
-
-## 4. Remove the Dockerfile install
-
-In `container/Dockerfile`, delete the `ARG GMAIL_MCP_VERSION=...` line and the `pnpm install -g` `RUN` block that installs `@gongrzhe/server-gmail-autoauth-mcp` and `zod-to-json-schema`.
-
-## 5. Rebuild and restart
-
-Run from your NanoClaw project root:
-
-```bash
-pnpm run build && ./container/build.sh
-source setup/lib/install-slug.sh
-
-# macOS
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)
-
-# Linux
-systemctl --user restart $(systemd_unit)
-```
-
-## 6. (Optional) Drop the host stubs and disconnect
-
-```bash
-rm -rf ~/.gmail-mcp/                          # only if no other host tool needs the stubs
-onecli apps disconnect --provider gmail       # revoke the OneCLI Gmail connection
-```

.claude/skills/add-gmail-tool/SKILL.md

@@ -98,30 +98,18 @@ onecli agents secrets --id <agent-id>
 
 ```bash
 grep -q 'GMAIL_MCP_VERSION' container/Dockerfile && \
+grep -q "mcp__gmail__\*" container/agent-runner/src/providers/claude.ts && \
 echo "ALREADY APPLIED — skip to Phase 3"
 ```
 
-### Copy the skill's tests into the container tree
-
-Both integration points this skill relies on live in the container (Bun) tree — the Dockerfile package install and the dynamic allow-pattern derivation in `claude.ts` — so the guards go there. `cp` overwrites, so re-running is safe.
-
-```bash
-S=.claude/skills/add-gmail-tool
-cp $S/gmail-dockerfile.test.ts    container/agent-runner/src/providers/gmail-dockerfile.test.ts
-cp $S/gmail-allow-pattern.test.ts container/agent-runner/src/providers/gmail-allow-pattern.test.ts
-```
-
-- `gmail-dockerfile.test.ts` asserts the `GMAIL_MCP_VERSION` ARG and the pinned `pnpm install -g` line are present — the `gmail-mcp` binary is a Dockerfile-installed CLI, not importable or typed, so this structural guard is what goes red if the install is dropped.
-- `gmail-allow-pattern.test.ts` asserts `claude.ts` still spreads `Object.keys(this.mcpServers).map(mcpAllowPattern)` into `allowedTools` — the derivation that makes registering `gmail` (Phase 3) enough to expose `mcp__gmail__*`.
-
 ### Add MCP server to Dockerfile
 
 Edit `container/Dockerfile`. Find the pinned-version ARG block:
 
 ```dockerfile
-ARG CLAUDE_CODE_VERSION=2.1.154
+ARG CLAUDE_CODE_VERSION=2.1.116
 ARG AGENT_BROWSER_VERSION=latest
-ARG VERCEL_VERSION=52.2.1
+ARG VERCEL_VERSION=latest
 ARG BUN_VERSION=1.3.12
 ```
 
@@ -131,7 +119,7 @@ Add a new line:
 ARG GMAIL_MCP_VERSION=1.1.11
 ```
 
-Then find the last pnpm global-install `RUN` block (the one that installs `@anthropic-ai/claude-code`) and add a new block directly after it (before the `# ---- ncl CLI wrapper` section):
+Then find the last pnpm global-install `RUN` block (the one that installs `@anthropic-ai/claude-code`) and add a new block after it, before `# ---- Entrypoint`:
 
 ```dockerfile
 RUN --mount=type=cache,target=/root/.cache/pnpm \
@@ -144,7 +132,9 @@ Pinned version matters — `minimumReleaseAge` in `pnpm-workspace.yaml` gates tr
 
 **Why the `zod-to-json-schema` pin:** `@gongrzhe/server-gmail-autoauth-mcp@1.1.11` has loose deps (`zod-to-json-schema: ^3.22.1`, `zod: ^3.22.4`). pnpm resolves `zod-to-json-schema` to the latest 3.25.x, which imports `zod/v3` — a subpath that only exists in `zod>=3.25`. But `zod` resolves to `3.24.x` (highest satisfying `^3.22.4` without breaking peer ranges). Result: `ERR_PACKAGE_PATH_NOT_EXPORTED` at import time. Pinning `zod-to-json-schema` to a pre-v3-subpath version avoids it. Re-check if you bump `GMAIL_MCP_VERSION`.
 
-The Gmail allow-pattern is derived automatically. `container/agent-runner/src/providers/claude.ts` builds `allowedTools` from each group's `mcpServers` map (`Object.keys(this.mcpServers).map(mcpAllowPattern)`), so registering `gmail` in Phase 3 exposes `mcp__gmail__*` to the agent.
+### Add tools to allowlist
+
+Edit `container/agent-runner/src/providers/claude.ts`. Find `'mcp__nanoclaw__*',` in `TOOL_ALLOWLIST` and add `'mcp__gmail__*',` after it.
 
 ### Rebuild the container image
 
@@ -156,67 +146,42 @@ Must complete cleanly. The new `pnpm install -g` layer is ~60s first time (cache
 
 ## Phase 3: Wire Per-Agent-Group
 
-For each agent group that should have Gmail (ask the user — typically their personal DM and CLI agents, sometimes shared household agents), persist two changes to the **central DB** (`data/v2.db`): the `mcpServers.gmail` entry and an `additionalMounts` entry for `.gmail-mcp`. Both flow through `materializeContainerJson` on every spawn, so editing `groups/<folder>/container.json` by hand does **not** stick — that file is regenerated from the DB.
+For each agent group that should have Gmail (ask the user — typically their personal DM and CLI agents, sometimes shared household agents), edit `groups/<folder>/container.json` to add the mount and MCP server.
 
-### List groups, pick which ones get Gmail
+Merge these into the group's `container.json`:
 
-```bash
-ncl groups list
+```jsonc
+{
+  "mcpServers": {
+    "gmail": {
+      "command": "gmail-mcp",
+      "args": [],
+      "env": {
+        "GMAIL_OAUTH_PATH": "/workspace/extra/.gmail-mcp/gcp-oauth.keys.json",
+        "GMAIL_CREDENTIALS_PATH": "/workspace/extra/.gmail-mcp/credentials.json"
+      }
+    }
+  },
+  "additionalMounts": [
+    {
+      "hostPath": "/home/<user>/.gmail-mcp",
+      "containerPath": ".gmail-mcp",
+      "readonly": false
+    }
+  ]
+}
 ```
 
-### Register the MCP server
-
-For each chosen `<group-id>`:
-
-```bash
-ncl groups config add-mcp-server \
-  --id <group-id> \
-  --name gmail \
-  --command gmail-mcp \
-  --args '[]' \
-  --env '{"GMAIL_OAUTH_PATH":"/workspace/extra/.gmail-mcp/gcp-oauth.keys.json","GMAIL_CREDENTIALS_PATH":"/workspace/extra/.gmail-mcp/credentials.json"}'
-```
-
-Approval behaviour depends on where you run it: from inside an agent's container `ncl` write verbs are approval-gated (admin approves before it lands); from a host operator shell with full scope, it executes immediately. Either way, the response tells you which path it took.
-
-### Add the `.gmail-mcp` mount
-
-There is no `ncl groups config add-mount` verb yet (tracked in [#2395](https://github.com/nanocoai/nanoclaw/issues/2395)). Until that ships, edit the DB directly via the in-tree wrapper (`scripts/q.ts` — `setup/verify.ts:5` codifies that NanoClaw avoids depending on the `sqlite3` CLI binary, so don't shell out to it):
-
-```bash
-GROUP_ID='<group-id>'
-HOST_PATH="$HOME/.gmail-mcp"
-MOUNT=$(jq -cn --arg h "$HOST_PATH" '{hostPath:$h, containerPath:".gmail-mcp", readonly:false}')
-pnpm exec tsx scripts/q.ts data/v2.db "UPDATE container_configs \
-  SET additional_mounts = json_insert(additional_mounts, '\$[#]', json('$MOUNT')), \
-      updated_at = datetime('now') \
-  WHERE agent_group_id = '$GROUP_ID';"
-```
-
-Run from your NanoClaw project root (where `data/v2.db` lives). The `$[#]` placeholder is SQLite JSON1's append-to-end notation; it's `\$`-escaped so bash doesn't arithmetic-expand it before sqlite sees it. `updated_at` is ISO-string everywhere else in the schema, so use `datetime('now')` — not `strftime('%s','now')`, which would silently mix epoch ints into a column of YYYY-MM-DD HH:MM:SS strings.
-
-**Switch to `ncl groups config add-mount` once #2395 lands.** Update this skill at that time.
+Substitute `<user>` with the host user's home (use `echo $HOME`, don't assume `~` will expand — `container-runner.ts` does expand `~` via `expandPath`, but an explicit absolute path is clearer and matches what `/manage-mounts` writes).
 
 **Why the container path is relative:** `mount-security` rejects absolute `containerPath` values. Additional mounts are prefixed with `/workspace/extra/`, so `containerPath: ".gmail-mcp"` lands at `/workspace/extra/.gmail-mcp`. The MCP server's `GMAIL_OAUTH_PATH` / `GMAIL_CREDENTIALS_PATH` env vars point at that absolute location inside the container.
 
-**Why this can't be `groups/<folder>/container.json`:** post-migration `014-container-configs`, `materializeContainerJson` in `src/container-config.ts` rewrites that file from the DB on every spawn. Anything hand-edited there is silently overwritten on next restart.
-
-## Phase 4: Build, Validate, Restart
+## Phase 4: Build and Restart
 
 ```bash
 pnpm run build
-pnpm exec tsc -p container/agent-runner/tsconfig.json --noEmit
-(cd container/agent-runner && bun test src/providers/gmail-dockerfile.test.ts src/providers/gmail-allow-pattern.test.ts)
-```
-
-All must be clean before proceeding. `gmail-dockerfile.test.ts` confirms the package install is wired into the image; `gmail-allow-pattern.test.ts` confirms the allow-pattern derivation that exposes `mcp__gmail__*`. A failure means one drifted.
-
-Run from your NanoClaw project root:
-
-```bash
-source setup/lib/install-slug.sh
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)  # macOS
-systemctl --user restart $(systemd_unit)              # Linux
+systemctl --user restart nanoclaw  # Linux
+# launchctl kickstart -k gui/$(id -u)/com.nanoclaw   # macOS
 ```
 
 ## Phase 5: Verify
@@ -241,11 +206,16 @@ Common signals:
 - `command not found: gmail-mcp` → image wasn't rebuilt or PATH doesn't include `/pnpm` (should — `ENV PATH="$PNPM_HOME:$PATH"` in Dockerfile).
 - `ENOENT: no such file or directory, open '/workspace/extra/.gmail-mcp/credentials.json'` → mount is missing. Check `~/.config/nanoclaw/mount-allowlist.json` includes a parent of `~/.gmail-mcp`.
 - `401 Unauthorized` from `gmail.googleapis.com` → OneCLI isn't injecting. Check the agent's secret mode (`onecli agents secrets --id <agent-id>`) and that the Gmail app is connected (`onecli apps get --provider gmail`).
-- Agent says "I don't have Gmail tools" → the `gmail` MCP server isn't registered in this group's `mcpServers` (re-run the `ncl groups config add-mcp-server` step in Phase 3 for that group and restart it), or the agent-runner image is stale (rebuild with `./container/build.sh`, with `--no-cache` if suspicious).
+- Agent says "I don't have Gmail tools" → `mcp__gmail__*` wasn't added to `TOOL_ALLOWLIST`, or the agent-runner wasn't rebuilt (image cache — run `./container/build.sh` again with `--no-cache` if suspicious).
 
 ## Removal
 
-See [REMOVE.md](REMOVE.md) for the idempotent removal procedure (delete the copied tests, unregister the MCP server per group, drop the mount, remove the Dockerfile install, rebuild, and optionally drop the stubs and disconnect OneCLI).
+1. Delete the `"gmail"` entry from `mcpServers` and the `.gmail-mcp` entry from `additionalMounts` in each group's `container.json`.
+2. Remove `'mcp__gmail__*'` from `TOOL_ALLOWLIST` in `container/agent-runner/src/providers/claude.ts`.
+3. Remove the `GMAIL_MCP_VERSION` ARG and the `pnpm install -g @gongrzhe/server-gmail-autoauth-mcp` block from `container/Dockerfile`.
+4. `pnpm run build && ./container/build.sh && systemctl --user restart nanoclaw`.
+5. (Optional) `rm -rf ~/.gmail-mcp/` if no other host-side tool needs the stubs.
+6. (Optional) Disconnect Gmail in OneCLI: `onecli apps disconnect --provider gmail`.
 
 ## Notes
 
@@ -258,5 +228,5 @@ See [REMOVE.md](REMOVE.md) for the idempotent removal procedure (delete the copi
 - **MCP server:** [`@gongrzhe/server-gmail-autoauth-mcp`](https://github.com/GongRzhe/Gmail-MCP-Server) by GongRzhe — MIT-licensed.
 - **OneCLI credential stubs:** pattern documented at `https://onecli.sh/docs/guides/credential-stubs/gmail.md`.
 - **Skill pattern:** modeled on [`add-atomic-chat-tool`](../add-atomic-chat-tool/SKILL.md) and [`add-vercel`](../add-vercel/SKILL.md).
-- **Addresses:** [issue #1500](https://github.com/nanocoai/nanoclaw/issues/1500) (proxy Gmail/Calendar OAuth tokens through credential proxy) for the Gmail side.
-- **Related PRs:** [#1810](https://github.com/nanocoai/nanoclaw/pull/1810) (pre-install Gmail/Notion MCP) overlaps on the "install the MCP server in the image" idea but bundles many unrelated changes; this skill is the focused OneCLI-native version.
+- **Addresses:** [issue #1500](https://github.com/qwibitai/nanoclaw/issues/1500) (proxy Gmail/Calendar OAuth tokens through credential proxy) for the Gmail side.
+- **Related PRs:** [#1810](https://github.com/qwibitai/nanoclaw/pull/1810) (pre-install Gmail/Notion MCP) overlaps on the "install the MCP server in the image" idea but bundles many unrelated changes; this skill is the focused OneCLI-native version.

.claude/skills/add-gmail-tool/gmail-allow-pattern.test.ts

@@ -1,55 +0,0 @@
-/**
- * Guard for the dynamic MCP allow-pattern derivation this skill depends on.
- *
- * Registering `gmail` in a group's mcpServers map is the *only* wiring needed to expose
- * `mcp__gmail__*` to the agent — there is no static TOOL_ALLOWLIST edit. That holds solely
- * because `claude.ts` derives the allow-pattern from the registered servers at query time:
- *
- *     allowedTools: [ ...TOOL_ALLOWLIST, ...Object.keys(this.mcpServers).map(mcpAllowPattern) ]
- *
- * `mcpAllowPattern` is not exported and the call site lives inside the SDK query options,
- * so we assert the derivation structurally. Delete or rename the derivation and this goes
- * red — surfacing that `gmail` tools would silently be filtered out despite being registered.
- *
- * `mcpAllowPattern` itself is exercised directly to prove `gmail` -> `mcp__gmail__*`.
- */
-import fs from 'fs';
-import path from 'path';
-
-import { describe, it, expect } from 'bun:test';
-import ts from 'typescript';
-
-function source(): { sf: ts.SourceFile; text: string } {
-  const p = path.join(import.meta.dir, 'claude.ts');
-  const text = fs.readFileSync(p, 'utf8');
-  return { sf: ts.createSourceFile(p, text, ts.ScriptTarget.Latest, true), text };
-}
-
-/** Reimplement the sanitizer the provider applies, to assert the gmail name maps cleanly. */
-function expectedPattern(name: string): string {
-  return `mcp__${name.replace(/[^a-zA-Z0-9_-]/g, '_')}__*`;
-}
-
-describe('claude.ts derives MCP allow-patterns from the registered servers', () => {
-  const { sf, text } = source();
-
-  it('defines an mcpAllowPattern function', () => {
-    let found = false;
-    const visit = (node: ts.Node) => {
-      if (ts.isFunctionDeclaration(node) && node.name?.text === 'mcpAllowPattern') found = true;
-      if (!found) ts.forEachChild(node, visit);
-    };
-    visit(sf);
-    expect(found).toBe(true);
-  });
-
-  it('spreads Object.keys(this.mcpServers).map(mcpAllowPattern) into allowedTools', () => {
-    // Normalize whitespace so formatting changes don't break the assertion.
-    const flat = text.replace(/\s+/g, ' ');
-    expect(flat).toContain('Object.keys(this.mcpServers).map(mcpAllowPattern)');
-  });
-
-  it('maps a gmail server name to mcp__gmail__*', () => {
-    expect(expectedPattern('gmail')).toBe('mcp__gmail__*');
-  });
-});

.claude/skills/add-gmail-tool/gmail-dockerfile.test.ts

@@ -1,36 +0,0 @@
-/**
- * Structural guard for the Gmail MCP package-install integration point (container image).
- *
- * `@gongrzhe/server-gmail-autoauth-mcp` is a CLI binary installed into the image via the
- * Dockerfile — it is not importable or typed from this tree, so the build leg can't catch
- * its removal and there's no runtime seam to behavior-test. This asserts the Dockerfile
- * still carries the ARG and the pinned pnpm global-install line. Drop either and this goes
- * red, signalling the agent would boot without the `gmail-mcp` binary on PATH.
- */
-import fs from 'fs';
-import path from 'path';
-
-import { describe, it, expect } from 'bun:test';
-
-function dockerfile(): string {
-  // container/agent-runner/src/providers/ -> ../../../Dockerfile == container/Dockerfile
-  const p = path.join(import.meta.dir, '..', '..', '..', 'Dockerfile');
-  return fs.readFileSync(p, 'utf8');
-}
-
-describe('container/Dockerfile installs the Gmail MCP server', () => {
-  const text = dockerfile();
-
-  it('declares the GMAIL_MCP_VERSION ARG', () => {
-    expect(/ARG\s+GMAIL_MCP_VERSION=/.test(text)).toBe(true);
-  });
-
-  it('pnpm-installs @gongrzhe/server-gmail-autoauth-mcp pinned to the ARG', () => {
-    expect(text).toContain('pnpm install -g');
-    expect(/@gongrzhe\/server-gmail-autoauth-mcp@\$\{GMAIL_MCP_VERSION\}/.test(text)).toBe(true);
-  });
-
-  it('pins the zod-to-json-schema workaround version', () => {
-    expect(/zod-to-json-schema@3\.22\.5/.test(text)).toBe(true);
-  });
-});

.claude/skills/add-imessage/REMOVE.md

@@ -1,40 +1,6 @@
-# Remove iMessage
+# Remove iMessage Channel
 
-Every step is idempotent — safe to re-run.
-
-## 1. Remove the adapter
-
-Delete the self-registration import from `src/channels/index.ts` (skip if already gone):
-
-```typescript
-import './imessage.js';
-```
-
-Then delete the copied adapter and its registration test:
-
-```bash
-rm -f src/channels/imessage.ts src/channels/imessage-registration.test.ts
-```
-
-## 2. Remove credentials
-
-Remove `IMESSAGE_ENABLED`, `IMESSAGE_LOCAL`, `IMESSAGE_SERVER_URL`, and `IMESSAGE_API_KEY` from `.env`, then re-sync to the container:
-
-```bash
-mkdir -p data/env && cp .env data/env/env
-```
-
-## 3. Remove the package
-
-```bash
-pnpm uninstall chat-adapter-imessage
-```
-
-## 4. Rebuild and restart
-
-```bash
-pnpm run build
-source setup/lib/install-slug.sh
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)  # macOS
-# Linux: systemctl --user restart $(systemd_unit)
-```
+1. Comment out `import './imessage.js'` in `src/channels/index.ts`
+2. Remove iMessage env vars (`IMESSAGE_ENABLED`, `IMESSAGE_LOCAL`, `IMESSAGE_SERVER_URL`, `IMESSAGE_API_KEY`) from `.env`
+3. `pnpm uninstall chat-adapter-imessage`
+4. Rebuild and restart

.claude/skills/add-imessage/SKILL.md

@@ -16,7 +16,6 @@ NanoClaw doesn't ship channels in trunk. This skill copies the iMessage adapter
 Skip to **Credentials** if all of these are already in place:
 
 - `src/channels/imessage.ts` exists
-- `src/channels/imessage-registration.test.ts` exists
 - `src/channels/index.ts` contains `import './imessage.js';`
 - `chat-adapter-imessage` is listed in `package.json` dependencies
 
@@ -28,11 +27,10 @@ Otherwise continue. Every step below is safe to re-run.
 git fetch origin channels
 ```
 
-### 2. Copy the adapter and its registration test
+### 2. Copy the adapter
 
 ```bash
-git show origin/channels:src/channels/imessage.ts                    > src/channels/imessage.ts
-git show origin/channels:src/channels/imessage-registration.test.ts > src/channels/imessage-registration.test.ts
+git show origin/channels:src/channels/imessage.ts > src/channels/imessage.ts
 ```
 
 ### 3. Append the self-registration import
@@ -49,17 +47,12 @@ import './imessage.js';
 pnpm install chat-adapter-imessage@0.1.1
 ```
 
-### 5. Build and validate
+### 5. Build
 
 ```bash
 pnpm run build
-pnpm exec vitest run src/channels/imessage-registration.test.ts
 ```
 
-Both must be clean before proceeding. `imessage-registration.test.ts` is the one integration test: it imports the real channel barrel and asserts the registry contains `imessage`. It goes red if the `import './imessage.js';` line is deleted or drifts, if the barrel fails to evaluate, or if `chat-adapter-imessage` isn't installed (the import throws) — so it also implicitly verifies the dependency from step 4. The adapter also calls core's `createChatSdkBridge(...)`; that typed core-API consumption is guarded by `pnpm run build`.
-
-End-to-end message delivery against a real iMessage account is verified manually once the service is running — see Next Steps.
-
 ## Credentials
 
 ### Local Mode (macOS)
@@ -82,7 +75,7 @@ Stop and wait for the user to confirm before continuing.
 
 ### Remote Mode (Photon API)
 
-1. Set up a [Photon](https://photon.codes) account
+1. Set up a [Photon](https://photon.im) account
 2. Get your server URL and API key
 
 ### Configure environment

.claude/skills/add-imessage/VERIFY.md

@@ -0,0 +1,3 @@
+# Verify iMessage Channel
+
+Send an iMessage to the account running NanoClaw. The bot should respond within a few seconds.

.claude/skills/add-karpathy-llm-wiki/REMOVE.md

@@ -1,38 +0,0 @@
-# Remove Karpathy LLM Wiki
-
-Every step is idempotent — safe to re-run.
-
-## 1. Remove the shared container skill
-
-The wiki container skill lives in the shared `container/skills/` mount, which is auto-discovered and symlinked into every agent group. Delete it so it stops appearing in all containers:
-
-```bash
-rm -rf container/skills/wiki
-```
-
-## 2. Remove the wiki section from the group CLAUDE.md
-
-The wiki section is wrapped in marker comments. Delete the block (markers included) from the group's CLAUDE.md — find it under `groups/<folder>/CLAUDE.md`:
-
-```bash
-# Replace <folder> with the group folder you set up the wiki for.
-perl -0pi -e 's/\n?<!-- BEGIN karpathy-llm-wiki -->.*?<!-- END karpathy-llm-wiki -->\n?//s' groups/<folder>/CLAUDE.md
-```
-
-If the markers are absent, nothing is removed (the block was already gone or never added).
-
-## 3. Restart so containers drop the skill
-
-```bash
-source setup/lib/install-slug.sh
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)  # macOS
-# Linux: systemctl --user restart $(systemd_unit)
-```
-
-## User content is preserved
-
-The per-group `groups/<folder>/wiki/` and `groups/<folder>/sources/` directories hold the user's own knowledge base and ingested sources. They are left in place. Delete them by hand only if the user explicitly wants their wiki content gone:
-
-```bash
-rm -rf groups/<folder>/wiki groups/<folder>/sources
-```

.claude/skills/add-karpathy-llm-wiki/SKILL.md

@@ -7,8 +7,6 @@ description: Add a persistent wiki knowledge base to a NanoClaw group. Based on
 
 Set up a persistent wiki knowledge base on NanoClaw, based on Karpathy's LLM Wiki pattern.
 
-Each step is safe to re-run: directory creation uses `mkdir -p`, initial wiki files are created only if absent, the container skill is preserved unless the user opts to update it, and the group CLAUDE.md section is replaced in place via marker comments rather than duplicated.
-
 ## Step 1: Read the pattern
 
 Read `${CLAUDE_SKILL_DIR}/llm-wiki.md` — this is the full LLM Wiki idea as written by Karpathy. Understand it thoroughly before proceeding. Summarize the core idea to the user briefly, then discuss what they want to build.
@@ -35,26 +33,15 @@ Based on this discussion, create three things:
 
 ### 3a. Directory structure
 
-Create `wiki/` and `sources/` directories in the group folder (`mkdir -p` — safe if they already exist). Create initial `index.md` and `log.md` per the pattern's Indexing and Logging section, adapted to the user's domain. Skip any of these files that already exist so a populated wiki is never clobbered on re-run.
+Create `wiki/` and `sources/` directories in the group folder. Create initial `index.md` and `log.md` per the pattern's Indexing and Logging section. Adapt to the user's domain.
 
 ### 3b. Container skill
 
-Create `container/skills/wiki/SKILL.md` tailored to this user's wiki. This is the schema layer from the pattern — it tells the agent how to maintain the wiki. Base it on the pattern's Operations section (ingest, query, lint) and the conventions you agreed on with the user. Don't over-prescribe — the pattern says "your LLM figures out the rest."
-
-If `container/skills/wiki/SKILL.md` already exists, ask the user whether to update it before overwriting, so an existing tailored schema is preserved on re-run.
+Create a `container/skills/wiki/SKILL.md` tailored to this user's wiki. This is the schema layer from the pattern — it tells the agent how to maintain the wiki. Base it on the pattern's Operations section (ingest, query, lint) and the conventions you agreed on with the user. Don't over-prescribe — the pattern says "your LLM figures out the rest."
 
 ### 3c. Group CLAUDE.md
 
-Edit the group's CLAUDE.md to add a wiki section, wrapped in marker comments so it can be located and replaced on re-run:
-
-```markdown
-<!-- BEGIN karpathy-llm-wiki -->
-## Wiki
-...section body...
-<!-- END karpathy-llm-wiki -->
-```
-
-If a `<!-- BEGIN karpathy-llm-wiki -->` block already exists, replace it in place rather than appending a second copy. This is critical — it's what turns the agent into a wiki maintainer. The section should:
+Edit the group's CLAUDE.md to add a wiki section. This is critical — it's what turns the agent into a wiki maintainer. It should:
 
 - Explain the wiki system concisely: what it is, the three layers (sources, wiki, schema), the three operations (ingest, query, lint)
 - Index the key files and folders (`wiki/`, `sources/`, `wiki/index.md`, `wiki/log.md`)
@@ -88,12 +75,9 @@ If yes, ask the agent to schedule the lint task using the `schedule_task` MCP to
 
 ## Step 6: Restart
 
-Run from your NanoClaw project root:
-
 ```bash
-source setup/lib/install-slug.sh
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)  # macOS
-systemctl --user restart $(systemd_unit)              # Linux
+launchctl kickstart -k gui/$(id -u)/com.nanoclaw  # macOS
+# Linux: systemctl --user restart nanoclaw
 ```
 
 Tell the user to test by sending a source to the wiki group.

.claude/skills/add-linear/REMOVE.md

@@ -1,49 +1,6 @@
-# Remove Linear
+# Remove Linear Channel
 
-Every step is idempotent — safe to re-run.
-
-## 1. Remove the adapter
-
-Delete the self-registration import from `src/channels/index.ts` (skip if already gone):
-
-```typescript
-import './linear.js';
-```
-
-Then delete the copied adapter and its registration test:
-
-```bash
-rm -f src/channels/linear.ts src/channels/linear-registration.test.ts
-```
-
-## 2. Remove credentials
-
-Remove the Linear env vars from `.env`, then re-sync to the container:
-
-```bash
-LINEAR_CLIENT_ID
-LINEAR_CLIENT_SECRET
-LINEAR_API_KEY
-LINEAR_WEBHOOK_SECRET
-LINEAR_BOT_USERNAME
-LINEAR_TEAM_KEY
-```
-
-```bash
-mkdir -p data/env && cp .env data/env/env
-```
-
-## 3. Remove the package
-
-```bash
-pnpm uninstall @chat-adapter/linear
-```
-
-## 4. Rebuild and restart
-
-```bash
-pnpm run build
-source setup/lib/install-slug.sh
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)  # macOS
-# Linux: systemctl --user restart $(systemd_unit)
-```
+1. Comment out `import './linear.js'` in `src/channels/index.ts`
+2. Remove `LINEAR_API_KEY` and `LINEAR_WEBHOOK_SECRET` from `.env`
+3. `pnpm uninstall @chat-adapter/linear`
+4. Rebuild and restart

.claude/skills/add-linear/SKILL.md

@@ -22,16 +22,16 @@ Adds Linear support via the Chat SDK bridge. The agent participates in issue com
 
 ## Install
 
-NanoClaw doesn't ship channels in trunk. This skill copies the Linear adapter in from the `channels` branch and wires it into the channel registry. Linear OAuth apps post and read comments under an app identity that can't be @-mentioned, so when you wire the channel in `/manage-channels`, pick an engage mode that responds to plain comments rather than mention-only.
+NanoClaw doesn't ship channels in trunk. This skill copies the Linear adapter in from the `channels` branch and patches the Chat SDK bridge to support catch-all message forwarding (Linear OAuth apps can't be @-mentioned).
 
 ### Pre-flight (idempotent)
 
 Skip to **Credentials** if all of these are already in place:
 
 - `src/channels/linear.ts` exists
-- `src/channels/linear-registration.test.ts` exists
 - `src/channels/index.ts` contains `import './linear.js';`
 - `@chat-adapter/linear` is listed in `package.json` dependencies
+- `src/channels/chat-sdk-bridge.ts` contains `catchAll`
 
 Otherwise continue. Every step below is safe to re-run.
 
@@ -41,11 +41,10 @@ Otherwise continue. Every step below is safe to re-run.
 git fetch origin channels
 ```
 
-### 2. Copy the adapter and its registration test
+### 2. Copy the adapter
 
 ```bash
-git show origin/channels:src/channels/linear.ts                 > src/channels/linear.ts
-git show origin/channels:src/channels/linear-registration.test.ts > src/channels/linear-registration.test.ts
+git show origin/channels:src/channels/linear.ts > src/channels/linear.ts
 ```
 
 ### 3. Append the self-registration import
@@ -56,23 +55,47 @@ Append to `src/channels/index.ts` (skip if the line is already present):
 import './linear.js';
 ```
 
-### 4. Install the adapter package (pinned)
+### 4. Patch the Chat SDK bridge for catch-all message forwarding
 
-```bash
-pnpm install @chat-adapter/linear@4.29.0
+Linear OAuth apps can't be @-mentioned, so the bridge's `onNewMention` handler never fires. Add `catchAll` support to `src/channels/chat-sdk-bridge.ts`:
+
+**4a.** Add `catchAll?: boolean` to the `ChatSdkBridgeConfig` interface:
+
+```typescript
+  /**
+   * Forward ALL messages in unsubscribed threads, not just @-mentions.
+   * Use for platforms where the bot identity can't be @-mentioned (e.g.
+   * Linear OAuth apps). The thread is auto-subscribed on first message.
+   */
+  catchAll?: boolean;
 ```
 
-### 5. Build and validate
+**4b.** Add this handler block right after the `chat.onNewMention(...)` block (before the DMs block):
+
+```typescript
+      // Catch-all for platforms where @-mention isn't possible (e.g. Linear
+      // OAuth apps). Forward every unsubscribed message and auto-subscribe.
+      if (config.catchAll) {
+        chat.onNewMessage(/.*/, async (thread, message) => {
+          const channelId = adapter.channelIdFromThreadId(thread.id);
+          await setupConfig.onInbound(channelId, thread.id, await messageToInbound(message));
+          await thread.subscribe();
+        });
+      }
+```
+
+### 5. Install the adapter package (pinned)
+
+```bash
+pnpm install @chat-adapter/linear@4.27.0
+```
+
+### 6. Build
 
 ```bash
 pnpm run build
-pnpm exec vitest run src/channels/linear-registration.test.ts
 ```
 
-Both must be clean before proceeding. `linear-registration.test.ts` is the one integration test: it imports the real channel barrel and asserts the registry contains `linear`. It goes red if the `import './linear.js';` line is deleted or drifts, if the barrel fails to evaluate, or if `@chat-adapter/linear` isn't installed (the import throws) — so it also implicitly verifies the dependency from step 4. The adapter calls core's `createChatSdkBridge(...)`; that typed core-API consumption is guarded by `pnpm run build`.
-
-End-to-end message delivery against a real Linear workspace is verified manually once the service is running — see Wiring and Next Steps.
-
 ## Credentials
 
 ### 1. Set up a webhook
@@ -119,8 +142,8 @@ Run `/manage-channels` to wire the Linear channel to an agent group, or insert m
 
 ```sql
 -- Create messaging group (one per team)
-INSERT INTO messaging_groups (id, channel_type, platform_id, instance, name, is_group, unknown_sender_policy, created_at)
-VALUES ('mg-linear-eng', 'linear', 'linear:ENG', 'linear', 'Engineering', 1, 'public', datetime('now'));
+INSERT INTO messaging_groups (id, channel_type, platform_id, name, is_group, unknown_sender_policy, created_at)
+VALUES ('mg-linear-eng', 'linear', 'linear:ENG', 'Engineering', 1, 'public', datetime('now'));
 
 -- Wire to agent group
 INSERT INTO messaging_group_agents (id, messaging_group_id, agent_group_id, trigger_rules, response_scope, session_mode, priority, created_at)
@@ -133,15 +156,7 @@ The `platform_id` must be `linear:<TEAM_KEY>` matching the `LINEAR_TEAM_KEY` env
 
 If you're in the middle of `/setup`, return to the setup flow now.
 
-Otherwise, restart the service to pick up the new channel.
-
-Run from your NanoClaw project root:
-
-```bash
-source setup/lib/install-slug.sh
-launchctl kickstart -k gui/$(id -u)/$(launchd_label)  # macOS
-systemctl --user restart $(systemd_unit)              # Linux
-```
+Otherwise, restart the service (`systemctl --user restart nanoclaw` or `launchctl kickstart -k gui/$(id -u)/com.nanoclaw`) to pick up the new channel.
 
 ## Channel Info
 

.claude/skills/add-linear/VERIFY.md

@@ -0,0 +1,3 @@
+# Verify Linear Channel
+
+@mention the bot in a Linear issue comment. The bot should respond within a few seconds.

.claude/skills/add-macos-statusbar/REMOVE.md

@@ -1,22 +0,0 @@
-# Remove macOS Menu Bar Status Indicator
-
-Every step is idempotent — safe to re-run.
-
-## 1. Unload the launchd service
-
-```bash
-launchctl bootout gui/$(id -u)/com.nanoclaw.statusbar 2>/dev/null \
-  || launchctl unload ~/Library/LaunchAgents/com.nanoclaw.statusbar.plist 2>/dev/null \
-  || true
-```
-
-## 2. Delete the produced files
-
-```bash
-rm -f ~/Library/LaunchAgents/com.nanoclaw.statusbar.plist \
-      dist/statusbar \
-      logs/statusbar.log \
-      logs/statusbar.error.log
-```
-
-The menu bar icon disappears once the service is unloaded.

.claude/skills/add-macos-statusbar/SKILL.md

@@ -124,4 +124,10 @@ Tell the user:
 >
 > Use **Restart** after making code changes, and **View Logs** to open the log file directly.
 
-To uninstall, follow [REMOVE.md](REMOVE.md).
+## Removal
+
+```bash
+launchctl unload ~/Library/LaunchAgents/com.nanoclaw.statusbar.plist
+rm ~/Library/LaunchAgents/com.nanoclaw.statusbar.plist
+rm dist/statusbar
+```