spidersan 0.5.0 → 0.9.0

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 (217) hide show
  1. package/CHANGELOG.md +46 -48
  2. package/README.md +241 -4
  3. package/dist/bin/spidersan.d.ts.map +1 -1
  4. package/dist/bin/spidersan.js +13 -1
  5. package/dist/bin/spidersan.js.map +1 -1
  6. package/dist/commands/abandon.d.ts.map +1 -1
  7. package/dist/commands/abandon.js +1 -9
  8. package/dist/commands/abandon.js.map +1 -1
  9. package/dist/commands/ai.d.ts +15 -0
  10. package/dist/commands/ai.d.ts.map +1 -0
  11. package/dist/commands/ai.js +498 -0
  12. package/dist/commands/ai.js.map +1 -0
  13. package/dist/commands/auto.d.ts.map +1 -1
  14. package/dist/commands/auto.js +2 -1
  15. package/dist/commands/auto.js.map +1 -1
  16. package/dist/commands/bot.d.ts +16 -0
  17. package/dist/commands/bot.d.ts.map +1 -0
  18. package/dist/commands/bot.js +398 -0
  19. package/dist/commands/bot.js.map +1 -0
  20. package/dist/commands/conflicts.d.ts.map +1 -1
  21. package/dist/commands/conflicts.js +264 -313
  22. package/dist/commands/conflicts.js.map +1 -1
  23. package/dist/commands/context.d.ts +8 -0
  24. package/dist/commands/context.d.ts.map +1 -0
  25. package/dist/commands/context.js +104 -0
  26. package/dist/commands/context.js.map +1 -0
  27. package/dist/commands/cross-conflicts.d.ts.map +1 -1
  28. package/dist/commands/cross-conflicts.js +1 -38
  29. package/dist/commands/cross-conflicts.js.map +1 -1
  30. package/dist/commands/depends.d.ts.map +1 -1
  31. package/dist/commands/depends.js +1 -9
  32. package/dist/commands/depends.js.map +1 -1
  33. package/dist/commands/doctor.d.ts.map +1 -1
  34. package/dist/commands/doctor.js +117 -59
  35. package/dist/commands/doctor.js.map +1 -1
  36. package/dist/commands/fleet-status.d.ts +14 -0
  37. package/dist/commands/fleet-status.d.ts.map +1 -0
  38. package/dist/commands/fleet-status.js +127 -0
  39. package/dist/commands/fleet-status.js.map +1 -0
  40. package/dist/commands/git-watch.d.ts +24 -0
  41. package/dist/commands/git-watch.d.ts.map +1 -0
  42. package/dist/commands/git-watch.js +84 -0
  43. package/dist/commands/git-watch.js.map +1 -0
  44. package/dist/commands/index.d.ts +5 -0
  45. package/dist/commands/index.d.ts.map +1 -1
  46. package/dist/commands/index.js +7 -0
  47. package/dist/commands/index.js.map +1 -1
  48. package/dist/commands/merge-order.d.ts.map +1 -1
  49. package/dist/commands/merge-order.js +18 -67
  50. package/dist/commands/merge-order.js.map +1 -1
  51. package/dist/commands/merged.d.ts.map +1 -1
  52. package/dist/commands/merged.js +1 -9
  53. package/dist/commands/merged.js.map +1 -1
  54. package/dist/commands/pulse.d.ts.map +1 -1
  55. package/dist/commands/pulse.js +137 -74
  56. package/dist/commands/pulse.js.map +1 -1
  57. package/dist/commands/queen.d.ts.map +1 -1
  58. package/dist/commands/queen.js +36 -19
  59. package/dist/commands/queen.js.map +1 -1
  60. package/dist/commands/ready-check.d.ts +2 -1
  61. package/dist/commands/ready-check.d.ts.map +1 -1
  62. package/dist/commands/ready-check.js +6 -30
  63. package/dist/commands/ready-check.js.map +1 -1
  64. package/dist/commands/register.d.ts.map +1 -1
  65. package/dist/commands/register.js +7 -29
  66. package/dist/commands/register.js.map +1 -1
  67. package/dist/commands/stale.d.ts +1 -9
  68. package/dist/commands/stale.d.ts.map +1 -1
  69. package/dist/commands/stale.js +1 -42
  70. package/dist/commands/stale.js.map +1 -1
  71. package/dist/commands/torrent.d.ts.map +1 -1
  72. package/dist/commands/torrent.js +29 -18
  73. package/dist/commands/torrent.js.map +1 -1
  74. package/dist/commands/watch.d.ts.map +1 -1
  75. package/dist/commands/watch.js +13 -34
  76. package/dist/commands/watch.js.map +1 -1
  77. package/dist/lib/agent-errors.js +2 -2
  78. package/dist/lib/agent-errors.js.map +1 -1
  79. package/dist/lib/ai/context-builder.d.ts +16 -0
  80. package/dist/lib/ai/context-builder.d.ts.map +1 -0
  81. package/dist/lib/ai/context-builder.js +216 -0
  82. package/dist/lib/ai/context-builder.js.map +1 -0
  83. package/dist/lib/ai/event-handler.d.ts +21 -0
  84. package/dist/lib/ai/event-handler.d.ts.map +1 -0
  85. package/dist/lib/ai/event-handler.js +98 -0
  86. package/dist/lib/ai/event-handler.js.map +1 -0
  87. package/dist/lib/ai/index.d.ts +13 -0
  88. package/dist/lib/ai/index.d.ts.map +1 -0
  89. package/dist/lib/ai/index.js +11 -0
  90. package/dist/lib/ai/index.js.map +1 -0
  91. package/dist/lib/ai/llm-client.d.ts +37 -0
  92. package/dist/lib/ai/llm-client.d.ts.map +1 -0
  93. package/dist/lib/ai/llm-client.js +225 -0
  94. package/dist/lib/ai/llm-client.js.map +1 -0
  95. package/dist/lib/ai/reasoner.d.ts +11 -0
  96. package/dist/lib/ai/reasoner.d.ts.map +1 -0
  97. package/dist/lib/ai/reasoner.js +246 -0
  98. package/dist/lib/ai/reasoner.js.map +1 -0
  99. package/dist/lib/ai/setup.d.ts +40 -0
  100. package/dist/lib/ai/setup.d.ts.map +1 -0
  101. package/dist/lib/ai/setup.js +154 -0
  102. package/dist/lib/ai/setup.js.map +1 -0
  103. package/dist/lib/ai/types.d.ts +135 -0
  104. package/dist/lib/ai/types.d.ts.map +1 -0
  105. package/dist/lib/ai/types.js +39 -0
  106. package/dist/lib/ai/types.js.map +1 -0
  107. package/dist/lib/colony-subscriber.d.ts +15 -12
  108. package/dist/lib/colony-subscriber.d.ts.map +1 -1
  109. package/dist/lib/colony-subscriber.js +146 -65
  110. package/dist/lib/colony-subscriber.js.map +1 -1
  111. package/dist/lib/config.d.ts.map +1 -1
  112. package/dist/lib/config.js +18 -4
  113. package/dist/lib/config.js.map +1 -1
  114. package/dist/lib/conflict-analyzer.d.ts +33 -0
  115. package/dist/lib/conflict-analyzer.d.ts.map +1 -0
  116. package/dist/lib/conflict-analyzer.js +114 -0
  117. package/dist/lib/conflict-analyzer.js.map +1 -0
  118. package/dist/lib/conflict-renderer.d.ts +7 -0
  119. package/dist/lib/conflict-renderer.d.ts.map +1 -0
  120. package/dist/lib/conflict-renderer.js +162 -0
  121. package/dist/lib/conflict-renderer.js.map +1 -0
  122. package/dist/lib/conflict-tier.d.ts +20 -0
  123. package/dist/lib/conflict-tier.d.ts.map +1 -0
  124. package/dist/lib/conflict-tier.js +49 -0
  125. package/dist/lib/conflict-tier.js.map +1 -0
  126. package/dist/lib/crypto.js +1 -1
  127. package/dist/lib/crypto.js.map +1 -1
  128. package/dist/lib/daily-bridge.d.ts.map +1 -1
  129. package/dist/lib/daily-bridge.js +3 -2
  130. package/dist/lib/daily-bridge.js.map +1 -1
  131. package/dist/lib/git-events-subscriber.d.ts +59 -0
  132. package/dist/lib/git-events-subscriber.d.ts.map +1 -0
  133. package/dist/lib/git-events-subscriber.js +779 -0
  134. package/dist/lib/git-events-subscriber.js.map +1 -0
  135. package/dist/lib/git.d.ts +15 -0
  136. package/dist/lib/git.d.ts.map +1 -0
  137. package/dist/lib/git.js +180 -0
  138. package/dist/lib/git.js.map +1 -0
  139. package/dist/lib/github.d.ts.map +1 -1
  140. package/dist/lib/github.js +14 -9
  141. package/dist/lib/github.js.map +1 -1
  142. package/dist/lib/graph.d.ts +23 -0
  143. package/dist/lib/graph.d.ts.map +1 -0
  144. package/dist/lib/graph.js +134 -0
  145. package/dist/lib/graph.js.map +1 -0
  146. package/dist/lib/hub.d.ts +31 -0
  147. package/dist/lib/hub.d.ts.map +1 -0
  148. package/dist/lib/hub.js +92 -0
  149. package/dist/lib/hub.js.map +1 -0
  150. package/dist/lib/regex-utils.d.ts +6 -0
  151. package/dist/lib/regex-utils.d.ts.map +1 -0
  152. package/dist/lib/regex-utils.js +24 -0
  153. package/dist/lib/regex-utils.js.map +1 -0
  154. package/dist/lib/remote-drift.d.ts +60 -0
  155. package/dist/lib/remote-drift.d.ts.map +1 -0
  156. package/dist/lib/remote-drift.js +225 -0
  157. package/dist/lib/remote-drift.js.map +1 -0
  158. package/dist/lib/repo-scanner.d.ts +0 -4
  159. package/dist/lib/repo-scanner.d.ts.map +1 -1
  160. package/dist/lib/repo-scanner.js +2 -1
  161. package/dist/lib/repo-scanner.js.map +1 -1
  162. package/dist/lib/salvage-analyzer.d.ts.map +1 -1
  163. package/dist/lib/salvage-analyzer.js +2 -3
  164. package/dist/lib/salvage-analyzer.js.map +1 -1
  165. package/dist/lib/security.d.ts +17 -0
  166. package/dist/lib/security.d.ts.map +1 -1
  167. package/dist/lib/security.js +34 -1
  168. package/dist/lib/security.js.map +1 -1
  169. package/dist/lib/session-logger.d.ts +54 -0
  170. package/dist/lib/session-logger.d.ts.map +1 -0
  171. package/dist/lib/session-logger.js +136 -0
  172. package/dist/lib/session-logger.js.map +1 -0
  173. package/dist/storage/adapter.d.ts +4 -0
  174. package/dist/storage/adapter.d.ts.map +1 -1
  175. package/dist/storage/branch-registry-store.d.ts +13 -0
  176. package/dist/storage/branch-registry-store.d.ts.map +1 -0
  177. package/dist/storage/branch-registry-store.js +2 -0
  178. package/dist/storage/branch-registry-store.js.map +1 -0
  179. package/dist/storage/factory.d.ts +4 -0
  180. package/dist/storage/factory.d.ts.map +1 -1
  181. package/dist/storage/factory.js +25 -9
  182. package/dist/storage/factory.js.map +1 -1
  183. package/dist/storage/index.d.ts +5 -5
  184. package/dist/storage/index.d.ts.map +1 -1
  185. package/dist/storage/index.js +5 -6
  186. package/dist/storage/index.js.map +1 -1
  187. package/dist/storage/json-branch-registry-store.d.ts +19 -0
  188. package/dist/storage/json-branch-registry-store.d.ts.map +1 -0
  189. package/dist/storage/json-branch-registry-store.js +112 -0
  190. package/dist/storage/json-branch-registry-store.js.map +1 -0
  191. package/dist/storage/local.d.ts +2 -6
  192. package/dist/storage/local.d.ts.map +1 -1
  193. package/dist/storage/local.js +13 -76
  194. package/dist/storage/local.js.map +1 -1
  195. package/dist/storage/memory-branch-registry-store.d.ts +16 -0
  196. package/dist/storage/memory-branch-registry-store.d.ts.map +1 -0
  197. package/dist/storage/memory-branch-registry-store.js +65 -0
  198. package/dist/storage/memory-branch-registry-store.js.map +1 -0
  199. package/dist/storage/mycmail-adapter.d.ts.map +1 -1
  200. package/dist/storage/mycmail-adapter.js +4 -6
  201. package/dist/storage/mycmail-adapter.js.map +1 -1
  202. package/dist/storage/supabase-registry-sync-client-impl.d.ts +46 -0
  203. package/dist/storage/supabase-registry-sync-client-impl.d.ts.map +1 -0
  204. package/dist/storage/supabase-registry-sync-client-impl.js +322 -0
  205. package/dist/storage/supabase-registry-sync-client-impl.js.map +1 -0
  206. package/dist/storage/supabase-registry-sync-client.d.ts +9 -0
  207. package/dist/storage/supabase-registry-sync-client.d.ts.map +1 -0
  208. package/dist/storage/supabase-registry-sync-client.js +2 -0
  209. package/dist/storage/supabase-registry-sync-client.js.map +1 -0
  210. package/dist/storage/supabase.d.ts +8 -46
  211. package/dist/storage/supabase.d.ts.map +1 -1
  212. package/dist/storage/supabase.js +30 -342
  213. package/dist/storage/supabase.js.map +1 -1
  214. package/dist/tui/screen.d.ts.map +1 -1
  215. package/dist/tui/screen.js +5 -3
  216. package/dist/tui/screen.js.map +1 -1
  217. package/package.json +1 -1
@@ -0,0 +1,398 @@
1
+ /**
2
+ * spidersan bot — Message-driven git operations daemon via smalltoak.
3
+ *
4
+ * Polls smalltoak for /commands, executes git actions, replies with results.
5
+ * Requires envoak vault injection (GIT_BOT_ENABLED=true).
6
+ *
7
+ * Usage:
8
+ * envoak vault inject --key ... -- spidersan bot
9
+ * spidersan bot --once
10
+ * spidersan bot add <name> --path <path> --branch <branch> --push <files>
11
+ * spidersan bot remove <name>
12
+ * spidersan bot repos
13
+ */
14
+ import { Command } from 'commander';
15
+ import { execFileSync } from 'child_process';
16
+ import { existsSync, readFileSync, writeFileSync, mkdirSync } from 'fs';
17
+ import { join } from 'path';
18
+ import { homedir } from 'os';
19
+ // ── Config ──────────────────────────────────────────────────────────────────
20
+ const CONFIG_DIR = join(homedir(), '.spidersan');
21
+ const CONFIG_FILE = join(CONFIG_DIR, 'bot.json');
22
+ const HWM_FILE = join(CONFIG_DIR, 'bot_hwm');
23
+ const AGENT_NAME = 'spidersan';
24
+ const SMALLTOAK_URL = (process.env.SMALLTOAK_SERVER_URL || '').replace(/\/+$/, '');
25
+ const SMALLTOAK_TOKEN = process.env.SMALLTOAK_TOKEN || '';
26
+ const POLL_INTERVAL = 15_000;
27
+ const SYNC_INTERVAL = 90_000;
28
+ const RATE_LIMIT = 10_000; // ms per repo
29
+ const VALID_COMMANDS = new Set(['sync', 'pull', 'push', 'status', 'conflicts', 'log']);
30
+ const BRANCH_RE = /^[\w/.-]+$/;
31
+ // ── Tiers ───────────────────────────────────────────────────────────────────
32
+ const TIERS = {
33
+ coordinator: {
34
+ agents: ['birdsan', 'bsan', 'treebird', 'trbr'],
35
+ commands: ['sync', 'pull', 'push', 'status', 'conflicts', 'log'],
36
+ },
37
+ specialist: {
38
+ agents: ['spidersan', 'ssan', 'sherlock', 'srlk', 'watsan', 'wsan',
39
+ 'treesan', 'tsan', 'mycsan', 'mycs'],
40
+ commands: ['sync', 'pull', 'push', 'status', 'conflicts', 'log'],
41
+ },
42
+ worker: {
43
+ agents: ['nemosan', 'nemo', 'codex', 'codx', 'goose', 'goos'],
44
+ commands: ['status', 'log'],
45
+ },
46
+ };
47
+ function getTier(sender) {
48
+ for (const [tier, cfg] of Object.entries(TIERS)) {
49
+ if (cfg.agents.includes(sender))
50
+ return tier;
51
+ }
52
+ return null;
53
+ }
54
+ function isAuthorized(sender, command) {
55
+ const tier = getTier(sender);
56
+ if (!tier)
57
+ return false;
58
+ return TIERS[tier].commands.includes(command);
59
+ }
60
+ function loadBotConfig() {
61
+ if (existsSync(CONFIG_FILE)) {
62
+ try {
63
+ return JSON.parse(readFileSync(CONFIG_FILE, 'utf-8'));
64
+ }
65
+ catch { /* fall through */ }
66
+ }
67
+ return { repos: {}, pollInterval: 15, syncInterval: 90, rateLimit: 10 };
68
+ }
69
+ function saveBotConfig(cfg) {
70
+ if (!existsSync(CONFIG_DIR))
71
+ mkdirSync(CONFIG_DIR, { recursive: true });
72
+ writeFileSync(CONFIG_FILE, JSON.stringify(cfg, null, 2), 'utf-8');
73
+ }
74
+ // ── Command parser ──────────────────────────────────────────────────────────
75
+ function parseCommand(text, repos) {
76
+ if (!text || !text.startsWith('/'))
77
+ return null;
78
+ const parts = text.trim().split(/\s+/);
79
+ if (parts.length < 2)
80
+ return null;
81
+ const cmd = parts[0].slice(1);
82
+ const repo = parts[1];
83
+ const args = parts.slice(2);
84
+ if (!VALID_COMMANDS.has(cmd))
85
+ return null;
86
+ if (!(repo in repos))
87
+ return null;
88
+ for (const arg of args) {
89
+ if (arg.includes(".."))
90
+ return null;
91
+ if (!BRANCH_RE.test(arg))
92
+ return null;
93
+ }
94
+ return { cmd, repo, args };
95
+ }
96
+ // ── Smalltoak transport ─────────────────────────────────────────────────────
97
+ async function stRead(to, last) {
98
+ if (!SMALLTOAK_URL)
99
+ return [];
100
+ const params = new URLSearchParams();
101
+ if (to)
102
+ params.set('to', to);
103
+ if (last)
104
+ params.set('last', String(last));
105
+ const qs = params.toString() ? `?${params}` : '';
106
+ const headers = {};
107
+ if (SMALLTOAK_TOKEN)
108
+ headers['Authorization'] = `Bearer ${SMALLTOAK_TOKEN}`;
109
+ try {
110
+ const resp = await fetch(`${SMALLTOAK_URL}/messages${qs}`, { headers });
111
+ if (!resp.ok)
112
+ return [];
113
+ return await resp.json();
114
+ }
115
+ catch {
116
+ return [];
117
+ }
118
+ }
119
+ async function stPost(text, to, replyTo) {
120
+ if (!SMALLTOAK_URL)
121
+ return;
122
+ const headers = { 'Content-Type': 'application/json' };
123
+ if (SMALLTOAK_TOKEN)
124
+ headers['Authorization'] = `Bearer ${SMALLTOAK_TOKEN}`;
125
+ try {
126
+ await fetch(`${SMALLTOAK_URL}/messages`, {
127
+ method: 'POST',
128
+ headers,
129
+ body: JSON.stringify({
130
+ text, from: AGENT_NAME, to,
131
+ reply_to: replyTo,
132
+ }),
133
+ });
134
+ }
135
+ catch { /* silent */ }
136
+ }
137
+ // ── High-water mark ─────────────────────────────────────────────────────────
138
+ function loadHwm() {
139
+ try {
140
+ return parseInt(readFileSync(HWM_FILE, 'utf-8').trim(), 10) || 0;
141
+ }
142
+ catch {
143
+ return 0;
144
+ }
145
+ }
146
+ function saveHwm(id) {
147
+ if (!existsSync(CONFIG_DIR))
148
+ mkdirSync(CONFIG_DIR, { recursive: true });
149
+ writeFileSync(HWM_FILE, String(id), 'utf-8');
150
+ }
151
+ // ── Git executors ───────────────────────────────────────────────────────────
152
+ function executePull(cfg, branch) {
153
+ try {
154
+ const b = branch || cfg.branch;
155
+ const r = execFileSync('git', ['pull', '--ff-only', 'origin', b], { cwd: cfg.path, encoding: 'utf-8', timeout: 60000 });
156
+ return r.trim().substring(0, 500);
157
+ }
158
+ catch (err) {
159
+ return err.message;
160
+ }
161
+ }
162
+ function executePush(cfg) {
163
+ registerFiles(cfg);
164
+ const conflict = checkConflictsBefore(cfg);
165
+ if (conflict)
166
+ return conflict;
167
+ try {
168
+ for (const filePattern of cfg.autoPush) {
169
+ execFileSync('git', ['add', filePattern], { cwd: cfg.path, encoding: 'utf-8' });
170
+ }
171
+ try {
172
+ execFileSync('git', ['diff', '--cached', '--quiet'], { cwd: cfg.path, encoding: 'utf-8' });
173
+ return 'No changes to push';
174
+ }
175
+ catch { /* has staged changes */ }
176
+ execFileSync('git', ['commit', '-m', 'spidersan bot auto-push'], { cwd: cfg.path, encoding: 'utf-8' });
177
+ const r = execFileSync('git', ['push'], { cwd: cfg.path, encoding: 'utf-8', timeout: 60000 });
178
+ return r.trim().substring(0, 500) || 'Pushed';
179
+ }
180
+ catch (err) {
181
+ return err.message;
182
+ }
183
+ }
184
+ function registerFiles(cfg) {
185
+ try {
186
+ execFileSync('spidersan', ['register',
187
+ '--agent', 'spidersan-bot',
188
+ '--files', cfg.autoPush.join(','),
189
+ ], { cwd: cfg.path, encoding: 'utf-8', timeout: 10000 });
190
+ }
191
+ catch { /* best effort */ }
192
+ }
193
+ function checkConflictsBefore(cfg) {
194
+ try {
195
+ const result = execFileSync('spidersan', ['conflicts', '--json'], { cwd: cfg.path, encoding: 'utf-8', timeout: 10000 });
196
+ const data = JSON.parse(result);
197
+ const blocking = (data.conflicts || []).filter((c) => c.tier >= 2 || c.tier === 'BLOCK' || c.tier === 'PAUSE');
198
+ if (blocking.length > 0) {
199
+ const labels = blocking.map((c) => `${c.tierInfo?.label || 'T' + c.tier}: ${(c.files || [c.branch]).join(', ')}`);
200
+ return `BLOCKED: ${blocking.length} conflict(s) (tier 2+) — ${labels.join('; ')}`;
201
+ }
202
+ }
203
+ catch { /* spidersan not available or no conflicts */ }
204
+ return null;
205
+ }
206
+ function executeSync(cfg) {
207
+ registerFiles(cfg);
208
+ const conflict = checkConflictsBefore(cfg);
209
+ if (conflict)
210
+ return conflict;
211
+ const pull = executePull(cfg);
212
+ const push = executePush(cfg);
213
+ return `Pull: ${pull}\nPush: ${push}`;
214
+ }
215
+ function executeStatus(cfg) {
216
+ try {
217
+ const status = execFileSync('git', ['status', '--porcelain'], { cwd: cfg.path, encoding: 'utf-8' });
218
+ const branch = execFileSync('git', ['branch', '--show-current'], { cwd: cfg.path, encoding: 'utf-8' });
219
+ return `${status.trim()}\nBranch: ${branch.trim()}`.substring(0, 500);
220
+ }
221
+ catch (err) {
222
+ return err.message;
223
+ }
224
+ }
225
+ function executeLog(cfg, n = 10) {
226
+ try {
227
+ const limitedN = Math.min(n, 50);
228
+ const r = execFileSync('git', ['log', '--oneline', `-${limitedN}`], { cwd: cfg.path, encoding: 'utf-8' });
229
+ return r.trim().substring(0, 500);
230
+ }
231
+ catch (err) {
232
+ return err.message;
233
+ }
234
+ }
235
+ function executeConflicts(cfg) {
236
+ try {
237
+ const r = execFileSync('spidersan', ['conflicts'], { cwd: cfg.path, encoding: 'utf-8', timeout: 60000 });
238
+ return r.trim().substring(0, 500);
239
+ }
240
+ catch (err) {
241
+ if (err.code === 'ENOENT')
242
+ return 'spidersan command not found';
243
+ return err.message;
244
+ }
245
+ }
246
+ // ── Rate limiter ────────────────────────────────────────────────────────────
247
+ const lastAction = {};
248
+ function rateCheck(repo) {
249
+ const now = Date.now();
250
+ const last = lastAction[repo] || 0;
251
+ if (now - last < RATE_LIMIT)
252
+ return false;
253
+ lastAction[repo] = now;
254
+ return true;
255
+ }
256
+ // ── Command ─────────────────────────────────────────────────────────────────
257
+ export const botCommand = new Command('bot')
258
+ .description('Message-driven git operations daemon via smalltoak')
259
+ .option('--once', 'Single poll+sync cycle then exit')
260
+ .action(async (opts) => {
261
+ if (process.env.GIT_BOT_ENABLED !== 'true') {
262
+ console.error('Error: GIT_BOT_ENABLED not set. Run via: envoak vault inject --key ... -- spidersan bot');
263
+ process.exit(1);
264
+ }
265
+ const config = loadBotConfig();
266
+ if (Object.keys(config.repos).length === 0) {
267
+ console.error('No repos configured. Use: spidersan bot add <name> --path <path> --branch <branch> --push <files>');
268
+ process.exit(1);
269
+ }
270
+ console.log(`[bot] started — ${Object.keys(config.repos).length} repos, poll=${POLL_INTERVAL / 1000}s, sync=${SYNC_INTERVAL / 1000}s`);
271
+ // Register all configured repos/branches with spidersan for conflict detection
272
+ for (const [name, cfg] of Object.entries(config.repos)) {
273
+ try {
274
+ execFileSync('spidersan', ['register',
275
+ '--agent', 'spidersan-bot',
276
+ '--files', cfg.autoPush.join(','),
277
+ '--description', `git-bot auto-sync: ${name} (${cfg.branch})`
278
+ ], { cwd: cfg.path, encoding: 'utf-8', timeout: 10000 });
279
+ console.log(`[bot] registered ${name} (${cfg.branch}) — files: ${cfg.autoPush.join(', ')}`);
280
+ }
281
+ catch (err) {
282
+ console.log(`[bot] register ${name} skipped: ${err.message.split('\n')[0]}`);
283
+ }
284
+ }
285
+ const executors = {
286
+ sync: (cfg) => executeSync(cfg),
287
+ pull: (cfg, args) => executePull(cfg, args[0]),
288
+ push: (cfg) => executePush(cfg),
289
+ status: (cfg) => executeStatus(cfg),
290
+ log: (cfg, args) => executeLog(cfg, args[0] ? parseInt(args[0]) : 10),
291
+ conflicts: (cfg) => executeConflicts(cfg),
292
+ };
293
+ async function processMessage(msg) {
294
+ const sender = msg.from || 'unknown';
295
+ const parsed = parseCommand(msg.text || '', config.repos);
296
+ if (!parsed)
297
+ return;
298
+ const { cmd, repo, args } = parsed;
299
+ if (!isAuthorized(sender, cmd)) {
300
+ const tier = getTier(sender) || 'unknown';
301
+ await stPost(`DENIED: /${cmd} requires specialist or coordinator tier. Your tier: ${tier}.`, sender, msg.id);
302
+ return;
303
+ }
304
+ if (!rateCheck(repo)) {
305
+ await stPost(`RATE LIMITED: wait ${RATE_LIMIT / 1000}s between actions on ${repo}.`, sender, msg.id);
306
+ return;
307
+ }
308
+ const ts = new Date().toLocaleTimeString('en-US', { hour12: false });
309
+ console.log(`[${ts}] ${sender} → /${cmd} ${repo} ${args.join(' ')}`.trim());
310
+ try {
311
+ const result = executors[cmd](config.repos[repo], args);
312
+ await stPost(`/${cmd} ${repo}: ${result.substring(0, 500)}`, sender, msg.id);
313
+ }
314
+ catch (err) {
315
+ await stPost(`/${cmd} ${repo}: Error: ${err.message}`, sender, msg.id);
316
+ }
317
+ }
318
+ let hwm = loadHwm();
319
+ let lastSync = 0;
320
+ const cycle = async () => {
321
+ const now = Date.now();
322
+ // Periodic auto-sync
323
+ if (now - lastSync >= SYNC_INTERVAL) {
324
+ for (const [name, cfg] of Object.entries(config.repos)) {
325
+ try {
326
+ const result = executeSync(cfg);
327
+ const ts = new Date().toLocaleTimeString('en-US', { hour12: false });
328
+ console.log(`[${ts}] auto-sync ${name}: ${result.substring(0, 100)}`);
329
+ }
330
+ catch (err) {
331
+ console.log(`[auto-sync] ${name} failed: ${err.message}`);
332
+ }
333
+ }
334
+ lastSync = now;
335
+ }
336
+ // Poll for commands
337
+ try {
338
+ const msgs = await stRead(AGENT_NAME, 50);
339
+ const newMsgs = msgs.filter((m) => (m.id || 0) > hwm).sort((a, b) => a.id - b.id);
340
+ for (const msg of newMsgs) {
341
+ await processMessage(msg);
342
+ hwm = msg.id;
343
+ saveHwm(hwm);
344
+ }
345
+ }
346
+ catch (err) {
347
+ console.log(`[poll] error: ${err.message}`);
348
+ }
349
+ };
350
+ // Run once or loop
351
+ await cycle();
352
+ if (opts.once)
353
+ return;
354
+ setInterval(cycle, POLL_INTERVAL);
355
+ // Keep process alive
356
+ await new Promise(() => { });
357
+ });
358
+ // Sub-commands: add, remove, repos
359
+ botCommand
360
+ .command('add <name>')
361
+ .description('Add a repo to the bot watchlist')
362
+ .requiredOption('--path <path>', 'Absolute path to repo')
363
+ .requiredOption('--branch <branch>', 'Branch to track')
364
+ .option('--push <files>', 'Comma-separated auto-push file patterns')
365
+ .action((name, opts) => {
366
+ const config = loadBotConfig();
367
+ config.repos[name] = {
368
+ path: opts.path,
369
+ branch: opts.branch,
370
+ autoPush: opts.push ? opts.push.split(',') : [],
371
+ };
372
+ saveBotConfig(config);
373
+ console.log(`Added repo: ${name}`);
374
+ });
375
+ botCommand
376
+ .command('remove <name>')
377
+ .description('Remove a repo from the bot watchlist')
378
+ .action((name) => {
379
+ const config = loadBotConfig();
380
+ delete config.repos[name];
381
+ saveBotConfig(config);
382
+ console.log(`Removed repo: ${name}`);
383
+ });
384
+ botCommand
385
+ .command('repos')
386
+ .description('List configured repos')
387
+ .action(() => {
388
+ const config = loadBotConfig();
389
+ const repos = Object.entries(config.repos);
390
+ if (repos.length === 0) {
391
+ console.log('No repos configured.');
392
+ return;
393
+ }
394
+ for (const [name, cfg] of repos) {
395
+ console.log(` ${name}: ${cfg.path} (${cfg.branch}) push=[${cfg.autoPush.join(', ')}]`);
396
+ }
397
+ });
398
+ //# sourceMappingURL=bot.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"bot.js","sourceRoot":"","sources":["../../src/commands/bot.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,IAAI,CAAC;AACxE,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,OAAO,EAAE,MAAM,IAAI,CAAC;AAE7B,+EAA+E;AAE/E,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,YAAY,CAAC,CAAC;AACjD,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC;AACjD,MAAM,QAAQ,GAAG,IAAI,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;AAC7C,MAAM,UAAU,GAAG,WAAW,CAAC;AAE/B,MAAM,aAAa,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;AACnF,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC;AAE1D,MAAM,aAAa,GAAG,MAAM,CAAC;AAC7B,MAAM,aAAa,GAAG,MAAM,CAAC;AAC7B,MAAM,UAAU,GAAG,MAAM,CAAC,CAAC,cAAc;AAEzC,MAAM,cAAc,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC,CAAC;AACvF,MAAM,SAAS,GAAG,YAAY,CAAC;AAE/B,+EAA+E;AAE/E,MAAM,KAAK,GAA6D;IACtE,WAAW,EAAE;QACX,MAAM,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC;QAC/C,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,CAAC;KACjE;IACD,UAAU,EAAE;QACV,MAAM,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;YACzD,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC;QAC7C,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,KAAK,CAAC;KACjE;IACD,MAAM,EAAE;QACN,MAAM,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC;QAC7D,QAAQ,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC;KAC5B;CACF,CAAC;AAEF,SAAS,OAAO,CAAC,MAAc;IAC7B,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChD,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,IAAI,CAAC;IAC/C,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,YAAY,CAAC,MAAc,EAAE,OAAe;IACnD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IAC7B,IAAI,CAAC,IAAI;QAAE,OAAO,KAAK,CAAC;IACxB,OAAO,KAAK,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAChD,CAAC;AAiBD,SAAS,aAAa;IACpB,IAAI,UAAU,CAAC,WAAW,CAAC,EAAE,CAAC;QAC5B,IAAI,CAAC;YACH,OAAO,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;QACxD,CAAC;QAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;AAC1E,CAAC;AAED,SAAS,aAAa,CAAC,GAAc;IACnC,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAAE,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxE,aAAa,CAAC,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;AACpE,CAAC;AAED,+EAA+E;AAE/E,SAAS,YAAY,CAAC,IAAY,EAAE,KAAiC;IAEnE,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAChD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACvC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAClC,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC9B,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IACtB,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC5B,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,IAAI,CAAC;IAC1C,IAAI,CAAC,CAAC,IAAI,IAAI,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAClC,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QACpC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,CAAC;IACxC,CAAC;IACD,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;AAC7B,CAAC;AAED,+EAA+E;AAE/E,KAAK,UAAU,MAAM,CAAC,EAAW,EAAE,IAAa;IAC9C,IAAI,CAAC,aAAa;QAAE,OAAO,EAAE,CAAC;IAC9B,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;IACrC,IAAI,EAAE;QAAE,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC7B,IAAI,IAAI;QAAE,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAC3C,MAAM,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACjD,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,IAAI,eAAe;QAAE,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,eAAe,EAAE,CAAC;IAC5E,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,aAAa,YAAY,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QACxE,IAAI,CAAC,IAAI,CAAC,EAAE;YAAE,OAAO,EAAE,CAAC;QACxB,OAAO,MAAM,IAAI,CAAC,IAAI,EAAW,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,KAAK,UAAU,MAAM,CAAC,IAAY,EAAE,EAAW,EAAE,OAAgB;IAC/D,IAAI,CAAC,aAAa;QAAE,OAAO;IAC3B,MAAM,OAAO,GAA2B,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC;IAC/E,IAAI,eAAe;QAAE,OAAO,CAAC,eAAe,CAAC,GAAG,UAAU,eAAe,EAAE,CAAC;IAC5E,IAAI,CAAC;QACH,MAAM,KAAK,CAAC,GAAG,aAAa,WAAW,EAAE;YACvC,MAAM,EAAE,MAAM;YACd,OAAO;YACP,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE;gBAC1B,QAAQ,EAAE,OAAO;aAClB,CAAC;SACH,CAAC,CAAC;IACL,CAAC;IAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC;AAC1B,CAAC;AAED,+EAA+E;AAE/E,SAAS,OAAO;IACd,IAAI,CAAC;QAAC,OAAO,QAAQ,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;IAAC,CAAC;IACzE,MAAM,CAAC;QAAC,OAAO,CAAC,CAAC;IAAC,CAAC;AACrB,CAAC;AAED,SAAS,OAAO,CAAC,EAAU;IACzB,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;QAAE,SAAS,CAAC,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxE,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;AAC/C,CAAC;AAED,+EAA+E;AAE/E,SAAS,WAAW,CAAC,GAAe,EAAE,MAAe;IACnD,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,MAAM,IAAI,GAAG,CAAC,MAAM,CAAC;QAC/B,MAAM,CAAC,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACxH,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,OAAO,GAAG,CAAC,OAAO,CAAC;IACrB,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAAC,GAAe;IAClC,aAAa,CAAC,GAAG,CAAC,CAAC;IACnB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC3C,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,IAAI,CAAC;QACH,KAAK,MAAM,WAAW,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC;YACvC,YAAY,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAClF,CAAC;QACD,IAAI,CAAC;YACH,YAAY,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;YAC3F,OAAO,oBAAoB,CAAC;QAC9B,CAAC;QAAC,MAAM,CAAC,CAAC,wBAAwB,CAAC,CAAC;QACpC,YAAY,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,yBAAyB,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QACvG,MAAM,CAAC,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QAC9F,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,IAAI,QAAQ,CAAC;IAChD,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,OAAO,GAAG,CAAC,OAAO,CAAC;IACrB,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,GAAe;IACpC,IAAI,CAAC;QACH,YAAY,CAAC,WAAW,EAAE,CAAC,UAAU;YACnC,SAAS,EAAE,eAAe;YAC1B,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC;SAClC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3D,CAAC;IAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,oBAAoB,CAAC,GAAe;IAC3C,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACxH,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAChC,MAAM,QAAQ,GAAG,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC;QACpH,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACxB,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,IAAI,GAAG,GAAG,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACvH,OAAO,YAAY,QAAQ,CAAC,MAAM,4BAA4B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACpF,CAAC;IACH,CAAC;IAAC,MAAM,CAAC,CAAC,6CAA6C,CAAC,CAAC;IACzD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,WAAW,CAAC,GAAe;IAClC,aAAa,CAAC,GAAG,CAAC,CAAC;IACnB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;IAC3C,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;IAC9B,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;IAC9B,OAAO,SAAS,IAAI,WAAW,IAAI,EAAE,CAAC;AACxC,CAAC;AAED,SAAS,aAAa,CAAC,GAAe;IACpC,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QACpG,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QACvG,OAAO,GAAG,MAAM,CAAC,IAAI,EAAE,aAAa,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACxE,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,OAAO,GAAG,CAAC,OAAO,CAAC;IACrB,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,GAAe,EAAE,CAAC,GAAG,EAAE;IACzC,IAAI,CAAC;QACH,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;QACjC,MAAM,CAAC,GAAG,YAAY,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,IAAI,QAAQ,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1G,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,OAAO,GAAG,CAAC,OAAO,CAAC;IACrB,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CAAC,GAAe;IACvC,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;QACzG,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACpC,CAAC;IAAC,OAAO,GAAQ,EAAE,CAAC;QAClB,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ;YAAE,OAAO,6BAA6B,CAAC;QAChE,OAAO,GAAG,CAAC,OAAO,CAAC;IACrB,CAAC;AACH,CAAC;AAED,+EAA+E;AAE/E,MAAM,UAAU,GAA2B,EAAE,CAAC;AAE9C,SAAS,SAAS,CAAC,IAAY;IAC7B,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACnC,IAAI,GAAG,GAAG,IAAI,GAAG,UAAU;QAAE,OAAO,KAAK,CAAC;IAC1C,UAAU,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;IACvB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,+EAA+E;AAE/E,MAAM,CAAC,MAAM,UAAU,GAAG,IAAI,OAAO,CAAC,KAAK,CAAC;KACzC,WAAW,CAAC,oDAAoD,CAAC;KACjE,MAAM,CAAC,QAAQ,EAAE,kCAAkC,CAAC;KACpD,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;IACrB,IAAI,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,MAAM,EAAE,CAAC;QAC3C,OAAO,CAAC,KAAK,CAAC,yFAAyF,CAAC,CAAC;QACzG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3C,OAAO,CAAC,KAAK,CAAC,mGAAmG,CAAC,CAAC;QACnH,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,mBAAmB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,gBAAgB,aAAa,GAAG,IAAI,WAAW,aAAa,GAAG,IAAI,GAAG,CAAC,CAAC;IAEvI,+EAA+E;IAC/E,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;QACvD,IAAI,CAAC;YACH,YAAY,CAAC,WAAW,EAAE,CAAC,UAAU;gBACnC,SAAS,EAAE,eAAe;gBAC1B,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC;gBACjC,eAAe,EAAE,sBAAsB,IAAI,KAAK,GAAG,CAAC,MAAM,GAAG;aAC9D,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;YACzD,OAAO,CAAC,GAAG,CAAC,oBAAoB,IAAI,KAAK,GAAG,CAAC,MAAM,cAAc,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9F,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,kBAAkB,IAAI,aAAa,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC/E,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAgE;QAC7E,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC;QAC/B,IAAI,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QAC9C,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,WAAW,CAAC,GAAG,CAAC;QAC/B,MAAM,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC;QACnC,GAAG,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,gBAAgB,CAAC,GAAG,CAAC;KAC1C,CAAC;IAEF,KAAK,UAAU,cAAc,CAAC,GAAQ;QACpC,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,IAAI,SAAS,CAAC;QACrC,MAAM,MAAM,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;QAC1D,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;QAEnC,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,SAAS,CAAC;YAC1C,MAAM,MAAM,CAAC,YAAY,GAAG,wDAAwD,IAAI,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;YAC7G,OAAO;QACT,CAAC;QACD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;YACrB,MAAM,MAAM,CAAC,sBAAsB,UAAU,GAAG,IAAI,wBAAwB,IAAI,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;YACrG,OAAO;QACT,CAAC;QAED,MAAM,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;QACrE,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,MAAM,OAAO,GAAG,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAE5E,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;YACxD,MAAM,MAAM,CAAC,IAAI,GAAG,IAAI,IAAI,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QAC/E,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,MAAM,MAAM,CAAC,IAAI,GAAG,IAAI,IAAI,YAAY,GAAG,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;QACzE,CAAC;IACH,CAAC;IAED,IAAI,GAAG,GAAG,OAAO,EAAE,CAAC;IACpB,IAAI,QAAQ,GAAG,CAAC,CAAC;IAEjB,MAAM,KAAK,GAAG,KAAK,IAAI,EAAE;QACvB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QAEvB,qBAAqB;QACrB,IAAI,GAAG,GAAG,QAAQ,IAAI,aAAa,EAAE,CAAC;YACpC,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;gBACvD,IAAI,CAAC;oBACH,MAAM,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;oBAChC,MAAM,EAAE,GAAG,IAAI,IAAI,EAAE,CAAC,kBAAkB,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;oBACrE,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,eAAe,IAAI,KAAK,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC;gBACxE,CAAC;gBAAC,OAAO,GAAQ,EAAE,CAAC;oBAClB,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,YAAY,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC5D,CAAC;YACH,CAAC;YACD,QAAQ,GAAG,GAAG,CAAC;QACjB,CAAC;QAED,oBAAoB;QACpB,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;YAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;YACjG,KAAK,MAAM,GAAG,IAAI,OAAO,EAAE,CAAC;gBAC1B,MAAM,cAAc,CAAC,GAAG,CAAC,CAAC;gBAC1B,GAAG,GAAG,GAAG,CAAC,EAAE,CAAC;gBACb,OAAO,CAAC,GAAG,CAAC,CAAC;YACf,CAAC;QACH,CAAC;QAAC,OAAO,GAAQ,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CAAC,iBAAiB,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAC9C,CAAC;IACH,CAAC,CAAC;IAEF,mBAAmB;IACnB,MAAM,KAAK,EAAE,CAAC;IACd,IAAI,IAAI,CAAC,IAAI;QAAE,OAAO;IAEtB,WAAW,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;IAClC,qBAAqB;IACrB,MAAM,IAAI,OAAO,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;AAC9B,CAAC,CAAC,CAAC;AAEL,mCAAmC;AACnC,UAAU;KACP,OAAO,CAAC,YAAY,CAAC;KACrB,WAAW,CAAC,iCAAiC,CAAC;KAC9C,cAAc,CAAC,eAAe,EAAE,uBAAuB,CAAC;KACxD,cAAc,CAAC,mBAAmB,EAAE,iBAAiB,CAAC;KACtD,MAAM,CAAC,gBAAgB,EAAE,yCAAyC,CAAC;KACnE,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;IACrB,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG;QACnB,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE;KAChD,CAAC;IACF,aAAa,CAAC,MAAM,CAAC,CAAC;IACtB,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;AACrC,CAAC,CAAC,CAAC;AAEL,UAAU;KACP,OAAO,CAAC,eAAe,CAAC;KACxB,WAAW,CAAC,sCAAsC,CAAC;KACnD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE;IACf,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,OAAO,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,aAAa,CAAC,MAAM,CAAC,CAAC;IACtB,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;AACvC,CAAC,CAAC,CAAC;AAEL,UAAU;KACP,OAAO,CAAC,OAAO,CAAC;KAChB,WAAW,CAAC,uBAAuB,CAAC;KACpC,MAAM,CAAC,GAAG,EAAE;IACX,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC3C,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;QACpC,OAAO;IACT,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,KAAK,EAAE,CAAC;QAChC,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,KAAK,GAAG,CAAC,IAAI,KAAK,GAAG,CAAC,MAAM,WAAW,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC1F,CAAC;AACH,CAAC,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"conflicts.d.ts","sourceRoot":"","sources":["../../src/commands/conflicts.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAqYpC,eAAO,MAAM,gBAAgB,SA+TvB,CAAC"}
1
+ {"version":3,"file":"conflicts.d.ts","sourceRoot":"","sources":["../../src/commands/conflicts.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAiXpC,eAAO,MAAM,gBAAgB,SAoSvB,CAAC"}