@modesto_ma/dsh-guanxiang 0.2.0-beta.2 → 0.2.0-beta.4

package/lib/index.js

@@ -1,13 +1,13 @@
 import { createHash, randomBytes, timingSafeEqual } from "node:crypto";
 import { z } from "zod";
-import { homedir, tmpdir } from "node:os";
+import { homedir } from "node:os";
 import { basename, dirname, isAbsolute, join, relative, resolve } from "node:path";
-import { lstat, mkdir, mkdtemp, readFile, readdir, rename, rm, stat, writeFile } from "node:fs/promises";
+import { lstat, mkdir, readFile, readdir, rename, rm, stat, writeFile } from "node:fs/promises";
+import { createTwoFilesPatch, structuredPatch } from "diff";
 import { parse } from "yaml";
 import { createWriteStream } from "node:fs";
 import { Readable, Transform } from "node:stream";
 import { pipeline } from "node:stream/promises";
-import { execFile } from "node:child_process";
 //#region src/settings/contract.ts
 /**
 * 设置面板与 Host 路由共用的路由常量和 JSON 结构。浏览器端 bundle 也会
@@ -21,20 +21,22 @@ const STATE_ROUTE = "/guanxiang/state";
 const SETTINGS_ROUTE = "/guanxiang/settings";
 /** POST：立即重新拉取全部仓库，或 body `{ url }` 指定的一个仓库。 */
 const SYNC_ROUTE = "/guanxiang/sync";
-/** PUT：body `{ tokenEnv, value }` 把令牌存入 DSH 凭据库；DELETE：body `{ tokenEnv }` 删除已存的值。只接受已保存的访问令牌配置引用的名称和分析接口令牌的名称。 */
+/** PUT：body `{ tokenEnv, value }` 把分析接口令牌存入 DSH 凭据库；DELETE：body `{ tokenEnv }` 删除已存的值。只接受分析接口令牌的名称。 */
 const TOKEN_ROUTE = "/guanxiang/token";
+/** POST：body {@link HostAddRequest} 经 dsh-repo 添加主机；DELETE：body `{ url }` 删除面板添加的主机。 */
+const HOSTS_ROUTE = "/guanxiang/hosts";
+/** PUT：body `{ url, value }` 经 dsh-repo 保存主机令牌；DELETE：body `{ url }` 清除已存的令牌。 */
+const HOST_TOKEN_ROUTE = "/guanxiang/host-token";
 /**
 * POST：日志平台分析接口（Bearer 令牌鉴权，不走 DSH 登录）。它在 DSH 的
 * `/api` 命名空间之外，网关可以把它和需要登录的 DSH 接口分开暴露。
 */
 const ANALYZE_ROUTE = "/open-api/logalyze";
-/** Credential reference grammar of `@deepseek-ai/dsh-credentials` (a POSIX shell identifier), which {@link GitCredentialSpec.tokenEnv} follows. */
+/** Credential reference grammar of `@deepseek-ai/dsh-credentials` (a POSIX shell identifier). */
 const TOKEN_ENV_PATTERN = /^[A-Za-z_][A-Za-z0-9_]*$/;
 /** Keys of {@link EditableSettings}, in panel order. */
 const EDITABLE_KEYS = [
-	"reposDir",
 	"repos",
-	"gitCredentials",
 	"fetchIntervalMs",
 	"maxAppsPerRequest",
 	"dispatchTimeoutMs",
@@ -402,94 +404,6 @@ function mountAnalyzeRoute(ctx, gate) {
 	attach(ctx);
 }
 //#endregion
-//#region src/repos/credentials.ts
-/** Environment variables the helper reads; set only on git child processes. */
-const USERNAME_VARIABLE = "GUANXIANG_GIT_USERNAME";
-const TOKEN_VARIABLE = "GUANXIANG_GIT_TOKEN";
-/** Answers git's `get` request from the two variables and ignores `store` and `erase`. */
-const HELPER = `!f() { test "$1" = get || exit 0; printf 'username=%s\\npassword=%s\\n' "$${USERNAME_VARIABLE}" "$${TOKEN_VARIABLE}"; }; f`;
-/** Longest accepted token; personal access tokens are far shorter. */
-const MAX_TOKEN_LENGTH = 4096;
-/**
-* Normalize an access-token address prefix to `scheme://host[:port][/path]`
-* with a lowercase host and no trailing slash.
-* @param value - candidate prefix.
-* @returns the normalized prefix, or undefined when it is not an `https`/`http` URL without credentials, query, or fragment.
-*/
-function normalizeCredentialUrl(value) {
-	let url;
-	try {
-		url = new URL(value);
-	} catch {
-		return;
-	}
-	if (url.protocol !== "https:" && url.protocol !== "http:") return void 0;
-	if (url.host === "" || url.username !== "" || url.password !== "" || url.search !== "" || url.hash !== "") return void 0;
-	return `${url.protocol}//${url.host}${url.pathname.replace(/\/+$/, "")}`;
-}
-/**
-* Whether a token value can be handed to git: non-empty, bounded, and free of
-* control characters, which would break the credential helper protocol.
-* @param value - candidate token.
-* @returns whether it is accepted.
-*/
-function isAcceptedToken(value) {
-	return value.length > 0 && value.length <= 4096 && !/[\u0000-\u001f\u007f]/.test(value);
-}
-/**
-* The access-token configuration for a repository address: the entry whose
-* prefix has the same scheme and host and the longest path that contains the
-* repository path. scp-like addresses, SSH URLs, and local paths never match.
-* @param url - repository address.
-* @param specs - configured access tokens with normalized prefixes.
-* @returns the matching entry, if any.
-*/
-function credentialFor(url, specs) {
-	let repo;
-	try {
-		repo = new URL(url);
-	} catch {
-		return;
-	}
-	let best;
-	for (const spec of specs) {
-		const prefix = new URL(spec.url);
-		if (prefix.protocol !== repo.protocol || prefix.host !== repo.host) continue;
-		const path = prefix.pathname.replace(/\/+$/, "");
-		if (path !== "" && repo.pathname !== path && !repo.pathname.startsWith(`${path}/`)) continue;
-		if (best === void 0 || path.length > best.length) best = {
-			spec,
-			length: path.length
-		};
-	}
-	return best?.spec;
-}
-/**
-* Environment that makes one git process answer the credential request for
-* the token's host with the given token. Existing `GIT_CONFIG_COUNT` entries
-* are kept; the helper list for that host is reset first so a stale password
-* from another helper cannot shadow the token.
-* @param spec - matching access-token configuration.
-* @param token - token value.
-* @param env - environment of the git process before this call.
-* @returns variables to add to the git process environment.
-*/
-function credentialEnvironment(spec, token, env = process.env) {
-	const prefix = new URL(spec.url);
-	const key = `credential.${prefix.protocol}//${prefix.host}.helper`;
-	const parsed = Number(env.GIT_CONFIG_COUNT ?? "0");
-	const base = Number.isInteger(parsed) && parsed > 0 ? parsed : 0;
-	return {
-		GIT_CONFIG_COUNT: String(base + 2),
-		[`GIT_CONFIG_KEY_${base}`]: key,
-		[`GIT_CONFIG_VALUE_${base}`]: "",
-		[`GIT_CONFIG_KEY_${base + 1}`]: key,
-		[`GIT_CONFIG_VALUE_${base + 1}`]: HELPER,
-		[USERNAME_VARIABLE]: spec.username,
-		[TOKEN_VARIABLE]: token
-	};
-}
-//#endregion
 //#region src/config.ts
 /**
 * 插件配置：cordis.yml 中的 `config`（经 Standard Schema 在加载时校验）与
@@ -537,12 +451,16 @@ const repoSchema = z.object({
 	url: z.string().trim().min(1, "git 地址不能为空").refine(isAcceptedGitUrl, "不支持的 git 地址（支持 https/ssh/git/file URL、user@host:path 或绝对路径）"),
 	branch: z.string().trim().optional().transform((value) => value === "" ? void 0 : value).refine((value) => value === void 0 || isAcceptedBranch(value), "分支名不合法")
 }).strict();
-const credentialSchema = z.object({
-	url: z.string().trim().refine((value) => normalizeCredentialUrl(value) !== void 0, "令牌地址不合法：填 https://主机[:端口][/路径]，不含用户名、查询参数或片段").transform((value) => normalizeCredentialUrl(value)),
-	alias: z.string().trim().max(64, "令牌别名不能超过 64 个字符").regex(/^[^\u0000-\u001f\u007f]*$/, "令牌别名不能包含控制字符").optional().transform((value) => value === "" ? void 0 : value),
-	username: z.string().trim().regex(/^\S+$/, "用户名不能为空或包含空白").default("oauth2"),
-	tokenEnv: z.string().trim().regex(TOKEN_ENV_PATTERN, "令牌名称只能包含字母、数字和下划线，且不能以数字开头（它是凭据库中的键名，不是令牌本身）")
-}).strict();
+/**
+* An access token of earlier versions, which kept HTTPS tokens by address
+* prefix. Read only to move each one to a dsh-repo host once; never written.
+*/
+const legacyCredentialSchema = z.object({
+	url: z.string().trim().min(1),
+	alias: z.string().trim().optional(),
+	username: z.string().optional(),
+	tokenEnv: z.string().trim().regex(TOKEN_ENV_PATTERN)
+}).strip();
 const hostSchema = z.string().trim().toLowerCase().transform((value) => value.replace(/^\*\./, "")).refine((value) => HOST_NAME.test(value), "域名不合法：只填主机名，例如 oss.example.com");
 const durationMs = (min) => z.number().int().min(min).max(MAX_TIMER_DELAY_MS);
 const downloadSchema = z.object({
@@ -562,7 +480,6 @@ const authorSchema = z.object({
 }).strict();
 /** Field validators shared by the cordis config and the panel overlay. */
 const editableFields = {
-	reposDir: z.string().trim().min(1, "拉取目录不能为空"),
 	repos: z.array(repoSchema).superRefine((repos, issues) => {
 		const seen = /* @__PURE__ */ new Set();
 		for (const [index, repo] of repos.entries()) {
@@ -574,17 +491,6 @@ const editableFields = {
 			seen.add(repo.url);
 		}
 	}),
-	gitCredentials: z.array(credentialSchema).superRefine((credentials, issues) => {
-		const seen = /* @__PURE__ */ new Set();
-		for (const [index, credential] of credentials.entries()) {
-			if (seen.has(credential.url)) issues.addIssue({
-				code: "custom",
-				path: [index, "url"],
-				message: `重复的令牌地址：${credential.url}`
-			});
-			seen.add(credential.url);
-		}
-	}),
 	fetchIntervalMs: durationMs(0),
 	maxAppsPerRequest: z.number().int().min(1).max(32),
 	dispatchTimeoutMs: durationMs(1e3),
@@ -594,10 +500,11 @@ const editableFields = {
 };
 /** Standard Schema the Cordis loader validates `config` with before `apply()`. */
 const pluginConfigSchema = z.object({
-	reposDir: editableFields.reposDir.optional(),
+	/** Ignored: dsh-repo's `mirror.dir` decides where repositories are mirrored. Accepted so older compositions still load. */
+	reposDir: z.string().optional(),
 	repos: editableFields.repos.default([]),
-	/** HTTPS access tokens by address prefix; each names a credential reference, never a token value. */
-	gitCredentials: editableFields.gitCredentials.default([]),
+	/** Moved once to dsh-repo hosts at start; see {@link legacyCredentialSchema}. */
+	gitCredentials: z.array(legacyCredentialSchema).default([]),
 	fetchIntervalMs: editableFields.fetchIntervalMs.default(0),
 	maxAppsPerRequest: editableFields.maxAppsPerRequest.default(4),
 	dispatchTimeoutMs: editableFields.dispatchTimeoutMs.default(1800 * 1e3),
@@ -610,14 +517,14 @@ const pluginConfigSchema = z.object({
 	*/
 	analyzeTokenRef: z.string().trim().regex(TOKEN_ENV_PATTERN, "令牌名称只能包含字母、数字和下划线，且不能以数字开头").default("GUANXIANG_ANALYZE_TOKEN"),
 	/**
-	* Author and committer of SKILL improvement commits; omitted uses the git
-	* identity configured on the host (`user.name` / `user.email`).
+	* Author of SKILL improvement commits; omitted uses the user of the token
+	* dsh-repo holds for the repository's host, who is always the committer.
 	*/
 	skillUpdateAuthor: authorSchema.optional(),
 	/** Registered `ctx.subagents` provider the children start on. */
 	subagentProvider: z.string().trim().min(1).default("spawn"),
-	/** Timeout of one git command (clone, fetch, worktree), in milliseconds. */
-	gitTimeoutMs: durationMs(1e3).default(600 * 1e3),
+	/** Ignored: dsh-repo's `mirror.gitTimeoutMs` bounds git commands. Accepted so older compositions still load. */
+	gitTimeoutMs: z.number().optional(),
 	/**
 	* How long loading `/guanxiang` waits for the repository refresh before it
 	* renders the catalog it already has, in milliseconds; the refresh keeps
@@ -632,9 +539,11 @@ const pluginConfigSchema = z.object({
 }).strict().prefault({});
 /** Panel overlay: any subset of the editable settings. */
 const overlaySchema = z.object({
-	reposDir: editableFields.reposDir.optional(),
+	/** Ignored legacy key; the next panel save drops it. */
+	reposDir: z.string().optional(),
 	repos: editableFields.repos.optional(),
-	gitCredentials: editableFields.gitCredentials.optional(),
+	/** Legacy access tokens, moved once to dsh-repo hosts; the next panel save drops them. */
+	gitCredentials: z.array(legacyCredentialSchema).optional(),
 	fetchIntervalMs: editableFields.fetchIntervalMs.optional(),
 	maxAppsPerRequest: editableFields.maxAppsPerRequest.optional(),
 	dispatchTimeoutMs: editableFields.dispatchTimeoutMs.optional(),
@@ -675,42 +584,20 @@ function resolveDshHome(env = process.env) {
 	const configured = env.DSH_HOME?.trim();
 	return configured !== void 0 && configured !== "" ? configured : join(homedir(), ".dsh");
 }
-/**
-* Expand `~` and make a configured directory absolute.
-* @param path - configured directory.
-* @returns absolute directory.
-*/
-function expandHome(path) {
-	if (path === "~") return homedir();
-	if (path.startsWith("~/")) return join(homedir(), path.slice(2));
-	return resolve(path);
-}
 function copyRepos(repos) {
 	return repos.map((repo) => repo.branch === void 0 ? { url: repo.url } : {
 		url: repo.url,
 		branch: repo.branch
 	});
 }
-function copyCredentials(credentials) {
-	return credentials.map((credential) => ({
-		url: credential.url,
-		...credential.alias === void 0 ? {} : { alias: credential.alias },
-		username: credential.username,
-		tokenEnv: credential.tokenEnv
-	}));
-}
 /**
-* The editable settings a configuration implies, with `reposDir` defaulted to
-* `$DSH_HOME/guanxiang/repos`.
+* The editable settings a configuration implies.
 * @param config - validated plugin configuration.
-* @param env - process environment.
 * @returns complete editable settings.
 */
-function defaultsOf(config, env = process.env) {
+function defaultsOf(config) {
 	return {
-		reposDir: config.reposDir ?? join(resolveDshHome(env), "guanxiang", "repos"),
 		repos: copyRepos(config.repos),
-		gitCredentials: copyCredentials(config.gitCredentials),
 		fetchIntervalMs: config.fetchIntervalMs,
 		maxAppsPerRequest: config.maxAppsPerRequest,
 		dispatchTimeoutMs: config.dispatchTimeoutMs,
@@ -731,9 +618,7 @@ function defaultsOf(config, env = process.env) {
 */
 function applyOverlay(defaults, overlay) {
 	return {
-		reposDir: overlay.reposDir ?? defaults.reposDir,
 		repos: overlay.repos === void 0 ? defaults.repos : copyRepos(overlay.repos),
-		gitCredentials: overlay.gitCredentials === void 0 ? defaults.gitCredentials : copyCredentials(overlay.gitCredentials),
 		fetchIntervalMs: overlay.fetchIntervalMs ?? defaults.fetchIntervalMs,
 		maxAppsPerRequest: overlay.maxAppsPerRequest ?? defaults.maxAppsPerRequest,
 		dispatchTimeoutMs: overlay.dispatchTimeoutMs ?? defaults.dispatchTimeoutMs,
@@ -743,6 +628,80 @@ function applyOverlay(defaults, overlay) {
 	};
 }
 //#endregion
+//#region src/repos/lookup.ts
+/** Name dsh-repo provides the service under. */
+const DSH_REPOS_SERVICE = "dshRepos";
+/** Oldest dsh-repo release providing every method {@link REQUIRED_METHODS} lists. */
+const DSH_REPO_MIN_RELEASE = "0.1.0-beta.3";
+/** Methods this plugin calls; `getBranch` also marks a provider that honors `baseSha` and `newBranch` on commits. */
+const REQUIRED_METHODS = [
+	"getBranch",
+	"commitFiles",
+	"createChange",
+	"listHosts",
+	"addHost",
+	"removeHost",
+	"setHostToken",
+	"mirrorSettings",
+	"syncMirror",
+	"readMirrorFile",
+	"listMirrorTree",
+	"acquireSnapshot"
+];
+/**
+* Classify the value `ctx.get('dshRepos')` returned. The provider is another
+* package that may be older or newer than this one, so its version and
+* methods are checked at run time.
+* @param value - the looked-up service, or undefined.
+* @returns the usable service, or why there is none.
+*/
+function lookupRepos(value) {
+	if (value === void 0 || value === null) return { availability: "missing" };
+	const service = value;
+	if (service.version !== 1 || REQUIRED_METHODS.some((method) => typeof service[method] !== "function")) return { availability: "incompatible" };
+	return {
+		availability: "ready",
+		service: value
+	};
+}
+/**
+* The failure class of a `dshRepos` rejection.
+* @param error - the rejection.
+* @returns its `code` when it is a `RepoError`.
+*/
+function repoErrorCode(error) {
+	if (!(error instanceof Error) || error.name !== "RepoError") return void 0;
+	const code = error.code;
+	return typeof code === "string" ? code : void 0;
+}
+/**
+* Why the service cannot be used, as one line for the panel and tool errors.
+* @param availability - lookup outcome other than `ready`.
+* @returns the reason and the fix.
+*/
+function unavailableMessage(availability) {
+	return availability === "missing" ? `观象需要 dsh-repo 插件提供的 ${DSH_REPOS_SERVICE} 服务来拉取仓库和提交 SKILL 修改；请安装 dsh-repo` : `dsh-repo 的 ${DSH_REPOS_SERVICE} 服务与观象不兼容（需要服务版本 1，即 dsh-repo ${DSH_REPO_MIN_RELEASE} 及以上）；请升级 dsh-repo`;
+}
+/**
+* The usable service, or a thrown error saying why there is none.
+* @param value - the looked-up service, or undefined.
+* @returns the service.
+* @throws Error with {@link unavailableMessage} when it is missing or incompatible.
+*/
+function requireRepos(value) {
+	const lookup = lookupRepos(value);
+	if (lookup.availability !== "ready") throw new Error(unavailableMessage(lookup.availability));
+	return lookup.service;
+}
+/**
+* Readable message of a `dshRepos` rejection or any other thrown value.
+* @param error - the rejection.
+* @returns its message.
+*/
+function messageOf$1(error) {
+	return error instanceof Error ? error.message : String(error);
+}
+//#endregion
 //#region src/abort.ts
 /**
 * Cancellation helpers shared by the entry skill and the dispatch tool.
@@ -772,218 +731,58 @@ async function abortable(promise, signal) {
 	}
 }
 //#endregion
-//#region src/skill-update/git.ts
+//#region src/skill-update/change.ts
 /**
-* 在拉取仓库中用 git 底层命令生成 SKILL 修改的提交并推送：用临时索引文件
-* 在分析时的提交上替换文件、写出树对象，不改动任何检出、快照或本地分支；
-* 推送时用 GitLab push options 顺带创建合并请求。
+* 检查 SKILL 修改：从 dsh-repo 镜像读取分析时的提交中 SKILL 目录的文件，与提议
+* 的文件比较，算出逐文件行数和 unified diff，不改动任何镜像或快照。提议内容的
+* 摘要用作新分支名，提交本身经 dsh-repo 完成。
 *
-* @module dsh-guanxiang/skill-update/git
-*/
-const DIFF_FLAGS = [
-	"--no-color",
-	"--no-ext-diff",
-	"--no-renames"
-];
-/**
-* Write the proposed files over the skill directory of `base` into a new tree.
-* @param commands - git runner and timeout.
-* @param dir - repository directory whose object database receives the objects.
-* @param base - commit the analysis ran on.
-* @param skillDir - skill directory relative to the repository root, `/`-separated.
-* @param files - proposed files relative to `skillDir`.
-* @returns the tree, per-file line counts, and the diff; `files` is empty when nothing changes.
-* @throws when a proposed path replaces a symbolic link or a directory, or a git command fails.
-*/
-async function prepareChange(commands, dir, base, skillDir, files) {
-	const { git, timeoutMs } = commands;
-	const scratch = await mkdtemp(join(tmpdir(), "guanxiang-index-"));
-	try {
-		const env = { GIT_INDEX_FILE: join(scratch, "index") };
-		await git(["read-tree", base], {
-			cwd: dir,
-			timeoutMs,
-			env
-		});
-		const listing = await git([
-			"ls-tree",
-			"-r",
-			"-t",
-			"-z",
-			base,
-			"--",
-			`${skillDir}/`
-		], {
-			cwd: dir,
-			timeoutMs
-		});
-		const modes = /* @__PURE__ */ new Map();
-		for (const record of listing.split("\0")) {
-			const tab = record.indexOf("	");
-			if (tab < 0) continue;
-			modes.set(record.slice(tab + 1), record.slice(0, record.indexOf(" ")));
-		}
-		for (const file of files) {
-			const path = `${skillDir}/${file.path}`;
-			const existing = modes.get(path);
-			if (existing === "120000") throw new Error(`${path} 在仓库中是符号链接，不能用提议覆盖`);
-			if (existing === "040000") throw new Error(`${path} 在仓库中是目录，不能用文件覆盖`);
-			const blob = (await git([
-				"hash-object",
-				"-w",
-				"--stdin"
-			], {
-				cwd: dir,
-				timeoutMs,
-				input: file.content
-			})).trim();
-			await git([
-				"update-index",
-				"--add",
-				"--cacheinfo",
-				`${existing === "100755" ? "100755" : "100644"},${blob},${path}`
-			], {
-				cwd: dir,
-				timeoutMs,
-				env
-			});
-		}
-		const tree = (await git(["write-tree"], {
-			cwd: dir,
-			timeoutMs,
-			env
-		})).trim();
-		const stats = (await git([
-			"diff",
-			...DIFF_FLAGS,
-			"--numstat",
-			base,
-			tree,
-			"--",
-			`${skillDir}/`
-		], {
-			cwd: dir,
-			timeoutMs
-		})).split("\n").filter((line) => line !== "").map((line) => {
-			const [added = "-", removed = "-", ...path] = line.split("	");
-			return {
-				path: path.join("	"),
-				...added === "-" ? {} : { added: Number(added) },
-				...removed === "-" ? {} : { removed: Number(removed) }
-			};
-		});
-		return {
-			base,
-			tree,
-			files: stats,
-			diff: stats.length === 0 ? "" : await git([
-				"diff",
-				...DIFF_FLAGS,
-				base,
-				tree,
-				"--",
-				`${skillDir}/`
-			], {
-				cwd: dir,
-				timeoutMs
-			})
-		};
-	} finally {
-		await rm(scratch, {
-			recursive: true,
-			force: true
+* @module dsh-guanxiang/skill-update/change
+*/
+/**
+* Compare the proposed files with the skill directory of the base commit.
+* @param repos - the `dshRepos` service holding the mirror.
+* @param target - repository, base commit, and skill directory.
+* @param files - proposed files relative to the skill directory.
+* @param signal - cancellation.
+* @returns per-file line counts, the diff, and the digest; `files` is empty when nothing changes.
+* @throws when a proposed path replaces a symbolic link, a submodule, or a directory, or the mirror cannot be read.
+*/
+async function prepareChange(repos, target, files, signal) {
+	const { url, base, skillDir } = target;
+	const listing = await repos.listMirrorTree(url, base, skillDir, signal === void 0 ? {} : { signal });
+	const types = new Map(listing.map((entry) => [entry.path, entry.type]));
+	const stats = [];
+	const patches = [];
+	const digest = createHash("sha256").update(`${base}\n`);
+	for (const file of [...files].sort((a, b) => a.path < b.path ? -1 : a.path > b.path ? 1 : 0)) {
+		const path = `${skillDir}/${file.path}`;
+		const type = types.get(path);
+		if (type === "symlink") throw new Error(`${path} 在仓库中是符号链接，不能用提议覆盖`);
+		if (type === "dir" || type === "submodule") throw new Error(`${path} 在仓库中是目录，不能用文件覆盖`);
+		const before = type === "file" ? await repos.readMirrorFile(url, base, path, signal === void 0 ? {} : { signal }) ?? "" : void 0;
+		if (before === file.content) continue;
+		const structured = structuredPatch(path, path, before ?? "", file.content, void 0, void 0, { context: 3 });
+		let added = 0;
+		let removed = 0;
+		for (const hunk of structured.hunks) for (const line of hunk.lines) if (line.startsWith("+")) added += 1;
+		else if (line.startsWith("-")) removed += 1;
+		stats.push({
+			path,
+			added,
+			removed
 		});
+		const header = `diff --git a/${path} b/${path}\n${before === void 0 ? "new file mode 100644\n" : ""}`;
+		const patch = createTwoFilesPatch(before === void 0 ? "/dev/null" : `a/${path}`, `b/${path}`, before ?? "", file.content, void 0, void 0, { context: 3 });
+		patches.push(header + patch.replace(/^=+\n/, ""));
+		digest.update(`${path}\0${file.content}\0`);
 	}
-}
-/**
-* Whether the remote already has a branch.
-* @param commands - git runner and timeout.
-* @param dir - clone directory.
-* @param branch - branch name.
-* @param env - network environment of the clone's address.
-* @returns whether `refs/heads/<branch>` exists on `origin`.
-*/
-async function remoteBranchExists(commands, dir, branch, env) {
-	return (await commands.git([
-		"ls-remote",
-		"--heads",
-		"origin",
-		`refs/heads/${branch}`
-	], {
-		cwd: dir,
-		timeoutMs: commands.timeoutMs,
-		env
-	})).trim() !== "";
-}
-/**
-* Commit a prepared tree on its base commit without touching any ref.
-* @param commands - git runner and timeout.
-* @param dir - clone directory.
-* @param change - prepared tree and its base.
-* @param message - full commit message.
-* @param author - explicit identity; omitted uses the host's git configuration.
-* @returns the new commit id.
-*/
-async function commitChange(commands, dir, change, message, author) {
-	const env = author === void 0 ? void 0 : {
-		GIT_AUTHOR_NAME: author.name,
-		GIT_AUTHOR_EMAIL: author.email,
-		GIT_COMMITTER_NAME: author.name,
-		GIT_COMMITTER_EMAIL: author.email
+	return {
+		base,
+		digest: digest.digest("hex"),
+		files: stats,
+		diff: patches.join("")
 	};
-	return (await commands.git([
-		"commit-tree",
-		change.tree,
-		"-p",
-		change.base,
-		"-F",
-		"-"
-	], {
-		cwd: dir,
-		timeoutMs: commands.timeoutMs,
-		input: message,
-		...env === void 0 ? {} : { env }
-	})).trim();
-}
-/** Push options cannot carry line breaks; collapse every whitespace run. */
-function oneLine(text) {
-	return text.replace(/\s+/g, " ").trim();
-}
-/**
-* Push a commit to a new remote branch and ask GitLab to open a merge request
-* for it (`merge_request.*` push options). The push carries an empty lease on
-* the branch, so it fails instead of updating a branch that appeared after
-* {@link remoteBranchExists} was checked. A server that does not support push
-* options rejects the push.
-* @param commands - git runner and timeout.
-* @param dir - clone directory.
-* @param commit - commit to push.
-* @param branch - new branch name.
-* @param request - merge request target and text.
-* @param env - network environment of the clone's address.
-* @returns the merge request URL the server printed, if any.
-*/
-async function pushForMergeRequest(commands, dir, commit, branch, request, env) {
-	const options = [
-		"merge_request.create",
-		`merge_request.target=${request.target}`,
-		`merge_request.title=${oneLine(request.title)}`,
-		`merge_request.description=${oneLine(request.description)}`
-	].flatMap((option) => ["-o", option]);
-	const output = await commands.git([
-		"push",
-		"--porcelain",
-		`--force-with-lease=refs/heads/${branch}:`,
-		...options,
-		"origin",
-		`${commit}:refs/heads/${branch}`
-	], {
-		cwd: dir,
-		timeoutMs: commands.timeoutMs,
-		env,
-		output: "all"
-	});
-	return /https?:\/\/\S+\/-\/merge_requests\/\d+/.exec(output)?.[0];
 }
 //#endregion
 //#region src/repos/manifest.ts
@@ -1213,11 +1012,13 @@ async function readProposal(workDir, limits) {
 * - 只接受本进程中由同一会话派发过的任务运行目录；应用、仓库和分析时的提交
 *   取自派发记录，不取自运行目录里可被 Agent 改写的内容。
 * - 只改应用 SKILL 目录 `.dsh/skills/<skill>/` 下的文件，提交以分析时的提交为
-*   父提交，推送到新分支 `guanxiang/skill-<应用 id>-<树对象前缀>`，从不推送已有
-*   分支或默认分支。
-* - 推送前经 DSH 审批服务（`ctx.approval`）请求一次性授权；dsh_channels 把它
-*   显示为飞书决策卡片，DSH Web 显示为审批提示。只有 `allowed-once` 才推送；
-*   没有审批服务时工具报错，不推送。
+*   父提交，提交到新分支 `guanxiang/skill-<应用 id>-<改动摘要前缀>`，从不提交到
+*   已有分支或默认分支。
+* - 提交和创建合并请求经 dsh-repo 的 `dshRepos` 服务完成，支持 GitLab 与
+*   GitHub；令牌由 dsh-repo 按主机配置。没有该服务或版本不符时工具报错。
+* - 提交前经 DSH 审批服务（`ctx.approval`）请求一次性授权；dsh_channels 把它
+*   显示为飞书决策卡片，DSH Web 显示为审批提示。只有 `allowed-once` 才提交；
+*   没有审批服务时工具报错，不提交。
 * - 子会话中不提供本工具。
 *
 * @module dsh-guanxiang/skill-update/tool
@@ -1282,7 +1083,11 @@ const OUTPUT_SCHEMA$1 = {
 			items: {
 				type: "object",
 				additionalProperties: false,
-				required: ["path"],
+				required: [
+					"path",
+					"added",
+					"removed"
+				],
 				properties: {
 					path: { type: "string" },
 					added: { type: "number" },
@@ -1291,7 +1096,8 @@ const OUTPUT_SCHEMA$1 = {
 			}
 		},
 		diffPath: { type: "string" },
-		mergeRequestUrl: { type: "string" }
+		mergeRequestUrl: { type: "string" },
+		mergeRequestError: { type: "string" }
 	}
 };
 /**
@@ -1300,7 +1106,7 @@ const OUTPUT_SCHEMA$1 = {
 * @returns one line.
 */
 function describeFiles(files) {
-	return files.map((file) => file.added === void 0 ? `${file.path}（二进制）` : `${file.path}（+${file.added} −${file.removed ?? 0}）`).join("、");
+	return files.map((file) => `${file.path}（+${file.added} −${file.removed}）`).join("、");
 }
 /**
 * Model-facing rendering of a submission.
@@ -1312,18 +1118,15 @@ function renderProposeValue(value) {
 	return [{
 		type: "text",
 		text: `${{
-			opened: `已推送到 ${where} 并创建合并请求：${value.mergeRequestUrl ?? ""}`,
-			pushed: `已推送到 ${where}，但服务器没有返回合并请求链接；请在 GitLab 上确认合并请求是否已创建。`,
-			exists: `${where} 已存在，同一改动可能已经提交过，本次没有推送。`,
-			rejected: "授权被拒绝，没有推送：用户拒绝了这次修改，或会话的审批策略为 never（例如「完全访问」权限模式）。",
-			cancelled: "授权请求被撤回，没有推送。",
-			unavailable: "当前没有可以回答授权请求的界面，没有推送。"
+			opened: `已提交到 ${where} 并创建合并请求：${value.mergeRequestUrl ?? ""}`,
+			pushed: `已提交到 ${where}，但创建合并请求失败（${value.mergeRequestError ?? "未知原因"}）；请在代码托管平台上从该分支手动创建。`,
+			exists: `${where} 已存在，同一改动可能已经提交过，本次没有提交。`,
+			rejected: "授权被拒绝，没有提交：用户拒绝了这次修改，或会话的审批策略为 never（例如「完全访问」权限模式）。",
+			cancelled: "授权请求被撤回，没有提交。",
+			unavailable: "当前没有可以回答授权请求的界面，没有提交。"
 		}[value.status]}\n改动：${describeFiles(value.files)}\ndiff：${value.diffPath}`
 	}];
 }
-function messageOf$2(error) {
-	return error instanceof Error ? error.message : String(error);
-}
 /**
 * Write a file in an agent-writable directory without following whatever
 * entry the agent left at its path: the content goes to a new file created
@@ -1346,7 +1149,7 @@ function skillDirOf(app) {
 var SkillUpdater = class {
 	deps;
 	tasks = /* @__PURE__ */ new Map();
-	/** @param deps - registry, settings, git, and approval access. */
+	/** @param deps - registry, settings, approval, and `dshRepos` access. */
 	constructor(deps) {
 		this.deps = deps;
 	}
@@ -1373,7 +1176,7 @@ var SkillUpdater = class {
 		} catch (error) {
 			return {
 				ok: false,
-				error: messageOf$2(error)
+				error: messageOf$1(error)
 			};
 		}
 	}
@@ -1388,24 +1191,23 @@ var SkillUpdater = class {
 	/**
 	* Read the proposal, build its tree, and write the diff file.
 	* @returns undefined when the task wrote no proposal.
-	* @throws ProposalError or a git failure.
+	* @throws ProposalError, or an error when dsh-repo is unavailable or the mirror cannot be read.
 	*/
-	async prepare(task) {
+	async prepare(task, signal) {
 		const proposal = await readProposal(task.workDir, this.deps.settings().skillUpdates);
 		if (proposal === void 0) return void 0;
-		const commands = {
-			git: this.deps.git,
-			timeoutMs: this.deps.gitTimeoutMs
-		};
-		const { change, target } = await this.deps.registry.withClone(task.url, async (clone) => ({
-			change: await prepareChange(commands, clone.dir, task.commit, skillDirOf(task.app), proposal.files),
-			target: clone.branch
-		}));
+		const target = this.deps.registry.branchOf(task.url);
+		const change = await prepareChange(requireRepos(this.deps.repos()), {
+			url: task.url,
+			base: task.commit,
+			skillDir: skillDirOf(task.app)
+		}, proposal.files, signal);
 		if (change.files.length === 0) throw new ProposalError(`提议的文件与提交 ${task.commit.slice(0, 12)} 中的 SKILL 相同，没有改动`);
 		const diffPath = join(task.workDir, DIFF_FILE);
 		await replaceFile(diffPath, change.diff);
 		return {
 			reason: proposal.reason,
+			files: proposal.files,
 			change,
 			target,
 			diffPath
@@ -1418,7 +1220,7 @@ var SkillUpdater = class {
 	definition() {
 		return {
 			name: PROPOSE_TOOL_NAME,
-			description: "观象：把派发结果中某个应用的 SKILL 修改提议提交为合并请求。工具先请求用户授权，批准后推送新分支并创建合并请求，不会直接改动默认分支。仅在派发结果标出了 SKILL 修改提议时使用；不要自己用 git 推送。",
+			description: "观象：把派发结果中某个应用的 SKILL 修改提议提交为合并请求。工具先请求用户授权，批准后提交到新分支并创建合并请求，不会直接改动默认分支。仅在派发结果标出了 SKILL 修改提议时使用；不要自己用 git 推送。",
 			parameters: PARAMETERS,
 			output: {
 				schema: OUTPUT_SCHEMA$1,
@@ -1433,7 +1235,7 @@ var SkillUpdater = class {
 	* @param rawArgs - model arguments.
 	* @param exec - execution context of the calling agent.
 	* @returns how the submission ended.
-	* @throws when the arguments, task, proposal, or approval service are unusable, or git fails; nothing is pushed then.
+	* @throws when the arguments, task, proposal, approval service, or `dshRepos` service are unusable, or the commit fails; nothing is committed then.
 	*/
 	async execute(rawArgs, exec) {
 		const parsed = argsSchema$1.safeParse(rawArgs);
@@ -1447,11 +1249,18 @@ var SkillUpdater = class {
 		if (task === void 0) throw new Error(`${parsed.data.workDir} 不是本次 DSH 运行中观象派发任务的运行目录；DSH 重启后需要重新分析`);
 		if (task.sessionId !== agent.session.header.id) throw new Error(`${parsed.data.workDir} 不是当前会话派发的任务`);
 		const approval = this.deps.approval();
-		if (approval === void 0) throw new Error("当前 DSH 组合没有审批服务（@deepseek-ai/dsh-user-approval），观象不会在未经授权时推送");
-		const prepared = await this.prepare(task);
+		if (approval === void 0) throw new Error("当前 DSH 组合没有审批服务（@deepseek-ai/dsh-user-approval），观象不会在未经授权时提交");
+		const repos = requireRepos(this.deps.repos());
+		let prepared;
+		try {
+			prepared = await this.prepare(task, exec.signal);
+		} catch (error) {
+			exec.signal.throwIfAborted();
+			throw error;
+		}
 		if (prepared === void 0) throw new Error(`${task.workDir} 中没有 SKILL 修改提议（${PROPOSAL_DIR}/${REASON_FILE} 与 ${PROPOSAL_DIR}/${FILES_DIR}/）`);
 		const { change, target, diffPath, reason } = prepared;
-		const branch = `guanxiang/skill-${task.app.id}-${change.tree.slice(0, 10)}`;
+		const branch = `guanxiang/skill-${task.app.id}-${change.digest.slice(0, 10)}`;
 		const base = {
 			app: task.app.id,
 			repo: task.url,
@@ -1460,17 +1269,13 @@ var SkillUpdater = class {
 			files: [...change.files],
 			diffPath
 		};
-		const commands = {
-			git: this.deps.git,
-			timeoutMs: this.deps.gitTimeoutMs
-		};
-		if (await this.deps.registry.withClone(task.url, (clone) => remoteBranchExists(commands, clone.dir, branch, clone.env))) return {
+		if (await repos.getBranch(task.url, branch, { signal: exec.signal }) !== void 0) return {
 			...base,
 			status: "exists"
 		};
 		const preview = reason.replace(/\s+/g, " ").slice(0, REASON_PREVIEW_CHARS);
-		const zh = `观象将向 ${task.url} 推送新分支 ${branch}，并创建合并请求合入 ${target}。改动：${describeFiles(change.files)}。摘要：${summary}。理由：${preview}`;
-		const en = `GuanXiang will push branch ${branch} to ${task.url} and open a merge request into ${target}. Files: ${change.files.map((file) => file.path).join(", ")}. Summary: ${summary}`;
+		const zh = `观象将在 ${task.url} 提交新分支 ${branch}，并创建合并请求合入 ${target}。改动：${describeFiles(change.files)}。摘要：${summary}。理由：${preview}`;
+		const en = `GuanXiang will commit branch ${branch} to ${task.url} and open a merge request into ${target}. Files: ${change.files.map((file) => file.path).join(", ")}. Summary: ${summary}`;
 		const outcome = await approval.request({
 			agent,
 			toolName: PROPOSE_TOOL_NAME,
@@ -1489,23 +1294,50 @@ var SkillUpdater = class {
 		};
 		const message = `${summary}\n\n${reason}\n\nProposed-by: 观象 GuanXiang\nAnalyzed-commit: ${task.commit}\nSession: ${task.sessionId}\n`;
 		const description = `由观象在日志分析中提出（应用 ${task.app.id}，分析提交 ${task.commit.slice(0, 12)}，会话 ${task.sessionId}）。理由：${reason.slice(0, REASON_DESCRIPTION_CHARS)}`;
-		const url = await this.deps.registry.withClone(task.url, async (clone) => {
-			exec.signal.throwIfAborted();
-			const commit = await commitChange(commands, clone.dir, change, message, this.deps.author);
-			return await pushForMergeRequest(commands, clone.dir, commit, branch, {
-				target,
+		const changed = new Set(change.files.map((file) => file.path));
+		const files = prepared.files.map((file) => ({
+			action: "write",
+			path: `${skillDirOf(task.app)}/${file.path}`,
+			content: file.content
+		})).filter((file) => changed.has(file.path));
+		exec.signal.throwIfAborted();
+		try {
+			await repos.commitFiles(task.url, {
+				branch,
+				baseSha: task.commit,
+				newBranch: true,
+				message,
+				files,
+				...this.deps.author === void 0 ? {} : { author: this.deps.author },
+				signal: exec.signal
+			});
+		} catch (error) {
+			if (repoErrorCode(error) === "conflict") return {
+				...base,
+				status: "exists"
+			};
+			throw error;
+		}
+		try {
+			const opened = await repos.createChange(task.url, {
 				title: summary,
-				description
-			}, clone.env);
-		});
-		return url === void 0 ? {
-			...base,
-			status: "pushed"
-		} : {
-			...base,
-			status: "opened",
-			mergeRequestUrl: url
-		};
+				body: description,
+				sourceBranch: branch,
+				targetBranch: target,
+				signal: exec.signal
+			});
+			return {
+				...base,
+				status: "opened",
+				mergeRequestUrl: opened.webUrl
+			};
+		} catch (error) {
+			return {
+				...base,
+				status: "pushed",
+				mergeRequestError: messageOf$1(error)
+			};
+		}
 	}
 };
 //#endregion
@@ -1903,7 +1735,7 @@ function isInside(child, parent) {
 function textOf(blocks) {
 	return blocks.flatMap((block) => block.type === "text" && typeof block.text === "string" ? [block.text] : []).join("\n").trim();
 }
-function messageOf$1(error) {
+function messageOf(error) {
 	return error instanceof Error ? error.message : String(error);
 }
 /** Runs dispatches; one instance serves every registration of the tool. */
@@ -1959,7 +1791,7 @@ var Dispatcher = class {
 			try {
 				await stat(path);
 			} catch (error) {
-				throw new Error(`日志路径不可读：${path}（${error.code ?? messageOf$1(error)}）`);
+				throw new Error(`日志路径不可读：${path}（${error.code ?? messageOf(error)}）`);
 			}
 			return {
 				path,
@@ -2066,7 +1898,7 @@ var Dispatcher = class {
 					...base,
 					status: stop.aborted && !signal.aborted ? "timeout" : "failed",
 					output: "",
-					diagnostic: messageOf$1(error)
+					diagnostic: messageOf(error)
 				};
 			}
 			activations[index] = activation;
@@ -2098,7 +1930,7 @@ var Dispatcher = class {
 					childId: activation.childId,
 					status: "error",
 					output: "",
-					diagnostic: messageOf$1(error)
+					diagnostic: messageOf(error)
 				};
 			}
 		}));
@@ -2108,7 +1940,7 @@ var Dispatcher = class {
 				await activation.dispose();
 			} catch (error) {
 				const result = results.find((entry) => entry.childId === activation.childId);
-				if (result !== void 0) result.diagnostic = [result.diagnostic, `子 Agent 清理失败：${messageOf$1(error)}`].filter(Boolean).join("；");
+				if (result !== void 0) result.diagnostic = [result.diagnostic, `子 Agent 清理失败：${messageOf(error)}`].filter(Boolean).join("；");
 			}
 		}));
 		signal.throwIfAborted();
@@ -2116,201 +1948,40 @@ var Dispatcher = class {
 	}
 };
 //#endregion
-//#region src/repos/git.ts
-/**
-* 本机 git 命令的调用封装：沿用本机已有凭据（SSH key 或 credential helper），
-* 或由调用方经环境变量提供的访问令牌；禁止交互式提示，避免后台拉取卡在
-* 密码输入上。
-*
-* @module dsh-guanxiang/repos/git
-*/
-/** A failed git command with its combined output. */
-var GitError = class extends Error {
-	args;
-	output;
-	/**
-	* @param args - git arguments that failed.
-	* @param output - trimmed stderr (or stdout when stderr is empty).
-	*/
-	constructor(args, output) {
-		super(`git ${args.join(" ")} 失败：${output === "" ? "无输出" : output}`);
-		this.args = args;
-		this.output = output;
-	}
-};
-/**
-* Environment for non-interactive git: no terminal prompts, and SSH in batch
-* mode unless the user configured their own SSH command.
-* @param env - base environment.
-* @returns environment for git child processes.
-*/
-function gitEnvironment(env = process.env) {
-	const next = {
-		...env,
-		GIT_TERMINAL_PROMPT: "0"
-	};
-	if (env.GIT_SSH_COMMAND === void 0 && env.GIT_SSH === void 0) next.GIT_SSH_COMMAND = "ssh -o BatchMode=yes";
-	return next;
-}
-/**
-* Default runner backed by the `git` executable on PATH.
-* @param args - git arguments.
-* @param options - working directory, timeout, extra environment, input, and output selection.
-* @returns stdout, or stdout followed by stderr.
-*/
-const runGit = (args, options) => new Promise((resolve, reject) => {
-	const child = execFile("git", [...args], {
-		cwd: options.cwd,
-		env: {
-			...gitEnvironment(),
-			...options.env
-		},
-		timeout: options.timeoutMs,
-		maxBuffer: 16 * 1024 * 1024,
-		windowsHide: true
-	}, (error, stdout, stderr) => {
-		if (error === null) {
-			resolve(options.output === "all" ? `${stdout}${stderr}` : stdout);
-			return;
-		}
-		const output = (options.output === "all" || stderr.trim() === "" ? `${stdout}${stderr}` : stderr).trim();
-		reject(new GitError(args, error.killed === true ? `超时（${options.timeoutMs} ms）后被终止${output === "" ? "" : `：${output}`}` : output || error.message));
-	});
-	child.stdin?.on("error", () => {});
-	child.stdin?.end(options.input);
-});
-//#endregion
 //#region src/repos/registry.ts
-/**
-* 应用注册表：把设置中的 git 地址拉取到 `<reposDir>/<仓库名>`，从远端分支最新
-* 提交读取各仓库的应用描述，对外提供「已就绪的应用」，并为每次派发提供该
-* 提交的只读代码快照。
-*
-* - 拉取目录只做 fetch，不检出：新地址 `git clone --no-checkout`（先克隆到临时
-*   目录再改名，半成品不会被当成仓库），已有目录 `git fetch`。应用描述与 SKILL
-*   直接从提交的 git 对象读取，所以随时可以更新，不受正在进行的分析影响。
-* - 子 Agent 在 `<reposDir>/.snapshots/<仓库名>/` 下按提交创建的 `git worktree`
-*   快照里工作。快照创建后不再改动；同一提交的派发共用一份，没有使用者且已不是
-*   最新提交时删除。进程内首次同步某仓库时清掉上次运行遗留的快照。
-* - 更新失败时继续使用已有提交，并在状态里给出原因；应用描述或 SKILL 不合法时
-*   该应用不可用。
-* - 多个仓库声明同一个应用 id 时，这些仓库全部不可用。
-*
-* @module dsh-guanxiang/repos/registry
-*/
-/**
-* Checkout directory name for a git address: its last path segment without
-* `.git`, restricted to `[A-Za-z0-9._-]`.
-* @param url - git address.
-* @returns directory name.
-*/
-function repoDirName(url) {
-	const name = (url.replace(/^[^@/]+@[^:/]+:/, "").replace(/[?#].*$/, "").replace(/\/+$/, "").split(/[/\\:]/).pop() ?? "").replace(/\.git$/, "").replace(/[^A-Za-z0-9._-]/g, "-").replace(/^[.-]+/, "");
-	return name === "" ? "repo" : name;
-}
-/**
-* Assign each address a distinct directory; colliding names get a short hash
-* of their address appended.
-* @param reposDir - parent directory (may start with `~`).
-* @param urls - configured addresses.
-* @returns absolute directory per address.
-*/
-function assignDirs(reposDir, urls) {
-	const root = expandHome(reposDir);
-	const counts = /* @__PURE__ */ new Map();
-	for (const url of urls) counts.set(repoDirName(url), (counts.get(repoDirName(url)) ?? 0) + 1);
-	const dirs = /* @__PURE__ */ new Map();
-	for (const url of urls) {
-		const name = repoDirName(url);
-		const unique = (counts.get(name) ?? 0) > 1 ? `${name}-${createHash("sha1").update(url).digest("hex").slice(0, 8)}` : name;
-		dirs.set(url, join(root, unique));
-	}
-	return dirs;
-}
-/**
-* Directory holding the commit snapshots of one clone.
-* @param dir - clone directory `<reposDir>/<name>`.
-* @returns `<reposDir>/.snapshots/<name>`.
-*/
-function snapshotRoot(dir) {
-	return join(dirname(dir), ".snapshots", basename(dir));
-}
-/**
-* Run a task after every task queued earlier under the same key.
-* @param locks - tail of each key's queue.
-* @param key - queue key.
-* @param task - work to run.
-* @returns the task's result.
-*/
-function serialize(locks, key, task) {
-	const run = (locks.get(key) ?? Promise.resolve()).then(task);
-	const tail = run.then(() => void 0, () => void 0);
-	locks.set(key, tail);
-	tail.then(() => {
-		if (locks.get(key) === tail) locks.delete(key);
-	});
-	return run;
-}
-function messageOf(error) {
-	if (error instanceof GitError) return error.output === "" ? error.message : error.output;
-	return error instanceof Error ? error.message : String(error);
-}
-async function pathKind(path) {
-	try {
-		return (await stat(path)).isDirectory() ? "directory" : "other";
-	} catch (error) {
-		if (error.code === "ENOENT") return "missing";
-		throw error;
-	}
-}
-/** Clones, updates, and indexes the configured application repositories. */
+/** Mirrors, updates, and indexes the configured application repositories. */
 var RepoRegistry = class {
 	deps;
 	entries = [];
-	/** Orders clone and fetch work per clone directory. */
-	syncLocks = /* @__PURE__ */ new Map();
-	/** Orders `git worktree` work per clone directory. */
-	worktreeLocks = /* @__PURE__ */ new Map();
-	/** Snapshot roots already cleared of leftovers from an earlier run. */
-	clearedRoots = /* @__PURE__ */ new Set();
 	now;
-	/** @param deps - git runner, timeout, and change notification. */
+	/** @param deps - service lookup and change notification. */
 	constructor(deps) {
 		this.deps = deps;
 		this.now = deps.now ?? Date.now;
 	}
 	/**
 	* Replace the configured repositories. An address keeps its status when its
-	* branch and directory are unchanged; clones of removed addresses stay on
-	* disk, and their snapshots are deleted once no dispatch holds them.
-	* @param reposDir - parent directory of the clones.
+	* branch is unchanged.
 	* @param repos - configured repositories.
-	* @returns entries that are new or changed and therefore need a sync.
+	* @returns addresses that are new or changed and therefore need a sync.
 	*/
-	configure(reposDir, repos) {
-		const dirs = assignDirs(reposDir, repos.map((repo) => repo.url));
+	configure(repos) {
 		const previous = new Map(this.entries.map((entry) => [entry.spec.url, entry]));
 		const changed = [];
 		this.entries = repos.map((spec) => {
-			const dir = dirs.get(spec.url);
 			const kept = previous.get(spec.url);
-			if (kept !== void 0 && kept.dir === dir && kept.spec.branch === spec.branch) {
+			if (kept !== void 0 && kept.spec.branch === spec.branch) {
 				previous.delete(spec.url);
 				return kept;
 			}
 			changed.push(spec.url);
 			return {
 				spec: { ...spec },
-				dir,
-				snapshots: /* @__PURE__ */ new Map(),
 				activeRuns: 0,
 				retired: false
 			};
 		});
-		for (const entry of previous.values()) {
-			entry.retired = true;
-			this.pruneSnapshots(entry);
-		}
+		for (const entry of previous.values()) entry.retired = true;
 		this.deps.onChange();
 		return changed;
 	}
@@ -2331,16 +2002,14 @@ var RepoRegistry = class {
 		await Promise.all(this.entries.filter((entry) => wanted.has(entry.spec.url)).map((entry) => this.syncEntry(entry)));
 	}
 	/**
-	* Sync the configured repositories with the given addresses again after any
-	* sync already running for them, so the new sync sees settings changed since
-	* that sync started (an access token, for example). An idle repository
-	* starts syncing before this returns, so its status reads `syncing` at once.
-	* @param urls - addresses to sync.
+	* Sync every configured repository again after any sync already running for
+	* it, so the new sync sees changes made since that sync started (a host
+	* token, for example). An idle repository starts syncing before this
+	* returns, so its status reads `syncing` at once.
 	* @returns when those syncs settled.
 	*/
-	async resyncUrls(urls) {
-		const wanted = new Set(urls);
-		await Promise.all(this.entries.filter((entry) => wanted.has(entry.spec.url)).map((entry) => entry.syncing === void 0 ? this.syncEntry(entry) : entry.syncing.then(() => void 0, () => void 0).then(() => this.syncEntry(entry))));
+	async resyncAll() {
+		await Promise.all(this.entries.map((entry) => entry.syncing === void 0 ? this.syncEntry(entry) : entry.syncing.then(() => void 0, () => void 0).then(() => this.syncEntry(entry))));
 	}
 	/**
 	* Sync the repositories that never synced or whose last sync is at least
@@ -2371,7 +2040,7 @@ var RepoRegistry = class {
 			return {
 				url: entry.spec.url,
 				...entry.spec.branch === void 0 ? {} : { branch: entry.spec.branch },
-				dir: entry.dir,
+				...entry.dir === void 0 ? {} : { dir: entry.dir },
 				phase,
 				...entry.commit === void 0 ? {} : { commit: entry.commit },
 				...entry.commitTime === void 0 ? {} : { commitTime: entry.commitTime },
@@ -2406,76 +2075,64 @@ var RepoRegistry = class {
 	}
 	/**
 	* Hold a snapshot of each requested application's latest synced commit for
-	* one dispatch, creating the snapshots that do not exist yet. Every id must
-	* resolve to a usable application, or nothing is held.
+	* one dispatch. Every id must resolve to a usable application, or nothing is
+	* held.
 	* @param ids - requested application ids (duplicates allowed).
 	* @returns the lease.
-	* @throws when an id is unknown, its repository is not usable, or a snapshot cannot be created.
+	* @throws when an id is unknown, its repository is not usable, dsh-repo is unavailable, or a snapshot cannot be created.
 	*/
 	async acquire(ids) {
 		const unique = [...new Set(ids)];
 		const ready = new Map(this.readyEntries().map((item) => [item.ready.app.id, item]));
 		const missing = unique.filter((id) => !ready.has(id));
 		if (missing.length > 0) throw new Error(this.unknownMessage(missing));
+		const service = requireRepos(this.deps.repos());
 		const held = unique.map((id) => {
 			const { entry, ready: app } = ready.get(id);
-			const snapshot = this.snapshotFor(entry, app.commit);
-			snapshot.users += 1;
 			entry.activeRuns += 1;
 			return {
 				id,
 				entry,
 				app,
-				snapshot
+				snapshot: service.acquireSnapshot(app.url, app.commit)
 			};
 		});
 		this.deps.onChange();
+		const outcomes = await Promise.allSettled(held.map((item) => item.snapshot));
+		const leases = outcomes.flatMap((outcome) => outcome.status === "fulfilled" ? [outcome.value] : []);
 		let released = false;
 		const release = () => {
 			if (released) return;
 			released = true;
-			for (const { entry, snapshot } of held) {
-				snapshot.users -= 1;
-				entry.activeRuns -= 1;
-			}
-			for (const entry of new Set(held.map((item) => item.entry))) this.pruneSnapshots(entry);
+			for (const lease of leases) lease.release();
+			for (const { entry } of held) entry.activeRuns -= 1;
 			this.deps.onChange();
 		};
-		const created = await Promise.allSettled(held.map((item) => item.snapshot.created));
-		for (const [index, outcome] of created.entries()) {
+		for (const [index, outcome] of outcomes.entries()) {
 			if (outcome.status === "fulfilled") continue;
 			release();
-			throw new Error(`应用「${held[index]?.id}」的代码快照创建失败：${messageOf(outcome.reason)}`);
+			throw new Error(`应用「${held[index]?.id}」的代码快照创建失败：${messageOf$1(outcome.reason)}`);
 		}
 		return {
-			apps: new Map(held.map(({ id, app, snapshot }) => [id, {
+			apps: new Map(held.map(({ id, app }, index) => [id, {
 				...app,
-				dir: snapshot.dir
+				dir: leases[index].dir
 			}])),
 			release
 		};
 	}
 	/**
-	* Run a task on the clone of a configured address after every sync queued
-	* before it, so the task never overlaps a fetch of the same clone.
+	* The branch the last successful sync of a configured address resolved: the
+	* configured branch, or the remote's default branch when none is configured.
 	* @param url - configured repository address.
-	* @param task - work on the clone.
-	* @returns the task's result.
-	* @throws when the address is not configured, its token cannot be read, or the task fails.
+	* @returns the branch.
+	* @throws when the address is not configured or has not synced yet.
 	*/
-	async withClone(url, task) {
+	branchOf(url) {
 		const entry = this.entries.find((item) => item.spec.url === url);
 		if (entry === void 0) throw new Error(`仓库 ${url} 已不在配置中`);
-		return await serialize(this.syncLocks, entry.dir, async () => {
-			if (entry.retired) throw new Error(`仓库 ${url} 已不在配置中`);
-			const env = await this.deps.auth?.(url) ?? {};
-			const branch = entry.spec.branch ?? (await this.remoteHead(entry.dir, env)).replace(/^refs\/remotes\/origin\//, "");
-			return await task({
-				dir: entry.dir,
-				branch,
-				env
-			});
-		});
+		if (entry.branch === void 0) throw new Error(`仓库 ${url} 还没有同步成功`);
+		return entry.branch;
 	}
 	unknownMessage(ids) {
 		const status = new Map(this.status().flatMap((repo) => repo.app === void 0 ? [] : [[repo.app.id, repo]]));
@@ -2496,7 +2153,7 @@ var RepoRegistry = class {
 	}
 	syncEntry(entry) {
 		if (entry.syncing !== void 0) return entry.syncing;
-		const run = serialize(this.syncLocks, entry.dir, () => this.runSync(entry)).finally(() => {
+		const run = this.runSync(entry).finally(() => {
 			entry.syncing = void 0;
 			this.deps.onChange();
 		});
@@ -2506,16 +2163,20 @@ var RepoRegistry = class {
 	}
 	async runSync(entry) {
 		if (entry.retired) return;
+		let service;
 		let head;
 		try {
-			head = await this.update(entry);
+			service = requireRepos(this.deps.repos());
+			head = await service.syncMirror(entry.spec.url, entry.spec.branch === void 0 ? {} : { branch: entry.spec.branch });
 		} catch (error) {
 			entry.syncedAt = this.now();
-			entry.error = entry.commit !== void 0 && entry.app !== void 0 ? `更新失败，继续使用已有提交 ${entry.commit.slice(0, 8)}：${messageOf(error)}` : messageOf(error);
+			entry.error = entry.commit !== void 0 && entry.app !== void 0 ? `更新失败，继续使用已有提交 ${entry.commit.slice(0, 8)}：${messageOf$1(error)}` : messageOf$1(error);
 			return;
 		}
-		const manifest = await checkAppManifest(this.commitReader(entry.dir, head.commit));
+		const manifest = await checkAppManifest((path) => service.readMirrorFile(entry.spec.url, head.commit, path));
 		entry.syncedAt = this.now();
+		entry.dir = head.dir;
+		entry.branch = head.branch;
 		entry.commit = head.commit;
 		entry.commitTime = head.commitTime;
 		if (manifest.ok) {
@@ -2525,202 +2186,6 @@ var RepoRegistry = class {
 			entry.app = void 0;
 			entry.error = manifest.error;
 		}
-		this.pruneSnapshots(entry);
-	}
-	/**
-	* Clone or fetch, and resolve the commit the configured branch points to.
-	* The first visit of a snapshot root in this process deletes the snapshots
-	* an earlier run left behind.
-	*/
-	async update(entry) {
-		const { git, gitTimeoutMs: timeoutMs } = this.deps;
-		const { dir, spec } = entry;
-		const root = snapshotRoot(dir);
-		const firstVisit = !this.clearedRoots.has(root);
-		if (firstVisit) {
-			this.clearedRoots.add(root);
-			await rm(root, {
-				recursive: true,
-				force: true
-			});
-		}
-		const env = await this.deps.auth?.(spec.url) ?? {};
-		const kind = await pathKind(dir);
-		if (kind === "missing") {
-			await mkdir(dirname(dir), { recursive: true });
-			const partial = `${dir}.partial-${randomBytes(4).toString("hex")}`;
-			try {
-				await git([
-					"clone",
-					"--quiet",
-					"--no-checkout",
-					...spec.branch === void 0 ? [] : ["--branch", spec.branch],
-					"--",
-					spec.url,
-					partial
-				], {
-					timeoutMs,
-					env
-				});
-				await rename(partial, dir);
-			} catch (error) {
-				await rm(partial, {
-					recursive: true,
-					force: true
-				});
-				throw error;
-			}
-		} else {
-			if (kind !== "directory") throw new Error(`${dir} 已存在且不是目录`);
-			if (await pathKind(join(dir, ".git")) === "missing") {
-				if (!((await readdir(dir)).length === 0)) throw new Error(`${dir} 已存在且不是 git 仓库，请移走后重新拉取`);
-				await rm(dir, { recursive: true });
-				return await this.update(entry);
-			}
-			const origin = (await git([
-				"remote",
-				"get-url",
-				"origin"
-			], {
-				cwd: dir,
-				timeoutMs
-			})).trim();
-			if (origin !== spec.url) throw new Error(`${dir} 已被另一个仓库占用（origin 为 ${origin}）`);
-			await git([
-				"fetch",
-				"--quiet",
-				"--prune",
-				"origin"
-			], {
-				cwd: dir,
-				timeoutMs,
-				env
-			});
-			if (firstVisit) await git(["worktree", "prune"], {
-				cwd: dir,
-				timeoutMs
-			});
-		}
-		const [commit = "", commitTime = ""] = (await git([
-			"log",
-			"-1",
-			"--format=%H%n%cI",
-			spec.branch === void 0 ? await this.remoteHead(dir, env) : `refs/remotes/origin/${spec.branch}`,
-			"--"
-		], {
-			cwd: dir,
-			timeoutMs
-		})).trim().split("\n");
-		return {
-			commit,
-			commitTime
-		};
-	}
-	/**
-	* Reader for the files of one commit, from the clone's object database.
-	* Only regular files are read; a symbolic link is reported as unreadable.
-	*/
-	commitReader(dir, commit) {
-		const { git, gitTimeoutMs: timeoutMs } = this.deps;
-		return async (path) => {
-			const listing = await git([
-				"ls-tree",
-				"-z",
-				commit,
-				"--",
-				path
-			], {
-				cwd: dir,
-				timeoutMs
-			});
-			if (listing === "") return void 0;
-			const [mode, type, object] = listing.slice(0, listing.indexOf("	")).split(" ");
-			if (type !== "blob" || mode === "120000" || object === void 0) throw new Error(`${path} 不是普通文件`);
-			return await git([
-				"cat-file",
-				"blob",
-				object
-			], {
-				cwd: dir,
-				timeoutMs
-			});
-		};
-	}
-	/** The snapshot of `commit`, created in the background on first use. */
-	snapshotFor(entry, commit) {
-		const existing = entry.snapshots.get(commit);
-		if (existing !== void 0) return existing;
-		const dir = join(snapshotRoot(entry.dir), `${commit.slice(0, 12)}-${randomBytes(3).toString("hex")}`);
-		const created = serialize(this.worktreeLocks, entry.dir, async () => {
-			await mkdir(dirname(dir), { recursive: true });
-			await this.deps.git([
-				"worktree",
-				"add",
-				"--detach",
-				dir,
-				commit
-			], {
-				cwd: entry.dir,
-				timeoutMs: this.deps.gitTimeoutMs
-			});
-		});
-		const snapshot = {
-			commit,
-			dir,
-			users: 0,
-			created
-		};
-		entry.snapshots.set(commit, snapshot);
-		created.catch(() => {
-			if (entry.snapshots.get(commit) === snapshot) entry.snapshots.delete(commit);
-			this.removeSnapshot(entry.dir, dir);
-		});
-		return snapshot;
-	}
-	/** Delete the snapshots no lease holds, except the latest commit's of a configured repository. */
-	pruneSnapshots(entry) {
-		for (const [commit, snapshot] of entry.snapshots) {
-			if (snapshot.users > 0 || commit === entry.commit && !entry.retired) continue;
-			entry.snapshots.delete(commit);
-			snapshot.created.then(() => this.removeSnapshot(entry.dir, snapshot.dir), () => void 0);
-		}
-	}
-	async removeSnapshot(clone, dir) {
-		try {
-			await serialize(this.worktreeLocks, clone, async () => {
-				await rm(dir, {
-					recursive: true,
-					force: true
-				});
-				await this.deps.git(["worktree", "prune"], {
-					cwd: clone,
-					timeoutMs: this.deps.gitTimeoutMs
-				});
-			});
-		} catch {}
-	}
-	async remoteHead(dir, env) {
-		const { git, gitTimeoutMs: timeoutMs } = this.deps;
-		const read = async () => (await git(["symbolic-ref", "refs/remotes/origin/HEAD"], {
-			cwd: dir,
-			timeoutMs
-		})).trim();
-		try {
-			return await read();
-		} catch (error) {
-			if (!(error instanceof GitError)) throw error;
-			await git([
-				"remote",
-				"set-head",
-				"origin",
-				"--auto"
-			], {
-				cwd: dir,
-				timeoutMs,
-				env
-			});
-			return await read();
-		}
 	}
 };
 //#endregion
@@ -2979,16 +2444,21 @@ function createEntrySkillProvider(source) {
 }
 //#endregion
 //#region src/service.ts
-/**
-* 观象运行时：持有生效设置（cordis.yml + 面板覆盖）、应用注册表、入口
-* SKILL、派发工具与 SKILL 提议工具的注册，并为设置面板提供状态与写入口。
-*
-* @module dsh-guanxiang/service
-*/
 /** A settings write the panel reports as a field error. */
 var SettingsError = class extends Error {};
+/** Longest accepted token; personal access tokens are far shorter. */
+const MAX_TOKEN_LENGTH = 4096;
+const tokenValue = z.string().trim().refine((value) => value.length > 0 && value.length <= MAX_TOKEN_LENGTH && !/[\u0000-\u001f\u007f]/.test(value), `令牌不能为空、超过 ${MAX_TOKEN_LENGTH} 个字符或包含换行等控制字符`);
 const tokenClearSchema = z.object({ tokenEnv: z.string() }).strict();
-const tokenSetSchema = tokenClearSchema.extend({ value: z.string().trim().refine(isAcceptedToken, `令牌不能为空、超过 ${MAX_TOKEN_LENGTH} 个字符或包含换行等控制字符`) }).strict();
+const tokenSetSchema = tokenClearSchema.extend({ value: tokenValue }).strict();
+const hostUrlSchema = z.object({ url: z.string().trim().min(1, "主机地址不能为空") }).strict();
+const hostTokenSchema = hostUrlSchema.extend({ value: tokenValue }).strict();
+const hostAddSchema = z.object({
+	kind: z.enum(["github", "gitlab"]).optional(),
+	url: z.string().trim().min(1, "主机地址不能为空"),
+	alias: z.string().trim().max(64, "别名不能超过 64 个字符").optional().transform((value) => value === "" ? void 0 : value),
+	token: tokenValue.optional()
+}).strict();
 /** The plugin's long-lived state. */
 var GuanxiangService = class {
 	ctx;
@@ -3004,6 +2474,7 @@ var GuanxiangService = class {
 	active = true;
 	refreshWaitMs;
 	analyzeTokenRef;
+	legacyCredentials;
 	booted = Promise.withResolvers();
 	/**
 	* @param ctx - plugin context.
@@ -3017,12 +2488,10 @@ var GuanxiangService = class {
 		this.defaults = defaultsOf(config);
 		this.refreshWaitMs = config.refreshWaitMs;
 		this.analyzeTokenRef = config.analyzeTokenRef;
+		this.legacyCredentials = config.gitCredentials;
 		this.current = this.defaults;
-		const git = options.git ?? runGit;
 		this.registry = new RepoRegistry({
-			git,
-			gitTimeoutMs: config.gitTimeoutMs,
-			auth: (url) => this.gitAuth(url),
+			repos: () => ctx.get?.(DSH_REPOS_SERVICE),
 			onChange: () => {
 				this.onRegistryChange();
 			}
@@ -3030,10 +2499,9 @@ var GuanxiangService = class {
 		this.updater = new SkillUpdater({
 			registry: this.registry,
 			settings: () => this.current,
-			git,
-			gitTimeoutMs: config.gitTimeoutMs,
 			...config.skillUpdateAuthor === void 0 ? {} : { author: config.skillUpdateAuthor },
-			approval: () => ctx.get?.("approval")
+			approval: () => ctx.get?.("approval"),
+			repos: () => ctx.get?.(DSH_REPOS_SERVICE)
 		});
 		this.dispatcher = new Dispatcher({
 			registry: this.registry,
@@ -3050,7 +2518,10 @@ var GuanxiangService = class {
 			maxAppsPerRequest: () => this.current.maxAppsPerRequest,
 			skillUpdates: () => this.current.skillUpdates.enabled,
 			autoInvoke: config.autoInvoke,
-			inRepositories: (cwd) => isInside(cwd, expandHome(this.current.reposDir))
+			inRepositories: (cwd) => {
+				const lookup = lookupRepos(ctx.get?.(DSH_REPOS_SERVICE));
+				return lookup.availability === "ready" && isInside(cwd, lookup.service.mirrorSettings().dir);
+			}
 		});
 	}
 	/** Register the entry skill provider; called once from `apply()`. */
@@ -3095,7 +2566,8 @@ var GuanxiangService = class {
 		}
 	}
 	/**
-	* Load the panel overlay, configure the registry, and sync every repository.
+	* Load the panel overlay, configure the registry, move legacy access tokens
+	* to dsh-repo hosts, and sync every repository.
 	* @returns when the first sync round settled.
 	*/
 	async boot() {
@@ -3113,9 +2585,53 @@ var GuanxiangService = class {
 			this.ctx.logger?.warn?.("guanxiang: 忽略面板设置：%s", read.error);
 		}
 		this.current = applyOverlay(this.defaults, this.overlay);
-		this.registry.configure(this.current.reposDir, this.current.repos);
+		this.registry.configure(this.current.repos);
+		await this.migrateCredentials();
 		await this.registry.syncAll();
 	}
+	/**
+	* React to dsh-repo becoming available (or reloading): move legacy tokens
+	* and sync every repository again.
+	* @returns when the syncs settled.
+	*/
+	async reposAvailable() {
+		await this.booted.promise;
+		if (!this.active) return;
+		await this.migrateCredentials();
+		await this.registry.resyncAll();
+	}
+	/**
+	* Add each access token of earlier versions whose address dsh-repo does not
+	* know yet as a dsh-repo host, carrying the stored token value. The panel's
+	* list replaces the cordis.yml list, as it did before. An entry whose token
+	* cannot be resolved yet is left for a later start instead of creating a
+	* host without a token. Failures are logged; the legacy entry stays and the
+	* next start tries again.
+	*/
+	async migrateCredentials() {
+		const legacy = this.overlay.gitCredentials ?? this.legacyCredentials;
+		if (legacy.length === 0) return;
+		const lookup = lookupRepos(this.ctx.get?.(DSH_REPOS_SERVICE));
+		if (lookup.availability !== "ready") return;
+		const store = this.credentialStore();
+		if (store === void 0) return;
+		for (const credential of legacy) try {
+			const token = (await store.resolve(credential.tokenEnv))?.value;
+			if (token === void 0 || token === "") {
+				this.ctx.logger?.warn?.("guanxiang: 访问令牌 %s 尚未设置，暂不迁移到 dsh-repo", credential.url);
+				continue;
+			}
+			await lookup.service.addHost({
+				url: credential.url,
+				...credential.alias === void 0 || credential.alias === "" ? {} : { alias: credential.alias },
+				token
+			});
+			this.ctx.logger?.info?.("guanxiang: 已把访问令牌 %s 迁移为 dsh-repo 主机", credential.url);
+		} catch (error) {
+			if (repoErrorCode(error) === "conflict") continue;
+			this.ctx.logger?.warn?.("guanxiang: 迁移访问令牌 %s 到 dsh-repo 失败：%s", credential.url, messageOf$1(error));
+		}
+	}
 	/** Stop registering tools; in-flight syncs finish without side effects on the host. */
 	shutdown() {
 		this.active = false;
@@ -3133,7 +2649,8 @@ var GuanxiangService = class {
 			overridden: overriddenKeys(this.overlay),
 			...this.overlayError === void 0 ? {} : { overlayError: this.overlayError },
 			repos: this.registry.status(),
-			credentials: await this.credentialsState(),
+			hosts: await this.hostsState(),
+			credentialsAvailable: this.credentialStore() !== void 0,
 			analyze: await this.analyzeState()
 		};
 	}
@@ -3164,42 +2681,109 @@ var GuanxiangService = class {
 	credentialStore() {
 		return this.ctx.get?.("credentials");
 	}
-	async credentialsState() {
-		const store = this.credentialStore();
-		if (store === void 0) return {
-			available: false,
-			tokens: []
-		};
-		const names = [...new Set(this.current.gitCredentials.map((credential) => credential.tokenEnv))];
-		return {
-			available: true,
-			tokens: await Promise.all(names.map((tokenEnv) => describeToken(store, tokenEnv)))
+	async hostsState() {
+		const lookup = lookupRepos(this.ctx.get?.(DSH_REPOS_SERVICE));
+		if (lookup.availability !== "ready") return {
+			availability: lookup.availability,
+			hosts: []
 		};
+		const mirrorDir = lookup.service.mirrorSettings().dir;
+		try {
+			return {
+				availability: "ready",
+				mirrorDir,
+				hosts: (await lookup.service.listHosts()).map((host) => ({
+					kind: host.kind,
+					url: host.url,
+					...host.alias === void 0 ? {} : { alias: host.alias },
+					origin: host.origin,
+					token: {
+						tokenEnv: host.tokenRef,
+						...host.token
+					}
+				}))
+			};
+		} catch (error) {
+			return {
+				availability: "ready",
+				mirrorDir,
+				hosts: [],
+				error: messageOf$1(error)
+			};
+		}
 	}
 	/**
-	* Environment carrying the access token for one repository address; empty
-	* when no access-token configuration matches it.
-	* @param url - repository address.
-	* @returns variables for its network git commands.
-	* @throws when a configuration matches but its token cannot be read.
+	* Add a dsh-repo host, optionally with its token, then sync every repository.
+	* @param raw - request body `{ kind?, url, alias?, token? }`.
+	* @returns the new panel state.
+	* @throws SettingsError when the body is invalid, dsh-repo is unavailable, or it refuses the host.
 	*/
-	async gitAuth(url) {
-		const spec = credentialFor(url, this.current.gitCredentials);
-		if (spec === void 0) return {};
-		const store = this.credentialStore();
-		if (store === void 0) throw new Error(`地址匹配访问令牌 ${spec.url}，但当前 DSH 组合没有凭据服务，无法读取 ${spec.tokenEnv}`);
-		const token = await store.resolve(spec.tokenEnv);
-		if (token === void 0) throw new Error(`地址匹配访问令牌 ${spec.url}，但 ${spec.tokenEnv} 未设置：请在观象面板「访问令牌」中保存令牌，或设置同名环境变量`);
-		if (!isAcceptedToken(token.value)) throw new Error(`${spec.tokenEnv} 的值不能用作令牌：不能超过 ${MAX_TOKEN_LENGTH} 个字符或包含换行等控制字符`);
-		return credentialEnvironment(spec, token.value);
+	async addHost(raw) {
+		const parsed = hostAddSchema.safeParse(raw);
+		if (!parsed.success) throw new SettingsError(describeIssue(parsed.error));
+		const { kind, url, alias, token } = parsed.data;
+		await this.withRepos((repos) => repos.addHost({
+			url,
+			...kind === void 0 ? {} : { kind },
+			...alias === void 0 ? {} : { alias },
+			...token === void 0 ? {} : { token }
+		}));
+		return await this.state();
+	}
+	/**
+	* Remove a host added from a panel, and its stored token.
+	* @param raw - request body `{ url }`.
+	* @returns the new panel state.
+	* @throws SettingsError when the body is invalid, dsh-repo is unavailable, or the host is unknown or configured in cordis.yml.
+	*/
+	async removeHost(raw) {
+		const parsed = hostUrlSchema.safeParse(raw);
+		if (!parsed.success) throw new SettingsError(describeIssue(parsed.error));
+		await this.withRepos((repos) => repos.removeHost(parsed.data.url));
+		return await this.state();
+	}
+	/**
+	* Store a host's token through dsh-repo, then sync every repository.
+	* @param raw - request body `{ url, value }`.
+	* @returns the new panel state.
+	* @throws SettingsError when the body is invalid, dsh-repo is unavailable, or the host is unknown.
+	*/
+	async setHostToken(raw) {
+		const parsed = hostTokenSchema.safeParse(raw);
+		if (!parsed.success) throw new SettingsError(describeIssue(parsed.error));
+		await this.withRepos((repos) => repos.setHostToken(parsed.data.url, parsed.data.value));
+		return await this.state();
 	}
 	/**
-	* Store the token of one access-token configuration in DSH's credential
-	* store, then re-sync the repositories that use it; or store the analyze
-	* API's bearer token (`analyzeTokenRef`), which applies from the next request.
+	* Remove a host's stored token; an environment variable of the same name applies again.
+	* @param raw - request body `{ url }`.
+	* @returns the new panel state.
+	* @throws SettingsError on the same conditions as {@link setHostToken}.
+	*/
+	async clearHostToken(raw) {
+		const parsed = hostUrlSchema.safeParse(raw);
+		if (!parsed.success) throw new SettingsError(describeIssue(parsed.error));
+		await this.withRepos((repos) => repos.setHostToken(parsed.data.url, void 0));
+		return await this.state();
+	}
+	/** Run one host change and start a resync, reporting dsh-repo failures as field errors. */
+	async withRepos(change) {
+		const lookup = lookupRepos(this.ctx.get?.(DSH_REPOS_SERVICE));
+		if (lookup.availability !== "ready") throw new SettingsError(unavailableMessage(lookup.availability));
+		try {
+			await change(lookup.service);
+		} catch (error) {
+			if (repoErrorCode(error) !== void 0) throw new SettingsError(messageOf$1(error));
+			throw error;
+		}
+		this.registry.resyncAll();
+	}
+	/**
+	* Store the analyze API's bearer token (`analyzeTokenRef`) in DSH's
+	* credential store; it applies from the next request.
 	* @param raw - request body `{ tokenEnv, value }`.
 	* @returns the new panel state.
-	* @throws SettingsError when the body is invalid, the name is neither referenced by the saved settings nor `analyzeTokenRef`, or no credential store is loaded.
+	* @throws SettingsError when the body is invalid, the name is not `analyzeTokenRef`, or no credential store is loaded.
 	*/
 	async setToken(raw) {
 		const parsed = tokenSetSchema.safeParse(raw);
@@ -3207,8 +2791,8 @@ var GuanxiangService = class {
 		return await this.writeToken(parsed.data.tokenEnv, parsed.data.value);
 	}
 	/**
-	* Remove the stored token of one access-token configuration; an environment
-	* variable of the same name applies again afterwards.
+	* Remove the stored analyze token; an environment variable of the same name
+	* applies again afterwards.
 	* @param raw - request body `{ tokenEnv }`.
 	* @returns the new panel state.
 	* @throws SettingsError on the same conditions as {@link setToken}.
@@ -3219,17 +2803,16 @@ var GuanxiangService = class {
 		return await this.writeToken(parsed.data.tokenEnv, void 0);
 	}
 	async writeToken(tokenEnv, value) {
-		if (tokenEnv !== this.analyzeTokenRef && !this.current.gitCredentials.some((credential) => credential.tokenEnv === tokenEnv)) throw new SettingsError(`${tokenEnv} 不是已保存的访问令牌配置引用的名称`);
+		if (tokenEnv !== this.analyzeTokenRef) throw new SettingsError(`${tokenEnv} 不是分析接口令牌的名称`);
 		const store = this.credentialStore();
 		if (store === void 0) throw new SettingsError("当前 DSH 组合没有凭据服务（@deepseek-ai/dsh-credentials-local），无法保存令牌");
 		if (value === void 0) await store.unset(tokenEnv);
 		else await store.set(tokenEnv, value);
-		this.registry.resyncUrls(this.current.repos.map((repo) => repo.url).filter((url) => credentialFor(url, this.current.gitCredentials)?.tokenEnv === tokenEnv));
 		return await this.state();
 	}
 	/**
 	* Validate and persist a complete settings payload from the panel, then
-	* sync repositories whose address, branch, or directory changed.
+	* sync repositories whose address or branch changed.
 	* @param raw - request body.
 	* @returns the new panel state.
 	* @throws SettingsError when the payload is invalid.
@@ -3260,20 +2843,12 @@ var GuanxiangService = class {
 		if (url !== void 0 && !this.registry.has(url)) throw new SettingsError(`未配置的仓库：${url}`);
 		url === void 0 ? this.registry.syncAll() : this.registry.syncUrls([url]);
 	}
-	/**
-	* Make an overlay effective and sync the repositories whose address, branch,
-	* directory, or matching access-token configuration changed.
-	*/
+	/** Make an overlay effective and sync the repositories whose address or branch changed. */
 	apply(overlay) {
-		const previous = this.current.gitCredentials;
 		this.overlay = overlay;
 		this.overlayError = void 0;
 		this.current = applyOverlay(this.defaults, overlay);
-		const changed = this.registry.configure(this.current.reposDir, this.current.repos);
-		const next = this.current.gitCredentials;
-		const reauthorized = this.current.repos.map((repo) => repo.url).filter((url) => JSON.stringify(credentialFor(url, previous)) !== JSON.stringify(credentialFor(url, next)));
-		this.registry.syncUrls(changed);
-		this.registry.resyncUrls(reauthorized.filter((url) => !changed.includes(url)));
+		this.registry.syncUrls(this.registry.configure(this.current.repos));
 	}
 	onRegistryChange() {
 		if (!this.active) return;
@@ -3452,6 +3027,28 @@ function registerSettingsRoutes(server, gate, service) {
 					state: req.method?.toUpperCase() === "DELETE" ? await service.clearToken(body) : await service.setToken(body)
 				});
 			})
+		}),
+		server.register({
+			kind: "exact",
+			path: HOSTS_ROUTE,
+			handler: guarded(gate, ["POST", "DELETE"], async (req, res) => {
+				const body = await readJsonBody(req, false);
+				sendJson(res, 200, {
+					ok: true,
+					state: req.method?.toUpperCase() === "DELETE" ? await service.removeHost(body) : await service.addHost(body)
+				});
+			})
+		}),
+		server.register({
+			kind: "exact",
+			path: HOST_TOKEN_ROUTE,
+			handler: guarded(gate, ["PUT", "DELETE"], async (req, res) => {
+				const body = await readJsonBody(req, false);
+				sendJson(res, 200, {
+					ok: true,
+					state: req.method?.toUpperCase() === "DELETE" ? await service.clearHostToken(body) : await service.setHostToken(body)
+				});
+			})
 		})
 	];
 	return () => {
@@ -3485,8 +3082,8 @@ function mountSettingsRoutes(ctx, service) {
 * 任务匹配已注册应用时由顶层 Agent 自行加载）和
 * `guanxiang_dispatch` 工具（按应用派发子 Agent，工作目录为该应用的代码
 * 仓库，首条消息用 `/<skill>` 加载仓库里的日志分析 SKILL），以及开启 SKILL
-* 改进时的 `guanxiang_propose_skill` 工具（经用户授权后把子 Agent 的 SKILL
-* 修改提议推送到新分支并创建合并请求）。应用仓库在设置
+* 改进时的 `guanxiang_propose_skill` 工具（经用户授权后经 dsh-repo 把子 Agent
+* 的 SKILL 修改提议提交到新分支并创建合并请求）。应用仓库在设置
 * 面板中只填 git 地址，由插件拉取；应用描述来自各仓库的
 * `.dsh/guanxiang.yaml`。另提供日志平台分析接口 `POST /open-api/logalyze`，
 * 经 dsh-channels 的 `feishuTopics` 服务在飞书群话题中开始分析。
@@ -3503,7 +3100,7 @@ const inject = [
 ];
 /**
 * Install the entry skill, the dispatch and SKILL proposal tools, the settings
-* routes, and the analyze route, then clone or update the configured
+* routes, and the analyze route, then mirror or update the configured
 * repositories in the background.
 * @param ctx - plugin context.
 * @param config - loader-validated configuration.
@@ -3523,8 +3120,13 @@ function apply(ctx, config, options = {}) {
 			service.shutdown();
 		};
 	}, "guanxiang: repositories");
+	ctx.inject?.([DSH_REPOS_SERVICE], () => {
+		service.reposAvailable().catch((error) => {
+			ctx.logger?.error?.("guanxiang: 同步仓库失败：%s", error instanceof Error ? error.message : String(error));
+		});
+	});
 }
 //#endregion
-export { ANALYZE_ROUTE, pluginConfigSchema as Config, pluginConfigSchema, DISPATCH_TOOL_NAME, Dispatcher, ENTRY_SKILL_NAME, GuanxiangService, MANIFEST_PATH, PROPOSE_TOOL_NAME, RepoRegistry, SETTINGS_ROUTE, STATE_ROUTE, SYNC_ROUTE, SkillUpdater, analyzeRequestHash, apply, inject, name, parseAnalyzeRequest, readAppManifest, renderChildPrompt, renderEntrySkill, resolveConfig };
+export { ANALYZE_ROUTE, pluginConfigSchema as Config, pluginConfigSchema, DISPATCH_TOOL_NAME, Dispatcher, ENTRY_SKILL_NAME, GuanxiangService, HOSTS_ROUTE, HOST_TOKEN_ROUTE, MANIFEST_PATH, PROPOSE_TOOL_NAME, RepoRegistry, SETTINGS_ROUTE, STATE_ROUTE, SYNC_ROUTE, SkillUpdater, analyzeRequestHash, apply, inject, name, parseAnalyzeRequest, readAppManifest, renderChildPrompt, renderEntrySkill, resolveConfig };
 
 //# sourceMappingURL=index.js.map