@zhin.js/adapter-github 1.1.15 → 1.1.16

package/agents/github/skills/github-subscriptions/handlers.ts

@@ -1,3 +1,4 @@
+import { createMessages, resolveLocale, type Locale } from 'zhin.js/i18n';
 import type { Message } from 'zhin.js';
 import { getCurrentCommMessage } from '@zhin.js/agent/security';
 import type { GithubClient } from '../../../../src/client.js';
@@ -15,41 +16,43 @@ function subscriptionsModel(client: GithubClient) {
   } | undefined;
 }
 
-export async function executeGithubStar(args: { action: 'star' | 'unstar' | 'check'; repo: string }, client: GithubClient, commMessage?: Message) {
+export async function executeGithubStar(args: { action: 'star' | 'unstar' | 'check'; repo: string }, client: GithubClient, commMessage?: Message, preference?: Locale) {
   const msg = commMessage ?? getCurrentCommMessage();
+  const locale = resolveLocale(preference ?? msg?.locale);
   const gh = await client.getUserOrDefaultApi(msg?.clientAdapter, msg?.sender?.id);
   switch (args.action) {
     case 'star': {
       const r = await gh.starRepo(args.repo);
-      return r.ok ? `⭐ 已 Star ${args.repo}` : `❌ ${r.data?.message || JSON.stringify(r.data)}`;
+      return r.ok ? t(locale, 'starred', { repo: args.repo }) : `❌ ${r.data?.message || JSON.stringify(r.data)}`;
     }
     case 'unstar': {
       const r = await gh.unstarRepo(args.repo);
-      return r.ok ? `💔 已取消 Star ${args.repo}` : `❌ ${r.data?.message || JSON.stringify(r.data)}`;
+      return r.ok ? t(locale, 'unstarred', { repo: args.repo }) : `❌ ${r.data?.message || JSON.stringify(r.data)}`;
     }
     case 'check': {
       const starred = await gh.isStarred(args.repo);
-      return starred ? `⭐ 已 Star ${args.repo}` : `☆ 尚未 Star ${args.repo}`;
+      return starred ? t(locale, 'starred', { repo: args.repo }) : t(locale, 'notStarred', { repo: args.repo });
     }
     default:
-      return `❌ 未知操作: ${args.action}`;
+      return t(locale, 'unknownAction', { action: args.action });
   }
 }
 
-export async function executeGithubSubscribe(args: { repo: string; events?: string }, client: GithubClient, commMessage?: Message) {
+export async function executeGithubSubscribe(args: { repo: string; events?: string }, client: GithubClient, commMessage?: Message, preference?: Locale) {
   const msg = commMessage ?? getCurrentCommMessage();
+  const locale = resolveLocale(preference ?? msg?.locale);
   if (!msg?.clientAdapter || !msg?.sender?.id || !msg?.conversation.id || !msg?.endpointId) {
-    return '❌ 无法获取当前聊天通道信息';
+    return t(locale, 'missingChannel');
   }
 
   const model = subscriptionsModel(client);
-  if (!model) return '❌ 数据库未就绪';
+  if (!model) return t(locale, 'databaseNotReady');
 
   const validEvents: EventType[] = ['push', 'issue', 'star', 'fork', 'unstar', 'pull_request'];
   const events: EventType[] = args.events
     ? args.events.split(',').map((s) => s.trim()).filter((e): e is EventType => validEvents.includes(e as EventType))
     : validEvents;
-  if (!events.length) return `❌ 无效的事件类型，可选: ${validEvents.join(', ')}`;
+  if (!events.length) return t(locale, 'invalidEvents', { events: validEvents.join(', ') });
 
   const [existing] = await model.select().where({
     repo: args.repo,
@@ -59,7 +62,7 @@ export async function executeGithubSubscribe(args: { repo: string; events?: stri
   });
   if (existing) {
     await model.update({ events, target_type: msg.conversation.kind || 'private' }).where({ id: existing.id });
-    return `✅ 已更新订阅 ${args.repo}\n📡 事件: ${events.join(', ')}`;
+    return t(locale, 'updated', { repo: args.repo, events: events.join(', ') });
   }
 
   await model.insert({
@@ -71,17 +74,18 @@ export async function executeGithubSubscribe(args: { repo: string; events?: stri
     adapter: msg.clientAdapter,
     endpoint: msg.endpointId,
   });
-  return `✅ 已订阅 ${args.repo}\n📡 事件: ${events.join(', ')}\n📌 通知将推送到当前通道`;
+  return t(locale, 'subscribed', { repo: args.repo, events: events.join(', ') });
 }
 
-export async function executeGithubUnsubscribe(args: { repo: string }, client: GithubClient, commMessage?: Message) {
+export async function executeGithubUnsubscribe(args: { repo: string }, client: GithubClient, commMessage?: Message, preference?: Locale) {
   const msg = commMessage ?? getCurrentCommMessage();
+  const locale = resolveLocale(preference ?? msg?.locale);
   if (!msg?.clientAdapter || !msg?.conversation.id || !msg?.endpointId) {
-    return '❌ 无法获取当前聊天通道信息';
+    return t(locale, 'missingChannel');
   }
 
   const model = subscriptionsModel(client);
-  if (!model) return '❌ 数据库未就绪';
+  if (!model) return t(locale, 'databaseNotReady');
 
   const [existing] = await model.select().where({
     repo: args.repo,
@@ -89,31 +93,91 @@ export async function executeGithubUnsubscribe(args: { repo: string }, client: G
     adapter: msg.clientAdapter,
     endpoint: msg.endpointId,
   });
-  if (!existing) return `📭 当前通道未订阅 ${args.repo}`;
+  if (!existing) return t(locale, 'notSubscribed', { repo: args.repo });
 
   await model.delete().where({ id: existing.id });
-  return `✅ 已取消订阅 ${args.repo}`;
+  return t(locale, 'unsubscribed', { repo: args.repo });
 }
 
-export async function executeGithubSubscriptions(_args: Record<string, never>, client: GithubClient, commMessage?: Message) {
+export async function executeGithubSubscriptions(_args: Record<string, never>, client: GithubClient, commMessage?: Message, preference?: Locale) {
   const msg = commMessage ?? getCurrentCommMessage();
+  const locale = resolveLocale(preference ?? msg?.locale);
   if (!msg?.clientAdapter || !msg?.conversation.id || !msg?.endpointId) {
-    return '❌ 无法获取当前聊天通道信息';
+    return t(locale, 'missingChannel');
   }
 
   const model = subscriptionsModel(client);
-  if (!model) return '❌ 数据库未就绪';
+  if (!model) return t(locale, 'databaseNotReady');
 
   const subs = await model.select().where({
     target_id: msg.conversation.id,
     adapter: msg.clientAdapter,
     endpoint: msg.endpointId,
   });
-  if (!subs?.length) return '📭 当前通道没有任何 GitHub 订阅';
+  if (!subs?.length) return t(locale, 'empty');
 
-  return `📋 当前通道订阅 (${subs.length}):\n\n` +
+  return t(locale, 'list', { count: subs.length }) +
     subs.map((s: any) => {
       const events = Array.isArray(s.events) ? s.events : [];
-      return `  📦 ${s.repo}\n     📡 ${events.join(', ') || '(无事件)'}`;
+      return `  📦 ${s.repo}\n     📡 ${events.join(', ') || t(locale, 'noEvents')}`;
     }).join('\n\n');
 }
+
+const t = createMessages({
+  "starred": {
+    "zh-CN": "⭐ 已 Star {repo}",
+    "en": "⭐ Starred: {repo}"
+  },
+  "unstarred": {
+    "zh-CN": "💔 已取消 Star {repo}",
+    "en": "💔 Unstarred: {repo}"
+  },
+  "notStarred": {
+    "zh-CN": "☆ 尚未 Star {repo}",
+    "en": "☆ Not starred: {repo}"
+  },
+  "unknownAction": {
+    "zh-CN": "❌ 未知操作: {action}",
+    "en": "❌ Unknown action: {action}"
+  },
+  "missingChannel": {
+    "zh-CN": "❌ 无法获取当前聊天通道信息",
+    "en": "❌ Current chat channel is unavailable"
+  },
+  "databaseNotReady": {
+    "zh-CN": "❌ 数据库未就绪",
+    "en": "❌ Database is not ready"
+  },
+  "invalidEvents": {
+    "zh-CN": "❌ 无效的事件类型，可选: {events}",
+    "en": "❌ Invalid event types. Available: {events}"
+  },
+  "updated": {
+    "zh-CN": "✅ 已更新订阅 {repo}\n📡 事件: {events}",
+    "en": "✅ Subscription updated: {repo}\n📡 Events: {events}"
+  },
+  "subscribed": {
+    "zh-CN": "✅ 已订阅 {repo}\n📡 事件: {events}\n📌 通知将推送到当前通道",
+    "en": "✅ Subscribed to {repo}\n📡 Events: {events}\n📌 Notifications will be sent to this channel"
+  },
+  "notSubscribed": {
+    "zh-CN": "📭 当前通道未订阅 {repo}",
+    "en": "📭 This channel is not subscribed to {repo}"
+  },
+  "unsubscribed": {
+    "zh-CN": "✅ 已取消订阅 {repo}",
+    "en": "✅ Unsubscribed from {repo}"
+  },
+  "empty": {
+    "zh-CN": "📭 当前通道没有任何 GitHub 订阅",
+    "en": "📭 This channel has no GitHub subscriptions"
+  },
+  "list": {
+    "zh-CN": "📋 当前通道订阅 ({count}):\n\n",
+    "en": "📋 Channel subscriptions ({count}):\n\n"
+  },
+  "noEvents": {
+    "zh-CN": "(无事件)",
+    "en": "(no events)"
+  }
+});

package/agents/github/skills/github-subscriptions/tools/star/index.js

@@ -11,6 +11,6 @@ export default defineAgentTool({
     }),
     tags: ['github'],
     async execute(input, context) {
-        return executeGithubStar(input, context.$client);
+        return executeGithubStar(input, context.$client, undefined, context.locale);
     },
 });

package/agents/github/skills/github-subscriptions/tools/star/index.ts

@@ -11,6 +11,6 @@ export default defineAgentTool<{ action: 'star' | 'unstar' | 'check'; repo: stri
   }),
   tags: ['github'],
   async execute(input, context) {
-    return executeGithubStar(input, context.$client);
+    return executeGithubStar(input, context.$client, undefined, context.locale);
   },
 });

package/agents/github/skills/github-subscriptions/tools/subscribe/index.js

@@ -11,6 +11,6 @@ export default defineAgentTool({
     adapter: 'github',
     tags: ['github'],
     async execute(input, context) {
-        return executeGithubSubscribe(input, context.$client);
+        return executeGithubSubscribe(input, context.$client, undefined, context.locale);
     },
 });

package/agents/github/skills/github-subscriptions/tools/subscribe/index.ts

@@ -11,6 +11,6 @@ export default defineAgentTool<{ repo: string; events?: string }>({
   adapter: 'github',
   tags: ['github'],
   async execute(input, context) {
-    return executeGithubSubscribe(input, context.$client);
+    return executeGithubSubscribe(input, context.$client, undefined, context.locale);
   },
 });

package/agents/github/skills/github-subscriptions/tools/subscriptions/index.js

@@ -8,6 +8,6 @@ export default defineAgentTool({
     adapter: 'github',
     tags: ['github'],
     async execute(input, context) {
-        return executeGithubSubscriptions({}, context.$client);
+        return executeGithubSubscriptions({}, context.$client, undefined, context.locale);
     },
 });

package/agents/github/skills/github-subscriptions/tools/subscriptions/index.ts

@@ -8,6 +8,6 @@ export default defineAgentTool<{}>({
   adapter: 'github',
   tags: ['github'],
   async execute(input, context) {
-    return executeGithubSubscriptions({}, context.$client);
+    return executeGithubSubscriptions({}, context.$client, undefined, context.locale);
   },
 });

package/agents/github/skills/github-subscriptions/tools/unsubscribe/index.js

@@ -10,6 +10,6 @@ export default defineAgentTool({
     adapter: 'github',
     tags: ['github'],
     async execute(input, context) {
-        return executeGithubUnsubscribe(input, context.$client);
+        return executeGithubUnsubscribe(input, context.$client, undefined, context.locale);
     },
 });

package/agents/github/skills/github-subscriptions/tools/unsubscribe/index.ts

@@ -10,6 +10,6 @@ export default defineAgentTool<{ repo: string }>({
   adapter: 'github',
   tags: ['github'],
   async execute(input, context) {
-    return executeGithubUnsubscribe(input, context.$client);
+    return executeGithubUnsubscribe(input, context.$client, undefined, context.locale);
   },
 });

package/commands/github/endpoint/definition.js

@@ -15,8 +15,8 @@ export const githubEndpointCommands = createEndpointCommands({
     adapterDisplayName: 'GitHub',
     fields: [
         { key: 'app_id', required: true, env: true, description: 'GitHub App ID' },
-        { key: 'private_key', required: true, description: 'PEM 文件路径（推荐，如 ./data/xxx.pem）或 PEM 内容' },
-        { key: 'webhook_secret', env: true, description: 'webhook 签名密钥（不配则 API-only）' },
+        { key: 'private_key', required: true, description: 'PEM 文件路径（推荐，如 ./data/xxx.pem）或 PEM 内容', descriptionI18n: { en: "PEM file path (recommended, such as ./data/app.pem) or PEM content" } },
+        { key: 'webhook_secret', env: true, description: 'webhook 签名密钥（不配则 API-only）', descriptionI18n: { en: "Webhook signing secret (API-only when omitted)" } },
     ],
     running: (use) => use(githubRuntimeStateToken).endpoints.values(),
     describeEntry: (entry) => `app_id: ${String(entry.app_id)}`,

package/commands/github/endpoint/definition.ts

@@ -15,8 +15,8 @@ export const githubEndpointCommands = createEndpointCommands({
   adapterDisplayName: 'GitHub',
   fields: [
     { key: 'app_id', required: true, env: true, description: 'GitHub App ID' },
-    { key: 'private_key', required: true, description: 'PEM 文件路径（推荐，如 ./data/xxx.pem）或 PEM 内容' },
-    { key: 'webhook_secret', env: true, description: 'webhook 签名密钥（不配则 API-only）' },
+    { key: 'private_key', required: true, description: 'PEM 文件路径（推荐，如 ./data/xxx.pem）或 PEM 内容', descriptionI18n: { en: "PEM file path (recommended, such as ./data/app.pem) or PEM content" } },
+    { key: 'webhook_secret', env: true, description: 'webhook 签名密钥（不配则 API-only）', descriptionI18n: { en: "Webhook signing secret (API-only when omitted)" } },
   ],
   running: (use) => use(githubRuntimeStateToken).endpoints.values(),
   describeEntry: (entry) => `app_id: ${String(entry.app_id)}`,

package/lib/github-channel-context.d.ts

@@ -2,6 +2,7 @@
  * Parse GitHub Issue/PR channel context from IM messages.
  */
 import type { Message } from 'zhin.js';
+import { type Locale } from 'zhin.js/i18n';
 import { type ParsedChannel } from './types.js';
 import type { GhClient } from './gh-client.js';
 export interface GitHubChannelContext extends ParsedChannel {
@@ -9,7 +10,7 @@ export interface GitHubChannelContext extends ParsedChannel {
 }
 export declare function parseMessageChannel(message: Message): GitHubChannelContext | null;
 export declare function issueBranchName(number: number): string;
-export declare function resolveWorkspaceBranch(gh: GhClient, ctx: GitHubChannelContext): Promise<{
+export declare function resolveWorkspaceBranch(gh: GhClient, ctx: GitHubChannelContext, locale?: Locale): Promise<{
     branch: string;
     base: string;
 }>;

package/lib/github-channel-context.js

@@ -1,3 +1,4 @@
+import { createMessages } from 'zhin.js/i18n';
 import { buildChannelId, parseChannelId } from './types.js';
 export function parseMessageChannel(message) {
     const channelId = message.conversation.id;
@@ -11,14 +12,14 @@ export function parseMessageChannel(message) {
 export function issueBranchName(number) {
     return `zhin/bot/issue-${number}`;
 }
-export async function resolveWorkspaceBranch(gh, ctx) {
+export async function resolveWorkspaceBranch(gh, ctx, locale) {
     if (ctx.type === 'pr') {
         const pr = await gh.getPR(ctx.repo, ctx.number);
         if (pr.ok && pr.data?.head?.ref) {
             const base = pr.data.base?.ref ?? 'main';
             return { branch: pr.data.head.ref, base };
         }
-        throw new Error(`无法读取 PR #${ctx.number} 的 head 分支`);
+        throw new Error(t(locale, 'missingHead', { number: ctx.number }));
     }
     const repoInfo = await gh.getRepo(ctx.repo);
     const base = repoInfo.ok && repoInfo.data?.default_branch
@@ -29,3 +30,6 @@ export async function resolveWorkspaceBranch(gh, ctx) {
 export function formatChannelContext(ctx) {
     return buildChannelId(ctx.repo, ctx.type, ctx.number);
 }
+const t = createMessages({
+    missingHead: { 'zh-CN': '无法读取 PR #{number} 的 head 分支', en: 'Cannot read the head branch of PR #{number}' },
+});

package/lib/workspace-manager.d.ts

@@ -1,21 +1,22 @@
+import { type Locale } from 'zhin.js/i18n';
 import type { GhClient, GitHubBotIdentity } from './gh-client.js';
 /**
  * 校验 GitHub "owner/name" 全名，防止路径穿越与 git 选项注入。
  * 返回通过校验的原值，便于调用方直接使用「已消毒」的变量。
  */
-export declare function assertRepoFullName(repo: string): string;
+export declare function assertRepoFullName(repo: string, locale?: Locale): string;
 /**
  * 校验 git ref 名称，拒绝选项注入（`-` 前缀）与 git 非法字符。
  */
-export declare function assertGitRefName(ref: string): string;
+export declare function assertGitRefName(ref: string, locale?: Locale): string;
 export declare class WorkspaceManager {
     private readonly gh;
     private readonly rootDir;
     constructor(gh: GhClient, rootDir: string);
-    getRepoPath(repo: string): string;
+    getRepoPath(repo: string, locale?: Locale): string;
     private runGit;
-    configureBotGit(repoPath: string, identity: GitHubBotIdentity): Promise<void>;
-    ensureRepo(repo: string): Promise<string>;
-    checkoutBranch(repo: string, branch: string, baseRef: string): Promise<string>;
-    commitAndPush(repo: string, branch: string, message: string): Promise<string>;
+    configureBotGit(repoPath: string, identity: GitHubBotIdentity, locale?: Locale): Promise<void>;
+    ensureRepo(repo: string, locale?: Locale): Promise<string>;
+    checkoutBranch(repo: string, branch: string, baseRef: string, locale?: Locale): Promise<string>;
+    commitAndPush(repo: string, branch: string, message: string, locale?: Locale): Promise<string>;
 }

package/lib/workspace-manager.js

@@ -4,6 +4,7 @@
 import { spawn } from 'node:child_process';
 import fs from 'node:fs';
 import path from 'node:path';
+import { createMessages } from 'zhin.js/i18n';
 const REPO_FULL_NAME_RE = /^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/;
 const GIT_REF_ILLEGAL_CHARS = new Set('~^:?*[\\`;');
 function containsIllegalGitRefCharacter(ref) {
@@ -19,27 +20,27 @@ function containsIllegalGitRefCharacter(ref) {
  * 校验 GitHub "owner/name" 全名，防止路径穿越与 git 选项注入。
  * 返回通过校验的原值，便于调用方直接使用「已消毒」的变量。
  */
-export function assertRepoFullName(repo) {
+export function assertRepoFullName(repo, locale) {
     if (typeof repo !== 'string' ||
         !REPO_FULL_NAME_RE.test(repo) ||
         repo.split('/').some((seg) => seg === '' || seg.startsWith('-') || /^\.+$/.test(seg))) {
-        throw new TypeError(`非法的仓库全名: ${JSON.stringify(repo)}`);
+        throw new TypeError(t(locale, 'invalidRepo', { value: JSON.stringify(repo) }));
     }
     return repo;
 }
 /**
  * 校验 git ref 名称，拒绝选项注入（`-` 前缀）与 git 非法字符。
  */
-export function assertGitRefName(ref) {
+export function assertGitRefName(ref, locale) {
     if (typeof ref !== 'string' || ref.length === 0) {
-        throw new TypeError(`非法的 git ref: ${JSON.stringify(ref)}`);
+        throw new TypeError(t(locale, 'invalidRef', { value: JSON.stringify(ref) }));
     }
     if (ref.startsWith('-') ||
         ref.includes('..') ||
         containsIllegalGitRefCharacter(ref) ||
         ref.endsWith('/') ||
         ref.endsWith('.')) {
-        throw new TypeError(`非法的 git ref: ${JSON.stringify(ref)}`);
+        throw new TypeError(t(locale, 'invalidRef', { value: JSON.stringify(ref) }));
     }
     return ref;
 }
@@ -50,12 +51,12 @@ export class WorkspaceManager {
         this.gh = gh;
         this.rootDir = rootDir;
     }
-    getRepoPath(repo) {
-        repo = assertRepoFullName(repo);
+    getRepoPath(repo, locale) {
+        repo = assertRepoFullName(repo, locale);
         const [owner, name] = repo.split('/');
         return path.join(this.rootDir, owner, name);
     }
-    runGit(cwd, args, env) {
+    runGit(cwd, args, env, locale) {
         return new Promise((resolve, reject) => {
             const proc = spawn('git', args, {
                 cwd,
@@ -68,7 +69,7 @@ export class WorkspaceManager {
             proc.stderr.on('data', (d) => { stderr += d.toString(); });
             proc.on('error', (err) => {
                 if (err.code === 'ENOENT')
-                    reject(new Error('git 未安装'));
+                    reject(new Error(t(locale, 'missingGit')));
                 else
                     reject(err);
             });
@@ -80,75 +81,86 @@ export class WorkspaceManager {
             });
         });
     }
-    configureBotGit(repoPath, identity) {
-        return Promise.all([
-            this.runGit(repoPath, ['config', 'user.name', identity.login]),
-            this.runGit(repoPath, ['config', 'user.email', identity.email]),
-        ]).then(() => undefined);
+    async configureBotGit(repoPath, identity, locale) {
+        // Both writes acquire the same .git/config.lock.
+        await this.runGit(repoPath, ['config', 'user.name', identity.login], undefined, locale);
+        await this.runGit(repoPath, ['config', 'user.email', identity.email], undefined, locale);
     }
-    async ensureRepo(repo) {
-        repo = assertRepoFullName(repo);
+    async ensureRepo(repo, locale) {
+        repo = assertRepoFullName(repo, locale);
         if (!this.gh.isAppAuth) {
-            throw new Error('GitHub App 认证未配置，无法托管工作区');
+            throw new Error(t(locale, 'appRequired'));
         }
         const token = await this.gh.ensureInstallationTokenForRepo(repo);
         if (!token)
-            throw new Error(`无法获取 ${repo} 的 Installation Token`);
-        const repoPath = this.getRepoPath(repo);
+            throw new Error(t(locale, 'repoTokenUnavailable', { repo }));
+        const repoPath = this.getRepoPath(repo, locale);
         fs.mkdirSync(path.dirname(repoPath), { recursive: true });
         const identity = await this.gh.getBotIdentity();
         if (!identity)
-            throw new Error('无法解析 GitHub App Bot 身份');
+            throw new Error(t(locale, 'missingIdentity'));
         const cloneUrl = this.gh.buildCloneUrl(repo, token);
         if (!fs.existsSync(path.join(repoPath, '.git'))) {
-            await this.runGit(path.dirname(repoPath), ['clone', cloneUrl, path.basename(repoPath)]);
+            await this.runGit(path.dirname(repoPath), ['clone', '--', cloneUrl, path.basename(repoPath)], undefined, locale);
         }
         else {
-            await this.runGit(repoPath, ['remote', 'set-url', 'origin', cloneUrl]);
-            await this.runGit(repoPath, ['fetch', 'origin', '--prune']);
+            await this.runGit(repoPath, ['remote', 'set-url', 'origin', cloneUrl], undefined, locale);
+            await this.runGit(repoPath, ['fetch', 'origin', '--prune'], undefined, locale);
         }
-        await this.configureBotGit(repoPath, identity);
+        await this.configureBotGit(repoPath, identity, locale);
         return repoPath;
     }
-    async checkoutBranch(repo, branch, baseRef) {
-        repo = assertRepoFullName(repo);
-        branch = assertGitRefName(branch);
-        baseRef = assertGitRefName(baseRef);
-        const repoPath = await this.ensureRepo(repo);
-        const localBranches = await this.runGit(repoPath, ['branch', '--list', branch]);
+    async checkoutBranch(repo, branch, baseRef, locale) {
+        repo = assertRepoFullName(repo, locale);
+        branch = assertGitRefName(branch, locale);
+        baseRef = assertGitRefName(baseRef, locale);
+        const repoPath = await this.ensureRepo(repo, locale);
+        const localBranches = await this.runGit(repoPath, ['branch', '--list', branch], undefined, locale);
         if (localBranches.trim()) {
-            await this.runGit(repoPath, ['checkout', branch]);
-            await this.runGit(repoPath, ['pull', '--rebase', 'origin', branch]).catch(async () => {
-                await this.runGit(repoPath, ['fetch', 'origin', branch]);
+            await this.runGit(repoPath, ['checkout', branch], undefined, locale);
+            await this.runGit(repoPath, ['pull', '--rebase', '--', 'origin', branch], undefined, locale).catch(async () => {
+                await this.runGit(repoPath, ['fetch', '--', 'origin', branch], undefined, locale);
             });
             return repoPath;
         }
-        const remoteBranch = await this.runGit(repoPath, ['ls-remote', '--heads', 'origin', branch]);
+        const remoteBranch = await this.runGit(repoPath, ['ls-remote', '--heads', '--', 'origin', branch], undefined, locale);
         if (remoteBranch.trim()) {
-            await this.runGit(repoPath, ['checkout', '-B', branch, `origin/${branch}`]);
+            await this.runGit(repoPath, ['checkout', '-B', branch, `origin/${branch}`], undefined, locale);
             return repoPath;
         }
-        await this.runGit(repoPath, ['fetch', 'origin', baseRef]);
-        await this.runGit(repoPath, ['checkout', '-B', branch, `origin/${baseRef}`]);
+        await this.runGit(repoPath, ['fetch', '--', 'origin', baseRef], undefined, locale);
+        await this.runGit(repoPath, ['checkout', '-B', branch, `origin/${baseRef}`], undefined, locale);
         return repoPath;
     }
-    async commitAndPush(repo, branch, message) {
-        repo = assertRepoFullName(repo);
-        branch = assertGitRefName(branch);
-        const repoPath = this.getRepoPath(repo);
+    async commitAndPush(repo, branch, message, locale) {
+        repo = assertRepoFullName(repo, locale);
+        branch = assertGitRefName(branch, locale);
+        const repoPath = this.getRepoPath(repo, locale);
         if (!fs.existsSync(repoPath)) {
-            throw new Error(`工作区不存在: ${repoPath}，请先 github_prepare_workspace`);
+            throw new Error(t(locale, 'missingWorkspace', { path: repoPath }));
         }
         const token = await this.gh.ensureInstallationTokenForRepo(repo);
         if (!token)
-            throw new Error('Installation Token 不可用');
-        await this.runGit(repoPath, ['remote', 'set-url', 'origin', this.gh.buildCloneUrl(repo, token)]);
-        const status = await this.runGit(repoPath, ['status', '--porcelain']);
+            throw new Error(t(locale, 'missingToken'));
+        await this.runGit(repoPath, ['remote', 'set-url', 'origin', this.gh.buildCloneUrl(repo, token)], undefined, locale);
+        const status = await this.runGit(repoPath, ['status', '--porcelain'], undefined, locale);
         if (!status.trim())
-            return '没有可提交的变更';
-        await this.runGit(repoPath, ['add', '-A']);
-        await this.runGit(repoPath, ['commit', '-m', message]);
-        await this.runGit(repoPath, ['push', '-u', 'origin', branch]);
-        return `已 push 到 origin/${branch}`;
+            return t(locale, 'noChanges');
+        await this.runGit(repoPath, ['add', '-A'], undefined, locale);
+        await this.runGit(repoPath, ['commit', '-m', message], undefined, locale);
+        await this.runGit(repoPath, ['push', '-u', 'origin', branch], undefined, locale);
+        return t(locale, 'pushed', { branch });
     }
 }
+const t = createMessages({
+    invalidRepo: { 'zh-CN': '非法的仓库全名: {value}', en: 'Invalid repository name: {value}' },
+    invalidRef: { 'zh-CN': '非法的 git ref: {value}', en: 'Invalid git ref: {value}' },
+    missingGit: { 'zh-CN': 'git 未安装', en: 'git is not installed' },
+    appRequired: { 'zh-CN': 'GitHub App 认证未配置，无法托管工作区', en: 'GitHub App authentication is not configured; the workspace is unavailable' },
+    repoTokenUnavailable: { 'zh-CN': '无法获取 {repo} 的 Installation Token', en: 'Cannot obtain an Installation Token for {repo}' },
+    missingIdentity: { 'zh-CN': '无法解析 GitHub App Bot 身份', en: 'Cannot resolve the GitHub App bot identity' },
+    missingWorkspace: { 'zh-CN': '工作区不存在: {path}，请先准备工作区', en: 'Workspace does not exist: {path}. Prepare the workspace first' },
+    missingToken: { 'zh-CN': 'Installation Token 不可用', en: 'Installation Token is unavailable' },
+    noChanges: { 'zh-CN': '没有可提交的变更', en: 'No changes to commit' },
+    pushed: { 'zh-CN': '已 push 到 origin/{branch}', en: 'Pushed to origin/{branch}' },
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/adapter-github",
-  "version": "1.1.15",
+  "version": "1.1.16",
   "description": "Zhin.js GitHub adapter for Plugin Runtime (App auth + webhook)",
   "type": "module",
   "main": "./lib/index.js",
@@ -39,25 +39,25 @@
     "directory": "plugins/adapters/github"
   },
   "dependencies": {
-    "@zhin.js/adapter": "1.1.22",
-    "@zhin.js/agent-feature": "1.1.9",
-    "@zhin.js/core": "1.1.50",
-    "@zhin.js/feature-kit": "1.1.8",
-    "@zhin.js/host-http": "1.1.9",
-    "@zhin.js/im-contract": "1.1.6",
+    "@zhin.js/adapter": "1.1.23",
+    "@zhin.js/agent-feature": "1.1.10",
+    "@zhin.js/core": "1.1.51",
+    "@zhin.js/feature-kit": "1.1.9",
+    "@zhin.js/host-http": "1.1.10",
+    "@zhin.js/im-contract": "1.1.7",
     "@zhin.js/logger": "1.1.2",
-    "@zhin.js/skill": "1.1.9",
-    "@zhin.js/tool": "1.1.9"
+    "@zhin.js/skill": "1.1.10",
+    "@zhin.js/tool": "1.1.10"
   },
   "peerDependencies": {
     "zod": "^4.0.0",
-    "@zhin.js/adapter": "^1.1.22",
-    "@zhin.js/agent": "^1.1.40",
-    "@zhin.js/command": "^1.1.10",
-    "@zhin.js/core": "^1.1.50",
-    "@zhin.js/host-http": "^1.1.9",
-    "@zhin.js/prompt-section": "^1.1.8",
-    "zhin.js": "^1.1.15"
+    "@zhin.js/adapter": "^1.1.23",
+    "@zhin.js/agent": "^1.1.42",
+    "@zhin.js/command": "^1.1.11",
+    "@zhin.js/core": "^1.1.51",
+    "@zhin.js/host-http": "^1.1.10",
+    "@zhin.js/prompt-section": "^1.1.9",
+    "zhin.js": "^1.1.16"
   },
   "peerDependenciesMeta": {
     "@zhin.js/agent": {
@@ -81,9 +81,9 @@
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
     "zod": "^4.4.3",
-    "@zhin.js/agent": "1.1.40",
-    "@zhin.js/prompt-section": "1.1.8",
-    "zhin.js": "1.1.15"
+    "@zhin.js/agent": "1.1.42",
+    "@zhin.js/prompt-section": "1.1.9",
+    "zhin.js": "1.1.16"
   },
   "files": [
     "adapters",