@playcraft/cli 0.0.56 → 0.0.58

package/dist/remix/local-git.js

@@ -0,0 +1,56 @@
+import { spawnSync } from 'node:child_process';
+import { existsSync, readFileSync } from 'node:fs';
+import path from 'node:path';
+/** @internal exported for tests */
+export function readRemixLocalMeta(repoDir) {
+    const metaPath = path.join(repoDir, '.playcraft.json');
+    if (!existsSync(metaPath)) {
+        throw new Error(`未找到 .playcraft.json（当前目录：${repoDir}）。请先在该目录执行 playcraft remix clone，或 cd 到 clone 得到的目录。`);
+    }
+    try {
+        const raw = JSON.parse(readFileSync(metaPath, 'utf8'));
+        const projectId = String(raw.projectId || '').trim();
+        const branch = String(raw.branch || '').trim();
+        const cloneUrl = String(raw.cloneUrl || '').trim();
+        if (!projectId || !branch || !cloneUrl) {
+            throw new Error('invalid_meta');
+        }
+        return {
+            schemaVersion: '1.0',
+            projectId,
+            branch,
+            cloneUrl,
+            clonedAt: typeof raw.clonedAt === 'string' ? raw.clonedAt : new Date().toISOString(),
+        };
+    }
+    catch (error) {
+        if (error instanceof Error && error.message.includes('.playcraft.json'))
+            throw error;
+        throw new Error(`.playcraft.json 无效或损坏：${metaPath}`);
+    }
+}
+/** @internal exported for tests */
+export function assertPlaycraftProxyRemote(cloneUrl) {
+    if (!cloneUrl.includes('/api/git/projects/')) {
+        throw new Error(`当前 .playcraft.json 的 cloneUrl 不是 PlayCraft Git 代理地址。\n` +
+            `请用 playcraft remix clone 重新克隆，不要改 remote 到工蜂 / 其它 Git 主机。\n` +
+            `cloneUrl: ${cloneUrl}`);
+    }
+}
+/**
+ * 运行带 PlayCraft PAT 的 git 子命令：注入 Bearer，并清空 credential.helper，
+ * 避免 Windows Git Credential Manager 弹窗。
+ */
+export function runAuthenticatedGit(gitCommandAndArgs, options) {
+    return spawnSync('git', [
+        '-c',
+        'credential.helper=',
+        '-c',
+        `http.extraHeader=Authorization: Bearer ${options.token}`,
+        ...gitCommandAndArgs,
+    ], {
+        cwd: options.cwd,
+        encoding: 'utf8',
+        stdio: options.pipe ? 'pipe' : 'inherit',
+    });
+}

package/dist/remix/pull.js

@@ -0,0 +1,66 @@
+import { prepareLocalSkillLifecycle } from '../project-skills/lifecycle.js';
+import { spawnSync } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import path from 'node:path';
+import { PlayCraftHttpClient } from '../utils/playcraft-http-client.js';
+import { assertPlaycraftProxyRemote, readRemixLocalMeta, runAuthenticatedGit, } from './local-git.js';
+/**
+ * 从 PlayCraft Git 代理拉取当前 Remix。
+ * 与 remix push 相同：注入 Bearer PAT，并禁用 credential.helper（避免 Windows GCM）。
+ */
+export async function remixPull(options = {}) {
+    const repoDir = path.resolve(options.dir?.trim() || process.cwd());
+    if (!existsSync(path.join(repoDir, '.git'))) {
+        throw new Error(`目录不是 Git 仓库：${repoDir}`);
+    }
+    const meta = readRemixLocalMeta(repoDir);
+    assertPlaycraftProxyRemote(meta.cloneUrl);
+    const client = new PlayCraftHttpClient({
+        url: options.url,
+        token: options.token,
+    });
+    const gitArgs = options.gitArgs?.length ? options.gitArgs : [];
+    const effectiveArgs = gitArgs.length > 0
+        ? gitArgs
+        : (() => {
+            const upstream = spawnSync('git', ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}'], {
+                cwd: repoDir,
+                encoding: 'utf8',
+            });
+            if (upstream.status === 0 && upstream.stdout.trim()) {
+                return [];
+            }
+            return ['origin', meta.branch];
+        })();
+    if (!options.json) {
+        process.stderr.write(`[pull] ${meta.cloneUrl}\n`);
+        process.stderr.write(`[pull] branch=${meta.branch} dir=${repoDir}\n`);
+    }
+    const result = runAuthenticatedGit(['pull', ...effectiveArgs], {
+        cwd: repoDir,
+        token: client.token,
+        pipe: Boolean(options.json),
+    });
+    if (result.status !== 0) {
+        const detail = [result.stderr, result.stdout].filter(Boolean).join('\n').trim();
+        throw new Error(detail || `git pull 失败（exit ${result.status}）`);
+    }
+    await prepareLocalSkillLifecycle(repoDir, 'checkout');
+    if (options.json) {
+        console.log(JSON.stringify({
+            schemaVersion: '1.0',
+            ok: true,
+            command: 'remix.pull',
+            requestId: client.requestId,
+            data: {
+                projectId: meta.projectId,
+                branch: meta.branch,
+                cloneUrl: meta.cloneUrl,
+                dir: repoDir,
+                gitArgs: effectiveArgs,
+            },
+        }));
+        return;
+    }
+    console.log(`✓ 已从 Remix 分支 ${meta.branch} 拉取`);
+}

package/dist/remix/push.js

@@ -0,0 +1,90 @@
+import { prepareLocalSkillLifecycle } from '../project-skills/lifecycle.js';
+import { reconcileLocalProjectSkills } from '../project-skills/reconcile.js';
+import { projectSkillsMessage as skillMessage } from '../project-skills/messages.js';
+import { spawnSync } from 'node:child_process';
+import { existsSync } from 'node:fs';
+import path from 'node:path';
+import { PlayCraftHttpClient } from '../utils/playcraft-http-client.js';
+import { assertPlaycraftProxyRemote, readRemixLocalMeta, runAuthenticatedGit, } from './local-git.js';
+export { assertPlaycraftProxyRemote, readRemixLocalMeta } from './local-git.js';
+/**
+ * Push 当前 Remix 仓库到 PlayCraft Git 代理。
+ *
+ * 故意不用 `git push` + credential.helper：Windows 上 Git Credential Manager
+ * 经常抢走鉴权并弹窗。这里与 clone 一样，用一次性 `http.extraHeader` 注入 PAT，
+ * 并清空本命令的 credential.helper，避免 GCM 介入。
+ */
+export async function remixPush(options = {}) {
+    const repoDir = path.resolve(options.dir?.trim() || process.cwd());
+    if (!existsSync(path.join(repoDir, '.git'))) {
+        throw new Error(`目录不是 Git 仓库：${repoDir}`);
+    }
+    const meta = readRemixLocalMeta(repoDir);
+    assertPlaycraftProxyRemote(meta.cloneUrl);
+    const client = new PlayCraftHttpClient({
+        url: options.url,
+        token: options.token,
+    });
+    const gitArgs = options.gitArgs?.length ? options.gitArgs : [];
+    // 默认推当前分支；不强制改用户已设的 upstream。若无 upstream 且未传参数，
+    // 用 meta.branch 设 -u，避免「没有 upstream」报错。
+    const effectiveArgs = gitArgs.length > 0
+        ? gitArgs
+        : (() => {
+            const upstream = spawnSync('git', ['rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}'], {
+                cwd: repoDir,
+                encoding: 'utf8',
+            });
+            if (upstream.status === 0 && upstream.stdout.trim()) {
+                return [];
+            }
+            return ['-u', 'origin', meta.branch];
+        })();
+    if (!options.json) {
+        process.stderr.write(`[push] ${meta.cloneUrl}\n`);
+        process.stderr.write(`[push] branch=${meta.branch} dir=${repoDir}\n`);
+    }
+    const skills = await prepareLocalSkillLifecycle(repoDir, 'push');
+    const result = runAuthenticatedGit(['push', ...effectiveArgs], {
+        cwd: repoDir,
+        token: client.token,
+        pipe: Boolean(options.json),
+    });
+    if (result.status !== 0) {
+        const detail = [result.stderr, result.stdout].filter(Boolean).join('\n').trim();
+        throw new Error(detail || `git push 失败（exit ${result.status}）`);
+    }
+    let skillIndex;
+    let skillIndexFailed = false;
+    if (skills.managed) {
+        try {
+            skillIndex = await reconcileLocalProjectSkills(repoDir, { url: options.url, token: options.token });
+        }
+        catch (error) {
+            skillIndexFailed = true;
+            skillIndex = { indexed: false, message: skillMessage('pushIndexFailed'), detail: error instanceof Error ? error.message : String(error) };
+            process.exitCode = 1;
+        }
+        if (!options.json)
+            process.stderr.write(`${JSON.stringify(skillIndex)}\n`);
+    }
+    if (options.json) {
+        console.log(JSON.stringify({
+            schemaVersion: '1.0',
+            ok: !skillIndexFailed,
+            command: 'remix.push',
+            requestId: client.requestId,
+            data: {
+                projectId: meta.projectId,
+                branch: meta.branch,
+                cloneUrl: meta.cloneUrl,
+                dir: repoDir,
+                gitArgs: effectiveArgs,
+                gitPushed: true,
+                skills: skillIndex,
+            },
+        }));
+        return;
+    }
+    console.log(`✓ 已推送到 Remix 分支 ${meta.branch}`);
+}

package/dist/utils/agent-api-client.js

@@ -3,6 +3,8 @@ import { join } from 'path';
 import { homedir } from 'os';
 import { loadGlobalConfig } from '../config.js';
 import { DEFAULT_PLAYCRAFT_CLOUD_BASE } from '../commands/login.js';
+import { AGENT_TOOL_OPERATION_PROTOCOL, AGENT_TOOL_OPERATION_HEADERS, AGENT_TOOL_OPERATION_CAPABILITIES_PATH, } from '@playcraft/common/agent-tools';
+import { beginToolOperation } from './tool-operation-journal.js';
 /**
  * 判断 token 是否为用户 PAT（Personal Access Token）。
  * PAT 以 "playcraft_pat_" 开头；沙箱 JWT 为三段式 base64。
@@ -48,9 +50,7 @@ export class AgentApiClient {
         this.apiUrl = apiUrl;
         this.token = token;
         this.isPat = isPatToken(token);
-        this.playcraftEnv = (process.env.PLAYCRAFT_ENV ||
-            localConfig.env ||
-            '').trim();
+        this.playcraftEnv = (process.env.PLAYCRAFT_ENV || localConfig.env || '').trim();
     }
     /** 根据 token 类型构造鉴权 headers */
     authHeaders() {
@@ -67,21 +67,58 @@ export class AgentApiClient {
         const p = path.startsWith('/') ? path : `/${path}`;
         return new URL(`/api/agent/tools${p}`, this.apiUrl);
     }
-    async post(path, body) {
-        const url = this.toolsRequestUrl(path).href;
-        const res = await fetch(url, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                ...this.authHeaders(),
-            },
-            body: JSON.stringify(body),
-        });
-        if (!res.ok) {
-            const text = await res.text().catch(() => res.statusText);
-            throw new Error(`API ${res.status}: ${text}`);
+    async post(path, body, options) {
+        const url = this.toolsRequestUrl(path);
+        const serializedBody = JSON.stringify(body);
+        if (serializedBody === undefined)
+            throw new Error('Tool request body is required');
+        const operation = beginToolOperation(url.pathname, serializedBody, options?.requestId ?? process.env.PLAYCRAFT_TOOL_REQUEST_ID);
+        try {
+            const capabilityResponse = await fetch(this.toolsRequestUrl(AGENT_TOOL_OPERATION_CAPABILITIES_PATH), {
+                headers: this.authHeaders(),
+                redirect: 'error',
+                signal: AbortSignal.timeout(30_000),
+            });
+            if (!capabilityResponse.ok) {
+                await capabilityResponse.body?.cancel();
+                throw new Error(`Business tool protocol unavailable (${capabilityResponse.status}); no operation was sent`);
+            }
+            const capabilities = (await capabilityResponse.json());
+            if (capabilities.protocol !== AGENT_TOOL_OPERATION_PROTOCOL ||
+                capabilities.settledOnly !== true)
+                throw new Error('Business tool protocol is incompatible; no operation was sent');
+            const res = await fetch(url, {
+                method: 'POST',
+                redirect: 'error',
+                signal: AbortSignal.timeout(30 * 60_000),
+                headers: {
+                    'Content-Type': 'application/json',
+                    ...this.authHeaders(),
+                    [AGENT_TOOL_OPERATION_HEADERS.protocol]: AGENT_TOOL_OPERATION_PROTOCOL,
+                    [AGENT_TOOL_OPERATION_HEADERS.requestId]: operation.requestId,
+                    ...(operation.settledOnly ? { [AGENT_TOOL_OPERATION_HEADERS.settledOnly]: 'true' } : {}),
+                },
+                body: serializedBody,
+            });
+            if (res.headers.get(AGENT_TOOL_OPERATION_HEADERS.protocol) !== AGENT_TOOL_OPERATION_PROTOCOL ||
+                res.headers.get(AGENT_TOOL_OPERATION_HEADERS.requestId) !== operation.requestId) {
+                await res.body?.cancel();
+                throw new Error('Business did not acknowledge a durable receipt; outcome remains unconfirmed');
+            }
+            if (!res.ok) {
+                const text = await res.text().catch(() => res.statusText);
+                throw new Error(`API ${res.status}: ${text}`);
+            }
+            const result = (await res.json());
+            operation.complete();
+            return result;
+        }
+        catch (error) {
+            throw new Error(`${error instanceof Error ? error.message : String(error)}\n` +
+                `Tool request ${operation.requestId}; record: ${operation.file}. ` +
+                `To query its settled result, rerun the same command with PLAYCRAFT_TOOL_REQUEST_ID=${operation.requestId}. ` +
+                'This recovery does not start another operation.');
         }
-        return res.json();
     }
     async get(path, params) {
         const url = this.toolsRequestUrl(path);

package/dist/utils/tool-operation-journal.js

@@ -0,0 +1,54 @@
+import { createHash, randomUUID } from 'node:crypto';
+import { mkdirSync, readFileSync, writeFileSync, renameSync } from 'node:fs';
+import { homedir } from 'node:os';
+import { isAbsolute, join } from 'node:path';
+import { isAgentToolRequestId } from '@playcraft/common/agent-tools';
+/** Persist an identity before sending. Store neither credentials nor request/response bodies. */
+export function beginToolOperation(path, serializedBody, recoverId) {
+    const identifier = recoverId ?? randomUUID();
+    if (!isAgentToolRequestId(identifier))
+        throw new Error('Invalid PLAYCRAFT_TOOL_REQUEST_ID');
+    const requestId = identifier.toLowerCase();
+    const directory = process.env.PLAYCRAFT_TOOL_REQUEST_DIR ?? join(homedir(), '.playcraft', 'tool-requests');
+    if (!isAbsolute(directory))
+        throw new Error('PLAYCRAFT_TOOL_REQUEST_DIR must be an absolute path');
+    mkdirSync(directory, { recursive: true, mode: 0o700 });
+    const file = join(directory, `${requestId}.json`);
+    const inputHash = createHash('sha256').update(serializedBody).digest('hex');
+    const now = new Date().toISOString();
+    const entry = {
+        version: 1,
+        requestId,
+        path,
+        inputHash,
+        state: 'unconfirmed',
+        createdAt: now,
+        updatedAt: now,
+    };
+    let settledOnly = recoverId !== undefined;
+    try {
+        writeFileSync(file, JSON.stringify(entry), { flag: 'wx', mode: 0o600 });
+    }
+    catch (error) {
+        if (error.code !== 'EEXIST')
+            throw error;
+        const previous = JSON.parse(readFileSync(file, 'utf8'));
+        if (previous.version !== 1 ||
+            previous.requestId !== requestId ||
+            previous.path !== path ||
+            previous.inputHash !== inputHash)
+            throw new Error(`Tool request ${requestId} conflicts with its durable local record`);
+        settledOnly = true;
+    }
+    return {
+        requestId,
+        settledOnly,
+        file,
+        complete() {
+            const current = JSON.parse(readFileSync(file, 'utf8'));
+            const temporary = `${file}.${randomUUID()}.tmp`;
+            writeFileSync(temporary, JSON.stringify({ ...current, state: 'completed', updatedAt: new Date().toISOString() }), { flag: 'wx', mode: 0o600 });
+            renameSync(temporary, file);
+        },
+    };
+}