@playcraft/cli 0.0.53 → 0.0.56

package/dist/commands/skills.js

@@ -21,6 +21,7 @@
 import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { getFusionHintsForGameplayAtoms, } from '../atom-tree/fusion-hints.js';
+import { detectFusionIntent, fusionCompositeScoreBoost, fusionSingleMechanicPenalty, isFusionCompositeManifest, } from '../atom-tree/fusion-intent.js';
 import { collectPinnedDependencies, loadSkillManifestIndex, parseAtomTreeJson, parseSelectedAtomRefsFromAtomTreeProject, isUninitializedAtomTreeSkeleton, resolveSkillsDirs, validateAtomTreeSelectionProject, } from '../atom-tree/selection.js';
 import { buildAtomTreeSkeleton } from '../atom-tree/build-skeleton.js';
 import { validateAsrCoverageProject } from '../asr/validate-asr-coverage.js';
@@ -83,6 +84,10 @@ const INTENT_TAG_ALIASES = {
     mahjong: ['tile', 'tiles', '牌面'],
     麻将: ['tile', 'tiles', 'mahjong', '牌面'],
     solitaire: ['solitaire', 'klondike', 'card'],
+    消除: ['elimination', 'match-3', 'match3', 'match'],
+    箭头: ['arrow', 'path', 'slide-out'],
+    fusion: ['融合', 'hybrid', 'combine'],
+    融合: ['fusion', 'hybrid', 'combine', 'match-3', 'arrow'],
 };
 const ANCHOR_MEDIA_ROLE_LABELS = {
     tileTextureSet: { label: '牌面/瓦片贴图组', layer: '视觉资产层' },
@@ -250,7 +255,7 @@ function getCategoryLayer(category, atomId) {
     return '玩法层';
 }
 // ─── Manifest 索引器 ─────────────────────────────────────────────────────────
-function loadSkillIndex(skillsDirs) {
+export function loadSkillIndex(skillsDirs) {
     const entries = [];
     const seen = new Set();
     for (const dir of skillsDirs) {
@@ -281,7 +286,10 @@ function loadSkillIndex(skillsDirs) {
 // ─── 推荐算法 ────────────────────────────────────────────────────────────────
 function getGameplayType(manifest) {
     const gen = manifest['generation'];
-    return gen?.gameplayType;
+    if (gen?.gameplayType)
+        return gen.gameplayType;
+    const pgs = manifest['pgs'];
+    return pgs?.gameplayType;
 }
 function isEngineManifest(manifest) {
     return manifest.category === 'engine' || manifest.bundleType === 'aicomponent';
@@ -315,7 +323,7 @@ function pinAtomIdToBareName(pinAtomId) {
 /**
  * 仅按 intent 打分（discovery 相位）。不假设目标引擎。
  */
-export function scoreSkillIntentOnly(entry, intentTags) {
+export function scoreSkillIntentOnly(entry, intentTags, rawIntent = '') {
     if (intentTags.length === 0)
         return 0;
     const { manifest } = entry;
@@ -333,6 +341,8 @@ export function scoreSkillIntentOnly(entry, intentTags) {
     }
     if (manifest.category === 'engine')
         score += 1;
+    score += fusionCompositeScoreBoost(manifest, intentTags, rawIntent);
+    score += fusionSingleMechanicPenalty(manifest, intentTags, rawIntent);
     return score;
 }
 /**
@@ -392,7 +402,7 @@ export function inferSuggestedEngines(scored, intentTags, indexMap) {
  * 计算一个 skill 对给定 engine + intent 的匹配分数。
  * 得分越高，越应该被推荐。
  */
-export function scoreSkill(entry, engine, intentTags) {
+export function scoreSkill(entry, engine, intentTags, rawIntent = '') {
     const { manifest } = entry;
     let score = 0;
     // 1. 引擎精确匹配：renderBackend 或 engineVariants 中有指定引擎
@@ -418,6 +428,8 @@ export function scoreSkill(entry, engine, intentTags) {
     });
     if (importsEngine)
         score += 5;
+    score += fusionCompositeScoreBoost(manifest, intentTags, rawIntent);
+    score += fusionSingleMechanicPenalty(manifest, intentTags, rawIntent);
     return score;
 }
 /**
@@ -452,9 +464,12 @@ function collectDependencies(atomId, index, engine, visited = new Set(), depth =
     }
     else {
         // 无 variant，使用顶层 imports
+        // 只对 requires 做递归传递依赖展开；compatibleWith 只记录直接引用
         for (const imp of entry.manifest.imports ?? []) {
-            if (imp.pinAtomId && !visited.has(imp.pinAtomId)) {
-                deps.push(imp.pinAtomId);
+            if (!imp.pinAtomId || visited.has(imp.pinAtomId))
+                continue;
+            deps.push(imp.pinAtomId);
+            if (imp.edgeKind === 'requires') {
                 deps.push(...collectDependencies(imp.pinAtomId, index, engine, visited, depth + 1));
             }
         }
@@ -563,9 +578,10 @@ function buildIntentOnlyMatchResult(entries, intentTags, suggestedEngines, index
 /**
  * 仅 --intent：先推断引擎，再对首选引擎做完整 match（一轮输出全部内容）。
  */
-export function buildAutoMatchResult(entries, intentTags) {
+export function buildAutoMatchResult(entries, intentTags, rawIntent = '') {
+    const intentBlob = rawIntent || intentTags.join(' ');
     const scored = entries
-        .map((entry) => ({ entry, score: scoreSkillIntentOnly(entry, intentTags) }))
+        .map((entry) => ({ entry, score: scoreSkillIntentOnly(entry, intentTags, intentBlob) }))
         .filter(({ score }) => score >= SCORE_THRESHOLD_DISCOVERY);
     const indexMap = new Map(entries.map((e) => [e.atomId, e]));
     const suggestedEngines = inferSuggestedEngines(scored, intentTags, indexMap);
@@ -573,7 +589,7 @@ export function buildAutoMatchResult(entries, intentTags) {
     if (!engine) {
         return buildIntentOnlyMatchResult(entries, intentTags, suggestedEngines, indexMap);
     }
-    const full = buildMatchResult(entries, engine, intentTags);
+    const full = buildMatchResult(entries, engine, intentTags, intentBlob);
     const gap = suggestedEngines.length > 1 ? suggestedEngines[0].score - suggestedEngines[1].score : 99;
     return {
         ...full,
@@ -582,8 +598,20 @@ export function buildAutoMatchResult(entries, intentTags) {
         engineAmbiguous: suggestedEngines.length > 1 && gap < 5,
     };
 }
-function selectMatchSeedAtomIds(scored, engine, intentTags) {
+function selectMatchSeedAtomIds(scored, engine, intentTags, rawIntent = '') {
     const seeds = new Set();
+    const fusionIntent = detectFusionIntent(intentTags, rawIntent);
+    if (fusionIntent) {
+        const composites = scored.filter(({ entry, score }) => isGameplayManifest(entry.manifest) &&
+            isFusionCompositeManifest(entry.manifest) &&
+            score >= SCORE_THRESHOLD_FULL &&
+            passesGameplayIntentFilter(entry, intentTags));
+        if (composites.length > 0) {
+            for (const { entry } of composites)
+                seeds.add(entry.atomId);
+            return seeds;
+        }
+    }
     for (const { entry, score } of scored) {
         const { manifest } = entry;
         if (isEngineManifest(manifest) && pinAtomIdToEngine(entry.atomId, manifest) === engine) {
@@ -674,19 +702,20 @@ function buildItemReason(entry, engine, intentTags, score, via, dependencyReason
         return `标签：${matchedTags.join(', ')}`;
     return score !== null ? `score=${score}` : '推荐';
 }
-export function buildMatchResult(entries, engine, intentTags) {
+export function buildMatchResult(entries, engine, intentTags, rawIntent = '') {
+    const intentBlob = rawIntent || intentTags.join(' ');
     const indexMap = new Map(entries.map((e) => [e.atomId, e]));
     const scoreById = new Map();
     const expandedIntent = expandIntentTags(intentTags);
     const scored = entries
         .map((entry) => {
-        const score = scoreSkill(entry, engine, expandedIntent);
+        const score = scoreSkill(entry, engine, expandedIntent, intentBlob);
         scoreById.set(entry.atomId, score);
         return { entry, score };
     })
         .filter(({ score }) => score >= SCORE_THRESHOLD_FULL)
         .sort((a, b) => b.score - a.score);
-    const seedIds = selectMatchSeedAtomIds(scored, engine, expandedIntent);
+    const seedIds = selectMatchSeedAtomIds(scored, engine, expandedIntent, intentBlob);
     const requiredIds = expandSeedClosure(seedIds, indexMap, engine);
     const seedIdSet = seedIds;
     const dependencyReasonMap = buildDependencyReasonMap(requiredIds, indexMap, engine);
@@ -1475,9 +1504,10 @@ export function registerSkillsCommands(program) {
                 '  示例：playcraft skills match --engine phaser --intent "match3,grid" --json');
             process.exit(1);
         }
+        const intentBlob = opts.intent;
         const result = opts.engine
-            ? buildMatchResult(entries, opts.engine, intentTags)
-            : buildAutoMatchResult(entries, intentTags);
+            ? buildMatchResult(entries, opts.engine, intentTags, intentBlob)
+            : buildAutoMatchResult(entries, intentTags, intentBlob);
         if (opts.json) {
             process.stdout.write(JSON.stringify(result, null, 2) + '\n');
             return;
@@ -1909,9 +1939,10 @@ export function registerSkillsCommands(program) {
                 process.exit(1);
             }
         }
+        const intentBlob = opts.intent;
         const result = opts.engine
-            ? buildMatchResult(entries, opts.engine, intentTags)
-            : buildAutoMatchResult(entries, intentTags);
+            ? buildMatchResult(entries, opts.engine, intentTags, intentBlob)
+            : buildAutoMatchResult(entries, intentTags, intentBlob);
         if (!result.engine) {
             console.log('无法从 intent 推断运行引擎。请指定：--engine phaser 或 --engine threejs');
             console.log(`示例：playcraft skills init-atom-tree --intent "${intentTags.join(',')}" --engine phaser --force`);

package/dist/index.js

@@ -21,8 +21,10 @@ import { registerImageCommands } from './commands/image.js';
 import { registerAudioCommands } from './commands/audio.js';
 import { registerPrefabCommands } from './commands/prefab.js';
 import { registerRecommendCommands } from './commands/recommend.js';
-import { registerRemixCommands } from './commands/remix.js';
+import { registerRemixCommands, registerGitCredentialCommand } from './commands/remix.js';
 import { registerSkillsCommands } from './commands/skills.js';
+import { registerLevelsCommands } from './commands/levels.js';
+import { registerPatternsCommands } from './commands/patterns.js';
 import { registerPradCommands } from './commands/prad.js';
 import { register3DCommands } from './commands/3d.js';
 import { CLI_ROOT_DESCRIPTION, getCliTopicsHelpText, registerRootProgramHelp, } from './cli-root-help.js';
@@ -30,10 +32,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 const packageJson = JSON.parse(readFileSync(join(__dirname, '..', 'package.json'), 'utf-8'));
 const program = new Command();
-program
-    .name('playcraft')
-    .description(CLI_ROOT_DESCRIPTION)
-    .version(packageJson.version);
+program.name('playcraft').description(CLI_ROOT_DESCRIPTION).version(packageJson.version);
 registerRootProgramHelp(program);
 // 版本检查（非阻塞，后台执行）
 // 只在非 upgrade 命令时检查，避免重复提示
@@ -43,8 +42,13 @@ if (!process.argv.includes('upgrade')) {
 // create 命令
 program
     .command('create [project-name]')
-    .description('从模板创建新的可玩广告项目（包含 Agent Team 工作目录结构）')
+    .description('从模板创建新的可玩广告项目')
     .option('-d, --dir <path>', '在指定目录下创建项目', process.cwd())
+    .option('--port <number>', '本地 Agent 端口（非交互模式默认 2468）', '2468')
+    .option('--non-interactive', '跳过交互式问答，使用命令行参数或默认值')
+    .option('-t, --template <id>', '模板: agent | phaser-playable | three-playable', 'agent')
+    .option('--here', '在当前目录（或 --dir 指定目录）直接初始化，不创建子目录')
+    .option('-f, --force', '非交互模式：目标目录非空时仍覆盖同名文件')
     .action(async (projectName, options) => {
     await createCommand(projectName, options);
 });
@@ -356,8 +360,11 @@ registerPrefabCommands(program);
 registerRecommendCommands(program);
 // Remix workflow (playcraft remix <command>)
 registerRemixCommands(program);
+registerGitCredentialCommand(program);
 // 开发时 Skill 发现与脚手架 (playcraft skills <command>)
 registerSkillsCommands(program);
+registerLevelsCommands(program);
+registerPatternsCommands(program);
 registerPradCommands(program);
 // 3D model utilities (playcraft 3d <command>)
 register3DCommands(program);

package/dist/remix/clone-source.js

@@ -0,0 +1,208 @@
+/**
+ * Parse sources accepted by `playcraft remix clone`:
+ * - PlayCraft remix detail: /projects/:id/remixes/:branch
+ * - PlayCraft remix editor: /editor/remix/:id?branch=
+ * - Gongfeng / GitLab / GitHub branch tree or bare repo URL
+ */
+/** 工蜂内网 / 外网域名互为别名（详情页可能展示任一）。 */
+export const GONGFENG_HOST_ALIASES = ['git.woa.com', 'git.tencent.com'];
+const GIT_HOST_HINTS = [
+    ...GONGFENG_HOST_ALIASES,
+    'github.com',
+    'gitlab.com',
+    'gitee.com',
+];
+function looksLikeHttpUrl(value) {
+    return /^https?:\/\//i.test(value.trim());
+}
+/** Canonical host for Gongfeng alias matching (woa ↔ tencent). */
+export function canonicalizeGitHost(hostname) {
+    const host = hostname.trim().toLowerCase();
+    if (GONGFENG_HOST_ALIASES.includes(host)) {
+        return 'git.woa.com';
+    }
+    return host;
+}
+function isGongfengHost(hostname) {
+    const host = hostname.trim().toLowerCase();
+    return GONGFENG_HOST_ALIASES.includes(host);
+}
+function decodePathSegment(segment) {
+    try {
+        return decodeURIComponent(segment);
+    }
+    catch {
+        return segment;
+    }
+}
+/** Strip credentials and trailing .git / slash for comparison. Gongfeng hosts are aliased. */
+export function normalizeGitRepositoryUrl(raw) {
+    let url = raw.trim();
+    // git@host:group/repo.git → https://host/group/repo
+    const scp = /^git@([^:]+):(.+)$/.exec(url);
+    if (scp) {
+        url = `https://${scp[1]}/${scp[2]}`;
+    }
+    try {
+        const u = new URL(url);
+        u.hash = '';
+        u.search = '';
+        u.username = '';
+        u.password = '';
+        u.hostname = canonicalizeGitHost(u.hostname);
+        let pathname = u.pathname.replace(/\/+$/, '');
+        pathname = pathname.replace(/\.git$/i, '');
+        return `${u.protocol}//${u.host}${pathname}`.toLowerCase();
+    }
+    catch {
+        return url
+            .replace(/\.git$/i, '')
+            .replace(/\/+$/, '')
+            .toLowerCase();
+    }
+}
+/**
+ * From a host tree/blob URL, extract repo base + optional branch.
+ * Supports:
+ *   .../tree/<branch>
+ *   .../-/tree/<branch>  (GitLab)
+ *   .../blob/<branch>/...
+ */
+export function parseGitHostTreeUrl(raw) {
+    let input = raw.trim();
+    if (!looksLikeHttpUrl(input) && !input.startsWith('git@'))
+        return null;
+    // scp-style
+    if (input.startsWith('git@')) {
+        const scp = /^git@([^:]+):(.+)$/.exec(input);
+        if (!scp)
+            return null;
+        input = `https://${scp[1]}/${scp[2]}`;
+    }
+    let u;
+    try {
+        u = new URL(input);
+    }
+    catch {
+        return null;
+    }
+    const host = u.hostname.toLowerCase();
+    const isKnownHost = isGongfengHost(host) ||
+        GIT_HOST_HINTS.some((h) => host === h || host.endsWith(`.${h}`)) ||
+        host.includes('git.');
+    // PlayCraft portal hosts are handled elsewhere
+    if (!isKnownHost && !u.pathname.includes('/tree/') && !u.pathname.includes('/-/tree/')) {
+        // Still allow any https URL that looks like *.git
+        if (!u.pathname.endsWith('.git') && !input.endsWith('.git')) {
+            return null;
+        }
+    }
+    const path = u.pathname;
+    const gitlabTree = /\/-\/tree\/([^/]+)(?:\/|$)/.exec(path);
+    const plainTree = /\/tree\/([^/]+)(?:\/|$)/.exec(path);
+    const blob = /\/blob\/([^/]+)(?:\/|$)/.exec(path);
+    const match = gitlabTree || plainTree || blob;
+    let repositoryPath = path;
+    let branch;
+    if (match) {
+        branch = decodePathSegment(match[1]);
+        repositoryPath = path.slice(0, match.index);
+    }
+    repositoryPath = repositoryPath.replace(/\.git$/i, '').replace(/\/+$/, '');
+    if (!repositoryPath || repositoryPath === '/')
+        return null;
+    const repositoryUrl = `${u.protocol}//${u.host}${repositoryPath}`;
+    return { repositoryUrl, branch };
+}
+export function parsePlaycraftRemixUrl(raw) {
+    if (!looksLikeHttpUrl(raw))
+        return null;
+    let u;
+    try {
+        u = new URL(raw.trim());
+    }
+    catch {
+        return null;
+    }
+    // /projects/:projectId/remixes/:branch
+    const detail = /^\/projects\/([^/]+)\/remixes\/([^/]+)\/?$/.exec(u.pathname);
+    if (detail) {
+        const projectId = decodePathSegment(detail[1]);
+        const branch = decodePathSegment(detail[2]);
+        if (!projectId || !branch)
+            return null;
+        return {
+            kind: 'playcraft-detail',
+            projectId,
+            branch,
+            origin: u.origin,
+        };
+    }
+    // /editor/remix/:projectId?branch=
+    const editor = /^\/editor\/remix\/([^/]+)\/?$/.exec(u.pathname);
+    if (editor) {
+        const projectId = decodePathSegment(editor[1]);
+        const branchRaw = u.searchParams.get('branch') || u.searchParams.get('branchId');
+        if (!projectId || !branchRaw?.trim())
+            return null;
+        return {
+            kind: 'playcraft-editor',
+            projectId,
+            branch: decodePathSegment(branchRaw.trim()),
+            origin: u.origin,
+        };
+    }
+    return null;
+}
+/**
+ * Resolve clone source from a pasted URL or explicit flags.
+ * Throws with a user-facing Chinese message on conflict / missing fields.
+ */
+export function resolveRemixCloneTarget(input) {
+    const source = input.source?.trim();
+    const flagProjectId = input.projectId?.trim();
+    const flagBranch = input.branch?.trim();
+    const sourceLooksRemote = Boolean(source) && (looksLikeHttpUrl(source) || source.startsWith('git@'));
+    if (source && sourceLooksRemote) {
+        const playcraft = parsePlaycraftRemixUrl(source);
+        if (playcraft && (playcraft.kind === 'playcraft-detail' || playcraft.kind === 'playcraft-editor')) {
+            if (flagProjectId && flagProjectId !== playcraft.projectId) {
+                throw new Error('URL 中的项目 ID 与 --project-id 不一致。');
+            }
+            if (flagBranch && flagBranch !== playcraft.branch) {
+                throw new Error('URL 中的分支与 --branch 不一致。');
+            }
+            return {
+                kind: playcraft.kind,
+                projectId: playcraft.projectId,
+                branch: playcraft.branch,
+                origin: playcraft.origin,
+            };
+        }
+        const gitHost = parseGitHostTreeUrl(source);
+        if (gitHost) {
+            const branch = flagBranch || gitHost.branch;
+            if (!branch) {
+                throw new Error('工蜂/Git 地址未包含分支，请在 URL 使用 /tree/<branch>，或额外传入 --branch。');
+            }
+            return {
+                kind: 'git-host',
+                repositoryUrl: gitHost.repositoryUrl,
+                branch,
+            };
+        }
+        throw new Error('无法识别该 URL。请粘贴 Remix 详情页、Remix Editor 地址，或工蜂分支页（…/tree/<branch>）。');
+    }
+    if (flagProjectId && flagBranch) {
+        return { kind: 'flags', projectId: flagProjectId, branch: flagBranch };
+    }
+    throw new Error('请传入 Remix 详情/编辑器 URL，或工蜂 Git 地址；也可使用 --project-id 与 --branch。');
+}
+export function isRemoteCloneSource(value) {
+    const v = value?.trim();
+    return Boolean(v && (looksLikeHttpUrl(v) || v.startsWith('git@')));
+}
+/** @deprecated use isRemoteCloneSource */
+export function isHttpCloneSource(value) {
+    return isRemoteCloneSource(value);
+}