npm - @playcraft/cli - Versions diffs - 0.0.34 → 0.0.37 - Mend

@playcraft/cli 0.0.34 → 0.0.37

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (6) hide show

package/dist/commands/login.js ADDED Viewed

@@ -0,0 +1,138 @@
+import http from 'http';
+import { exec } from 'child_process';
+import crypto from 'crypto';
+import { saveGlobalConfig, loadGlobalConfig } from '../config.js';
+const CALLBACK_PORT = 3456;
+const TIMEOUT_MS = 5 * 60 * 1000;
+function escapeHtml(text) {
+    return text
+        .replace(/&/g, '&amp;')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;')
+        .replace(/"/g, '&quot;');
+}
+function openBrowser(url) {
+    const cmd = process.platform === 'darwin'
+        ? 'open'
+        : process.platform === 'win32'
+            ? 'start'
+            : 'xdg-open';
+    try {
+        exec(`${cmd} "${url}"`, (err, _stdout, stderr) => {
+            if (err) {
+                console.error('Failed to open browser automatically:', err.message);
+                if (stderr?.trim()) {
+                    console.error(stderr.trim());
+                }
+                console.error('Please use the URL printed above to complete login.');
+                return;
+            }
+        });
+    }
+    catch (e) {
+        console.error('Failed to start browser launcher:', e instanceof Error ? e.message : e);
+        console.error('Please use the URL printed above to complete login.');
+    }
+}
+export async function loginCommand(options) {
+    const globalConfig = loadGlobalConfig();
+    const backendUrl = options.url ||
+        globalConfig.backendUrl ||
+        'https://playcraft.woa.com';
+    const state = crypto.randomBytes(16).toString('hex');
+    return new Promise((resolve, reject) => {
+        const server = http.createServer((req, res) => {
+            res.setHeader('Access-Control-Allow-Origin', '*');
+            res.setHeader('Access-Control-Allow-Methods', 'POST, OPTIONS');
+            res.setHeader('Access-Control-Allow-Headers', 'Content-Type');
+            if (req.method === 'OPTIONS') {
+                res.writeHead(204);
+                res.end();
+                return;
+            }
+            if (req.url === '/callback' && req.method === 'POST') {
+                let body = '';
+                req.on('data', (chunk) => (body += chunk));
+                req.on('end', () => {
+                    try {
+                        const data = JSON.parse(body);
+                        if (data.state !== state) {
+                            res.writeHead(403, { 'Content-Type': 'text/html' });
+                            res.end('<html><body><h1>Invalid state</h1></body></html>');
+                            server.close(() => {
+                                reject(new Error('State mismatch - possible CSRF attack'));
+                            });
+                            return;
+                        }
+                        saveGlobalConfig({ token: data.token, backendUrl });
+                        res.writeHead(200, { 'Content-Type': 'text/html' });
+                        res.end('<html>' +
+                            '<head><meta charset="utf-8"><title>Login Success</title></head>' +
+                            '<body style="font-family:system-ui;text-align:center;padding:40px">' +
+                            '<h1>CLI Login Successful</h1>' +
+                            '<p>You can close this window and return to your terminal.</p>' +
+                            '</body></html>');
+                        server.close();
+                        console.log('Login successful! Token saved to ~/.playcraft/config.json');
+                        resolve();
+                    }
+                    catch (err) {
+                        const cause = err instanceof Error ? err : new Error(String(err));
+                        console.error('[playcraft login] Callback handling failed:', cause.message);
+                        if (cause.stack) {
+                            console.error(cause.stack);
+                        }
+                        const userFacing = cause instanceof SyntaxError
+                            ? 'Invalid JSON in login callback.'
+                            : `Login callback failed: ${cause.message}`;
+                        res.writeHead(500, { 'Content-Type': 'text/html; charset=utf-8' });
+                        res.end('<html><head><meta charset="utf-8"/><title>Error</title></head>' +
+                            '<body style="font-family:system-ui;padding:24px">' +
+                            `<h1>Error</h1><p>${escapeHtml(userFacing)}</p>` +
+                            '</body></html>');
+                        server.close(() => {
+                            reject(new Error(userFacing));
+                        });
+                    }
+                });
+            }
+        });
+        // Bind failures emit 'error' (e.g. EADDRINUSE); synchronously thrown errors from listen() are caught below.
+        server.on('error', (err) => {
+            server.close(() => {
+                if (err.code === 'EADDRINUSE') {
+                    reject(new Error(`Port ${CALLBACK_PORT} is already in use. ` +
+                        'Please close any other playcraft login process and try again.'));
+                }
+                else {
+                    reject(err);
+                }
+            });
+        });
+        try {
+            server.listen(CALLBACK_PORT, () => {
+                const callbackUrl = `http://localhost:${CALLBACK_PORT}/callback`;
+                const authUrl = `${backendUrl}/cli-auth?callback=${encodeURIComponent(callbackUrl)}&state=${state}`;
+                console.log('Opening browser for login...');
+                console.log(`If the browser does not open, visit this URL manually:\n  ${authUrl}\n`);
+                openBrowser(authUrl);
+                console.log(`Waiting for authorization (timeout: ${TIMEOUT_MS / 1000}s)...`);
+            });
+        }
+        catch (err) {
+            server.close(() => {
+                reject(err instanceof Error ? err : new Error(String(err)));
+            });
+            return;
+        }
+        // Timeout handler
+        const timeout = setTimeout(() => {
+            server.close(() => {
+                reject(new Error('Login timed out after 5 minutes. Please try again.'));
+            });
+        }, TIMEOUT_MS);
+        server.on('close', () => {
+            clearTimeout(timeout);
+        });
+    });
+}

package/dist/commands/prefab.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { inspect } from 'node:util';
 import { readFileSync, writeFileSync, readdirSync, statSync, existsSync } from 'fs';
 import { join, resolve } from 'path';
 import JSON5 from 'json5';
-import { THEME_SCHEMA_PATH, THEME_INDEX_PATH, THEME_DIR, DEFAULT_GAME_PATH, MANIFEST_PATH, ASSETS_JSON_PATH, LITE_CREATOR_EXTENSIONS_DIR, themeDataPath, scenePath, defaultValueFromJsonSchemaProperty, buildThemeIndexTs, parseThemeIndexImportPath, parseThemePrefabs, mergeThemeDataKey, deleteThemeDataKey, parseExtensionMetaData, parseGameConfig, buildExtensionPrefabs, updateGameConfigValue, updateGameConfigExtensions, findConfigKeyCaseInsensitive, parseConfigKey, listScenesFromManifest, listScenesWithGameConfig, resolveGameConfigPath, getActiveSceneIdFromManifest, reorderManifestDefaultScene, validateThemeValue, validateConfigValue, describeJsonSchemaFields, describeConfigSchemaFields, getPrefabFieldDescriptors, getPrefabFieldDiffs, prefabHasSchemaDiff, } from '@playcraft/common/prefab';
+import { THEME_SCHEMA_PATH, THEME_INDEX_PATH, THEME_DIR, DEFAULT_GAME_PATH, MANIFEST_PATH, ASSETS_JSON_PATH, LITE_CREATOR_EXTENSIONS_DIR, themeDataPath, scenePath, defaultValueFromJsonSchemaProperty, buildThemeIndexTs, parseThemeIndexImportPath, parseThemePrefabs, mergeThemeDataKey, deleteThemeDataKey, parseExtensionMetaData, parseGameConfig, buildExtensionPrefabs, updateGameConfigValue, updateGameConfigExtensions, findConfigKeyCaseInsensitive, parseConfigKey, listScenesFromManifest, listScenesWithGameConfig, resolveGameConfigPath, reorderManifestDefaultScene, validateThemeValue, validateConfigValue, describeJsonSchemaFields, describeConfigSchemaFields, getPrefabFieldDescriptors, getPrefabFieldDiffs, prefabHasSchemaDiff, } from '@playcraft/common/prefab';
 const DEFAULT_PAGE_LIMIT = 50;
 /** 场景在 manifest / CLI 中列出但解析不到 GameConfig 时的人读标签 */
 const NO_SCENE_GAMECONFIG_LABEL = '（无场景级 GameConfig）';
@@ -243,16 +243,16 @@ function resolveThemeId(projectDir, opts) {
 }
 // ─── PlayCanvas / LiteCreator helpers ────────────────────────────────────────
 /**
- * 当前活跃场景 ID = manifest.scenes[0]。
- *
- * 与 Remix 编辑器和后端 `setDefaultScene`（将目标场景移到首位）的 SSOT 一致。
+ * 当前活跃场景 ID = manifest.scenes[0]（与 `@playcraft/common` 中 `getActiveSceneIdFromManifest` 一致）。
+ * 用 `listScenesFromManifest` 组合实现，避免依赖较新 common 包才提供的命名导出。
  */
 function getMainSceneId(projectDir) {
     if (!fileExists(projectDir, MANIFEST_PATH))
         return null;
     try {
         const manifestJson = JSON.parse(readLocalFile(projectDir, MANIFEST_PATH));
-        return getActiveSceneIdFromManifest(manifestJson);
+        const scenes = listScenesFromManifest(manifestJson);
+        return scenes.length > 0 ? scenes[0].id : null;
     }
     catch {
         return null;
@@ -1265,8 +1265,16 @@ export function registerPrefabCommands(program) {
                 console.error(`Error: 场景 "${variant}" 不存在。可用: ${scenes.map((s) => `${s.name}(${s.id})`).join(', ')}`);
                 process.exit(1);
             }
-            const manifestRaw = readLocalFile(projectDir, MANIFEST_PATH);
-            const manifestJson = JSON.parse(manifestRaw);
+            let manifestJson;
+            try {
+                const manifestRaw = readLocalFile(projectDir, MANIFEST_PATH);
+                manifestJson = JSON.parse(manifestRaw);
+            }
+            catch (e) {
+                const msg = e instanceof Error ? e.message : String(e);
+                console.error(`Error: 无法读取或解析 ${MANIFEST_PATH}: ${msg}`);
+                process.exit(1);
+            }
             const reordered = reorderManifestDefaultScene(manifestJson, found.id);
             if (reordered && reordered !== manifestJson) {
                 writeFileSync(join(projectDir, MANIFEST_PATH), JSON.stringify(reordered, null, 2), 'utf-8');

package/dist/commands/tools.js CHANGED Viewed

@@ -144,6 +144,40 @@ export function registerToolsCommands(program) {
     const tools = program
         .command('tools')
         .description('后端 /api/agent/tools；需 PLAYCRAFT_API_URL + PLAYCRAFT_SANDBOX_TOKEN 或 .playcraft.json');
+    // ─── Image Models ────────────────────────────────────────────
+    tools.command('list-image-models')
+        .description('列出后端已配置的可用生图模型（modelKind=image），输出可直接作为 --image-model 的值')
+        .option('--json', '以 JSON 格式输出（默认为人类可读表格）')
+        .action(async (opts) => {
+        try {
+            const client = new AgentApiClient();
+            const models = await client.get('/image-models');
+            if (!models.length) {
+                console.log('暂无已配置的生图模型。请前往 Admin > AI Settings 添加 modelKind=image 的配置。');
+                return;
+            }
+            if (opts.json) {
+                console.log(JSON.stringify(models, null, 2));
+                return;
+            }
+            // 人类可读表格
+            const defaultMark = (m) => (m.isDefault ? ' (default)' : '');
+            const maxRefLen = Math.max(...models.map((m) => m.ref.length), 'MODEL REF'.length);
+            console.log('');
+            console.log(`${'MODEL REF'.padEnd(maxRefLen)}  PROVIDER          MODEL`);
+            console.log(`${'-'.repeat(maxRefLen)}  ----------------  --------------------------------`);
+            for (const m of models) {
+                console.log(`${m.ref.padEnd(maxRefLen)}  ${m.provider.padEnd(16)}  ${m.model}${defaultMark(m)}`);
+            }
+            console.log('');
+            console.log(`使用方式：playcraft tools generate-image --prompt "..." --output out.png --image-model <MODEL REF>`);
+            console.log('');
+        }
+        catch (err) {
+            console.error('获取生图模型列表失败：', err instanceof Error ? err.message : String(err));
+            process.exit(1);
+        }
+    });
     // ─── Generation ─────────────────────────────────────────────
     tools.command('generate-image')
         .description('AI 生成图片（支持多张参考图图生图）')
@@ -152,6 +186,7 @@ export function registerToolsCommands(program) {
         .requiredOption('--output <path>', '保存路径')
         .option('--image-size <size>', '图片尺寸 (1K|2K|4K)')
         .option('--reference-image <path>', '参考图路径（可重复多次，最多 8 张），支持 PNG/JPG/WEBP', collectReferenceImagePaths, [])
+        .option('--image-model <ref>', '生图模型，格式 provider/model-id（如 iegg-litellm/gpt-image-1 或 google/gemini-2.0-flash-preview-image-generation）')
         .action(async (opts) => {
         try {
             const paths = opts.referenceImage ?? [];
@@ -165,6 +200,7 @@ export function registerToolsCommands(program) {
                 aspectRatio: opts.aspectRatio,
                 imageSize: opts.imageSize,
                 referenceImages,
+                ...(opts.imageModel ? { imageModelRef: opts.imageModel } : {}),
             });
             const buf = Buffer.from(result.imageBase64, 'base64');
             const sniffed = sniffImageExtension(buf);

package/dist/config.js CHANGED Viewed

@@ -1,6 +1,8 @@
 import { cosmiconfig } from 'cosmiconfig';
 import { z } from 'zod';
 import path from 'path';
+import { homedir } from 'os';
+import { mkdirSync, writeFileSync, readFileSync } from 'fs';
 import 'dotenv/config';
 export const ConfigSchema = z.object({
     projectId: z.string().optional(),
@@ -13,19 +15,44 @@ export const ConfigSchema = z.object({
 const explorer = cosmiconfig('playcraft', {
     searchPlaces: ['playcraft.config.json', 'playcraft.agent.config.json'],
 });
+const GLOBAL_CONFIG_DIR = path.join(homedir(), '.playcraft');
+const GLOBAL_CONFIG_FILE = path.join(GLOBAL_CONFIG_DIR, 'config.json');
+export function loadGlobalConfig() {
+    try {
+        const content = readFileSync(GLOBAL_CONFIG_FILE, 'utf-8');
+        return JSON.parse(content);
+    }
+    catch {
+        return {};
+    }
+}
+export function saveGlobalConfig(partial) {
+    mkdirSync(GLOBAL_CONFIG_DIR, { recursive: true });
+    let existing = {};
+    try {
+        existing = JSON.parse(readFileSync(GLOBAL_CONFIG_FILE, 'utf-8'));
+    }
+    catch {
+        // ignore
+    }
+    const merged = { ...existing, ...partial };
+    writeFileSync(GLOBAL_CONFIG_FILE, JSON.stringify(merged, null, 2), 'utf-8');
+}
 export async function loadConfig(cliOptions) {
     const result = await explorer.search(cliOptions.dir || process.cwd());
     const fileConfig = result?.config || {};
     const agentConfig = (fileConfig && typeof fileConfig === 'object' && 'agent' in fileConfig)
         ? (fileConfig.agent || {})
         : fileConfig;
+    const globalConfig = loadGlobalConfig();
     const config = ConfigSchema.parse({
+        ...globalConfig,
         ...agentConfig,
         ...cliOptions,
-        projectId: cliOptions.projectId || process.env.PLAYCRAFT_PROJECT_ID || agentConfig.projectId,
-        token: cliOptions.token || process.env.PLAYCRAFT_TOKEN || agentConfig.token,
-        port: cliOptions.port || (process.env.PLAYCRAFT_PORT ? parseInt(process.env.PLAYCRAFT_PORT) : undefined) || agentConfig.port,
-        mode: cliOptions.mode || process.env.PLAYCRAFT_MODE || agentConfig.mode,
+        projectId: cliOptions.projectId || process.env.PLAYCRAFT_PROJECT_ID || agentConfig.projectId || globalConfig.projectId,
+        token: cliOptions.token || process.env.PLAYCRAFT_TOKEN || agentConfig.token || globalConfig.token,
+        port: cliOptions.port || (process.env.PLAYCRAFT_PORT ? parseInt(process.env.PLAYCRAFT_PORT) : undefined) || agentConfig.port || globalConfig.port,
+        mode: cliOptions.mode || process.env.PLAYCRAFT_MODE || agentConfig.mode || globalConfig.mode,
     });
     // Resolve absolute path for dir
     config.dir = path.resolve(process.cwd(), config.dir);

package/dist/index.js CHANGED Viewed

@@ -43,6 +43,15 @@ program
     .action(async (options) => {
     await initCommand(options.dir);
 });
+// login 命令
+program
+    .command('login')
+    .description('登录 PlayCraft 账号并获取 CLI token')
+    .option('--url <url>', '后端地址', 'https://playcraft.woa.com')
+    .action(async (options) => {
+    const { loginCommand } = await import('./commands/login.js');
+    await loginCommand(options);
+});
 // start 命令
 program
     .command('start')

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@playcraft/cli",
-  "version": "0.0.34",
+  "version": "0.0.37",
   "private": false,
   "type": "module",
   "bin": {
@@ -23,8 +23,8 @@
     "release": "node scripts/release.js"
   },
   "dependencies": {
-    "@playcraft/build": "^0.0.35",
-    "@playcraft/common": "^0.0.22",
+    "@playcraft/build": "^0.0.37",
+    "@playcraft/common": "^0.0.25",
     "chokidar": "^4.0.3",
     "commander": "^13.1.0",
     "cors": "^2.8.6",