✨ feat(vscode): worktree 打开方式可选 VS Code/PyCharm，并修复 handleOpenWorktree 不展开 ~ 的打开报错

- worktree.ts: handleOpenWorktree/handleDeleteWorktree/dispatchImplTabPostCloseAsync 三处改用 resolveWorktreePath，修复带 ~ 的存量路径被拼成 <工作区>/~/... 导致打不开 - 新增全局设置 worktreeOpenWith（'vscode' | 'pycharm'，默认 vscode），贯穿 store/settings handler/messages/KanbanPanel 与 webview 的 messages/useIssues/App/SettingsModal「钩子」分组新增「工作树打开方式」下拉 - handleOpenWorktree 按设置分支：pycharm 走 JetBrains pycharm 启动器，ENOENT 时提示启用命令行启动器 Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-06-24 05:20:22 +08:00
parent 5e7a3d20d9
commit cacc60eb0e
9 changed files with 78 additions and 4 deletions
@@ -841,6 +841,7 @@ export class KanbanWebviewPanel {
        devBranch: s.devBranch,
        autoBuildBranch: s.autoBuildBranch,
        worktreeDirectory: s.worktreeDirectory,
+        worktreeOpenWith: s.worktreeOpenWith,
        worktreePostCreateScript: s.worktreePostCreateScript,
        worktreePreRemoveScript: s.worktreePreRemoveScript,
        implTabPreCreateScript: s.implTabPreCreateScript,
@@ -901,6 +902,7 @@ export class KanbanWebviewPanel {
          devBranch: s.devBranch,
          autoBuildBranch: s.autoBuildBranch,
          worktreeDirectory: s.worktreeDirectory,
+          worktreeOpenWith: s.worktreeOpenWith,
          worktreePostCreateScript: s.worktreePostCreateScript,
          worktreePreRemoveScript: s.worktreePreRemoveScript,
          implTabPreCreateScript: s.implTabPreCreateScript,
@@ -26,6 +26,7 @@ export async function handleSettingsSave(panel: KanbanWebviewPanel, payload: {
  devBranch: string
  autoBuildBranch: string
  worktreeDirectory: string
+  worktreeOpenWith: 'vscode' | 'pycharm'
  worktreePostCreateScript: string
  worktreePreRemoveScript: string
  implTabPreCreateScript: string
@@ -76,6 +77,7 @@ export async function handleSettingsSave(panel: KanbanWebviewPanel, payload: {
      devBranch: trimmedDevBranch || prev.devBranch,
      autoBuildBranch: trimmedAutoBuildBranch,
      worktreeDirectory: trimmedWorktreeDir || prev.worktreeDirectory,
+      worktreeOpenWith: payload.worktreeOpenWith || prev.worktreeOpenWith,
      worktreePostCreateScript: trimmedPostCreate,
      worktreePreRemoveScript: trimmedPreRemove,
      implTabPreCreateScript: trimmedImplPre,
@@ -95,6 +97,7 @@ export async function handleSettingsSave(panel: KanbanWebviewPanel, payload: {
    devBranch: trimmedDevBranch,
    autoBuildBranch: trimmedAutoBuildBranch,
    worktreeDirectory: trimmedWorktreeDir,
+    worktreeOpenWith: payload.worktreeOpenWith,
    worktreePostCreateScript: trimmedPostCreate,
    worktreePreRemoveScript: trimmedPreRemove,
    implTabPreCreateScript: trimmedImplPre,
@@ -175,6 +178,7 @@ export async function handleEditSettingsRequest(panel: KanbanWebviewPanel): Prom
    devBranch: s.devBranch,
    autoBuildBranch: s.autoBuildBranch,
    worktreeDirectory: s.worktreeDirectory,
+    worktreeOpenWith: s.worktreeOpenWith,
    worktreePostCreateScript: s.worktreePostCreateScript,
    worktreePreRemoveScript: s.worktreePreRemoveScript,
    implTabPreCreateScript: s.implTabPreCreateScript,
@@ -1,10 +1,10 @@
 import type { HookContext } from '../../git/worktreeHooks'
 import type { KanbanWebviewPanel } from '../KanbanPanel'
 import { execFile } from 'node:child_process'
-import * as path from 'node:path'
 import { commands, Uri, window, workspace } from 'vscode'
 import { getToken } from '../../auth/secrets'
 import { detectRepo } from '../../git/remote'
+import { resolveWorktreePath } from '../../git/worktree'
 import {
  runImplTabPostCloseHook,
  runImplTabPreCreateHook,
@@ -26,7 +26,26 @@ export async function handleOpenWorktree(panel: KanbanWebviewPanel, relPath: str
    void window.showErrorMessage('请先打开一个工作区文件夹')
    return
  }
-  const abs = path.isAbsolute(relPath) ? relPath : path.join(workspaceRoot, relPath)
+  // 存量工单可能存了带 `~` 的 worktreePath，必须经 resolveWorktreePath 展开，
+  // 否则 path.join(workspaceRoot, '~/...') 会拼出不存在的路径。
+  const abs = resolveWorktreePath(relPath, workspaceRoot)
+
+  // PyCharm 分支用 JetBrains 启动器打开目录。错误在回调里自行处理，不要落进
+  // 下面 openFolder 的 catch。
+  const { worktreeOpenWith } = getSettings(panel.context)
+  if (worktreeOpenWith === 'pycharm') {
+    execFile('pycharm', [abs], (err) => {
+      if (err) {
+        const code = (err as NodeJS.ErrnoException).code ?? 'unknown'
+        const message = code === 'ENOENT'
+          ? '找不到 pycharm 命令，请在 JetBrains Toolbox 里启用命令行启动器或把 pycharm 加入 PATH'
+          : err.message
+        void window.showErrorMessage(`用 PyCharm 打开失败: ${message}`)
+      }
+    })
+    return
+  }
+
  try {
    await commands.executeCommand('vscode.openFolder', Uri.file(abs), true)
  }
@@ -56,7 +75,7 @@ export async function handleDeleteWorktree(panel: KanbanWebviewPanel, issueNumbe
  if (choice !== '删除')
    return

-  const abs = path.isAbsolute(relPath) ? relPath : path.join(workspaceRoot, relPath)
+  const abs = resolveWorktreePath(relPath, workspaceRoot)

  // Run the pre-remove lifecycle hook so the user can tear down resources
  // (close IDE windows, etc.) before the worktree dir vanishes. Best-effort
@@ -265,7 +284,7 @@ export async function dispatchImplTabPostCloseAsync(panel: KanbanWebviewPanel, i
    const wt = typeof stateObj.worktreePath === 'string' ? stateObj.worktreePath : ''
    if (!wt)
      return
-    const absWorktree = path.isAbsolute(wt) ? wt : path.join(workspaceRoot, wt)
+    const absWorktree = resolveWorktreePath(wt, workspaceRoot)
    const settings = getSettings(panel.context)
    await dispatchWorktreeHook(panel, 'impl-tab-post-close', {
      workspaceRoot,
@@ -62,6 +62,7 @@ export type ExtensionToWebview
      devBranch: string
      autoBuildBranch: string
      worktreeDirectory: string
+      worktreeOpenWith: 'vscode' | 'pycharm'
      worktreePostCreateScript: string
      worktreePreRemoveScript: string
      implTabPreCreateScript: string
@@ -117,6 +118,7 @@ export type WebviewToExtension
      devBranch: string
      autoBuildBranch: string
      worktreeDirectory: string
+      worktreeOpenWith: 'vscode' | 'pycharm'
      worktreePostCreateScript: string
      worktreePreRemoveScript: string
      implTabPreCreateScript: string
@@ -94,6 +94,12 @@ export interface Settings {
   * `~/Sources/worktree/$project_name/$feature_name`".
   */
  worktreeDirectory: string
+  /**
+   * Which editor opens a worktree when the user clicks it in the detail
+   * panel. `'pycharm'` shells out to the JetBrains `pycharm` launcher;
+   * `'vscode'` (default) opens a new VS Code window.
+   */
+  worktreeOpenWith: 'vscode' | 'pycharm'
  /**
   * Path to a user-provided shell script that runs *after* the extension
   * creates a worktree via `git worktree add`. Empty string means use the
@@ -166,6 +172,7 @@ function defaults(ctx: ExtensionContext): Settings {
    devBranch: 'main',
    autoBuildBranch: '',
    worktreeDirectory: '~/Sources/worktree/$project_name/$feature_name',
+    worktreeOpenWith: 'vscode',
    worktreePostCreateScript: '',
    worktreePreRemoveScript: '',
    implTabPreCreateScript: '',
@@ -214,6 +221,11 @@ export function getSettings(ctx: ExtensionContext): Settings {
  const worktreeDirectory = typeof stored.worktreeDirectory === 'string' && stored.worktreeDirectory.length > 0
    ? stored.worktreeDirectory
    : base.worktreeDirectory
+  // worktreeOpenWith is an enum — only the two known values are valid; anything
+  // else (legacy installs, garbage) collapses to the default.
+  const worktreeOpenWith = stored.worktreeOpenWith === 'pycharm' || stored.worktreeOpenWith === 'vscode'
+    ? stored.worktreeOpenWith
+    : base.worktreeOpenWith
  // worktree hook script paths: '' is meaningful (= "use default
  // .spx/worktree-*.sh"), so don't coerce. Non-string legacy values fall
  // back to ''. The hook runner resolves '' to the default at execution
@@ -253,6 +265,7 @@ export function getSettings(ctx: ExtensionContext): Settings {
    devBranch,
    autoBuildBranch,
    worktreeDirectory,
+    worktreeOpenWith,
    worktreePostCreateScript,
    worktreePreRemoveScript,
    implTabPreCreateScript,
@@ -446,6 +446,7 @@ export function App() {
        initialDevBranch={settings?.devBranch ?? 'main'}
        initialAutoBuildBranch={settings?.autoBuildBranch ?? ''}
        initialWorktreeDirectory={settings?.worktreeDirectory ?? ''}
+        initialWorktreeOpenWith={settings?.worktreeOpenWith ?? 'vscode'}
        initialWorktreePostCreateScript={settings?.worktreePostCreateScript ?? ''}
        initialWorktreePreRemoveScript={settings?.worktreePreRemoveScript ?? ''}
        initialImplTabPreCreateScript={settings?.implTabPreCreateScript ?? ''}
@@ -24,6 +24,7 @@ interface SubmitValues {
  devBranch: string
  autoBuildBranch: string
  worktreeDirectory: string
+  worktreeOpenWith: 'vscode' | 'pycharm'
  worktreePostCreateScript: string
  worktreePreRemoveScript: string
  implTabPreCreateScript: string
@@ -61,6 +62,7 @@ export interface SettingsModalProps {
  initialDevBranch: string
  initialAutoBuildBranch: string
  initialWorktreeDirectory: string
+  initialWorktreeOpenWith: 'vscode' | 'pycharm'
  initialWorktreePostCreateScript: string
  initialWorktreePreRemoveScript: string
  initialImplTabPreCreateScript: string
@@ -131,6 +133,7 @@ export function SettingsModal({
  initialDevBranch,
  initialAutoBuildBranch,
  initialWorktreeDirectory,
+  initialWorktreeOpenWith,
  initialWorktreePostCreateScript,
  initialWorktreePreRemoveScript,
  initialImplTabPreCreateScript,
@@ -155,6 +158,7 @@ export function SettingsModal({
  const [devBranch, setDevBranch] = useState(initialDevBranch)
  const [autoBuildBranch, setAutoBuildBranch] = useState(initialAutoBuildBranch)
  const [worktreeDirectory, setWorktreeDirectory] = useState(initialWorktreeDirectory)
+  const [worktreeOpenWith, setWorktreeOpenWith] = useState(initialWorktreeOpenWith)
  const [worktreePostCreateScript, setWorktreePostCreateScript] = useState(initialWorktreePostCreateScript)
  const [worktreePreRemoveScript, setWorktreePreRemoveScript] = useState(initialWorktreePreRemoveScript)
  const [implTabPreCreateScript, setImplTabPreCreateScript] = useState(initialImplTabPreCreateScript)
@@ -258,6 +262,7 @@ export function SettingsModal({
      autoBuildBranch: autoBuildBranch.trim(),
      // worktree 目录模板：trim 后留空 = 用默认模板（getSettings 读时回退）
      worktreeDirectory: worktreeDirectory.trim(),
+      worktreeOpenWith,
      // 钩子路径保持原样 trim（前后空格无意义；空串 = 用默认 .spx/*.sh）
      worktreePostCreateScript: worktreePostCreateScript.trim(),
      worktreePreRemoveScript: worktreePreRemoveScript.trim(),
@@ -642,6 +647,28 @@ export function SettingsModal({
                  />
                </Field>

+                <Field
+                  label="工作树打开方式"
+                  hint={(
+                    <>
+                      点击工单详情里的工作树时用哪个编辑器打开。PyCharm 需
+                      {' '}
+                      <code>pycharm</code>
+                      {' '}
+                      命令在 PATH 中（JetBrains Toolbox 里启用命令行启动器）。
+                    </>
+                  )}
+                >
+                  <select
+                    value={worktreeOpenWith}
+                    onChange={e => setWorktreeOpenWith(e.target.value as 'vscode' | 'pycharm')}
+                    className={inputClass}
+                  >
+                    <option value="vscode">VS Code</option>
+                    <option value="pycharm">PyCharm</option>
+                  </select>
+                </Field>
+
                <Field
                  label="worktree 创建后脚本"
                  hint={(
@@ -34,6 +34,7 @@ export interface SettingsValues {
  devBranch: string
  autoBuildBranch: string
  worktreeDirectory: string
+  worktreeOpenWith: 'vscode' | 'pycharm'
  worktreePostCreateScript: string
  worktreePreRemoveScript: string
  implTabPreCreateScript: string
@@ -57,6 +58,7 @@ export interface SettingsOverlayState {
  devBranch: string
  autoBuildBranch: string
  worktreeDirectory: string
+  worktreeOpenWith: 'vscode' | 'pycharm'
  worktreePostCreateScript: string
  worktreePreRemoveScript: string
  implTabPreCreateScript: string
@@ -268,6 +270,7 @@ export function useIssues(): UseIssuesResult {
      devBranch: values.devBranch,
      autoBuildBranch: values.autoBuildBranch,
      worktreeDirectory: values.worktreeDirectory,
+      worktreeOpenWith: values.worktreeOpenWith,
      worktreePostCreateScript: values.worktreePostCreateScript,
      worktreePreRemoveScript: values.worktreePreRemoveScript,
      implTabPreCreateScript: values.implTabPreCreateScript,
@@ -594,6 +597,7 @@ export function useIssues(): UseIssuesResult {
            devBranch: msg.devBranch,
            autoBuildBranch: msg.autoBuildBranch,
            worktreeDirectory: msg.worktreeDirectory,
+            worktreeOpenWith: msg.worktreeOpenWith,
            worktreePostCreateScript: msg.worktreePostCreateScript,
            worktreePreRemoveScript: msg.worktreePreRemoveScript,
            implTabPreCreateScript: msg.implTabPreCreateScript,
@@ -77,6 +77,7 @@ export type ExtensionToWebview
      devBranch: string
      autoBuildBranch: string
      worktreeDirectory: string
+      worktreeOpenWith: 'vscode' | 'pycharm'
      worktreePostCreateScript: string
      worktreePreRemoveScript: string
      implTabPreCreateScript: string
@@ -132,6 +133,7 @@ export type WebviewToExtension
      devBranch: string
      autoBuildBranch: string
      worktreeDirectory: string
+      worktreeOpenWith: 'vscode' | 'pycharm'
      worktreePostCreateScript: string
      worktreePreRemoveScript: string
      implTabPreCreateScript: string