xonecas.io
687
Oc

orc-code / commit 87e4b22

refactor: split orc-core into library + separate cli package

- orc-core (library): agents.ts, db.ts, index.ts — no CLI or terminal I/O
- @orc-code/cli (new): cli.ts, prompt.ts, display.ts — terminal UI
- cli imports core via 'orc-code' package exports
- plugins stay as orc-core deps, cli only depends on orc-code + types

xonecas2026-03-26 87e4b22d7c5f86d8c8a1ccb5964c21c00b5e2afb parent faaf7a3

10 files changed

bun.lock+16−2
@@ -14,12 +14,24 @@
1414 "typescript": "^5.8.2",
1515 },
1616 },
17- "packages/orc-core": {
18- "name": "orc-code",
17+ "packages/orc-cli": {
18+ "name": "@orc-code/cli",
1919 "version": "0.0.1",
2020 "bin": {
2121 "orc": "src/cli.ts",
2222 },
23+ "dependencies": {
24+ "@orc-code/types": "workspace:*",
25+ "orc-code": "workspace:*",
26+ },
27+ "devDependencies": {
28+ "@types/bun": "^1.2.0",
29+ "typescript": "^5.8.2",
30+ },
31+ },
32+ "packages/orc-core": {
33+ "name": "orc-code",
34+ "version": "0.0.1",
2335 "dependencies": {
2436 "@orc-code/plugin-claude": "workspace:*",
2537 "@orc-code/plugin-codex": "workspace:*",
@@ -134,6 +146,8 @@
134146
135147 "@nodelib/fs.walk": ["@nodelib/fs.walk@1.2.8", "", { "dependencies": { "@nodelib/fs.scandir": "2.1.5", "fastq": "^1.6.0" } }, "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg=="],
136148
149+ "@orc-code/cli": ["@orc-code/cli@workspace:packages/orc-cli"],
150+
137151 "@orc-code/plugin-claude": ["@orc-code/plugin-claude@workspace:packages/plugin-claude"],
138152
139153 "@orc-code/plugin-codex": ["@orc-code/plugin-codex@workspace:packages/plugin-codex"],
packages/orc-cli/package.json+20−0
@@ -0,0 +1,20 @@
1+{
2+ "name": "@orc-code/cli",
3+ "version": "0.0.1",
4+ "type": "module",
5+ "bin": {
6+ "orc": "src/cli.ts"
7+ },
8+ "scripts": {
9+ "dev": "bun run src/cli.ts",
10+ "typecheck": "tsc --noEmit"
11+ },
12+ "dependencies": {
13+ "orc-code": "workspace:*",
14+ "@orc-code/types": "workspace:*"
15+ },
16+ "devDependencies": {
17+ "@types/bun": "^1.2.0",
18+ "typescript": "^5.8.2"
19+ }
20+}
packages/orc-cli/src/cli.ts+107−0
@@ -0,0 +1,107 @@
1+#!/usr/bin/env bun
2+
3+import { randomUUID } from "node:crypto";
4+import { discoverAgents, saveSession, updateSessionAgentId } from "orc-code";
5+import type { AgentPlugin, AgentProcess } from "@orc-code/types";
6+import { printBanner, printEvent } from "./display.js";
7+import { closePrompt, readPrompt } from "./prompt.js";
8+
9+function parseArgs(argv: string[]): {
10+ resume?: string;
11+ prompt?: string;
12+ agent?: string;
13+} {
14+ const args = argv.slice(2);
15+ let resume: string | undefined;
16+ let prompt: string | undefined;
17+ let agent: string | undefined;
18+
19+ for (let i = 0; i < args.length; i++) {
20+ const arg = args[i];
21+ if ((arg === "-r" || arg === "--resume") && i + 1 < args.length) {
22+ resume = args[++i];
23+ } else if ((arg === "-a" || arg === "--agent") && i + 1 < args.length) {
24+ agent = args[++i];
25+ } else if (!prompt && !arg.startsWith("-")) {
26+ prompt = arg;
27+ }
28+ }
29+
30+ return { resume, prompt, agent };
31+}
32+
33+async function runTurn(ap: AgentProcess): Promise<string | null> {
34+ for await (const event of ap.events) {
35+ printEvent(event);
36+ }
37+ const result = await ap.result;
38+ return result.sessionId;
39+}
40+
41+async function main(): Promise<void> {
42+ const { resume, prompt: initialPrompt, agent: agentName } = parseArgs(process.argv);
43+
44+ const agents = await discoverAgents();
45+ if (agents.length === 0) {
46+ console.error("No agent CLIs found in $PATH. Install claude or codex.");
47+ process.exit(1);
48+ }
49+
50+ const agent: AgentPlugin | undefined = agentName
51+ ? agents.find((a) => a.name === agentName)
52+ : agents[0];
53+ if (!agent) {
54+ console.error(
55+ `Agent "${agentName}" not found. Available: ${agents.map((a) => a.name).join(", ")}`,
56+ );
57+ process.exit(1);
58+ }
59+
60+ printBanner(agent.name);
61+
62+ const orcSessionId = randomUUID();
63+ let agentSessionId: string | null = resume ?? null;
64+
65+ // Get the first prompt — either from CLI args or interactively
66+ let prompt: string | null = initialPrompt ?? (await readPrompt("> "));
67+ if (!prompt) {
68+ process.exit(0);
69+ }
70+
71+ // Save session with title from first prompt
72+ saveSession(orcSessionId, agentSessionId, agent.name, prompt.slice(0, 50));
73+
74+ // Main loop: send prompt, stream response, ask for next prompt
75+ while (prompt) {
76+ const ap = agentSessionId
77+ ? agent.resumeSession(agentSessionId, prompt)
78+ : agent.createSession(prompt);
79+
80+ console.log(
81+ `\n ${agent.name} ⟶ ${agentSessionId ? `session ${agentSessionId}` : "new session"}\n`,
82+ );
83+
84+ const sid = await runTurn(ap);
85+ if (sid) {
86+ agentSessionId = sid;
87+ updateSessionAgentId(orcSessionId, agentSessionId);
88+ }
89+
90+ // One-shot mode: if prompt was passed as CLI arg and no --resume, exit after first turn
91+ if (initialPrompt && !resume) {
92+ break;
93+ }
94+
95+ console.log();
96+ prompt = await readPrompt("> ");
97+ }
98+
99+ closePrompt();
100+ console.log();
101+ console.log(`orc session: ${orcSessionId}`);
102+ if (agentSessionId) {
103+ console.log(`agent session: ${agentSessionId}`);
104+ }
105+}
106+
107+main();
packages/orc-cli/src/display.ts+0−0
packages/orc-cli/src/prompt.ts+38−0
@@ -0,0 +1,38 @@
1+import { type Interface, createInterface } from "node:readline/promises";
2+
3+let rl: Interface | null = null;
4+let stdinClosed = false;
5+
6+function getReadline(): Interface | null {
7+ if (stdinClosed) return null;
8+ if (!rl) {
9+ rl = createInterface({
10+ input: process.stdin,
11+ output: process.stdout,
12+ });
13+ rl.on("close", () => {
14+ rl = null;
15+ stdinClosed = true;
16+ });
17+ }
18+ return rl;
19+}
20+
21+/** Read a line from the user. Returns null on EOF (Ctrl+D) or empty input. */
22+export async function readPrompt(prefix: string): Promise<string | null> {
23+ const readline = getReadline();
24+ if (!readline) return null;
25+ try {
26+ const line = await readline.question(prefix);
27+ return line.trim() || null;
28+ } catch {
29+ return null;
30+ }
31+}
32+
33+export function closePrompt(): void {
34+ if (rl) {
35+ rl.close();
36+ rl = null;
37+ }
38+}
packages/orc-cli/tsconfig.json+8−0
@@ -0,0 +1,8 @@
1+{
2+ "extends": "../../tsconfig.json",
3+ "compilerOptions": {
4+ "rootDir": "src",
5+ "outDir": "dist"
6+ },
7+ "include": ["src"]
8+}
packages/orc-core/package.json+2−3
@@ -2,11 +2,10 @@
22 "name": "orc-code",
33 "version": "0.0.1",
44 "type": "module",
5- "bin": {
6- "orc": "src/cli.ts"
5+ "exports": {
6+ ".": "./src/index.ts"
77 },
88 "scripts": {
9- "dev": "bun run src/cli.ts",
109 "typecheck": "tsc --noEmit"
1110 },
1211 "dependencies": {
packages/orc-core/src/cli.ts+0−84
@@ -1,84 +0,0 @@
1-#!/usr/bin/env bun
2-
3-import { randomUUID } from "node:crypto";
4-import { discoverAgents } from "./agents.js";
5-import { saveSession, updateSessionAgentId } from "./db.js";
6-import { printBanner, printEvent } from "./display.js";
7-
8-function parseArgs(argv: string[]): {
9- resume?: string;
10- prompt?: string;
11- agent?: string;
12-} {
13- const args = argv.slice(2);
14- let resume: string | undefined;
15- let prompt: string | undefined;
16- let agent: string | undefined;
17-
18- for (let i = 0; i < args.length; i++) {
19- const arg = args[i];
20- if ((arg === "-r" || arg === "--resume") && i + 1 < args.length) {
21- resume = args[++i];
22- } else if ((arg === "-a" || arg === "--agent") && i + 1 < args.length) {
23- agent = args[++i];
24- } else if (!prompt && !arg.startsWith("-")) {
25- prompt = arg;
26- }
27- }
28-
29- return { resume, prompt, agent };
30-}
31-
32-async function main(): Promise<void> {
33- const { resume, prompt, agent: agentName } = parseArgs(process.argv);
34-
35- if (!prompt) {
36- console.error("Usage: orc <prompt>");
37- console.error(" orc -a <agent> -r <session-id> <prompt>");
38- process.exit(1);
39- }
40-
41- const agents = await discoverAgents();
42- if (agents.length === 0) {
43- console.error("No agent CLIs found in $PATH. Install claude or codex.");
44- process.exit(1);
45- }
46-
47- const agent = agentName ? agents.find((a) => a.name === agentName) : agents[0];
48- if (!agent) {
49- console.error(
50- `Agent "${agentName}" not found. Available: ${agents.map((a) => a.name).join(", ")}`,
51- );
52- process.exit(1);
53- }
54- printBanner(agent.name);
55-
56- const orcSessionId = randomUUID();
57- const title = prompt.slice(0, 50);
58-
59- saveSession(orcSessionId, null, agent.name, title);
60-
61- const ap = resume ? agent.resumeSession(resume, prompt) : agent.createSession(prompt);
62-
63- console.log(` ${agent.name} ⟶ ${resume ? `resuming ${resume}` : "new session"}`);
64- console.log();
65-
66- for await (const event of ap.events) {
67- printEvent(event);
68- }
69-
70- const result = await ap.result;
71- if (result.sessionId) {
72- updateSessionAgentId(orcSessionId, result.sessionId);
73- }
74-
75- console.log();
76- console.log(`orc session: ${orcSessionId}`);
77- if (result.sessionId) {
78- console.log(`agent session: ${result.sessionId}`);
79- }
80-
81- process.exit(result.exitCode);
82-}
83-
84-main();
packages/orc-core/src/index.ts+2−0
@@ -0,0 +1,2 @@
1+export { discoverAgents } from "./agents.js";
2+export { saveSession, updateSessionAgentId, upsertAgent } from "./db.js";
packages/types/src/helpers.ts+2−0
@@ -16,6 +16,7 @@ export function spawnAgentProcess(
1616 ): AgentProcess {
1717 const child = Bun.spawn([command, ...args], {
1818 cwd: cwd ?? process.cwd(),
19+ stdin: "ignore",
1920 stdout: "pipe",
2021 stderr: "pipe",
2122 });
@@ -68,6 +69,7 @@ export function spawnAgentProcess(
6869 export async function checkCommand(command: string): Promise<boolean> {
6970 try {
7071 const proc = Bun.spawn(["which", command], {
72+ stdin: "ignore",
7173 stdout: "ignore",
7274 stderr: "ignore",
7375 });