@hunan36/dsh-git-flow 0.4.1 → 0.4.2

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.1",
+  "version": "0.4.2",
   "description": "Workspace git branch switcher, commit composer with AI-written messages, and push for DeepSeek Harness",
   "keywords": [
     "dsh",