dsh-hooks 0.9.1 → 0.11.0

package/lib/runner.js

@@ -26,6 +26,18 @@ export function terminate(child) {
     }
     child.kill();
 }
+/**
+ * Resolve the spawn working directory for a hook: `cwd: 'session'` runs in
+ * the session's cwd (falling back to the plugin process when unknown); any
+ * other configured value is used verbatim (documented as an absolute path).
+ */
+function resolveCwd(spec, ctx) {
+    if (spec.cwd === undefined)
+        return undefined;
+    if (spec.cwd === 'session')
+        return ctx.cwd ?? process.cwd();
+    return spec.cwd;
+}
 /**
  * Fire-and-forget command runner. Emissions are irreversible side effects:
  * failures only warn, never block the agent loop. Context travels through
@@ -34,13 +46,29 @@ export function terminate(child) {
  * templating by the user. `input: 'stdin'` additionally writes the full
  * context as one JSON document to stdin, and `retries` re-spawns commands
  * whose exit code is non-zero (with exponential backoff, in the background).
+ * `cwd` moves the spawn into the session/project directory, and an optional
+ * `limiter` caps concurrent runs per identity.
  */
 export function createHookRunner(log = console.log, record) {
     const children = new Set();
     const pendingRetries = new Set();
-    function spawnOnce(spec, ctx, attempt) {
+    /** Live logical-run counts per limiter id (retries keep their slot). */
+    const inFlightById = new Map();
+    function releaseSlot(limiter) {
+        if (limiter === undefined)
+            return;
+        const count = (inFlightById.get(limiter.id) ?? 0) - 1;
+        if (count <= 0)
+            inFlightById.delete(limiter.id);
+        else
+            inFlightById.set(limiter.id, count);
+    }
+    function spawnOnce(spec, ctx, attempt, recordOverride, done) {
         if (!spec.run)
             return { ok: false, reason: 'skipped', detail: 'no run command' };
+        // Per-run override replaces the shared sink for this logical run so
+        // callers can attribute outcomes (incl. retries) to one hook identity.
+        const rec = recordOverride ?? record;
         const timeoutMs = spec.timeoutMs ?? DEFAULT_TIMEOUT_MS;
         const retries = spec.retries ?? 0;
         const retryDelayMs = spec.retryDelayMs ?? DEFAULT_RETRY_DELAY_MS;
@@ -59,6 +87,7 @@ export function createHookRunner(log = console.log, record) {
         try {
             child = spawn(command, {
                 shell: true,
+                cwd: resolveCwd(spec, ctx),
                 env: { ...process.env, ...env },
                 stdio: [useStdin ? 'pipe' : 'ignore', 'pipe', 'pipe'],
             });
@@ -66,18 +95,19 @@ export function createHookRunner(log = console.log, record) {
         catch (error) {
             const detail = error instanceof Error ? error.message : String(error);
             console.warn(`[dsh-hooks] spawn 失败 (${eventLabel(ctx)}): ${detail}`);
-            record?.({ ...base, outcome: 'spawn-failed', error: detail });
+            rec?.({ ...base, outcome: 'spawn-failed', error: detail });
+            done?.();
             return { ok: false, reason: 'spawn-failed', detail };
         }
         const startedAt = Date.now();
-        record?.({ ...base, outcome: 'spawned' });
+        rec?.({ ...base, outcome: 'spawned' });
         children.add(child);
         let timedOut = false;
         const timer = setTimeout(() => {
             timedOut = true;
             terminate(child);
             console.warn(`[dsh-hooks] 超时（${timeoutMs}ms），已终止：${eventLabel(ctx)}`);
-            record?.({ ...base, outcome: 'timeout', durationMs: Date.now() - startedAt });
+            rec?.({ ...base, outcome: 'timeout', durationMs: Date.now() - startedAt });
         }, timeoutMs);
         // Never hold the process open for a hook.
         child.unref();
@@ -107,8 +137,9 @@ export function createHookRunner(log = console.log, record) {
             // that actually ran and exited non-zero does.
             if (timedOut || code === null || code === 0) {
                 if (!timedOut && code !== null) {
-                    record?.({ ...base, outcome: 'exit-0', exitCode: 0, durationMs: Date.now() - startedAt });
+                    rec?.({ ...base, outcome: 'exit-0', exitCode: 0, durationMs: Date.now() - startedAt });
                 }
+                done?.();
                 return;
             }
             if (attempt < retries) {
@@ -116,7 +147,7 @@ export function createHookRunner(log = console.log, record) {
                 log(`[dsh-hooks] hook 退出码 ${code}，${delay}ms 后重试（${attempt + 1}/${retries}）：${eventLabel(ctx)}`);
                 const retryTimer = setTimeout(() => {
                     pendingRetries.delete(retryTimer);
-                    spawnOnce(spec, ctx, attempt + 1);
+                    spawnOnce(spec, ctx, attempt + 1, recordOverride, done);
                 }, delay);
                 retryTimer.unref?.();
                 pendingRetries.add(retryTimer);
@@ -125,14 +156,24 @@ export function createHookRunner(log = console.log, record) {
             const tail = captured.err.trim();
             const detail = tail === '' ? '' : `，stderr：${tail.slice(-400)}`;
             console.warn(`[dsh-hooks] hook 退出码 ${code} (${eventLabel(ctx)})${detail}`);
-            record?.({ ...base, outcome: 'exit-nonzero', exitCode: code, durationMs: Date.now() - startedAt, error: tail.slice(-400) || undefined });
+            rec?.({ ...base, outcome: 'exit-nonzero', exitCode: code, durationMs: Date.now() - startedAt, error: tail.slice(-400) || undefined });
+            done?.();
         });
         return { ok: true, reason: 'ran' };
     }
-    function run(spec, ctx) {
+    function run(spec, ctx, recordOverride, limiter) {
         if (!spec.run)
             return { ok: false, reason: 'skipped', detail: 'no run command' };
-        return spawnOnce(spec, ctx, 0);
+        if (limiter !== undefined) {
+            const inFlight = inFlightById.get(limiter.id) ?? 0;
+            if (inFlight >= limiter.max) {
+                const detail = `maxConcurrent 达到上限（${limiter.max}），本次触发被丢弃`;
+                recordOverride?.({ kind: 'run', event: ctx.event, command: spec.run, sessionId: ctx.sessionId, sessionName: ctx.sessionName, outcome: 'skipped', error: detail });
+                return { ok: false, reason: 'skipped', detail };
+            }
+            inFlightById.set(limiter.id, inFlight + 1);
+        }
+        return spawnOnce(spec, ctx, 0, recordOverride, () => releaseSlot(limiter));
     }
     function dispose() {
         for (const timer of pendingRetries)

package/lib/server.d.ts

@@ -48,7 +48,7 @@ export interface HookRoutesOptions {
 /** Sanitized per-hook description for the settings panel (regex sources, no RegExp objects). */
 export declare function describeHooks(hooks: readonly HookSpec[]): {
     index: number;
-    on: "agent/created" | "agent/disposed" | "agent/error" | "agent/status" | "approval/asked" | "approval/decided" | "session/created" | "session/disposed" | "session/title" | "step/end" | "tool/call" | "tool/result" | "tree/settled" | "turn/end" | "turn/start" | "user/message";
+    on: "agent/created" | "agent/disposed" | "agent/error" | "agent/status" | "approval/asked" | "approval/decided" | "hook/failed" | "session/created" | "session/disposed" | "session/title" | "step/end" | "tool/call" | "tool/result" | "tree/settled" | "turn/end" | "turn/start" | "user/message";
     when: "aborted" | "blocked" | "completed" | "error" | "interrupted" | "max-tokens" | undefined;
     match: {
         [k: string]: string;
@@ -63,6 +63,10 @@ export declare function describeHooks(hooks: readonly HookSpec[]): {
     timeoutMs: number | undefined;
     retries: number | undefined;
     retryDelayMs: number | undefined;
+    enabled: boolean | undefined;
+    cwd: string | undefined;
+    maxConcurrent: number | undefined;
+    debounceMs: number | undefined;
 }[];
 /** Create the /dsh-hooks route handler (exported for tests). */
 export declare function createHookHandler(options: HookRoutesOptions): (req: IncomingMessage, res: ServerResponse) => Promise<void>;

package/lib/server.js

@@ -55,6 +55,21 @@ async function readJsonBody(req) {
         return null;
     }
 }
+/** Render a match value for the panel: regex source or comparison string. */
+function matchText(value) {
+    if (value instanceof RegExp)
+        return value.source;
+    // Normalize single-op objects to the equivalent string syntax so the
+    // editor round-trip keeps comparison semantics; multi-op stays JSON.
+    const ops = Object.entries(value);
+    if (ops.length === 1) {
+        const [op, n] = ops[0];
+        const symbol = { gt: '>', gte: '>=', lt: '<', lte: '<=', eq: '=' }[op];
+        if (symbol !== undefined && typeof n === 'number')
+            return `${symbol}${n}`;
+    }
+    return JSON.stringify(value);
+}
 /** Sanitized per-hook description for the settings panel (regex sources, no RegExp objects). */
 export function describeHooks(hooks) {
     return hooks.map((hook, i) => ({
@@ -63,7 +78,7 @@ export function describeHooks(hooks) {
         when: hook.when,
         match: hook.match === undefined
             ? undefined
-            : Object.fromEntries(Object.entries(hook.match).map(([field, re]) => [field, re.source])),
+            : Object.fromEntries(Object.entries(hook.match).map(([field, re]) => [field, matchText(re)])),
         run: hook.run,
         notify: hook.notify === undefined || hook.notify === null
             ? undefined
@@ -72,6 +87,10 @@ export function describeHooks(hooks) {
         timeoutMs: hook.timeoutMs,
         retries: hook.retries,
         retryDelayMs: hook.retryDelayMs,
+        enabled: hook.enabled,
+        cwd: hook.cwd,
+        maxConcurrent: hook.maxConcurrent,
+        debounceMs: hook.debounceMs,
     }));
 }
 const FAILED_OUTCOMES = new Set(['exit-nonzero', 'timeout', 'spawn-failed', 'send-failed']);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-hooks",
-  "version": "0.9.1",
+  "version": "0.11.0",
   "packageManager": "pnpm@11.21.0",
   "description": "Config-driven lifecycle hooks plugin for DeepSeek Harness: declare event -> command hooks in cordis.patch.yml, no plugin code required. Includes a Hooks section in the Web GUI settings (history timeline + manual tester + notify tests + hook editor + Feishu connect).",
   "author": "PeterBon",