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
+186
@@ -0,0 +1,186 @@
|
||||
/**
|
||||
* Step: auth — Verify or register an Anthropic credential in OneCLI.
|
||||
*
|
||||
* Modes:
|
||||
* --check (default) Verify an Anthropic secret exists.
|
||||
* --create --value <token> Create an Anthropic secret. Errors if one
|
||||
* already exists unless --force is passed.
|
||||
*
|
||||
* The actual user-facing prompt (subscription vs API key, paste the token)
|
||||
* stays in the /new-setup SKILL.md. This step is just the machine side:
|
||||
* it calls `onecli secrets list` / `onecli secrets create` and emits a
|
||||
* structured status block. The token value is never logged.
|
||||
*/
|
||||
import { execFileSync } from 'child_process';
|
||||
import os from 'os';
|
||||
import path from 'path';
|
||||
|
||||
import { log } from '../src/log.js';
|
||||
import { emitStatus } from './status.js';
|
||||
|
||||
const LOCAL_BIN = path.join(os.homedir(), '.local', 'bin');
|
||||
|
||||
interface Args {
|
||||
mode: 'check' | 'create';
|
||||
value?: string;
|
||||
force: boolean;
|
||||
}
|
||||
|
||||
function childEnv(): NodeJS.ProcessEnv {
|
||||
const parts = [LOCAL_BIN];
|
||||
if (process.env.PATH) parts.push(process.env.PATH);
|
||||
return { ...process.env, PATH: parts.join(path.delimiter) };
|
||||
}
|
||||
|
||||
function parseArgs(args: string[]): Args {
|
||||
let mode: 'check' | 'create' = 'check';
|
||||
let value: string | undefined;
|
||||
let force = false;
|
||||
|
||||
for (let i = 0; i < args.length; i++) {
|
||||
const key = args[i];
|
||||
const val = args[i + 1];
|
||||
switch (key) {
|
||||
case '--check':
|
||||
mode = 'check';
|
||||
break;
|
||||
case '--create':
|
||||
mode = 'create';
|
||||
break;
|
||||
case '--value':
|
||||
value = val;
|
||||
i++;
|
||||
break;
|
||||
case '--force':
|
||||
force = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (mode === 'create' && !value) {
|
||||
emitStatus('AUTH', {
|
||||
STATUS: 'failed',
|
||||
ERROR: 'missing_value_for_create',
|
||||
LOG: 'logs/setup.log',
|
||||
});
|
||||
process.exit(2);
|
||||
}
|
||||
|
||||
return { mode, value, force };
|
||||
}
|
||||
|
||||
interface OnecliSecret {
|
||||
id: string;
|
||||
name: string;
|
||||
type: string;
|
||||
hostPattern: string | null;
|
||||
}
|
||||
|
||||
function listSecrets(): OnecliSecret[] {
|
||||
const out = execFileSync('onecli', ['secrets', 'list'], {
|
||||
encoding: 'utf-8',
|
||||
env: childEnv(),
|
||||
stdio: ['ignore', 'pipe', 'ignore'],
|
||||
});
|
||||
const parsed = JSON.parse(out) as { data?: unknown };
|
||||
return Array.isArray(parsed.data) ? (parsed.data as OnecliSecret[]) : [];
|
||||
}
|
||||
|
||||
function findAnthropicSecret(secrets: OnecliSecret[]): OnecliSecret | undefined {
|
||||
return secrets.find((s) => s.type === 'anthropic');
|
||||
}
|
||||
|
||||
function createAnthropicSecret(value: string): void {
|
||||
// `value` is a credential — do not log it, do not echo, do not pass through a shell.
|
||||
execFileSync(
|
||||
'onecli',
|
||||
[
|
||||
'secrets',
|
||||
'create',
|
||||
'--name',
|
||||
'Anthropic',
|
||||
'--type',
|
||||
'anthropic',
|
||||
'--value',
|
||||
value,
|
||||
'--host-pattern',
|
||||
'api.anthropic.com',
|
||||
],
|
||||
{
|
||||
env: childEnv(),
|
||||
stdio: ['ignore', 'ignore', 'pipe'],
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
export async function run(args: string[]): Promise<void> {
|
||||
const { mode, value, force } = parseArgs(args);
|
||||
|
||||
let secrets: OnecliSecret[];
|
||||
try {
|
||||
secrets = listSecrets();
|
||||
} catch (err) {
|
||||
log.error('onecli secrets list failed', { err });
|
||||
emitStatus('AUTH', {
|
||||
STATUS: 'failed',
|
||||
ERROR: 'onecli_list_failed',
|
||||
HINT: 'Is OneCLI running? Run `/new-setup` from the onecli step.',
|
||||
LOG: 'logs/setup.log',
|
||||
});
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
const existing = findAnthropicSecret(secrets);
|
||||
|
||||
if (mode === 'check') {
|
||||
emitStatus('AUTH', {
|
||||
SECRET_PRESENT: !!existing,
|
||||
ANTHROPIC_OK: !!existing,
|
||||
STATUS: existing ? 'success' : 'missing',
|
||||
...(existing ? { SECRET_NAME: existing.name, SECRET_ID: existing.id } : {}),
|
||||
LOG: 'logs/setup.log',
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
// mode === 'create'
|
||||
if (existing && !force) {
|
||||
emitStatus('AUTH', {
|
||||
SECRET_PRESENT: true,
|
||||
STATUS: 'skipped',
|
||||
REASON: 'anthropic_secret_already_exists',
|
||||
SECRET_NAME: existing.name,
|
||||
SECRET_ID: existing.id,
|
||||
HINT: 'Re-run with --force to replace, or delete the existing secret first.',
|
||||
LOG: 'logs/setup.log',
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
createAnthropicSecret(value!);
|
||||
} catch (err) {
|
||||
const e = err as { stderr?: string | Buffer; status?: number };
|
||||
const stderr = typeof e.stderr === 'string' ? e.stderr : e.stderr?.toString('utf-8') ?? '';
|
||||
log.error('onecli secrets create failed', { status: e.status, stderr });
|
||||
emitStatus('AUTH', {
|
||||
STATUS: 'failed',
|
||||
ERROR: 'onecli_create_failed',
|
||||
EXIT_CODE: e.status ?? -1,
|
||||
LOG: 'logs/setup.log',
|
||||
});
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
// Re-verify
|
||||
const updated = findAnthropicSecret(listSecrets());
|
||||
|
||||
emitStatus('AUTH', {
|
||||
SECRET_PRESENT: !!updated,
|
||||
ANTHROPIC_OK: !!updated,
|
||||
CREATED: true,
|
||||
STATUS: updated ? 'success' : 'failed',
|
||||
...(updated ? { SECRET_NAME: updated.name, SECRET_ID: updated.id } : {}),
|
||||
LOG: 'logs/setup.log',
|
||||
});
|
||||
}
|
||||
@@ -0,0 +1,100 @@
|
||||
/**
|
||||
* Step: cli-agent — Create the first agent wired to the CLI channel.
|
||||
*
|
||||
* Thin wrapper around `scripts/init-first-agent.ts --cli-only`. Emits a
|
||||
* status block so /new-setup SKILL.md can parse the result without having
|
||||
* to read the script's plain stdout.
|
||||
*
|
||||
* Args:
|
||||
* --display-name <name> (required) operator's display name
|
||||
* --agent-name <name> (optional) agent persona name, defaults to display-name
|
||||
* --welcome <text> (optional) system welcome instruction
|
||||
*/
|
||||
import { execFileSync } from 'child_process';
|
||||
import path from 'path';
|
||||
|
||||
import { log } from '../src/log.js';
|
||||
import { emitStatus } from './status.js';
|
||||
|
||||
function parseArgs(args: string[]): {
|
||||
displayName: string;
|
||||
agentName?: string;
|
||||
welcome?: string;
|
||||
} {
|
||||
let displayName: string | undefined;
|
||||
let agentName: string | undefined;
|
||||
let welcome: string | undefined;
|
||||
|
||||
for (let i = 0; i < args.length; i++) {
|
||||
const key = args[i];
|
||||
const val = args[i + 1];
|
||||
switch (key) {
|
||||
case '--display-name':
|
||||
displayName = val;
|
||||
i++;
|
||||
break;
|
||||
case '--agent-name':
|
||||
agentName = val;
|
||||
i++;
|
||||
break;
|
||||
case '--welcome':
|
||||
welcome = val;
|
||||
i++;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!displayName) {
|
||||
emitStatus('CLI_AGENT', {
|
||||
STATUS: 'failed',
|
||||
ERROR: 'missing_display_name',
|
||||
LOG: 'logs/setup.log',
|
||||
});
|
||||
process.exit(2);
|
||||
}
|
||||
|
||||
return { displayName, agentName, welcome };
|
||||
}
|
||||
|
||||
export async function run(args: string[]): Promise<void> {
|
||||
const { displayName, agentName, welcome } = parseArgs(args);
|
||||
|
||||
const projectRoot = process.cwd();
|
||||
const script = path.join(projectRoot, 'scripts', 'init-first-agent.ts');
|
||||
|
||||
const scriptArgs = ['exec', 'tsx', script, '--cli-only', '--display-name', displayName];
|
||||
if (agentName) scriptArgs.push('--agent-name', agentName);
|
||||
if (welcome) scriptArgs.push('--welcome', welcome);
|
||||
|
||||
log.info('Invoking init-first-agent in cli-only mode', { displayName, agentName });
|
||||
|
||||
try {
|
||||
execFileSync('pnpm', scriptArgs, {
|
||||
cwd: projectRoot,
|
||||
stdio: ['ignore', 'pipe', 'pipe'],
|
||||
encoding: 'utf-8',
|
||||
});
|
||||
} catch (err) {
|
||||
const e = err as { stdout?: string; stderr?: string; status?: number };
|
||||
log.error('init-first-agent failed', {
|
||||
status: e.status,
|
||||
stdout: e.stdout,
|
||||
stderr: e.stderr,
|
||||
});
|
||||
emitStatus('CLI_AGENT', {
|
||||
STATUS: 'failed',
|
||||
ERROR: 'init_script_failed',
|
||||
EXIT_CODE: e.status ?? -1,
|
||||
LOG: 'logs/setup.log',
|
||||
});
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
emitStatus('CLI_AGENT', {
|
||||
DISPLAY_NAME: displayName,
|
||||
AGENT_NAME: agentName || displayName,
|
||||
CHANNEL: 'cli/local',
|
||||
STATUS: 'success',
|
||||
LOG: 'logs/setup.log',
|
||||
});
|
||||
}
|
||||
@@ -16,6 +16,9 @@ const STEPS: Record<
|
||||
mounts: () => import('./mounts.js'),
|
||||
service: () => import('./service.js'),
|
||||
verify: () => import('./verify.js'),
|
||||
onecli: () => import('./onecli.js'),
|
||||
auth: () => import('./auth.js'),
|
||||
'cli-agent': () => import('./cli-agent.js'),
|
||||
};
|
||||
|
||||
async function main(): Promise<void> {
|
||||
|
||||
+194
@@ -0,0 +1,194 @@
|
||||
/**
|
||||
* Step: onecli — Install + configure the OneCLI gateway and CLI.
|
||||
*
|
||||
* Aggregates what the old /setup + /init-onecli skills ran as loose shell
|
||||
* commands. Idempotent: skips install if `onecli` already works, and safely
|
||||
* re-applies PATH, api-host, and .env updates.
|
||||
*
|
||||
* Emits ONECLI_URL so /new-setup SKILL.md can forward it downstream (e.g. as
|
||||
* ${ONECLI_URL} in status messages). Polls /health to give downstream steps
|
||||
* (auth, service) a ready gateway.
|
||||
*/
|
||||
import { execFileSync, execSync } from 'child_process';
|
||||
import fs from 'fs';
|
||||
import os from 'os';
|
||||
import path from 'path';
|
||||
|
||||
import { log } from '../src/log.js';
|
||||
import { emitStatus } from './status.js';
|
||||
|
||||
const LOCAL_BIN = path.join(os.homedir(), '.local', 'bin');
|
||||
|
||||
function childEnv(): NodeJS.ProcessEnv {
|
||||
const parts = [LOCAL_BIN];
|
||||
if (process.env.PATH) parts.push(process.env.PATH);
|
||||
return { ...process.env, PATH: parts.join(path.delimiter) };
|
||||
}
|
||||
|
||||
function onecliVersion(): string | null {
|
||||
try {
|
||||
return execFileSync('onecli', ['version'], {
|
||||
encoding: 'utf-8',
|
||||
env: childEnv(),
|
||||
stdio: ['ignore', 'pipe', 'ignore'],
|
||||
}).trim();
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
function getApiHost(): string | null {
|
||||
try {
|
||||
const out = execFileSync('onecli', ['config', 'get', 'api-host'], {
|
||||
encoding: 'utf-8',
|
||||
env: childEnv(),
|
||||
stdio: ['ignore', 'pipe', 'ignore'],
|
||||
}).trim();
|
||||
const parsed = JSON.parse(out) as { value?: unknown };
|
||||
return typeof parsed.value === 'string' && parsed.value ? parsed.value : null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
function extractUrlFromOutput(output: string): string | null {
|
||||
const match = output.match(/https?:\/\/[\w.\-]+(?::\d+)?/);
|
||||
return match ? match[0] : null;
|
||||
}
|
||||
|
||||
function ensureShellProfilePath(): void {
|
||||
const home = os.homedir();
|
||||
const line = 'export PATH="$HOME/.local/bin:$PATH"';
|
||||
for (const profile of [path.join(home, '.bashrc'), path.join(home, '.zshrc')]) {
|
||||
try {
|
||||
const content = fs.existsSync(profile) ? fs.readFileSync(profile, 'utf-8') : '';
|
||||
if (!content.includes('.local/bin')) {
|
||||
fs.appendFileSync(profile, `\n${line}\n`);
|
||||
log.info('Added ~/.local/bin to PATH in shell profile', { profile });
|
||||
}
|
||||
} catch (err) {
|
||||
log.warn('Could not update shell profile', { profile, err });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function writeEnvOnecliUrl(url: string): void {
|
||||
const envFile = path.join(process.cwd(), '.env');
|
||||
let content = fs.existsSync(envFile) ? fs.readFileSync(envFile, 'utf-8') : '';
|
||||
if (/^ONECLI_URL=/m.test(content)) {
|
||||
content = content.replace(/^ONECLI_URL=.*$/m, `ONECLI_URL=${url}`);
|
||||
} else {
|
||||
content = content.trimEnd() + (content ? '\n' : '') + `ONECLI_URL=${url}\n`;
|
||||
}
|
||||
fs.writeFileSync(envFile, content);
|
||||
}
|
||||
|
||||
function installOnecli(): { stdout: string; ok: boolean } {
|
||||
// OneCLI's own install script handles gateway + CLI + PATH.
|
||||
// We run the two canonical installers in sequence and capture stdout so
|
||||
// we can extract the printed URL as a fallback to `onecli config get`.
|
||||
let stdout = '';
|
||||
try {
|
||||
stdout += execSync('curl -fsSL onecli.sh/install | sh', {
|
||||
encoding: 'utf-8',
|
||||
stdio: ['ignore', 'pipe', 'pipe'],
|
||||
});
|
||||
stdout += execSync('curl -fsSL onecli.sh/cli/install | sh', {
|
||||
encoding: 'utf-8',
|
||||
stdio: ['ignore', 'pipe', 'pipe'],
|
||||
});
|
||||
return { stdout, ok: true };
|
||||
} catch (err) {
|
||||
const e = err as { stdout?: string; stderr?: string };
|
||||
log.error('OneCLI install failed', { stderr: e.stderr });
|
||||
return { stdout: stdout + (e.stdout ?? '') + (e.stderr ?? ''), ok: false };
|
||||
}
|
||||
}
|
||||
|
||||
async function pollHealth(url: string, timeoutMs: number): Promise<boolean> {
|
||||
const deadline = Date.now() + timeoutMs;
|
||||
while (Date.now() < deadline) {
|
||||
try {
|
||||
const res = await fetch(`${url}/health`);
|
||||
if (res.ok) return true;
|
||||
} catch {
|
||||
// not ready yet
|
||||
}
|
||||
await new Promise((resolve) => setTimeout(resolve, 1000));
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
export async function run(_args: string[]): Promise<void> {
|
||||
ensureShellProfilePath();
|
||||
|
||||
let installOutput = '';
|
||||
let present = !!onecliVersion();
|
||||
if (!present) {
|
||||
log.info('Installing OneCLI gateway and CLI');
|
||||
const res = installOnecli();
|
||||
installOutput = res.stdout;
|
||||
if (!res.ok) {
|
||||
emitStatus('ONECLI', {
|
||||
INSTALLED: false,
|
||||
STATUS: 'failed',
|
||||
ERROR: 'install_failed',
|
||||
LOG: 'logs/setup.log',
|
||||
});
|
||||
process.exit(1);
|
||||
}
|
||||
present = !!onecliVersion();
|
||||
if (!present) {
|
||||
emitStatus('ONECLI', {
|
||||
INSTALLED: false,
|
||||
STATUS: 'failed',
|
||||
ERROR: 'onecli_not_on_path_after_install',
|
||||
HINT: 'Open a new shell or run `export PATH="$HOME/.local/bin:$PATH"` and retry.',
|
||||
LOG: 'logs/setup.log',
|
||||
});
|
||||
process.exit(1);
|
||||
}
|
||||
}
|
||||
|
||||
let url = getApiHost();
|
||||
if (!url && installOutput) {
|
||||
url = extractUrlFromOutput(installOutput);
|
||||
if (url) {
|
||||
try {
|
||||
execFileSync('onecli', ['config', 'set', 'api-host', url], {
|
||||
stdio: 'ignore',
|
||||
env: childEnv(),
|
||||
});
|
||||
} catch (err) {
|
||||
log.warn('onecli config set api-host failed', { err });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!url) {
|
||||
emitStatus('ONECLI', {
|
||||
INSTALLED: true,
|
||||
STATUS: 'failed',
|
||||
ERROR: 'could_not_resolve_api_host',
|
||||
HINT: 'Run `onecli config get api-host` to inspect the gateway URL.',
|
||||
LOG: 'logs/setup.log',
|
||||
});
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
writeEnvOnecliUrl(url);
|
||||
log.info('Wrote ONECLI_URL to .env', { url });
|
||||
|
||||
const healthy = await pollHealth(url, 15000);
|
||||
|
||||
emitStatus('ONECLI', {
|
||||
INSTALLED: true,
|
||||
ONECLI_URL: url,
|
||||
HEALTHY: healthy,
|
||||
STATUS: healthy ? 'success' : 'degraded',
|
||||
...(healthy
|
||||
? {}
|
||||
: { HINT: 'Gateway did not respond to /health within 15s. Try `onecli start`.' }),
|
||||
LOG: 'logs/setup.log',
|
||||
});
|
||||
}
|
||||
Reference in New Issue
Block a user