@zhijiewang/openharness 2.12.0 → 2.14.0

package/dist/query/tools.js

@@ -2,7 +2,7 @@
  * Tool execution — permission checking, batching, output capping.
  */
 import { createCheckpoint, getAffectedFiles } from "../harness/checkpoints.js";
-import { emitHook } from "../harness/hooks.js";
+import { emitHook, emitHookWithOutcome } from "../harness/hooks.js";
 import { findToolByName } from "../Tool.js";
 import { createToolResultMessage } from "../types/message.js";
 import { checkPermission } from "../types/permissions.js";
@@ -45,9 +45,28 @@ export async function executeSingleTool(toolCall, tools, context, permissionMode
         if (perm.reason === "needs-approval" && askUser) {
             const { formatToolArgs } = await import("../utils/tool-summary.js");
             const description = formatToolArgs(tool.name, toolCall.arguments);
-            const allowed = await askUser(tool.name, description, tool.riskLevel);
-            if (!allowed) {
-                return { output: "Permission denied by user.", isError: true };
+            // Hook: permissionRequest — fires between preToolUse and the interactive askUser prompt.
+            // Only fires when checkPermission says "needs-approval" AND askUser is provided.
+            const hookOutcome = await emitHookWithOutcome("permissionRequest", {
+                toolName: tool.name,
+                toolArgs: JSON.stringify(toolCall.arguments).slice(0, 1000),
+                toolInputJson: JSON.stringify(parsed.data).slice(0, 1000),
+                permissionMode,
+                permissionAction: "ask",
+            });
+            if (hookOutcome.permissionDecision === "allow") {
+                // Hook granted permission — skip interactive prompt and proceed to execution.
+            }
+            else if (hookOutcome.permissionDecision === "deny" || !hookOutcome.allowed) {
+                const reason = hookOutcome.reason ? `: ${hookOutcome.reason}` : "";
+                return { output: `Permission denied by hook${reason}`, isError: true };
+            }
+            else {
+                // "ask" or no decision → fall through to interactive prompt
+                const allowed = await askUser(tool.name, description, tool.riskLevel);
+                if (!allowed) {
+                    return { output: "Permission denied by user.", isError: true };
+                }
             }
         }
         else {
@@ -79,12 +98,23 @@ export async function executeSingleTool(toolCall, tools, context, permissionMode
                 toolAbort.addEventListener("abort", () => reject(new Error(`Tool '${tool.name}' timed out after ${TOOL_TIMEOUT_MS / 1000}s`)));
             }),
         ]);
-        // Hook: postToolUse
-        emitHook("postToolUse", {
-            toolName: tool.name,
-            toolArgs: JSON.stringify(toolCall.arguments).slice(0, 1000),
-            toolOutput: result.output.slice(0, 1000),
-        });
+        // Hook: postToolUse / postToolUseFailure (mutually exclusive — strict CC parity)
+        if (result.isError) {
+            emitHook("postToolUseFailure", {
+                toolName: tool.name,
+                toolArgs: JSON.stringify(toolCall.arguments).slice(0, 1000),
+                toolOutput: result.output.slice(0, 1000),
+                toolError: "ReportedError",
+                errorMessage: result.output.slice(0, 1000),
+            });
+        }
+        else {
+            emitHook("postToolUse", {
+                toolName: tool.name,
+                toolArgs: JSON.stringify(toolCall.arguments).slice(0, 1000),
+                toolOutput: result.output.slice(0, 1000),
+            });
+        }
         // Emit fileChanged hook for file-modifying tools
         if (!result.isError && ["Edit", "Write", "MultiEdit"].includes(tool.name)) {
             const filePaths = getAffectedFiles(tool.name, parsed.data);
@@ -141,7 +171,15 @@ export async function executeSingleTool(toolCall, tools, context, permissionMode
         return { output, isError: result.isError };
     }
     catch (err) {
-        return { output: `Tool error: ${err instanceof Error ? err.message : String(err)}`, isError: true };
+        const errMsg = err instanceof Error ? err.message : String(err);
+        const errName = err instanceof Error ? err.name : "ExecutionError";
+        emitHook("postToolUseFailure", {
+            toolName: tool.name,
+            toolArgs: JSON.stringify(toolCall.arguments).slice(0, 1000),
+            errorMessage: errMsg,
+            toolError: errName,
+        });
+        return { output: `Tool error: ${errMsg}`, isError: true };
     }
 }
 export async function* executeToolCalls(toolCalls, tools, context, permissionMode, askUser, state) {

package/dist/query/types.d.ts

@@ -20,6 +20,8 @@ export type QueryConfig = {
     workingDir?: string;
     /** Auto-commit after each file-modifying tool */
     gitCommitPerTool?: boolean;
+    /** For sub-agent invocations: the agent role name (feeds into the model router). */
+    role?: string;
 };
 export type TransitionReason = "next_turn" | "retry_network" | "retry_prompt_too_long" | "retry_max_output_tokens";
 export type QueryLoopState = {
@@ -33,5 +35,9 @@ export type QueryLoopState = {
     promptTooLongRetries?: number;
     /** Track consecutive compression failures for circuit breaker */
     compressionFailures?: number;
+    /** Whether the previous turn made any tool calls (feeds ModelRouter) */
+    lastTurnHadTools?: boolean;
+    /** Number of tool calls in the previous turn (feeds ModelRouter) */
+    lastTurnToolCount?: number;
 };
 //# sourceMappingURL=types.d.ts.map

package/dist/tools/AgentTool/index.js

@@ -99,7 +99,7 @@ export const AgentTool = {
             const runAgent = async () => {
                 let finalText = "";
                 try {
-                    for await (const event of query(input.prompt, config)) {
+                    for await (const event of query(input.prompt, { ...config, role: role?.id })) {
                         if (event.type === "text_delta")
                             finalText += event.content;
                     }
@@ -137,7 +137,7 @@ export const AgentTool = {
         let finalText = "";
         try {
             try {
-                for await (const event of query(input.prompt, config)) {
+                for await (const event of query(input.prompt, { ...config, role: role?.id })) {
                     if (event.type === "text_delta") {
                         finalText += event.content;
                     }

package/dist/tools/ScheduleWakeupTool/index.d.ts

@@ -5,12 +5,12 @@ declare const inputSchema: z.ZodObject<{
     reason: z.ZodString;
     prompt: z.ZodString;
 }, "strip", z.ZodTypeAny, {
-    prompt: string;
     reason: string;
+    prompt: string;
     delaySeconds: number;
 }, {
-    prompt: string;
     reason: string;
+    prompt: string;
     delaySeconds: number;
 }>;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhijiewang/openharness",
-  "version": "2.12.0",
+  "version": "2.14.0",
   "description": "Open-source terminal coding agent. Works with any LLM.",
   "type": "module",
   "bin": {
@@ -84,5 +84,8 @@
   "bugs": {
     "url": "https://github.com/zhijiewong/openharness/issues"
   },
-  "homepage": "https://github.com/zhijiewong/openharness#readme"
+  "homepage": "https://github.com/zhijiewong/openharness#readme",
+  "optionalDependencies": {
+    "@napi-rs/keyring": "^1.2.0"
+  }
 }