@playcraft/cli 0.0.40 → 0.0.41

package/dist/commands/recommend.js

@@ -52,7 +52,7 @@ function parseIntOpt(label, raw) {
 export function registerRecommendCommands(program) {
     const rec = program
         .command('recommend')
-        .description('Tag → Atom 推荐(后端 /api/agent/tools/recommend-*);需 .playcraft.json 或环境变量');
+        .description('Tag → Atom 推荐（后端 /api/agent/tools/recommend-*）；运行 playcraft login 后即可直接使用，也支持 .playcraft.json 或 PLAYCRAFT_SANDBOX_TOKEN 环境变量');
     // ─── meta / data ───────────────────────────────────────────
     rec
         .command('meta')

package/dist/commands/remix.js

@@ -0,0 +1,213 @@
+import inquirer from 'inquirer';
+import { exec } from 'child_process';
+import { loadGlobalConfig } from '../config.js';
+import { DEFAULT_PLAYCRAFT_CLOUD_BASE } from './login.js';
+function resolveBackendBaseUrl(options) {
+    const globalConfig = loadGlobalConfig();
+    const raw = options.url ||
+        process.env.PLAYCRAFT_URL ||
+        globalConfig.url ||
+        globalConfig.backendUrl ||
+        DEFAULT_PLAYCRAFT_CLOUD_BASE;
+    return raw.replace(/\/+$/, '');
+}
+function resolveJwtToken(options) {
+    const globalConfig = loadGlobalConfig();
+    const token = options.token || process.env.PLAYCRAFT_TOKEN || globalConfig.token;
+    if (!token) {
+        throw new Error('缺少 JWT token。请先执行 `playcraft login`，或传入 --token / PLAYCRAFT_TOKEN。');
+    }
+    return token;
+}
+function openBrowser(url) {
+    const cmd = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'start' : 'xdg-open';
+    exec(`${cmd} "${url}"`, () => undefined);
+}
+function formatIdleSec(idleSec) {
+    if (!idleSec || idleSec <= 0)
+        return '0s';
+    if (idleSec < 60)
+        return `${idleSec}s`;
+    const m = Math.floor(idleSec / 60);
+    const s = idleSec % 60;
+    return `${m}m${s}s`;
+}
+function getTtydUrl(agentBaseUrl) {
+    if (!agentBaseUrl || !agentBaseUrl.includes('/agent/'))
+        return undefined;
+    return agentBaseUrl.replace('/agent/', '/ttyd/');
+}
+async function remixCreate(options) {
+    const baseUrl = resolveBackendBaseUrl(options);
+    const token = resolveJwtToken(options);
+    const endpoint = `${baseUrl}/api/projects/${encodeURIComponent(options.projectId)}/branches`;
+    const res = await fetch(endpoint, {
+        method: 'POST',
+        headers: {
+            Authorization: `Bearer ${token}`,
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+            name: options.name,
+            ref: options.sourceBranch,
+        }),
+    });
+    if (!res.ok) {
+        const text = await res.text();
+        throw new Error(`创建 remix 失败: ${res.status} ${text}`);
+    }
+    const data = (await res.json());
+    console.log(`Remix 创建成功: ${data.displayName || data.name}`);
+    console.log(`分支: ${data.name}`);
+}
+async function remixEnsureStream(options) {
+    const baseUrl = resolveBackendBaseUrl(options);
+    const token = resolveJwtToken(options);
+    const endpoint = new URL(`${baseUrl}/api/projects/${encodeURIComponent(options.projectId)}/sandbox/ensure-stream`);
+    endpoint.searchParams.set('branch', options.branch);
+    if (options.evictConfirmed)
+        endpoint.searchParams.set('evictConfirmed', 'true');
+    const res = await fetch(endpoint.toString(), {
+        method: 'GET',
+        headers: {
+            Authorization: `Bearer ${token}`,
+            Accept: 'text/event-stream',
+        },
+    });
+    if (!res.ok || !res.body) {
+        const text = await res.text();
+        throw new Error(`ensure-stream 失败: ${res.status} ${text}`);
+    }
+    const reader = res.body.getReader();
+    const decoder = new TextDecoder();
+    let buffer = '';
+    const parseBlock = (block) => {
+        const payload = block
+            .split('\n')
+            .filter((line) => line.startsWith('data:'))
+            .map((line) => line.slice(5).trim())
+            .join('\n');
+        if (!payload)
+            return null;
+        try {
+            return JSON.parse(payload);
+        }
+        catch {
+            return null;
+        }
+    };
+    while (true) {
+        const { done, value } = await reader.read();
+        if (done)
+            break;
+        buffer += decoder.decode(value, { stream: true });
+        let sepIdx = buffer.indexOf('\n\n');
+        while (sepIdx >= 0) {
+            const block = buffer.slice(0, sepIdx);
+            buffer = buffer.slice(sepIdx + 2);
+            const event = parseBlock(block);
+            if (!event) {
+                sepIdx = buffer.indexOf('\n\n');
+                continue;
+            }
+            if (event.type === 'phase') {
+                console.log(`[${event.phase}]${event.detail ? ` ${event.detail}` : ''}`);
+            }
+            else if (event.type === 'log') {
+                console.log(event.message);
+            }
+            else if (event.type === 'error') {
+                throw new Error(event.message || 'ensure-stream 返回 error 事件');
+            }
+            else if (event.type === 'capacity_exceeded') {
+                if (!event.candidates.length) {
+                    throw new Error(`容量已满 (${event.current}/${event.max})，但服务端未返回可驱逐候选`);
+                }
+                const selected = await inquirer.prompt([
+                    {
+                        type: 'list',
+                        name: 'slotId',
+                        message: `沙箱容量已满 (${event.current}/${event.max})，请选择一个候选项继续驱逐:`,
+                        choices: event.candidates.map((c) => ({
+                            name: `${c.slotId} (${c.projectId}/${c.branchName}) idle=${formatIdleSec(c.idleSec)}${c.hasUnpushedChanges ? ' [unpushed]' : ''}`,
+                            value: c.slotId,
+                        })),
+                    },
+                ]);
+                const confirmed = await inquirer.prompt([
+                    {
+                        type: 'confirm',
+                        name: 'ok',
+                        message: `确认继续驱逐并重试？ selected=${selected.slotId}`,
+                        default: false,
+                    },
+                ]);
+                if (!confirmed.ok) {
+                    throw new Error('用户取消操作');
+                }
+                return remixEnsureStream({ ...options, evictConfirmed: true });
+            }
+            else if (event.type === 'done') {
+                return {
+                    sandboxId: event.sandboxId,
+                    previewUrl: event.previewUrl,
+                    agentBaseUrl: event.agentBaseUrl,
+                };
+            }
+            sepIdx = buffer.indexOf('\n\n');
+        }
+    }
+    throw new Error('ensure-stream 结束但未收到 done 事件');
+}
+export function registerRemixCommands(program) {
+    const remix = program
+        .command('remix')
+        .description('Remix 工作流命令（JWT 鉴权，调用用户态 API）');
+    remix
+        .command('create')
+        .description('创建 remix 分支（POST /api/projects/:id/branches）')
+        .requiredOption('--project-id <id>', '项目 ID')
+        .requiredOption('--name <name>', 'remix 分支名（或展示名）')
+        .option('--source-branch <branch>', '源分支', 'main')
+        .option('--url <url>', '后端基址（默认取登录配置 / PLAYCRAFT_URL）')
+        .option('--token <jwt>', 'JWT token（默认取登录配置 / PLAYCRAFT_TOKEN）')
+        .action(async (opts) => {
+        await remixCreate({
+            projectId: String(opts.projectId),
+            name: String(opts.name),
+            sourceBranch: String(opts.sourceBranch || 'main'),
+            url: opts.url,
+            token: opts.token,
+        });
+    });
+    remix
+        .command('start')
+        .description('启动/复用 remix 沙箱（GET ensure-stream SSE）')
+        .requiredOption('--project-id <id>', '项目 ID')
+        .requiredOption('--branch <name>', '分支名（如 remix/my-branch）')
+        .option('--evict-confirmed', '携带 evictConfirmed=true 重试')
+        .option('--open', 'ready 后自动打开预览地址')
+        .option('--url <url>', '后端基址（默认取登录配置 / PLAYCRAFT_URL）')
+        .option('--token <jwt>', 'JWT token（默认取登录配置 / PLAYCRAFT_TOKEN）')
+        .action(async (opts) => {
+        const ready = await remixEnsureStream({
+            projectId: String(opts.projectId),
+            branch: String(opts.branch),
+            evictConfirmed: Boolean(opts.evictConfirmed),
+            url: opts.url,
+            token: opts.token,
+        });
+        const ttydUrl = getTtydUrl(ready.agentBaseUrl);
+        console.log('Sandbox ready:');
+        console.log(`- sandboxId: ${ready.sandboxId}`);
+        if (ready.previewUrl)
+            console.log(`- previewUrl: ${ready.previewUrl}`);
+        if (ready.agentBaseUrl)
+            console.log(`- agentBaseUrl: ${ready.agentBaseUrl}`);
+        if (ttydUrl)
+            console.log(`- ttydUrl: ${ttydUrl}`);
+        if (opts.open && ready.previewUrl) {
+            openBrowser(ready.previewUrl);
+        }
+    });
+}