@zhijiewang/openharness 0.10.1 → 0.11.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/README.md +79 -13
- package/dist/Tool.d.ts.map +1 -1
- package/dist/Tool.js +7 -1
- package/dist/Tool.js.map +1 -1
- package/dist/Tool.test.js +8 -2
- package/dist/Tool.test.js.map +1 -1
- package/dist/agents/roles.d.ts +25 -0
- package/dist/agents/roles.d.ts.map +1 -0
- package/dist/agents/roles.js +116 -0
- package/dist/agents/roles.js.map +1 -0
- package/dist/agents/roles.test.d.ts +2 -0
- package/dist/agents/roles.test.d.ts.map +1 -0
- package/dist/agents/roles.test.js +38 -0
- package/dist/agents/roles.test.js.map +1 -0
- package/dist/commands/commands-new.test.d.ts +5 -0
- package/dist/commands/commands-new.test.d.ts.map +1 -0
- package/dist/commands/commands-new.test.js +132 -0
- package/dist/commands/commands-new.test.js.map +1 -0
- package/dist/commands/commands.test.js +31 -0
- package/dist/commands/commands.test.js.map +1 -1
- package/dist/commands/index.d.ts +2 -0
- package/dist/commands/index.d.ts.map +1 -1
- package/dist/commands/index.js +199 -6
- package/dist/commands/index.js.map +1 -1
- package/dist/components/REPL.js +1 -1
- package/dist/components/REPL.js.map +1 -1
- package/dist/git/git.test.js +33 -1
- package/dist/git/git.test.js.map +1 -1
- package/dist/git/index.d.ts +12 -0
- package/dist/git/index.d.ts.map +1 -1
- package/dist/git/index.js +47 -2
- package/dist/git/index.js.map +1 -1
- package/dist/harness/checkpoints.d.ts +36 -0
- package/dist/harness/checkpoints.d.ts.map +1 -0
- package/dist/harness/checkpoints.js +156 -0
- package/dist/harness/checkpoints.js.map +1 -0
- package/dist/harness/config.d.ts +3 -0
- package/dist/harness/config.d.ts.map +1 -1
- package/dist/harness/config.js +35 -2
- package/dist/harness/config.js.map +1 -1
- package/dist/harness/config.test.js +21 -1
- package/dist/harness/config.test.js.map +1 -1
- package/dist/harness/hooks-env.test.d.ts +5 -0
- package/dist/harness/hooks-env.test.d.ts.map +1 -0
- package/dist/harness/hooks-env.test.js +41 -0
- package/dist/harness/hooks-env.test.js.map +1 -0
- package/dist/harness/hooks.d.ts +7 -0
- package/dist/harness/hooks.d.ts.map +1 -1
- package/dist/harness/hooks.js +14 -0
- package/dist/harness/hooks.js.map +1 -1
- package/dist/harness/keybindings.d.ts.map +1 -1
- package/dist/harness/keybindings.js +4 -0
- package/dist/harness/keybindings.js.map +1 -1
- package/dist/harness/memory.d.ts +19 -0
- package/dist/harness/memory.d.ts.map +1 -1
- package/dist/harness/memory.js +85 -0
- package/dist/harness/memory.js.map +1 -1
- package/dist/harness/onboarding.d.ts +1 -1
- package/dist/harness/onboarding.d.ts.map +1 -1
- package/dist/harness/onboarding.js +59 -4
- package/dist/harness/onboarding.js.map +1 -1
- package/dist/harness/onboarding.test.d.ts +5 -0
- package/dist/harness/onboarding.test.d.ts.map +1 -0
- package/dist/harness/onboarding.test.js +93 -0
- package/dist/harness/onboarding.test.js.map +1 -0
- package/dist/harness/rules.d.ts +6 -1
- package/dist/harness/rules.d.ts.map +1 -1
- package/dist/harness/rules.js +52 -5
- package/dist/harness/rules.js.map +1 -1
- package/dist/harness/rules.test.js +30 -1
- package/dist/harness/rules.test.js.map +1 -1
- package/dist/harness/session.d.ts +8 -1
- package/dist/harness/session.d.ts.map +1 -1
- package/dist/harness/session.js +13 -5
- package/dist/harness/session.js.map +1 -1
- package/dist/harness/store.d.ts +46 -0
- package/dist/harness/store.d.ts.map +1 -0
- package/dist/harness/store.js +56 -0
- package/dist/harness/store.js.map +1 -0
- package/dist/harness/store.test.d.ts +2 -0
- package/dist/harness/store.test.d.ts.map +1 -0
- package/dist/harness/store.test.js +71 -0
- package/dist/harness/store.test.js.map +1 -0
- package/dist/harness/submit-handler.d.ts +2 -0
- package/dist/harness/submit-handler.d.ts.map +1 -1
- package/dist/harness/submit-handler.js +3 -0
- package/dist/harness/submit-handler.js.map +1 -1
- package/dist/main.js +153 -26
- package/dist/main.js.map +1 -1
- package/dist/mcp/client.d.ts +2 -0
- package/dist/mcp/client.d.ts.map +1 -1
- package/dist/mcp/client.js +10 -2
- package/dist/mcp/client.js.map +1 -1
- package/dist/mcp/loader.d.ts +2 -0
- package/dist/mcp/loader.d.ts.map +1 -1
- package/dist/mcp/loader.js +34 -18
- package/dist/mcp/loader.js.map +1 -1
- package/dist/mcp/loader.test.d.ts +7 -0
- package/dist/mcp/loader.test.d.ts.map +1 -0
- package/dist/mcp/loader.test.js +25 -0
- package/dist/mcp/loader.test.js.map +1 -0
- package/dist/providers/anthropic-convert.test.d.ts +5 -0
- package/dist/providers/anthropic-convert.test.d.ts.map +1 -0
- package/dist/providers/anthropic-convert.test.js +98 -0
- package/dist/providers/anthropic-convert.test.js.map +1 -0
- package/dist/providers/anthropic.d.ts.map +1 -1
- package/dist/providers/anthropic.js +23 -4
- package/dist/providers/anthropic.js.map +1 -1
- package/dist/providers/stream-parsing.test.d.ts +6 -0
- package/dist/providers/stream-parsing.test.d.ts.map +1 -0
- package/dist/providers/stream-parsing.test.js +174 -0
- package/dist/providers/stream-parsing.test.js.map +1 -0
- package/dist/query/compress.d.ts +17 -0
- package/dist/query/compress.d.ts.map +1 -0
- package/dist/query/compress.js +115 -0
- package/dist/query/compress.js.map +1 -0
- package/dist/query/errors.d.ts +10 -0
- package/dist/query/errors.d.ts.map +1 -0
- package/dist/query/errors.js +22 -0
- package/dist/query/errors.js.map +1 -0
- package/dist/query/index.d.ts +15 -0
- package/dist/query/index.d.ts.map +1 -0
- package/dist/query/index.js +199 -0
- package/dist/query/index.js.map +1 -0
- package/dist/query/tools.d.ts +17 -0
- package/dist/query/tools.d.ts.map +1 -0
- package/dist/query/tools.js +129 -0
- package/dist/query/tools.js.map +1 -0
- package/dist/query/types.d.ts +31 -0
- package/dist/query/types.d.ts.map +1 -0
- package/dist/query/types.js +5 -0
- package/dist/query/types.js.map +1 -0
- package/dist/query.d.ts +8 -38
- package/dist/query.d.ts.map +1 -1
- package/dist/query.js +7 -444
- package/dist/query.js.map +1 -1
- package/dist/query.test.js +1 -1
- package/dist/query.test.js.map +1 -1
- package/dist/renderer/cells.d.ts.map +1 -1
- package/dist/renderer/cells.js +15 -2
- package/dist/renderer/cells.js.map +1 -1
- package/dist/renderer/colors.d.ts +8 -0
- package/dist/renderer/colors.d.ts.map +1 -0
- package/dist/renderer/colors.js +18 -0
- package/dist/renderer/colors.js.map +1 -0
- package/dist/renderer/diff.test.d.ts +5 -0
- package/dist/renderer/diff.test.d.ts.map +1 -0
- package/dist/renderer/diff.test.js +140 -0
- package/dist/renderer/diff.test.js.map +1 -0
- package/dist/renderer/differ.d.ts.map +1 -1
- package/dist/renderer/differ.js +1 -10
- package/dist/renderer/differ.js.map +1 -1
- package/dist/renderer/e2e.test.js +1 -0
- package/dist/renderer/e2e.test.js.map +1 -1
- package/dist/renderer/image.test.d.ts +5 -0
- package/dist/renderer/image.test.d.ts.map +1 -0
- package/dist/renderer/image.test.js +66 -0
- package/dist/renderer/image.test.js.map +1 -0
- package/dist/renderer/index.d.ts +21 -4
- package/dist/renderer/index.d.ts.map +1 -1
- package/dist/renderer/index.js +191 -116
- package/dist/renderer/index.js.map +1 -1
- package/dist/renderer/layout.d.ts +5 -1
- package/dist/renderer/layout.d.ts.map +1 -1
- package/dist/renderer/layout.js +504 -614
- package/dist/renderer/layout.js.map +1 -1
- package/dist/renderer/markdown.d.ts.map +1 -1
- package/dist/renderer/markdown.js +42 -36
- package/dist/renderer/markdown.js.map +1 -1
- package/dist/renderer/perf.test.js +1 -0
- package/dist/renderer/perf.test.js.map +1 -1
- package/dist/renderer/session-browser.test.d.ts +6 -0
- package/dist/renderer/session-browser.test.d.ts.map +1 -0
- package/dist/renderer/session-browser.test.js +95 -0
- package/dist/renderer/session-browser.test.js.map +1 -0
- package/dist/renderer/ui-ux.test.d.ts +15 -0
- package/dist/renderer/ui-ux.test.d.ts.map +1 -0
- package/dist/renderer/ui-ux.test.js +470 -0
- package/dist/renderer/ui-ux.test.js.map +1 -0
- package/dist/repl.d.ts.map +1 -1
- package/dist/repl.js +178 -14
- package/dist/repl.js.map +1 -1
- package/dist/services/StreamingToolExecutor.d.ts.map +1 -1
- package/dist/services/StreamingToolExecutor.js +4 -2
- package/dist/services/StreamingToolExecutor.js.map +1 -1
- package/dist/services/agent-messaging.d.ts +68 -0
- package/dist/services/agent-messaging.d.ts.map +1 -0
- package/dist/services/agent-messaging.js +121 -0
- package/dist/services/agent-messaging.js.map +1 -0
- package/dist/services/agent-messaging.test.d.ts +2 -0
- package/dist/services/agent-messaging.test.d.ts.map +1 -0
- package/dist/services/agent-messaging.test.js +88 -0
- package/dist/services/agent-messaging.test.js.map +1 -0
- package/dist/services/cron.d.ts +40 -0
- package/dist/services/cron.d.ts.map +1 -0
- package/dist/services/cron.js +90 -0
- package/dist/services/cron.js.map +1 -0
- package/dist/services/cron.test.d.ts +2 -0
- package/dist/services/cron.test.d.ts.map +1 -0
- package/dist/services/cron.test.js +49 -0
- package/dist/services/cron.test.js.map +1 -0
- package/dist/tools/AgentTool/index.d.ts +9 -0
- package/dist/tools/AgentTool/index.d.ts.map +1 -1
- package/dist/tools/AgentTool/index.js +89 -6
- package/dist/tools/AgentTool/index.js.map +1 -1
- package/dist/tools/BashTool/index.d.ts +6 -0
- package/dist/tools/BashTool/index.d.ts.map +1 -1
- package/dist/tools/BashTool/index.js +39 -1
- package/dist/tools/BashTool/index.js.map +1 -1
- package/dist/tools/FileEditTool/index.js +4 -4
- package/dist/tools/FileEditTool/index.js.map +1 -1
- package/dist/tools/FileReadTool/index.d.ts +3 -0
- package/dist/tools/FileReadTool/index.d.ts.map +1 -1
- package/dist/tools/FileReadTool/index.js +102 -4
- package/dist/tools/FileReadTool/index.js.map +1 -1
- package/dist/tools/FileWriteTool/index.d.ts.map +1 -1
- package/dist/tools/FileWriteTool/index.js +20 -5
- package/dist/tools/FileWriteTool/index.js.map +1 -1
- package/dist/tools/GlobTool/index.d.ts.map +1 -1
- package/dist/tools/GlobTool/index.js +4 -61
- package/dist/tools/GlobTool/index.js.map +1 -1
- package/dist/tools/GrepTool/index.d.ts +30 -0
- package/dist/tools/GrepTool/index.d.ts.map +1 -1
- package/dist/tools/GrepTool/index.js +153 -72
- package/dist/tools/GrepTool/index.js.map +1 -1
- package/dist/tools/LSTool/index.d.ts +3 -0
- package/dist/tools/LSTool/index.d.ts.map +1 -1
- package/dist/tools/LSTool/index.js +44 -29
- package/dist/tools/LSTool/index.js.map +1 -1
- package/dist/tools/TaskCreateTool/index.d.ts +6 -0
- package/dist/tools/TaskCreateTool/index.d.ts.map +1 -1
- package/dist/tools/TaskCreateTool/index.js +8 -2
- package/dist/tools/TaskCreateTool/index.js.map +1 -1
- package/dist/tools/TaskGetTool/index.d.ts +12 -0
- package/dist/tools/TaskGetTool/index.d.ts.map +1 -0
- package/dist/tools/TaskGetTool/index.js +50 -0
- package/dist/tools/TaskGetTool/index.js.map +1 -0
- package/dist/tools/TaskOutputTool/index.d.ts +15 -0
- package/dist/tools/TaskOutputTool/index.d.ts.map +1 -0
- package/dist/tools/TaskOutputTool/index.js +45 -0
- package/dist/tools/TaskOutputTool/index.js.map +1 -0
- package/dist/tools/TaskStopTool/index.d.ts +15 -0
- package/dist/tools/TaskStopTool/index.d.ts.map +1 -0
- package/dist/tools/TaskStopTool/index.js +51 -0
- package/dist/tools/TaskStopTool/index.js.map +1 -0
- package/dist/tools/TaskUpdateTool/index.d.ts +21 -3
- package/dist/tools/TaskUpdateTool/index.d.ts.map +1 -1
- package/dist/tools/TaskUpdateTool/index.js +48 -3
- package/dist/tools/TaskUpdateTool/index.js.map +1 -1
- package/dist/tools/tools-basic.test.js +191 -2
- package/dist/tools/tools-basic.test.js.map +1 -1
- package/dist/tools.d.ts.map +1 -1
- package/dist/tools.js +6 -0
- package/dist/tools.js.map +1 -1
- package/dist/types/permissions.d.ts +2 -2
- package/dist/types/permissions.d.ts.map +1 -1
- package/dist/types/permissions.js +59 -13
- package/dist/types/permissions.js.map +1 -1
- package/dist/types/permissions.test.js +57 -0
- package/dist/types/permissions.test.js.map +1 -1
- package/dist/utils/bash-safety.d.ts +18 -0
- package/dist/utils/bash-safety.d.ts.map +1 -0
- package/dist/utils/bash-safety.js +227 -0
- package/dist/utils/bash-safety.js.map +1 -0
- package/dist/utils/bash-safety.test.d.ts +2 -0
- package/dist/utils/bash-safety.test.d.ts.map +1 -0
- package/dist/utils/bash-safety.test.js +112 -0
- package/dist/utils/bash-safety.test.js.map +1 -0
- package/dist/utils/fs.d.ts +15 -0
- package/dist/utils/fs.d.ts.map +1 -0
- package/dist/utils/fs.js +64 -0
- package/dist/utils/fs.js.map +1 -0
- package/dist/utils/fs.test.d.ts +5 -0
- package/dist/utils/fs.test.d.ts.map +1 -0
- package/dist/utils/fs.test.js +82 -0
- package/dist/utils/fs.test.js.map +1 -0
- package/dist/utils/safe-env.d.ts +10 -0
- package/dist/utils/safe-env.d.ts.map +1 -0
- package/dist/utils/safe-env.js +40 -0
- package/dist/utils/safe-env.js.map +1 -0
- package/package.json +3 -1
package/dist/git/index.js
CHANGED
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { execSync, spawnSync } from "node:child_process";
|
|
6
6
|
import { join } from "node:path";
|
|
7
|
+
import { existsSync } from "node:fs";
|
|
7
8
|
/**
|
|
8
9
|
* Check if we're in a git repository.
|
|
9
10
|
*/
|
|
@@ -71,6 +72,7 @@ export function gitDiff(cwd) {
|
|
|
71
72
|
export function gitCommit(message, cwd) {
|
|
72
73
|
try {
|
|
73
74
|
execSync("git add -A", { cwd, stdio: "pipe" });
|
|
75
|
+
// Respect git signing config — never use --no-gpg-sign
|
|
74
76
|
spawnSync("git", ["commit", "-m", message, "--allow-empty"], { cwd, stdio: "pipe" });
|
|
75
77
|
return true;
|
|
76
78
|
}
|
|
@@ -82,9 +84,26 @@ export function gitCommit(message, cwd) {
|
|
|
82
84
|
* Auto-commit AI edits with a descriptive message.
|
|
83
85
|
* Returns the commit hash or null on failure.
|
|
84
86
|
*/
|
|
87
|
+
/**
|
|
88
|
+
* Check if repo is in a merge or rebase state.
|
|
89
|
+
*/
|
|
90
|
+
export function isInMergeOrRebase(cwd) {
|
|
91
|
+
const root = cwd ?? process.cwd();
|
|
92
|
+
try {
|
|
93
|
+
const gitDir = join(root, ".git");
|
|
94
|
+
return existsSync(join(gitDir, "MERGE_HEAD"))
|
|
95
|
+
|| existsSync(join(gitDir, "rebase-merge"))
|
|
96
|
+
|| existsSync(join(gitDir, "rebase-apply"));
|
|
97
|
+
}
|
|
98
|
+
catch {
|
|
99
|
+
return false;
|
|
100
|
+
}
|
|
101
|
+
}
|
|
85
102
|
export function autoCommitAIEdits(toolName, files, cwd) {
|
|
86
103
|
if (!isGitRepo(cwd))
|
|
87
104
|
return null;
|
|
105
|
+
if (isInMergeOrRebase(cwd))
|
|
106
|
+
return null; // skip auto-commit during merge/rebase
|
|
88
107
|
try {
|
|
89
108
|
if (files.length > 0) {
|
|
90
109
|
// Stage only the files the AI touched
|
|
@@ -105,11 +124,12 @@ export function autoCommitAIEdits(toolName, files, cwd) {
|
|
|
105
124
|
const staged = execSync("git diff --cached --name-only", { cwd, stdio: "pipe" }).toString().trim();
|
|
106
125
|
if (!staged)
|
|
107
126
|
return null;
|
|
108
|
-
// Generate commit message
|
|
127
|
+
// Generate commit message with Co-Authored-By trailer
|
|
109
128
|
const fileList = files.length > 0
|
|
110
129
|
? (files.length <= 3 ? files.join(", ") : `${files.length} files`)
|
|
111
130
|
: staged.split("\n").slice(0, 3).join(", ");
|
|
112
|
-
const message = `oh: ${toolName} ${fileList}
|
|
131
|
+
const message = `oh: ${toolName} ${fileList}\n\nCo-Authored-By: OpenHarness <noreply@openharness.dev>`;
|
|
132
|
+
// Respect git signing config — don't pass --no-gpg-sign
|
|
113
133
|
spawnSync("git", ["commit", "-m", message], { cwd, stdio: "pipe" });
|
|
114
134
|
// Return commit hash
|
|
115
135
|
return execSync("git rev-parse --short HEAD", { cwd, stdio: "pipe" }).toString().trim();
|
|
@@ -165,6 +185,31 @@ export function createWorktree(cwd) {
|
|
|
165
185
|
return null;
|
|
166
186
|
}
|
|
167
187
|
}
|
|
188
|
+
/**
|
|
189
|
+
* Check if a worktree has uncommitted changes or new commits.
|
|
190
|
+
*/
|
|
191
|
+
export function hasWorktreeChanges(worktreePath) {
|
|
192
|
+
if (hasUncommittedChanges(worktreePath))
|
|
193
|
+
return true;
|
|
194
|
+
try {
|
|
195
|
+
const diffStat = execSync("git diff HEAD --stat", { cwd: worktreePath, stdio: "pipe" }).toString().trim();
|
|
196
|
+
return diffStat.length > 0;
|
|
197
|
+
}
|
|
198
|
+
catch {
|
|
199
|
+
return false;
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
/**
|
|
203
|
+
* Get the git repository root directory, or null if not in a repo.
|
|
204
|
+
*/
|
|
205
|
+
export function gitRoot(cwd) {
|
|
206
|
+
try {
|
|
207
|
+
return execSync("git rev-parse --show-toplevel", { cwd, stdio: "pipe" }).toString().trim();
|
|
208
|
+
}
|
|
209
|
+
catch {
|
|
210
|
+
return null;
|
|
211
|
+
}
|
|
212
|
+
}
|
|
168
213
|
/**
|
|
169
214
|
* Remove a git worktree and clean up.
|
|
170
215
|
*/
|
package/dist/git/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/git/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/git/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Checkpoints — auto-snapshot files before modifications for safe rewind.
|
|
3
|
+
*
|
|
4
|
+
* Before each file-modifying tool (FileWrite, FileEdit, Bash), the checkpoint
|
|
5
|
+
* system saves copies of affected files. `/rewind` restores the last checkpoint.
|
|
6
|
+
*
|
|
7
|
+
* Storage: .oh/checkpoints/{sessionId}/{turnN}/{relativePath}
|
|
8
|
+
*/
|
|
9
|
+
export type Checkpoint = {
|
|
10
|
+
turn: number;
|
|
11
|
+
timestamp: number;
|
|
12
|
+
files: string[];
|
|
13
|
+
description: string;
|
|
14
|
+
};
|
|
15
|
+
/** Initialize checkpoint system for a session */
|
|
16
|
+
export declare function initCheckpoints(sessionId: string): void;
|
|
17
|
+
/**
|
|
18
|
+
* Create a checkpoint before modifying files.
|
|
19
|
+
* Saves copies of the specified files so they can be restored later.
|
|
20
|
+
*/
|
|
21
|
+
export declare function createCheckpoint(turn: number, filePaths: string[], description: string): Checkpoint | null;
|
|
22
|
+
/**
|
|
23
|
+
* Rewind to the last checkpoint — restore all files from the most recent snapshot.
|
|
24
|
+
* Returns the checkpoint that was restored, or null if no checkpoints.
|
|
25
|
+
*/
|
|
26
|
+
export declare function rewindLastCheckpoint(): Checkpoint | null;
|
|
27
|
+
/** Get the list of available checkpoints */
|
|
28
|
+
export declare function listCheckpoints(): Checkpoint[];
|
|
29
|
+
/** Get checkpoint count */
|
|
30
|
+
export declare function checkpointCount(): number;
|
|
31
|
+
/**
|
|
32
|
+
* Extract file paths from tool input that might be modified.
|
|
33
|
+
* Returns paths that should be checkpointed before the tool runs.
|
|
34
|
+
*/
|
|
35
|
+
export declare function getAffectedFiles(toolName: string, toolInput: Record<string, unknown>): string[];
|
|
36
|
+
//# sourceMappingURL=checkpoints.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"checkpoints.d.ts","sourceRoot":"","sources":["../../src/harness/checkpoints.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAQH,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAKF,iDAAiD;AACjD,wBAAgB,eAAe,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAavD;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EAAE,EACnB,WAAW,EAAE,MAAM,GAClB,UAAU,GAAG,IAAI,CA8CnB;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,UAAU,GAAG,IAAI,CA2BxD;AAED,4CAA4C;AAC5C,wBAAgB,eAAe,IAAI,UAAU,EAAE,CAE9C;AAED,2BAA2B;AAC3B,wBAAgB,eAAe,IAAI,MAAM,CAExC;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE,CA4B/F"}
|
|
@@ -0,0 +1,156 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Checkpoints — auto-snapshot files before modifications for safe rewind.
|
|
3
|
+
*
|
|
4
|
+
* Before each file-modifying tool (FileWrite, FileEdit, Bash), the checkpoint
|
|
5
|
+
* system saves copies of affected files. `/rewind` restores the last checkpoint.
|
|
6
|
+
*
|
|
7
|
+
* Storage: .oh/checkpoints/{sessionId}/{turnN}/{relativePath}
|
|
8
|
+
*/
|
|
9
|
+
import { readFileSync, writeFileSync, mkdirSync, existsSync, copyFileSync, rmSync } from 'node:fs';
|
|
10
|
+
import { join, relative, dirname } from 'node:path';
|
|
11
|
+
const CHECKPOINTS_DIR = '.oh/checkpoints';
|
|
12
|
+
const MAX_CHECKPOINTS = 20; // per session
|
|
13
|
+
let currentSessionId = '';
|
|
14
|
+
let checkpointLog = [];
|
|
15
|
+
/** Initialize checkpoint system for a session */
|
|
16
|
+
export function initCheckpoints(sessionId) {
|
|
17
|
+
currentSessionId = sessionId;
|
|
18
|
+
checkpointLog = [];
|
|
19
|
+
const dir = join(CHECKPOINTS_DIR, sessionId);
|
|
20
|
+
if (existsSync(dir)) {
|
|
21
|
+
// Load existing checkpoint log
|
|
22
|
+
const logPath = join(dir, 'log.json');
|
|
23
|
+
if (existsSync(logPath)) {
|
|
24
|
+
try {
|
|
25
|
+
checkpointLog = JSON.parse(readFileSync(logPath, 'utf-8'));
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
checkpointLog = [];
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
/**
|
|
34
|
+
* Create a checkpoint before modifying files.
|
|
35
|
+
* Saves copies of the specified files so they can be restored later.
|
|
36
|
+
*/
|
|
37
|
+
export function createCheckpoint(turn, filePaths, description) {
|
|
38
|
+
if (!currentSessionId || filePaths.length === 0)
|
|
39
|
+
return null;
|
|
40
|
+
const dir = join(CHECKPOINTS_DIR, currentSessionId, `turn-${turn}`);
|
|
41
|
+
mkdirSync(dir, { recursive: true });
|
|
42
|
+
const savedFiles = [];
|
|
43
|
+
const cwd = process.cwd();
|
|
44
|
+
for (const filePath of filePaths) {
|
|
45
|
+
if (!existsSync(filePath))
|
|
46
|
+
continue;
|
|
47
|
+
const relPath = relative(cwd, filePath);
|
|
48
|
+
const destPath = join(dir, relPath);
|
|
49
|
+
try {
|
|
50
|
+
mkdirSync(dirname(destPath), { recursive: true });
|
|
51
|
+
copyFileSync(filePath, destPath);
|
|
52
|
+
savedFiles.push(relPath);
|
|
53
|
+
}
|
|
54
|
+
catch { /* skip unreadable files */ }
|
|
55
|
+
}
|
|
56
|
+
if (savedFiles.length === 0)
|
|
57
|
+
return null;
|
|
58
|
+
const checkpoint = {
|
|
59
|
+
turn,
|
|
60
|
+
timestamp: Date.now(),
|
|
61
|
+
files: savedFiles,
|
|
62
|
+
description,
|
|
63
|
+
};
|
|
64
|
+
checkpointLog.push(checkpoint);
|
|
65
|
+
// Evict old checkpoints
|
|
66
|
+
while (checkpointLog.length > MAX_CHECKPOINTS) {
|
|
67
|
+
const old = checkpointLog.shift();
|
|
68
|
+
const oldDir = join(CHECKPOINTS_DIR, currentSessionId, `turn-${old.turn}`);
|
|
69
|
+
try {
|
|
70
|
+
rmSync(oldDir, { recursive: true });
|
|
71
|
+
}
|
|
72
|
+
catch { /* ignore */ }
|
|
73
|
+
}
|
|
74
|
+
// Persist log
|
|
75
|
+
const logPath = join(CHECKPOINTS_DIR, currentSessionId, 'log.json');
|
|
76
|
+
mkdirSync(dirname(logPath), { recursive: true });
|
|
77
|
+
writeFileSync(logPath, JSON.stringify(checkpointLog, null, 2));
|
|
78
|
+
return checkpoint;
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* Rewind to the last checkpoint — restore all files from the most recent snapshot.
|
|
82
|
+
* Returns the checkpoint that was restored, or null if no checkpoints.
|
|
83
|
+
*/
|
|
84
|
+
export function rewindLastCheckpoint() {
|
|
85
|
+
if (checkpointLog.length === 0)
|
|
86
|
+
return null;
|
|
87
|
+
const checkpoint = checkpointLog.pop();
|
|
88
|
+
const dir = join(CHECKPOINTS_DIR, currentSessionId, `turn-${checkpoint.turn}`);
|
|
89
|
+
const cwd = process.cwd();
|
|
90
|
+
for (const relPath of checkpoint.files) {
|
|
91
|
+
const srcPath = join(dir, relPath);
|
|
92
|
+
const destPath = join(cwd, relPath);
|
|
93
|
+
if (existsSync(srcPath)) {
|
|
94
|
+
try {
|
|
95
|
+
mkdirSync(dirname(destPath), { recursive: true });
|
|
96
|
+
copyFileSync(srcPath, destPath);
|
|
97
|
+
}
|
|
98
|
+
catch { /* skip */ }
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
// Clean up the restored checkpoint dir
|
|
102
|
+
try {
|
|
103
|
+
rmSync(dir, { recursive: true });
|
|
104
|
+
}
|
|
105
|
+
catch { /* ignore */ }
|
|
106
|
+
// Persist updated log
|
|
107
|
+
const logPath = join(CHECKPOINTS_DIR, currentSessionId, 'log.json');
|
|
108
|
+
writeFileSync(logPath, JSON.stringify(checkpointLog, null, 2));
|
|
109
|
+
return checkpoint;
|
|
110
|
+
}
|
|
111
|
+
/** Get the list of available checkpoints */
|
|
112
|
+
export function listCheckpoints() {
|
|
113
|
+
return [...checkpointLog];
|
|
114
|
+
}
|
|
115
|
+
/** Get checkpoint count */
|
|
116
|
+
export function checkpointCount() {
|
|
117
|
+
return checkpointLog.length;
|
|
118
|
+
}
|
|
119
|
+
/**
|
|
120
|
+
* Extract file paths from tool input that might be modified.
|
|
121
|
+
* Returns paths that should be checkpointed before the tool runs.
|
|
122
|
+
*/
|
|
123
|
+
export function getAffectedFiles(toolName, toolInput) {
|
|
124
|
+
switch (toolName) {
|
|
125
|
+
case 'FileWrite':
|
|
126
|
+
case 'Write':
|
|
127
|
+
return toolInput.file_path ? [String(toolInput.file_path)] : [];
|
|
128
|
+
case 'FileEdit':
|
|
129
|
+
case 'Edit':
|
|
130
|
+
return toolInput.file_path ? [String(toolInput.file_path)] : [];
|
|
131
|
+
case 'NotebookEdit':
|
|
132
|
+
return toolInput.notebook_path ? [String(toolInput.notebook_path)] : [];
|
|
133
|
+
case 'Bash': {
|
|
134
|
+
// Extract file paths from bash commands that modify files
|
|
135
|
+
const cmd = String(toolInput.command ?? '');
|
|
136
|
+
const files = [];
|
|
137
|
+
// Detect redirect targets: > file, >> file
|
|
138
|
+
const redirects = cmd.matchAll(/>{1,2}\s*(\S+)/g);
|
|
139
|
+
for (const m of redirects)
|
|
140
|
+
if (m[1] && !m[1].startsWith('/dev/'))
|
|
141
|
+
files.push(m[1]);
|
|
142
|
+
// Detect sed -i targets
|
|
143
|
+
const sedMatch = cmd.match(/sed\s+-i\S*\s+.*\s+(\S+)$/);
|
|
144
|
+
if (sedMatch?.[1])
|
|
145
|
+
files.push(sedMatch[1]);
|
|
146
|
+
// Detect mv/cp targets
|
|
147
|
+
const mvMatch = cmd.match(/(?:mv|cp)\s+\S+\s+(\S+)$/);
|
|
148
|
+
if (mvMatch?.[1])
|
|
149
|
+
files.push(mvMatch[1]);
|
|
150
|
+
return files.filter(f => existsSync(f));
|
|
151
|
+
}
|
|
152
|
+
default:
|
|
153
|
+
return [];
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
//# sourceMappingURL=checkpoints.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"checkpoints.js","sourceRoot":"","sources":["../../src/harness/checkpoints.ts"],"names":[],"mappings":"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"}
|
package/dist/harness/config.d.ts
CHANGED
|
@@ -23,6 +23,7 @@ export type HooksConfig = {
|
|
|
23
23
|
export type ToolPermissionRule = {
|
|
24
24
|
tool: string;
|
|
25
25
|
action: "allow" | "deny" | "ask";
|
|
26
|
+
pattern?: string;
|
|
26
27
|
};
|
|
27
28
|
export type OhConfig = {
|
|
28
29
|
provider: string;
|
|
@@ -36,6 +37,8 @@ export type OhConfig = {
|
|
|
36
37
|
toolPermissions?: ToolPermissionRule[];
|
|
37
38
|
statusLineFormat?: string;
|
|
38
39
|
};
|
|
40
|
+
/** Clear cached config (call after writes or to force re-read) */
|
|
41
|
+
export declare function invalidateConfigCache(): void;
|
|
39
42
|
export declare function readOhConfig(root?: string): OhConfig | null;
|
|
40
43
|
export declare function writeOhConfig(cfg: OhConfig, root?: string): void;
|
|
41
44
|
//# sourceMappingURL=config.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/harness/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,SAAS,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/harness/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAKH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC7B,SAAS,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,YAAY,CAAC,EAAE,OAAO,EAAE,CAAC;IACzB,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC;IACvB,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC;IACvB,WAAW,CAAC,EAAE,OAAO,EAAE,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,GAAG,MAAM,GAAG,KAAK,CAAC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,cAAc,EAAE,cAAc,CAAC;IAC/B,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,eAAe,EAAE,CAAC;IAC/B,KAAK,CAAC,EAAE,WAAW,CAAC;IACpB,eAAe,CAAC,EAAE,kBAAkB,EAAE,CAAC;IACvC,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B,CAAC;AAaF,kEAAkE;AAClE,wBAAgB,qBAAqB,IAAI,IAAI,CAG5C;AAED,wBAAgB,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,IAAI,CA4B3D;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAmChE"}
|
package/dist/harness/config.js
CHANGED
|
@@ -10,18 +10,51 @@ function yamlScalar(value) {
|
|
|
10
10
|
function configPath(root) {
|
|
11
11
|
return join(root ?? ".", ".oh", "config.yaml");
|
|
12
12
|
}
|
|
13
|
+
let _configCache;
|
|
14
|
+
let _configCacheRoot;
|
|
15
|
+
/** Clear cached config (call after writes or to force re-read) */
|
|
16
|
+
export function invalidateConfigCache() {
|
|
17
|
+
_configCache = undefined;
|
|
18
|
+
_configCacheRoot = undefined;
|
|
19
|
+
}
|
|
13
20
|
export function readOhConfig(root) {
|
|
21
|
+
const effectiveRoot = root ?? ".";
|
|
22
|
+
if (_configCache !== undefined && _configCacheRoot === effectiveRoot)
|
|
23
|
+
return _configCache;
|
|
14
24
|
const p = configPath(root);
|
|
15
|
-
if (!existsSync(p))
|
|
25
|
+
if (!existsSync(p)) {
|
|
26
|
+
_configCache = null;
|
|
27
|
+
_configCacheRoot = effectiveRoot;
|
|
16
28
|
return null;
|
|
29
|
+
}
|
|
17
30
|
try {
|
|
18
|
-
|
|
31
|
+
const base = parse(readFileSync(p, "utf-8"));
|
|
32
|
+
// Merge local overrides from config.local.yaml (gitignored personal settings)
|
|
33
|
+
const localPath = join(root ?? ".", ".oh", "config.local.yaml");
|
|
34
|
+
if (existsSync(localPath)) {
|
|
35
|
+
try {
|
|
36
|
+
const local = parse(readFileSync(localPath, "utf-8"));
|
|
37
|
+
if (local) {
|
|
38
|
+
const merged = { ...base, ...local };
|
|
39
|
+
_configCache = merged;
|
|
40
|
+
_configCacheRoot = effectiveRoot;
|
|
41
|
+
return merged;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
catch { /* ignore malformed local config */ }
|
|
45
|
+
}
|
|
46
|
+
_configCache = base;
|
|
47
|
+
_configCacheRoot = effectiveRoot;
|
|
48
|
+
return base;
|
|
19
49
|
}
|
|
20
50
|
catch {
|
|
51
|
+
_configCache = null;
|
|
52
|
+
_configCacheRoot = effectiveRoot;
|
|
21
53
|
return null;
|
|
22
54
|
}
|
|
23
55
|
}
|
|
24
56
|
export function writeOhConfig(cfg, root) {
|
|
57
|
+
invalidateConfigCache();
|
|
25
58
|
const p = configPath(root);
|
|
26
59
|
mkdirSync(join(root ?? ".", ".oh"), { recursive: true });
|
|
27
60
|
if (cfg.provider === "llamacpp" || cfg.provider === "lmstudio") {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/harness/config.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/harness/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import test from "node:test";
|
|
2
2
|
import assert from "node:assert/strict";
|
|
3
|
-
import { mkdtempSync } from "node:fs";
|
|
3
|
+
import { mkdtempSync, writeFileSync } from "node:fs";
|
|
4
4
|
import { tmpdir } from "node:os";
|
|
5
|
+
import { join } from "node:path";
|
|
5
6
|
import { readOhConfig, writeOhConfig } from "./config.js";
|
|
6
7
|
function tmp() {
|
|
7
8
|
return mkdtempSync(tmpdir() + "/oh-cfg-test-");
|
|
@@ -84,4 +85,23 @@ test("writeOhConfig() overwrites existing config", () => {
|
|
|
84
85
|
assert.equal(cfg?.provider, "anthropic");
|
|
85
86
|
assert.equal(cfg?.model, "claude-haiku-4-5");
|
|
86
87
|
});
|
|
88
|
+
// ── config.local.yaml merge ──
|
|
89
|
+
test("readOhConfig() merges config.local.yaml overrides", () => {
|
|
90
|
+
const dir = tmp();
|
|
91
|
+
writeOhConfig({ provider: "openai", model: "gpt-4o", permissionMode: "ask" }, dir);
|
|
92
|
+
writeFileSync(join(dir, ".oh", "config.local.yaml"), "model: gpt-4o-mini\napiKey: local-key\n");
|
|
93
|
+
const cfg = readOhConfig(dir);
|
|
94
|
+
assert.ok(cfg !== null);
|
|
95
|
+
assert.equal(cfg.provider, "openai"); // not overridden
|
|
96
|
+
assert.equal(cfg.model, "gpt-4o-mini"); // overridden
|
|
97
|
+
assert.equal(cfg.apiKey, "local-key"); // added
|
|
98
|
+
});
|
|
99
|
+
test("readOhConfig() ignores malformed config.local.yaml", () => {
|
|
100
|
+
const dir = tmp();
|
|
101
|
+
writeOhConfig({ provider: "openai", model: "gpt-4o", permissionMode: "ask" }, dir);
|
|
102
|
+
writeFileSync(join(dir, ".oh", "config.local.yaml"), "{{{{invalid yaml");
|
|
103
|
+
const cfg = readOhConfig(dir);
|
|
104
|
+
assert.ok(cfg !== null);
|
|
105
|
+
assert.equal(cfg.model, "gpt-4o"); // base config unchanged
|
|
106
|
+
});
|
|
87
107
|
//# sourceMappingURL=config.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../src/harness/config.test.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,WAAW,
|
|
1
|
+
{"version":3,"file":"config.test.js","sourceRoot":"","sources":["../../src/harness/config.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hooks-env.test.d.ts","sourceRoot":"","sources":["../../src/harness/hooks-env.test.ts"],"names":[],"mappings":"AAAA;;GAEG"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Tests for hooks system — env var construction and hook matching.
|
|
3
|
+
*/
|
|
4
|
+
import test from 'node:test';
|
|
5
|
+
import assert from 'node:assert/strict';
|
|
6
|
+
// Test the buildEnv function indirectly by importing and calling emitHook
|
|
7
|
+
// We can't test shell execution easily, but we CAN test the env var construction
|
|
8
|
+
// by examining the HookContext type coverage
|
|
9
|
+
test('HookContext supports all new env var fields', () => {
|
|
10
|
+
// Verify the type accepts all expected fields
|
|
11
|
+
const ctx = {
|
|
12
|
+
toolName: 'Bash',
|
|
13
|
+
toolArgs: '{"command":"echo hi"}',
|
|
14
|
+
toolOutput: 'hi',
|
|
15
|
+
toolInputJson: '{"command":"echo hi"}',
|
|
16
|
+
sessionId: 'test-123',
|
|
17
|
+
model: 'gpt-4o',
|
|
18
|
+
provider: 'openai',
|
|
19
|
+
permissionMode: 'ask',
|
|
20
|
+
cost: '$0.0042',
|
|
21
|
+
tokens: '1000↑ 500↓',
|
|
22
|
+
};
|
|
23
|
+
// All fields should be defined
|
|
24
|
+
assert.equal(ctx.toolName, 'Bash');
|
|
25
|
+
assert.equal(ctx.sessionId, 'test-123');
|
|
26
|
+
assert.equal(ctx.model, 'gpt-4o');
|
|
27
|
+
assert.equal(ctx.provider, 'openai');
|
|
28
|
+
assert.equal(ctx.permissionMode, 'ask');
|
|
29
|
+
assert.equal(ctx.cost, '$0.0042');
|
|
30
|
+
assert.equal(ctx.tokens, '1000↑ 500↓');
|
|
31
|
+
assert.equal(ctx.toolInputJson, '{"command":"echo hi"}');
|
|
32
|
+
});
|
|
33
|
+
test('HookContext allows partial fields (all optional)', () => {
|
|
34
|
+
const minimal = {};
|
|
35
|
+
assert.equal(minimal.toolName, undefined);
|
|
36
|
+
assert.equal(minimal.sessionId, undefined);
|
|
37
|
+
const withTool = { toolName: 'Read' };
|
|
38
|
+
assert.equal(withTool.toolName, 'Read');
|
|
39
|
+
assert.equal(withTool.model, undefined);
|
|
40
|
+
});
|
|
41
|
+
//# sourceMappingURL=hooks-env.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hooks-env.test.js","sourceRoot":"","sources":["../../src/harness/hooks-env.test.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,MAAM,MAAM,oBAAoB,CAAC;AAGxC,0EAA0E;AAC1E,iFAAiF;AACjF,6CAA6C;AAE7C,IAAI,CAAC,6CAA6C,EAAE,GAAG,EAAE;IACvD,8CAA8C;IAC9C,MAAM,GAAG,GAAgB;QACvB,QAAQ,EAAE,MAAM;QAChB,QAAQ,EAAE,uBAAuB;QACjC,UAAU,EAAE,IAAI;QAChB,aAAa,EAAE,uBAAuB;QACtC,SAAS,EAAE,UAAU;QACrB,KAAK,EAAE,QAAQ;QACf,QAAQ,EAAE,QAAQ;QAClB,cAAc,EAAE,KAAK;QACrB,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,YAAY;KACrB,CAAC;IAEF,+BAA+B;IAC/B,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACnC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IACxC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IAClC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACrC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;IACxC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAClC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;IACvC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,aAAa,EAAE,uBAAuB,CAAC,CAAC;AAC3D,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,kDAAkD,EAAE,GAAG,EAAE;IAC5D,MAAM,OAAO,GAAgB,EAAE,CAAC;IAChC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;IAC1C,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;IAE3C,MAAM,QAAQ,GAAgB,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnD,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACxC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;AAC1C,CAAC,CAAC,CAAC"}
|
package/dist/harness/hooks.d.ts
CHANGED
|
@@ -9,6 +9,13 @@ export type HookContext = {
|
|
|
9
9
|
toolName?: string;
|
|
10
10
|
toolArgs?: string;
|
|
11
11
|
toolOutput?: string;
|
|
12
|
+
toolInputJson?: string;
|
|
13
|
+
sessionId?: string;
|
|
14
|
+
model?: string;
|
|
15
|
+
provider?: string;
|
|
16
|
+
permissionMode?: string;
|
|
17
|
+
cost?: string;
|
|
18
|
+
tokens?: string;
|
|
12
19
|
};
|
|
13
20
|
/**
|
|
14
21
|
* Emit a hook event. For preToolUse, returns false if any hook blocks the call.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/harness/hooks.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,MAAM,MAAM,SAAS,GAAG,cAAc,GAAG,YAAY,GAAG,YAAY,GAAG,aAAa,CAAC;AAErF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../../src/harness/hooks.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAMH,MAAM,MAAM,SAAS,GAAG,cAAc,GAAG,YAAY,GAAG,YAAY,GAAG,aAAa,CAAC;AAErF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AA4EF;;;;;GAKG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,GAAE,WAAgB,GAAG,OAAO,CA8BzE;AAED;;;GAGG;AACH,wBAAsB,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,GAAG,GAAE,WAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAe7F"}
|
package/dist/harness/hooks.js
CHANGED
|
@@ -25,6 +25,20 @@ function buildEnv(event, ctx) {
|
|
|
25
25
|
env.OH_TOOL_ARGS = ctx.toolArgs;
|
|
26
26
|
if (ctx.toolOutput)
|
|
27
27
|
env.OH_TOOL_OUTPUT = ctx.toolOutput;
|
|
28
|
+
if (ctx.toolInputJson)
|
|
29
|
+
env.OH_TOOL_INPUT_JSON = ctx.toolInputJson;
|
|
30
|
+
if (ctx.sessionId)
|
|
31
|
+
env.OH_SESSION_ID = ctx.sessionId;
|
|
32
|
+
if (ctx.model)
|
|
33
|
+
env.OH_MODEL = ctx.model;
|
|
34
|
+
if (ctx.provider)
|
|
35
|
+
env.OH_PROVIDER = ctx.provider;
|
|
36
|
+
if (ctx.permissionMode)
|
|
37
|
+
env.OH_PERMISSION_MODE = ctx.permissionMode;
|
|
38
|
+
if (ctx.cost)
|
|
39
|
+
env.OH_COST = ctx.cost;
|
|
40
|
+
if (ctx.tokens)
|
|
41
|
+
env.OH_TOKENS = ctx.tokens;
|
|
28
42
|
return env;
|
|
29
43
|
}
|
|
30
44
|
function matchesHook(def, ctx) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../src/harness/hooks.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../../src/harness/hooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keybindings.d.ts","sourceRoot":"","sources":["../../src/harness/keybindings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAMH,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAaF,mDAAmD;AACnD,wBAAgB,eAAe,IAAI,UAAU,EAAE,CAmB9C;
|
|
1
|
+
{"version":3,"file":"keybindings.d.ts","sourceRoot":"","sources":["../../src/harness/keybindings.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAMH,MAAM,MAAM,UAAU,GAAG;IACvB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAaF,mDAAmD;AACnD,wBAAgB,eAAe,IAAI,UAAU,EAAE,CAmB9C;AAsCD;;;;;;;;GAQG;AACH,wBAAgB,uBAAuB;iBAO1B,MAAM,UACL;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,OAAO,CAAA;KAAE,GACvD,MAAM,GAAG,IAAI;IA6ChB,uDAAuD;mBACxC,UAAU,EAAE;EAI9B"}
|
|
@@ -41,6 +41,10 @@ function defaultKeybindings() {
|
|
|
41
41
|
{ key: 'ctrl+d', action: '/diff' },
|
|
42
42
|
{ key: 'ctrl+l', action: '/clear' },
|
|
43
43
|
{ key: 'ctrl+u', action: '/undo' },
|
|
44
|
+
{ key: 'ctrl+s', action: '/status' },
|
|
45
|
+
{ key: 'ctrl+k ctrl+c', action: '/cost' },
|
|
46
|
+
{ key: 'ctrl+k ctrl+f', action: '/fast' },
|
|
47
|
+
{ key: 'ctrl+k ctrl+l', action: '/log' },
|
|
44
48
|
];
|
|
45
49
|
}
|
|
46
50
|
/** Parse a key string like "ctrl+s" into components */
|