@nowcrew/daemon 0.6.88-beta.33 → 0.6.88-beta.34

package/dist/marketplace-command.js

@@ -0,0 +1,21 @@
+import { execFile } from "node:child_process";
+import { promisify } from "node:util";
+export class MarketplaceFailure extends Error {
+    code;
+    constructor(code) {
+        super(code);
+        this.code = code;
+    }
+}
+const exec = promisify(execFile);
+export const runMarketplaceCommand = async (bin, args, options) => {
+    try {
+        const result = await exec(bin, [...args], { ...options, timeout: 120_000, maxBuffer: 4 * 1024 * 1024,
+            killSignal: "SIGKILL", encoding: "utf8" });
+        return result.stdout;
+    }
+    catch (error) {
+        const value = error;
+        throw new MarketplaceFailure(value.code === "ENOENT" ? "cli_missing" : value.killed ? "command_timeout" : "command_failed");
+    }
+};

package/dist/marketplace-controller.js

@@ -11,17 +11,22 @@ export function createMarketplaceController(deps) {
         const deadline = now() + 10 * 60_000;
         let lease = null;
         try {
-            while (!stopped && now() < deadline && lease === null) {
-                lease = await deps.acquire();
-                if (!lease)
-                    await wait();
-            }
-            if (!lease || stopped) {
-                operations.set(id, { operationId: id, status: "failed", results: [], errorCode: "runtime_busy" });
-                return;
+            const scopes = await (deps.resolve ?? resolveMarketplaceScopes)(request.targets, deps.agentsRoot);
+            // 查询不使用任务执行槽；只有写入运行时共用市场/插件目录时才等待独占保护。
+            if (request.mode === "update") {
+                while (!stopped && now() < deadline && lease === null) {
+                    lease = await deps.acquire();
+                    if (!lease)
+                        await wait();
+                }
+                if (!lease || stopped) {
+                    operations.set(id, { operationId: id, status: "failed", results: [], errorCode: "runtime_busy" });
+                    return;
+                }
             }
+            if (stopped || now() >= deadline)
+                throw new Error("operation_deadline");
             operations.set(id, { operationId: id, status: "running", results: [], errorCode: null });
-            const scopes = await (deps.resolve ?? resolveMarketplaceScopes)(request.targets, deps.agentsRoot);
             const results = [];
             for (const scope of scopes) {
                 if (stopped || now() >= deadline)

package/dist/marketplace-remote.js

@@ -0,0 +1,48 @@
+import { mkdtemp, rm } from "node:fs/promises";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import { z } from "zod";
+import { MARKETPLACE, PLUGIN } from "./marketplace-protocol.js";
+import { MarketplaceFailure } from "./marketplace-command.js";
+import { validateMarketplaceSource } from "./marketplace-source.js";
+const Manifest = z.object({ name: z.literal(MARKETPLACE), plugins: z.array(z.object({ name: z.string() }).passthrough()) });
+const Target = z.object({
+    version: z.string().regex(/^[A-Za-z0-9][A-Za-z0-9._+-]{0,79}$/),
+    source: z.object({ source: z.literal("git-subdir"),
+        url: z.literal("git@codeup.aliyun.com:6128d2e757e7cd986dfae5ab/pm/AIinterview-agent-skill.git"),
+        path: z.literal("plugins/AIinterview-plugin"), sha: z.string().regex(/^[a-f0-9]{40}$/) }),
+});
+export async function readRemoteMarketplace(runtime, registered, env, command) {
+    const source = validateMarketplaceSource(registered.url, registered.ref);
+    const temporary = await mkdtemp(join(tmpdir(), "nowwork-marketplace-query-"));
+    const options = { env, cwd: temporary };
+    try {
+        await command("git", ["init", "--bare", "--template=", "."], options);
+        await command("git", ["fetch", "--depth=1", "--no-tags", source.url, source.ref], options);
+        const revision = (await command("git", ["rev-parse", "--verify", "FETCH_HEAD"], options)).trim();
+        if (!/^[a-f0-9]{40}$/.test(revision))
+            throw new MarketplaceFailure("verification_failed");
+        const path = runtime === "claude" ? ".claude-plugin/marketplace.json" : ".agents/plugins/marketplace.json";
+        const raw = await command("git", ["show", `${revision}:${path}`], options);
+        let value;
+        try {
+            value = JSON.parse(raw);
+        }
+        catch {
+            throw new MarketplaceFailure("invalid_inventory");
+        }
+        const manifest = Manifest.safeParse(value);
+        if (!manifest.success)
+            throw new MarketplaceFailure("invalid_inventory");
+        const matches = manifest.data.plugins.filter(plugin => plugin.name === PLUGIN);
+        if (matches.length !== 1)
+            throw new MarketplaceFailure("invalid_inventory");
+        const target = Target.safeParse(matches[0]);
+        if (!target.success)
+            throw new MarketplaceFailure("unsupported_installation");
+        return { marketRevision: revision, targetVersion: target.data.version };
+    }
+    finally {
+        await rm(temporary, { recursive: true, force: true });
+    }
+}

package/dist/marketplace-runner.js

@@ -1,6 +1,4 @@
 /** 固定市场操作的短命 CLI 适配；原始命令输出不离开设备。 */
-import { execFile } from "node:child_process";
-import { promisify } from "node:util";
 import { createHash } from "node:crypto";
 import { readFile, readdir, realpath, lstat, mkdtemp, rm } from "node:fs/promises";
 import { homedir, tmpdir } from "node:os";
@@ -8,28 +6,13 @@ import { join, resolve, isAbsolute, relative, sep } from "node:path";
 import { applyProviderEnv } from "./provider-env.js";
 import { augmentedPath } from "./runtime-path.js";
 import { MARKETPLACE, PLUGIN } from "./marketplace-protocol.js";
-const exec = promisify(execFile);
+import { MarketplaceFailure, runMarketplaceCommand } from "./marketplace-command.js";
+import { readRemoteMarketplace } from "./marketplace-remote.js";
+import { readMarketplaceSource } from "./marketplace-source.js";
+export { MarketplaceFailure, runMarketplaceCommand } from "./marketplace-command.js";
 const SELECTOR = `${PLUGIN}@${MARKETPLACE}`;
 const SOURCE = "git@codeup.aliyun.com:6128d2e757e7cd986dfae5ab/pm/AIinterview-agent-skill.git";
 const SOURCE_PATH = "plugins/AIinterview-plugin";
-export class MarketplaceFailure extends Error {
-    code;
-    constructor(code) {
-        super(code);
-        this.code = code;
-    }
-}
-export const runMarketplaceCommand = async (bin, args, options) => {
-    try {
-        const result = await exec(bin, [...args], { ...options, timeout: 120_000, maxBuffer: 4 * 1024 * 1024,
-            killSignal: "SIGKILL", encoding: "utf8" });
-        return result.stdout;
-    }
-    catch (error) {
-        const value = error;
-        throw new MarketplaceFailure(value.code === "ENOENT" ? "cli_missing" : value.killed ? "command_timeout" : "command_failed");
-    }
-};
 const obj = (x) => x !== null && typeof x === "object" && !Array.isArray(x) ? x : {};
 const parse = (text) => { try {
     return JSON.parse(text);
@@ -117,6 +100,26 @@ export function parsePluginInventory(runtime, value, configHome) {
         throw new MarketplaceFailure("invalid_inventory");
     return { version: v, enabled: item.enabled, path, revision: sha(obj(item.source).sha) };
 }
+/** 查询与任务并行；外部更新改变安装清单时重读一次，避免混合两代安装事实。 */
+async function readInstalledSnapshot(runtime, inventory) {
+    for (let attempt = 0; attempt < 2; attempt += 1) {
+        const before = await inventory();
+        let valid = before === null;
+        if (before !== null) {
+            try {
+                const manifest = obj(parse(await readFile(join(before.path, runtime === "claude" ? ".claude-plugin" : ".codex-plugin", "plugin.json"), "utf8")));
+                valid = manifest.name === PLUGIN && version(manifest.version) === before.version;
+            }
+            catch { /* 清单变化则重读；稳定但不可读的安装仍报告核验失败。 */ }
+        }
+        if (JSON.stringify(before) !== JSON.stringify(await inventory()))
+            continue;
+        if (!valid)
+            throw new MarketplaceFailure("verification_failed");
+        return before;
+    }
+    throw new MarketplaceFailure("configuration_changed");
+}
 /** 逐字节比对固定 Git 源子目录，不能只凭 CLI 退出码或版本字符串证明安装完成。 */
 export async function verifyInstalledContent(path, revision, env, command) {
     const temporary = await mkdtemp(join(tmpdir(), "nowwork-plugin-verify-"));
@@ -186,10 +189,19 @@ export async function runMarketplaceScope(scope, mode, command = runMarketplaceC
         const root = market[0].root ?? market[0].installLocation;
         if (typeof root !== "string" || !isAbsolute(root))
             throw new MarketplaceFailure("invalid_inventory");
-        const before = await inventory();
+        const registered = await readMarketplaceSource(scope.runtime, scope.configHome, market[0]);
+        const before = mode === "update" ? await inventory() : await readInstalledSnapshot(scope.runtime, inventory);
         result = { ...result, beforeVersion: before?.version ?? null, afterVersion: before?.version ?? null, enabled: before?.enabled ?? null };
-        if (mode !== "inspect")
-            await run(["plugin", "marketplace", scope.runtime === "claude" ? "update" : "upgrade", MARKETPLACE]);
+        if (mode === "inspect")
+            return { ...result, status: before ? "checked" : "not_installed", activation: "unverified" };
+        if (mode === "refresh") {
+            const latest = await readRemoteMarketplace(scope.runtime, registered, scope.env, command);
+            const current = await readMarketplaceSource(scope.runtime, scope.configHome, market[0]);
+            if (current.url !== registered.url || current.ref !== registered.ref)
+                throw new MarketplaceFailure("configuration_changed");
+            return { ...result, ...latest, status: "refreshed", activation: "not_changed" };
+        }
+        await run(["plugin", "marketplace", scope.runtime === "claude" ? "update" : "upgrade", MARKETPLACE]);
         const revision = sha((await command("git", ["-C", root, "rev-parse", "HEAD"], options)).trim());
         if (!revision)
             throw new MarketplaceFailure("verification_failed");
@@ -200,19 +212,8 @@ export async function runMarketplaceScope(scope, mode, command = runMarketplaceC
         const targetVersion = version(target?.version);
         const targetSha = sha(source.sha);
         result = { ...result, marketRevision: revision, targetVersion };
-        if (mode === "refresh")
-            return { ...result, status: "refreshed", activation: "not_changed" };
         if (!before)
             return { ...result, status: "not_installed", activation: "not_changed" };
-        if (mode === "inspect") {
-            const installed = obj(parse(await readFile(join(before.path, scope.runtime === "claude" ? ".claude-plugin" : ".codex-plugin", "plugin.json"), "utf8")));
-            const actualVersion = version(installed.version);
-            result = { ...result, afterVersion: actualVersion };
-            if (installed.name !== PLUGIN || actualVersion !== before.version)
-                throw new MarketplaceFailure("verification_failed");
-            // 清单可能来自市场元数据；没有文件内容核验就不报告已安装源提交。
-            return { ...result, status: "checked", installedRevision: null, activation: "unverified" };
-        }
         if (!targetVersion || !targetSha || source.url !== SOURCE || source.path !== SOURCE_PATH || source.source !== "git-subdir")
             throw new MarketplaceFailure("unsupported_installation");
         // Codex add 会启用插件；不偷偷改变用户已禁用的状态。

package/dist/marketplace-source.js

@@ -0,0 +1,103 @@
+import { readFile, realpath, stat } from "node:fs/promises";
+import { join, resolve } from "node:path";
+import { parse as parseToml } from "smol-toml";
+import { MARKETPLACE } from "./marketplace-protocol.js";
+import { MarketplaceFailure } from "./marketplace-command.js";
+const REPOSITORY_PATH = "6128d2e757e7cd986dfae5ab/pm/nowwork-pm-skills-marketplace";
+const obj = (value) => value !== null && typeof value === "object" && !Array.isArray(value) ? value : {};
+/** 固定仓库身份，但保留用户登记的 SSH/HTTPS 传输方式；不允许 URL 内嵌凭据。 */
+function allowedRepository(value) {
+    if (typeof value !== "string" || value.length > 4096 || /[\s\u0000-\u001f\u007f\\]/u.test(value))
+        return false;
+    let host;
+    let path;
+    const scp = /^git@([^/:]+):(.+)$/u.exec(value);
+    if (scp) {
+        host = scp[1];
+        path = scp[2];
+    }
+    else {
+        let url;
+        try {
+            url = new URL(value);
+        }
+        catch {
+            return false;
+        }
+        if (!["https:", "ssh:"].includes(url.protocol) || url.search || url.hash || url.password)
+            return false;
+        if (url.protocol === "https:" && (url.username || url.port))
+            return false;
+        if (url.protocol === "ssh:" && (url.username !== "git" || (url.port !== "" && url.port !== "22")))
+            return false;
+        host = url.hostname;
+        path = url.pathname.replace(/^\//u, "");
+    }
+    return host.toLowerCase() === "codeup.aliyun.com" && path.replace(/\/$/u, "").replace(/\.git$/u, "") === REPOSITORY_PATH;
+}
+export function validateMarketplaceSource(url, ref) {
+    const selectedRef = ref === undefined ? "HEAD" : ref;
+    if (!allowedRepository(url) || typeof selectedRef !== "string" || !selectedRef || selectedRef.length > 1024
+        || /^[+-]/u.test(selectedRef) || selectedRef === "@" || selectedRef.includes("..") || selectedRef.includes("@{")
+        || /[\s\u0000-\u001f\u007f~^:?*\[\\]/u.test(selectedRef)
+        || selectedRef.split("/").some(part => !part || part.startsWith(".") || part.endsWith(".") || part.endsWith(".lock"))) {
+        throw new MarketplaceFailure("unsupported_installation");
+    }
+    return { url, ref: selectedRef };
+}
+async function registrationFile(path) {
+    try {
+        if ((await stat(path)).size > 1024 * 1024)
+            throw new MarketplaceFailure("invalid_inventory");
+        return await readFile(path, "utf8");
+    }
+    catch (error) {
+        if (error instanceof MarketplaceFailure)
+            throw error;
+        throw new MarketplaceFailure("configuration_changed");
+    }
+}
+/** 列表会省略 ref；以同一配置目录内的原生登记文件为准，不从已安装缓存猜分支。 */
+export async function readMarketplaceSource(runtime, configHome, listed) {
+    let source;
+    let listedUrl;
+    if (runtime === "claude") {
+        let registered;
+        const text = await registrationFile(join(configHome, "plugins/known_marketplaces.json"));
+        try {
+            registered = obj(obj(JSON.parse(text))[MARKETPLACE]);
+        }
+        catch {
+            throw new MarketplaceFailure("invalid_inventory");
+        }
+        const entry = obj(registered.source);
+        if (entry.source !== "git" || listed.source !== "git")
+            throw new MarketplaceFailure("unsupported_installation");
+        source = validateMarketplaceSource(entry.url, entry.ref);
+        listedUrl = listed.url ?? listed.repo;
+        if (typeof registered.installLocation !== "string" || typeof listed.installLocation !== "string")
+            throw new MarketplaceFailure("configuration_changed");
+        const canonical = (path) => realpath(path).catch(() => resolve(path));
+        if (await canonical(registered.installLocation) !== await canonical(listed.installLocation))
+            throw new MarketplaceFailure("configuration_changed");
+    }
+    else {
+        let entry;
+        const text = await registrationFile(join(configHome, "config.toml"));
+        try {
+            entry = obj(obj(parseToml(text).marketplaces)[MARKETPLACE]);
+        }
+        catch {
+            throw new MarketplaceFailure("invalid_inventory");
+        }
+        const origin = obj(listed.marketplaceSource);
+        if (entry.source_type !== "git" || origin.sourceType !== "git")
+            throw new MarketplaceFailure("unsupported_installation");
+        source = validateMarketplaceSource(entry.source, entry.ref);
+        listedUrl = origin.source;
+    }
+    // 同一轮清单与登记文件来源不一致，可能正被重新登记；不擅自改查另一来源。
+    if (listedUrl !== source.url)
+        throw new MarketplaceFailure("configuration_changed");
+    return source;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nowcrew/daemon",
-  "version": "0.6.88-beta.33",
+  "version": "0.6.88-beta.34",
   "type": "module",
   "description": "crew daemon — 运行在用户机器:拉起/管理 agent 进程,注入 crew CLI,归一化 runtime 事件",
   "license": "Apache-2.0",
@@ -23,6 +23,7 @@
     "@nowcrew/cli": "0.4.17",
     "cross-spawn": "^7.0.6",
     "semver": "7.8.5",
+    "smol-toml": "1.8.0",
     "ws": "^8",
     "yaml": "^2.8.1",
     "zod": "^3.23.0"