Replaces the agent-group-centric "main group" concept with user-level
privileges and adds the cold-DM infrastructure needed for proactive
outbound messaging (pairing, approvals, welcome flows).
Privilege model
- New tables: users, user_roles (owner global-only; admin global or
scoped to an agent_group), agent_group_members (explicit non-
privileged access; admin/owner imply membership), user_dms (cold-DM
resolution cache).
- Removed agent_groups.is_admin, messaging_groups.admin_user_id. Replaced
with messaging_groups.unknown_sender_policy (strict | request_approval
| public) for per-chat unknown-sender gating.
- src/access.ts: canAccessAgentGroup, pickApprover, pickApprovalDelivery.
- src/router.ts: access gate on every inbound, honoring
unknown_sender_policy for unknown senders.
- src/channels/telegram.ts: pairing interceptor upserts the paired user
and promotes them to owner if hasAnyOwner() is false (first-pair-wins).
Cold DM infrastructure
- ChannelAdapter.openDM?(handle) — optional method. Chat-SDK-bridge wires
it to chat.openDM() for resolution-required channels (Discord, Slack,
Teams, Webex, gChat); direct-addressable channels (Telegram, WhatsApp,
iMessage, Matrix, Resend) fall through to the handle directly.
- src/user-dm.ts: ensureUserDm(userId) — resolves + caches via user_dms.
Approval routing
- onecli-approvals + delivery use pickApprover + pickApprovalDelivery:
scoped admins → global admins → owners (dedup), first reachable via
ensureUserDm, same-channel-kind tie-break. Approvals land in the
approver's DM, not the origin chat.
Delivery fixes
- delivery.ts ACL rejection now throws instead of returning undefined —
the outer loop previously marked rejected messages as delivered.
- Implicit-origin allow: session.messaging_group_id === target skips the
destination check.
- createMessagingGroupAgent auto-creates the companion agent_destinations
row (normalized local_name from the messaging group's name, collision-
broken within the agent's namespace).
Container
- container-runner.ts: /workspace/global always read-only; drops
NANOCLAW_IS_ADMIN; adds NANOCLAW_ADMIN_USER_IDS (owners + global admins
+ scoped admins for this agent group). Agent-runner poll-loop gates
slash commands against that set.
New skill: /init-first-agent
- Walks the operator through standing up the first agent for a channel:
channel pick → identity lookup (reads each channel SKILL.md's
## Channel Info > how-to-find-id) → DM platform_id resolution (direct-
addressable, cold-DM via "user DMs bot first + sqlite lookup", or
Telegram pair-code fallback) → run scripts/init-first-agent.ts →
verify via tail of nanoclaw.log.
- scripts/init-first-agent.ts: parameterized helper that upserts the
user + grants owner (if none), creates dm-with-<display-name> agent
group + initGroupFilesystem, reuses/creates the DM messaging_group,
wires it (auto-creates destination), resolves the session, and writes
a kind:'chat' / sender:'system' welcome message into inbound.db. Host
sweep wakes the container and the agent DMs the operator via the
normal delivery path.
/manage-channels rewrite
- Drops --is-main / --jid / main-vs-non-main isolation references.
- First-channel flow delegates to /init-first-agent.
- Explains createMessagingGroupAgent auto-creates destinations.
- Adds a privileged-users show section.
setup/
- register.ts: drop --is-main, --jid, --local-name, --trigger
requiresTrigger defaults; call initGroupFilesystem; normalize to
v2 schema (no is_admin, no admin_user_id, sets unknown_sender_policy
'strict'); let createMessagingGroupAgent handle the destination row.
- pair-telegram.ts: emit PAIRED_USER_ID (namespaced "telegram:<id>")
instead of ADMIN_USER_ID; update header comment.
- register.test.ts deleted — was v1-only, tested a registered_groups
table that no longer exists.
Docs
- v2-architecture-diagram.{md,html}: ER diagram updated to drop
is_admin/admin_user_id, add unknown_sender_policy, and include
users/user_roles/agent_group_members/user_dms.
- v2-architecture-draft.md: approval-routing paragraph rewritten for
pickApprover/pickApprovalDelivery/ensureUserDm; SQL schema block
updated; admin-verification paragraph references
NANOCLAW_ADMIN_USER_IDS.
- v2-setup-wiring.md: entity-model sketch rewritten.
- v2-checklist.md: marked privilege refactor / container filtering /
approval routing / unknown-sender gating done; removed obsolete
admin_user_id and main-vs-non-main items.
Scripts
- scripts/init-first-agent.ts (new) replaces scripts/welcome-owner-dm.ts
(removed; welcome-owner was a Discord-specific one-off).
- test-v2-host.ts, test-v2-channel-e2e.ts, seed-discord.ts: drop
is_admin + admin_user_id, use unknown_sender_policy.
Tests
- src/access.test.ts (new): 14 tests for canAccessAgentGroup, role
helpers, pickApprover, ensureUserDm, pickApprovalDelivery.
- src/db/db-v2.test.ts: adds 3 tests for the auto-created
agent_destinations row (normalized name, no duplicates, collision
break within an agent group).
- host-core.test.ts, channel-registry.test.ts: updated fixtures to
use unknown_sender_policy: 'public' where the test exercises routing
rather than the access gate.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
127 lines
4.3 KiB
TypeScript
127 lines
4.3 KiB
TypeScript
/**
|
|
* Step: pair-telegram — issue a one-time pairing code and wait for the
|
|
* operator to send `@botname CODE` from the chat they want to register.
|
|
*
|
|
* On success, prints platformId / isGroup / pairedUserId / intent. The caller
|
|
* (skill) can then wire the chat to an agent group (e.g. via /init-first-agent
|
|
* or setup --step register). telegram.ts's inbound interceptor has already
|
|
* upserted the paired user and granted owner if no owner existed yet.
|
|
*
|
|
* The service must already be running so the telegram adapter is polling.
|
|
*/
|
|
import { initDb } from '../src/db/connection.js';
|
|
import { runMigrations } from '../src/db/migrations/index.js';
|
|
import { DATA_DIR } from '../src/config.js';
|
|
import path from 'path';
|
|
|
|
import {
|
|
createPairing,
|
|
waitForPairing,
|
|
type PairingIntent,
|
|
} from '../src/channels/telegram-pairing.js';
|
|
import { emitStatus } from './status.js';
|
|
|
|
interface Args {
|
|
intent: PairingIntent;
|
|
ttlMs: number;
|
|
}
|
|
|
|
function parseArgs(args: string[]): Args {
|
|
let intent: PairingIntent = 'main';
|
|
let ttlMs = 5 * 60 * 1000;
|
|
for (let i = 0; i < args.length; i++) {
|
|
switch (args[i]) {
|
|
case '--intent': {
|
|
const raw = args[++i] || 'main';
|
|
if (raw === 'main') {
|
|
intent = 'main';
|
|
} else if (raw.startsWith('wire-to:')) {
|
|
intent = { kind: 'wire-to', folder: raw.slice('wire-to:'.length) };
|
|
} else if (raw.startsWith('new-agent:')) {
|
|
intent = { kind: 'new-agent', folder: raw.slice('new-agent:'.length) };
|
|
} else {
|
|
throw new Error(`Unknown intent: ${raw}`);
|
|
}
|
|
break;
|
|
}
|
|
case '--ttl-ms':
|
|
ttlMs = parseInt(args[++i] || '300000', 10);
|
|
break;
|
|
}
|
|
}
|
|
return { intent, ttlMs };
|
|
}
|
|
|
|
function intentToString(intent: PairingIntent): string {
|
|
if (intent === 'main') return 'main';
|
|
return `${intent.kind}:${intent.folder}`;
|
|
}
|
|
|
|
export async function run(args: string[]): Promise<void> {
|
|
const { intent, ttlMs } = parseArgs(args);
|
|
|
|
// Pairing reads/writes its JSON store under DATA_DIR; the DB isn't strictly
|
|
// required for the pairing primitive itself, but the inbound interceptor
|
|
// (running in the live service) needs it. Touch it here so a fresh install
|
|
// doesn't blow up on the first match.
|
|
const db = initDb(path.join(DATA_DIR, 'v2.db'));
|
|
runMigrations(db);
|
|
|
|
const MAX_REGENERATIONS = 5;
|
|
let record = await createPairing(intent, { ttlMs });
|
|
emitStatus('PAIR_TELEGRAM_ISSUED', {
|
|
CODE: record.code,
|
|
INTENT: intentToString(intent),
|
|
EXPIRES_AT: record.expiresAt,
|
|
INSTRUCTIONS: `Send "${record.code}" from the Telegram chat you want to register (or "@<botname> ${record.code}" in a group with privacy on).`,
|
|
});
|
|
|
|
for (let regen = 0; regen <= MAX_REGENERATIONS; regen++) {
|
|
try {
|
|
const consumed = await waitForPairing(record.code, {
|
|
timeoutMs: ttlMs,
|
|
onAttempt: (a) => {
|
|
emitStatus('PAIR_TELEGRAM_ATTEMPT', {
|
|
EXPECTED_CODE: record.code,
|
|
RECEIVED_CODE: a.candidate,
|
|
PLATFORM_ID: a.platformId,
|
|
AT: a.at,
|
|
});
|
|
},
|
|
});
|
|
emitStatus('PAIR_TELEGRAM', {
|
|
STATUS: 'success',
|
|
CODE: record.code,
|
|
INTENT: intentToString(consumed.intent),
|
|
PLATFORM_ID: consumed.consumed!.platformId,
|
|
IS_GROUP: consumed.consumed!.isGroup,
|
|
PAIRED_USER_ID: consumed.consumed!.adminUserId
|
|
? `telegram:${consumed.consumed!.adminUserId}`
|
|
: '',
|
|
});
|
|
return;
|
|
} catch (err) {
|
|
const message = err instanceof Error ? err.message : String(err);
|
|
const invalidated = /invalidated by wrong code/.test(message);
|
|
if (invalidated && regen < MAX_REGENERATIONS) {
|
|
record = await createPairing(intent, { ttlMs });
|
|
emitStatus('PAIR_TELEGRAM_NEW_CODE', {
|
|
CODE: record.code,
|
|
INTENT: intentToString(intent),
|
|
EXPIRES_AT: record.expiresAt,
|
|
REASON: 'previous code invalidated by wrong attempt',
|
|
REGENERATIONS_LEFT: MAX_REGENERATIONS - regen - 1,
|
|
INSTRUCTIONS: `Send "${record.code}" from the Telegram chat you want to register.`,
|
|
});
|
|
continue;
|
|
}
|
|
emitStatus('PAIR_TELEGRAM', {
|
|
STATUS: 'failed',
|
|
CODE: record.code,
|
|
ERROR: invalidated ? 'max-regenerations-exceeded' : message,
|
|
});
|
|
process.exit(2);
|
|
}
|
|
}
|
|
}
|