@zhin.js/adapter-github 1.1.0 → 1.1.3

package/src/endpoint.ts

@@ -162,8 +162,8 @@ export class GithubEndpoint extends Endpoint<GithubClient> {
 }
 
 export function defaultCreateClient(config: ResolvedGithubConfig): GhClient {
-  const appAuth = config.appId && config.privateKey
-    ? { appId: config.appId, privateKey: config.privateKey }
-    : undefined;
-  return new GhClient({ host: config.host, appAuth });
+  return new GhClient({
+    host: config.host,
+    appAuth: { appId: config.appId, privateKey: config.privateKey },
+  });
 }

package/src/github-runtime-state.ts

@@ -1,6 +1,6 @@
 /**
  * GitHub 插件实例的运行时状态：adapter create() 注册的 endpoint 列表。
- * 由 plugin.ts setup() provide，adapter create 与 `github.endpoint` 命令共享（同一 owner generation）。
+ * 由 plugin.ts setup() provide，adapter create 与 `github endpoint` 命令共享（同一 owner generation）。
  */
 import { defineEndpointRuntimeStateToken } from 'zhin.js/adapter';
 

package/src/index.ts

@@ -12,7 +12,7 @@ export {
   resolveGithubConfig,
   shouldAutoReplyRepo,
   verifyWebhookSignature,
-  type GithubAdapterConfig,
+  type GithubEndpointConfig,
   type GithubInboundComment,
   type GithubWireSegment,
   type ResolvedGithubConfig,

package/src/oauth-users.ts

@@ -14,7 +14,7 @@ export const GITHUB_OAUTH_USERS_SCHEMA = {
   platform_uid: { type: 'text', nullable: false },
   github_login: { type: 'text', nullable: false },
   access_token: { type: 'text', nullable: false },
-  created_at: { type: 'integer', nullable: false },
+  created_at: { type: 'bigint', nullable: false },
 } as const;
 
 export function defineGithubOauthUsersTable(

package/src/protocol.ts

@@ -5,9 +5,7 @@
 
 import { createHmac, timingSafeEqual } from 'node:crypto';
 import type { IncomingMessage } from 'node:http';
-import { pickCredential } from 'zhin.js/adapter';
-import { isMediaRef } from '@zhin.js/core';
-import type { ConversationRef } from '@zhin.js/im-contract';
+import { isMediaRef, type ConversationRef } from '@zhin.js/im-contract';
 import { formatCompact, getLogger } from '@zhin.js/logger';
 
 const logger = getLogger('github');
@@ -23,7 +21,6 @@ export type {
   EventType,
   GenericWebhookPayload,
   GitHubComment,
-  GitHubEndpointConfig,
   GitHubIssue,
   GitHubOAuthUser,
   GitHubPR,
@@ -38,52 +35,30 @@ export type {
 
 export { buildChannelId, parseChannelId } from './types.js';
 
-/** Plugin Runtime owner config (`plugins.<instanceKey>` / schema.json). */
-export interface GithubAdapterConfig {
-  readonly id?: string;
+/** One expanded GitHub endpoint configuration produced by AdapterIndex. */
+export interface GithubEndpointConfig {
+  readonly id: string;
   readonly host?: string;
-  readonly app_id?: string | number;
-  readonly appId?: string | number;
-  readonly private_key?: string;
-  readonly privateKey?: string;
+  readonly app_id: string | number;
+  readonly private_key: string;
   readonly webhook_secret?: string;
-  readonly webhookSecret?: string;
   readonly webhook_path?: string;
-  readonly webhookPath?: string;
-  readonly poll_interval?: number;
-  readonly pollInterval?: number;
   readonly auto_reply_repos?: readonly string[];
-  readonly autoReplyRepos?: readonly string[];
   readonly bot_login?: string;
-  readonly botLogin?: string;
   readonly workspace_root?: string;
-  readonly workspaceRoot?: string;
-  /** Transitional: legacy root `endpoints[]` with `context: github`. */
-  readonly endpoints?: ReadonlyArray<Partial<ResolvedGithubConfig> & {
-    readonly context?: string;
-    readonly app_id?: string | number;
-    readonly private_key?: string;
-    readonly webhook_secret?: string;
-    readonly webhook_path?: string;
-    readonly poll_interval?: number;
-    readonly auto_reply_repos?: readonly string[];
-    readonly bot_login?: string;
-    readonly workspace_root?: string;
-  }>;
 }
 
 export interface ResolvedGithubConfig {
   readonly context: 'github';
   readonly id: string;
   readonly host?: string;
-  readonly appId?: string | number;
-  readonly privateKey?: string;
+  readonly appId: string | number;
+  readonly privateKey: string;
   readonly webhookSecret?: string;
   readonly webhookPath: string;
-  readonly pollInterval: number;
   readonly autoReplyRepos: readonly string[];
   readonly botLogin?: string;
-  readonly workspaceRoot?: string;
+  readonly workspaceRoot: string;
 }
 
 export interface GithubWireSegment {
@@ -118,63 +93,35 @@ export function githubInboundConversation(
   };
 }
 
-export function resolveGithubConfig(config: GithubAdapterConfig = {}): ResolvedGithubConfig {
-  const entry = config.endpoints?.find((item) => item.context === 'github');
-  const appIdRaw = pickCredential(
-    config.appId != null ? String(config.appId) : undefined,
-    config.app_id != null ? String(config.app_id) : undefined,
-    entry?.appId != null ? String(entry.appId) : undefined,
-    entry?.app_id != null ? String(entry.app_id) : undefined,
-    process.env.GITHUB_APP_ID,
-  );
+export function resolveGithubConfig(config: GithubEndpointConfig): ResolvedGithubConfig {
+  const id = typeof config.id === 'string' ? config.id.trim() : '';
+  if (!id) throw new TypeError('GitHub endpoint requires a non-empty id');
+  const appIdRaw = config.app_id != null ? String(config.app_id).trim() : '';
   const appId = appIdRaw ? (Number(appIdRaw) || appIdRaw) : undefined;
-  const privateKey = pickCredential(
-    config.privateKey,
-    config.private_key,
-    entry?.privateKey,
-    entry?.private_key,
-  ) || undefined;
+  const privateKey = typeof config.private_key === 'string'
+    ? config.private_key.trim()
+    : '';
   if (!appId || !privateKey) {
-    throw new TypeError(
-      'GitHub adapter requires app_id + private_key (plugins.<key> or GITHUB_APP_ID)',
-    );
+    throw new TypeError('GitHub endpoint requires app_id and private_key');
   }
-  const id = (typeof config.id === 'string' && config.id)
-    || (typeof entry?.id === 'string' && entry.id)
-    || process.env.GITHUB_BOT_NAME
-    || 'github-bot';
-  const webhookSecret = config.webhookSecret ?? config.webhook_secret
-    ?? entry?.webhookSecret ?? entry?.webhook_secret
-    ?? process.env.GITHUB_WEBHOOK_SECRET
-    ?? undefined;
-  const host = config.host ?? entry?.host;
-  const webhookPath = normalizeWebhookPath(
-    config.webhookPath ?? config.webhook_path ?? entry?.webhookPath ?? entry?.webhook_path
-    ?? '/github/webhook',
-  );
-  const pollInterval = Number(
-    config.pollInterval ?? config.poll_interval ?? entry?.pollInterval ?? entry?.poll_interval ?? 60,
-  ) || 60;
-  const autoReplyRepos = [
-    ...(config.autoReplyRepos ?? config.auto_reply_repos
-      ?? entry?.autoReplyRepos ?? entry?.auto_reply_repos ?? []),
-  ];
-  const botLogin = config.botLogin ?? config.bot_login ?? entry?.botLogin ?? entry?.bot_login;
-  const workspaceRoot = config.workspaceRoot ?? config.workspace_root
-    ?? entry?.workspaceRoot ?? entry?.workspace_root;
+  const webhookSecret = config.webhook_secret;
+  const host = config.host;
+  const webhookPath = normalizeWebhookPath(config.webhook_path ?? '/github/webhook');
+  const autoReplyRepos = [...(config.auto_reply_repos ?? [])];
+  const botLogin = config.bot_login;
+  const workspaceRoot = config.workspace_root ?? 'data/github-workspaces';
 
   return {
     context: 'github',
     id,
     ...(host ? { host } : {}),
-    ...(appId != null ? { appId } : {}),
-    ...(privateKey ? { privateKey } : {}),
+    appId,
+    privateKey,
     ...(webhookSecret ? { webhookSecret } : {}),
     webhookPath,
-    pollInterval,
     autoReplyRepos,
     ...(botLogin ? { botLogin } : {}),
-    ...(workspaceRoot ? { workspaceRoot } : {}),
+    workspaceRoot,
   };
 }
 

package/src/types.ts

@@ -1,31 +1,3 @@
-// ── Endpoint 配置 ─────────────────────────────────────────────────────────
-//  基于 gh CLI 认证：需要系统已安装并认证 gh CLI
-//  认证方式：gh auth login
-
-export interface GitHubEndpointConfig {
-  context: 'github';
-  /** Endpoint 标识名称 */
-  name: string;
-  /** GitHub Enterprise 主机名（默认 github.com） */
-  host?: string;
-  /** GitHub App ID */
-  app_id?: string | number;
-  /** GitHub App 私钥（PEM 内容或文件路径） */
-  private_key?: string;
-  /** Webhook Secret（配置后启用 Webhook 接收事件，不配置则使用轮询） */
-  webhook_secret?: string;
-  /** Webhook 路由路径（默认 /github/webhook） */
-  webhook_path?: string;
-  /** 事件轮询间隔（秒，默认 60，Webhook 模式下作为降级备选） */
-  poll_interval?: number;
-  /** 这些仓库的人类 Issue/PR 评论自动触发 AI（无需 @bot） */
-  auto_reply_repos?: string[];
-  /** 覆盖 App bot 登录名（默认 {slug}[bot]） */
-  bot_login?: string;
-  /** 托管 git 工作区根目录（默认 {cwd}/data/github-workspaces） */
-  workspace_root?: string;
-}
-
 // ── Channel ID ───────────────────────────────────────────────────────
 //  格式: {owner}/{repo}/issues/{number} 或 {owner}/{repo}/pull/{number}
 

package/agent/skills/github.md

@@ -1,283 +0,0 @@
----
-name: github
-platforms:
-  - github
-description: >-
-  GitHub 全功能适配器技能：内置工具处理 Star/绑定/订阅；MCP server-github 处理 Fork/PR/Issue 等 API；
-  bash + gh CLI 覆盖其余仓库自动化。
-  Endpoint 操作使用 GitHub App 身份；Star 等可使用用户 OAuth 绑定。
-  每个 Zhin 实例通过 GH_TOKEN 环境变量注入身份，支持多实例协同。
-  channel ID 格式：owner/repo/issues/N 或 owner/repo/pull/N。
-keywords:
-  - github
-  - gh
-  - cli
-  - adapter:github
-  - pr
-  - pull request
-  - issue
-  - merge
-  - review
-  - star
-  - fork
-  - branch
-  - release
-  - CI
-  - workflow
-  - repo
-  - 合并
-  - 仓库
-  - 拉取请求
-  - 代码审查
-  - search
-  - 搜索
-  - bind
-  - unbind
-  - whoami
-  - 绑定
-  - 授权
-  - label
-  - assign
-  - file
-  - commit
-  - compare
-  - edit
-  - webhook
-  - subscribe
-  - discussion
-tags:
-  - github
-  - development
-  - git
-  - ci-cd
-tools:
-  - bash
-  - github_star
-  - github_bind
-  - github_unbind
-  - github_whoami
-  - github_install
-  - github_subscribe
-  - github_unsubscribe
-  - github_subscriptions
-  - github_prepare_workspace
-  - github_patch_file
-  - github_push_branch
-  - github_create_pr
-always: false
-requires:
-  bins:
-    - gh
-  env:
-    - GH_TOKEN
----
-
-# GitHub 全功能操作指南
-
-本技能提供三种操作方式：
-- **适配器内置工具**（`github_*`）：用户交互类操作，具备账号绑定、Device Flow 授权、频道级订阅等适配器专有逻辑
-- **Bot 写仓库工具**（`github_prepare_workspace` / `github_patch_file` / `github_push_branch` / `github_create_pr`）：Installation Token，UI 显示 **Bot** 身份；push/开 PR 需 HITL
-- **MCP server-github**（`mcp_github_*`，可选）：`ai.githubMcp.*` 配置已随 Plugin Runtime 迁移移除；如需 MCP 工具，按 `mcp/<name>.ts` 约定自行装配（PAT 为**人身份**，勿用于 Bot 写仓库）
-- **bash + gh CLI**：仓库自动化操作，灵活覆盖 GitHub API 全场景
-
-## 一、适配器内置工具
-
-以下工具由 GitHub 适配器注册，具有特殊行为（用户 OAuth 绑定、频道绑定等），**不能用 gh CLI 替代**。
-
-### 账号与身份
-
-| 工具 | 说明 |
-|------|------|
-| `github_bind` | 绑定用户的 GitHub 账号（Device Flow 授权，无需输入密码）。用户想 star/fork 或操作自己的账号时，先引导使用此工具 |
-| `github_unbind` | 解除用户绑定的 GitHub 账号 |
-| `github_whoami` | 查看用户已绑定的 GitHub 账号信息 |
-| `github_install` | 获取安装 GitHub App 的链接，安装后 Endpoint 可访问用户的仓库 |
-
-### 用户操作（使用绑定账号）
-
-| 工具 | 说明 |
-|------|------|
-| `github_star` | Star 或取消 Star 一个仓库。优先使用用户绑定的 GitHub 账号，未绑定则降级为 Endpoint 默认账号 |
-
-### Bot 开发工作流（App 身份）
-
-| 工具 | 说明 |
-|------|------|
-| `github_prepare_workspace` | Clone/fetch 托管工作区并 checkout Issue/PR 对应分支 |
-| `github_patch_file` | Contents API 单文件更新（小改） |
-| `github_push_branch` | git commit + push（**需 HITL**） |
-| `github_create_pr` | 创建 PR（**需 HITL**；Issue 线程常用） |
-
-Issue 线程：新分支 → 开发 → push → 开 PR。PR 线程：push 到现有 head 分支。
-
-### MCP（server-github，可选 PAT）
-
-| 工具 | 说明 |
-|------|------|
-| `mcp_github_fork_repository` | Fork 仓库（替代已移除的 `github_fork`） |
-| `mcp_github_create_issue` 等 | Issue/PR/搜索/文件等，见 MCP 工具列表 |
-
-### Webhook 订阅（频道级）
-
-| 工具 | 说明 |
-|------|------|
-| `github_subscribe` | 订阅仓库的 Webhook 事件，推送到**当前聊天通道** |
-| `github_unsubscribe` | 取消订阅仓库的 Webhook 事件 |
-| `github_subscriptions` | 查看当前聊天通道的订阅列表 |
-
-### 内置工具执行规则
-
-1. `github_star` 优先使用用户绑定的 GitHub 账号，未绑定则降级为 Endpoint 默认账号
-2. Bot 写仓库用 `github_*` 工具，不用 `mcp_github_*` 写操作
-3. MCP（`mcp_github_*`）仅在你按 `mcp/<name>.ts` 约定装配后可用（旧 `ai.githubMcp.enabled` 已移除），PAT 为人身份
-4. 当用户想操作自己的 GitHub 账号进行 Star 时，先引导用户使用 `github_bind` 绑定
-5. Webhook 订阅关联到当前聊天通道，仅在该通道接收事件通知
-
----
-
-## 二、gh CLI 全场景速查
-
-当适配器内置工具不能满足需求（如 Release 管理、Workflow 触发、Discussion、gh api 万能调用），或需要更灵活的参数控制时，使用 `bash` 工具调用 `gh` CLI。当前进程已通过 `GH_TOKEN` 环境变量注入身份凭据。
-
-### 0. 前提检查
-
-```bash
-gh --version
-gh auth status
-```
-
-### 1. 仓库（gh repo）
-
-```bash
-gh repo view owner/repo
-gh repo list owner --limit 10 --json name,description
-gh repo clone owner/repo
-gh repo create owner/new-repo --public --description "描述"
-```
-
-### 2. Issue（gh issue）
-
-```bash
-gh issue list -R owner/repo --state open --limit 20 --json number,title,state,labels,assignees
-gh issue view 123 -R owner/repo --json number,title,body,state,labels,assignees --jq '{number,title,state,labels,assignees,body: .body[:2000]}'
-gh issue create -R owner/repo --title "标题" --body "正文" --label "bug" --assignee "user1"
-gh issue close 123 -R owner/repo
-gh issue reopen 123 -R owner/repo
-gh issue comment 123 -R owner/repo --body "评论内容"
-gh issue edit 123 -R owner/repo --title "新标题"
-gh issue edit 123 -R owner/repo --add-label "enhancement" --remove-label "bug"
-gh issue edit 123 -R owner/repo --add-assignee "user2" --remove-assignee "user1"
-```
-
-### 3. Pull Request（gh pr）
-
-```bash
-gh pr list -R owner/repo --state open --limit 20 --json number,title,state,author,mergeable
-gh pr view 456 -R owner/repo --json number,title,body,state,author,mergeable,reviewDecision --jq '{number,title,state,author,mergeable,reviewDecision,body: .body[:2000]}'
-gh pr create -R owner/repo --title "标题" --body "描述" --base main --head feature-branch
-gh pr merge 456 -R owner/repo --squash --delete-branch
-gh pr close 456 -R owner/repo
-gh pr reopen 456 -R owner/repo
-gh pr comment 456 -R owner/repo --body "评论内容"
-gh pr review 456 -R owner/repo --approve
-gh pr review 456 -R owner/repo --request-changes --body "需要修改的内容"
-gh pr review 456 -R owner/repo --comment --body "一般性建议"
-gh pr checks 456 -R owner/repo
-gh pr diff 456 -R owner/repo | head -n 200
-```
-
-### 4. Release（gh release）
-
-```bash
-gh release list -R owner/repo --limit 10
-gh release view v1.0.0 -R owner/repo
-gh release create v1.0.0 -R owner/repo --title "v1.0.0" --notes "发布说明" --target main
-gh release delete v1.0.0 -R owner/repo --yes
-```
-
-### 5. Workflow / CI（gh run & gh workflow）
-
-```bash
-gh run list -R owner/repo --limit 10 --json databaseId,displayTitle,status,conclusion
-gh run view 12345 -R owner/repo
-gh run rerun 12345 -R owner/repo --failed
-gh workflow list -R owner/repo
-gh workflow run ci.yml -R owner/repo --ref main
-```
-
-### 6. 搜索（gh search）
-
-```bash
-gh search issues "关键词" --repo owner/repo --limit 10 --json number,title,state
-gh search repos "关键词" --limit 10 --json fullName,description,stargazersCount
-gh search code "函数名" --repo owner/repo --limit 10 --json path,textMatches
-```
-
-### 7. 标签与指派
-
-```bash
-gh label list -R owner/repo
-gh label create "priority:high" -R owner/repo --color FF0000 --description "高优先级"
-gh issue edit 123 -R owner/repo --add-label "priority:high"
-gh issue edit 123 -R owner/repo --remove-label "priority:low"
-gh issue edit 123 -R owner/repo --add-assignee "user1"
-gh issue edit 123 -R owner/repo --remove-assignee "user2"
-```
-
-### 8. 文件与提交
-
-```bash
-gh api /repos/owner/repo/contents/path/to/file --jq '.content' | base64 -d
-gh api /repos/owner/repo/commits --jq '.[0:10] | .[] | {sha: .sha[:7], message: .commit.message[:80], author: .commit.author.name, date: .commit.author.date}'
-gh api /repos/owner/repo/compare/main...feature --jq '{ahead_by, behind_by, files: [.files[:20][] | {filename, status, changes}]}'
-```
-
-### 9. Discussion
-
-```bash
-gh api /repos/owner/repo/discussions --jq '.[0:10] | .[] | {number, title, category: .category.name}'
-gh api /repos/owner/repo/discussions/categories --jq '.[] | {id: .node_id, name, slug}'
-gh api graphql -f query='mutation {
-  createDiscussion(input: {
-    repositoryId: "REPO_NODE_ID",
-    categoryId: "CATEGORY_NODE_ID",
-    title: "标题",
-    body: "正文"
-  }) { discussion { number url } }
-}'
-gh api -X POST /repos/owner/repo/discussions/{number}/comments -f body="评论内容"
-```
-
-### 10. 万能 fallback：gh api
-
-```bash
-gh api /repos/owner/repo/xxx
-gh api -X POST /repos/owner/repo/xxx -f key=value
-gh api -X PATCH /repos/owner/repo/xxx -f key=value
-gh api graphql -f query='{ repository(owner:"owner", name:"repo") { ... } }'
-```
-
----
-
-## 三、输出控制黄金规则
-
-**所有 gh CLI 命令都必须控制输出大小**，防止 token 爆炸：
-
-| 手段 | 示例 |
-|------|------|
-| `--json` + `--jq` | 精确控制返回字段和条数 |
-| `--limit N` | 列表不超过 20 条 |
-| `--jq '.body[:2000]'` | 截断长文本字段 |
-| `\| head -n 200` | 截断 diff 等大文本 |
-
-**目标：单次调用输出 < 15KB。**
-
-## 四、常见错误与修复
-
-| 错误 | 原因 | 修复 |
-|------|------|------|
-| `gh: command not found` | 未安装 gh CLI | 需管理员安装 |
-| `HTTP 401` | Token 无效或过期 | 检查 GH_TOKEN 环境变量 |
-| `HTTP 404` | 仓库/资源不存在或无权限 | 确认 owner/repo 和 Token scope |
-| `HTTP 422` | 参数不合法 | 检查必填字段是否缺失 |
-| `GraphQL: ...` | GraphQL 查询语法错误 | 检查 query 拼写与字段名 |

package/commands/endpoint/add/[id].ts

@@ -1,3 +0,0 @@
-import { githubEndpointCommands } from '../../../src/github-endpoint-commands.js';
-
-export default githubEndpointCommands.add;

package/commands/endpoint/list.ts

@@ -1,3 +0,0 @@
-import { githubEndpointCommands } from '../../src/github-endpoint-commands.js';
-
-export default githubEndpointCommands.list;

package/commands/endpoint/remove/[id].ts

@@ -1,3 +0,0 @@
-import { githubEndpointCommands } from '../../../src/github-endpoint-commands.js';
-
-export default githubEndpointCommands.remove;

package/lib/github-bot-handlers.d.ts

@@ -1,27 +0,0 @@
-/**
- * GitHub App Bot workflow handlers (Installation Token identity).
- */
-import type { Message } from 'zhin.js';
-import type { GithubClient } from './client.js';
-export declare function executeGithubPrepareWorkspace(args: {
-    repo?: string;
-}, client: GithubClient, commMessage?: Message): Promise<string>;
-export declare function executeGithubPatchFile(args: {
-    repo?: string;
-    path: string;
-    content: string;
-    message: string;
-    branch?: string;
-}, client: GithubClient, commMessage?: Message): Promise<string>;
-export declare function executeGithubPushBranch(args: {
-    repo?: string;
-    branch?: string;
-    message: string;
-}, client: GithubClient, commMessage?: Message): Promise<string>;
-export declare function executeGithubCreatePr(args: {
-    repo?: string;
-    title: string;
-    body?: string;
-    head?: string;
-    base?: string;
-}, client: GithubClient, commMessage?: Message): Promise<string>;

package/lib/github-endpoint-commands.d.ts

@@ -1 +0,0 @@
-export declare const githubEndpointCommands: import("@zhin.js/adapter").EndpointCommands<Readonly<import("@zhin.js/command").CommandDefinition<unknown, unknown, import("@zhin.js/command").CommandMessage, string | undefined>>>;

package/lib/github-tool-handlers.d.ts

@@ -1,18 +0,0 @@
-import type { Message } from 'zhin.js';
-import type { GithubClient } from './client.js';
-export declare function executeGithubStar(args: {
-    action: 'star' | 'unstar' | 'check';
-    repo: string;
-}, client: GithubClient, commMessage?: Message): Promise<string>;
-export declare function executeGithubBind(_args: Record<string, never>, client: GithubClient, commMessage?: Message): Promise<string>;
-export declare function executeGithubUnbind(_args: Record<string, never>, client: GithubClient, commMessage?: Message): Promise<string>;
-export declare function executeGithubWhoami(_args: Record<string, never>, client: GithubClient, commMessage?: Message): Promise<string>;
-export declare function executeGithubInstall(client: GithubClient): Promise<string>;
-export declare function executeGithubSubscribe(args: {
-    repo: string;
-    events?: string;
-}, client: GithubClient, commMessage?: Message): Promise<string>;
-export declare function executeGithubUnsubscribe(args: {
-    repo: string;
-}, client: GithubClient, commMessage?: Message): Promise<string>;
-export declare function executeGithubSubscriptions(_args: Record<string, never>, client: GithubClient, commMessage?: Message): Promise<string>;