@zhijiewang/openharness 0.1.2 → 0.2.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.
- package/.github/ISSUE_TEMPLATE/bug_report.md +27 -0
- package/.github/ISSUE_TEMPLATE/feature_request.md +17 -0
- package/.github/pull_request_template.md +24 -0
- package/CODE_OF_CONDUCT.md +43 -0
- package/README.md +160 -156
- package/SECURITY.md +21 -0
- package/dist/commands/index.d.ts +37 -0
- package/dist/commands/index.d.ts.map +1 -0
- package/dist/commands/index.js +189 -0
- package/dist/commands/index.js.map +1 -0
- package/dist/components/App.d.ts.map +1 -1
- package/dist/components/App.js +3 -2
- package/dist/components/App.js.map +1 -1
- package/dist/components/ErrorBoundary.d.ts +17 -0
- package/dist/components/ErrorBoundary.d.ts.map +1 -0
- package/dist/components/ErrorBoundary.js +19 -0
- package/dist/components/ErrorBoundary.js.map +1 -0
- package/dist/components/Markdown.d.ts.map +1 -1
- package/dist/components/Markdown.js +70 -18
- package/dist/components/Markdown.js.map +1 -1
- package/dist/components/Messages.d.ts.map +1 -1
- package/dist/components/Messages.js +10 -4
- package/dist/components/Messages.js.map +1 -1
- package/dist/components/PermissionPrompt.d.ts.map +1 -1
- package/dist/components/PermissionPrompt.js +25 -7
- package/dist/components/PermissionPrompt.js.map +1 -1
- package/dist/components/REPL.d.ts.map +1 -1
- package/dist/components/REPL.js +60 -6
- package/dist/components/REPL.js.map +1 -1
- package/dist/components/Spinner.d.ts +3 -2
- package/dist/components/Spinner.d.ts.map +1 -1
- package/dist/components/Spinner.js +22 -4
- package/dist/components/Spinner.js.map +1 -1
- package/dist/components/TextInput.d.ts.map +1 -1
- package/dist/components/TextInput.js +4 -1
- package/dist/components/TextInput.js.map +1 -1
- package/dist/git/index.d.ts +47 -0
- package/dist/git/index.d.ts.map +1 -0
- package/dist/git/index.js +151 -0
- package/dist/git/index.js.map +1 -0
- package/dist/harness/session.d.ts.map +1 -1
- package/dist/harness/session.js +2 -1
- package/dist/harness/session.js.map +1 -1
- package/dist/main.js +88 -2
- package/dist/main.js.map +1 -1
- package/dist/providers/openai.js +11 -1
- package/dist/providers/openai.js.map +1 -1
- package/dist/providers/openrouter.js +11 -1
- package/dist/providers/openrouter.js.map +1 -1
- package/dist/query.d.ts +15 -11
- package/dist/query.d.ts.map +1 -1
- package/dist/query.js +196 -80
- package/dist/query.js.map +1 -1
- package/dist/services/StreamingToolExecutor.d.ts +25 -0
- package/dist/services/StreamingToolExecutor.d.ts.map +1 -0
- package/dist/services/StreamingToolExecutor.js +107 -0
- package/dist/services/StreamingToolExecutor.js.map +1 -0
- package/dist/tools/AgentTool/index.d.ts +15 -0
- package/dist/tools/AgentTool/index.d.ts.map +1 -0
- package/dist/tools/AgentTool/index.js +30 -0
- package/dist/tools/AgentTool/index.js.map +1 -0
- package/dist/tools/AskUserTool/index.d.ts +15 -0
- package/dist/tools/AskUserTool/index.d.ts.map +1 -0
- package/dist/tools/AskUserTool/index.js +30 -0
- package/dist/tools/AskUserTool/index.js.map +1 -0
- package/dist/tools/EnterPlanModeTool/index.d.ts +6 -0
- package/dist/tools/EnterPlanModeTool/index.d.ts.map +1 -0
- package/dist/tools/EnterPlanModeTool/index.js +37 -0
- package/dist/tools/EnterPlanModeTool/index.js.map +1 -0
- package/dist/tools/ExitPlanModeTool/index.d.ts +6 -0
- package/dist/tools/ExitPlanModeTool/index.d.ts.map +1 -0
- package/dist/tools/ExitPlanModeTool/index.js +21 -0
- package/dist/tools/ExitPlanModeTool/index.js.map +1 -0
- package/dist/tools/NotebookEditTool/index.d.ts +18 -0
- package/dist/tools/NotebookEditTool/index.d.ts.map +1 -0
- package/dist/tools/NotebookEditTool/index.js +61 -0
- package/dist/tools/NotebookEditTool/index.js.map +1 -0
- package/dist/tools/SkillTool/index.d.ts +15 -0
- package/dist/tools/SkillTool/index.d.ts.map +1 -0
- package/dist/tools/SkillTool/index.js +49 -0
- package/dist/tools/SkillTool/index.js.map +1 -0
- package/dist/tools/TaskCreateTool/index.d.ts +15 -0
- package/dist/tools/TaskCreateTool/index.d.ts.map +1 -0
- package/dist/tools/TaskCreateTool/index.js +54 -0
- package/dist/tools/TaskCreateTool/index.js.map +1 -0
- package/dist/tools/TaskListTool/index.d.ts +6 -0
- package/dist/tools/TaskListTool/index.d.ts.map +1 -0
- package/dist/tools/TaskListTool/index.js +40 -0
- package/dist/tools/TaskListTool/index.js.map +1 -0
- package/dist/tools/TaskUpdateTool/index.d.ts +18 -0
- package/dist/tools/TaskUpdateTool/index.d.ts.map +1 -0
- package/dist/tools/TaskUpdateTool/index.js +50 -0
- package/dist/tools/TaskUpdateTool/index.js.map +1 -0
- package/dist/tools/WebSearchTool/index.d.ts +15 -0
- package/dist/tools/WebSearchTool/index.d.ts.map +1 -0
- package/dist/tools/WebSearchTool/index.js +76 -0
- package/dist/tools/WebSearchTool/index.js.map +1 -0
- package/dist/tools.d.ts.map +1 -1
- package/dist/tools.js +27 -0
- package/dist/tools.js.map +1 -1
- package/dist/utils/retry.d.ts +10 -0
- package/dist/utils/retry.d.ts.map +1 -0
- package/dist/utils/retry.js +23 -0
- package/dist/utils/retry.js.map +1 -0
- package/dist/utils/theme.d.ts +27 -0
- package/dist/utils/theme.d.ts.map +1 -0
- package/dist/utils/theme.js +45 -0
- package/dist/utils/theme.js.map +1 -0
- package/dist/utils/tokens.d.ts +18 -0
- package/dist/utils/tokens.d.ts.map +1 -0
- package/dist/utils/tokens.js +57 -0
- package/dist/utils/tokens.js.map +1 -0
- package/package.json +61 -57
package/dist/components/REPL.js
CHANGED
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { useState, useCallback, useRef, useEffect } from "react";
|
|
3
3
|
import { Box, Text, useApp } from "ink";
|
|
4
|
-
import { createAssistantMessage, createUserMessage } from "../types/message.js";
|
|
4
|
+
import { createAssistantMessage, createUserMessage, createMessage } from "../types/message.js";
|
|
5
5
|
import { query } from "../query.js";
|
|
6
6
|
import { createSession, saveSession, loadSession } from "../harness/session.js";
|
|
7
7
|
import { CostTracker, estimateCost } from "../harness/cost.js";
|
|
8
|
+
import { processSlashCommand } from "../commands/index.js";
|
|
9
|
+
import { autoCommitAIEdits, isGitRepo } from "../git/index.js";
|
|
8
10
|
import Messages from "./Messages.js";
|
|
9
11
|
import Spinner from "./Spinner.js";
|
|
10
12
|
import TextInput from "./TextInput.js";
|
|
@@ -35,6 +37,8 @@ export default function REPL({ provider, tools, permissionMode, systemPrompt, mo
|
|
|
35
37
|
const [loading, setLoading] = useState(false);
|
|
36
38
|
const [streamingText, setStreamingText] = useState("");
|
|
37
39
|
const [toolCalls, setToolCalls] = useState(new Map());
|
|
40
|
+
const toolCallsRef = useRef(toolCalls);
|
|
41
|
+
toolCallsRef.current = toolCalls;
|
|
38
42
|
const [pendingPermission, setPendingPermission] = useState(null);
|
|
39
43
|
const [error, setError] = useState(null);
|
|
40
44
|
const [currentModel, setCurrentModel] = useState(model ?? "");
|
|
@@ -83,6 +87,7 @@ export default function REPL({ provider, tools, permissionMode, systemPrompt, mo
|
|
|
83
87
|
systemPrompt,
|
|
84
88
|
permissionMode,
|
|
85
89
|
askUser,
|
|
90
|
+
model: currentModel || undefined,
|
|
86
91
|
};
|
|
87
92
|
let accumulated = "";
|
|
88
93
|
try {
|
|
@@ -105,18 +110,30 @@ export default function REPL({ provider, tools, permissionMode, systemPrompt, mo
|
|
|
105
110
|
break;
|
|
106
111
|
case "tool_call_complete":
|
|
107
112
|
break;
|
|
108
|
-
case "tool_call_end":
|
|
113
|
+
case "tool_call_end": {
|
|
114
|
+
const toolName = toolCallsRef.current?.get(event.callId)?.toolName ?? "unknown";
|
|
109
115
|
setToolCalls((prev) => {
|
|
110
116
|
const next = new Map(prev);
|
|
111
117
|
next.set(event.callId, {
|
|
112
118
|
callId: event.callId,
|
|
113
|
-
toolName
|
|
119
|
+
toolName,
|
|
114
120
|
status: event.isError ? "error" : "done",
|
|
115
121
|
output: event.output,
|
|
116
122
|
});
|
|
117
123
|
return next;
|
|
118
124
|
});
|
|
125
|
+
// Git auto-commit for write tools
|
|
126
|
+
if (!event.isError && isGitRepo()) {
|
|
127
|
+
const writeTool = ["Edit", "Write", "Bash"].includes(toolName);
|
|
128
|
+
if (writeTool) {
|
|
129
|
+
const hash = autoCommitAIEdits(toolName, [], process.cwd());
|
|
130
|
+
if (hash) {
|
|
131
|
+
setMessages((prev) => [...prev, createMessage("system", `git: committed ${hash}`)]);
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
}
|
|
119
135
|
break;
|
|
136
|
+
}
|
|
120
137
|
case "cost_update":
|
|
121
138
|
setCurrentModel(event.model);
|
|
122
139
|
costRef.current.record("provider", event.model, event.inputTokens, event.outputTokens, event.cost || estimateCost(event.model, event.inputTokens, event.outputTokens));
|
|
@@ -129,6 +146,13 @@ export default function REPL({ provider, tools, permissionMode, systemPrompt, mo
|
|
|
129
146
|
if (accumulated) {
|
|
130
147
|
setMessages((prev) => [...prev, createAssistantMessage(accumulated)]);
|
|
131
148
|
}
|
|
149
|
+
// Auto-save session
|
|
150
|
+
sessionRef.current.messages = messagesRef.current;
|
|
151
|
+
sessionRef.current.totalCost = costRef.current.totalCost;
|
|
152
|
+
try {
|
|
153
|
+
saveSession(sessionRef.current);
|
|
154
|
+
}
|
|
155
|
+
catch { /* ignore */ }
|
|
132
156
|
break;
|
|
133
157
|
}
|
|
134
158
|
}
|
|
@@ -149,12 +173,42 @@ export default function REPL({ provider, tools, permissionMode, systemPrompt, mo
|
|
|
149
173
|
exit();
|
|
150
174
|
return;
|
|
151
175
|
}
|
|
176
|
+
// Process slash commands
|
|
177
|
+
if (trimmed.startsWith("/")) {
|
|
178
|
+
const ctx = {
|
|
179
|
+
messages: messagesRef.current,
|
|
180
|
+
model: currentModel,
|
|
181
|
+
permissionMode,
|
|
182
|
+
totalCost: costRef.current.totalCost,
|
|
183
|
+
totalInputTokens: costRef.current.totalInputTokens,
|
|
184
|
+
totalOutputTokens: costRef.current.totalOutputTokens,
|
|
185
|
+
sessionId,
|
|
186
|
+
};
|
|
187
|
+
const result = processSlashCommand(trimmed, ctx);
|
|
188
|
+
if (result) {
|
|
189
|
+
if (result.clearMessages) {
|
|
190
|
+
setMessages([]);
|
|
191
|
+
}
|
|
192
|
+
if (result.compactedMessages) {
|
|
193
|
+
setMessages(result.compactedMessages);
|
|
194
|
+
}
|
|
195
|
+
if (result.newModel) {
|
|
196
|
+
setCurrentModel(result.newModel);
|
|
197
|
+
}
|
|
198
|
+
if (result.output) {
|
|
199
|
+
// Show command output as a system message
|
|
200
|
+
setMessages((prev) => [...prev, createMessage("system", result.output)]);
|
|
201
|
+
}
|
|
202
|
+
if (result.handled)
|
|
203
|
+
return;
|
|
204
|
+
// If not handled, fall through to send to LLM (e.g., /plan, /review)
|
|
205
|
+
}
|
|
206
|
+
}
|
|
152
207
|
const userMsg = createUserMessage(input);
|
|
153
208
|
setMessages((prev) => [...prev, userMsg]);
|
|
154
209
|
pendingPromptRef.current = input;
|
|
155
|
-
// Increment counter to trigger useEffect (refs don't cause re-renders)
|
|
156
210
|
setSubmitCount((c) => c + 1);
|
|
157
|
-
}, [exit]);
|
|
158
|
-
return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsx(Text, { color: "magenta", children: BANNER }), _jsxs(Box, { children: [_jsx(Text, { bold: true, color: "magenta", children: "OpenHarness" }), _jsx(Text, { dimColor: true, children: " v0.1.0" }), _jsx(Text, { color: "cyan", children: currentModel ? ` ${currentModel}` : "" }), _jsx(Text, { dimColor: true, children: ` (${permissionMode})` })] }), _jsxs(Text, { dimColor: true, children: ["session ", sessionId, totalCost > 0 ? ` | $${totalCost.toFixed(4)}` : ""] }), _jsx(Text, { dimColor: true, children: "─".repeat(60) })] }), _jsx(Messages, { messages: messages, toolCalls: toolCalls }), loading && streamingText && (_jsxs(Box, { marginY: 0, children: [_jsx(Text, { color: "magenta", bold: true, children: "◆ " }), _jsx(Text, { children: streamingText })] })), loading && !streamingText && _jsx(Spinner, { model: currentModel }), error && (_jsx(Box, { marginY: 1, borderStyle: "round", borderColor: "red", paddingX: 1, children: _jsxs(Text, { color: "red", children: ["✗ ", error] }) })), pendingPermission && (_jsx(PermissionPrompt, { toolName: pendingPermission.toolName, description: pendingPermission.description, riskLevel: pendingPermission.riskLevel, onResolve: pendingPermission.resolve })), _jsx(Box, { marginTop: 1, children: _jsx(TextInput, { onSubmit: handleSubmit, disabled: loading }) })] }));
|
|
211
|
+
}, [exit, currentModel, permissionMode, sessionId]);
|
|
212
|
+
return (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { flexDirection: "column", marginBottom: 1, children: [_jsx(Text, { color: "magenta", children: BANNER }), _jsxs(Box, { children: [_jsx(Text, { bold: true, color: "magenta", children: "OpenHarness" }), _jsx(Text, { dimColor: true, children: " v0.1.0" }), _jsx(Text, { color: "cyan", children: currentModel ? ` ${currentModel}` : "" }), _jsx(Text, { dimColor: true, children: ` (${permissionMode})` })] }), _jsxs(Text, { dimColor: true, children: ["session ", sessionId, totalCost > 0 ? ` | $${totalCost.toFixed(4)}` : ""] }), _jsx(Text, { dimColor: true, children: "─".repeat(60) })] }), _jsx(Messages, { messages: messages, toolCalls: toolCalls }), loading && streamingText && (_jsxs(Box, { marginY: 0, children: [_jsx(Text, { color: "magenta", bold: true, children: "◆ " }), _jsx(Text, { children: streamingText })] })), loading && !streamingText && _jsx(Spinner, { model: currentModel, tokens: costRef.current.totalOutputTokens }), error && (_jsx(Box, { marginY: 1, borderStyle: "round", borderColor: "red", paddingX: 1, children: _jsxs(Text, { color: "red", children: ["✗ ", error] }) })), pendingPermission && (_jsx(PermissionPrompt, { toolName: pendingPermission.toolName, description: pendingPermission.description, riskLevel: pendingPermission.riskLevel, onResolve: pendingPermission.resolve })), _jsx(Box, { marginTop: 1, children: _jsx(TextInput, { onSubmit: handleSubmit, disabled: loading }) }), _jsxs(Text, { dimColor: true, children: ["exit to quit", loading ? " | Ctrl+C to interrupt" : ""] })] }));
|
|
159
213
|
}
|
|
160
214
|
//# sourceMappingURL=REPL.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"REPL.js","sourceRoot":"","sources":["../../src/components/REPL.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACxE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAMxC,OAAO,EAAE,sBAAsB,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"REPL.js","sourceRoot":"","sources":["../../src/components/REPL.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
type
|
|
1
|
+
type Props = {
|
|
2
2
|
model?: string;
|
|
3
|
+
tokens?: number;
|
|
3
4
|
};
|
|
4
|
-
export default function Spinner({ model }:
|
|
5
|
+
export default function Spinner({ model, tokens }: Props): import("react/jsx-runtime").JSX.Element;
|
|
5
6
|
export {};
|
|
6
7
|
//# sourceMappingURL=Spinner.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Spinner.d.ts","sourceRoot":"","sources":["../../src/components/Spinner.tsx"],"names":[],"mappings":"AAIA,KAAK,
|
|
1
|
+
{"version":3,"file":"Spinner.d.ts","sourceRoot":"","sources":["../../src/components/Spinner.tsx"],"names":[],"mappings":"AAIA,KAAK,KAAK,GAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEjD,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,KAAK,2CAwCvD"}
|
|
@@ -1,16 +1,34 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { useState, useEffect } from "react";
|
|
3
3
|
import { Box, Text } from "ink";
|
|
4
|
-
import
|
|
5
|
-
export default function Spinner({ model }) {
|
|
4
|
+
import { useTheme } from "../utils/theme.js";
|
|
5
|
+
export default function Spinner({ model, tokens }) {
|
|
6
|
+
const theme = useTheme();
|
|
6
7
|
const [elapsed, setElapsed] = useState(0);
|
|
8
|
+
const [frame, setFrame] = useState(0);
|
|
7
9
|
useEffect(() => {
|
|
8
10
|
const start = Date.now();
|
|
9
11
|
const timer = setInterval(() => {
|
|
10
12
|
setElapsed(Math.floor((Date.now() - start) / 1000));
|
|
11
|
-
|
|
13
|
+
setFrame((f) => f + 1);
|
|
14
|
+
}, 50);
|
|
12
15
|
return () => clearInterval(timer);
|
|
13
16
|
}, []);
|
|
14
|
-
|
|
17
|
+
const text = `Thinking${model ? ` (${model})` : ""}`;
|
|
18
|
+
const baseColor = elapsed > 60 ? theme.error : elapsed > 30 ? theme.stall : theme.primary;
|
|
19
|
+
const shimmerColor = elapsed > 60 ? theme.stallShimmer : elapsed > 30 ? theme.warning : theme.primaryShimmer;
|
|
20
|
+
const shimmerPos = frame % (text.length + 6);
|
|
21
|
+
return (_jsxs(Box, { children: [_jsx(Text, { color: baseColor, children: "◆ " }), text.split("").map((char, i) => {
|
|
22
|
+
const dist = Math.abs(i - shimmerPos);
|
|
23
|
+
const bright = dist <= 1;
|
|
24
|
+
return (_jsx(Text, { color: bright ? shimmerColor : baseColor, bold: bright, children: char }, i));
|
|
25
|
+
}), _jsxs(Text, { color: theme.dim, children: [elapsed > 0 ? ` ${elapsed}s` : "", tokens && tokens > 0 ? ` | ${formatTokens(tokens)}` : "", "..."] })] }));
|
|
26
|
+
}
|
|
27
|
+
function formatTokens(n) {
|
|
28
|
+
if (n >= 1_000_000)
|
|
29
|
+
return `${(n / 1_000_000).toFixed(1)}M tokens`;
|
|
30
|
+
if (n >= 1_000)
|
|
31
|
+
return `${(n / 1_000).toFixed(1)}K tokens`;
|
|
32
|
+
return `${n} tokens`;
|
|
15
33
|
}
|
|
16
34
|
//# sourceMappingURL=Spinner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Spinner.js","sourceRoot":"","sources":["../../src/components/Spinner.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,
|
|
1
|
+
{"version":3,"file":"Spinner.js","sourceRoot":"","sources":["../../src/components/Spinner.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextInput.d.ts","sourceRoot":"","sources":["../../src/components/TextInput.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"TextInput.d.ts","sourceRoot":"","sources":["../../src/components/TextInput.tsx"],"names":[],"mappings":"AAKA,KAAK,cAAc,GAAG;IACpB,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,cAAc,2CA6DvE"}
|
|
@@ -2,7 +2,9 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
|
2
2
|
import { useState, useCallback } from "react";
|
|
3
3
|
import { Box, Text, useInput } from "ink";
|
|
4
4
|
import InkTextInput from "ink-text-input";
|
|
5
|
+
import { useTheme } from "../utils/theme.js";
|
|
5
6
|
export default function TextInput({ onSubmit, disabled }) {
|
|
7
|
+
const theme = useTheme();
|
|
6
8
|
const [value, setValue] = useState("");
|
|
7
9
|
const [history, setHistory] = useState([]);
|
|
8
10
|
const [historyIndex, setHistoryIndex] = useState(-1);
|
|
@@ -32,6 +34,7 @@ export default function TextInput({ onSubmit, disabled }) {
|
|
|
32
34
|
setValue("");
|
|
33
35
|
onSubmit(submitted);
|
|
34
36
|
}, [onSubmit, disabled]);
|
|
35
|
-
|
|
37
|
+
const placeholder = disabled ? "Waiting..." : "Ask anything...";
|
|
38
|
+
return (_jsxs(Box, { borderStyle: "single", borderTop: true, borderBottom: false, borderLeft: false, borderRight: false, borderColor: theme.border, paddingX: 0, children: [_jsx(Text, { color: theme.user, bold: true, children: "❯ " }), _jsx(InkTextInput, { value: value, onChange: setValue, onSubmit: handleSubmit, placeholder: placeholder })] }));
|
|
36
39
|
}
|
|
37
40
|
//# sourceMappingURL=TextInput.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TextInput.js","sourceRoot":"","sources":["../../src/components/TextInput.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC1C,OAAO,YAAY,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"TextInput.js","sourceRoot":"","sources":["../../src/components/TextInput.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AACrD,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,KAAK,CAAC;AAC1C,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAO7C,MAAM,CAAC,OAAO,UAAU,SAAS,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAkB;IACtE,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IACvC,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAW,EAAE,CAAC,CAAC;IACrD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IAErD,QAAQ,CACN,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QACd,IAAI,GAAG,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACtC,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,CAAC,EAAE,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC5D,eAAe,CAAC,IAAI,CAAC,CAAC;YACtB,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAE,CAAC,CAAC;QAC3B,CAAC;QACD,IAAI,GAAG,CAAC,SAAS,EAAE,CAAC;YAClB,IAAI,YAAY,IAAI,CAAC,EAAE,CAAC;gBACtB,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;gBACpB,QAAQ,CAAC,EAAE,CAAC,CAAC;YACf,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,GAAG,YAAY,GAAG,CAAC,CAAC;gBAC9B,eAAe,CAAC,IAAI,CAAC,CAAC;gBACtB,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAE,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;IACH,CAAC,EACD,EAAE,QAAQ,EAAE,CAAC,QAAQ,EAAE,CACxB,CAAC;IAEF,MAAM,YAAY,GAAG,WAAW,CAC9B,CAAC,SAAiB,EAAE,EAAE;QACpB,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,QAAQ;YAAE,OAAO;QAC1C,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,SAAS,EAAE,GAAG,IAAI,CAAC,CAAC,CAAC;QAC3C,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;QACpB,QAAQ,CAAC,EAAE,CAAC,CAAC;QACb,QAAQ,CAAC,SAAS,CAAC,CAAC;IACtB,CAAC,EACD,CAAC,QAAQ,EAAE,QAAQ,CAAC,CACrB,CAAC;IAEF,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,iBAAiB,CAAC;IAEhE,OAAO,CACL,MAAC,GAAG,IACF,WAAW,EAAC,QAAQ,EACpB,SAAS,EAAE,IAAI,EACf,YAAY,EAAE,KAAK,EACnB,UAAU,EAAE,KAAK,EACjB,WAAW,EAAE,KAAK,EAClB,WAAW,EAAE,KAAK,CAAC,MAAM,EACzB,QAAQ,EAAE,CAAC,aAEX,KAAC,IAAI,IAAC,KAAK,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,kBAC1B,IAAI,GACA,EACP,KAAC,YAAY,IACX,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,YAAY,EACtB,WAAW,EAAE,WAAW,GACxB,IACE,CACP,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Git integration — auto-commit AI edits, undo, diff.
|
|
3
|
+
* Inspired by Aider's git-native workflow.
|
|
4
|
+
*/
|
|
5
|
+
/**
|
|
6
|
+
* Check if we're in a git repository.
|
|
7
|
+
*/
|
|
8
|
+
export declare function isGitRepo(cwd?: string): boolean;
|
|
9
|
+
/**
|
|
10
|
+
* Get current branch name.
|
|
11
|
+
*/
|
|
12
|
+
export declare function gitBranch(cwd?: string): string;
|
|
13
|
+
/**
|
|
14
|
+
* Check if there are uncommitted changes.
|
|
15
|
+
*/
|
|
16
|
+
export declare function hasUncommittedChanges(cwd?: string): boolean;
|
|
17
|
+
/**
|
|
18
|
+
* Get list of modified files (unstaged + staged).
|
|
19
|
+
*/
|
|
20
|
+
export declare function getModifiedFiles(cwd?: string): string[];
|
|
21
|
+
/**
|
|
22
|
+
* Get diff of uncommitted changes.
|
|
23
|
+
*/
|
|
24
|
+
export declare function gitDiff(cwd?: string): string;
|
|
25
|
+
/**
|
|
26
|
+
* Commit all staged + unstaged changes with a message.
|
|
27
|
+
* Stages all modified files first.
|
|
28
|
+
*/
|
|
29
|
+
export declare function gitCommit(message: string, cwd?: string): boolean;
|
|
30
|
+
/**
|
|
31
|
+
* Auto-commit AI edits with a descriptive message.
|
|
32
|
+
* Returns the commit hash or null on failure.
|
|
33
|
+
*/
|
|
34
|
+
export declare function autoCommitAIEdits(toolName: string, files: string[], cwd?: string): string | null;
|
|
35
|
+
/**
|
|
36
|
+
* Undo the last commit (soft reset — keeps changes unstaged).
|
|
37
|
+
*/
|
|
38
|
+
export declare function gitUndo(cwd?: string): boolean;
|
|
39
|
+
/**
|
|
40
|
+
* Get short log of recent commits.
|
|
41
|
+
*/
|
|
42
|
+
export declare function gitLog(count?: number, cwd?: string): string;
|
|
43
|
+
/**
|
|
44
|
+
* Commit user's dirty files before AI edits (Aider pattern).
|
|
45
|
+
*/
|
|
46
|
+
export declare function commitDirtyFiles(cwd?: string): boolean;
|
|
47
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/git/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAIH;;GAEG;AACH,wBAAgB,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAO/C;AAED;;GAEG;AACH,wBAAgB,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAM9C;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAO3D;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CASvD;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAM5C;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAQhE;AAED;;;GAGG;AACH,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,EAChB,KAAK,EAAE,MAAM,EAAE,EACf,GAAG,CAAC,EAAE,MAAM,GACX,MAAM,GAAG,IAAI,CAwBf;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAY7C;AAED;;GAEG;AACH,wBAAgB,MAAM,CAAC,KAAK,GAAE,MAAU,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAM9D;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAStD"}
|
|
@@ -0,0 +1,151 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Git integration — auto-commit AI edits, undo, diff.
|
|
3
|
+
* Inspired by Aider's git-native workflow.
|
|
4
|
+
*/
|
|
5
|
+
import { execSync, spawnSync } from "node:child_process";
|
|
6
|
+
/**
|
|
7
|
+
* Check if we're in a git repository.
|
|
8
|
+
*/
|
|
9
|
+
export function isGitRepo(cwd) {
|
|
10
|
+
try {
|
|
11
|
+
execSync("git rev-parse --is-inside-work-tree", { cwd, stdio: "pipe" });
|
|
12
|
+
return true;
|
|
13
|
+
}
|
|
14
|
+
catch {
|
|
15
|
+
return false;
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Get current branch name.
|
|
20
|
+
*/
|
|
21
|
+
export function gitBranch(cwd) {
|
|
22
|
+
try {
|
|
23
|
+
return execSync("git branch --show-current", { cwd, stdio: "pipe" }).toString().trim();
|
|
24
|
+
}
|
|
25
|
+
catch {
|
|
26
|
+
return "";
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* Check if there are uncommitted changes.
|
|
31
|
+
*/
|
|
32
|
+
export function hasUncommittedChanges(cwd) {
|
|
33
|
+
try {
|
|
34
|
+
const output = execSync("git status --porcelain", { cwd, stdio: "pipe" }).toString().trim();
|
|
35
|
+
return output.length > 0;
|
|
36
|
+
}
|
|
37
|
+
catch {
|
|
38
|
+
return false;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* Get list of modified files (unstaged + staged).
|
|
43
|
+
*/
|
|
44
|
+
export function getModifiedFiles(cwd) {
|
|
45
|
+
try {
|
|
46
|
+
const staged = execSync("git diff --cached --name-only", { cwd, stdio: "pipe" }).toString().trim();
|
|
47
|
+
const unstaged = execSync("git diff --name-only", { cwd, stdio: "pipe" }).toString().trim();
|
|
48
|
+
const output = [staged, unstaged].filter(Boolean).join("\n");
|
|
49
|
+
return output ? [...new Set(output.split("\n"))] : [];
|
|
50
|
+
}
|
|
51
|
+
catch {
|
|
52
|
+
return [];
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
/**
|
|
56
|
+
* Get diff of uncommitted changes.
|
|
57
|
+
*/
|
|
58
|
+
export function gitDiff(cwd) {
|
|
59
|
+
try {
|
|
60
|
+
return execSync("git diff", { cwd, stdio: "pipe" }).toString();
|
|
61
|
+
}
|
|
62
|
+
catch {
|
|
63
|
+
return "";
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* Commit all staged + unstaged changes with a message.
|
|
68
|
+
* Stages all modified files first.
|
|
69
|
+
*/
|
|
70
|
+
export function gitCommit(message, cwd) {
|
|
71
|
+
try {
|
|
72
|
+
execSync("git add -A", { cwd, stdio: "pipe" });
|
|
73
|
+
spawnSync("git", ["commit", "-m", message, "--allow-empty"], { cwd, stdio: "pipe" });
|
|
74
|
+
return true;
|
|
75
|
+
}
|
|
76
|
+
catch {
|
|
77
|
+
return false;
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* Auto-commit AI edits with a descriptive message.
|
|
82
|
+
* Returns the commit hash or null on failure.
|
|
83
|
+
*/
|
|
84
|
+
export function autoCommitAIEdits(toolName, files, cwd) {
|
|
85
|
+
if (!isGitRepo(cwd) || files.length === 0)
|
|
86
|
+
return null;
|
|
87
|
+
try {
|
|
88
|
+
// Stage only the files the AI touched
|
|
89
|
+
for (const file of files) {
|
|
90
|
+
try {
|
|
91
|
+
execSync(`git add ${JSON.stringify(file)}`, { cwd, stdio: "pipe" });
|
|
92
|
+
}
|
|
93
|
+
catch {
|
|
94
|
+
// File might not exist (deleted)
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
// Generate commit message
|
|
98
|
+
const fileList = files.length <= 3 ? files.join(", ") : `${files.length} files`;
|
|
99
|
+
const message = `oh: ${toolName} ${fileList}`;
|
|
100
|
+
spawnSync("git", ["commit", "-m", message], { cwd, stdio: "pipe" });
|
|
101
|
+
// Return commit hash
|
|
102
|
+
return execSync("git rev-parse --short HEAD", { cwd, stdio: "pipe" }).toString().trim();
|
|
103
|
+
}
|
|
104
|
+
catch {
|
|
105
|
+
return null;
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
/**
|
|
109
|
+
* Undo the last commit (soft reset — keeps changes unstaged).
|
|
110
|
+
*/
|
|
111
|
+
export function gitUndo(cwd) {
|
|
112
|
+
try {
|
|
113
|
+
// Only undo if the last commit was made by OpenHarness
|
|
114
|
+
const lastMessage = execSync("git log -1 --pretty=%s", { cwd, stdio: "pipe" }).toString().trim();
|
|
115
|
+
if (!lastMessage.startsWith("oh:")) {
|
|
116
|
+
return false; // Don't undo non-OH commits
|
|
117
|
+
}
|
|
118
|
+
execSync("git reset --soft HEAD~1", { cwd, stdio: "pipe" });
|
|
119
|
+
return true;
|
|
120
|
+
}
|
|
121
|
+
catch {
|
|
122
|
+
return false;
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
/**
|
|
126
|
+
* Get short log of recent commits.
|
|
127
|
+
*/
|
|
128
|
+
export function gitLog(count = 5, cwd) {
|
|
129
|
+
try {
|
|
130
|
+
return execSync(`git log --oneline -${count}`, { cwd, stdio: "pipe" }).toString().trim();
|
|
131
|
+
}
|
|
132
|
+
catch {
|
|
133
|
+
return "";
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
/**
|
|
137
|
+
* Commit user's dirty files before AI edits (Aider pattern).
|
|
138
|
+
*/
|
|
139
|
+
export function commitDirtyFiles(cwd) {
|
|
140
|
+
if (!isGitRepo(cwd) || !hasUncommittedChanges(cwd))
|
|
141
|
+
return false;
|
|
142
|
+
try {
|
|
143
|
+
execSync("git add -A", { cwd, stdio: "pipe" });
|
|
144
|
+
execSync('git commit -m "wip: save before AI edits"', { cwd, stdio: "pipe" });
|
|
145
|
+
return true;
|
|
146
|
+
}
|
|
147
|
+
catch {
|
|
148
|
+
return false;
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/git/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/harness/session.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/harness/session.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAInD,MAAM,MAAM,OAAO,GAAG;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,OAAO,EAAE,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,wBAAgB,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAUtE;AAED,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAOlE;AAED,wBAAgB,WAAW,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CAI7D;AAED,wBAAgB,YAAY,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IAChD,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC,CAsBD"}
|
package/dist/harness/session.js
CHANGED
|
@@ -4,10 +4,11 @@
|
|
|
4
4
|
import { readFileSync, writeFileSync, mkdirSync, readdirSync, existsSync } from "node:fs";
|
|
5
5
|
import { join } from "node:path";
|
|
6
6
|
import { homedir } from "node:os";
|
|
7
|
+
import { randomUUID } from "node:crypto";
|
|
7
8
|
const DEFAULT_SESSION_DIR = join(homedir(), ".oh", "sessions");
|
|
8
9
|
export function createSession(provider, model) {
|
|
9
10
|
return {
|
|
10
|
-
id:
|
|
11
|
+
id: randomUUID().slice(0, 12),
|
|
11
12
|
messages: [],
|
|
12
13
|
createdAt: Date.now(),
|
|
13
14
|
updatedAt: Date.now(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/harness/session.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC1F,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/harness/session.ts"],"names":[],"mappings":"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"}
|
package/dist/main.js
CHANGED
|
@@ -4,8 +4,8 @@ import { render } from "ink";
|
|
|
4
4
|
import { Command, Option } from "commander";
|
|
5
5
|
import App from "./components/App.js";
|
|
6
6
|
import { getAllTools } from "./tools.js";
|
|
7
|
-
import { createRulesFile, loadRules } from "./harness/rules.js";
|
|
8
|
-
import { detectProject } from "./harness/onboarding.js";
|
|
7
|
+
import { createRulesFile, loadRules, loadRulesAsPrompt } from "./harness/rules.js";
|
|
8
|
+
import { detectProject, projectContextToPrompt } from "./harness/onboarding.js";
|
|
9
9
|
import { MODEL_PRICING } from "./harness/cost.js";
|
|
10
10
|
import { listSessions } from "./harness/session.js";
|
|
11
11
|
const VERSION = "0.1.0";
|
|
@@ -14,6 +14,92 @@ program
|
|
|
14
14
|
.name("openharness")
|
|
15
15
|
.description("Open-source terminal coding agent. Build your own Claude Code with any LLM.")
|
|
16
16
|
.version(VERSION);
|
|
17
|
+
// ── Headless run command ──
|
|
18
|
+
const DEFAULT_SYSTEM_PROMPT = `You are OpenHarness, an AI coding assistant running in the user's terminal.
|
|
19
|
+
You have access to tools for reading, writing, and searching files, and running shell commands.
|
|
20
|
+
Always explain what you're about to do before using tools.`;
|
|
21
|
+
function buildSystemPrompt() {
|
|
22
|
+
const parts = [DEFAULT_SYSTEM_PROMPT];
|
|
23
|
+
const projectCtx = detectProject();
|
|
24
|
+
const projectPrompt = projectContextToPrompt(projectCtx);
|
|
25
|
+
if (projectPrompt)
|
|
26
|
+
parts.push(projectPrompt);
|
|
27
|
+
const rulesPrompt = loadRulesAsPrompt();
|
|
28
|
+
if (rulesPrompt)
|
|
29
|
+
parts.push(rulesPrompt);
|
|
30
|
+
return parts.join("\n\n");
|
|
31
|
+
}
|
|
32
|
+
program
|
|
33
|
+
.command("run")
|
|
34
|
+
.description("Run a single prompt non-interactively")
|
|
35
|
+
.argument("<prompt>", "The prompt to execute")
|
|
36
|
+
.option("-m, --model <model>", "Model to use")
|
|
37
|
+
.addOption(new Option("--permission-mode <mode>", "Permission mode")
|
|
38
|
+
.choices(["ask", "trust", "deny"])
|
|
39
|
+
.default("trust"))
|
|
40
|
+
.option("--trust", "Auto-approve all tools")
|
|
41
|
+
.option("--deny", "Block all non-read tools")
|
|
42
|
+
.option("--json", "Output as JSON")
|
|
43
|
+
.option("--max-turns <n>", "Maximum turns", "20")
|
|
44
|
+
.action(async (prompt, opts) => {
|
|
45
|
+
const permissionMode = (opts.trust
|
|
46
|
+
? "trust"
|
|
47
|
+
: opts.deny
|
|
48
|
+
? "deny"
|
|
49
|
+
: opts.permissionMode);
|
|
50
|
+
const { createProvider } = await import("./providers/index.js");
|
|
51
|
+
const { provider, model } = await createProvider(opts.model);
|
|
52
|
+
const { query } = await import("./query.js");
|
|
53
|
+
const tools = getAllTools();
|
|
54
|
+
const systemPrompt = buildSystemPrompt();
|
|
55
|
+
const config = {
|
|
56
|
+
provider,
|
|
57
|
+
tools,
|
|
58
|
+
systemPrompt,
|
|
59
|
+
permissionMode,
|
|
60
|
+
maxTurns: parseInt(opts.maxTurns),
|
|
61
|
+
model,
|
|
62
|
+
};
|
|
63
|
+
let fullOutput = "";
|
|
64
|
+
const toolResults = [];
|
|
65
|
+
const callIdToName = {};
|
|
66
|
+
for await (const event of query(prompt, config)) {
|
|
67
|
+
if (event.type === "text_delta") {
|
|
68
|
+
fullOutput += event.content;
|
|
69
|
+
if (!opts.json)
|
|
70
|
+
process.stdout.write(event.content);
|
|
71
|
+
}
|
|
72
|
+
else if (event.type === "tool_call_start") {
|
|
73
|
+
callIdToName[event.callId] = event.toolName;
|
|
74
|
+
if (!opts.json)
|
|
75
|
+
process.stderr.write(`[tool] ${event.toolName}\n`);
|
|
76
|
+
}
|
|
77
|
+
else if (event.type === "tool_call_end") {
|
|
78
|
+
toolResults.push({
|
|
79
|
+
tool: callIdToName[event.callId] || event.callId || "unknown",
|
|
80
|
+
output: event.output,
|
|
81
|
+
error: event.isError,
|
|
82
|
+
});
|
|
83
|
+
if (!opts.json && event.isError)
|
|
84
|
+
process.stderr.write(`[error] ${event.output}\n`);
|
|
85
|
+
}
|
|
86
|
+
else if (event.type === "error") {
|
|
87
|
+
if (!opts.json)
|
|
88
|
+
process.stderr.write(`[error] ${event.message}\n`);
|
|
89
|
+
}
|
|
90
|
+
else if (event.type === "turn_complete") {
|
|
91
|
+
if (event.reason !== "completed") {
|
|
92
|
+
process.exitCode = 1;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
if (opts.json) {
|
|
97
|
+
console.log(JSON.stringify({ output: fullOutput, tools: toolResults }, null, 2));
|
|
98
|
+
}
|
|
99
|
+
else {
|
|
100
|
+
process.stdout.write("\n");
|
|
101
|
+
}
|
|
102
|
+
});
|
|
17
103
|
// ── Default command: just run `openharness` to start chatting ──
|
|
18
104
|
program
|
|
19
105
|
.command("chat", { isDefault: true })
|