dsh-git-branch-manage 1.0.3 → 1.0.5

package/lib/git.d.ts

@@ -148,15 +148,17 @@ export declare function cutoutBranchName(exec: Exec, repoRoot: string, base: str
  */
 export declare function addWorktreeCutout(exec: Exec, repoRoot: string, base: string, newBranch: string, targetPath: string): Promise<void>;
 /**
- * In-place branch switch of the main checkout. A remote display name relies
+ * In-place branch switch of one checkout. A remote display name relies
  * on git's dwim: `git switch <local>` creates the tracking branch when
  * exactly one remote has it.
  * @param exec - executor seam.
- * @param repoRoot - main worktree directory.
+ * @param checkoutDir - the directory whose OWN checkout moves: the queried
+ * session's toplevel, so a linked worktree switches itself rather than the
+ * main checkout. `worktree prune` still runs here (it is repo-wide).
  * @param branch - branch display name.
  * @returns the local branch name now checked out.
  */
-export declare function switchBranch(exec: Exec, repoRoot: string, branch: string): Promise<string>;
+export declare function switchBranch(exec: Exec, checkoutDir: string, branch: string): Promise<string>;
 /**
  * Create a NEW branch. Three shapes:
  *
@@ -205,6 +207,20 @@ export declare function renameBranch(exec: Exec, repoRoot: string, name: string,
  * @returns the name of the branch that was deleted.
  */
 export declare function deleteBranch(exec: Exec, repoRoot: string, name: string): Promise<string>;
+/**
+ * argv prefix for network READ commands when cn-accelerate is on: the
+ * per-command `url.<base>.insteadOf=https://github.com/` rewrite. Per-command
+ * `git -c` (before the subcommand) rather than the user's global git config —
+ * the plugin must never persist settings on the user's behalf, and one
+ * injected value cannot leak into unrelated git runs. Rewrites
+ * `https://github.com/o/r.git` → `<base>https://github.com/o/r.git`, which is
+ * how public mirror prefixes consume GitHub URLs.
+ * @param prefix - the accelerate URL (raw or normalized); undefined = off.
+ * @returns the `-c` pair to prepend, or `[]` when off or the value is
+ * unusable (an invalid value fails SAFE to a direct connection — config
+ * validation rejects such values at load; this is the defensive path).
+ */
+export declare function accelArgs(prefix: string | undefined): readonly string[];
 /**
  * Sync remote-tracking refs: fetch every remote and prune tracking branches
  * the remotes no longer carry (the CLI equivalent of IDEA's "synchronize
@@ -213,8 +229,10 @@ export declare function deleteBranch(exec: Exec, repoRoot: string, name: string)
  * executor's hard timeout as a GitError.
  * @param exec - executor seam.
  * @param repoRoot - main worktree directory (fetch is repository-wide).
+ * @param accelPrefix - optional cn-accelerate mirror prefix (see
+ * {@link accelArgs}); only the READ half of the network commands gets it.
  */
-export declare function fetchAll(exec: Exec, repoRoot: string): Promise<void>;
+export declare function fetchAll(exec: Exec, repoRoot: string, accelPrefix?: string): Promise<void>;
 /** Outcome of {@link updateBranch}: the branch touched and whether it moved. */
 export interface UpdateOutcome {
     branch: string;
@@ -231,10 +249,12 @@ export interface UpdateOutcome {
  * branch ITS worktree holds.
  * @param exec - executor seam.
  * @param cwd - directory whose checked-out branch is updated.
+ * @param accelPrefix - optional cn-accelerate mirror prefix; feeds ONLY the
+ * fetch phase ({@link fetchAll}) — the `--ff-only` merge is local.
  * @returns the branch name and whether HEAD actually moved (false = the
  * upstream already contained it).
  */
-export declare function updateBranch(exec: Exec, cwd: string): Promise<UpdateOutcome>;
+export declare function updateBranch(exec: Exec, cwd: string, accelPrefix?: string): Promise<UpdateOutcome>;
 /** Outcome of {@link pushBranch}: the branch touched and whether it moved. */
 export interface PushOutcome {
     branch: string;
@@ -247,7 +267,11 @@ export interface PushOutcome {
  * git's own message rather than silently picking one), and `--force` is
  * never passed — a diverged remote refuses rather than losing commits.
  * Runs at the queried directory's own toplevel, so a linked-worktree
- * session pushes the branch ITS worktree holds.
+ * session pushes the branch ITS worktree holds. The cn-accelerate rewrite is
+ * deliberately NEVER injected here (no {@link accelArgs} parameter exists):
+ * public mirrors have no `receive-pack`, and rewriting would turn a
+ * diagnosable direct failure into an opaque mirror failure while leaking the
+ * pushed content to a third party.
  * @param exec - executor seam.
  * @param cwd - directory whose checked-out branch is pushed.
  * @returns the branch and whether the remote-tracking ref changed. A branch

package/lib/git.js

@@ -7,7 +7,7 @@ import { execFile } from 'node:child_process';
 import { existsSync, readdirSync } from 'node:fs';
 import { appendFile, mkdir, readFile, rm } from 'node:fs/promises';
 import { basename, dirname, isAbsolute, join, normalize, resolve } from 'node:path';
-import { localBranchName } from './normalize.js';
+import { accelerateUrlError, localBranchName, normalizeAccelerateUrl } from './normalize.js';
 /** Failure of one git invocation: non-zero exit with the stderr text. */
 export class GitError extends Error {
     args;
@@ -374,20 +374,22 @@ export async function addWorktreeCutout(exec, repoRoot, base, newBranch, targetP
     await git(exec, repoRoot, ['worktree', 'add', targetPath, '-b', newBranch, base]);
 }
 /**
- * In-place branch switch of the main checkout. A remote display name relies
+ * In-place branch switch of one checkout. A remote display name relies
  * on git's dwim: `git switch <local>` creates the tracking branch when
  * exactly one remote has it.
  * @param exec - executor seam.
- * @param repoRoot - main worktree directory.
+ * @param checkoutDir - the directory whose OWN checkout moves: the queried
+ * session's toplevel, so a linked worktree switches itself rather than the
+ * main checkout. `worktree prune` still runs here (it is repo-wide).
  * @param branch - branch display name.
  * @returns the local branch name now checked out.
  */
-export async function switchBranch(exec, repoRoot, branch) {
-    const resolved = await resolveBranch(exec, repoRoot, branch);
+export async function switchBranch(exec, checkoutDir, branch) {
+    const resolved = await resolveBranch(exec, checkoutDir, branch);
     if (resolved === undefined)
         throw new GitError(['switch'], 1, `branch "${branch}" not found`);
     try {
-        await git(exec, repoRoot, ['switch', resolved.local]);
+        await git(exec, checkoutDir, ['switch', resolved.local]);
     }
     catch (error) {
         // A stale worktree registration claims the branch; prune (no-op on a
@@ -395,8 +397,8 @@ export async function switchBranch(exec, repoRoot, branch) {
         const stale = error instanceof GitError && error.stderr.includes('already used by worktree');
         if (!stale)
             throw error;
-        await git(exec, repoRoot, ['worktree', 'prune']);
-        await git(exec, repoRoot, ['switch', resolved.local]);
+        await git(exec, checkoutDir, ['worktree', 'prune']);
+        await git(exec, checkoutDir, ['switch', resolved.local]);
     }
     return resolved.local;
 }
@@ -462,6 +464,24 @@ export async function deleteBranch(exec, repoRoot, name) {
     await git(exec, repoRoot, ['branch', '-d', name]);
     return name;
 }
+/**
+ * argv prefix for network READ commands when cn-accelerate is on: the
+ * per-command `url.<base>.insteadOf=https://github.com/` rewrite. Per-command
+ * `git -c` (before the subcommand) rather than the user's global git config —
+ * the plugin must never persist settings on the user's behalf, and one
+ * injected value cannot leak into unrelated git runs. Rewrites
+ * `https://github.com/o/r.git` → `<base>https://github.com/o/r.git`, which is
+ * how public mirror prefixes consume GitHub URLs.
+ * @param prefix - the accelerate URL (raw or normalized); undefined = off.
+ * @returns the `-c` pair to prepend, or `[]` when off or the value is
+ * unusable (an invalid value fails SAFE to a direct connection — config
+ * validation rejects such values at load; this is the defensive path).
+ */
+export function accelArgs(prefix) {
+    if (prefix === undefined || accelerateUrlError(prefix) !== undefined)
+        return [];
+    return ['-c', `url.${normalizeAccelerateUrl(prefix)}.insteadOf=https://github.com/`];
+}
 /**
  * Sync remote-tracking refs: fetch every remote and prune tracking branches
  * the remotes no longer carry (the CLI equivalent of IDEA's "synchronize
@@ -470,9 +490,11 @@ export async function deleteBranch(exec, repoRoot, name) {
  * executor's hard timeout as a GitError.
  * @param exec - executor seam.
  * @param repoRoot - main worktree directory (fetch is repository-wide).
+ * @param accelPrefix - optional cn-accelerate mirror prefix (see
+ * {@link accelArgs}); only the READ half of the network commands gets it.
  */
-export async function fetchAll(exec, repoRoot) {
-    await git(exec, repoRoot, ['fetch', '--all', '--prune'], NETWORK_TIMEOUT_MS);
+export async function fetchAll(exec, repoRoot, accelPrefix) {
+    await git(exec, repoRoot, [...accelArgs(accelPrefix), 'fetch', '--all', '--prune'], NETWORK_TIMEOUT_MS);
 }
 /**
  * Update the CURRENT checkout: fetch every remote, then fast-forward the
@@ -485,11 +507,13 @@ export async function fetchAll(exec, repoRoot) {
  * branch ITS worktree holds.
  * @param exec - executor seam.
  * @param cwd - directory whose checked-out branch is updated.
+ * @param accelPrefix - optional cn-accelerate mirror prefix; feeds ONLY the
+ * fetch phase ({@link fetchAll}) — the `--ff-only` merge is local.
  * @returns the branch name and whether HEAD actually moved (false = the
  * upstream already contained it).
  */
-export async function updateBranch(exec, cwd) {
-    await fetchAll(exec, cwd);
+export async function updateBranch(exec, cwd, accelPrefix) {
+    await fetchAll(exec, cwd, accelPrefix);
     const before = (await git(exec, cwd, ['rev-parse', 'HEAD'])).trim();
     await git(exec, cwd, ['merge', '--ff-only', '@{u}']);
     const after = (await git(exec, cwd, ['rev-parse', 'HEAD'])).trim();
@@ -503,7 +527,11 @@ export async function updateBranch(exec, cwd) {
  * git's own message rather than silently picking one), and `--force` is
  * never passed — a diverged remote refuses rather than losing commits.
  * Runs at the queried directory's own toplevel, so a linked-worktree
- * session pushes the branch ITS worktree holds.
+ * session pushes the branch ITS worktree holds. The cn-accelerate rewrite is
+ * deliberately NEVER injected here (no {@link accelArgs} parameter exists):
+ * public mirrors have no `receive-pack`, and rewriting would turn a
+ * diagnosable direct failure into an opaque mirror failure while leaking the
+ * pushed content to a third party.
  * @param exec - executor seam.
  * @param cwd - directory whose checked-out branch is pushed.
  * @returns the branch and whether the remote-tracking ref changed. A branch

package/lib/index.d.ts

@@ -25,6 +25,11 @@ export interface Config {
     /** Post-create configuration files to copy when .worktreeinclude is absent;
      * absent = none. */
     postCreateCopyFiles?: Volatile<string[]> | string[];
+    /** cn-accelerate mirror rewrite for network READ commands (fetch/update);
+     * absent = off. PUSH is never rewritten. */
+    cnAccelerate?: Volatile<boolean> | boolean;
+    /** cn-accelerate mirror prefix; absent = the shipped default. */
+    cnAccelerateUrl?: Volatile<string> | string;
 }
 /** The shipped prune cap (whole storage root, valid git worktrees only). */
 export declare const KEEP_WORKTREES_DEFAULT = 30;
@@ -36,6 +41,13 @@ export declare const KEEP_WORKTREES_DEFAULT = 30;
 export declare const Config: z;
 /** Reject stale or misspelled config keys before defaults can hide them. */
 export declare function validateConfig(config: Config): void;
+/**
+ * The accelerate prefix must be an http(s) URL without whitespace — it is
+ * concatenated with `https://github.com/` into one `url.<base>.insteadOf`
+ * config value, so a space would smuggle arguments and a non-http scheme is
+ * not a fetchable remote. Absent = the shipped default, which passes.
+ */
+export declare function validateCnAccelerateUrl(value: string | undefined): void;
 /**
  * The prune cap must be an integer >= 1: 0 would read as "create then
  * immediately self-delete" (the fresh worktree is excluded, but every other
@@ -60,6 +72,10 @@ export interface SectionConfig {
     keepWorktrees?: number;
     /** Post-create configuration files to copy when .worktreeinclude is absent. */
     postCreateCopyFiles?: string[];
+    /** cn-accelerate mirror rewrite for network READ commands; absent = off. */
+    cnAccelerate?: boolean;
+    /** cn-accelerate mirror prefix; absent = the shipped default. */
+    cnAccelerateUrl?: string;
 }
 /** The section-shaped view of a config: absent keys stay absent
  * (`exactOptionalPropertyTypes`) except the switches, which spell their

package/lib/index.js

@@ -8,6 +8,7 @@
 import { homedir } from 'node:os';
 import z from '@deepseek-ai/schemastery';
 import { childProcessExec } from './git.js';
+import { ACCEL_DEFAULT_URL, accelerateUrlError } from './normalize.js';
 import { handleAiCommitMessage, handleChanges, handleCommit, handleCommitFiles, handleCreateBranch, handleCreateWorktree, handleDeleteBranch, handleEnsureDirectory, handleFetch, handleGroupWorktrees, handleInspectWorktree, handleLog, handlePathExists, handlePurgeDirectory, handleRemoveWorktree, handleRenameBranch, handleStage, handleStatus, handleSwitch, handleUpdate, handlePush, handleWorktreesAll, } from './routes.js';
 import { validateRootDir } from './settings.js';
 import { ROUTE_AI_COMMIT_MESSAGE, ROUTE_BRANCH, ROUTE_BRANCH_DELETE, ROUTE_BRANCH_RENAME, ROUTE_CHANGES, ROUTE_COMMIT, ROUTE_COMMIT_FILES, ROUTE_ENSURE_DIRECTORY, ROUTE_EXISTS, ROUTE_FETCH, ROUTE_GROUP, ROUTE_INSPECT, ROUTE_LOG, ROUTE_PUSH, ROUTE_PURGE, ROUTE_REMOVE, ROUTE_STAGE, ROUTE_STATUS, ROUTE_SWITCH, ROUTE_UPDATE, ROUTE_WORKTREE, ROUTE_WORKTREES_ALL } from './wire.js';
@@ -37,10 +38,12 @@ export const Config = z.object({
     autoPruneWorktrees: z.boolean().default(false).volatile(),
     keepWorktrees: z.number().default(KEEP_WORKTREES_DEFAULT).volatile(),
     postCreateCopyFiles: z.array(z.string()).default([]).volatile(),
+    cnAccelerate: z.boolean().default(false).volatile(),
+    cnAccelerateUrl: z.string().default(ACCEL_DEFAULT_URL).volatile(),
 });
 /** Reject stale or misspelled config keys before defaults can hide them. */
 export function validateConfig(config) {
-    const unknown = Object.keys(config).find(key => key !== 'rootDir' && key !== 'groupSidebar' && key !== 'fetchBeforeCreate' && key !== 'autoPruneWorktrees' && key !== 'keepWorktrees' && key !== 'postCreateCopyFiles');
+    const unknown = Object.keys(config).find(key => key !== 'rootDir' && key !== 'groupSidebar' && key !== 'fetchBeforeCreate' && key !== 'autoPruneWorktrees' && key !== 'keepWorktrees' && key !== 'postCreateCopyFiles' && key !== 'cnAccelerate' && key !== 'cnAccelerateUrl');
     if (unknown !== undefined) {
         throw new Error(`GitWorktreeConfig: unknown key "${unknown}"`);
     }
@@ -66,9 +69,27 @@ export function validateConfig(config) {
             throw new Error('GitWorktreeConfig: "postCreateCopyFiles" must be an array of strings');
         }
     }
+    const cnAccelerate = readVolatile(config.cnAccelerate);
+    if (cnAccelerate !== undefined && typeof cnAccelerate !== 'boolean') {
+        throw new Error('GitWorktreeConfig: "cnAccelerate" must be a boolean');
+    }
+    validateCnAccelerateUrl(readVolatile(config.cnAccelerateUrl));
     validateKeepWorktrees(readVolatile(config.keepWorktrees));
     validateRootDir(root);
 }
+/**
+ * The accelerate prefix must be an http(s) URL without whitespace — it is
+ * concatenated with `https://github.com/` into one `url.<base>.insteadOf`
+ * config value, so a space would smuggle arguments and a non-http scheme is
+ * not a fetchable remote. Absent = the shipped default, which passes.
+ */
+export function validateCnAccelerateUrl(value) {
+    if (value === undefined)
+        return;
+    if (typeof value !== 'string' || accelerateUrlError(value) !== undefined) {
+        throw new Error('GitWorktreeConfig: "cnAccelerateUrl" must be an http(s) URL without whitespace');
+    }
+}
 /**
  * The prune cap must be an integer >= 1: 0 would read as "create then
  * immediately self-delete" (the fresh worktree is excluded, but every other
@@ -94,14 +115,18 @@ export function sectionOf(config) {
     const fetchBeforeCreate = readVolatile(config.fetchBeforeCreate);
     const autoPruneWorktrees = readVolatile(config.autoPruneWorktrees);
     const keepWorktrees = readVolatile(config.keepWorktrees);
+    const cnAccelerate = readVolatile(config.cnAccelerate);
+    const cnAccelerateUrl = readVolatile(config.cnAccelerateUrl);
     return {
         ...(rootDir === undefined ? {} : { rootDir }),
         ...(postCreateCopyFiles === undefined ? {} : { postCreateCopyFiles }),
+        ...(cnAccelerateUrl === undefined ? {} : { cnAccelerateUrl }),
         // The composition layer spells the shipped defaults so a user-layer
         // unset can always fall back to them.
         groupSidebar: groupSidebar ?? true,
         fetchBeforeCreate: fetchBeforeCreate ?? false,
         autoPruneWorktrees: autoPruneWorktrees ?? false,
+        cnAccelerate: cnAccelerate ?? false,
         keepWorktrees: keepWorktrees ?? KEEP_WORKTREES_DEFAULT,
     };
 }
@@ -119,6 +144,8 @@ export function apply(ctx, config = {}) {
         sectionRootDir: () => readVolatile(currentConfig().rootDir),
         sectionFetchBeforeCreate: () => readVolatile(currentConfig().fetchBeforeCreate),
         sectionPostCreateCopyFiles: () => readVolatile(currentConfig().postCreateCopyFiles),
+        sectionCnAccelerate: () => readVolatile(currentConfig().cnAccelerate),
+        sectionCnAccelerateUrl: () => readVolatile(currentConfig().cnAccelerateUrl),
         home: () => homedir(),
         envHome: () => process.env.DSH_HOME,
     });

package/lib/normalize.d.ts

@@ -1,7 +1,8 @@
 /**
- * Pure branch/path name normalization for worktree directory placement.
- * Windows-forbidden characters are the governing constraint: a worktree
- * folder name must survive on every platform the host runs on.
+ * Pure name/URL normalization shared by the host (git command assembly,
+ * config validation) and the client (forms). Windows-forbidden characters
+ * govern worktree directory placement: a worktree folder name must survive
+ * on every platform the host runs on.
  */
 /**
  * Turn a branch display name into a single safe directory segment.
@@ -56,3 +57,27 @@ export type BranchNameIssue = 'empty' | 'leadingDash' | 'illegal';
  * @returns the issue kind, or null when the name is acceptable.
  */
 export declare function branchNameIssue(name: string): BranchNameIssue | null;
+/**
+ * Shipped default for the cn-accelerate mirror prefix (the design doc's
+ * `cnAccelerateUrl` default and the popover's「恢复默认」target).
+ */
+export declare const ACCEL_DEFAULT_URL = "https://gh-proxy.com/";
+/** Why a user-typed accelerate URL is not acceptable yet (undefined = fine). */
+export type AccelerateUrlIssue = 'empty' | 'invalid';
+/**
+ * Pre-flight check of the cn-accelerate prefix against what the rewrite can
+ * actually use: non-empty after trim, `http://` or `https://` scheme, and no
+ * whitespace anywhere (a space would break the `url.<base>.insteadOf=<target>`
+ * git config value and smuggle a second argument).
+ * @param value - raw draft text.
+ * @returns the issue kind, or undefined when the value is acceptable.
+ */
+export declare function accelerateUrlError(value: string): AccelerateUrlIssue | undefined;
+/**
+ * Normalize an accepted accelerate URL: trim, and append the trailing `/`
+ * the prefix concatenation requires (`https://gh-proxy.com/` + `o/r.git`
+ * must stay one valid URL). Callers pass the result to `url.<base>.insteadOf`.
+ * @param value - an accepted (non-empty, http(s), whitespace-free) URL.
+ * @returns the prefix ending in `/`.
+ */
+export declare function normalizeAccelerateUrl(value: string): string;

package/lib/normalize.js

@@ -1,7 +1,8 @@
 /**
- * Pure branch/path name normalization for worktree directory placement.
- * Windows-forbidden characters are the governing constraint: a worktree
- * folder name must survive on every platform the host runs on.
+ * Pure name/URL normalization shared by the host (git command assembly,
+ * config validation) and the client (forms). Windows-forbidden characters
+ * govern worktree directory placement: a worktree folder name must survive
+ * on every platform the host runs on.
  */
 /**
  * Turn a branch display name into a single safe directory segment.
@@ -91,3 +92,37 @@ export function branchNameIssue(name) {
         return 'illegal';
     return null;
 }
+/**
+ * Shipped default for the cn-accelerate mirror prefix (the design doc's
+ * `cnAccelerateUrl` default and the popover's「恢复默认」target).
+ */
+export const ACCEL_DEFAULT_URL = 'https://gh-proxy.com/';
+/**
+ * Pre-flight check of the cn-accelerate prefix against what the rewrite can
+ * actually use: non-empty after trim, `http://` or `https://` scheme, and no
+ * whitespace anywhere (a space would break the `url.<base>.insteadOf=<target>`
+ * git config value and smuggle a second argument).
+ * @param value - raw draft text.
+ * @returns the issue kind, or undefined when the value is acceptable.
+ */
+export function accelerateUrlError(value) {
+    const trimmed = value.trim();
+    if (trimmed === '')
+        return 'empty';
+    if (/\s/.test(trimmed))
+        return 'invalid';
+    if (!trimmed.startsWith('http://') && !trimmed.startsWith('https://'))
+        return 'invalid';
+    return undefined;
+}
+/**
+ * Normalize an accepted accelerate URL: trim, and append the trailing `/`
+ * the prefix concatenation requires (`https://gh-proxy.com/` + `o/r.git`
+ * must stay one valid URL). Callers pass the result to `url.<base>.insteadOf`.
+ * @param value - an accepted (non-empty, http(s), whitespace-free) URL.
+ * @returns the prefix ending in `/`.
+ */
+export function normalizeAccelerateUrl(value) {
+    const trimmed = value.trim();
+    return trimmed.endsWith('/') ? trimmed : `${trimmed}/`;
+}

package/lib/routes.d.ts

@@ -14,6 +14,10 @@ export interface RouteDeps {
     sectionFetchBeforeCreate: () => boolean | undefined;
     /** Post-create configuration files to copy when .worktreeinclude is absent. */
     sectionPostCreateCopyFiles?: () => string[] | undefined;
+    /** Whether the cn-accelerate mirror rewrite is on (absent = off). */
+    sectionCnAccelerate?: () => boolean | undefined;
+    /** The cn-accelerate mirror prefix (absent = the shipped default). */
+    sectionCnAccelerateUrl?: () => string | undefined;
     /** User home directory seam. */
     home: () => string;
     /** `$DSH_HOME` environment value seam. */
@@ -120,7 +124,12 @@ export declare function handleStatus(deps: RouteDeps, path: string | undefined):
  */
 export declare function handleCreateWorktree(deps: RouteDeps, body: unknown): Promise<RouteOutcome>;
 /**
- * POST /switch 鈥?in-place branch switch of the main checkout.
+ * POST /switch — in-place branch switch of the QUERIED directory's own
+ * checkout. A main-checkout session switches the main checkout; a linked
+ * worktree session switches ITS worktree. (It used to always run in the
+ * main checkout: a worktree session's checkout appeared to succeed while its
+ * own branch never moved. git itself refuses a branch another worktree
+ * holds — an honest error beats moving a checkout nobody was looking at.)
  * @param deps - host dependencies.
  * @param body - parsed request body.
  */

package/lib/routes.js

@@ -6,7 +6,7 @@ import { basename, dirname, join, resolve } from 'node:path';
 import { mkdir, readdir, rm, stat } from 'node:fs/promises';
 import { runPostCreateCopy } from './copy-files.js';
 import { appendWorktreeExclude, fsExcludeSeams, GitError, addWorktree, addWorktreeCutout, collectAiDiff, commitFiles, commitIndex, createBranch, cutoutBranchName, deleteBranch, fetchAll, fsDirExists, inspectWorktree, isAbsoluteDir, isStageablePath, logHistory, probeRepo, probeWorkspaceGit, removeWorktree, renameBranch, resolveBranch, pushBranch, stagePaths, switchBranch, updateBranch, workingChanges } from './git.js';
-import { isAbsoluteConfigPath, sanitizeBranchDir } from './normalize.js';
+import { ACCEL_DEFAULT_URL, accelerateUrlError, isAbsoluteConfigPath, normalizeAccelerateUrl, sanitizeBranchDir } from './normalize.js';
 import { resolveRootDir } from './settings.js';
 import { COMMIT_MESSAGE_LIMIT } from './wire.js';
 /** Real fs-backed one-level directory listing (names only). Plain FILES are
@@ -39,6 +39,18 @@ export async function fsMkdirRecursive(path) {
 function fail(status, error) {
     return { status, body: { error } };
 }
+/**
+ * The rewrite prefix for one request's network READ commands: the cn-accelerate
+ * mirror prefix when the switch is on and the URL setting is usable (the
+ * shipped default fills an absent URL), else undefined — no injection and the
+ * direct connection runs unchanged. PUSH never consults this helper.
+ */
+function accelPrefix(deps) {
+    if (deps.sectionCnAccelerate?.() !== true)
+        return undefined;
+    const url = deps.sectionCnAccelerateUrl?.() ?? ACCEL_DEFAULT_URL;
+    return accelerateUrlError(url) === undefined ? normalizeAccelerateUrl(url) : undefined;
+}
 /** Upper bound on distinct paths one /group request may probe. */
 const GROUP_PATHS_LIMIT = 256;
 /** Probes per in-flight batch — polite on Windows, where each git call is a
@@ -414,7 +426,7 @@ export async function handleCreateWorktree(deps, body) {
             const resolved = await resolveBranch(deps.exec, facts.repoRoot, branch);
             if (resolved?.remote !== undefined) {
                 try {
-                    await fetchAll(deps.exec, facts.repoRoot);
+                    await fetchAll(deps.exec, facts.repoRoot, accelPrefix(deps));
                 }
                 catch (error) {
                     fetchWarning = error instanceof GitError ? error.stderr.trim() : error instanceof Error ? error.message : String(error);
@@ -471,7 +483,12 @@ export async function handleCreateWorktree(deps, body) {
     }
 }
 /**
- * POST /switch 鈥?in-place branch switch of the main checkout.
+ * POST /switch — in-place branch switch of the QUERIED directory's own
+ * checkout. A main-checkout session switches the main checkout; a linked
+ * worktree session switches ITS worktree. (It used to always run in the
+ * main checkout: a worktree session's checkout appeared to succeed while its
+ * own branch never moved. git itself refuses a branch another worktree
+ * holds — an honest error beats moving a checkout nobody was looking at.)
  * @param deps - host dependencies.
  * @param body - parsed request body.
  */
@@ -488,7 +505,7 @@ export async function handleSwitch(deps, body) {
         const facts = await probeRepo(deps.exec, repoPath, deps.dirExists);
         if (facts === undefined)
             return fail(400, `"${repoPath}" is not inside a git repository`);
-        const switched = await switchBranch(deps.exec, facts.repoRoot, branch);
+        const switched = await switchBranch(deps.exec, facts.toplevel, branch);
         const result = { branch: switched };
         return { status: 200, body: result };
     }
@@ -644,7 +661,7 @@ export async function handleFetch(deps, body) {
         const facts = await probeRepo(deps.exec, repoPath, deps.dirExists);
         if (facts === undefined)
             return fail(400, `"${repoPath}" is not inside a git repository`);
-        await fetchAll(deps.exec, facts.repoRoot);
+        await fetchAll(deps.exec, facts.repoRoot, accelPrefix(deps));
         const result = { remote: 'all' };
         return { status: 200, body: result };
     }
@@ -677,7 +694,7 @@ export async function handleUpdate(deps, body) {
         // session "update current branch" means the branch that worktree holds.
         // `repoRoot` would fast-forward the main checkout behind the user's back
         // (both are the same directory when the session IS the main checkout).
-        const outcome = await updateBranch(deps.exec, facts.toplevel);
+        const outcome = await updateBranch(deps.exec, facts.toplevel, accelPrefix(deps));
         const result = { branch: outcome.branch, updated: outcome.updated };
         return { status: 200, body: result };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-git-branch-manage",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "提供 git 分支与 worktree 管理：输入框工具栏显示当前分支、可原地切换；支持 IDEA 风格分支选择器、远程分支检出、右键操作菜单（新建/重命名/删除/复制）、推送与更新当前分支，以及把分支隔离到独立 worktree 工作区，并管理其创建与删除。",
   "keywords": [
     "dsh",