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

package/lib/index.js

@@ -610,8 +610,8 @@ 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. */
@@ -774,9 +774,9 @@ async function abortable(promise, signal) {
 //#endregion
 //#region src/skill-update/git.ts
 /**
-* 在拉取仓库中用 git 底层命令生成 SKILL 修改的提交并推送：用临时索引文件
-* 在分析时的提交上替换文件、写出树对象，不改动任何检出、快照或本地分支；
-* 推送时用 GitLab push options 顺带创建合并请求。
+* 在拉取仓库中用 git 底层命令检查 SKILL 修改：用临时索引文件在分析时的提交上
+* 替换文件、写出树对象，算出逐文件行数和 diff，不改动任何检出、快照或本地
+* 分支。树对象的前缀用作新分支名，提交本身经 dsh-repo 完成。
 *
 * @module dsh-guanxiang/skill-update/git
 */
@@ -895,96 +895,6 @@ async function prepareChange(commands, dir, base, skillDir, files) {
 		});
 	}
 }
-/**
-* 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 (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
 /**
@@ -1206,6 +1116,37 @@ async function readProposal(workDir, limits) {
 	};
 }
 //#endregion
+//#region src/skill-update/repos.ts
+/** Name dsh-repo provides the service under. */
+const DSH_REPOS_SERVICE = "dshRepos";
+/**
+* Classify the value `ctx.get('dshRepos')` returned. The provider is another
+* package that may be older or newer than this one, so its version is checked
+* at run time; `getBranch` marks a provider that also honors `baseSha` and
+* `newBranch` on commits.
+* @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 || typeof service.getBranch !== "function" || typeof service.commitFiles !== "function" || typeof service.createChange !== "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;
+}
+//#endregion
 //#region src/skill-update/tool.ts
 /**
 * `guanxiang_propose_skill`：把某个派发任务的 SKILL 修改提议提交为合并请求。
@@ -1213,11 +1154,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
@@ -1291,7 +1234,8 @@ const OUTPUT_SCHEMA$1 = {
 			}
 		},
 		diffPath: { type: "string" },
-		mergeRequestUrl: { type: "string" }
+		mergeRequestUrl: { type: "string" },
+		mergeRequestError: { type: "string" }
 	}
 };
 /**
@@ -1312,12 +1256,12 @@ 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}`
 	}];
 }
@@ -1406,6 +1350,7 @@ var SkillUpdater = class {
 		await replaceFile(diffPath, change.diff);
 		return {
 			reason: proposal.reason,
+			files: proposal.files,
 			change,
 			target,
 			diffPath
@@ -1418,7 +1363,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 +1378,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,7 +1392,10 @@ 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），观象不会在未经授权时推送");
+		if (approval === void 0) throw new Error("当前 DSH 组合没有审批服务（@deepseek-ai/dsh-user-approval），观象不会在未经授权时提交");
+		const lookup = lookupRepos(this.deps.repos());
+		if (lookup.availability !== "ready") throw new Error(lookup.availability === "missing" ? `提交 SKILL 修改需要 dsh-repo 插件提供的 ${DSH_REPOS_SERVICE} 服务；请安装 dsh-repo，并在它的 hosts 中配置该应用仓库所在的主机和令牌` : `dsh-repo 的 ${DSH_REPOS_SERVICE} 服务与观象不兼容（观象需要服务版本 1 且提供 getBranch，即 dsh-repo 0.1.0-beta.2 及以上）；请升级 dsh-repo`);
+		const repos = lookup.service;
 		const prepared = await this.prepare(task);
 		if (prepared === void 0) throw new Error(`${task.workDir} 中没有 SKILL 修改提议（${PROPOSAL_DIR}/${REASON_FILE} 与 ${PROPOSAL_DIR}/${FILES_DIR}/）`);
 		const { change, target, diffPath, reason } = prepared;
@@ -1460,17 +1408,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 +1433,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$2(error)
+			};
+		}
 	}
 };
 //#endregion
@@ -2472,8 +2443,7 @@ var RepoRegistry = class {
 			const branch = entry.spec.branch ?? (await this.remoteHead(entry.dir, env)).replace(/^refs\/remotes\/origin\//, "");
 			return await task({
 				dir: entry.dir,
-				branch,
-				env
+				branch
 			});
 		});
 	}
@@ -3033,7 +3003,8 @@ var GuanxiangService = class {
 			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,
@@ -3485,8 +3456,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` 服务在飞书群话题中开始分析。