@hunan36/dsh-git-flow 0.4.0 → 0.4.2

package/README.md

@@ -100,7 +100,7 @@ If you would rather not install pnpm at all, the plugin itself does not need it
 - **Use Node's npm**: `cd ~/.dsh/profiles/<profile> && npm install https://github.com/hunan36/dsh-git-flow`
 - **Copy the directory**: drop the whole `dsh-git-flow` folder (including `lib/`) into `<profile>/node_modules/`, for offline or fully manual setups
 
-Both need one extra step: add `dsh-git-flow` to that profile's `dsh.profile.bundles` in its `package.json`, then restart `dsh web`. The plugin page and `dsh plugin add` do that for you; a manual install does not, and the package stays unloaded even though it sits in `node_modules`.
+Both need one extra step: add `@hunan36/dsh-git-flow` to that profile's `dsh.profile.bundles` in its `package.json`, then restart `dsh web`. The plugin page and `dsh plugin add` do that for you; a manual install does not, and the package stays unloaded even though it sits in `node_modules`.
 
 ### Point the plugin page at npm (a machine that only has npm)
 
@@ -234,11 +234,11 @@ After editing `src/`, run **`pnpm build` and commit `lib/` along with it**, or e
 Artifact contract:
 
 - `lib/index.js`: Node ESM, imported directly by the cordis loader.
-- `lib/client.js`: a CJS factory wrapped as `window.__ModuleLoader__.load({ id: "dsh-git-flow", factory: (require) => … })`; `react`, `react/jsx-runtime`, and `@deepseek-ai/dsh-client-ui-primitives` stay external and come from the page's static module table.
+- `lib/client.js`: a CJS factory wrapped as `window.__ModuleLoader__.load({ id: "@hunan36/dsh-git-flow", factory: (require) => … })` (the id is `package.json`'s `name`); `react`, `react/jsx-runtime`, and `@deepseek-ai/dsh-client-ui-primitives` stay external and come from the page's static module table.
 
 ## Compatibility
 
-Developed and verified against `@deepseek-ai/dsh@0.1.6-alpha.2`, with peer and dev dependencies pinned to it. dsh is still alpha, so contracts such as `conversation.input.left`, `ctx.webServer.register`, and `ctx.slots.inject` may drift between minor versions. After upgrading dsh, rebuild and confirm the first line of `lib/client.js` is still `window.__ModuleLoader__.load({ id: "dsh-git-flow"`.
+Developed and verified against `@deepseek-ai/dsh@0.1.6-alpha.2`, with peer and dev dependencies pinned to it. dsh is still alpha, so contracts such as `conversation.input.left`, `ctx.webServer.register`, and `ctx.slots.inject` may drift between minor versions. After upgrading dsh, rebuild and confirm the first line of `lib/client.js` is still `window.__ModuleLoader__.load({ id: "@hunan36/dsh-git-flow"`.
 
 ## Known limits
 
@@ -251,4 +251,4 @@ Developed and verified against `@deepseek-ai/dsh@0.1.6-alpha.2`, with peer and d
 
 ## Verification (0.1.6-alpha.2)
 
-Measured on an isolated `DSH_HOME` with profile `gitflow-web` (`dsh-git-flow` appended to `dsh.profile.bundles`): the chip text equals `git branch --show-current`; the menu lists every local branch plus each remote-only one; search filters rows; switching moves both the chip and the worktree files; a dirty switch is refused and only confirms `--force` after a second dialog; an invalid branch name errors while a valid one is created and switched to; with a single file checked, the model returned a `feat: …` message and `git log -1 --name-only` showed only that file; commit-and-push made the branch appear in `git ls-remote` with its upstream set; a session whose workspace is not a repository renders no chip; the `headless` profile boots with no warning and no routes.
+Measured on an isolated `DSH_HOME` with profile `gitflow-web` (`@hunan36/dsh-git-flow` appended to `dsh.profile.bundles`): the chip text equals `git branch --show-current`; the menu lists every local branch plus each remote-only one; search filters rows; switching moves both the chip and the worktree files; a dirty switch is refused and only confirms `--force` after a second dialog; an invalid branch name errors while a valid one is created and switched to; with a single file checked, the model returned a `feat: …` message and `git log -1 --name-only` showed only that file; commit-and-push made the branch appear in `git ls-remote` with its upstream set; a session whose workspace is not a repository renders no chip; the `headless` profile boots with no warning and no routes.

package/README.zh.md

@@ -99,7 +99,7 @@ npm install -g pnpm        # 装最新的 10.x
 - **用 Node 自带的 npm**：`cd ~/.dsh/profiles/<profile> && npm install https://github.com/hunan36/dsh-git-flow`
 - **直接拷贝**：把整个 `dsh-git-flow` 目录（含 `lib/`）拷进 `<profile>/node_modules/`，适用于离线或纯手工环境
 
-这两种方式都必须**再补一步**：把 `dsh-git-flow` 加进该 profile `package.json` 的 `dsh.profile.bundles`，然后重启 `dsh web` —— 插件页和 `dsh plugin add` 会自动做这一步，手工装则要自己写，否则包在 `node_modules` 里也不会被加载。
+这两种方式都必须**再补一步**：把 `@hunan36/dsh-git-flow` 加进该 profile `package.json` 的 `dsh.profile.bundles`，然后重启 `dsh web` —— 插件页和 `dsh plugin add` 会自动做这一步，手工装则要自己写，否则包在 `node_modules` 里也不会被加载。
 
 ### 让插件页改用 npm（机器上只有 npm）
 
@@ -236,14 +236,14 @@ pnpm build       # tsc -> lib/types/**，tsdown -> lib/index.js + lib/client.js
 产物契约：
 
 - `lib/index.js`：Node ESM，被 cordis loader 直接 import。
-- `lib/client.js`：CJS 工厂包成 `window.__ModuleLoader__.load({ id: "dsh-git-flow", factory: (require) => … })`；
+- `lib/client.js`：CJS 工厂包成 `window.__ModuleLoader__.load({ id: "@hunan36/dsh-git-flow", factory: (require) => … })`（id 取 `package.json` 的 `name`）；
   `react`、`react/jsx-runtime`、`@deepseek-ai/dsh-client-ui-primitives` 保持 external，由页面静态模块表提供。
 
 ## 兼容性
 
 针对 `@deepseek-ai/dsh@0.1.6-alpha.2` 实测开发，peer/devDependencies 锁在该版本。dsh 尚在 alpha，
 `conversation.input.left`、`ctx.webServer.register`、`ctx.slots.inject` 等契约可能在小版本间漂移；
-升级 dsh 后请重跑构建并确认 `lib/client.js` 首行仍是 `window.__ModuleLoader__.load({ id: "dsh-git-flow"`。
+升级 dsh 后请重跑构建并确认 `lib/client.js` 首行仍是 `window.__ModuleLoader__.load({ id: "@hunan36/dsh-git-flow"`。
 
 ## 已知边界
 
@@ -256,7 +256,7 @@ pnpm build       # tsc -> lib/types/**，tsdown -> lib/index.js + lib/client.js
 
 ## 验证记录（0.1.6-alpha.2）
 
-独立 `DSH_HOME` + profile `gitflow-web`（bundles 追加 `dsh-git-flow`）实测：胶囊文本 == `git branch --show-current`；
+独立 `DSH_HOME` + profile `gitflow-web`（bundles 追加 `@hunan36/dsh-git-flow`）实测：胶囊文本 == `git branch --show-current`；
 弹层行数 == 本地分支 + 仅在远端；搜索过滤；切分支后胶囊与工作区文件同步；脏工作区切换被拦下并弹二次确认（`--force` 才丢弃改动）；
 非法分支名报错、合法名创建并切换；勾选单个文件生成 AI 信息（`feat: …`）并只提交该文件（`git log -1 --name-only` 验证）；
 提交并推送后 `git ls-remote` 出现该分支且建立 upstream；非 git 工作区会话里胶囊不渲染；`headless` profile 启动无警告、无路由。

package/cordis.patch.yml

@@ -1,3 +1,3 @@
 - insert:
     - id: git-flow
-      name: 'dsh-git-flow'
+      name: '@hunan36/dsh-git-flow'

package/lib/index.js

@@ -663,14 +663,16 @@ var GitFlow = class extends Service {
 	async checkout(sessionId, name, force = false) {
 		const repo = await this.resolveRepo(sessionId);
 		assertBranchName(name);
+		const target = await this.unqualifiedName(repo, name);
 		const args = ["switch"];
 		if (force) args.push("--force");
-		if (await this.hasLocalBranch(repo, name)) args.push(name);
+		if (await this.hasLocalBranch(repo, target)) args.push(target);
 		else {
-			const remotes = await this.remoteBranches(repo, name);
-			if (remotes.length > 1) throw new GitError("git/invalid-input", `branch ${name} exists on multiple remotes: ${remotes.join(", ")}`);
-			if (remotes.length === 1) args.push("-c", name, "--track", remotes[0]);
-			else args.push(name);
+			const remotes = await this.remoteBranches(repo, target);
+			const tracking = remotes.includes(name) ? name : remotes.length === 1 ? remotes[0] : void 0;
+			if (tracking !== void 0) args.push("-c", target, "--track", tracking);
+			else if (remotes.length > 1) throw new GitError("git/invalid-input", `branch ${target} exists on multiple remotes: ${remotes.join(", ")}`);
+			else args.push(target);
 		}
 		await this.runSwitch(repo, args);
 		return this.status(sessionId);
@@ -1202,6 +1204,20 @@ var GitFlow = class extends Service {
 			`refs/heads/${name}`
 		])).exitCode === 0;
 	}
+	/**
+	* Turn a branch row's name into something `git switch` accepts. Remote-only
+	* rows are labelled `<remote>/<branch>` because that is their short refname,
+	* but git refuses to switch to a remote ref directly; stripping the prefix
+	* lets {@link checkout} create the local tracking branch instead. Only a
+	* known remote is peeled off, and only when no real local branch has that
+	* exact name.
+	*/
+	async unqualifiedName(repo, name) {
+		if (await this.hasLocalBranch(repo, name)) return name;
+		const slash = name.indexOf("/");
+		if (slash <= 0) return name;
+		return (await this.git.runOk(repo, ["remote"])).stdout.split("\n").map((line) => line.trim()).filter(Boolean).includes(name.slice(0, slash)) ? name.slice(slash + 1) : name;
+	}
 	async remoteBranches(repo, name) {
 		return (await this.git.runOk(repo, [
 			"for-each-ref",

package/lib/types/service.d.ts

@@ -173,6 +173,15 @@ export declare class GitFlow extends Service {
      */
     private changedInIndex;
     private hasLocalBranch;
+    /**
+     * Turn a branch row's name into something `git switch` accepts. Remote-only
+     * rows are labelled `<remote>/<branch>` because that is their short refname,
+     * but git refuses to switch to a remote ref directly; stripping the prefix
+     * lets {@link checkout} create the local tracking branch instead. Only a
+     * known remote is peeled off, and only when no real local branch has that
+     * exact name.
+     */
+    private unqualifiedName;
     private remoteBranches;
     private runSwitch;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hunan36/dsh-git-flow",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Workspace git branch switcher, commit composer with AI-written messages, and push for DeepSeek Harness",
   "keywords": [
     "dsh",