ncl wirings create: create the send-authorization ACL row

Delegate `ncl wirings create` to createMessagingGroupAgent instead of the
generic single-table INSERT, so the matching agent_destinations ACL row is
auto-created. Without it, ncl-wired agents silently lacked the send
authorization skill-wired agents get and delivery rejected non-origin sends
with "unauthorized channel destination".

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

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

@@ -135,22 +135,7 @@ 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.
 
-### Default new groups to codex (optional)
-
-New groups are created on the **instance default** (`DEFAULT_AGENT_PROVIDER` in `.env`, or `claude` when unset). Installing this skill wires codex in but does NOT change that default — "installed" is not "authenticated", so the default stays claude until you opt in explicitly.
-
-After install, ask the operator before flipping it:
-
-> "Codex is installed. Default new agent groups to codex? Existing groups keep their current provider."
-
-On yes — set it, then restart the host so it takes effect:
-
-```bash
-pnpm exec tsx setup/index.ts --step set-env -- --key DEFAULT_AGENT_PROVIDER --value codex
-launchctl kickstart -k gui/$(id -u)/com.nanoclaw   # macOS; Linux: systemctl --user restart nanoclaw
-```
-
-This affects only groups created afterward. Per-group `ncl groups config update --provider` still overrides the default in either direction. Creation itself stays provider-agnostic (no `--provider` flag — provider is a DB property stamped from the instance default at creation).
+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
 

.claude/skills/init-first-agent/SKILL.md

@@ -82,7 +82,7 @@ npx tsx scripts/init-first-agent.ts \
   --agent-name "${AGENT_NAME}"
 ```
 
-The new group is created on the instance default provider (`DEFAULT_AGENT_PROVIDER` in `.env`, or `claude` when unset). To put it on a different provider, switch after creation with `ncl groups config update --id <group-id> --provider <name>`. Add `--welcome "System instruction: ..."` to override the default welcome prompt.
+Add `--provider <name>` when the user picked a non-default provider (there is no install-wide default — the choice is explicit per group). Add `--welcome "System instruction: ..."` to override the default welcome prompt.
 
 The script:
 1. Upserts the `users` row and grants `owner` role if no owner exists.

.claude/skills/manage-channels/SKILL.md

@@ -67,7 +67,7 @@ pnpm exec tsx setup/index.ts --step register -- \
 
 The `register` step creates the agent group (reusing it if the folder already exists), the messaging group, and the wiring row. `createMessagingGroupAgent` auto-creates the companion `agent_destinations` row so the agent can address the channel by name.
 
-New agent groups are created on the instance default provider (`DEFAULT_AGENT_PROVIDER` in `.env`, or `claude` when unset). To run a group on a different provider, switch it after creation with `ncl groups config update --provider <name>` (e.g. `codex`).
+When creating a NEW agent group on a non-default provider, append `--provider <name>` (e.g. `--provider codex`) — there is no install-wide default; existing groups switch via `ncl groups config update --provider` instead.
 
 For separate agents, also ask for a folder name and optionally a different assistant name.
 

.claude/skills/update-nanoclaw/SKILL.md

@@ -233,7 +233,7 @@ Parse the diff output for lines that contain `[BREAKING]` anywhere in the line.
 ```
 
 If no `[BREAKING]` lines are found:
-- Skip this step silently. Proceed to Step 7.
+- Skip this step silently. Proceed to Step 7 (skill updates check).
 
 If one or more `[BREAKING]` lines are found:
 - Display a warning header to the user: "This update includes breaking changes that may require action:"
@@ -244,7 +244,7 @@ If one or more `[BREAKING]` lines are found:
   - "Skip — I'll handle these manually"
 - Set `multiSelect: true` so the user can pick multiple skills if there are several breaking changes.
 - For each skill the user selects, invoke it using the Skill tool.
-- After all selected skills complete (or if user chose Skip), proceed to Step 7.
+- After all selected skills complete (or if user chose Skip), proceed to Step 7 (skill updates check).
 
 # Step 7: Skill updates (part of updating NanoClaw)
 

CHANGELOG.md

@@ -10,7 +10,7 @@ All notable changes to NanoClaw will be documented in this file.
 - [BREAKING] **`@onecli-sh/sdk` 0.5.0 -> 2.2.1 — requires a OneCLI server with the `/v1` API** (older servers 404 every SDK call). The sanctioned gateway and CLI versions are pinned in `versions.json`. **The gateway is a separate component — updating NanoClaw does not upgrade it for you:** `/update-nanoclaw` upgrades it when the pin moves, otherwise upgrade manually. **Migration:** [docs/onecli-upgrades.md](docs/onecli-upgrades.md).
 - **New agent provider: Codex (OpenAI) — run `/add-codex`.** Full runtime via `codex app-server` (planning, MCP tools, server-side history, resume). Trunk ships the seams and the skill; the payload installs from the `providers` branch (the skill, the setup picker, or `--step provider-auth codex`). Auth is vault-only — no credential ever enters a container.
 - **Setup can now select, install, and authenticate a non-default agent provider.** A provider registry feeds the setup picker, an installer pulls the provider's payload from its branch, a vault auth walkthrough runs (`--step provider-auth`), and the picked provider is set on the first agent (a DB property) before its first spawn. Default (Claude) installs are unaffected — picking Claude changes nothing.
-- **New groups inherit an instance-wide default provider.** `DEFAULT_AGENT_PROVIDER` in `.env` (default `claude`) sets which provider newly created agent groups get at creation; provider stays a per-group DB property, overridable via `ncl groups config update --provider` + restart. Existing groups are untouched — no migration, no retroactive flips.
+- **Provider choice is explicit per group — no install-wide default.** Provider is a DB property set via `ncl groups config update --provider` + restart; creation is provider-agnostic.
 - **Memory migrates via `/migrate-memory`, never at runtime.** Each provider keeps its own store; fresh groups on a surfaces-owning provider see no stale `CLAUDE.*` files. See [docs/provider-migration.md](docs/provider-migration.md).
 - **Per-exchange archiving is provider-owned** — the `onExchangeComplete` hook; the markdown writer ships with the codex payload.
 - **Container boot failures now say why** — the last stderr lines are logged at `warn` on a non-zero exit instead of a silent crash loop.

scripts/init-cli-agent.ts

@@ -21,6 +21,7 @@ import path from 'path';
 
 import { DATA_DIR } from '../src/config.js';
 import { createAgentGroup, getAgentGroupByFolder } from '../src/db/agent-groups.js';
+import { updateContainerConfigScalars } from '../src/db/container-configs.js';
 import { initDb } from '../src/db/connection.js';
 import {
   createMessagingGroup,
@@ -123,11 +124,11 @@ async function main(): Promise<void> {
       `# ${args.agentName}\n\n` +
       `You are ${args.agentName}, a personal NanoClaw agent for ${args.displayName}. ` +
       'When the user first reaches out, introduce yourself briefly and invite them to chat. Keep replies concise.',
-    // The operator's setup pick (NANOCLAW_PICKED_PROVIDER) when set; otherwise
-    // undefined, so initGroupFilesystem falls back to the instance default and
-    // stamps it onto the fresh config row.
-    provider: pickedProvider,
   });
+  // Runtime provider lives on the config row, not the deprecated agent_provider.
+  if (pickedProvider && pickedProvider !== 'claude') {
+    updateContainerConfigScalars(ag.id, { provider: pickedProvider });
+  }
 
   // 3. CLI messaging group + wiring.
   let cliMg: MessagingGroup | undefined = getMessagingGroupByPlatform(CLI_CHANNEL, CLI_PLATFORM_ID);

scripts/init-first-agent.ts

@@ -205,13 +205,15 @@ async function main(): Promise<void> {
   } else {
     console.log(`Reusing agent group: ${ag.id} (${folder})`);
   }
-  // Seed the config row, stamped with the effective provider: the operator's
-  // setup pick (NANOCLAW_PICKED_PROVIDER) when this runs inside a setup run,
-  // otherwise the persisted instance default. Workspace scaffolding is deferred
-  // to the first spawn (group-init), where the DB-resolved provider decides the
-  // surface (Claude: CLAUDE.local.md; a surfaces-owning provider: the memory
-  // scaffold). A reused group keeps its provider (INSERT OR IGNORE).
-  ensureContainerConfig(ag.id, pickedProvider);
+  // Ensure the config row exists; defer workspace scaffolding to the first
+  // spawn (group-init), where the DB-resolved provider decides the surface
+  // (Claude: CLAUDE.local.md; a surfaces-owning provider: the memory scaffold)
+  // — so a non-Claude group never gets stale CLAUDE.* files written here.
+  ensureContainerConfig(ag.id);
+  // Runtime provider lives on the config row, not the deprecated agent_provider.
+  if (pickedProvider && pickedProvider !== 'claude') {
+    updateContainerConfigScalars(ag.id, { provider: pickedProvider });
+  }
   const groupDir = path.resolve(GROUPS_DIR, folder);
   fs.mkdirSync(groupDir, { recursive: true });
   fs.writeFileSync(

setup/auto.ts

@@ -46,7 +46,6 @@ import './providers/index.js';
 import { brightSelect } from './lib/bright-select.js';
 import { offerClaudeOnFailure } from './lib/claude-handoff.js';
 import { setPickedProvider } from './lib/picked-provider.js';
-import { upsertEnvVar } from './set-env.js';
 import {
   applyToEnv,
   parseFlags,
@@ -66,7 +65,6 @@ import { ensureAnswer, fail, runQuietChild, runQuietStep, spawnQuiet } from './l
 import { emit as phEmit } from './lib/diagnostics.js';
 import { accentGreen, brandBody, brandBold, brandChip, dimWrap, fitToWidth, fmtDuration, note, wrapForGutter } from './lib/theme.js';
 import { isValidTimezone } from '../src/timezone.js';
-import { DEFAULT_AGENT_PROVIDER } from '../src/config.js';
 
 const CLI_AGENT_NAME = 'Terminal Agent';
 const RUN_START = Date.now();
@@ -377,12 +375,6 @@ async function main(): Promise<void> {
     } else {
       await runAuthStep();
     }
-    // Persist the pick as the instance-wide default so every future group
-    // (channel-approved, ncl-created) is created on this provider. Read from
-    // .env at host start; per-group `ncl groups config update --provider` wins.
-    // Only after install + auth succeeded — a failed setup must not leave new
-    // groups defaulting to an unauthenticated runtime.
-    upsertEnvVar('DEFAULT_AGENT_PROVIDER', agentProvider);
   }
 
   if (!skip.has('mounts')) {
@@ -835,18 +827,14 @@ async function askAgentProviderChoice(): Promise<string> {
     phEmit('agent_provider_chosen', { provider: preset, preset: true });
     return preset;
   }
-  // The pick is persisted as the instance default (DEFAULT_AGENT_PROVIDER), so
-  // pre-select the current default — a re-run Enter-through then preserves it
-  // instead of silently resetting it to claude. Fall back to claude if the
-  // persisted default isn't an offered option (e.g. its provider was removed).
-  const currentDefault = options.some((o) => o.value === DEFAULT_AGENT_PROVIDER)
-    ? DEFAULT_AGENT_PROVIDER
-    : 'claude';
+  // The pick installs and authenticates a runtime — it is not an
+  // install-wide default, so re-runs safely Enter-through on claude (its
+  // auth flow short-circuits when the secret already exists).
   const choice = ensureAnswer(
     await brightSelect<string>({
       message: 'Which agent runtime should power your assistant?',
       options,
-      initialValue: currentDefault,
+      initialValue: 'claude',
     }),
   ) as string;
   setupLog.userInput('agent_provider', choice);

setup/lib/picked-provider.ts

@@ -1,17 +1,16 @@
 /**
- * The agent runtime the operator picked in THIS setup run, carried to the
- * group-creation child processes over the process boundary.
+ * The agent runtime the operator picked in THIS setup run.
  *
- * There is no `--provider` flag in the creation contract — provider is a DB
- * property of a group. Setup persists the pick two ways: as the install-wide
- * default (`DEFAULT_AGENT_PROVIDER` in `.env`, see src/config.ts), which every
- * future group inherits at creation via the `ensureContainerConfig` chokepoint;
- * and here, in a setup-run-scoped env var, so the FIRST agent created in the
- * same run (by `init-first-agent` / `init-cli-agent`, which run as child
- * processes) is stamped with the pick before the welcome wakes the container —
- * without waiting for the host to restart and reload `.env`. `undefined` /
- * `'claude'` means no run-scoped pick; the creation scripts then fall back to
- * the install-wide default.
+ * There is no install-wide default provider and no `--provider` in the
+ * creation contract — provider is a DB property of a group. Setup is the one
+ * orchestrator that knows the operator's pick, so it stashes it here (set once
+ * at the auth step). The group-creation scripts (`init-first-agent`,
+ * `init-cli-agent`) run as **child processes**, so the pick is carried over the
+ * process boundary via an environment variable they inherit; they apply it to
+ * the group at creation, before the welcome wakes the container. This is the
+ * only place the value lives — a setup-run-scoped global, NOT a persisted
+ * install default. `undefined` / `'claude'` means the built-in default and no
+ * provider write at all.
  */
 const ENV_KEY = 'NANOCLAW_PICKED_PROVIDER';
 

setup/provider-contract.test.ts

@@ -55,19 +55,12 @@ describe('setup carries the picked provider to creation via a setup-run env var'
   // The creation scripts run as child processes, inherit the env var, and apply
   // it to the group's runtime config — container_configs.provider, the source of
   // truth materialized into container.json (agent_provider is deprecated) — before
-  // the welcome wakes the container, falling back to the instance default
-  // (DEFAULT_AGENT_PROVIDER) when the env var is unset. No `--provider` flag in
-  // the contract (above). init-first-agent stamps directly via
-  // ensureContainerConfig; init-cli-agent threads it through initGroupFilesystem.
-  const applyPattern: Record<string, RegExp> = {
-    'scripts/init-first-agent.ts': /ensureContainerConfig\([^)]*pickedProvider/,
-    'scripts/init-cli-agent.ts': /provider:\s*pickedProvider/,
-  };
-  for (const [file, pattern] of Object.entries(applyPattern)) {
+  // the welcome wakes the container. No `--provider` flag in the contract (above).
+  for (const file of ['scripts/init-first-agent.ts', 'scripts/init-cli-agent.ts']) {
     it(`${file} applies the env-carried provider to container_configs.provider`, () => {
       const src = read(file);
       expect(src).toContain('NANOCLAW_PICKED_PROVIDER');
-      expect(src).toMatch(pattern);
+      expect(src).toMatch(/updateContainerConfigScalars\([^)]*provider:\s*pickedProvider/);
     });
   }
 });

setup/register.ts

@@ -126,12 +126,11 @@ export async function run(args: string[]): Promise<void> {
   const db = initDb(dbPath);
   runMigrations(db);
 
-  // 1. Create or find agent group. The workspace is scaffolded at the first
-  // spawn (group-init), where the DB-resolved provider is known; here we only
-  // seed the config row — stamped with the instance default so a newly wired
-  // channel group is created on the operator's chosen provider (per-group
-  // `ncl groups config update --provider` still overrides). A reused group
-  // keeps its existing provider (INSERT OR IGNORE).
+  // 1. Create or find agent group. Provider-agnostic: provider is a DB
+  // property set via `ncl groups config update --provider`, not a creation
+  // flag. The workspace is scaffolded at the first spawn (group-init), where
+  // the DB-resolved provider is known; here we only ensure the config row
+  // exists so that update has a row to write.
   let agentGroup = getAgentGroupByFolder(parsed.folder);
   if (!agentGroup) {
     const agId = generateId('ag');

setup/set-env.ts

@@ -18,34 +18,6 @@ import path from 'path';
 import { log } from '../src/log.js';
 import { emitStatus } from './status.js';
 
-/**
- * Upsert a `KEY=VALUE` line into the project's `.env`, returning whether the
- * key already existed. The canonical writer for new `.env` edits (legacy setup
- * steps still write directly) so flows don't invent grep/sed pipelines (which
- * can't be allowlisted tightly).
- */
-export function upsertEnvVar(key: string, value: string): { existed: boolean } {
-  if (!/^[A-Z][A-Z0-9_]*$/.test(key)) {
-    throw new Error(`Invalid env key: ${key} (must be UPPER_SNAKE_CASE)`);
-  }
-  const envFile = path.join(process.cwd(), '.env');
-  let content = '';
-  if (fs.existsSync(envFile)) {
-    content = fs.readFileSync(envFile, 'utf-8');
-  }
-  const lineRegex = new RegExp(`^${key}=.*$`, 'm');
-  const existed = lineRegex.test(content);
-  const newLine = `${key}=${value}`;
-  if (existed) {
-    content = content.replace(lineRegex, newLine);
-  } else {
-    const sep = content && !content.endsWith('\n') ? '\n' : '';
-    content = content + sep + newLine + '\n';
-  }
-  fs.writeFileSync(envFile, content);
-  return { existed };
-}
-
 export async function run(args: string[]): Promise<void> {
   const keyIdx = args.indexOf('--key');
   const valueIdx = args.indexOf('--value');
@@ -61,15 +33,37 @@ export async function run(args: string[]): Promise<void> {
   const key = args[keyIdx + 1];
   const value = args[valueIdx + 1];
 
-  const { existed } = upsertEnvVar(key, value);
+  if (!/^[A-Z][A-Z0-9_]*$/.test(key)) {
+    throw new Error(`Invalid env key: ${key} (must be UPPER_SNAKE_CASE)`);
+  }
+
+  const projectRoot = process.cwd();
+  const envFile = path.join(projectRoot, '.env');
+
+  let content = '';
+  if (fs.existsSync(envFile)) {
+    content = fs.readFileSync(envFile, 'utf-8');
+  }
+
+  const lineRegex = new RegExp(`^${key}=.*$`, 'm');
+  const newLine = `${key}=${value}`;
+  const existed = lineRegex.test(content);
+
+  if (existed) {
+    content = content.replace(lineRegex, newLine);
+  } else {
+    const sep = content && !content.endsWith('\n') ? '\n' : '';
+    content = content + sep + newLine + '\n';
+  }
+
+  fs.writeFileSync(envFile, content);
   log.info('Updated .env', { key, existed });
 
   let synced = false;
   if (syncContainer) {
-    const projectRoot = process.cwd();
     const dataEnvDir = path.join(projectRoot, 'data', 'env');
     fs.mkdirSync(dataEnvDir, { recursive: true });
-    fs.copyFileSync(path.join(projectRoot, '.env'), path.join(dataEnvDir, 'env'));
+    fs.copyFileSync(envFile, path.join(dataEnvDir, 'env'));
     synced = true;
     log.info('Synced .env to container mount', { path: 'data/env/env' });
   }

src/cli/resources/groups.ts

@@ -8,7 +8,6 @@ import { getDb, hasTable } from '../../db/connection.js';
 import { getSession } from '../../db/sessions.js';
 import { writeSessionMessage } from '../../session-manager.js';
 import {
-  ensureContainerConfig,
   getContainerConfig,
   updateContainerConfigScalars,
   updateContainerConfigJson,
@@ -91,11 +90,6 @@ registerResource({
           created_at: new Date().toISOString(),
         };
         createAgentGroup(group);
-        // Seed the config row now so the group is created on the instance
-        // default (ensureContainerConfig stamps it) and is spawnable without
-        // waiting for the startup backfill. Per-group overrides via
-        // `groups config update --provider` still win.
-        ensureContainerConfig(group.id);
         return group;
       },
     },

src/cli/resources/wirings.test.ts

@@ -0,0 +1,91 @@
+/**
+ * Regression test — `ncl wirings create` must delegate to
+ * `createMessagingGroupAgent` so the matching `agent_destinations` ACL row is
+ * auto-created. The generic single-table INSERT skipped it, leaving ncl-wired
+ * agents silently without the send authorization skill-wired agents get
+ * (delivery throws "unauthorized channel destination" for non-origin sends).
+ *
+ * The approval handler in `dispatch.ts` re-enters `dispatch()` with
+ * `caller: 'host'` after admin approval, so the test invokes dispatch with the
+ * host caller — same code path a real approval would take.
+ */
+import fs from 'fs';
+import { describe, expect, it, beforeEach, afterEach, vi } from 'vitest';
+
+vi.mock('../../container-runner.js', () => ({
+  wakeContainer: vi.fn().mockResolvedValue(undefined),
+  isContainerRunning: vi.fn().mockReturnValue(false),
+  getActiveContainerCount: vi.fn().mockReturnValue(0),
+  killContainer: vi.fn(),
+}));
+
+vi.mock('../../config.js', async () => {
+  const actual = await vi.importActual('../../config.js');
+  return { ...actual, DATA_DIR: '/tmp/nanoclaw-test-cli-wirings' };
+});
+
+const TEST_DIR = '/tmp/nanoclaw-test-cli-wirings';
+
+import { initTestDb, closeDb, runMigrations, createAgentGroup, getDb } from '../../db/index.js';
+import { dispatch } from '../dispatch.js';
+// Side-effect import: registers the `wirings-*` commands (including create).
+import './wirings.js';
+
+function now(): string {
+  return new Date().toISOString();
+}
+
+describe('wirings CLI create auto-creates the send-authorization ACL row', () => {
+  const GID = 'ag-1';
+  const MGID = 'mg-1';
+
+  beforeEach(() => {
+    if (fs.existsSync(TEST_DIR)) fs.rmSync(TEST_DIR, { recursive: true });
+    fs.mkdirSync(TEST_DIR, { recursive: true });
+
+    const db = initTestDb();
+    runMigrations(db);
+
+    createAgentGroup({ id: GID, name: 'agent', folder: 'agent', agent_provider: null, created_at: now() });
+    db.prepare(
+      `INSERT INTO messaging_groups (id, channel_type, platform_id, instance, name, is_group, unknown_sender_policy, created_at)
+       VALUES (?, 'telegram', 'tg-1', 'telegram', 'chat', 1, 'strict', ?)`,
+    ).run(MGID, now());
+  });
+
+  afterEach(() => {
+    closeDb();
+    if (fs.existsSync(TEST_DIR)) fs.rmSync(TEST_DIR, { recursive: true });
+  });
+
+  it('creates the wiring and the matching agent_destinations row', async () => {
+    // Precondition: no destination exists yet.
+    const before = getDb()
+      .prepare('SELECT COUNT(*) AS c FROM agent_destinations WHERE agent_group_id = ?')
+      .get(GID) as { c: number };
+    expect(before.c).toBe(0);
+
+    const resp = await dispatch(
+      {
+        id: 'req-create',
+        command: 'wirings-create',
+        args: { messaging_group_id: MGID, agent_group_id: GID },
+      },
+      { caller: 'host' },
+    );
+
+    expect(resp.ok).toBe(true);
+
+    // The wiring row exists.
+    const wiring = getDb()
+      .prepare('SELECT * FROM messaging_group_agents WHERE messaging_group_id = ? AND agent_group_id = ?')
+      .get(MGID, GID) as Record<string, unknown> | undefined;
+    expect(wiring).toBeDefined();
+
+    // The send-authorization ACL row was auto-created and points at the chat.
+    const dest = getDb()
+      .prepare('SELECT * FROM agent_destinations WHERE agent_group_id = ? AND target_type = ? AND target_id = ?')
+      .get(GID, 'channel', MGID) as Record<string, unknown> | undefined;
+    expect(dest).toBeDefined();
+  });
+});

src/cli/resources/wirings.ts

@@ -1,3 +1,7 @@
+import { randomUUID } from 'crypto';
+
+import { createMessagingGroupAgent } from '../../db/messaging-groups.js';
+import type { EngageMode, IgnoredMessagePolicy, MessagingGroupAgent, SenderScope } from '../../types.js';
 import { registerResource } from '../crud.js';
 
 registerResource({
@@ -66,5 +70,60 @@ registerResource({
     },
     { name: 'created_at', type: 'string', description: 'Auto-set.', generated: true },
   ],
-  operations: { list: 'open', get: 'open', create: 'approval', update: 'approval', delete: 'approval' },
+  // `create` is intentionally not in `operations` — the generic single-table
+  // INSERT skips the `agent_destinations` ACL row that the canonical helper
+  // `createMessagingGroupAgent` auto-creates, so ncl-wired agents would
+  // silently lack the send authorization skill-wired agents get (delivery
+  // throws "unauthorized channel destination" for non-origin sends). Provided
+  // as a `customOperation` that delegates to the helper instead.
+  operations: { list: 'open', get: 'open', update: 'approval', delete: 'approval' },
+  customOperations: {
+    create: {
+      access: 'approval',
+      description:
+        'Wire a messaging group to an agent group. Delegates to createMessagingGroupAgent so the ' +
+        'matching agent_destinations ACL row is auto-created (a bare INSERT would skip it, leaving ' +
+        'the agent unauthorized to send to the chat). Use --messaging-group-id and --agent-group-id, ' +
+        'plus optional --engage-mode, --engage-pattern, --sender-scope, --ignored-message-policy, --session-mode.',
+      handler: async (args) => {
+        const messagingGroupId = args.messaging_group_id ? String(args.messaging_group_id) : '';
+        const agentGroupId = args.agent_group_id ? String(args.agent_group_id) : '';
+        if (!messagingGroupId) throw new Error('--messaging-group-id is required');
+        if (!agentGroupId) throw new Error('--agent-group-id is required');
+
+        const engageMode = args.engage_mode !== undefined ? String(args.engage_mode) : 'mention';
+        if (!['pattern', 'mention', 'mention-sticky'].includes(engageMode)) {
+          throw new Error('engage_mode must be one of: pattern, mention, mention-sticky');
+        }
+        const senderScope = args.sender_scope !== undefined ? String(args.sender_scope) : 'all';
+        if (!['all', 'known'].includes(senderScope)) {
+          throw new Error('sender_scope must be one of: all, known');
+        }
+        const ignoredMessagePolicy =
+          args.ignored_message_policy !== undefined ? String(args.ignored_message_policy) : 'drop';
+        if (!['drop', 'accumulate'].includes(ignoredMessagePolicy)) {
+          throw new Error('ignored_message_policy must be one of: drop, accumulate');
+        }
+        const sessionMode = args.session_mode !== undefined ? String(args.session_mode) : 'shared';
+        if (!['shared', 'per-thread', 'agent-shared'].includes(sessionMode)) {
+          throw new Error('session_mode must be one of: shared, per-thread, agent-shared');
+        }
+
+        const mga: MessagingGroupAgent = {
+          id: randomUUID(),
+          messaging_group_id: messagingGroupId,
+          agent_group_id: agentGroupId,
+          engage_mode: engageMode as EngageMode,
+          engage_pattern: args.engage_pattern !== undefined ? String(args.engage_pattern) : null,
+          sender_scope: senderScope as SenderScope,
+          ignored_message_policy: ignoredMessagePolicy as IgnoredMessagePolicy,
+          session_mode: sessionMode as MessagingGroupAgent['session_mode'],
+          priority: 0,
+          created_at: new Date().toISOString(),
+        };
+        createMessagingGroupAgent(mga);
+        return mga;
+      },
+    },
+  },
 });

src/config.ts

@@ -6,27 +6,9 @@ import { getContainerImageBase, getDefaultContainerImage, getInstallSlug } from
 import { isValidTimezone } from './timezone.js';
 
 // Read config values from .env (falls back to process.env).
-const envConfig = readEnvFile([
-  'ASSISTANT_NAME',
-  'ASSISTANT_HAS_OWN_NUMBER',
-  'ONECLI_URL',
-  'ONECLI_API_KEY',
-  'TZ',
-  'DEFAULT_AGENT_PROVIDER',
-]);
+const envConfig = readEnvFile(['ASSISTANT_NAME', 'ASSISTANT_HAS_OWN_NUMBER', 'ONECLI_URL', 'ONECLI_API_KEY', 'TZ']);
 
 export const ASSISTANT_NAME = process.env.ASSISTANT_NAME || envConfig.ASSISTANT_NAME || 'Andy';
-
-// Instance-wide default agent provider for newly created groups. `claude` (the
-// built-in provider) when unset, so existing installs are unaffected on upgrade.
-// Applied only at group-creation time (stamped onto the config row) — never in
-// provider resolution — so existing groups are never retroactively flipped.
-// Per-group `ncl groups config update --provider` still overrides it.
-export const DEFAULT_AGENT_PROVIDER = (
-  process.env.DEFAULT_AGENT_PROVIDER ||
-  envConfig.DEFAULT_AGENT_PROVIDER ||
-  'claude'
-).toLowerCase();
 export const ASSISTANT_HAS_OWN_NUMBER =
   (process.env.ASSISTANT_HAS_OWN_NUMBER || envConfig.ASSISTANT_HAS_OWN_NUMBER) === 'true';
 

src/db/container-configs.test.ts

@@ -1,59 +0,0 @@
-/**
- * ensureContainerConfig provider stamping (global-default-provider feature).
- *
- * Two load-bearing guarantees:
- *   1. A fresh row is stamped with the given provider (claude → NULL), so a new
- *      group is created on the instance default.
- *   2. An existing row is never overwritten (INSERT OR IGNORE), so enabling a
- *      non-claude default never retroactively flips existing groups.
- */
-import { describe, it, expect, beforeEach, afterEach } from 'vitest';
-
-import { initTestDb, closeDb } from './connection.js';
-import { runMigrations } from './migrations/index.js';
-import { createAgentGroup } from './agent-groups.js';
-import { ensureContainerConfig, getContainerConfig } from './container-configs.js';
-
-function makeGroup(id: string): void {
-  createAgentGroup({ id, name: id, folder: id, agent_provider: null, created_at: new Date().toISOString() });
-}
-
-describe('ensureContainerConfig provider stamping', () => {
-  beforeEach(() => {
-    const db = initTestDb();
-    runMigrations(db);
-  });
-  afterEach(() => {
-    closeDb();
-  });
-
-  it('stamps a non-default provider on a fresh row; claude is stored as NULL', () => {
-    makeGroup('ag-codex');
-    ensureContainerConfig('ag-codex', 'codex');
-    expect(getContainerConfig('ag-codex')?.provider).toBe('codex');
-
-    makeGroup('ag-claude');
-    ensureContainerConfig('ag-claude', 'claude');
-    expect(getContainerConfig('ag-claude')?.provider).toBeNull();
-
-    // Casing is normalized to match what resolution lowercases to.
-    makeGroup('ag-cased');
-    ensureContainerConfig('ag-cased', 'Codex');
-    expect(getContainerConfig('ag-cased')?.provider).toBe('codex');
-
-    makeGroup('ag-cased-claude');
-    ensureContainerConfig('ag-cased-claude', 'Claude');
-    expect(getContainerConfig('ag-cased-claude')?.provider).toBeNull();
-  });
-
-  it('never overwrites an existing row — existing groups are not flipped', () => {
-    makeGroup('ag-existing');
-    ensureContainerConfig('ag-existing', 'codex'); // existing group already on codex
-    expect(getContainerConfig('ag-existing')?.provider).toBe('codex');
-
-    // A later bare ensure (defensive re-init, or a changed instance default)
-    // must NOT change it — INSERT OR IGNORE keeps the row frozen.
-    ensureContainerConfig('ag-existing');
-    expect(getContainerConfig('ag-existing')?.provider).toBe('codex');
-  });
-});

src/db/container-configs.ts

@@ -1,4 +1,3 @@
-import { DEFAULT_AGENT_PROVIDER } from '../config.js';
 import type { ContainerConfigRow } from '../types.js';
 import { getDb } from './connection.js';
 
@@ -40,36 +39,14 @@ export function createContainerConfig(config: ContainerConfigRow): void {
     .run(config);
 }
 
-/**
- * Create a config row if one doesn't exist, stamping the provider. Idempotent —
- * no-ops if the row already exists, so an existing group's provider is never
- * overwritten (load-bearing: this is how the global default stays "new groups
- * only" for groups that already have a row).
- *
- * An absent `provider` takes the instance default (`DEFAULT_AGENT_PROVIDER`);
- * `claude` and an absent value that resolves to claude are stored as NULL — the
- * column means "follows the built-in default", matching pre-feature rows.
- */
-export function ensureContainerConfig(agentGroupId: string, provider?: string | null): void {
-  // Single chokepoint for the instance default: a fresh row with no explicit
-  // provider is stamped with DEFAULT_AGENT_PROVIDER, so every new-group creation
-  // path inherits it without each having to remember. INSERT OR IGNORE keeps an
-  // EXISTING row untouched — so this stays "new groups only" for any group that
-  // already has a config row (backfillContainerConfigs seeds one for every group
-  // at host startup; a non-claude default would only reach a row-less *legacy*
-  // group if a creation script reused it before that first backfill ran). Callers
-  // that know the provider (subagent → parent's, spawn → resolved) pass it
-  // explicitly and override the default.
-  // `claude` (the built-in default) and casing normalize to NULL/lowercase so the
-  // column matches what resolution lowercases to.
-  const normalized = (provider ?? DEFAULT_AGENT_PROVIDER).toLowerCase();
-  const stamped = normalized && normalized !== 'claude' ? normalized : null;
+/** Create an empty config row with sensible defaults. Idempotent — no-ops if row exists. */
+export function ensureContainerConfig(agentGroupId: string): void {
   getDb()
     .prepare(
-      `INSERT OR IGNORE INTO container_configs (agent_group_id, provider, updated_at)
-       VALUES (?, ?, ?)`,
+      `INSERT OR IGNORE INTO container_configs (agent_group_id, updated_at)
+       VALUES (?, ?)`,
     )
-    .run(agentGroupId, stamped, new Date().toISOString());
+    .run(agentGroupId, new Date().toISOString());
 }
 
 /** Update scalar fields on a config row. Only touches fields present in `updates`. */

src/group-init.ts

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import path from 'path';
 
-import { DATA_DIR, DEFAULT_AGENT_PROVIDER, GROUPS_DIR } from './config.js';
+import { DATA_DIR, GROUPS_DIR } from './config.js';
 import { ensureContainerConfig } from './db/container-configs.js';
 import { log } from './log.js';
 import { providerProvidesAgentSurfaces } from './providers/provider-container-registry.js';
@@ -53,18 +53,11 @@ export function initGroupFilesystem(
 ): void {
   const initialized: string[] = [];
 
-  // `opts.provider` absent means "caller has no provider opinion" — for a
-  // brand-new group that resolves to the instance default, so the scaffold and
-  // the stamped config row both match it. A caller that knows the provider
-  // (subagent → parent's, spawn → resolved, setup → operator's pick) passes it
-  // explicitly — including `claude` — which pins the group and skips the
-  // default. ensureContainerConfig is INSERT OR IGNORE, so this only stamps a
-  // genuinely new group; existing rows are never touched.
-  const providerHint = (opts?.provider ?? DEFAULT_AGENT_PROVIDER).toLowerCase();
-
-  // Default agent surfaces apply unless the provider declares (at registration)
-  // that it provides its own.
-  const defaultSurfaces = !providerProvidesAgentSurfaces(providerHint);
+  // Default agent surfaces apply unless the group's provider declares (at
+  // registration) that it provides its own. Callers that don't know the
+  // provider omit it — unregistered/unknown names report no capabilities,
+  // so the default surfaces are written, exactly as before this seam.
+  const defaultSurfaces = !providerProvidesAgentSurfaces(opts?.provider);
 
   // 1. groups/<folder>/ — group memory + working dir
   const groupDir = path.resolve(GROUPS_DIR, group.folder);
@@ -113,10 +106,8 @@ export function initGroupFilesystem(
   }
 
   // Ensure container_configs row exists in the DB. Idempotent — no-op if
-  // the row already exists (e.g. created by backfill or group creation). On a
-  // fresh row, stamp the resolved provider hint so a new group is created on
-  // the instance default (or the caller's explicit pick).
-  ensureContainerConfig(group.id, providerHint);
+  // the row already exists (e.g. created by backfill or group creation).
+  ensureContainerConfig(group.id);
   initialized.push('container_configs');
 
   // 2. data/v2-sessions/<id>/.claude-shared/ — Claude state + per-group skills

src/modules/agent-to-agent/create-agent.test.ts

@@ -16,6 +16,7 @@ const mockRequestApproval = vi.fn().mockResolvedValue(undefined);
 const mockGetContainerConfig = vi.fn();
 const mockCreateAgentGroup = vi.fn();
 const mockInitGroupFilesystem = vi.fn();
+const mockUpdateScalars = vi.fn();
 const mockWriteDestinations = vi.fn();
 const mockNotifyWrite = vi.fn();
 
@@ -25,6 +26,7 @@ vi.mock('../approvals/index.js', () => ({
 vi.mock('../../db/container-configs.js', () => ({
   getContainerConfig: (...a: unknown[]) => mockGetContainerConfig(...a),
   ensureContainerConfig: () => {},
+  updateContainerConfigScalars: (...a: unknown[]) => mockUpdateScalars(...a),
 }));
 vi.mock('../../db/agent-groups.js', () => ({
   getAgentGroup: (id: string) => ({ id, name: id.toUpperCase(), folder: id, agent_provider: null, created_at: '' }),
@@ -78,10 +80,8 @@ describe('handleCreateAgent — scope-based authorization', () => {
 
   it('child inherits the creator provider (codex parent → codex child)', async () => {
     // A subagent must run on the same authenticated runtime as its creator —
-    // on a codex-only install a claude default would 401. The provider is
-    // passed to initGroupFilesystem, which stamps the child's config row.
-    // Red-on-delete: dropping the inheritance lets the child fall through to the
-    // instance default instead of codex.
+    // on a codex-only install a claude default would 401. Red-on-delete:
+    // dropping the inheritance leaves the child provider-less (→ claude).
     mockGetContainerConfig.mockReturnValue({ cli_scope: 'global', provider: 'codex' });
 
     await handleCreateAgent({ name: 'Scout', instructions: 'help' }, SESSION);
@@ -90,19 +90,15 @@ describe('handleCreateAgent — scope-based authorization', () => {
       expect.anything(),
       expect.objectContaining({ provider: 'codex' }),
     );
+    expect(mockUpdateScalars).toHaveBeenCalledWith(expect.any(String), { provider: 'codex' });
   });
 
-  it('claude creator pins the child to claude, not the instance default', async () => {
-    mockGetContainerConfig.mockReturnValue({ cli_scope: 'global' }); // parent has no explicit provider
+  it('claude creator leaves the child provider unset (built-in default)', async () => {
+    mockGetContainerConfig.mockReturnValue({ cli_scope: 'global' }); // no provider
 
     await handleCreateAgent({ name: 'Scout', instructions: 'help' }, SESSION);
 
-    // The child inherits the parent's EFFECTIVE provider (claude), passed
-    // explicitly so it never falls through to a non-claude instance default.
-    expect(mockInitGroupFilesystem).toHaveBeenCalledWith(
-      expect.anything(),
-      expect.objectContaining({ provider: 'claude' }),
-    );
+    expect(mockUpdateScalars).not.toHaveBeenCalled();
   });
 
   it('group scope (default): requires approval, does NOT create directly', async () => {

src/modules/agent-to-agent/create-agent.ts

@@ -16,7 +16,7 @@ import path from 'path';
 
 import { GROUPS_DIR } from '../../config.js';
 import { createAgentGroup, getAgentGroup, getAgentGroupByFolder } from '../../db/agent-groups.js';
-import { getContainerConfig } from '../../db/container-configs.js';
+import { getContainerConfig, updateContainerConfigScalars } from '../../db/container-configs.js';
 import { getSession } from '../../db/sessions.js';
 import { wakeContainer } from '../../container-runner.js';
 import { initGroupFilesystem } from '../../group-init.js';
@@ -163,15 +163,17 @@ async function performCreateAgent(
     created_at: now,
   };
   createAgentGroup(newGroup);
-  // Subagent path: a child inherits its creator's EFFECTIVE provider, NOT the
-  // instance-wide default — so a child is never spawned on a runtime the parent
-  // can't reach (e.g. a codex-only install where claude isn't authenticated).
-  // Passing it explicitly to initGroupFilesystem pins the child's scaffold and
-  // stamps its config row in one step (a NULL parent resolves to claude). The
+  // A subagent inherits its creator's provider. Provider is a DB property; the
+  // child is created provider-agnostic, then stamped with the parent's runtime
+  // so a single-provider install (e.g. codex-only, where claude isn't
+  // authenticated) doesn't spawn a child on a runtime it can't reach. The
   // operator can still flip a child later with `ncl groups config update
-  // --provider`.
-  const parentProvider = getContainerConfig(sourceGroup.id)?.provider ?? 'claude';
+  // --provider`. claude (the built-in default) leaves the column unset.
+  const parentProvider = getContainerConfig(sourceGroup.id)?.provider ?? undefined;
   initGroupFilesystem(newGroup, { instructions: instructions ?? undefined, provider: parentProvider });
+  if (parentProvider) {
+    updateContainerConfigScalars(newGroup.id, { provider: parentProvider });
+  }
 
   // Insert bidirectional destination rows (= ACL grants).
   // Creator refers to child by the name it chose; child refers to creator as "parent".

src/modules/permissions/channel-approval.ts

@@ -292,10 +292,8 @@ export function createNewAgentGroup(name: string): AgentGroup {
   });
 
   const ag = getAgentGroup(agId)!;
-  // Channel-approved groups are created on the instance default provider
-  // (DEFAULT_AGENT_PROVIDER, or claude when unset) — initGroupFilesystem stamps
-  // it onto the fresh config row. The operator flips a group afterward with
-  // `ncl groups config update --provider`.
+  // Channel-approved groups get the built-in default provider (claude); the
+  // operator flips a group with `ncl groups config update --provider`.
   initGroupFilesystem(ag);
   return ag;
 }