@nggaigc/cli 0.1.15 → 0.1.17

package/README.md

@@ -8,6 +8,6 @@ npx --yes @nggaigc/cli@latest install
 
 安装器会先验证内置 Plugin 的 Ed25519 签名、归档哈希和逐文件哈希，再原子安装 Skill。首次运行会打开 NGGAIGC 浏览器授权页；浏览器仅接收短期连接挑战，安装器通过内存中的独立轮询凭据获取连接结果，设备凭据只通过标准输入进入操作系统受保护的凭据存储（Windows Credential Manager 或 macOS Keychain）。安装器不接受 API Key、授权码或设备凭据参数，也不从环境变量读取这些值。
 
-截至本地核对，npm 已发布 CLI 0.1.14；本源码的 CLI 0.1.15 / Plugin 1.1.17 只是待整合验收与正式签名的候选，不是当前 `@latest`。候选保留 Windows x64/arm64 与 Apple 芯片 Mac arm64 声明，使用本机 Node.js 22.x（22.13 起）或 24.x，不下载或内嵌 Node.js。Windows PowerShell 5.1 默认 `Restricted` 时，安装器仅为受信凭据辅助脚本的子进程指定 `RemoteSigned`；不修改系统或用户执行策略。安装成功但连接失败会明确分开报告，无需重装；由于系统 URL 处理器退出码不能证明浏览器窗口已显示，安装器会同时给出短期一次性手动授权链接。
+本源码的 CLI 0.1.17 / Plugin 1.1.18 是待整合验收与正式签名的候选，不代表当前 `@latest`。候选保留 Windows x64/arm64 与 Apple 芯片 Mac arm64 声明，使用本机 Node.js 22.x（22.13 起）或 24.x，不下载或内嵌 Node.js。Windows PowerShell 5.1 默认 `Restricted` 时，安装器仅为受信凭据辅助脚本的子进程指定 `RemoteSigned`；不修改系统或用户执行策略。安装成功但连接失败会明确分开报告，无需重装；由于系统 URL 处理器退出码不能证明浏览器窗口已显示，安装器会同时给出短期一次性手动授权链接。
 
 macOS arm64 辅助程序沿用已编译并通过完整性校验的产物；本次 Windows 修复未进行 Mac 实机回归。Intel Mac 不在支持范围内。签名和 registry 读回前，不要将本候选标为已发布。

package/dist/bundle.js

@@ -47,7 +47,7 @@ export async function verifyBundle(input) {
             !exactKeys(manifestValue, manifestKeys) ||
             manifestValue.schemaVersion !== "nggaigc-plugin-package/v1" ||
             manifestValue.artifactId !== "plugin.nggaigc" ||
-            manifestValue.version !== "1.1.17" ||
+            manifestValue.version !== "1.1.18" ||
             manifestValue.artifactPath !==
                 `packages/plugins/nggaigc-plugin-${manifestValue.version}.zip` ||
             typeof manifestValue.sourceCommit !== "string" ||

package/dist/independent-skill.js

@@ -381,6 +381,16 @@ async function existingReceipt(target, entry, trust) {
         const facts = await lstat(target);
         if (!facts.isDirectory() || facts.isSymbolicLink())
             fail("INSTALL_CONFLICT");
+        for (const [name, maximum] of [
+            [".nggaigc-package.json", 65536],
+            [".nggaigc-package.bin", MAX_PACKAGE_BYTES],
+        ]) {
+            const metadata = await lstat(path.join(target, name));
+            if (!metadata.isFile() ||
+                metadata.isSymbolicLink() ||
+                metadata.size > maximum)
+                return false;
+        }
         const value = JSON.parse(await readFile(path.join(target, ".nggaigc-package.json"), "utf8"));
         if (!record(value) ||
             typeof value.id !== "string" ||
@@ -485,6 +495,184 @@ async function download(entry, releaseId, origin, fetcher) {
         fail("PACKAGE_DOWNLOAD_FAILED");
     return bytes;
 }
+/** Historical authenticity cannot grant start/rollback eligibility. The active
+ * catalog and online admission remain the only source of new-start authority. */
+async function replacementEntry(directory, id, options) {
+    let receipt;
+    try {
+        const facts = await lstat(directory);
+        if (!facts.isDirectory() || facts.isSymbolicLink())
+            fail("INSTALL_CONFLICT");
+        const receiptFacts = await lstat(path.join(directory, ".nggaigc-package.json"));
+        if (!receiptFacts.isFile() ||
+            receiptFacts.isSymbolicLink() ||
+            receiptFacts.size > 65536)
+            fail("INSTALL_CONFLICT");
+        const value = JSON.parse(await readFile(path.join(directory, ".nggaigc-package.json"), "utf8"));
+        if (!record(value) ||
+            value.id !== id ||
+            typeof value.version !== "string" ||
+            !VERSION.test(value.version) ||
+            typeof value.manifestSha256 !== "string" ||
+            !DIGEST.test(value.manifestSha256))
+            fail("INSTALL_CONFLICT");
+        receipt = value;
+    }
+    catch {
+        fail("INSTALL_CONFLICT");
+    }
+    const current = options.index.entries.filter((entry) => entry.id === id && entry.version === receipt.version);
+    if (current.length) {
+        if (current.length === 1 && current[0].state === "disabled")
+            fail("HISTORICAL_VERSION_BLOCKED");
+        if (current.length !== 1)
+            fail("INSTALL_CONFLICT");
+        if (!(await existingReceipt(directory, current[0], options.trust)))
+            fail("INSTALL_CONFLICT");
+        return current[0];
+    }
+    const origin = options.origin ?? "https://api.nggaigc.com/";
+    if (origin !== "https://api.nggaigc.com/" &&
+        origin !== "https://api.nggaigc.com")
+        fail("PACKAGE_SOURCE_REJECTED");
+    const url = new URL(`/v1/skill-packages/${encodeURIComponent(id)}/${encodeURIComponent(receipt.version)}/verification`, origin);
+    url.searchParams.set("manifestSha256", receipt.manifestSha256);
+    let value;
+    try {
+        const response = await (options.fetcher ?? fetch)(url, {
+            method: "GET",
+            redirect: "error",
+            credentials: "omit",
+            cache: "no-store",
+            signal: AbortSignal.timeout(15000),
+        });
+        if (response.status === 410 &&
+            !response.redirected &&
+            response.url === url.href)
+            fail("HISTORICAL_VERSION_BLOCKED");
+        if (!response.ok ||
+            response.redirected ||
+            response.url !== url.href ||
+            Number(response.headers.get("content-length") ?? 0) > 16384)
+            fail("HISTORICAL_VERIFICATION_UNAVAILABLE");
+        const reader = response.body?.getReader();
+        if (!reader)
+            fail("HISTORICAL_VERIFICATION_UNAVAILABLE");
+        const chunks = [];
+        let size = 0;
+        try {
+            while (true) {
+                const chunk = await reader.read();
+                if (chunk.done)
+                    break;
+                size += chunk.value.length;
+                if (size > 16384)
+                    fail("HISTORICAL_VERIFICATION_UNAVAILABLE");
+                chunks.push(chunk.value);
+            }
+        }
+        finally {
+            await reader.cancel();
+        }
+        value = JSON.parse(Buffer.concat(chunks).toString("utf8"));
+    }
+    catch (error) {
+        if (error instanceof IndependentSkillError)
+            throw error;
+        fail("HISTORICAL_VERIFICATION_UNAVAILABLE");
+    }
+    if (!record(value) ||
+        value.schemaVersion !== "nggaigc-skill-verification/v1" ||
+        value.scope !== "replacement-verification" ||
+        value.status !== "verified-published" ||
+        value.id !== id ||
+        value.version !== receipt.version ||
+        value.manifestSha256 !== receipt.manifestSha256 ||
+        !record(value.package))
+        fail("HISTORICAL_VERIFICATION_UNAVAILABLE");
+    const pkg = value.package;
+    if (typeof pkg.sha256 !== "string" ||
+        !DIGEST.test(pkg.sha256) ||
+        !Number.isSafeInteger(pkg.sizeBytes) ||
+        pkg.sizeBytes < 1 ||
+        pkg.sizeBytes > MAX_PACKAGE_BYTES ||
+        !record(pkg.signature) ||
+        pkg.signature.algorithm !== "ed25519" ||
+        typeof pkg.signature.keyId !== "string" ||
+        typeof pkg.signature.value !== "string" ||
+        !record(pkg.compatibility) ||
+        !record(pkg.compatibility.rootSkill) ||
+        !record(pkg.compatibility.platform))
+        fail("HISTORICAL_VERIFICATION_UNAVAILABLE");
+    const entry = {
+        id,
+        version: value.version,
+        manifestSha256: value.manifestSha256,
+        state: "superseded",
+        manifest: {
+            id,
+            version: value.version,
+            lifecycle: { status: "published" },
+            requires: [],
+            package: pkg,
+        },
+    };
+    // Never trust a locally editable receipt as file ownership evidence: the cached
+    // ZIP must verify against the pinned signing key, and EVERY installed file.
+    if (!(await existingReceipt(directory, entry, options.trust)))
+        fail("INSTALL_CONFLICT");
+    return entry;
+}
+async function acquireInstallLock(lock) {
+    for (let attempt = 0; attempt < 2; attempt++) {
+        try {
+            const handle = await open(lock, "wx", 0o600);
+            await handle.writeFile(JSON.stringify({ schemaVersion: 1, pid: process.pid }));
+            await handle.sync();
+            return handle;
+        }
+        catch {
+            // Only our positively identified, dead-owner locks may be recovered. Legacy
+            // empty locks, malformed state and permission errors remain fail-closed.
+            if (attempt)
+                fail("INSTALL_BUSY");
+            let reclaim;
+            try {
+                // Serialize reclaimers so one cannot unlink a newly acquired live lock
+                // after another has recovered the dead owner.
+                reclaim = await open(`${lock}.reclaim`, "wx", 0o600);
+                const facts = await lstat(lock);
+                if (!facts.isFile() || facts.isSymbolicLink() || facts.size > 1024)
+                    fail("INSTALL_BUSY");
+                const state = JSON.parse(await readFile(lock, "utf8"));
+                if (!record(state) ||
+                    state.schemaVersion !== 1 ||
+                    !Number.isSafeInteger(state.pid) ||
+                    state.pid <= 0)
+                    fail("INSTALL_BUSY");
+                try {
+                    process.kill(state.pid, 0);
+                    fail("INSTALL_BUSY");
+                }
+                catch (error) {
+                    if (!record(error) || error.code !== "ESRCH")
+                        fail("INSTALL_BUSY");
+                }
+                await rm(lock);
+            }
+            catch {
+                fail("INSTALL_BUSY");
+            }
+            finally {
+                if (reclaim) {
+                    await reclaim.close();
+                    await rm(`${lock}.reclaim`);
+                }
+            }
+        }
+    }
+    return fail("INSTALL_BUSY");
+}
 export async function prepareIndependentSkill(options) {
     const ordered = resolve(options.index, options.skillId, options.skillVersion, options.rootSkillVersion, options.platformVersion);
     if (!path.isAbsolute(options.codexHome))
@@ -505,33 +693,17 @@ export async function prepareIndependentSkill(options) {
             fail("INSTALL_CONFLICT");
         const target = path.join(skillsRoot, slug);
         const lock = path.join(stateRoot, `.nggaigc-${slug}.lock`);
-        let handle;
-        try {
-            handle = await open(lock, "wx", 0o600);
-        }
-        catch {
-            fail("INSTALL_BUSY");
-        }
+        const handle = await acquireInstallLock(lock);
         try {
             const backup = path.join(stateRoot, `.nggaigc-backup-${slug}`);
             if ((await lstat(backup).then(() => true, () => false)) &&
                 !(await lstat(target).then(() => true, () => false))) {
-                let version;
                 try {
-                    const receipt = JSON.parse(await readFile(path.join(backup, ".nggaigc-package.json"), "utf8"));
-                    if (!record(receipt) || typeof receipt.version !== "string")
-                        fail("ROLLBACK_PENDING");
-                    version = receipt.version;
+                    await replacementEntry(backup, entry.id, options);
                 }
                 catch {
                     fail("ROLLBACK_PENDING");
                 }
-                const previous = options.index.entries.find((candidate) => candidate.id === entry.id &&
-                    candidate.version === version &&
-                    candidate.state === "active");
-                if (!previous ||
-                    !(await existingReceipt(backup, previous, options.trust)))
-                    fail("ROLLBACK_PENDING");
                 await rename(backup, target);
             }
             if (await existingReceipt(target, entry, options.trust)) {
@@ -560,26 +732,13 @@ export async function prepareIndependentSkill(options) {
                 });
                 const targetExists = await lstat(target).then(() => true, () => false);
                 if (targetExists) {
-                    let oldReceipt;
-                    try {
-                        const value = JSON.parse(await readFile(path.join(target, ".nggaigc-package.json"), "utf8"));
-                        if (!record(value) ||
-                            typeof value.id !== "string" ||
-                            typeof value.version !== "string")
-                            fail("INSTALL_CONFLICT");
-                        oldReceipt = { id: value.id, version: value.version };
-                    }
-                    catch {
-                        fail("INSTALL_CONFLICT");
+                    await replacementEntry(target, entry.id, options);
+                    if (await lstat(backup).then(() => true, () => false)) {
+                        // Retain exactly the immediately previous verified version. Do not
+                        // delete a tampered/unowned backup merely to make an update succeed.
+                        await replacementEntry(backup, entry.id, options);
+                        await rm(backup, { recursive: true });
                     }
-                    const oldEntry = options.index.entries.find((candidate) => candidate.id === oldReceipt.id &&
-                        candidate.version === oldReceipt.version);
-                    if (oldReceipt.id !== entry.id ||
-                        !oldEntry ||
-                        !(await existingReceipt(target, oldEntry, options.trust)))
-                        fail("INSTALL_CONFLICT");
-                    if (await lstat(backup).then(() => true, () => false))
-                        fail("ROLLBACK_PENDING");
                     await rename(target, backup);
                 }
                 try {
@@ -591,6 +750,20 @@ export async function prepareIndependentSkill(options) {
                         await rename(backup, target);
                     fail("INSTALL_FAILED");
                 }
+                let activatedValid = false;
+                try {
+                    await options.afterActivate?.(target);
+                    activatedValid = await existingReceipt(target, entry, options.trust);
+                }
+                catch {
+                    activatedValid = false;
+                }
+                if (!activatedValid) {
+                    await rm(target, { recursive: true, force: true });
+                    if (targetExists)
+                        await rename(backup, target);
+                    fail("INSTALL_FAILED");
+                }
                 result = {
                     id: entry.id,
                     version: entry.version,
@@ -655,13 +828,7 @@ export async function rollbackIndependentSkill(options) {
     const target = path.join(skillsRoot, slug);
     const backup = path.join(stateRoot, `.nggaigc-backup-${slug}`);
     const lock = path.join(stateRoot, `.nggaigc-${slug}.lock`);
-    let handle;
-    try {
-        handle = await open(lock, "wx", 0o600);
-    }
-    catch {
-        fail("INSTALL_BUSY");
-    }
+    const handle = await acquireInstallLock(lock);
     const retired = path.join(stateRoot, `.nggaigc-retired-${slug}-${randomUUID()}`);
     try {
         if (!(await existingReceipt(target, current, options.trust)) ||

package/dist/install.js

@@ -8,7 +8,7 @@ import { CliError, fixedErrorCode } from "./errors.js";
 function defaultBundle() {
     const vendor = fileURLToPath(new URL("../vendor/", import.meta.url));
     return {
-        archive: path.join(vendor, "nggaigc-plugin-1.1.17.zip"),
+        archive: path.join(vendor, "nggaigc-plugin-1.1.18.zip"),
         manifest: path.join(vendor, "manifest.json"),
         trust: path.join(vendor, "trusted-keys.json"),
     };

package/dist/skill-command.js

@@ -15,7 +15,7 @@ function record(value) {
 async function productionDependencies(codexHome) {
     const vendor = fileURLToPath(new URL("../vendor/", import.meta.url));
     const bundle = await verifyBundle({
-        archive: path.join(vendor, "nggaigc-plugin-1.1.17.zip"),
+        archive: path.join(vendor, "nggaigc-plugin-1.1.18.zip"),
         manifest: path.join(vendor, "manifest.json"),
         trust: path.join(vendor, "trusted-keys.json"),
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nggaigc/cli",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "description": "Secure one-command NGGAIGC Skill installer for Codex.",
   "type": "module",
   "bin": {
@@ -22,12 +22,11 @@
     "x64",
     "arm64"
   ],
+  "license": "UNLICENSED",
   "scripts": {
     "build": "tsc -p tsconfig.build.json",
-    "prepack": "tsc -p tsconfig.build.json && node scripts/stage-assets.mjs",
     "test": "vitest run src --exclude 'src/windows-secure-store.integration.test.ts'",
     "test:credential:os": "tsc -p tsconfig.build.json && vitest run src/windows-secure-store.integration.test.ts",
     "typecheck": "tsc -p tsconfig.json --noEmit"
-  },
-  "license": "UNLICENSED"
-}
+  }
+}

package/vendor/manifest.json

@@ -1,40 +1,41 @@
 {
   "schemaVersion": "nggaigc-plugin-package/v1",
   "artifactId": "plugin.nggaigc",
-  "version": "1.1.17",
-  "sourceCommit": "c7f5c09ee376c47e2c3263e04588821ca7be149e",
-  "artifactPath": "packages/plugins/nggaigc-plugin-1.1.17.zip",
-  "sha256": "c75143fa55bf7ea42cbe87a39f9d89de4d6051db66061ec18eef969a069e7ea6",
-  "sizeBytes": 367844,
-  "fileCount": 21,
+  "version": "1.1.18",
+  "sourceCommit": "44a6a19b363015ab1774c568ffdd509689c3444b",
+  "artifactPath": "packages/plugins/nggaigc-plugin-1.1.18.zip",
+  "sha256": "9d8da5a4100c05e5a7daa9071fbe0bcca36a414d7f34f60093a21a4f90316db4",
+  "sizeBytes": 395352,
+  "fileCount": 22,
   "platforms": ["win32-x64", "win32-arm64", "darwin-arm64"],
   "files": {
-    ".codex-plugin/plugin.json": "5f425e4a4d07c5b8678a95376b0d6b57e5181d22590baa398774f228efd4143f",
-    "installer/install.cjs": "779733bd3994f072c1ac322a7b493e93104e1e7c07b4d268b80da7d4294bc934",
+    ".codex-plugin/plugin.json": "b450ba745df8d2d041e8b63cc56261b028078eb6c0b1a943c209b20d26af32d4",
+    "installer/install.cjs": "85b3ebd5a82968384e2868956e62088be27014681bf373ca601a70d007e66e7c",
     "installer/legacy-root-digests.json": "922552646a5aa6cff8616c372912a37b1d5f263351206b85785ed9b2eae31641",
     "installer/signed-pair-1.1.16.json": "ccb22a90302cc5c9c585067ebc211a27b0c9d8a177c2740a5678a58a3d70bfe9",
-    "migration/seedream-1.1.2/agents/openai.yaml": "3cbf034ddccd64a7972acd37e7433683a3944f3d8c7b5bdccbbd70e517bf5a8c",
-    "migration/seedream-1.1.2/references/image-generation.md": "5cb3094c7a313dea152787be50979e0b145e46d5e8bf3629dd1fa47c7ab9c424",
-    "migration/seedream-1.1.2/references/source.json": "3b0d89d9b5b7b786e9b60633a639e7f77844a9aec8d723fd380ff22c74dfa3b9",
-    "migration/seedream-1.1.2/scripts/seedream.mjs": "76854d6880696be7836525fd2c2b0f9c296d67dd5d56b3cc11d1f5c4b2f123bc",
-    "migration/seedream-1.1.2/SKILL.md": "38ce21f895e32223d0dac55fb2eafb9627ffb32132ac2d45c66cef24d37e0d75",
+    "installer/signed-pair-1.1.17.json": "a3697506c929aaa085a6d994fc3a1b9a87e522ec6e1e32f3f760e6a534effa2b",
+    "migration/seedream-1.1.3/agents/openai.yaml": "3cbf034ddccd64a7972acd37e7433683a3944f3d8c7b5bdccbbd70e517bf5a8c",
+    "migration/seedream-1.1.3/references/image-generation.md": "91e70d577c9990cc1315b3ef41144dbb40ca420b7ae36376def23f0b0c1fd7e4",
+    "migration/seedream-1.1.3/references/source.json": "75998d079a229435d1097b00bd008703bd38026fc6485c312254925bf55398a8",
+    "migration/seedream-1.1.3/scripts/seedream.mjs": "f235aa1222d88a4c888417dca02f4830ab90fa241d1511aaf6565087bc0347f7",
+    "migration/seedream-1.1.3/SKILL.md": "e71b612fc05ab2a0f8a45a745b01a83a5565163f2c671c91b3403b2d8e0b37f4",
     "skills/nggaigc/agents/openai.yaml": "8936d97b9821e687e224e9349cc42be2ee5fc20988562efffbcb70080aedf87c",
-    "skills/nggaigc/references/catalog-and-updates.md": "0c85490d57ee8eac28255decb320c2880a5ab24f08a33baefe4faccca03fb4c6",
-    "skills/nggaigc/references/source.json": "c78895bf0ae5effeed138342e4853b932ec66d4903a1a2a965d81d7d013f734b",
-    "skills/nggaigc/scripts/bootstrap-public.json": "b562cdb786cd50724bc81a93daf9cfcbb39f6eefe30ec8e909e3439e704efabf",
-    "skills/nggaigc/scripts/launch-ngg-client.cjs": "59fbd6d43907752ba3c1242ccc09b74383132d7f7035c27f96a1c4f9b8609eec",
+    "skills/nggaigc/references/catalog-and-updates.md": "d4ef563e4c0b23d917275da1fb91e5f7f7e652cf2b072a230087bb3702bdef9a",
+    "skills/nggaigc/references/source.json": "932b9d5ebf25af8ff195f94a5fb2149655b2d6dbabf8303f70c946044311a9dd",
+    "skills/nggaigc/scripts/bootstrap-public.json": "d616d9e0ff7e27717ff40b75727786a9a1ea35a9e8c34073ea4b142515dea1cf",
+    "skills/nggaigc/scripts/launch-ngg-client.cjs": "f948a4fa2a5d1867f8e58a08bdf53cf03611e0ea60d2d39c8aee8be09de2210e",
     "skills/nggaigc/scripts/macos-keychain": "b0bdf29d14219d38ca18c7e5c599deb0daa8c8ac70b0babbc7d4fb23673079ec",
     "skills/nggaigc/scripts/macos-keychain.swift": "1b57e74fde66c824fe970547dd8ca0883a3334c34c065e85a8a2a90d4556a7f5",
-    "skills/nggaigc/scripts/ngg_client.mjs": "b35cf3a01c667b252ff680a5452bb918ed3a0ab4e26345120794819dd896780c",
-    "skills/nggaigc/scripts/ngg-session.mjs": "6d213a204fe0db7777ed69a7f46d1fbd3e99e11baa8011db7f4f3f53d6dbd42d",
+    "skills/nggaigc/scripts/ngg_client.mjs": "703a6f7dfe7f1bc70716da7c880887ccece4733c14704f27a5856630dddc0bc6",
+    "skills/nggaigc/scripts/ngg-session.mjs": "e4d8b4eec48fc55a2533fbd9ba933bc5f56b5fe0226b7bbaf00cbb6223b34853",
     "skills/nggaigc/scripts/supported-platforms.json": "ec8b0754c489e04534a1d9880dd6664ba9c5bcd07789e06d138e0923f23575ff",
     "skills/nggaigc/scripts/windows-credential.ps1": "ce097f2a8601664522fcfa8c9505243439ff786a45f15a1dba702b8f9b13dab1",
-    "skills/nggaigc/SKILL.md": "cb05429a10dbe79ccc0800b0c190c42f855ce428f541bdf94f2fc9f61bde244a"
+    "skills/nggaigc/SKILL.md": "4dc24674e0aa4058beb7c4940ef2fe6c60b28eae05a6e38d0d74190d47c048e5"
   },
   "signature": {
     "algorithm": "ed25519",
     "keyId": "ngg-signing-skill-release-1",
     "scope": "artifact-bytes",
-    "value": "4ERtPG1JcJNav97OBfdrAp4iZLxLCAbjOuzG/QPlBU62sC6Q1nGdiBsnsVOqoUCe2aeGn9uMf33ToltsU6/9DQ=="
+    "value": "ZAYCQgoT4dYK1GYyWd9STOlImKO7sMdOjpfREUvsocBBnZOCZGYlsr+9FLIM/ZwdasMtMsWmZZFR91hDxQZLBw=="
   }
 }