swadhinbiswas feat: implement air-gapped mode, UI fixes, and project management integrations · 7/9/2026
e3bd4a1
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
/**
* PR Commands
* Manage pull requests from the CLI
*/
import chalk from "chalk";
import { Command } from "commander";
import inquirer from "inquirer";
import ora from "ora";
import { simpleGit } from "simple-git";
import { getWithAuth, patchWithAuth, postWithAuth } from "../../lib/api.js";
import { getConfig } from "../../lib/config.js";
import { getRepoInfoFromGit } from "../../lib/git.js";
const git = simpleGit();
interface PullRequest {
id: string;
number: number;
title: string;
state: string;
author: { username: string };
sourceBranch: string;
targetBranch: string;
createdAt: string;
updatedAt: string;
isDraft: boolean;
additions?: number;
deletions?: number;
changedFiles?: number;
}
export const prCommands = new Command("pr").description("Manage pull requests");
// Get repo info from git remote
async function getRepoInfo() {
return getRepoInfoFromGit(git);
}
// PR Create
prCommands
.command("create")
.description("Create a new pull request")
.option("-t, --title <title>", "PR title")
.option("-b, --body <body>", "PR description")
.option("-B, --base <branch>", "Base branch", "main")
.option("-d, --draft", "Create as draft PR")
.option("-a, --assignee <user>", "Assign to user")
.option(
"-l, --label <label>",
"Add label (can be used multiple times)",
(val, acc: string[]) => [...acc, val],
[],
)
.action(async (options) => {
const config = getConfig();
if (!config.token) {
console.error(chalk.hex("#ff5555")("Not logged in. Run 'och auth login' first."));
process.exit(1);
}
const spinner = ora("Preparing pull request...").start();
try {
const repoInfo = await getRepoInfo();
if (!repoInfo) {
spinner.fail("Could not determine repository");
process.exit(1);
}
const currentBranch = (
await git.revparse(["--abbrev-ref", "HEAD"])
).trim();
if (currentBranch === options.base) {
spinner.fail(
`Cannot create PR from ${options.base} to ${options.base}`,
);
process.exit(1);
}
spinner.stop();
// Get title interactively if not provided
let title = options.title;
let body = options.body;
if (!title) {
const lastCommit = await git.log({ maxCount: 1 });
const defaultTitle =
lastCommit.latest?.message?.split("\n")[0] || currentBranch;
const answers = await inquirer.prompt([
{
type: "input",
name: "title",
message: "PR Title:",
default: defaultTitle,
},
{
type: "editor",
name: "body",
message: "PR Description (optional):",
},
]);
title = answers.title;
body = answers.body;
}
spinner.start("Creating pull request...");
const result = await postWithAuth<{ data: PullRequest }>(
`/api/repos/${repoInfo.owner}/${repoInfo.repo}/pulls`,
{
title,
body,
sourceBranch: currentBranch,
targetBranch: options.base,
isDraft: options.draft || false,
assignee: options.assignee,
labels: options.label,
},
);
spinner.succeed(
`Created PR #${result.data.number}: ${result.data.title}`,
);
console.log(
chalk.hex("#6272a4")(
` ${config.serverUrl}/${repoInfo.owner}/${repoInfo.repo}/pull/${result.data.number}`,
),
);
} catch (error) {
spinner.fail("Failed to create pull request");
console.error(
chalk.hex("#ff5555")(error instanceof Error ? error.message : "Unknown error"),
);
process.exit(1);
}
});
// PR List
prCommands
.command("list")
.alias("ls")
.description("List pull requests")
.option(
"-s, --state <state>",
"Filter by state (open, closed, merged, all)",
"open",
)
.option("-a, --author <user>", "Filter by author")
.option("-l, --label <label>", "Filter by label")
.option("-L, --limit <n>", "Maximum results", "30")
.action(async (options) => {
const config = getConfig();
if (!config.token) {
console.error(chalk.hex("#ff5555")("Not logged in. Run 'och auth login' first."));
process.exit(1);
}
const spinner = ora("Fetching pull requests...").start();
try {
const repoInfo = await getRepoInfo();
if (!repoInfo) {
spinner.fail("Could not determine repository");
process.exit(1);
}
const params = new URLSearchParams();
if (options.state !== "all") params.append("state", options.state);
if (options.author) params.append("author", options.author);
if (options.label) params.append("label", options.label);
params.append("limit", options.limit);
const result = await getWithAuth<{ data: PullRequest[] }>(
`/api/repos/${repoInfo.owner}/${repoInfo.repo}/pulls?${params}`,
);
spinner.stop();
const { printSectionHeader } = await import("../../lib/formatter.js");
if (result.data.length === 0) {
console.log(chalk.hex("#6272a4")("No pull requests found."));
return;
}
printSectionHeader(`Pull Requests (${result.data.length})`, "Recent pull requests for this repository", "PR");
console.log("");
for (const pr of result.data) {
const stateIcon =
pr.state === "open"
? chalk.hex("#50fa7b")("▶")
: pr.state === "merged"
? chalk.hex("#bd93f9")("✔")
: chalk.hex("#ff5555")("✖");
const draftLabel = pr.isDraft ? chalk.hex("#6272a4")(" [draft]") : "";
console.log(` ${stateIcon} ${chalk.hex("#f8f8f2").bold(`#${pr.number}`)} ${chalk.hex("#f8f8f2")(pr.title)}${draftLabel}`);
console.log(
chalk.hex("#6272a4")(
` ${pr.sourceBranch} → ${pr.targetBranch} • @${pr.author.username}`,
),
);
console.log("");
}
} catch (error) {
spinner.fail("Failed to list pull requests");
console.error(
chalk.hex("#ff5555")(error instanceof Error ? error.message : "Unknown error"),
);
process.exit(1);
}
});
// PR View
prCommands
.command("view <number>")
.description("View a pull request")
.option("-w, --web", "Open in browser")
.action(async (number: string, options) => {
const config = getConfig();
if (!config.token) {
console.error(chalk.hex("#ff5555")("Not logged in. Run 'och auth login' first."));
process.exit(1);
}
const spinner = ora("Fetching pull request...").start();
try {
const repoInfo = await getRepoInfo();
if (!repoInfo) {
spinner.fail("Could not determine repository");
process.exit(1);
}
const result = await getWithAuth<{
data: PullRequest & { body?: string };
}>(`/api/repos/${repoInfo.owner}/${repoInfo.repo}/pulls/${number}`);
spinner.stop();
const pr = result.data;
const stateColor =
pr.state === "open"
? chalk.hex("#50fa7b")
: pr.state === "merged"
? chalk.hex("#ff79c6")
: chalk.hex("#ff5555");
console.log(chalk.bold(`\n#${pr.number} ${pr.title}\n`));
console.log(
`State: ${stateColor(pr.state.toUpperCase())}${pr.isDraft ? chalk.hex("#6272a4")(" (draft)") : ""}`,
);
console.log(`Author: @${pr.author.username}`);
console.log(`Branch: ${pr.sourceBranch} → ${pr.targetBranch}`);
console.log(`Created: ${new Date(pr.createdAt).toLocaleDateString()}`);
if (pr.additions !== undefined) {
console.log(
`Changes: ${chalk.hex("#50fa7b")(`+${pr.additions}`)} ${chalk.hex("#ff5555")(`-${pr.deletions}`)} (${pr.changedFiles} files)`,
);
}
if (pr.body) {
console.log(chalk.hex("#6272a4")("\n─".repeat(40)));
console.log(pr.body);
}
console.log(chalk.hex("#6272a4")("\n─".repeat(40)));
console.log(
chalk.hex("#6272a4")(
`${config.serverUrl}/${repoInfo.owner}/${repoInfo.repo}/pull/${number}`,
),
);
console.log("");
} catch (error) {
spinner.fail("Failed to fetch pull request");
console.error(
chalk.hex("#ff5555")(error instanceof Error ? error.message : "Unknown error"),
);
process.exit(1);
}
});
// PR Merge
prCommands
.command("merge <number>")
.description("Merge a pull request")
.option("-m, --merge", "Use merge commit")
.option("-s, --squash", "Squash and merge")
.option("-r, --rebase", "Rebase and merge")
.option("-d, --delete-branch", "Delete branch after merge")
.action(async (number: string, options) => {
const config = getConfig();
if (!config.token) {
console.error(chalk.hex("#ff5555")("Not logged in. Run 'och auth login' first."));
process.exit(1);
}
const mergeMethod = options.squash
? "squash"
: options.rebase
? "rebase"
: "merge";
const spinner = ora(`Merging PR #${number} (${mergeMethod})...`).start();
try {
const repoInfo = await getRepoInfo();
if (!repoInfo) {
spinner.fail("Could not determine repository");
process.exit(1);
}
await postWithAuth(
`/api/repos/${repoInfo.owner}/${repoInfo.repo}/pulls/${number}/merge`,
{
method: mergeMethod,
deleteBranch: options.deleteBranch,
},
);
spinner.succeed(`Merged PR #${number}`);
} catch (error) {
spinner.fail("Failed to merge pull request");
console.error(
chalk.hex("#ff5555")(error instanceof Error ? error.message : "Unknown error"),
);
process.exit(1);
}
});
// PR Checkout
prCommands
.command("checkout <number>")
.alias("co")
.description("Checkout a pull request locally")
.action(async (number: string) => {
const config = getConfig();
if (!config.token) {
console.error(chalk.hex("#ff5555")("Not logged in. Run 'och auth login' first."));
process.exit(1);
}
const spinner = ora(`Checking out PR #${number}...`).start();
try {
const repoInfo = await getRepoInfo();
if (!repoInfo) {
spinner.fail("Could not determine repository");
process.exit(1);
}
// Get PR info
const result = await getWithAuth<{ data: PullRequest }>(
`/api/repos/${repoInfo.owner}/${repoInfo.repo}/pulls/${number}`,
);
const branchName = result.data.sourceBranch;
// Fetch and checkout
spinner.text = `Fetching ${branchName}...`;
await git.fetch(["origin", branchName]);
spinner.text = `Checking out ${branchName}...`;
await git.checkout(branchName);
spinner.succeed(`Checked out PR #${number} (${branchName})`);
} catch (error) {
spinner.fail("Failed to checkout pull request");
console.error(
chalk.hex("#ff5555")(error instanceof Error ? error.message : "Unknown error"),
);
process.exit(1);
}
});
// PR Close
prCommands
.command("close <number>")
.description("Close a pull request")
.action(async (number: string) => {
const config = getConfig();
if (!config.token) {
console.error(chalk.hex("#ff5555")("Not logged in. Run 'och auth login' first."));
process.exit(1);
}
const spinner = ora(`Closing PR #${number}...`).start();
try {
const repoInfo = await getRepoInfo();
if (!repoInfo) {
spinner.fail("Could not determine repository");
process.exit(1);
}
await patchWithAuth(
`/api/repos/${repoInfo.owner}/${repoInfo.repo}/pulls/${number}`,
{ state: "closed" },
);
spinner.succeed(`Closed PR #${number}`);
} catch (error) {
spinner.fail("Failed to close pull request");
console.error(
chalk.hex("#ff5555")(error instanceof Error ? error.message : "Unknown error"),
);
process.exit(1);
}
});
// PR Diff
prCommands
.command("diff <number>")
.description("View pull request diff")
.action(async (number: string) => {
const config = getConfig();
if (!config.token) {
console.error(chalk.hex("#ff5555")("Not logged in. Run 'och auth login' first."));
process.exit(1);
}
const spinner = ora(`Fetching diff for PR #${number}...`).start();
try {
const repoInfo = await getRepoInfo();
if (!repoInfo) {
spinner.fail("Could not determine repository");
process.exit(1);
}
const result = await getWithAuth<{ data: { diff: string } }>(
`/api/repos/${repoInfo.owner}/${repoInfo.repo}/pulls/${number}/diff`,
);
spinner.stop();
console.log(result.data.diff);
} catch (error) {
spinner.fail("Failed to fetch diff");
console.error(
chalk.hex("#ff5555")(error instanceof Error ? error.message : "Unknown error"),
);
process.exit(1);
}
});
// PR Ready (mark as ready for review)
prCommands
.command("ready <number>")
.description("Mark pull request as ready for review")
.action(async (number: string) => {
const config = getConfig();
if (!config.token) {
console.error(chalk.hex("#ff5555")("Not logged in. Run 'och auth login' first."));
process.exit(1);
}
const spinner = ora(`Marking PR #${number} as ready...`).start();
try {
const repoInfo = await getRepoInfo();
if (!repoInfo) {
spinner.fail("Could not determine repository");
process.exit(1);
}
await patchWithAuth(
`/api/repos/${repoInfo.owner}/${repoInfo.repo}/pulls/${number}`,
{ isDraft: false },
);
spinner.succeed(`PR #${number} is now ready for review`);
} catch (error) {
spinner.fail("Failed to update pull request");
console.error(
chalk.hex("#ff5555")(error instanceof Error ? error.message : "Unknown error"),
);
process.exit(1);
}
});
export default prCommands;