@yijiancaotang/cli 1.0.0 → 1.1.0

package/dist/installation.js

@@ -1,4 +1,4 @@
-import { constants, lstatSync, fstatSync, openSync, closeSync, readSync, writeFileSync, fsyncSync, fchmodSync, mkdirSync, readdirSync, rmdirSync } from "node:fs";
+import { constants, lstatSync, fstatSync, openSync, closeSync, readSync, writeFileSync, fsyncSync, fchmodSync, ftruncateSync, mkdirSync, readdirSync, rmdirSync } from "node:fs";
 import { access, lstat, stat, realpath, open, readdir } from "node:fs/promises";
 import { createHash } from "node:crypto";
 import { basename, delimiter, dirname, isAbsolute, join, relative, resolve, sep } from "node:path";
@@ -7,6 +7,8 @@ import { CliError, asRecord } from "./errors.js";
 import { PLATFORM_IDS, isPlatformId, platformSupported } from "./local-types.js";
 import { bindSkillAgent, completeSkillInventory } from "./skill-assets.js";
 import { acquireLocalLock } from "./local-lock.js";
+import { LEGACY_MANAGED_SKILLS } from "./managed-skill-baseline.js";
+import { REVIEWED_MANAGED_BUNDLE_1_1_0 } from "./reviewed-managed-bundle-baseline.js";
 const same = (a, b) => a.dev === b.dev && a.ino === b.ino;
 const missing = (error) => asRecord(error)?.code === "ENOENT";
 const unsafe = () => new CliError("installation_unsafe", "本地安装位置未通过安全检查。", "请人工检查属主、权限、符号链接与目标目录；不要自动删除、覆盖或修改凭据。");
@@ -128,8 +130,8 @@ export class OwnedTree {
         if (!info.isFile() || info.uid !== this.uid || info.nlink !== 1 || (info.mode & 0o022) !== 0 || info.size > max)
             throw unsafe();
     }
-    readFile(name, max, executable = false) {
-        const check = (info) => { this.checkFile(info, max); if (executable && (info.mode & 0o100) === 0)
+    readFile(name, max, executable = false, mode) {
+        const check = (info) => { this.checkFile(info, max); if (executable && (info.mode & 0o100) === 0 || mode !== undefined && (info.mode & 0o7777) !== mode)
             throw unsafe(); };
         let before;
         try {
@@ -158,9 +160,9 @@ export class OwnedTree {
             closeSync(fd);
         }
     }
-    async read(path, max = 1048576) {
+    async read(path, max = 1048576, mode) {
         return this.directory(dirname(path), false, async (directories) => {
-            return pinned(directories.at(-1), () => this.readFile(basename(path), max));
+            return pinned(directories.at(-1), () => this.readFile(basename(path), max, false, mode));
         });
     }
     async list(path) {
@@ -237,6 +239,43 @@ export class OwnedTree {
         });
         return result === true;
     }
+    // Never truncate on open. Only an exact, single-link managed inode may change;
+    // the caller durably preserves its public before/after bytes before calling.
+    async replaceManaged(entry, rollback = false) {
+        const result = await this.directory(dirname(entry.path), false, async (directories) => pinned(directories.at(-1), () => {
+            const name = basename(entry.path), before = lstatSync(name);
+            const check = (info) => { this.checkFile(info, 1048576); if ((info.mode & 0o7777) !== entry.mode)
+                throw unsafe(); };
+            check(before);
+            const fd = openSync(name, constants.O_RDWR | constants.O_NOFOLLOW | constants.O_NONBLOCK);
+            try {
+                const opened = fstatSync(fd);
+                check(opened);
+                if (!unchanged(before, opened) || rollback && (!entry.identity || !same(entry.identity, opened)))
+                    throw unsafe();
+                const expected = rollback ? entry.after : entry.before, next = rollback ? entry.before : entry.after;
+                if (!readDescriptor(fd, 1048576).equals(expected) || !unchanged(opened, fstatSync(fd)) || !unchanged(opened, lstatSync(name)))
+                    throw unsafe();
+                if (!rollback)
+                    entry.identity = opened;
+                writeFileSync(fd, next);
+                ftruncateSync(fd, next.length);
+                fsyncSync(fd);
+                const written = fstatSync(fd), named = lstatSync(name);
+                check(written);
+                check(named);
+                if (!same(opened, written) || !unchanged(written, named) || written.size !== next.length || !readDescriptor(fd, 1048576).equals(next)
+                    || !unchanged(written, fstatSync(fd)) || !unchanged(written, lstatSync(name)))
+                    throw unsafe();
+                return true;
+            }
+            finally {
+                closeSync(fd);
+            }
+        }));
+        if (result !== true)
+            throw unsafe();
+    }
     async removeDirectory(path, expected) {
         await this.directory(dirname(path), false, async (directories) => {
             pinned(directories.at(-1), () => {
@@ -281,6 +320,9 @@ async function readSource(path, max = 1048576) {
         throw sourceInvalid();
     }
 }
+function managedShim(directory) {
+    return Buffer.from(`#!/usr/bin/env node\n// caotang managed command v1\nimport(${JSON.stringify(pathToFileURL(join(directory, "bin", "caotang.cjs")).href)}).catch(()=>{process.stderr.write(JSON.stringify({code:"cli_unavailable",message:"本地命令行暂不可用。",next_action:"请人工核对本地安装，不要重复业务写入。"})+"\\n");process.exitCode=7;});\n`);
+}
 async function bundle(ctx, tree) {
     if (!completeSkillInventory(ctx.assets.map(asset => asset.name)) || ctx.assets.some(asset => hash(asset.content) !== asset.sha256 || !asset.content || Buffer.byteLength(asset.content) > 65536))
         throw sourceInvalid();
@@ -316,7 +358,7 @@ async function bundle(ctx, tree) {
     for (const file of files)
         digest.update(`${file.path}\0${file.mode}\0${file.bytes.length}\0`).update(file.bytes);
     const sha = digest.digest("hex"), directory = join(tree.home, ".caotang", "cli", "releases", sha), command = join(tree.home, ".local", "bin", "caotang");
-    const shim = Buffer.from(`#!/usr/bin/env node\n// caotang managed command v1\nimport(${JSON.stringify(pathToFileURL(join(directory, "bin", "caotang.cjs")).href)}).catch(()=>{process.stderr.write(JSON.stringify({code:"cli_unavailable",message:"本地命令行暂不可用。",next_action:"请人工核对本地安装，不要重复业务写入。"})+"\\n");process.exitCode=7;});\n`);
+    const shim = managedShim(directory);
     return { files, sha, directory, command, shim, version: info.version };
 }
 function validateTargets(ctx, tree) {
@@ -378,25 +420,160 @@ async function onPath(command, env) {
     }
     return false;
 }
+// The fixed 1.1.0 baseline is admitted only after its complete public runtime
+// inventory verifies. Never infer provenance from a version or receipt.
+async function reviewedV110Bundle(tree, value) {
+    const pin = REVIEWED_MANAGED_BUNDLE_1_1_0, directory = join(tree.home, ".caotang", "cli", "releases", pin.sha);
+    const children = new Map([["", new Set()]]);
+    for (const file of pin.files) {
+        const parts = file.path.split("/");
+        let parent = "";
+        for (const [index, part] of parts.entries()) {
+            children.get(parent).add(part);
+            if (index < parts.length - 1) {
+                parent = parent ? `${parent}/${part}` : part;
+                if (!children.has(parent))
+                    children.set(parent, new Set());
+            }
+        }
+    }
+    const verifyInventory = async () => {
+        for (const [path, expected] of children)
+            if ((await tree.list(join(directory, path)))?.join(",") !== [...expected].sort().join(","))
+                throw conflict();
+    };
+    await verifyInventory();
+    const files = [], digest = createHash("sha256");
+    for (const file of pin.files) {
+        const bytes = await tree.read(join(directory, file.path), file.bytes, file.mode);
+        if (!bytes || bytes.length !== file.bytes || hash(bytes) !== file.sha256)
+            throw conflict();
+        files.push({ path: file.path, bytes, mode: file.mode });
+        digest.update(`${file.path}\0${file.mode}\0${bytes.length}\0`).update(bytes);
+    }
+    if (digest.digest("hex") !== pin.sha)
+        throw conflict();
+    await verifyInventory();
+    const manifest = JSON.parse(files.find(file => file.path === "skills/manifest.json").bytes.toString("utf8"));
+    if (!completeSkillInventory(manifest.skills.map(item => item.name)))
+        throw conflict();
+    const assets = manifest.skills.map(item => { const bytes = files.find(file => file.path === `skills/${item.name}/SKILL.md`).bytes; return { ...item, content: bytes.toString("utf8"), sha256: hash(bytes) }; });
+    return { bundle: { files, sha: pin.sha, version: pin.version, directory, command: value.command, shim: managedShim(directory) }, assets };
+}
+// Keep the reviewed 1.0.0 six-skill baseline unchanged. A directory digest alone
+// cannot authorize replacing somebody's same-name skill.
+async function legacyBundles(ctx, tree, value) {
+    if (!["1.0.1", "1.1.0"].includes(value.version) || ctx.agentName === undefined)
+        return [];
+    const releases = join(tree.home, ".caotang", "cli", "releases"), entries = await tree.list(releases) ?? [];
+    if (entries.length > 128)
+        throw unsafe();
+    const found = [];
+    const runtime = Buffer.from(JSON.stringify({ name: "@yijiancaotang/cli", version: "1.0.0", private: true, type: "module", engines: { node: ">=20" }, bin: { caotang: "bin/caotang.cjs" } }));
+    const manifest = Buffer.from(JSON.stringify({ formatVersion: 1, skills: LEGACY_MANAGED_SKILLS.map(({ name, description }) => ({ name, description })) }));
+    for (const sha of entries) {
+        if (!/^[a-f0-9]{64}$/.test(sha) || sha === value.sha)
+            continue;
+        const directory = join(releases, sha), packageBytes = await tree.read(join(directory, "package.json"), 32768, 0o600);
+        if (!packageBytes?.equals(runtime))
+            continue;
+        const root = await tree.list(directory), bin = await tree.list(join(directory, "bin")), dist = await tree.list(join(directory, "dist"));
+        const skills = await tree.list(join(directory, "skills")), generated = await tree.list(join(directory, "dist/generated"));
+        if (root?.join(",") !== "bin,dist,package.json,skills" || bin?.join(",") !== "caotang.cjs" || generated?.join(",") !== "knowledge-growth.js"
+            || !dist || dist.length > 64 || !dist.includes("cli.js") || !dist.includes("generated") || dist.some(name => name !== "generated" && !/^[a-z][a-z0-9-]*\.js$/.test(name))
+            || skills?.join(",") !== [...LEGACY_MANAGED_SKILLS.map(item => item.name), "manifest.json"].sort().join(","))
+            throw conflict();
+        if (!(await tree.read(join(directory, "skills/manifest.json"), 16384, 0o600))?.equals(manifest))
+            throw conflict();
+        const files = [{ path: "package.json", bytes: runtime, mode: 0o600 }, { path: "skills/manifest.json", bytes: manifest, mode: 0o600 }];
+        const assets = [];
+        for (const item of LEGACY_MANAGED_SKILLS) {
+            if ((await tree.list(join(directory, "skills", item.name)))?.join(",") !== "SKILL.md")
+                throw conflict();
+            const bytes = await tree.read(join(directory, "skills", item.name, "SKILL.md"), 65536, 0o600);
+            if (!bytes || hash(bytes) !== item.sha256)
+                throw conflict();
+            assets.push({ ...item, content: bytes.toString("utf8") });
+            files.push({ path: `skills/${item.name}/SKILL.md`, bytes, mode: 0o600 });
+        }
+        for (const path of ["bin/caotang.cjs", ...dist.filter(name => name !== "generated").map(name => `dist/${name}`), "dist/generated/knowledge-growth.js"]) {
+            const mode = path === "bin/caotang.cjs" ? 0o700 : 0o600, bytes = await tree.read(join(directory, path), 1048576, mode);
+            if (!bytes?.length)
+                throw conflict();
+            files.push({ path, bytes, mode });
+        }
+        files.sort((a, b) => a.path.localeCompare(b.path));
+        if (files.reduce((total, file) => total + file.bytes.length, 0) > 5242880)
+            throw conflict();
+        const digest = createHash("sha256");
+        for (const file of files)
+            digest.update(`${file.path}\0${file.mode}\0${file.bytes.length}\0`).update(file.bytes);
+        if (digest.digest("hex") !== sha)
+            throw conflict();
+        found.push({ bundle: { files, sha, version: "1.0.0", directory, command: value.command, shim: managedShim(directory) }, assets });
+    }
+    if (value.version === "1.1.0" && value.sha !== REVIEWED_MANAGED_BUNDLE_1_1_0.sha && entries.includes(REVIEWED_MANAGED_BUNDLE_1_1_0.sha))
+        found.push(await reviewedV110Bundle(tree, value));
+    return found;
+}
+async function installPlan(ctx, tree, value) {
+    const missing = [], modified = [];
+    const newlyInstalledPlatforms = [], upgradedPlatforms = [], replacements = [];
+    for (const target of ctx.targets) {
+        let absent = 0;
+        for (const raw of ctx.assets) {
+            const asset = bindSkillAgent(raw, ctx.agentName), dir = join(target.skillDirectory, asset.name), entries = await tree.list(dir);
+            if (entries === null || entries.length === 0) {
+                missing.push({ target, asset });
+                absent++;
+                continue;
+            }
+            if (entries.length !== 1 || entries[0] !== "SKILL.md")
+                throw skillConflict();
+            const bytes = await tree.read(join(dir, "SKILL.md"), 65536);
+            if (!bytes)
+                throw skillConflict();
+            if (!bytes.equals(Buffer.from(asset.content)))
+                modified.push({ target, asset, bytes });
+        }
+        if (absent === ctx.assets.length)
+            newlyInstalledPlatforms.push(target.id);
+    }
+    const command = await tree.read(value.command);
+    if (command && ((await lstat(value.command)).mode & 0o100) === 0)
+        throw unsafe();
+    const legacy = modified.length || command && !command.equals(value.shim) ? await legacyBundles(ctx, tree, value) : [];
+    for (const item of modified) {
+        const known = legacy.some(source => source.assets.some(asset => asset.name === item.asset.name && Buffer.from(bindSkillAgent(asset, ctx.agentName).content).equals(item.bytes)));
+        if (!known)
+            throw skillConflict();
+        const path = join(item.target.skillDirectory, item.asset.name, "SKILL.md");
+        if (!(await tree.read(path, 65536, 0o600))?.equals(item.bytes))
+            throw unsafe();
+        replacements.push({ path, before: item.bytes, after: Buffer.from(item.asset.content), mode: 0o600, label: `${item.target.id}:${item.asset.name}` });
+        if (!upgradedPlatforms.includes(item.target.id))
+            upgradedPlatforms.push(item.target.id);
+    }
+    if (command && !command.equals(value.shim)) {
+        if (!legacy.some(source => source.bundle.shim.equals(command)))
+            throw conflict();
+        if (!(await tree.read(value.command, 1048576, 0o700))?.equals(command))
+            throw unsafe();
+        // Always switch the shared stable command after every selected skill succeeds.
+        replacements.push({ path: value.command, before: command, after: value.shim, mode: 0o700, label: "command" });
+    }
+    return { missing, replacements, newlyInstalledPlatforms, upgradedPlatforms };
+}
 export async function installLocal(ctx) {
     const tree = new OwnedTree(ctx.homeDir), changed = [];
     let changesPossible = false;
-    const newlyInstalledPlatforms = [];
     try {
         validateTargets(ctx, tree);
         if (!ctx.targets.length && !ctx.agentName)
             throw new CliError("no_supported_platform", "未识别到支持的AI客户端。", "核对Claude Code、Codex、OpenClaw，或macOS上的Kimi Code、Kimi工作模式、WorkBuddy后再接入；不会自动安装客户端。");
         const value = await bundle(ctx, tree);
         await tree.directory(tree.home, false, async () => { });
-        for (const target of ctx.targets)
-            for (const asset of ctx.assets)
-                if (await skillState(tree, target, bindSkillAgent(asset, ctx.agentName)) === "modified")
-                    throw skillConflict();
-        const existingCommand = await tree.read(value.command);
-        if (existingCommand && !existingCommand.equals(value.shim))
-            throw conflict();
-        if (existingCommand && ((await lstat(value.command)).mode & 0o100) === 0)
-            throw unsafe();
+        await installPlan(ctx, tree, value);
         if (await bundleState(tree, value) === "modified")
             throw conflict();
         const lockPath = join(tree.home, ".caotang", ".setup.lock");
@@ -411,13 +588,7 @@ export async function installLocal(ctx) {
             const state = await bundleState(tree, value);
             if (state === "modified")
                 throw conflict();
-            for (const target of ctx.targets) {
-                const statuses = await Promise.all(ctx.assets.map(asset => skillState(tree, target, bindSkillAgent(asset, ctx.agentName))));
-                if (statuses.includes("modified"))
-                    throw skillConflict();
-                if (statuses.every(status => status === "missing"))
-                    newlyInstalledPlatforms.push(target.id);
-            }
+            const originalPlan = await installPlan(ctx, tree, value);
             if (state === "missing") {
                 const created = await tree.createDirectory(value.directory);
                 if (!created)
@@ -428,25 +599,79 @@ export async function installLocal(ctx) {
                 if (await bundleState(tree, value) !== "installed")
                     throw conflict();
             }
-            for (const target of ctx.targets)
-                for (const asset of ctx.assets) {
-                    if (await skillState(tree, target, bindSkillAgent(asset, ctx.agentName)) === "installed")
-                        continue;
-                    const dir = join(target.skillDirectory, asset.name), created = await tree.createDirectory(dir);
-                    if (!created && (await tree.list(dir))?.length !== 0)
-                        throw skillConflict();
-                    changed.push(`${target.id}:${asset.name}`);
-                    await tree.writeNew(join(dir, "SKILL.md"), Buffer.from(bindSkillAgent(asset, ctx.agentName).content), 0o600);
-                    if (await skillState(tree, target, bindSkillAgent(asset, ctx.agentName)) !== "installed")
-                        throw skillConflict();
+            for (const { target, asset } of originalPlan.missing) {
+                const dir = join(target.skillDirectory, asset.name), created = await tree.createDirectory(dir);
+                if (!created && (await tree.list(dir))?.length !== 0)
+                    throw skillConflict();
+                changed.push(`${target.id}:${asset.name}`);
+                await tree.writeNew(join(dir, "SKILL.md"), Buffer.from(asset.content), 0o600);
+                if (await skillState(tree, target, asset) !== "installed")
+                    throw skillConflict();
+            }
+            const plan = await installPlan(ctx, tree, value), attempted = [];
+            let recoveryJournal;
+            if (plan.replacements.length) {
+                const snapshot = Buffer.from(JSON.stringify({ formatVersion: 1, targetBundleSha: value.sha, files: plan.replacements.map(entry => ({ path: relative(tree.home, entry.path), mode: entry.mode, before: entry.before.toString("base64"), after: entry.after.toString("base64") })) }));
+                if (snapshot.length > 1048576)
+                    throw unsafe();
+                recoveryJournal = join(tree.home, ".caotang", "cli", "upgrades", hash(snapshot) + ".json");
+                await tree.writeNew(recoveryJournal, snapshot, 0o600);
+                if (!(await tree.read(recoveryJournal, 1048576, 0o600))?.equals(snapshot))
+                    throw unsafe();
+                await tree.directory(dirname(recoveryJournal), false, async (directories) => {
+                    for (const directory of directories)
+                        await directory.handle.sync();
+                });
+            }
+            try {
+                for (const entry of plan.replacements) {
+                    attempted.push(entry);
+                    changed.push(entry.label);
+                    await tree.replaceManaged(entry);
+                }
+                if (await tree.writeNew(value.command, value.shim, 0o700))
+                    changed.push("command");
+                if (!(await tree.read(value.command))?.equals(value.shim) || ((await lstat(value.command)).mode & 0o100) === 0 || await bundleState(tree, value) !== "installed")
+                    throw conflict();
+                for (const target of ctx.targets)
+                    for (const asset of ctx.assets)
+                        if (await skillState(tree, target, bindSkillAgent(asset, ctx.agentName)) !== "installed")
+                            throw skillConflict();
+            }
+            catch (error) {
+                if (!recoveryJournal)
+                    throw error;
+                let restored = true;
+                for (const entry of attempted.reverse()) {
+                    try {
+                        const current = await tree.read(entry.path, 1048576, entry.mode);
+                        if (!current?.equals(entry.before)) {
+                            if (!entry.identity) {
+                                restored = false;
+                                continue;
+                            }
+                            await tree.replaceManaged(entry, true);
+                        }
+                        if (!(await tree.read(entry.path, 1048576, entry.mode))?.equals(entry.before)
+                            || entry.identity && !same(await lstat(entry.path), entry.identity))
+                            restored = false;
+                    }
+                    catch {
+                        restored = false;
+                    }
+                }
+                const recovery = { upgrade_status: restored ? "rolled_back" : "unknown", recovery_journal: recoveryJournal };
+                if (restored && error instanceof CliError && error.code === "installation_permission_denied") {
+                    Object.assign(error.details, recovery);
+                    throw error;
                 }
-            if (await tree.writeNew(value.command, value.shim, 0o700))
-                changed.push("command");
+                throw new CliError(restored ? "installation_upgrade_failed" : "installation_upgrade_unknown", restored ? "本地升级未完成，已核对并恢复本轮改动的原文件。" : "无法确认本地升级结果，部分受管文件可能尚未恢复。", "保留旧版本与恢复原件，请本人核对 recovery_journal；不要强制覆盖、删除、重新授权或重复业务写入。", 7, recovery);
+            }
+            return { changed, bundleSha: value.sha, bundleDirectory: value.directory, newlyInstalledPlatforms: originalPlan.newlyInstalledPlatforms, upgradedPlatforms: originalPlan.upgradedPlatforms };
         }
         finally {
             release();
         }
-        return { changed, bundleSha: value.sha, bundleDirectory: value.directory, newlyInstalledPlatforms };
     }
     catch (error) {
         const safe = error instanceof CliError ? error
@@ -489,3 +714,48 @@ export async function inspectLocalInstallation(ctx) {
     }
     return { command: { installed, on_path, version: value.version, ...(installed ? { executable_path: value.command } : {}) }, platforms, issues };
 }
+// Read-only evidence for known platform paths, never an installation/overwrite
+// permit. Only the current name's exact public templates count as its skills.
+export async function inspectManagedOrigins(ctx) {
+    if (ctx.agentName === undefined)
+        throw new CliError("agent_name_required", "请用你自己的名字再运行 setup --agent <你的名字>。", "之后每条命令都带同一个 --agent <你的名字>；不会借用其他 AI 的连接。");
+    const tree = new OwnedTree(ctx.homeDir);
+    validateTargets(ctx, tree);
+    const value = await bundle(ctx, tree), assets = ctx.assets.map(asset => bindSkillAgent(asset, ctx.agentName));
+    let legacy = [];
+    try {
+        legacy = await legacyBundles(ctx, tree, value);
+    }
+    catch { /* Unverified old files provide no evidence; never promote them. */ }
+    const platforms = [];
+    for (const target of ctx.targets) {
+        const skills = [];
+        for (const asset of assets) {
+            let status;
+            try {
+                status = await skillState(tree, target, asset);
+                if (status === "modified") {
+                    const dir = join(target.skillDirectory, asset.name), entries = await tree.list(dir);
+                    if (entries?.join(",") === "SKILL.md") {
+                        const bytes = await tree.read(join(dir, "SKILL.md"), 65536, 0o600);
+                        if (bytes && legacy.some(source => source.assets.some(old => old.name === asset.name && Buffer.from(bindSkillAgent(old, ctx.agentName).content).equals(bytes))))
+                            status = "outdated";
+                    }
+                }
+            }
+            catch {
+                status = "unsafe";
+            }
+            skills.push({ name: asset.name, status });
+        }
+        platforms.push({ id: target.id, skill_directory: target.skillDirectory, ownKnownCount: skills.filter(skill => skill.status === "installed" || skill.status === "outdated").length, skills });
+    }
+    let command = { legacyManaged: false, on_path: false };
+    try {
+        const bytes = await tree.read(value.command, 1048576, 0o700), old = legacy.find(source => bytes?.equals(source.bundle.shim));
+        if (old)
+            command = { legacyManaged: true, on_path: await onPath(value.command, ctx.env), version: old.bundle.version, executable_path: value.command };
+    }
+    catch { /* An unsafe command must not be called a verified old command. */ }
+    return { platforms, command };
+}

package/dist/local-commands.js

@@ -6,12 +6,13 @@ import { fileURLToPath } from "node:url";
 import { authLogin } from "./auth.js";
 import { doctor } from "./doctor.js";
 import { CliError, asRecord } from "./errors.js";
-import { inspectLocalInstallation, installLocal } from "./installation.js";
+import { inspectLocalInstallation, inspectManagedOrigins, installLocal } from "./installation.js";
 import { isPlatformId, platformSupported } from "./local-types.js";
-import { detectPlatforms } from "./platforms.js";
+import { detectPlatforms, knownSkillTargets } from "./platforms.js";
 import { loadSkillAssets } from "./skill-assets.js";
+import { LocalRecords } from "./local-records.js";
 import { defaultConnectionNames, inspectAccountState, onboardingMessage } from "./onboarding.js";
-import { setupFailureMessage } from "./connection-copy.js";
+import { connectionCopy, setupFailureMessage } from "./connection-copy.js";
 const root = () => fileURLToPath(new URL("../", import.meta.url));
 const invalid = () => new CliError("invalid_arguments", "命令或参数无效。", "运行 --help；平台支持claude-code、codex、openclaw，以及仅macOS支持的kimi-code、kimi-work和workbuddy。");
 export function selectedPlatforms(value, operatingSystem = process.platform) {
@@ -53,33 +54,97 @@ export async function localVersion(packageRoot = root()) {
 export function manualUpdateInstructions() {
     return { status: 200, body: { operation: "update", update_policy: "manual", next_action: "运行 npx @yijiancaotang/cli@latest setup --agent <你的名字> 更新到最新版。" } };
 }
-async function targetsFor(ctx, ids, setup) {
+function connectionTimeInBeijing(value) {
+    if (!value)
+        return undefined;
+    const timestamp = Date.parse(value);
+    if (!Number.isFinite(timestamp))
+        return undefined;
+    const parts = new Intl.DateTimeFormat("en-GB", {
+        timeZone: "Asia/Shanghai", year: "numeric", month: "2-digit", day: "2-digit",
+        hour: "2-digit", minute: "2-digit", hourCycle: "h23",
+    }).formatToParts(timestamp);
+    const fields = Object.fromEntries(parts.map(part => [part.type, part.value]));
+    return `${fields.year}-${fields.month}-${fields.day} ${fields.hour}:${fields.minute}`;
+}
+const recordsFor = (ctx) => ctx.agent ? new LocalRecords(ctx.homeDir, ctx.agent, ctx.auth.environment ?? "production", new URL(ctx.auth.api.baseUrl).origin) : undefined;
+async function targetsFor(ctx, ids, setup, assets, recorded) {
+    const inspect = (targets) => inspectManagedOrigins({ ...ctx, agentName: ctx.agent?.key, assets, targets });
     if (ctx.agent) {
         if (ids && ids.length !== 1)
             throw new CliError("invalid_arguments", "每次接入只给一个 AI 平台安装技能。", "请带自己的 --agent 名字，一次只选一个 --platform；其它 AI 分别接入。");
-        ids = ids ?? (ctx.agent.platform ? [ctx.agent.platform] : []);
-        if (!ids.length)
-            return [];
+        if (ids === undefined && recorded.length === 0) {
+            const candidates = await knownSkillTargets({ ...ctx, skipInvalidCandidates: true }), origins = await inspect(candidates);
+            const own = candidates.filter(target => origins.platforms.some(platform => platform.id === target.id && platform.skill_directory === target.skillDirectory && platform.ownKnownCount > 0))
+                .map(target => ({ ...target, detected: true, evidence: "skills" }));
+            if (own.length > 0 || !ctx.agent.platform)
+                return { targets: own, origins };
+        }
+        ids = ids ?? (recorded.length ? recorded.map(target => target.id) : ctx.agent.platform ? [ctx.agent.platform] : []);
+    }
+    const redirected = (id) => id === "claude-code" ? ctx.env.CLAUDE_CONFIG_DIR !== undefined
+        : id === "openclaw" ? ctx.env.OPENCLAW_STATE_DIR !== undefined || ctx.env.OPENCLAW_HOME !== undefined
+            : id === "kimi-code" && ctx.env.KIMI_CODE_HOME !== undefined;
+    const preferred = recorded.filter(target => (!ids || ids.includes(target.id)) && !redirected(target.id));
+    if (preferred.some(target => !platformSupported(target.id, ctx.operatingSystem)))
+        throw new CliError("platform_unsupported", "已记录的技能平台不支持当前系统。", "请在原支持的系统上检查该平台；不会猜测新目录或搬动技能。", 2);
+    const discoveryIds = ids?.filter(id => !preferred.some(target => target.id === id));
+    // A recorded custom target must not cause inspection of an unrelated default
+    // directory just to rediscover the same platform.
+    const discovered = discoveryIds?.length === 0 ? [] : await detectPlatforms({ homeDir: ctx.homeDir, env: ctx.env, applicationRoots: ctx.applicationRoots, operatingSystem: ctx.operatingSystem, platformIds: discoveryIds });
+    const all = [...preferred.map(target => ({ ...target })), ...discovered];
+    const origins = await inspect(all);
+    for (const target of all) {
+        if (ctx.agent && !target.detected && origins.platforms.some(platform => platform.id === target.id && platform.skill_directory === target.skillDirectory && platform.ownKnownCount > 0)) {
+            target.detected = true;
+            target.evidence = "skills";
+        }
     }
-    const all = await detectPlatforms({ homeDir: ctx.homeDir, env: ctx.env, applicationRoots: ctx.applicationRoots, operatingSystem: ctx.operatingSystem, platformIds: ids });
-    return ids ? all.filter(target => ids.includes(target.id)) : setup ? all.filter(target => target.detected) : all;
+    return { targets: ids ? all.filter(target => ids.includes(target.id)) : setup ? all.filter(target => target.detected) : all, origins };
 }
 export async function localDoctor(ctx, flags, authFailure) {
     return doctor({
         auth: ctx.auth, authFailure, agent: ctx.agent,
         inspectLocal: async () => {
             const assets = await loadSkillAssets(ctx.packageRoot ?? root());
-            return inspectLocalInstallation({ ...ctx, agentName: ctx.agent?.key, assets, targets: await targetsFor(ctx, selectedPlatforms(flags.platform, ctx.operatingSystem), false) });
+            const recorded = await recordsFor(ctx)?.targets() ?? [];
+            const selection = await targetsFor(ctx, selectedPlatforms(flags.platform, ctx.operatingSystem), false, assets, recorded);
+            const inspected = await inspectLocalInstallation({ ...ctx, agentName: ctx.agent?.key, assets, targets: selection.targets });
+            const platforms = inspected.platforms.map(platform => {
+                const origin = selection.origins.platforms.find(origin => origin.id === platform.id && origin.skill_directory === platform.skill_directory);
+                return origin ? { ...platform, skills: origin.skills } : platform;
+            });
+            const issues = inspected.issues.filter(issue => !["skill_missing", "skill_modified", "skill_unsafe"].includes(issue.code));
+            let command = inspected.command;
+            if (selection.origins.command.legacyManaged) {
+                command = { ...command, installed: true, ...selection.origins.command };
+                for (let index = issues.length - 1; index >= 0; index--)
+                    if (issues[index].code === "command_modified")
+                        issues.splice(index, 1);
+                issues.push({ code: "command_outdated", message: "已核对为旧版受管命令行，需要更新。", next_action: "沿用原来的名字运行 npx @yijiancaotang/cli@latest setup --agent <你的名字> 更新，不需要重新批准连接。" });
+            }
+            const skillPlatforms = selection.targets.filter(target => recorded.some(record => record.id === target.id)
+                || selection.origins.platforms.some(origin => origin.id === target.id && origin.skill_directory === target.skillDirectory && origin.ownKnownCount > 0)).map(target => target.id);
+            return { ...inspected, command, platforms, issues, skill_platforms: skillPlatforms };
         },
     });
 }
 export async function localSetup(ctx, flags) {
-    const assets = await loadSkillAssets(ctx.packageRoot ?? root()), targets = await targetsFor(ctx, selectedPlatforms(flags.platform, ctx.operatingSystem), true);
+    const records = recordsFor(ctx), recorded = await records?.targets() ?? [];
+    const assets = await loadSkillAssets(ctx.packageRoot ?? root()), { targets } = await targetsFor(ctx, selectedPlatforms(flags.platform, ctx.operatingSystem), true, assets, recorded);
     const local = { ...ctx, agentName: ctx.agent?.key, assets, targets };
     const installed = await installLocal(local);
+    await records?.rememberInstallation(targets, assets, installed.bundleSha);
+    for (const target of targets) {
+        if (!target.detected) {
+            target.detected = true;
+            target.evidence = "skills";
+        }
+    }
     const newEntries = installed.newlyInstalledPlatforms;
     let authFailure;
     let authorizationAttempted = false;
+    const currentSecrets = new Set(ctx.auth.tokenOverride ? [ctx.auth.tokenOverride] : []);
     // Observe the actual start request after authLogin's credential/abort checks.
     // Validation and doctor requests do not constitute a new authorization attempt.
     const observedAuth = {
@@ -89,6 +154,8 @@ export async function localSetup(ctx, flags) {
             request(path, options) {
                 if (path === "/api/v1/agent/device-auth/start" && options?.method === "POST")
                     authorizationAttempted = true;
+                if (path === "/api/v1/agent/mcp-token/validate" && typeof options?.token === "string")
+                    currentSecrets.add(options.token);
                 return ctx.auth.api.request(path, options);
             },
             upload: (url, headers, bytes) => ctx.auth.api.upload(url, headers, bytes),
@@ -97,10 +164,12 @@ export async function localSetup(ctx, flags) {
     };
     let newAuthorizationOwner;
     let loginIdentity;
+    let loginResult = null;
     const names = defaultConnectionNames(targets.map(target => target.id), ctx.computerName, ctx.agent?.name);
     try {
         const login = await authLogin(observedAuth, { device_name: flags["device-name"] ?? names.deviceName, client_name: flags["client-name"] ?? names.clientName, noOpen: flags["no-open"] === true });
         const who = asRecord(login.body);
+        loginResult = who;
         if (typeof who?.user_id === "string" && typeof who.token_id === "string" && (who.kind === "manual" || who.kind === "device") && (who.scope === "read_only" || who.scope === "read_write")) {
             loginIdentity = { userId: who.user_id, tokenId: who.token_id, kind: who.kind, scope: who.scope };
         }
@@ -111,7 +180,7 @@ export async function localSetup(ctx, flags) {
         authFailure = error instanceof CliError ? error : new CliError("authorization_delivery_unknown", "无法确认授权操作的结果。", "先在网页核对并吊销未保存的设备，不要自动重新签发。", 6);
     }
     let checkedIdentity;
-    const report = await doctor({ auth: ctx.auth, authFailure, agent: ctx.agent, inspectLocal: () => inspectLocalInstallation(local), onIdentity: who => { checkedIdentity = who; } });
+    const report = await doctor({ auth: ctx.auth, authFailure, agent: ctx.agent, inspectLocal: async () => ({ ...await inspectLocalInstallation(local), skill_platforms: targets.map(target => target.id) }), onIdentity: who => { checkedIdentity = who; } });
     const body = asRecord(report.result.body);
     if (!body)
         throw new CliError("diagnostic_unavailable", "本地安装已执行，但无法确认最终诊断。", "先运行doctor只读核对，不要直接重新授权。", 7);
@@ -129,8 +198,32 @@ export async function localSetup(ctx, flags) {
     const accountState = newEntries.length && body.ready === true && checkedIdentity ? await inspectAccountState(ctx.auth, checkedIdentity.userId) : "unknown";
     const greeting = body.ready === true && checkedIdentity ? onboardingMessage(newEntries, accountState, checkedIdentity.scope)
         : { account_state: "unknown", onboarding: { action: "none", newly_connected_platforms: [] }, user_message: setupFailureMessage(identityChanged ? "authorization_identity_changed" : authFailure?.code) };
+    const reused = Boolean(sameConnection && loginResult?.reused_existing === true);
+    let connection;
+    if (sameConnection && ctx.agent && checkedIdentity) {
+        if (reused) {
+            connection = ctx.auth.tokenOverride !== undefined ? { connection_name: ctx.agent.key, connection_name_source: "environment_override" }
+                : await records?.connection(checkedIdentity.tokenId, [...currentSecrets]) ?? { connection_name: ctx.agent.key, connection_name_source: "local_agent_key" };
+        }
+        else if (body.ready === true && loginResult?.new_authorization_confirmed === true && typeof loginResult.connection_name === "string" && typeof loginResult.connected_at === "string") {
+            connection = { connection_name: loginResult.connection_name, connection_name_source: "local_authorization_record", connected_at: loginResult.connected_at, connection_time_source: "device_authorization" };
+            await records?.rememberConnection(checkedIdentity.tokenId, connection, [...currentSecrets]);
+        }
+    }
+    const onboardingCopy = reused && checkedIdentity && (connection?.connection_name_source !== "environment_override"
+        ? greeting.onboarding.action !== "none" || checkedIdentity.scope === "read_only"
+        : greeting.onboarding.action === "none" && checkedIdentity.scope === "read_only")
+        ? { onboarding_message: greeting.onboarding.action !== "none" ? greeting.user_message : connectionCopy.read_only } : {};
+    const connectionDisplayTime = connectionTimeInBeijing(connection?.connected_at);
+    const reuseCopy = reused && connection && connection.connection_name_source !== "environment_override" ? {
+        user_message: "这个名字已经接过了，沿用原来的连接，不用再批准。",
+        next_action: `已沿用名为 ${connection.connection_name} 的连接${connectionDisplayTime ? `（${connectionDisplayTime} 接入）` : ""}。如果你不是它，请用你自己的名字重新运行 setup --agent <你的名字>，不要继续用这条连接。`,
+        ...(connection.connection_name_source === "local_agent_key" ? { connection_name_note: "本机仅记有规范化名字，原连接名称和接入时间未记录。" } : {}),
+    } : reused && connection?.connection_name_source === "environment_override" ? {
+        reuse_notice: "本次沿用环境中提供的授权，不是本机保存的同名连接。若要独立接入，请由本人先处理环境授权覆盖，再用自己的名字运行 setup --agent <你的名字>。",
+    } : {};
     return { exitCode: report.exitCode, result: { status: 200, body: { ...body, operation: "setup", local_installation: { changed: installed.changed, bundle_sha: installed.bundleSha }, authorization_attempted: authorizationAttempted,
-                new_authorization_confirmed: confirmed, ...(confirmed ? { new_authorization_owner_id: newAuthorizationOwner } : {}), ...greeting,
-                ...(ctx.agent && !targets.length ? { generic_usage: { message: "这个 AI 没有专用技能安装位置；请按下列命令使用自己的连接。", commands: ["doctor", "context --start", "projects", "knowledge", "search", "auth status"].map(command => `caotang --agent ${shellWord(ctx.agent.name)} ${command}`) } } : {}),
+                new_authorization_confirmed: confirmed, ...(confirmed ? { new_authorization_owner_id: newAuthorizationOwner } : {}), reused_existing: reused, ...connection, ...greeting, ...onboardingCopy, ...reuseCopy,
+                ...(ctx.agent && !targets.length ? { generic_usage: { message: "暂未定位到这个名字的专用技能；若曾使用自定义目录，请保留原目录参数再检查。仍可按下列命令使用自己的连接。", commands: ["doctor", "context --start", "projects", "knowledge", "search", "auth status"].map(command => `caotang --agent ${shellWord(ctx.agent.name)} ${command}`) } } : {}),
                 ...(body.ready === true ? { next_conversation: "请开新对话说‘开工了’。" } : {}) } } };
 }