@gatherthread/dsh-host 0.1.0-alpha.7 → 0.1.0-beta.1

package/README.md

@@ -19,7 +19,7 @@ The package does not install a DSH runtime dependency.
 After `@gatherthread/dsh-host` is published, the ordinary three-step path is:
 
 ```text
-npx @deepseek-ai/dsh@0.1.2-rc.1 plugin --profile web add @gatherthread/dsh-host@0.1.0-alpha.7
+npx @deepseek-ai/dsh@0.1.2-rc.1 plugin --profile web add @gatherthread/dsh-host@0.1.0-beta.1
 npx @deepseek-ai/dsh@0.1.2-rc.1 web
 # In DSH: Settings -> GatherThread / 共序 -> Sign in and pair
 ```
@@ -42,8 +42,8 @@ Inside DSH, choose the future GatherThread public service or enter one custom
 server origin. The same field covers an HTTPS LAN host, self-hosted deployment,
 or Tailscale address; plain HTTP is accepted only on loopback. The plugin opens
 an outbound HTTPS connection. A five-minute, single-use short code is confirmed
-through the existing GatherThread browser session or invitation identity.
-Public account registration is not assumed. The resulting long-lived device
+through a signed-in GatherThread email account. Project invitations grant
+membership only and cannot authorize pairing. Signup is closed by default. The resulting long-lived device
 grant is stored only by DSH's credential service and never appears in argv, a
 URL, browser storage, logs, status RPC, or shared history. Once paired, the
 plugin reconnects automatically whenever DSH starts.
@@ -60,6 +60,14 @@ other plugins remain untouched. The repository-level `npm run dsh:connect --
 --help` source-checkout connector and the examples under `bundle/` remain
 advanced/offline diagnostics, not the normal user path.
 
+## GitHub code synchronization
+
+Beta 1 includes direct GitHub controls and requires matching server, Web app and native plugin releases. The project owner first connects an existing repository and base branch in Web. Install Git 2.38+ and GitHub CLI on the device, then open **Settings → GatherThread / 共序 → 项目代码 · GitHub（推荐）**. Click **连接 GitHub · 打开浏览器** to start local browser sign-in if needed, then authorize that exact project/repository configuration. `gh auth login --hostname github.com --git-protocol https --web` remains a local fallback. This consent is separate from GT Cloud and conversation sync; a new GitHub binding automatically uploads settled changes while idle and can be switched off. Configuration changes, including pause/resume, require renewed local authorization.
+
+The Web app may request code operations only on your selected online runtime and cannot grant this local consent. Code and GitHub credentials travel directly to GitHub. GitHub permissions remain independent of GT membership; removing a GT member or project does not revoke GitHub access or delete GitHub data. See [Project code collaboration](../../docs/CODE_SYNC.md) for setup, recovery, limits and GitHub workflow-trigger risks.
+
+GitHub 接入仍为**未发布源码预览**，需使用匹配的服务端、网页与原生插件源码构建，不能假定固定版本 npm 包已支持。在网页配置现有仓库后，每台设备安装 Git 2.38+ 与 GitHub CLI，再进入 **Settings → GatherThread / 共序 → 项目代码 · GitHub（推荐）**，点击“连接 GitHub · 打开浏览器”完成本机登录，并核对、逐项目授权。终端命令仍可作为保底。GitHub、GT Cloud 和会话同步分别授权；新 GitHub 绑定在 Agent 空闲时会自动上传稳定改动，可关闭且重连后保持关闭。配置变化及暂停后恢复需重新本地授权。网页不能替代本地文件授权，共序成员变化或项目删除不会撤销 GitHub 权限或删除 GitHub 数据。完整流程见[项目代码协作文档](../../docs/CODE_SYNC.md)。
+
 ## Security and recovery
 
 Only allowlisted public text/tool fields leave DSH. Reasoning blocks, raw model

package/bundle/manifest.json

@@ -1,7 +1,7 @@
 {
   "schemaVersion": 1,
   "name": "@gatherthread/dsh-host",
-  "version": "0.1.0-alpha.7",
+  "version": "0.1.0-beta.1",
   "license": "Apache-2.0",
   "defaultEnabled": false,
   "hostEntry": "@gatherthread/dsh-host",

package/client/client.js

@@ -105,7 +105,9 @@ function GatherThreadStatusPanel({ connection, sessions }) {
       }
       onSuccess?.(next);
     } catch {
-      setNotice(endpoint.startsWith("code/")
+      setNotice(endpoint.startsWith("github/") && githubEnglish()
+        ? "GitHub sync did not finish. Check local sign-in, project access and the remote version; no files were forcibly overwritten."
+        : endpoint.startsWith("code/") || endpoint.startsWith("github/")
         ? "代码同步未完成。请检查本机授权、项目权限和云端版本；不会强制覆盖文件。"
         : endpoint.startsWith("sync/")
         ? "上传操作未完成。请检查连接和会话权限后重试。"
@@ -184,64 +186,112 @@ function GatherThreadStatusPanel({ connection, sessions }) {
       setModel,
       runAction,
     }),
+  nativeState === undefined || unavailable ? null : renderCodeSyncControls(nativeState, busy, runAction, true),
   nativeState === undefined || unavailable ? null : renderCodeSyncControls(nativeState, busy, runAction));
 }
 
-function renderCodeSyncControls(state, busy, runAction) {
-  if (!state.codeSync?.length) return null;
+function githubEnglish() {
+  return typeof navigator !== "undefined" && typeof navigator.language === "string"
+    && !/^zh(?:-|$)/iu.test(navigator.language);
+}
+
+function renderCodeSyncControls(state, busy, runAction, github = false) {
+  const projects = github ? state.githubSync : state.codeSync;
+  if (!projects?.length) return null;
+  const label = (zh, en) => github && githubEnglish() ? en : zh;
   const actions = [
-    ["code_sync_status", "检查状态"],
-    ["code_upload", "上传代码"],
-    ["code_download", "下载更新"],
-    ["code_recover", "恢复到新目录"],
+    ["code_sync_status", label("检查状态", "Check status")],
+    ["code_upload", label("上传代码", "Upload code")],
+    ["code_download", label("下载更新", "Download updates")],
+    ["code_recover", label("恢复到新目录", "Recover to a new folder")],
   ];
-  return React.createElement("section", { style: styles.connectionCard, "aria-label": "项目代码同步" },
-    React.createElement("h3", { style: styles.sectionTitle }, "项目代码 · Git"),
+  if (github) actions.push(["code_update", label("从主分支更新", "Update from base branch")]);
+  const prefix = github ? "github_" : "";
+  return React.createElement("section", { style: styles.connectionCard, "aria-label": github ? label("GitHub 项目代码同步", "GitHub project code sync") : "项目代码同步" },
+    React.createElement("h3", { style: styles.sectionTitle }, github ? label("项目代码 · GitHub（推荐）", "Project code · GitHub (recommended)") : "项目代码 · GatherThread 云端"),
     React.createElement("p", { style: styles.muted },
-      "代码与会话上传独立。每位成员使用自己的云端分支；项目成员均可读取代码。上传前请检查源文件，不上传密钥或私人资料。"),
-    ...state.codeSync.map((project) => {
-      const invoke = (action) => void runAction("code/action", { projectId: project.projectId, action });
+      github ? label("本机直接与 GitHub 同步，代码和 GitHub 凭据不经过 GatherThread。GitHub 仓库成员权限独立管理；自动上传可能触发仓库 Actions。", "This device syncs directly with GitHub; source and credentials do not pass through GatherThread. GitHub access is managed separately, and automatic pushes may trigger Actions.") : "代码与会话上传独立。每位成员使用自己的云端分支；项目成员均可读取代码。上传前请检查源文件，不上传密钥或私人资料。"),
+    github ? React.createElement("p", { style: styles.muted }, label("先在本机安装 Git 和 GitHub CLI；点击下方按钮会打开浏览器完成 GitHub 登录。", "Install Git and GitHub CLI on this device, then use the button below to open browser sign-in.")) : null,
+    ...projects.map((project) => {
+      const invoke = (action) => void runAction(github ? "github/action" : "code/action", { projectId: project.projectId, action: `${prefix}${action}` });
       const status = project.status;
+      const enabled = github ? project.connection?.enabled === true : status?.enabled;
       return React.createElement("details", { key: project.projectId, style: { ...styles.row, display: "block" } },
         React.createElement("summary", { style: styles.sessionTitle }, project.projectName),
         React.createElement("div", { style: styles.form },
+          github ? React.createElement("p", { style: styles.sessionMeta }, project.connection
+            ? `${project.connection.repository} · ${label("主分支", "Base")} ${project.connection.base_branch} · ${label("成员分支", "My branch")} ${project.branch ?? label("尚未分配", "not assigned")}${enabled ? "" : ` · ${label("已暂停", "paused")}`}`
+            : label("请由项目创建者在 GatherThread 的项目代码中绑定 GitHub 仓库。", "Ask the project owner to connect a GitHub repository in GatherThread project code settings.")) : null,
+          github ? React.createElement("button", { type: "button", style: styles.compactButton,
+            disabled: busy || !project.connection,
+            onClick: () => void runAction("github/connect", { projectId: project.projectId }),
+          }, label("连接 GitHub · 打开浏览器", "Connect GitHub · Open browser")) : null,
           React.createElement("label", { style: styles.syncToggle },
             React.createElement("input", {
-              type: "checkbox", checked: project.authorized, disabled: busy,
-              onChange: (event) => void runAction("code/authorize", {
+              type: "checkbox", checked: project.authorized, disabled: busy || (github && !project.authorized && !enabled),
+              onChange: (event) => void runAction(github ? "github/authorize" : "code/authorize", {
                 projectId: project.projectId, enabled: event.target.checked,
+                ...(github && event.target.checked && project.connection ? {
+                  repository: project.connection.repository, base_branch: project.connection.base_branch, revision: project.connection.revision,
+                } : {}),
               }),
-            }), "允许此 DSH 同步该项目代码"),
-          React.createElement("p", { style: styles.muted }, "仅访问此项目已经绑定的本地目录，不改动原 Git 分支或暂存区。下载要求本地没有未上传改动；恢复始终新建目录，不更换当前 Agent 工作目录。"),
+            }), github ? label("允许此 DSH 将本项目代码同步到上述 GitHub 仓库", "Allow this DSH to sync this project's code to the GitHub repository above") : "允许此 DSH 同步该项目代码"),
+          React.createElement("p", { style: styles.muted }, label("仅访问此项目已经绑定的本地目录，不改动原 Git 分支或暂存区。下载要求本地没有未上传改动；恢复始终新建目录，不更换当前 Agent 工作目录。", "Only the local folder already bound to this project is accessed. Your original Git branch and index stay unchanged. Downloads require no unuploaded changes; recovery creates a separate folder.")),
           status ? React.createElement("p", { style: styles.sessionMeta },
-            status.local_status_unknown ? "已恢复云端副本；原工作区状态未知，请单独检查。" : status.enabled
-              ? `${status.file_count} 个源文件 · ${status.local_changes} 项待上传 · ${status.excluded_count} 项已排除 · 云端 ${status.cloud_commit?.slice(0, 8) ?? "尚无版本"}`
-              : "请先由项目创建者在 GatherThread 的「项目代码」中启用 Git。") : null,
-          status?.needs_download ? React.createElement("p", { style: styles.notice }, "云端有新版本。请先下载；本地有改动时请恢复到新目录比较，不会自动覆盖。") : null,
+            status.local_status_unknown ? label("已恢复云端副本；原工作区状态未知，请单独检查。", "A remote copy was recovered. Review the original workspace separately; its state is unknown.") : status.enabled
+              ? `${status.file_count} ${label("个源文件", "source files")} · ${status.local_changes} ${label("项待上传", "pending changes")} · ${status.excluded_count} ${label("项已排除", "excluded")} · ${label("云端", "remote")} ${status.cloud_commit?.slice(0, 8) ?? label("尚无版本", "no version yet")}`
+              : github ? label("GitHub 同步已暂停，请由项目创建者恢复。", "GitHub sync is paused; ask the project owner to resume it.") : "请先由项目创建者在 GatherThread 的「项目代码」中启用 Git。") : null,
+          status?.needs_download ? React.createElement("p", { style: styles.notice }, label("云端有新版本。请先下载；本地有改动时请恢复到新目录比较，不会自动覆盖。", "A newer remote version exists. Download when your local files are clean; otherwise recover to a new folder for comparison.")) : null,
           project.authorized ? React.createElement("label", { style: styles.syncToggle },
             React.createElement("input", {
               type: "checkbox", checked: status?.automatic_upload === true,
-              disabled: busy || !status?.enabled,
+              disabled: busy || (!enabled && !status?.automatic_upload),
               onChange: (event) => invoke(event.target.checked ? "code_auto_upload_enable" : "code_auto_upload_disable"),
-            }), "空闲时自动上传本地代码至云端") : null,
-          React.createElement("div", { style: styles.syncActions }, ...actions.map(([action, label]) => (
+            }), github ? label("空闲时自动上传本地代码至 GitHub", "Automatically upload local code to GitHub while idle") : "空闲时自动上传本地代码至云端") : null,
+          React.createElement("div", { style: styles.syncActions }, ...actions.map(([action, actionLabel]) => (
             React.createElement("button", {
               key: action, type: "button", style: styles.compactButton,
-              disabled: busy || !project.authorized || (action !== "code_sync_status" && !status?.enabled),
+              disabled: busy || (!project.authorized && !(github && action === "code_sync_status")) || (action !== "code_sync_status" && !enabled),
               onClick: () => {
-                if (action === "code_recover" && !window.confirm("将云端代码恢复到当前项目旁的新目录，原目录和会话保持不变。继续？")) return;
+                if (action === "code_recover" && !window.confirm(label("将云端代码恢复到当前项目旁的新目录，原目录和会话保持不变。继续？", "Recover remote code to a new sibling folder? The original folder and conversations stay unchanged."))) return;
                 invoke(action);
               },
-            }, label)
+            }, actionLabel)
           ))),
           status?.recovery_directory ? React.createElement("p", { role: "status", style: styles.notice },
-            `已恢复至项目同级目录：${status.recovery_directory}。在本地 Agent 中打开该目录继续工作；原会话保持不变。`) : null,
-          project.error ? React.createElement("p", { role: "status", style: styles.notice }, codeSyncErrorLabel(project.error)) : null,
+            `${label("已恢复至项目同级目录：", "Recovered to a sibling folder: ")}${status.recovery_directory}${label("。在本地 Agent 中打开该目录继续工作；原会话保持不变。", ". Open that folder in your local Agent to continue; original conversations remain unchanged.")}`) : null,
+          project.error ? React.createElement("p", { role: "status", style: styles.notice }, codeSyncErrorLabel(project.error, github)) : null,
         ));
     }));
 }
 
-function codeSyncErrorLabel(code) {
+function codeSyncErrorLabel(code, github = false) {
+  if (github && githubEnglish()) {
+    const labels = {
+      code_sync_disabled: "Allow this DSH to sync project code first.",
+      code_sync_busy: "The Agent is working. Try again after this turn finishes.",
+      code_workspace_busy: "The Agent is working. Try again after this turn finishes.",
+      code_sync_dirty: "Local changes are not uploaded. Upload them first, or recover remote code to a new folder for comparison.",
+      code_sync_recovery_required: "The local folder is missing or a download was interrupted. Recover remote code to a new folder first.",
+      code_sync_forbidden: "Code access was denied. Check this device's sign-in and project permissions.",
+      code_sync_conflict: "The remote version changed. Download safely or recover to a new folder; nothing was overwritten.",
+      code_conflict: "The remote version conflicted. Check the latest branch while preserving local changes.",
+      code_stale_head: "A newer remote version exists. Recover to a new folder before comparing changes.",
+      code_merge_conflict: "Branches conflict. Preserve local changes and resolve the conflict after comparing versions.",
+      code_git_unavailable: "Git is unavailable. Check this device's Git installation.",
+      code_secret_detected: "A possible secret was detected, so the upload was blocked. Check project files.",
+      code_sync_secret: "A possible secret was detected, so the upload was blocked. Check project files.",
+      code_github_binding_changed: "The GitHub repository changed. Review the repository and base branch, then authorize again.",
+      code_github_not_configured: "Ask the project owner to connect a GitHub repository first.",
+      code_github_unavailable: "GitHub settings are temporarily unavailable. Check the connection and retry.",
+      code_sync_binding: "The code sync target changed. Review the repository and local authorization.",
+      code_sync_unavailable: "Cannot connect to GitHub. Check Git, GitHub CLI sign-in, network and repository access on this device.",
+      code_sync_limit: "Project files exceed this sync method's safety limits. Check large files and exclusions.",
+      code_sync_unsupported: "This repository contains unsupported content; no code was changed.",
+      code_sync_unsafe_path: "The project contains an unsafe or unsupported path. Sync was stopped.",
+    };
+    return labels[code] ?? "Code sync did not finish. Check authorization, files and remote status; conversation sync is unaffected.";
+  }
   const labels = {
     code_sync_disabled: "请先允许此 DSH 同步项目代码。",
     code_sync_busy: "Agent 正在工作，请等待本轮结束后再同步。",
@@ -259,6 +309,14 @@ function codeSyncErrorLabel(code) {
     code_secret_detected: "检测到可能的密钥，已阻止上传。请检查项目文件。",
     code_not_enabled: "请先由项目创建者在 GatherThread 启用项目 Git。",
     code_sync_secret: "检测到可能的密钥，已阻止上传。请检查项目文件。",
+    code_github_binding_changed: "GitHub 仓库配置已变化，请核对最新仓库和主分支后重新授权。",
+    code_github_not_configured: "请先由项目创建者绑定 GitHub 仓库。",
+    code_github_unavailable: "GitHub 配置信息暂不可用，请检查连接后重试。",
+    code_sync_binding: "代码同步绑定已变化。请核对当前仓库与本地授权后重试。",
+    code_sync_unavailable: github ? "无法连接 GitHub。请检查本机 Git、GitHub CLI 登录状态、网络和仓库访问权限。" : "代码同步暂不可用，请检查本机 Git 与服务连接。",
+    code_sync_limit: "项目文件超过同步限制，未上传。请检查大文件和排除范围。",
+    code_sync_unsupported: "仓库包含当前同步方式不支持的内容，未修改代码。",
+    code_sync_unsafe_path: "项目含不安全或不支持的文件路径，已停止同步。",
   };
   return labels[code] ?? "代码同步未完成。请检查授权、文件和云端状态后重试；会话同步不受影响。";
 }
@@ -317,7 +375,7 @@ function renderNativeControls(input) {
           disabled: input.busy || state.officialServerUrl === undefined,
           style: styles.secondaryButton,
           onClick: () => input.setServerUrl(state.officialServerUrl || ""),
-        }, state.officialServerUrl === undefined ? "共序官方服务 · 尚未开放" : "使用共序官方服务"),
+        }, state.officialServerUrl === undefined ? "输入共序服务器地址" : "使用共序官方服务"),
         React.createElement("span", { style: styles.muted }, "局域网、自托管与 Tailscale 请使用自定义地址。")),
       React.createElement("form", {
         key: "pairing-form",
@@ -499,7 +557,7 @@ function detail(label, value) {
 function parseNativeState(value) {
   exactObject(value, [
     "schemaVersion", "integration", "authorization", "compatibility", "runtime",
-    "officialServerUrl", "serverUrl", "deviceName", "route", "projectCount", "bindings", "localSync", "codeSync", "pairing", "recoverableError",
+    "officialServerUrl", "serverUrl", "deviceName", "route", "projectCount", "bindings", "localSync", "codeSync", "githubSync", "pairing", "recoverableError",
   ]);
   if (value.schemaVersion !== 2 || value.integration !== "gatherthread") throw new Error("invalid native status identity");
   if (!AUTHORIZATION_STATES.has(value.authorization)) throw new Error("invalid native authorization state");
@@ -524,6 +582,7 @@ function parseNativeState(value) {
   let bindings;
   let localSync;
   let codeSync;
+  let githubSync;
   if (value.route !== undefined || value.bindings !== undefined || value.projectCount !== undefined) {
     if (value.route === undefined || !Number.isSafeInteger(value.projectCount) || value.projectCount < 0
       || !Array.isArray(value.bindings) || value.bindings.length > 100
@@ -564,17 +623,34 @@ function parseNativeState(value) {
       }
       return { ...sync };
     });
-    const codeSyncValue = value.codeSync ?? [];
+    const parseCodeProjects = (codeSyncValue, github = false) => {
     if (!Array.isArray(codeSyncValue) || codeSyncValue.length > 100) throw new Error("invalid code sync status");
-    codeSync = codeSyncValue.map((project) => {
-      exactObject(project, ["projectId", "projectName", "authorized", "status", "error"]);
+    return codeSyncValue.map((project) => {
+      exactObject(project, ["projectId", "projectName", "authorized", "status", "error", ...(github ? ["connection", "branch"] : [])]);
       boundedText(project.projectId, 128);
       boundedText(project.projectName, 160);
       if (typeof project.authorized !== "boolean") throw new Error("invalid code sync authorization");
-      if (project.error !== undefined && !/^code_[a-z_]{1,60}$/u.test(project.error)) throw new Error("invalid code sync error");
+      if (project.error !== undefined && !/^(?:github_)?code_[a-z_]{1,60}$/u.test(project.error)) throw new Error("invalid code sync error");
+      if (github) {
+        if (project.connection !== null) {
+          exactObject(project.connection, ["repository", "base_branch", "revision", "enabled"]);
+          boundedText(project.connection.repository, 160);
+          if (!/^[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+$/u.test(project.connection.repository)) throw new Error("invalid GitHub repository");
+          boundedText(project.connection.base_branch, 255);
+          boundedText(project.connection.revision, 128);
+          if (typeof project.connection.enabled !== "boolean") throw new Error("invalid GitHub state");
+        }
+        if (project.branch !== null) boundedText(project.branch, 255);
+      }
       if (project.status !== undefined) {
         const status = project.status;
-        exactObject(status, ["enabled", "automatic_upload", "local_changes", "file_count", "excluded_count", "base_commit", "cloud_commit", "branch_id", "needs_download", "recovery_directory", "local_status_unknown"]);
+        exactObject(status, ["enabled", "automatic_upload", "local_changes", "file_count", "excluded_count", "base_commit", "cloud_commit", "branch_id", "needs_download", "recovery_directory", "local_status_unknown", ...(github ? ["provider", "repository", "branch", "base_branch"] : [])]);
+        if (github) {
+          if (status.provider !== undefined && status.provider !== "github") throw new Error("invalid code provider");
+          if (status.repository !== undefined && status.repository !== project.connection?.repository) throw new Error("GitHub target mismatch");
+          if (status.base_branch !== undefined && status.base_branch !== project.connection?.base_branch) throw new Error("GitHub base mismatch");
+          if (status.branch !== undefined) boundedText(status.branch, 255);
+        }
         if (status.local_status_unknown !== undefined && typeof status.local_status_unknown !== "boolean") throw new Error("invalid local status flag");
         for (const key of ["enabled", "automatic_upload", "needs_download"]) {
           if (typeof status[key] !== "boolean") throw new Error("invalid code sync flag");
@@ -593,6 +669,9 @@ function parseNativeState(value) {
       }
       return { ...project };
     });
+    };
+    codeSync = parseCodeProjects(value.codeSync ?? []);
+    githubSync = parseCodeProjects(value.githubSync ?? [], true);
   }
   let pairing;
   if (value.pairing !== undefined) {
@@ -628,7 +707,7 @@ function parseNativeState(value) {
     ...(officialServerUrl === undefined ? {} : { officialServerUrl }),
     ...(serverUrl === undefined ? {} : { serverUrl }),
     ...(value.deviceName === undefined ? {} : { deviceName: value.deviceName }),
-    ...(route === undefined ? {} : { route, projectCount: value.projectCount, bindings, localSync, codeSync }),
+    ...(route === undefined ? {} : { route, projectCount: value.projectCount, bindings, localSync, codeSync, githubSync }),
     ...(pairing === undefined ? {} : { pairing }),
     ...(value.recoverableError === undefined ? {} : { recoverableError: value.recoverableError }),
   };