colyn-cli 3.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (263) hide show
  1. package/README-en.md +85 -0
  2. package/README.md +85 -0
  3. package/bin/colyn +25 -0
  4. package/dist/cli.d.ts +2 -0
  5. package/dist/cli.d.ts.map +1 -0
  6. package/dist/cli.js +116 -0
  7. package/dist/cli.js.map +1 -0
  8. package/dist/commands/add.d.ts +6 -0
  9. package/dist/commands/add.d.ts.map +1 -0
  10. package/dist/commands/add.helpers.d.ts +48 -0
  11. package/dist/commands/add.helpers.d.ts.map +1 -0
  12. package/dist/commands/add.helpers.js +251 -0
  13. package/dist/commands/add.helpers.js.map +1 -0
  14. package/dist/commands/add.js +286 -0
  15. package/dist/commands/add.js.map +1 -0
  16. package/dist/commands/checkout.d.ts +16 -0
  17. package/dist/commands/checkout.d.ts.map +1 -0
  18. package/dist/commands/checkout.js +428 -0
  19. package/dist/commands/checkout.js.map +1 -0
  20. package/dist/commands/completion.d.ts +10 -0
  21. package/dist/commands/completion.d.ts.map +1 -0
  22. package/dist/commands/completion.js +380 -0
  23. package/dist/commands/completion.js.map +1 -0
  24. package/dist/commands/config.d.ts +11 -0
  25. package/dist/commands/config.d.ts.map +1 -0
  26. package/dist/commands/config.js +338 -0
  27. package/dist/commands/config.js.map +1 -0
  28. package/dist/commands/index.d.ts +10 -0
  29. package/dist/commands/index.d.ts.map +1 -0
  30. package/dist/commands/index.js +41 -0
  31. package/dist/commands/index.js.map +1 -0
  32. package/dist/commands/info.d.ts +6 -0
  33. package/dist/commands/info.d.ts.map +1 -0
  34. package/dist/commands/info.js +374 -0
  35. package/dist/commands/info.js.map +1 -0
  36. package/dist/commands/init.d.ts +6 -0
  37. package/dist/commands/init.d.ts.map +1 -0
  38. package/dist/commands/init.handlers.d.ts +27 -0
  39. package/dist/commands/init.handlers.d.ts.map +1 -0
  40. package/dist/commands/init.handlers.js +314 -0
  41. package/dist/commands/init.handlers.js.map +1 -0
  42. package/dist/commands/init.helpers.d.ts +42 -0
  43. package/dist/commands/init.helpers.d.ts.map +1 -0
  44. package/dist/commands/init.helpers.js +275 -0
  45. package/dist/commands/init.helpers.js.map +1 -0
  46. package/dist/commands/init.js +61 -0
  47. package/dist/commands/init.js.map +1 -0
  48. package/dist/commands/install.d.ts +6 -0
  49. package/dist/commands/install.d.ts.map +1 -0
  50. package/dist/commands/install.helpers.d.ts +32 -0
  51. package/dist/commands/install.helpers.d.ts.map +1 -0
  52. package/dist/commands/install.helpers.js +124 -0
  53. package/dist/commands/install.helpers.js.map +1 -0
  54. package/dist/commands/install.js +104 -0
  55. package/dist/commands/install.js.map +1 -0
  56. package/dist/commands/list-project.d.ts +11 -0
  57. package/dist/commands/list-project.d.ts.map +1 -0
  58. package/dist/commands/list-project.js +260 -0
  59. package/dist/commands/list-project.js.map +1 -0
  60. package/dist/commands/list.d.ts +15 -0
  61. package/dist/commands/list.d.ts.map +1 -0
  62. package/dist/commands/list.helpers.d.ts +50 -0
  63. package/dist/commands/list.helpers.d.ts.map +1 -0
  64. package/dist/commands/list.helpers.js +143 -0
  65. package/dist/commands/list.helpers.js.map +1 -0
  66. package/dist/commands/list.js +530 -0
  67. package/dist/commands/list.js.map +1 -0
  68. package/dist/commands/merge.d.ts +6 -0
  69. package/dist/commands/merge.d.ts.map +1 -0
  70. package/dist/commands/merge.helpers.d.ts +74 -0
  71. package/dist/commands/merge.helpers.d.ts.map +1 -0
  72. package/dist/commands/merge.helpers.js +307 -0
  73. package/dist/commands/merge.helpers.js.map +1 -0
  74. package/dist/commands/merge.js +260 -0
  75. package/dist/commands/merge.js.map +1 -0
  76. package/dist/commands/release.d.ts +6 -0
  77. package/dist/commands/release.d.ts.map +1 -0
  78. package/dist/commands/release.helpers.d.ts +61 -0
  79. package/dist/commands/release.helpers.d.ts.map +1 -0
  80. package/dist/commands/release.helpers.js +277 -0
  81. package/dist/commands/release.helpers.js.map +1 -0
  82. package/dist/commands/release.js +127 -0
  83. package/dist/commands/release.js.map +1 -0
  84. package/dist/commands/remove.d.ts +6 -0
  85. package/dist/commands/remove.d.ts.map +1 -0
  86. package/dist/commands/remove.helpers.d.ts +59 -0
  87. package/dist/commands/remove.helpers.d.ts.map +1 -0
  88. package/dist/commands/remove.helpers.js +190 -0
  89. package/dist/commands/remove.helpers.js.map +1 -0
  90. package/dist/commands/remove.js +137 -0
  91. package/dist/commands/remove.js.map +1 -0
  92. package/dist/commands/repair.d.ts +6 -0
  93. package/dist/commands/repair.d.ts.map +1 -0
  94. package/dist/commands/repair.helpers.d.ts +5 -0
  95. package/dist/commands/repair.helpers.d.ts.map +1 -0
  96. package/dist/commands/repair.helpers.js +499 -0
  97. package/dist/commands/repair.helpers.js.map +1 -0
  98. package/dist/commands/repair.js +28 -0
  99. package/dist/commands/repair.js.map +1 -0
  100. package/dist/commands/status.d.ts +6 -0
  101. package/dist/commands/status.d.ts.map +1 -0
  102. package/dist/commands/status.js +116 -0
  103. package/dist/commands/status.js.map +1 -0
  104. package/dist/commands/system-integration.d.ts +6 -0
  105. package/dist/commands/system-integration.d.ts.map +1 -0
  106. package/dist/commands/system-integration.helpers.d.ts +70 -0
  107. package/dist/commands/system-integration.helpers.d.ts.map +1 -0
  108. package/dist/commands/system-integration.helpers.js +313 -0
  109. package/dist/commands/system-integration.helpers.js.map +1 -0
  110. package/dist/commands/system-integration.js +132 -0
  111. package/dist/commands/system-integration.js.map +1 -0
  112. package/dist/commands/tmux.d.ts +11 -0
  113. package/dist/commands/tmux.d.ts.map +1 -0
  114. package/dist/commands/tmux.js +500 -0
  115. package/dist/commands/tmux.js.map +1 -0
  116. package/dist/commands/todo.d.ts +6 -0
  117. package/dist/commands/todo.d.ts.map +1 -0
  118. package/dist/commands/todo.helpers.d.ts +50 -0
  119. package/dist/commands/todo.helpers.d.ts.map +1 -0
  120. package/dist/commands/todo.helpers.js +297 -0
  121. package/dist/commands/todo.helpers.js.map +1 -0
  122. package/dist/commands/todo.js +579 -0
  123. package/dist/commands/todo.js.map +1 -0
  124. package/dist/commands/update.d.ts +18 -0
  125. package/dist/commands/update.d.ts.map +1 -0
  126. package/dist/commands/update.helpers.d.ts +89 -0
  127. package/dist/commands/update.helpers.d.ts.map +1 -0
  128. package/dist/commands/update.helpers.js +335 -0
  129. package/dist/commands/update.helpers.js.map +1 -0
  130. package/dist/commands/update.js +187 -0
  131. package/dist/commands/update.js.map +1 -0
  132. package/dist/core/config-loader.d.ts +47 -0
  133. package/dist/core/config-loader.d.ts.map +1 -0
  134. package/dist/core/config-loader.js +188 -0
  135. package/dist/core/config-loader.js.map +1 -0
  136. package/dist/core/config-merger.d.ts +29 -0
  137. package/dist/core/config-merger.d.ts.map +1 -0
  138. package/dist/core/config-merger.js +100 -0
  139. package/dist/core/config-merger.js.map +1 -0
  140. package/dist/core/config-migration.d.ts +64 -0
  141. package/dist/core/config-migration.d.ts.map +1 -0
  142. package/dist/core/config-migration.js +340 -0
  143. package/dist/core/config-migration.js.map +1 -0
  144. package/dist/core/config-new.d.ts +19 -0
  145. package/dist/core/config-new.d.ts.map +1 -0
  146. package/dist/core/config-new.js +58 -0
  147. package/dist/core/config-new.js.map +1 -0
  148. package/dist/core/config-schema.d.ts +221 -0
  149. package/dist/core/config-schema.d.ts.map +1 -0
  150. package/dist/core/config-schema.js +168 -0
  151. package/dist/core/config-schema.js.map +1 -0
  152. package/dist/core/config.d.ts +55 -0
  153. package/dist/core/config.d.ts.map +1 -0
  154. package/dist/core/config.js +143 -0
  155. package/dist/core/config.js.map +1 -0
  156. package/dist/core/dev-server.d.ts +29 -0
  157. package/dist/core/dev-server.d.ts.map +1 -0
  158. package/dist/core/dev-server.js +54 -0
  159. package/dist/core/dev-server.js.map +1 -0
  160. package/dist/core/discovery.d.ts +51 -0
  161. package/dist/core/discovery.d.ts.map +1 -0
  162. package/dist/core/discovery.js +247 -0
  163. package/dist/core/discovery.js.map +1 -0
  164. package/dist/core/env.d.ts +13 -0
  165. package/dist/core/env.d.ts.map +1 -0
  166. package/dist/core/env.js +75 -0
  167. package/dist/core/env.js.map +1 -0
  168. package/dist/core/git.d.ts +31 -0
  169. package/dist/core/git.d.ts.map +1 -0
  170. package/dist/core/git.js +56 -0
  171. package/dist/core/git.js.map +1 -0
  172. package/dist/core/paths.d.ts +86 -0
  173. package/dist/core/paths.d.ts.map +1 -0
  174. package/dist/core/paths.js +256 -0
  175. package/dist/core/paths.js.map +1 -0
  176. package/dist/core/tmux-config.d.ts +174 -0
  177. package/dist/core/tmux-config.d.ts.map +1 -0
  178. package/dist/core/tmux-config.js +545 -0
  179. package/dist/core/tmux-config.js.map +1 -0
  180. package/dist/core/tmux-config.legacy.d.ts +243 -0
  181. package/dist/core/tmux-config.legacy.d.ts.map +1 -0
  182. package/dist/core/tmux-config.legacy.js +896 -0
  183. package/dist/core/tmux-config.legacy.js.map +1 -0
  184. package/dist/core/tmux.d.ts +214 -0
  185. package/dist/core/tmux.d.ts.map +1 -0
  186. package/dist/core/tmux.js +712 -0
  187. package/dist/core/tmux.js.map +1 -0
  188. package/dist/core/toolchain-resolver.d.ts +51 -0
  189. package/dist/core/toolchain-resolver.d.ts.map +1 -0
  190. package/dist/core/toolchain-resolver.js +364 -0
  191. package/dist/core/toolchain-resolver.js.map +1 -0
  192. package/dist/core/worktree-status.d.ts +20 -0
  193. package/dist/core/worktree-status.d.ts.map +1 -0
  194. package/dist/core/worktree-status.js +67 -0
  195. package/dist/core/worktree-status.js.map +1 -0
  196. package/dist/i18n/index.d.ts +36 -0
  197. package/dist/i18n/index.d.ts.map +1 -0
  198. package/dist/i18n/index.js +157 -0
  199. package/dist/i18n/index.js.map +1 -0
  200. package/dist/i18n/locales/en.d.ts +866 -0
  201. package/dist/i18n/locales/en.d.ts.map +1 -0
  202. package/dist/i18n/locales/en.js +985 -0
  203. package/dist/i18n/locales/en.js.map +1 -0
  204. package/dist/i18n/locales/zh-CN.d.ts +865 -0
  205. package/dist/i18n/locales/zh-CN.d.ts.map +1 -0
  206. package/dist/i18n/locales/zh-CN.js +985 -0
  207. package/dist/i18n/locales/zh-CN.js.map +1 -0
  208. package/dist/index.d.ts +2 -0
  209. package/dist/index.d.ts.map +1 -0
  210. package/dist/index.js +4 -0
  211. package/dist/index.js.map +1 -0
  212. package/dist/plugins/builtin/gradle.d.ts +9 -0
  213. package/dist/plugins/builtin/gradle.d.ts.map +1 -0
  214. package/dist/plugins/builtin/gradle.js +164 -0
  215. package/dist/plugins/builtin/gradle.js.map +1 -0
  216. package/dist/plugins/builtin/maven.d.ts +9 -0
  217. package/dist/plugins/builtin/maven.d.ts.map +1 -0
  218. package/dist/plugins/builtin/maven.js +127 -0
  219. package/dist/plugins/builtin/maven.js.map +1 -0
  220. package/dist/plugins/builtin/npm.d.ts +9 -0
  221. package/dist/plugins/builtin/npm.d.ts.map +1 -0
  222. package/dist/plugins/builtin/npm.js +238 -0
  223. package/dist/plugins/builtin/npm.js.map +1 -0
  224. package/dist/plugins/builtin/pip.d.ts +9 -0
  225. package/dist/plugins/builtin/pip.d.ts.map +1 -0
  226. package/dist/plugins/builtin/pip.js +210 -0
  227. package/dist/plugins/builtin/pip.js.map +1 -0
  228. package/dist/plugins/builtin/xcode.d.ts +12 -0
  229. package/dist/plugins/builtin/xcode.d.ts.map +1 -0
  230. package/dist/plugins/builtin/xcode.js +438 -0
  231. package/dist/plugins/builtin/xcode.js.map +1 -0
  232. package/dist/plugins/index.d.ts +13 -0
  233. package/dist/plugins/index.d.ts.map +1 -0
  234. package/dist/plugins/index.js +24 -0
  235. package/dist/plugins/index.js.map +1 -0
  236. package/dist/plugins/manager.d.ts +93 -0
  237. package/dist/plugins/manager.d.ts.map +1 -0
  238. package/dist/plugins/manager.js +270 -0
  239. package/dist/plugins/manager.js.map +1 -0
  240. package/dist/plugins/utils.d.ts +42 -0
  241. package/dist/plugins/utils.d.ts.map +1 -0
  242. package/dist/plugins/utils.js +175 -0
  243. package/dist/plugins/utils.js.map +1 -0
  244. package/dist/types/index.d.ts +104 -0
  245. package/dist/types/index.d.ts.map +1 -0
  246. package/dist/types/index.js +21 -0
  247. package/dist/types/index.js.map +1 -0
  248. package/dist/types/plugin.d.ts +200 -0
  249. package/dist/types/plugin.d.ts.map +1 -0
  250. package/dist/types/plugin.js +19 -0
  251. package/dist/types/plugin.js.map +1 -0
  252. package/dist/utils/logger.d.ts +42 -0
  253. package/dist/utils/logger.d.ts.map +1 -0
  254. package/dist/utils/logger.js +80 -0
  255. package/dist/utils/logger.js.map +1 -0
  256. package/docs/en/manual/04-command-reference/README.md +58 -0
  257. package/docs/en/manual/README.md +108 -0
  258. package/docs/zh-CN/manual/04-command-reference/README.md +58 -0
  259. package/docs/zh-CN/manual/README.md +108 -0
  260. package/package.json +65 -0
  261. package/shell/colyn.sh +55 -0
  262. package/shell/completion.bash +270 -0
  263. package/shell/completion.zsh +167 -0
@@ -0,0 +1,530 @@
1
+ import * as path from 'path';
2
+ import chalk from 'chalk';
3
+ import Table from 'cli-table3';
4
+ import ora from 'ora';
5
+ import chokidar from 'chokidar';
6
+ import { getProjectPaths, validateProjectInitialized } from '../core/paths.js';
7
+ import { discoverProjectInfo, getMainBranch, getMainPort } from '../core/discovery.js';
8
+ import { ColynError } from '../types/index.js';
9
+ import { formatError, output } from '../utils/logger.js';
10
+ import { t } from '../i18n/index.js';
11
+ import { getGitStatus, getGitDiff, formatStatus, formatStatusSimple, formatDiff, formatWorktreeStatus, formatWorktreeStatusEmoji } from './list.helpers.js';
12
+ import { getWorktreeStatus } from '../core/worktree-status.js';
13
+ import { isInTmux, isTmuxAvailable } from '../core/tmux.js';
14
+ /**
15
+ * 检测当前工作目录是否在指定路径下
16
+ */
17
+ function isCurrentDirectory(targetPath) {
18
+ const cwd = process.cwd();
19
+ // 规范化路径后比较
20
+ const normalizedCwd = path.resolve(cwd);
21
+ const normalizedTarget = path.resolve(targetPath);
22
+ return normalizedCwd === normalizedTarget || normalizedCwd.startsWith(normalizedTarget + path.sep);
23
+ }
24
+ /**
25
+ * 计算列的最大宽度
26
+ */
27
+ function getColumnWidths(items) {
28
+ let maxId = 6; // "0-main" 或 "→ 1"
29
+ let maxBranch = 6; // "Branch"
30
+ let maxPort = 5; // "Port" + 1
31
+ let maxGitStatus = 3; // "Git"
32
+ const maxGitStatusSimple = 1; // "●"
33
+ let maxDiff = 4; // "Diff"
34
+ let maxPath = 4; // "Path"
35
+ let maxWtStatus = 6; // "Status"
36
+ const maxWtStatusEmoji = 3; // "st."
37
+ for (const item of items) {
38
+ // 主分支显示 "0-main",worktree 显示数字 ID
39
+ const idStr = item.isMain ? '0-main' : String(item.id);
40
+ const idDisplay = item.isCurrent ? `→ ${idStr}` : ` ${idStr}`;
41
+ maxId = Math.max(maxId, idDisplay.length);
42
+ maxBranch = Math.max(maxBranch, item.branch.length);
43
+ maxPort = Math.max(maxPort, String(item.port).length);
44
+ maxGitStatus = Math.max(maxGitStatus, formatStatus(item.status).length);
45
+ maxDiff = Math.max(maxDiff, formatDiff(item.diff, item.isMain).length);
46
+ maxPath = Math.max(maxPath, item.path.length);
47
+ maxWtStatus = Math.max(maxWtStatus, formatWorktreeStatus(item.worktreeStatus).length);
48
+ }
49
+ return {
50
+ id: maxId,
51
+ branch: maxBranch,
52
+ port: maxPort,
53
+ gitStatus: maxGitStatus,
54
+ gitStatusSimple: maxGitStatusSimple,
55
+ diff: maxDiff,
56
+ path: maxPath,
57
+ wtStatus: maxWtStatus,
58
+ wtStatusEmoji: maxWtStatusEmoji
59
+ };
60
+ }
61
+ /**
62
+ * 计算指定模式下的表格宽度
63
+ * 表格边框和分隔符大约占用: 列数 * 3 + 1
64
+ */
65
+ function calculateTableWidth(widths, mode) {
66
+ const borderOverhead = 3; // 每列的边框开销 "│ " + " "
67
+ let totalWidth = 1; // 左边框
68
+ // ID 和 Branch 始终显示
69
+ totalWidth += widths.id + borderOverhead;
70
+ totalWidth += widths.branch + borderOverhead;
71
+ switch (mode) {
72
+ case 'full':
73
+ totalWidth += widths.port + borderOverhead;
74
+ totalWidth += widths.gitStatus + borderOverhead;
75
+ totalWidth += widths.diff + borderOverhead;
76
+ totalWidth += widths.path + borderOverhead;
77
+ totalWidth += widths.wtStatus + borderOverhead;
78
+ break;
79
+ case 'no-port':
80
+ totalWidth += widths.gitStatus + borderOverhead;
81
+ totalWidth += widths.diff + borderOverhead;
82
+ totalWidth += widths.path + borderOverhead;
83
+ totalWidth += widths.wtStatus + borderOverhead;
84
+ break;
85
+ case 'no-path':
86
+ totalWidth += widths.gitStatus + borderOverhead;
87
+ totalWidth += widths.diff + borderOverhead;
88
+ totalWidth += widths.wtStatus + borderOverhead;
89
+ break;
90
+ case 'compress-wt':
91
+ totalWidth += widths.gitStatus + borderOverhead;
92
+ totalWidth += widths.diff + borderOverhead;
93
+ totalWidth += widths.wtStatusEmoji + borderOverhead;
94
+ break;
95
+ case 'simple-git':
96
+ totalWidth += widths.gitStatusSimple + borderOverhead;
97
+ totalWidth += widths.diff + borderOverhead;
98
+ totalWidth += widths.wtStatusEmoji + borderOverhead;
99
+ break;
100
+ case 'no-git':
101
+ totalWidth += widths.diff + borderOverhead;
102
+ totalWidth += widths.wtStatusEmoji + borderOverhead;
103
+ break;
104
+ case 'no-diff':
105
+ totalWidth += widths.wtStatusEmoji + borderOverhead;
106
+ break;
107
+ case 'minimal':
108
+ // 只有 ID 和 Branch
109
+ break;
110
+ }
111
+ return totalWidth;
112
+ }
113
+ /**
114
+ * 选择最佳显示模式
115
+ */
116
+ function selectDisplayMode(widths, terminalWidth) {
117
+ const modes = ['full', 'no-port', 'no-path', 'compress-wt', 'simple-git', 'no-git', 'no-diff', 'minimal'];
118
+ for (const mode of modes) {
119
+ if (calculateTableWidth(widths, mode) <= terminalWidth) {
120
+ return mode;
121
+ }
122
+ }
123
+ return 'minimal';
124
+ }
125
+ /**
126
+ * 返回指定模式下有自身颜色(不被行色覆盖)的列索引集合
127
+ */
128
+ function getColoredCellIndices(mode) {
129
+ switch (mode) {
130
+ case 'full': return [3, 4, 6]; // git, diff, wtStatus
131
+ case 'no-port': return [2, 3, 5]; // git, diff, wtStatus
132
+ case 'no-path': return [2, 3, 4]; // git, diff, wtStatus
133
+ case 'compress-wt': return [2, 3, 4]; // git, diff, wtEmoji
134
+ case 'simple-git': return [2, 3, 4]; // gitSimple, diff, wtEmoji
135
+ case 'no-git': return [2, 3]; // diff, wtEmoji
136
+ case 'no-diff': return [2]; // wtEmoji
137
+ case 'minimal': return [];
138
+ }
139
+ }
140
+ /**
141
+ * 根据 worktree 状态返回带颜色的字符串
142
+ */
143
+ function coloredWtStatus(status, isEmoji) {
144
+ const str = isEmoji ? formatWorktreeStatusEmoji(status) : formatWorktreeStatus(status);
145
+ if (!str)
146
+ return '';
147
+ switch (status) {
148
+ case 'running': return chalk.cyan(str);
149
+ case 'waiting-confirm': return chalk.yellow(str);
150
+ case 'finish': return chalk.green(str);
151
+ default: return str;
152
+ }
153
+ }
154
+ /**
155
+ * 输出表格格式
156
+ */
157
+ function outputTable(items) {
158
+ if (items.length === 0) {
159
+ console.error(chalk.yellow(`\n${t('commands.list.noWorktrees')}\n`));
160
+ console.error(chalk.dim(t('commands.list.noWorktreesHint')));
161
+ return;
162
+ }
163
+ // 获取终端宽度
164
+ const terminalWidth = process.stdout.columns || 80;
165
+ // 计算列宽度
166
+ const widths = getColumnWidths(items);
167
+ // 选择显示模式
168
+ const mode = selectDisplayMode(widths, terminalWidth);
169
+ // 构建表头
170
+ const headers = [chalk.bold(t('commands.list.tableId')), chalk.bold(t('commands.list.tableBranch'))];
171
+ switch (mode) {
172
+ case 'full':
173
+ headers.push(chalk.bold(t('commands.list.tablePort')), chalk.bold(t('commands.list.tableGit')), chalk.bold(t('commands.list.tableDiff')), chalk.bold(t('commands.list.tablePath')), chalk.bold(t('commands.list.tableWtStatus')));
174
+ break;
175
+ case 'no-port':
176
+ headers.push(chalk.bold(t('commands.list.tableGit')), chalk.bold(t('commands.list.tableDiff')), chalk.bold(t('commands.list.tablePath')), chalk.bold(t('commands.list.tableWtStatus')));
177
+ break;
178
+ case 'no-path':
179
+ headers.push(chalk.bold(t('commands.list.tableGit')), chalk.bold(t('commands.list.tableDiff')), chalk.bold(t('commands.list.tableWtStatus')));
180
+ break;
181
+ case 'compress-wt':
182
+ headers.push(chalk.bold(t('commands.list.tableGit')), chalk.bold(t('commands.list.tableDiff')), chalk.bold(t('commands.list.tableWtStatusShort')));
183
+ break;
184
+ case 'simple-git':
185
+ headers.push(chalk.bold('S'), chalk.bold(t('commands.list.tableDiff')), chalk.bold(t('commands.list.tableWtStatusShort')));
186
+ break;
187
+ case 'no-git':
188
+ headers.push(chalk.bold(t('commands.list.tableDiff')), chalk.bold(t('commands.list.tableWtStatusShort')));
189
+ break;
190
+ case 'no-diff':
191
+ headers.push(chalk.bold(t('commands.list.tableWtStatusShort')));
192
+ break;
193
+ case 'minimal':
194
+ // 只有 ID 和 Branch
195
+ break;
196
+ }
197
+ const table = new Table({
198
+ head: headers,
199
+ style: {
200
+ head: [],
201
+ border: []
202
+ }
203
+ });
204
+ for (const item of items) {
205
+ // 主分支显示 "0-main",worktree 显示数字 ID
206
+ const idStr = item.isMain ? '0-main' : String(item.id);
207
+ const idDisplay = item.isCurrent ? `→ ${idStr}` : ` ${idStr}`;
208
+ // 构建行数据
209
+ const row = [idDisplay, item.branch];
210
+ // 构建各列数据的辅助值
211
+ const gitStr = formatStatus(item.status);
212
+ const coloredGit = gitStr ? chalk.yellow(gitStr) : '';
213
+ const gitSimpleStr = formatStatusSimple(item.status);
214
+ const coloredGitSimple = gitSimpleStr ? chalk.yellow(gitSimpleStr) : '';
215
+ const diffStr = formatDiff(item.diff, item.isMain);
216
+ const coloredDiff = item.isMain
217
+ ? chalk.dim(diffStr)
218
+ : (diffStr === '✓' ? chalk.green(diffStr) : chalk.cyan(diffStr));
219
+ // 根据模式追加列
220
+ switch (mode) {
221
+ case 'full':
222
+ row.push(String(item.port), coloredGit, coloredDiff, item.path, coloredWtStatus(item.worktreeStatus, false));
223
+ break;
224
+ case 'no-port':
225
+ row.push(coloredGit, coloredDiff, item.path, coloredWtStatus(item.worktreeStatus, false));
226
+ break;
227
+ case 'no-path':
228
+ row.push(coloredGit, coloredDiff, coloredWtStatus(item.worktreeStatus, false));
229
+ break;
230
+ case 'compress-wt':
231
+ row.push(coloredGit, coloredDiff, coloredWtStatus(item.worktreeStatus, true));
232
+ break;
233
+ case 'simple-git':
234
+ row.push(coloredGitSimple, coloredDiff, coloredWtStatus(item.worktreeStatus, true));
235
+ break;
236
+ case 'no-git':
237
+ row.push(coloredDiff, coloredWtStatus(item.worktreeStatus, true));
238
+ break;
239
+ case 'no-diff':
240
+ row.push(coloredWtStatus(item.worktreeStatus, true));
241
+ break;
242
+ case 'minimal':
243
+ // 只有 ID 和 Branch
244
+ break;
245
+ }
246
+ // 应用行样式(当前行青色,主分支灰色)
247
+ const coloredIndices = new Set(getColoredCellIndices(mode));
248
+ if (item.isCurrent) {
249
+ table.push(row.map((cell, index) => coloredIndices.has(index) ? cell : chalk.cyan(cell)));
250
+ }
251
+ else if (item.isMain) {
252
+ table.push(row.map((cell, index) => coloredIndices.has(index) ? cell : chalk.dim(cell)));
253
+ }
254
+ else {
255
+ table.push(row);
256
+ }
257
+ }
258
+ console.error(table.toString());
259
+ // 如果在 tmux 中,显示切换提示
260
+ if (isTmuxAvailable() && isInTmux()) {
261
+ const hasWorktrees = items.some(item => !item.isMain);
262
+ if (hasWorktrees) {
263
+ output('');
264
+ output(chalk.cyan(`💡 ${t('commands.list.tmuxSwitchHint')}`));
265
+ }
266
+ }
267
+ // 如果只有主分支,给出提示
268
+ const hasWorktrees = items.some(item => !item.isMain);
269
+ if (!hasWorktrees) {
270
+ console.error(chalk.dim(`\n${t('commands.list.noWorktreesHint')}`));
271
+ }
272
+ }
273
+ /**
274
+ * 输出 JSON 格式
275
+ */
276
+ function outputJson(items) {
277
+ console.log(JSON.stringify(items, null, 2));
278
+ }
279
+ /**
280
+ * 输出路径格式
281
+ */
282
+ function outputPaths(items) {
283
+ for (const item of items) {
284
+ console.log(item.path);
285
+ }
286
+ }
287
+ /**
288
+ * 清屏并将光标移到左上角
289
+ */
290
+ function clearScreen() {
291
+ // 使用 ANSI 转义码清屏
292
+ process.stdout.write('\x1b[2J\x1b[0;0H');
293
+ }
294
+ /**
295
+ * 获取列表数据(用于刷新模式)
296
+ * 返回 ListItem 数组而不是直接输出
297
+ */
298
+ async function fetchListData(options) {
299
+ // 获取项目路径并验证
300
+ const paths = await getProjectPaths();
301
+ await validateProjectInitialized(paths);
302
+ // 获取项目信息
303
+ const projectInfo = await discoverProjectInfo(paths.mainDir, paths.worktreesDir);
304
+ // 获取主分支信息
305
+ const mainBranch = await getMainBranch(paths.mainDir);
306
+ const mainPort = await getMainPort(paths.mainDir);
307
+ // 构建列表项
308
+ const items = [];
309
+ // 添加主分支(如果不排除)
310
+ if (options.main !== false) {
311
+ const { status: mainWtStatus } = await getWorktreeStatus(paths.configDir, 'main');
312
+ items.push({
313
+ id: null,
314
+ branch: mainBranch,
315
+ port: mainPort,
316
+ path: path.relative(paths.rootDir, paths.mainDir) || '.',
317
+ isMain: true,
318
+ isCurrent: isCurrentDirectory(paths.mainDir),
319
+ status: getGitStatus(paths.mainDir),
320
+ diff: { ahead: 0, behind: 0 }, // 主分支没有差异
321
+ worktreeStatus: mainWtStatus
322
+ });
323
+ }
324
+ // 添加任务 worktree(并行获取 worktree 状态)
325
+ const wtItems = await Promise.all(projectInfo.worktrees.map(async (wt) => {
326
+ const { status: wtStatus } = await getWorktreeStatus(paths.configDir, `task-${wt.id}`);
327
+ return {
328
+ id: wt.id,
329
+ branch: wt.branch,
330
+ port: wt.port,
331
+ path: path.relative(paths.rootDir, wt.path),
332
+ isMain: false,
333
+ isCurrent: isCurrentDirectory(wt.path),
334
+ status: getGitStatus(wt.path),
335
+ diff: getGitDiff(wt.path, mainBranch),
336
+ worktreeStatus: wtStatus
337
+ };
338
+ }));
339
+ items.push(...wtItems);
340
+ return items;
341
+ }
342
+ /**
343
+ * List 命令:列出所有 worktree
344
+ */
345
+ async function listCommand(options) {
346
+ try {
347
+ // 检查选项冲突
348
+ if (options.json && options.paths) {
349
+ throw new ColynError(t('commands.list.optionConflict'), t('commands.list.optionConflictHint'));
350
+ }
351
+ // 检查刷新模式与其他输出格式的冲突
352
+ if (options.refresh && (options.json || options.paths)) {
353
+ throw new ColynError(t('commands.list.refreshConflict'), t('commands.list.refreshConflictHint'));
354
+ }
355
+ // 刷新模式
356
+ if (options.refresh) {
357
+ // 获取项目路径
358
+ const paths = await getProjectPaths();
359
+ await validateProjectInitialized(paths);
360
+ // 防抖:避免短时间内多次刷新
361
+ let debounceTimer = null;
362
+ const DEBOUNCE_DELAY = 1000; // 1秒防抖延迟
363
+ // 渲染函数:先获取数据,再清屏并立即显示(减少闪烁)
364
+ const render = async () => {
365
+ try {
366
+ // 显示加载动画(在底部)
367
+ const spinner = ora({
368
+ text: t('commands.list.refreshingData'),
369
+ stream: process.stderr,
370
+ spinner: 'dots'
371
+ }).start();
372
+ // 1. 先获取数据(耗时操作)
373
+ const items = await fetchListData(options);
374
+ // 停止 spinner
375
+ spinner.stop();
376
+ // 2. 清屏
377
+ clearScreen();
378
+ // 3. 立即显示数据(无延迟)
379
+ outputTable(items);
380
+ output('');
381
+ output(chalk.dim(t('commands.list.watchMode')));
382
+ }
383
+ catch (error) {
384
+ // 刷新过程中出错,显示错误但不退出
385
+ clearScreen();
386
+ formatError(error);
387
+ output('');
388
+ output(chalk.dim(t('commands.list.watchMode')));
389
+ }
390
+ };
391
+ // 带防抖的渲染函数
392
+ const debouncedRender = () => {
393
+ if (debounceTimer) {
394
+ clearTimeout(debounceTimer);
395
+ }
396
+ debounceTimer = setTimeout(() => {
397
+ render();
398
+ debounceTimer = null;
399
+ }, DEBOUNCE_DELAY);
400
+ };
401
+ // 首次渲染
402
+ await render();
403
+ // 需要监听的路径
404
+ const watchPaths = [];
405
+ // 1. 主分支目录的 .git 目录
406
+ watchPaths.push(path.join(paths.mainDir, '.git'));
407
+ // 2. 所有 worktree 的 .git 文件(worktree 的 .git 是个文件,不是目录)
408
+ const projectInfo = await discoverProjectInfo(paths.mainDir, paths.worktreesDir);
409
+ for (const wt of projectInfo.worktrees) {
410
+ watchPaths.push(path.join(wt.path, '.git'));
411
+ }
412
+ // 3. worktrees 目录本身(检测新增/删除 worktree)
413
+ watchPaths.push(paths.worktreesDir);
414
+ // 4. 监听所有 worktree 目录下的 .env.local 文件(端口变化)
415
+ watchPaths.push(path.join(paths.mainDir, '.env.local'));
416
+ for (const wt of projectInfo.worktrees) {
417
+ watchPaths.push(path.join(wt.path, '.env.local'));
418
+ }
419
+ // 创建文件监听器
420
+ const watcher = chokidar.watch(watchPaths, {
421
+ persistent: true,
422
+ ignoreInitial: true,
423
+ // 忽略 .git 目录中的一些临时文件
424
+ ignored: /(\.git\/index\.lock$|\.git\/.*\.tmp$)/,
425
+ // 监听深度:.git 目录需要递归监听
426
+ depth: 5,
427
+ // 稳定延迟:文件修改后等待一段时间再触发(避免重复事件)
428
+ awaitWriteFinish: {
429
+ stabilityThreshold: 100,
430
+ pollInterval: 50
431
+ }
432
+ });
433
+ // 监听文件变化
434
+ watcher.on('all', (_event, _changedPath) => {
435
+ // 调试日志(可选)
436
+ // console.error(`File ${_event}: ${_changedPath}`);
437
+ debouncedRender();
438
+ });
439
+ // 监听器错误处理
440
+ watcher.on('error', (err) => {
441
+ output('');
442
+ const errorMessage = err instanceof Error ? err.message : String(err);
443
+ output(chalk.red(t('commands.list.watchError', { error: errorMessage })));
444
+ });
445
+ // 处理 Ctrl+C 优雅退出
446
+ process.on('SIGINT', async () => {
447
+ await watcher.close();
448
+ output('');
449
+ output(t('commands.list.refreshStopped'));
450
+ process.exit(0);
451
+ });
452
+ // 保持进程运行
453
+ return;
454
+ }
455
+ // 普通模式(不刷新)
456
+ // 获取项目路径并验证
457
+ const paths = await getProjectPaths();
458
+ await validateProjectInitialized(paths);
459
+ // 获取项目信息
460
+ const projectInfo = await discoverProjectInfo(paths.mainDir, paths.worktreesDir);
461
+ // 获取主分支信息
462
+ const mainBranch = await getMainBranch(paths.mainDir);
463
+ const mainPort = await getMainPort(paths.mainDir);
464
+ // 构建列表项
465
+ const items = [];
466
+ // 添加主分支(如果不排除)
467
+ if (options.main !== false) {
468
+ const { status: mainWtStatus } = await getWorktreeStatus(paths.configDir, 'main');
469
+ items.push({
470
+ id: null,
471
+ branch: mainBranch,
472
+ port: mainPort,
473
+ path: path.relative(paths.rootDir, paths.mainDir) || '.',
474
+ isMain: true,
475
+ isCurrent: isCurrentDirectory(paths.mainDir),
476
+ status: getGitStatus(paths.mainDir),
477
+ diff: { ahead: 0, behind: 0 }, // 主分支没有差异
478
+ worktreeStatus: mainWtStatus
479
+ });
480
+ }
481
+ // 添加任务 worktree(并行获取 worktree 状态)
482
+ const wtItems = await Promise.all(projectInfo.worktrees.map(async (wt) => {
483
+ const { status: wtStatus } = await getWorktreeStatus(paths.configDir, `task-${wt.id}`);
484
+ return {
485
+ id: wt.id,
486
+ branch: wt.branch,
487
+ port: wt.port,
488
+ path: path.relative(paths.rootDir, wt.path),
489
+ isMain: false,
490
+ isCurrent: isCurrentDirectory(wt.path),
491
+ status: getGitStatus(wt.path),
492
+ diff: getGitDiff(wt.path, mainBranch),
493
+ worktreeStatus: wtStatus
494
+ };
495
+ }));
496
+ items.push(...wtItems);
497
+ // 根据选项输出
498
+ if (options.json) {
499
+ outputJson(items);
500
+ }
501
+ else if (options.paths) {
502
+ outputPaths(items);
503
+ }
504
+ else {
505
+ outputTable(items);
506
+ }
507
+ }
508
+ catch (error) {
509
+ formatError(error);
510
+ process.exit(1);
511
+ }
512
+ }
513
+ /**
514
+ * 注册 list 命令
515
+ */
516
+ export function register(program) {
517
+ program
518
+ .command('list')
519
+ .alias('ls')
520
+ .description(t('commands.list.description'))
521
+ .option('--json', t('commands.list.jsonOption'))
522
+ .option('-p, --paths', t('commands.list.pathsOption'))
523
+ .option('--no-main', t('commands.list.noMainOption'))
524
+ .option('-r, --refresh', t('commands.list.refreshOption'))
525
+ .addHelpText('after', `\n${t('commands.list.gitColumnHelp')}`)
526
+ .action(async (options) => {
527
+ await listCommand(options);
528
+ });
529
+ }
530
+ //# sourceMappingURL=list.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"list.js","sourceRoot":"","sources":["../../src/commands/list.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,6 @@
1
+ import type { Command } from 'commander';
2
+ /**
3
+ * 注册 merge 命令
4
+ */
5
+ export declare function register(program: Command): void;
6
+ //# sourceMappingURL=merge.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../src/commands/merge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAgVzC;;GAEG;AACH,wBAAgB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAe/C"}
@@ -0,0 +1,74 @@
1
+ import type { WorktreeInfo } from '../types/index.js';
2
+ /**
3
+ * 识别目标类型
4
+ */
5
+ export type TargetType = 'id' | 'branch' | 'auto';
6
+ /**
7
+ * 判断目标参数类型
8
+ */
9
+ export declare function identifyTargetType(target: string | undefined): TargetType;
10
+ /**
11
+ * 自动识别当前 worktree
12
+ * 使用 getCurrentWorktreeId 验证目录名与 .env.local 配置一致
13
+ */
14
+ export declare function autoDetectWorktree(): Promise<number | null>;
15
+ /**
16
+ * 根据目标参数查找 worktree
17
+ */
18
+ export declare function findWorktreeTarget(target: string | undefined, mainDir: string, worktreesDir: string): Promise<WorktreeInfo>;
19
+ /**
20
+ * 检查 git 工作目录状态是否干净
21
+ */
22
+ export declare function checkGitWorkingDirectory(dirPath: string, dirName: string): Promise<void>;
23
+ /**
24
+ * 合并结果
25
+ */
26
+ export interface MergeResult {
27
+ success: boolean;
28
+ commitHash?: string;
29
+ conflictFiles?: string[];
30
+ error?: string;
31
+ }
32
+ /**
33
+ * 在 worktree 中更新主分支代码(默认使用 rebase,可选 merge)
34
+ * 这一步确保 worktree 包含主分支的所有更改
35
+ */
36
+ export declare function mergeMainIntoWorktree(worktreePath: string, mainBranch: string, useRebase?: boolean): Promise<MergeResult>;
37
+ /**
38
+ * 在主分支中合并 worktree 分支(使用 --no-ff)
39
+ * 此时 worktree 已经包含主分支的所有更改,理论上不会有冲突
40
+ */
41
+ export declare function mergeWorktreeIntoMain(mainDir: string, worktreeBranch: string): Promise<MergeResult>;
42
+ /**
43
+ * 执行合并操作(保留用于向后兼容,但不推荐使用)
44
+ * @deprecated 请使用 mergeMainIntoWorktree 和 mergeWorktreeIntoMain
45
+ */
46
+ export declare function executeMerge(mainDir: string, branch: string, _mainBranch: string): Promise<MergeResult>;
47
+ /**
48
+ * 推送到远程仓库
49
+ */
50
+ export declare function pushToRemote(mainDir: string, mainBranch: string): Promise<{
51
+ success: boolean;
52
+ error?: string;
53
+ }>;
54
+ /**
55
+ * 显示检测到的 worktree 信息
56
+ */
57
+ export declare function displayWorktreeInfo(worktree: WorktreeInfo): void;
58
+ /**
59
+ * 显示前置检查结果
60
+ */
61
+ export declare function displayCheckPassed(): void;
62
+ /**
63
+ * 显示合并成功信息
64
+ */
65
+ export declare function displayMergeSuccess(mainBranch: string, branch: string, commitHash: string, mainDir: string, worktreePath: string, worktreeId: number, pushed: boolean, verbose?: boolean): void;
66
+ /**
67
+ * 显示合并冲突信息(在 worktree 中解决)
68
+ */
69
+ export declare function displayMergeConflict(conflictFiles: string[], worktreePath: string, worktreeBranch: string, mainBranch: string, isRebase?: boolean): void;
70
+ /**
71
+ * 显示推送失败信息
72
+ */
73
+ export declare function displayPushFailed(error: string, mainDir: string, mainBranch: string): void;
74
+ //# sourceMappingURL=merge.helpers.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"merge.helpers.d.ts","sourceRoot":"","sources":["../../src/commands/merge.helpers.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AActD;;GAEG;AACH,MAAM,MAAM,UAAU,GAAG,IAAI,GAAG,QAAQ,GAAG,MAAM,CAAC;AAElD;;GAEG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,GAAG,UAAU,CAYzE;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAEjE;AAED;;GAEG;AACH,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,MAAM,GAAG,SAAS,EAC1B,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,YAAY,CAAC,CA4CvB;AAED;;GAEG;AACH,wBAAsB,wBAAwB,CAC5C,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,CAmBf;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,SAAS,GAAE,OAAc,GACxB,OAAO,CAAC,WAAW,CAAC,CAuDtB;AAED;;;GAGG;AACH,wBAAsB,qBAAqB,CACzC,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,WAAW,CAAC,CAwCtB;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,WAAW,CAAC,CAEtB;AAED;;GAEG;AACH,wBAAsB,YAAY,CAChC,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAc/C;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,CAOhE;AAED;;GAEG;AACH,wBAAgB,kBAAkB,IAAI,IAAI,CAKzC;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,OAAO,EACf,OAAO,GAAE,OAAe,GACvB,IAAI,CAmCN;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,aAAa,EAAE,MAAM,EAAE,EACvB,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,MAAM,EACtB,UAAU,EAAE,MAAM,EAClB,QAAQ,GAAE,OAAe,GACxB,IAAI,CAqCN;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,EACf,UAAU,EAAE,MAAM,GACjB,IAAI,CAQN"}