mirror of
https://github.com/qwibitai/nanoclaw.git
synced 2026-06-12 18:11:51 +08:00
feat(new-setup): add onecli, auth, and cli-agent dispatcher steps
Aggregates the loose OneCLI install, secret registration, and first-agent wiring commands from /setup into three new dispatcher steps. Adds --cli-only mode to init-first-agent so /new-setup can reach a working 2-way CLI chat with the bare minimum. - setup/onecli.ts: idempotent install + PATH + api-host + .env, polls /health - setup/auth.ts: --check verifies secret; --create --value registers it - setup/cli-agent.ts: wraps init-first-agent --cli-only - scripts/init-first-agent.ts: --cli-only mode; DM mode unchanged Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Koshkoshinsk
+148
-83
@@ -1,15 +1,26 @@
|
||||
/**
|
||||
* Init the first (or Nth) NanoClaw v2 agent for a DM channel.
|
||||
* Init the first (or Nth) NanoClaw v2 agent.
|
||||
*
|
||||
* Two modes:
|
||||
*
|
||||
* 1. **DM channel mode** (default): wires a real DM channel (discord, telegram,
|
||||
* etc.) + the CLI channel to the same agent, stages a welcome into the DM
|
||||
* session so the agent greets the operator over that channel.
|
||||
*
|
||||
* 2. **CLI-only mode** (`--cli-only`): wires only the CLI channel. Used by
|
||||
* `/new-setup` to get to a working 2-way CLI chat with the bare minimum.
|
||||
* Owner grant uses a synthetic `cli:local` user so admin-gated flows work.
|
||||
*
|
||||
* Creates/reuses: user, owner grant (if none), agent group + filesystem,
|
||||
* DM messaging group, wiring, session. Stages a system welcome message so
|
||||
* the host sweep wakes the container and the agent DMs the operator via
|
||||
* messaging group(s), wiring, session. Stages a system welcome message so
|
||||
* the host sweep wakes the container and the agent sends the greeting via
|
||||
* the normal delivery path.
|
||||
*
|
||||
* Runs alongside the service (WAL-mode sqlite) — does NOT initialize
|
||||
* channel adapters, so there's no Gateway conflict.
|
||||
*
|
||||
* Usage:
|
||||
* # DM mode
|
||||
* pnpm exec tsx scripts/init-first-agent.ts \
|
||||
* --channel discord \
|
||||
* --user-id discord:1470183333427675709 \
|
||||
@@ -18,6 +29,12 @@
|
||||
* [--agent-name "Andy"] \
|
||||
* [--welcome "System instruction: ..."]
|
||||
*
|
||||
* # CLI-only mode
|
||||
* pnpm exec tsx scripts/init-first-agent.ts --cli-only \
|
||||
* --display-name "Gavriel" \
|
||||
* [--agent-name "Andy"] \
|
||||
* [--welcome "System instruction: ..."]
|
||||
*
|
||||
* For direct-addressable channels (telegram, whatsapp, etc.), --platform-id
|
||||
* is typically the same as the handle in --user-id, with the channel prefix.
|
||||
*/
|
||||
@@ -38,9 +55,10 @@ import { grantRole, hasAnyOwner } from '../src/modules/permissions/db/user-roles
|
||||
import { upsertUser } from '../src/modules/permissions/db/users.js';
|
||||
import { initGroupFilesystem } from '../src/group-init.js';
|
||||
import { resolveSession, writeSessionMessage } from '../src/session-manager.js';
|
||||
import type { AgentGroup } from '../src/types.js';
|
||||
import type { AgentGroup, MessagingGroup } from '../src/types.js';
|
||||
|
||||
interface Args {
|
||||
cliOnly: boolean;
|
||||
channel: string;
|
||||
userId: string;
|
||||
platformId: string;
|
||||
@@ -52,12 +70,19 @@ interface Args {
|
||||
const DEFAULT_WELCOME =
|
||||
'System instruction: run /welcome to introduce yourself to the user on this new channel.';
|
||||
|
||||
const CLI_CHANNEL = 'cli';
|
||||
const CLI_PLATFORM_ID = 'local';
|
||||
const CLI_SYNTHETIC_USER_ID = `${CLI_CHANNEL}:${CLI_PLATFORM_ID}`;
|
||||
|
||||
function parseArgs(argv: string[]): Args {
|
||||
const out: Partial<Args> = {};
|
||||
const out: Partial<Args> = { cliOnly: false };
|
||||
for (let i = 0; i < argv.length; i++) {
|
||||
const key = argv[i];
|
||||
const val = argv[i + 1];
|
||||
switch (key) {
|
||||
case '--cli-only':
|
||||
out.cliOnly = true;
|
||||
break;
|
||||
case '--channel':
|
||||
out.channel = (val ?? '').toLowerCase();
|
||||
i++;
|
||||
@@ -85,7 +110,26 @@ function parseArgs(argv: string[]): Args {
|
||||
}
|
||||
}
|
||||
|
||||
const required: (keyof Args)[] = ['channel', 'userId', 'platformId', 'displayName'];
|
||||
if (!out.displayName) {
|
||||
console.error('Missing required arg: --display-name');
|
||||
console.error('See scripts/init-first-agent.ts header for usage.');
|
||||
process.exit(2);
|
||||
}
|
||||
|
||||
if (out.cliOnly) {
|
||||
// CLI-only: channel/user/platform default to the synthetic local CLI identity.
|
||||
return {
|
||||
cliOnly: true,
|
||||
channel: CLI_CHANNEL,
|
||||
userId: CLI_SYNTHETIC_USER_ID,
|
||||
platformId: CLI_PLATFORM_ID,
|
||||
displayName: out.displayName,
|
||||
agentName: out.agentName?.trim() || out.displayName,
|
||||
welcome: out.welcome?.trim() || DEFAULT_WELCOME,
|
||||
};
|
||||
}
|
||||
|
||||
const required: (keyof Args)[] = ['channel', 'userId', 'platformId'];
|
||||
const missing = required.filter((k) => !out[k]);
|
||||
if (missing.length) {
|
||||
console.error(`Missing required args: ${missing.map((k) => `--${k.replace(/([A-Z])/g, '-$1').toLowerCase()}`).join(', ')}`);
|
||||
@@ -94,11 +138,12 @@ function parseArgs(argv: string[]): Args {
|
||||
}
|
||||
|
||||
return {
|
||||
cliOnly: false,
|
||||
channel: out.channel!,
|
||||
userId: out.userId!,
|
||||
platformId: out.platformId!,
|
||||
displayName: out.displayName!,
|
||||
agentName: out.agentName?.trim() || out.displayName!,
|
||||
displayName: out.displayName,
|
||||
agentName: out.agentName?.trim() || out.displayName,
|
||||
welcome: out.welcome?.trim() || DEFAULT_WELCOME,
|
||||
};
|
||||
}
|
||||
@@ -115,6 +160,48 @@ function generateId(prefix: string): string {
|
||||
return `${prefix}-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
|
||||
}
|
||||
|
||||
function ensureCliMessagingGroup(now: string): MessagingGroup {
|
||||
let cliMg = getMessagingGroupByPlatform(CLI_CHANNEL, CLI_PLATFORM_ID);
|
||||
if (cliMg) return cliMg;
|
||||
|
||||
cliMg = {
|
||||
id: generateId('mg'),
|
||||
channel_type: CLI_CHANNEL,
|
||||
platform_id: CLI_PLATFORM_ID,
|
||||
name: 'Local CLI',
|
||||
is_group: 0,
|
||||
unknown_sender_policy: 'public',
|
||||
created_at: now,
|
||||
};
|
||||
createMessagingGroup(cliMg);
|
||||
console.log(`Created CLI messaging group: ${cliMg.id}`);
|
||||
return cliMg;
|
||||
}
|
||||
|
||||
function wireIfMissing(
|
||||
mg: MessagingGroup,
|
||||
ag: AgentGroup,
|
||||
now: string,
|
||||
label: string,
|
||||
): void {
|
||||
const existing = getMessagingGroupAgentByPair(mg.id, ag.id);
|
||||
if (existing) {
|
||||
console.log(`Wiring already exists: ${existing.id} (${label})`);
|
||||
return;
|
||||
}
|
||||
createMessagingGroupAgent({
|
||||
id: generateId('mga'),
|
||||
messaging_group_id: mg.id,
|
||||
agent_group_id: ag.id,
|
||||
trigger_rules: null,
|
||||
response_scope: 'all',
|
||||
session_mode: 'shared',
|
||||
priority: 0,
|
||||
created_at: now,
|
||||
});
|
||||
console.log(`Wired ${label}: ${mg.id} -> ${ag.id}`);
|
||||
}
|
||||
|
||||
async function main(): Promise<void> {
|
||||
const args = parseArgs(process.argv.slice(2));
|
||||
|
||||
@@ -123,7 +210,8 @@ async function main(): Promise<void> {
|
||||
|
||||
const now = new Date().toISOString();
|
||||
|
||||
// 1. User + (conditional) owner grant
|
||||
// 1. User + (conditional) owner grant.
|
||||
// In cli-only mode, the synthetic `cli:local` user becomes the first owner.
|
||||
const userId = namespacedUserId(args.channel, args.userId);
|
||||
upsertUser({
|
||||
id: userId,
|
||||
@@ -145,7 +233,9 @@ async function main(): Promise<void> {
|
||||
}
|
||||
|
||||
// 2. Agent group + filesystem
|
||||
const folder = `dm-with-${normalizeName(args.displayName)}`;
|
||||
const folder = args.cliOnly
|
||||
? `cli-with-${normalizeName(args.displayName)}`
|
||||
: `dm-with-${normalizeName(args.displayName)}`;
|
||||
let ag: AgentGroup | undefined = getAgentGroupByFolder(folder);
|
||||
if (!ag) {
|
||||
const agId = generateId('ag');
|
||||
@@ -168,54 +258,54 @@ async function main(): Promise<void> {
|
||||
'When you receive a system welcome prompt, introduce yourself briefly and invite them to chat. Keep replies concise.',
|
||||
});
|
||||
|
||||
// 3. DM messaging group
|
||||
const platformId = namespacedPlatformId(args.channel, args.platformId);
|
||||
let mg = getMessagingGroupByPlatform(args.channel, platformId);
|
||||
if (!mg) {
|
||||
const mgId = generateId('mg');
|
||||
createMessagingGroup({
|
||||
id: mgId,
|
||||
channel_type: args.channel,
|
||||
platform_id: platformId,
|
||||
name: args.displayName,
|
||||
is_group: 0,
|
||||
unknown_sender_policy: 'strict',
|
||||
created_at: now,
|
||||
});
|
||||
mg = getMessagingGroupByPlatform(args.channel, platformId)!;
|
||||
console.log(`Created messaging group: ${mg.id} (${platformId})`);
|
||||
// 3. Primary messaging group + wiring + welcome session.
|
||||
// In DM mode: the DM messaging group is primary, CLI is wired as a bonus.
|
||||
// In cli-only mode: the CLI messaging group is primary; no DM group.
|
||||
const cliMg = ensureCliMessagingGroup(now);
|
||||
|
||||
let primaryMg: MessagingGroup;
|
||||
if (args.cliOnly) {
|
||||
primaryMg = cliMg;
|
||||
} else {
|
||||
console.log(`Reusing messaging group: ${mg.id} (${platformId})`);
|
||||
const platformId = namespacedPlatformId(args.channel, args.platformId);
|
||||
let dmMg = getMessagingGroupByPlatform(args.channel, platformId);
|
||||
if (!dmMg) {
|
||||
const mgId = generateId('mg');
|
||||
createMessagingGroup({
|
||||
id: mgId,
|
||||
channel_type: args.channel,
|
||||
platform_id: platformId,
|
||||
name: args.displayName,
|
||||
is_group: 0,
|
||||
unknown_sender_policy: 'strict',
|
||||
created_at: now,
|
||||
});
|
||||
dmMg = getMessagingGroupByPlatform(args.channel, platformId)!;
|
||||
console.log(`Created messaging group: ${dmMg.id} (${platformId})`);
|
||||
} else {
|
||||
console.log(`Reusing messaging group: ${dmMg.id} (${platformId})`);
|
||||
}
|
||||
primaryMg = dmMg;
|
||||
}
|
||||
|
||||
// 4. Wire (auto-creates the companion agent_destinations row)
|
||||
const existingMga = getMessagingGroupAgentByPair(mg.id, ag.id);
|
||||
if (!existingMga) {
|
||||
createMessagingGroupAgent({
|
||||
id: generateId('mga'),
|
||||
messaging_group_id: mg.id,
|
||||
agent_group_id: ag.id,
|
||||
trigger_rules: null,
|
||||
response_scope: 'all',
|
||||
session_mode: 'shared',
|
||||
priority: 0,
|
||||
created_at: now,
|
||||
});
|
||||
console.log(`Wired ${mg.id} -> ${ag.id}`);
|
||||
} else {
|
||||
console.log(`Wiring already exists: ${existingMga.id}`);
|
||||
// Wire primary (DM or CLI), auto-creates companion agent_destinations row.
|
||||
wireIfMissing(primaryMg, ag, now, args.cliOnly ? 'cli' : 'dm');
|
||||
|
||||
// In DM mode also wire CLI so `pnpm run chat` works immediately.
|
||||
if (!args.cliOnly) {
|
||||
wireIfMissing(cliMg, ag, now, 'cli-bonus');
|
||||
}
|
||||
|
||||
// 5. Session + staged welcome message
|
||||
const { session, created } = resolveSession(ag.id, mg.id, null, 'shared');
|
||||
// 4. Session + staged welcome (on the primary messaging group)
|
||||
const { session, created } = resolveSession(ag.id, primaryMg.id, null, 'shared');
|
||||
console.log(`${created ? 'Created' : 'Reusing'} session: ${session.id}`);
|
||||
|
||||
writeSessionMessage(ag.id, session.id, {
|
||||
id: generateId('sys-welcome'),
|
||||
kind: 'chat',
|
||||
timestamp: now,
|
||||
platformId: mg.platform_id,
|
||||
channelType: args.channel,
|
||||
platformId: primaryMg.platform_id,
|
||||
channelType: primaryMg.channel_type,
|
||||
threadId: null,
|
||||
content: JSON.stringify({
|
||||
text: args.welcome,
|
||||
@@ -224,48 +314,23 @@ async function main(): Promise<void> {
|
||||
}),
|
||||
});
|
||||
|
||||
// 6. Wire the CLI channel to the same agent so the user can `pnpm run chat`
|
||||
// immediately. CLI ships with main and is always available — separate
|
||||
// messaging_group from the DM channel, so the two don't share a session.
|
||||
const CLI_PLATFORM_ID = 'local';
|
||||
let cliMg = getMessagingGroupByPlatform('cli', CLI_PLATFORM_ID);
|
||||
if (!cliMg) {
|
||||
cliMg = {
|
||||
id: generateId('mg'),
|
||||
channel_type: 'cli',
|
||||
platform_id: CLI_PLATFORM_ID,
|
||||
name: 'Local CLI',
|
||||
is_group: 0,
|
||||
unknown_sender_policy: 'public',
|
||||
created_at: now,
|
||||
};
|
||||
createMessagingGroup(cliMg);
|
||||
console.log(`Created CLI messaging group: ${cliMg.id}`);
|
||||
}
|
||||
const existingCliMga = getMessagingGroupAgentByPair(cliMg.id, ag.id);
|
||||
if (!existingCliMga) {
|
||||
createMessagingGroupAgent({
|
||||
id: generateId('mga'),
|
||||
messaging_group_id: cliMg.id,
|
||||
agent_group_id: ag.id,
|
||||
trigger_rules: null,
|
||||
response_scope: 'all',
|
||||
session_mode: 'shared',
|
||||
priority: 0,
|
||||
created_at: now,
|
||||
});
|
||||
console.log(`Wired cli/${CLI_PLATFORM_ID} -> ${ag.id}`);
|
||||
}
|
||||
|
||||
console.log('');
|
||||
console.log('Init complete.');
|
||||
console.log(` owner: ${userId}${promotedToOwner ? ' (promoted on first owner)' : ''}`);
|
||||
console.log(` agent: ${ag.name} [${ag.id}] @ groups/${folder}`);
|
||||
console.log(` channel: ${args.channel} ${platformId}`);
|
||||
if (args.cliOnly) {
|
||||
console.log(` channel: cli/${CLI_PLATFORM_ID}`);
|
||||
} else {
|
||||
console.log(` channel: ${args.channel} ${primaryMg.platform_id}`);
|
||||
console.log(` cli: cli/${CLI_PLATFORM_ID} wired — try \`pnpm run chat hi\``);
|
||||
}
|
||||
console.log(` session: ${session.id}`);
|
||||
console.log(` cli: cli/${CLI_PLATFORM_ID} wired — try \`pnpm run chat hi\``);
|
||||
console.log('');
|
||||
console.log('Host sweep (<=60s) will wake the container and the agent will send the welcome DM.');
|
||||
console.log(
|
||||
args.cliOnly
|
||||
? 'Host sweep (<=60s) will wake the container. Try `pnpm run chat hi`.'
|
||||
: 'Host sweep (<=60s) will wake the container and the agent will send the welcome DM.',
|
||||
);
|
||||
}
|
||||
|
||||
main().catch((err) => {
|
||||
|
||||
Reference in New Issue
Block a user