@vforsh/argus 0.3.1 → 0.5.0

package/dist/session/stdioCapture.d.ts

@@ -0,0 +1,33 @@
+/** Text a single request wrote to each stream. */
+export type CapturedStdio = {
+    stdout: string[];
+    stderr: string[];
+};
+/** Handle returned by {@link installStdioCapture}. */
+export type StdioCapture = {
+    /**
+     * Run `body` with its stdout/stderr redirected into `sink`.
+     *
+     * The sink travels with the async context, not with wall-clock time: a command that
+     * outlives its watchdog keeps writing into its own (already abandoned) sink instead of
+     * corrupting whichever request is running by then.
+     */
+    run: <T>(sink: CapturedStdio, body: () => Promise<T>) => Promise<T>;
+    /** Write straight to the real stdout, past the capture. Used for the JSONL responses themselves. */
+    writeStdout: (text: string) => void;
+    /** Restore the original stream writers. */
+    restore: () => void;
+};
+/**
+ * Redirect every stdout write made inside a request into that request's own buffer.
+ *
+ * The session's contract is that stdout carries nothing but its JSONL responses, and the
+ * ~200 commands it dispatches all reach stdout through their own `Output` closures — plus a
+ * handful of direct `process.stdout.write` calls. Patching the stream is what makes that
+ * contract hold for all of them at once, including plugin commands this file has never seen.
+ *
+ * stderr is captured *and* mirrored: the response carries it so a host can report a failure
+ * without a second channel, and a human tailing the session's stderr still sees it live.
+ */
+export declare const installStdioCapture: () => StdioCapture;
+//# sourceMappingURL=stdioCapture.d.ts.map

package/dist/session/stdioCapture.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"stdioCapture.d.ts","sourceRoot":"","sources":["../../src/session/stdioCapture.ts"],"names":[],"mappings":"AAEA,kDAAkD;AAClD,MAAM,MAAM,aAAa,GAAG;IAC3B,MAAM,EAAE,MAAM,EAAE,CAAA;IAChB,MAAM,EAAE,MAAM,EAAE,CAAA;CAChB,CAAA;AAED,sDAAsD;AACtD,MAAM,MAAM,YAAY,GAAG;IAC1B;;;;;;OAMG;IACH,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAA;IACnE,oGAAoG;IACpG,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,2CAA2C;IAC3C,OAAO,EAAE,MAAM,IAAI,CAAA;CACnB,CAAA;AAOD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,mBAAmB,QAAO,YAkBtC,CAAA"}

package/dist/session/stdioCapture.js

@@ -0,0 +1,56 @@
+import { AsyncLocalStorage } from 'node:async_hooks';
+/**
+ * Redirect every stdout write made inside a request into that request's own buffer.
+ *
+ * The session's contract is that stdout carries nothing but its JSONL responses, and the
+ * ~200 commands it dispatches all reach stdout through their own `Output` closures — plus a
+ * handful of direct `process.stdout.write` calls. Patching the stream is what makes that
+ * contract hold for all of them at once, including plugin commands this file has never seen.
+ *
+ * stderr is captured *and* mirrored: the response carries it so a host can report a failure
+ * without a second channel, and a human tailing the session's stderr still sees it live.
+ */
+export const installStdioCapture = () => {
+    const storage = new AsyncLocalStorage();
+    const originalStdoutWrite = process.stdout.write.bind(process.stdout);
+    const originalStderrWrite = process.stderr.write.bind(process.stderr);
+    process.stdout.write = createCapturingWrite(storage, originalStdoutWrite, (sink) => sink.stdout, false);
+    process.stderr.write = createCapturingWrite(storage, originalStderrWrite, (sink) => sink.stderr, true);
+    return {
+        run: (sink, body) => storage.run(sink, body),
+        writeStdout: (text) => {
+            originalStdoutWrite(text);
+        },
+        restore: () => {
+            process.stdout.write = originalStdoutWrite;
+            process.stderr.write = originalStderrWrite;
+        },
+    };
+};
+const createCapturingWrite = (storage, original, select, mirror) => {
+    const forward = original;
+    return ((chunk, encoding, callback) => {
+        const sink = storage.getStore();
+        if (!sink) {
+            return forward(chunk, encoding, callback);
+        }
+        select(sink).push(decodeChunk(chunk, encoding));
+        if (mirror) {
+            forward(chunk, encoding);
+        }
+        const done = typeof encoding === 'function' ? encoding : callback;
+        if (typeof done === 'function') {
+            ;
+            done();
+        }
+        return true;
+    });
+};
+const decodeChunk = (chunk, encoding) => {
+    if (typeof chunk === 'string') {
+        return chunk;
+    }
+    const bufferEncoding = typeof encoding === 'string' ? encoding : 'utf8';
+    return Buffer.from(chunk).toString(bufferEncoding);
+};
+//# sourceMappingURL=stdioCapture.js.map

package/dist/session/stdioCapture.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"stdioCapture.js","sourceRoot":"","sources":["../../src/session/stdioCapture.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AA6BpD;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAiB,EAAE;IACrD,MAAM,OAAO,GAAG,IAAI,iBAAiB,EAAiB,CAAA;IACtD,MAAM,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAgB,CAAA;IACpF,MAAM,mBAAmB,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAgB,CAAA;IAEpF,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,CAAA;IACvG,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,oBAAoB,CAAC,OAAO,EAAE,mBAAmB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IAEtG,OAAO;QACN,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,IAAI,CAAC;QAC5C,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;YACrB,mBAAmB,CAAC,IAAI,CAAC,CAAA;QAC1B,CAAC;QACD,OAAO,EAAE,GAAG,EAAE;YACb,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAA;YAC1C,OAAO,CAAC,MAAM,CAAC,KAAK,GAAG,mBAAmB,CAAA;QAC3C,CAAC;KACD,CAAA;AACF,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,CAC5B,OAAyC,EACzC,QAAqB,EACrB,MAAyC,EACzC,MAAe,EACD,EAAE;IAChB,MAAM,OAAO,GAAG,QAAsB,CAAA;IAEtC,OAAO,CAAC,CAAC,KAA0B,EAAE,QAAkB,EAAE,QAAkB,EAAW,EAAE;QACvF,MAAM,IAAI,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAA;QAC/B,IAAI,CAAC,IAAI,EAAE,CAAC;YACX,OAAO,OAAO,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAA;QAC1C,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;QAC/C,IAAI,MAAM,EAAE,CAAC;YACZ,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;QACzB,CAAC;QAED,MAAM,IAAI,GAAG,OAAO,QAAQ,KAAK,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAA;QACjE,IAAI,OAAO,IAAI,KAAK,UAAU,EAAE,CAAC;YAChC,CAAC;YAAC,IAAmB,EAAE,CAAA;QACxB,CAAC;QACD,OAAO,IAAI,CAAA;IACZ,CAAC,CAAgB,CAAA;AAClB,CAAC,CAAA;AAED,MAAM,WAAW,GAAG,CAAC,KAA0B,EAAE,QAAiB,EAAU,EAAE;IAC7E,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAA;IACb,CAAC;IACD,MAAM,cAAc,GAAG,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAE,QAA2B,CAAC,CAAC,CAAC,MAAM,CAAA;IAC3F,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAA;AACnD,CAAC,CAAA"}

package/dist/skill/argus/SKILL.md

@@ -155,6 +155,34 @@ For deeper command lists, use [INSPECT.md](./reference/INSPECT.md). For screensh
 
 ---
 
+## Session Transport (Many Commands, One Process)
+
+Use this when a harness drives a page through many sequential steps. One-shot `argus` pays Node
+startup plus watcher discovery (~100-200ms) per command; `argus session` pays it once and then
+serves JSONL requests on stdin.
+
+```bash
+argus session app
+```
+
+```json
+{"id": 1, "cmd": "eval", "args": {"expression": "location.href"}}
+{"id": 2, "cmd": "click", "args": {"selector": "button.start"}}
+{"id": 3, "cmd": "quit"}
+```
+
+Responses are one JSON line each, correlated by `id`, carrying the same payload the matching
+`--json` command prints: `{"id": 1, "ok": true, "result": {…}, "durationMs": 8}`. Failures answer
+`ok: false` and the session stays alive. stdout is JSONL only; human output goes to stderr.
+
+Daemons (`start`, `chrome start`, `watcher start`), stream tails (`logs tail`, `net tail`,
+`net sse`), and anything reading `--stdin` are refused — run those as their own process.
+
+Read [SESSION.md](./reference/SESSION.md) for the full request/response schema, timeout and
+watcher-loss semantics, and a host sketch.
+
+---
+
 ## CDP Quick Start
 
 Use CDP for local apps and clean repros where a temp/debuggable browser is acceptable.
@@ -226,3 +254,4 @@ Never treat whole-export row indexes as physical sheet rows: `exportRow` is only
 - [INJECT.md](./reference/INJECT.md) — Script injection on watcher attach/navigation.
 - [DIALOG.md](./reference/DIALOG.md) — Browser dialog status and handling.
 - [PLUGINS.md](./reference/PLUGINS.md) — CLI plugin loading and Google Sheets plugin.
+- [SESSION.md](./reference/SESSION.md) — Long-lived JSONL session transport for automation harnesses.

package/dist/skill/argus/reference/SESSION.md

@@ -0,0 +1,153 @@
+# Session Transport
+
+`argus session` serves many commands from one process over stdin/stdout. Use it when a harness
+issues dozens of sequential commands against the same watcher: each one-shot `argus` invocation
+pays Node startup plus watcher discovery (~100-200ms), and the session pays it once.
+
+```bash
+argus session app
+argus session app --request-timeout 30s
+argus session app --reconnect
+```
+
+The watcher id is resolved once and pinned. Every request runs the same Commander action the
+one-shot CLI would run, with `--json` forced on, so payloads match `argus <cmd> --json` byte for
+byte and a host can switch transports without changing how it parses results.
+
+---
+
+## Framing
+
+stdin takes one JSON object per line; stdout answers with one JSON object per line and nothing
+else. Human output goes to stderr.
+
+The first line is written before any request is read:
+
+```json
+{ "type": "ready", "protocolVersion": 1, "argusVersion": "0.4.0", "watcher": { "id": "app", "host": "127.0.0.1", "port": 51733 } }
+```
+
+### Request
+
+| Field     | Type             | Notes                                                              |
+| --------- | ---------------- | ------------------------------------------------------------------ |
+| `id`      | string \| number | Optional; echoed on the response. Omit only if you match by order. |
+| `cmd`     | string           | Command path, space-separated. Aliases work (`js`, `ext`, `wait`). |
+| `args`    | object           | Named arguments. Mutually exclusive with `argv`.                   |
+| `argv`    | string[]         | Raw CLI tokens. Mutually exclusive with `args`.                    |
+| `timeout` | string \| number | Per-request watchdog (`"30s"`, or milliseconds). `0` disables.     |
+
+```json
+{"id": 1, "cmd": "eval", "args": {"expression": "location.href"}}
+{"id": 2, "cmd": "eval-until", "args": {"expression": "window.APP_READY", "totalTimeout": "30s"}}
+{"id": 3, "cmd": "click", "args": {"selector": "button.submit"}}
+{"id": 4, "cmd": "drag", "argv": ["--selector", "canvas", "--pos", "320,240", "--by", "80,-30"]}
+{"id": 5, "cmd": "screenshot", "args": {"out": "./shot.png"}}
+{"id": 6, "cmd": "dom tree", "args": {"selector": "body", "depth": 2}}
+```
+
+`args` keys are resolved against the command's own definition, so anything the CLI accepts is
+reachable:
+
+- **Options** match by camelCase name, long flag, or short flag: `totalTimeout`, `total-timeout`,
+  and `q` all work.
+- **Positional arguments** match by their declared name (`key`/`value` for `storage local set`,
+  `role` for `locate role`) and are filled in declaration order. The leading watcher id is
+  injected for you.
+- **An option wins over a positional of the same name.** `{"expression": "…"}` on `eval` becomes
+  `--expression`, the spelling the CLI already documents as equivalent to the positional.
+- **Repeatable options** take an array: `{"arg": ["level=10", "mode=fast"]}`.
+- **Switches** take a boolean: `{"all": true}`, `{"await": false}` (which sends `--no-await`).
+
+### Response
+
+```json
+{"id": 1, "ok": true, "result": {"ok": true, "result": "https://app.example/", "type": "string", "exception": null}, "durationMs": 8}
+{"id": 2, "ok": false, "error": {"message": "Total timeout exceeded (30s)", "code": "session_command_failed"}, "exitCode": 1, "durationMs": 30014}
+```
+
+- `result` is the command's `--json` document. A command that streams newline-delimited JSON
+  (`eval --interval`) yields an array plus `"stream": true`; output that is not JSON at all comes
+  back verbatim as a string plus `"raw": true`.
+- `stderr` is present when the command wrote any, on success or failure. It is also mirrored to
+  the session's own stderr, so a human tailing the process still sees it live.
+- `durationMs` is the wall-clock time the CLI spent on the request.
+
+### Control requests
+
+| `cmd`  | Effect                                                       |
+| ------ | ------------------------------------------------------------ |
+| `ping` | Answers `{"pong": true, "watcher": "<id>"}` without any I/O. |
+| `quit` | Answers, then closes the session with exit code 0.           |
+
+---
+
+## Semantics
+
+**Ordering.** Requests are served strictly in submission order. Pipelining still pays off — the
+host can keep writing while a command is in flight — but responses arrive in the order the
+requests did.
+
+**Timeouts.** A request that outlives its watchdog is answered with `session_request_timeout` and
+the session moves on. The abandoned command keeps its own output buffer, so nothing it writes
+later can land in a later response.
+
+**Error isolation.** A malformed line, an unknown command, or a failing command answers
+`ok: false` and the session stays up. The `error.code` values specific to this transport are
+`session_invalid_request`, `session_unknown_command`, `session_command_rejected`,
+`session_request_timeout`, and `session_command_failed`; a watcher-side failure carries its own
+code through unchanged.
+
+**Watcher loss.** By default the session is fail-fast: after a failed request it probes the
+watcher, and if the watcher is gone it writes a notice to stderr and exits `1`. Pass `--reconnect`
+to keep it alive instead — every request re-resolves the id through the registry, so a watcher
+restarted under the same id (even on a new port) is picked up on the next request.
+
+**Shutdown.** `{"cmd": "quit"}` or EOF on stdin exits `0`. Requests still queued on stdin when the
+session exits — after a `quit`, or after watcher loss — are not answered; fail them on the host
+side when the process exits.
+
+---
+
+## Not available in a session
+
+Commands that never return on their own, or that would read the stream the transport owns, are
+refused with `session_command_rejected`:
+
+- `start`, `chrome start`, `watcher start`, `watcher native-host` — daemons; run them as their own
+  process and point the session at the resulting watcher.
+- `logs tail`, `net tail`, `net sse` — stream until interrupted.
+- `session` — no nesting.
+- Any request carrying `--stdin` or a `-` expression. Use `--file` or an inline expression.
+
+---
+
+## Host sketch
+
+```js
+import { spawn } from 'node:child_process'
+import readline from 'node:readline'
+
+const proc = spawn('argus', ['session', 'app'], { stdio: ['pipe', 'pipe', 'inherit'] })
+const lines = readline.createInterface({ input: proc.stdout })
+const pending = new Map()
+let nextId = 0
+
+lines.on('line', (line) => {
+	const message = JSON.parse(line)
+	if (message.type === 'ready') return
+	pending.get(message.id)?.(message)
+	pending.delete(message.id)
+})
+
+const run = (cmd, args) =>
+	new Promise((resolve) => {
+		const id = ++nextId
+		pending.set(id, resolve)
+		proc.stdin.write(`${JSON.stringify({ id, cmd, args })}\n`)
+	})
+
+await run('eval-until', { expression: 'window.APP_READY', totalTimeout: '30s' })
+await run('click', { selector: 'button.start' })
+proc.stdin.end()
+```

package/dist/watchers/queryParams.d.ts

@@ -1,3 +1,6 @@
+import type { MatchCase, NetQuery } from '@vforsh/argus-core';
+import { normalizeMatchPatterns } from '@vforsh/argus-core';
+export { normalizeMatchPatterns };
 type MatchCaseOptions = {
     ignoreCase?: boolean;
     caseSensitive?: boolean;
@@ -23,7 +26,8 @@ export declare const appendLogFilterParams: (params: URLSearchParams, options: {
 }) => {
     error?: string;
 };
-export declare const appendNetFilterParams: (params: URLSearchParams, options: {
+/** CLI-facing shape of the network filter flags, before validation. */
+export type NetFilterCliOptions = {
     grep?: string;
     host?: string[];
     method?: string[];
@@ -32,21 +36,19 @@ export declare const appendNetFilterParams: (params: URLSearchParams, options: {
     mime?: string[];
     scope?: string;
     frame?: string;
-    party?: "first" | "third";
+    party?: NetQuery['party'];
     failedOnly?: boolean;
     minDurationMs?: number;
     minTransferBytes?: number;
-}) => void;
+};
+export declare const appendNetFilterParams: (params: URLSearchParams, options: NetFilterCliOptions) => {
+    error?: string;
+};
 export declare const appendNetIgnoreParams: (params: URLSearchParams, options: {
     ignoreHost?: string[];
     ignorePattern?: string[];
 }) => {
     error?: string;
 };
-export declare const normalizeMatchPatterns: (match?: string[]) => {
-    patterns: string[];
-    error?: string;
-};
-export declare const resolveMatchCase: (options: MatchCaseOptions) => "sensitive" | "insensitive" | undefined;
-export {};
+export declare const resolveMatchCase: (options: MatchCaseOptions) => MatchCase | undefined;
 //# sourceMappingURL=queryParams.d.ts.map

package/dist/watchers/queryParams.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryParams.d.ts","sourceRoot":"","sources":["../../src/watchers/queryParams.ts"],"names":[],"mappings":"AAGA,KAAK,gBAAgB,GAAG;IACvB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,QAAQ,eAAe,EAAE,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,KAAG,IAalI,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,QAAQ,eAAe,EAAE,QAAQ,MAAM,KAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAW1F,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,QAAQ,MAAM,KAAG;IAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAW9F,CAAA;AAED,eAAO,MAAM,qBAAqB,GACjC,QAAQ,eAAe,EACvB,SAAS;IACR,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,OAAO,CAAA;CACvB,KACC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAwBlB,CAAA;AAED,eAAO,MAAM,qBAAqB,GACjC,QAAQ,eAAe,EACvB,SAAS;IACR,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,OAAO,GAAG,OAAO,CAAA;IACzB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAA;CACzB,KACC,IAqCF,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,QAAQ,eAAe,EAAE,SAAS;IAAE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,KAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAkB7I,CAAA;AAED,eAAO,MAAM,sBAAsB,GAAI,QAAQ,MAAM,EAAE,KAAG;IAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAW7F,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,SAAS,gBAAgB,KAAG,WAAW,GAAG,aAAa,GAAG,SAQ1F,CAAA"}
+{"version":3,"file":"queryParams.d.ts","sourceRoot":"","sources":["../../src/watchers/queryParams.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAa,SAAS,EAAE,QAAQ,EAAwB,MAAM,oBAAoB,CAAA;AAC9F,OAAO,EAAc,sBAAsB,EAAwD,MAAM,oBAAoB,CAAA;AAG7H,OAAO,EAAE,sBAAsB,EAAE,CAAA;AAEjC,KAAK,gBAAgB,GAAG;IACvB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,OAAO,CAAA;CACvB,CAAA;AAkBD,eAAO,MAAM,sBAAsB,GAAI,QAAQ,eAAe,EAAE,SAAS;IAAE,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,KAAG,IAMlI,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,QAAQ,eAAe,EAAE,QAAQ,MAAM,KAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAQ1F,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,QAAQ,MAAM,KAAG;IAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAW9F,CAAA;AAED,eAAO,MAAM,qBAAqB,GACjC,QAAQ,eAAe,EACvB,SAAS;IACR,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,EAAE,CAAA;IAChB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,OAAO,CAAA;CACvB,KACC;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAclB,CAAA;AAED,uEAAuE;AACvE,MAAM,MAAM,mBAAmB,GAAG;IACjC,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAA;IACjB,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAA;IACzB,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,QAAQ,eAAe,EAAE,SAAS,mBAAmB,KAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAsB7G,CAAA;AAED,eAAO,MAAM,qBAAqB,GAAI,QAAQ,eAAe,EAAE,SAAS;IAAE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,KAAG;IAAE,KAAK,CAAC,EAAE,MAAM,CAAA;CAa7I,CAAA;AAED,eAAO,MAAM,gBAAgB,GAAI,SAAS,gBAAgB,KAAG,SAAS,GAAG,SAQxE,CAAA"}

package/dist/watchers/queryParams.js

@@ -1,26 +1,34 @@
-import { normalizeQueryValue, parseNumber } from '../cli/parse.js';
-import { parseDurationMs } from '../time.js';
-export const appendAfterLimitParams = (params, options) => {
-    if (options.after?.trim()) {
-        params.set('after', options.after.trim());
-    }
-    if (options.sinceEpoch?.trim()) {
-        params.set('sinceEpoch', options.sinceEpoch.trim());
-    }
-    const limit = parseNumber(options.limit);
-    if (limit != null) {
-        params.set('limit', String(limit));
+import { NET_SCOPES, normalizeMatchPatterns, normalizeQueryValue, parseDurationMs, toSearchParams } from '@vforsh/argus-core';
+import { parseNumber } from '../cli/parse.js';
+export { normalizeMatchPatterns };
+/**
+ * Serialize a typed query fragment into an existing `URLSearchParams`.
+ *
+ * Callers layer route-specific params (`timeoutMs`, `part`, …) around these fragments, so each
+ * key is replaced rather than appended to — repeated values within one fragment still stack.
+ */
+const applyQuery = (params, query) => {
+    const serialized = toSearchParams(query);
+    for (const key of new Set(serialized.keys())) {
+        params.delete(key);
+        for (const value of serialized.getAll(key)) {
+            params.append(key, value);
+        }
     }
 };
+export const appendAfterLimitParams = (params, options) => {
+    applyQuery(params, {
+        after: options.after,
+        sinceEpoch: options.sinceEpoch,
+        limit: parseNumber(options.limit),
+    });
+};
 export const appendSinceParam = (params, since) => {
     const resolved = resolveSinceTimestamp(since);
     if (resolved.error) {
         return resolved;
     }
-    if (resolved.sinceTs == null) {
-        return {};
-    }
-    params.set('sinceTs', String(resolved.sinceTs));
+    applyQuery(params, { sinceTs: resolved.sinceTs ?? undefined });
     return {};
 };
 export const resolveSinceTimestamp = (since) => {
@@ -34,84 +42,51 @@ export const resolveSinceTimestamp = (since) => {
     return { sinceTs: Date.now() - duration };
 };
 export const appendLogFilterParams = (params, options) => {
-    if (options.levels) {
-        params.set('levels', options.levels);
-    }
     const normalizedMatch = normalizeMatchPatterns(options.match);
     if (normalizedMatch.error) {
-        return normalizedMatch;
-    }
-    for (const pattern of normalizedMatch.patterns) {
-        params.append('match', pattern);
-    }
-    const matchCase = resolveMatchCase(options);
-    if (matchCase) {
-        params.set('matchCase', matchCase);
-    }
-    const source = normalizeQueryValue(options.source);
-    if (source) {
-        params.set('source', source);
-    }
+        return { error: 'Invalid --match value: empty pattern.' };
+    }
+    applyQuery(params, {
+        levels: options.levels,
+        match: normalizedMatch.patterns,
+        matchCase: resolveMatchCase(options),
+        source: options.source,
+    });
     return {};
 };
 export const appendNetFilterParams = (params, options) => {
-    const grep = normalizeQueryValue(options.grep);
-    if (grep) {
-        params.set('grep', grep);
-    }
-    appendRepeatedParams(params, 'host', options.host);
-    appendRepeatedParams(params, 'method', options.method);
-    appendRepeatedParams(params, 'status', options.status);
-    appendRepeatedParams(params, 'resourceType', options.resourceType);
-    appendRepeatedParams(params, 'mime', options.mime);
-    const scope = normalizeQueryValue(options.scope);
-    if (scope) {
-        params.set('scope', scope);
-    }
-    const frame = normalizeQueryValue(options.frame);
-    if (frame) {
-        params.set('frame', frame);
-    }
-    if (options.party) {
-        params.set('party', options.party);
-    }
-    if (options.failedOnly) {
-        params.set('failedOnly', '1');
-    }
-    if (options.minDurationMs != null) {
-        params.set('minDurationMs', String(options.minDurationMs));
-    }
-    if (options.minTransferBytes != null) {
-        params.set('minTransferBytes', String(options.minTransferBytes));
-    }
+    const scope = resolveNetScope(options.scope);
+    if (scope.error) {
+        return scope;
+    }
+    applyQuery(params, {
+        grep: options.grep,
+        host: options.host,
+        method: options.method,
+        status: options.status,
+        resourceType: options.resourceType,
+        mime: options.mime,
+        scope: scope.value,
+        frame: options.frame,
+        party: options.party,
+        failedOnly: options.failedOnly,
+        minDurationMs: options.minDurationMs,
+        minTransferBytes: options.minTransferBytes,
+    });
+    return {};
 };
 export const appendNetIgnoreParams = (params, options) => {
     const hosts = normalizeRepeatedValues(options.ignoreHost);
     if (hosts.error) {
         return hosts;
     }
-    for (const value of hosts.values) {
-        params.append('ignoreHost', value);
-    }
     const patterns = normalizeRepeatedValues(options.ignorePattern);
     if (patterns.error) {
         return patterns;
     }
-    for (const value of patterns.values) {
-        params.append('ignorePattern', value);
-    }
+    applyQuery(params, { ignoreHost: hosts.values, ignorePattern: patterns.values });
     return {};
 };
-export const normalizeMatchPatterns = (match) => {
-    if (!match || match.length === 0) {
-        return { patterns: [] };
-    }
-    const patterns = match.map((value) => value.trim());
-    if (patterns.some((value) => value.length === 0)) {
-        return { patterns: [], error: 'Invalid --match value: empty pattern.' };
-    }
-    return { patterns };
-};
 export const resolveMatchCase = (options) => {
     if (options.caseSensitive) {
         return 'sensitive';
@@ -121,6 +96,17 @@ export const resolveMatchCase = (options) => {
     }
     return undefined;
 };
+/** Reject an unknown `--scope` here rather than round-tripping it to the watcher for a 400. */
+const resolveNetScope = (value) => {
+    const normalized = normalizeQueryValue(value);
+    if (!normalized) {
+        return {};
+    }
+    if (!NET_SCOPES.includes(normalized)) {
+        return { error: `Invalid --scope value: ${value}. Expected one of: ${NET_SCOPES.join(', ')}.` };
+    }
+    return { value: normalized };
+};
 const normalizeRepeatedValues = (values) => {
     if (!values || values.length === 0) {
         return { values: [] };
@@ -131,13 +117,4 @@ const normalizeRepeatedValues = (values) => {
     }
     return { values: normalized };
 };
-const appendRepeatedParams = (params, key, values) => {
-    const normalized = normalizeRepeatedValues(values);
-    if (normalized.error) {
-        return;
-    }
-    for (const value of normalized.values) {
-        params.append(key, value);
-    }
-};
 //# sourceMappingURL=queryParams.js.map

package/dist/watchers/queryParams.js.map

@@ -1 +1 @@
-{"version":3,"file":"queryParams.js","sourceRoot":"","sources":["../../src/watchers/queryParams.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"queryParams.js","sourceRoot":"","sources":["../../src/watchers/queryParams.ts"],"names":[],"mappings":"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"}

package/dist/watchers/requestWatcher.d.ts

@@ -1,33 +1,15 @@
+import type { ArgusWatcherRequestError, ArgusWatcherRequestInput, ArgusWatcherRequestResult, ArgusWatcherRequestSuccess } from '@vforsh/argus-plugin-api';
 import type { ErrorResponse, WatcherRecord } from '@vforsh/argus-core';
+import { buildWatcherUrl, formatWatcherTransportError } from '@vforsh/argus-core';
 import type { Output } from '../output/io.js';
-import type { HttpOptions } from '../httpClient.js';
 /** Input for a one-shot watcher request. */
-export type WatcherRequestInput = {
-    id?: string;
-    path: string;
-    query?: URLSearchParams;
-    method?: HttpOptions['method'];
-    body?: unknown;
-    timeoutMs?: number;
-    returnErrorResponse?: boolean;
-};
+export type WatcherRequestInput = ArgusWatcherRequestInput;
 /** Successful watcher request. */
-export type WatcherRequestSuccess<T> = {
-    ok: true;
-    watcher: WatcherRecord;
-    data: T;
-};
+export type WatcherRequestSuccess<T> = ArgusWatcherRequestSuccess<T>;
 /** Failed watcher request (resolve failure or transport error). */
-export type WatcherRequestError = {
-    ok: false;
-    watcher?: WatcherRecord;
-    exitCode: number;
-    message: string;
-    candidates?: WatcherRecord[];
-};
-export type WatcherRequestResult<T> = WatcherRequestSuccess<T> | WatcherRequestError;
-export declare const buildWatcherUrl: (watcher: Pick<WatcherRecord, "host" | "port">, path: string, query?: URLSearchParams) => string;
-export declare const formatWatcherTransportError: (watcher: Pick<WatcherRecord, "id">, error: unknown) => string;
+export type WatcherRequestError = ArgusWatcherRequestError;
+export type WatcherRequestResult<T> = ArgusWatcherRequestResult<T>;
+export { buildWatcherUrl, formatWatcherTransportError };
 export declare function fetchWatcherJson<T>(watcher: Pick<WatcherRecord, 'host' | 'port'>, input: Omit<WatcherRequestInput, 'id'>): Promise<T>;
 /**
  * Resolve a watcher, build a URL, and fetch JSON in one call.

package/dist/watchers/requestWatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"requestWatcher.d.ts","sourceRoot":"","sources":["../../src/watchers/requestWatcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACtE,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAUnD,4CAA4C;AAC5C,MAAM,MAAM,mBAAmB,GAAG;IACjC,EAAE,CAAC,EAAE,MAAM,CAAA;IACX,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,CAAC,EAAE,eAAe,CAAA;IACvB,MAAM,CAAC,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAA;IAC9B,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC7B,CAAA;AAED,kCAAkC;AAClC,MAAM,MAAM,qBAAqB,CAAC,CAAC,IAAI;IACtC,EAAE,EAAE,IAAI,CAAA;IACR,OAAO,EAAE,aAAa,CAAA;IACtB,IAAI,EAAE,CAAC,CAAA;CACP,CAAA;AAED,mEAAmE;AACnE,MAAM,MAAM,mBAAmB,GAAG;IACjC,EAAE,EAAE,KAAK,CAAA;IACT,OAAO,CAAC,EAAE,aAAa,CAAA;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,aAAa,EAAE,CAAA;CAC5B,CAAA;AAED,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI,qBAAqB,CAAC,CAAC,CAAC,GAAG,mBAAmB,CAAA;AAEpF,eAAO,MAAM,eAAe,GAAI,SAAS,IAAI,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,MAAM,MAAM,EAAE,QAAQ,eAAe,KAAG,MAGtH,CAAA;AAED,eAAO,MAAM,2BAA2B,GAAI,SAAS,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,OAAO,OAAO,KAAG,MAChC,CAAA;AAEjE,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAO3I;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CAwBxG;AAMD,+GAA+G;AAC/G,wBAAsB,oBAAoB,CAAC,KAAK,EAAE;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,aAAa,CAAA;CAAE,GAAG,IAAI,CAAC,CAO7H;AAMD,mGAAmG;AACnG,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CASnF;AAED,4EAA4E;AAC5E,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAOhF;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,EAChE,KAAK,EAAE,mBAAmB,EAC1B,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC;IAAE,OAAO,EAAE,aAAa,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,GAAG,IAAI,CAAC,CAoBrD"}
+{"version":3,"file":"requestWatcher.d.ts","sourceRoot":"","sources":["../../src/watchers/requestWatcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,wBAAwB,EACxB,wBAAwB,EACxB,yBAAyB,EACzB,0BAA0B,EAC1B,MAAM,0BAA0B,CAAA;AACjC,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAa,MAAM,oBAAoB,CAAA;AACjF,OAAO,EACN,eAAe,EAEf,2BAA2B,EAG3B,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAa7C,4CAA4C;AAC5C,MAAM,MAAM,mBAAmB,GAAG,wBAAwB,CAAA;AAE1D,kCAAkC;AAClC,MAAM,MAAM,qBAAqB,CAAC,CAAC,IAAI,0BAA0B,CAAC,CAAC,CAAC,CAAA;AAEpE,mEAAmE;AACnE,MAAM,MAAM,mBAAmB,GAAG,wBAAwB,CAAA;AAE1D,MAAM,MAAM,oBAAoB,CAAC,CAAC,IAAI,yBAAyB,CAAC,CAAC,CAAC,CAAA;AAIlE,OAAO,EAAE,eAAe,EAAE,2BAA2B,EAAE,CAAA;AAEvD,wBAAsB,gBAAgB,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,aAAa,EAAE,MAAM,GAAG,MAAM,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAO3I;AAED;;;GAGG;AACH,wBAAsB,kBAAkB,CAAC,CAAC,EAAE,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC,CA8BxG;AAMD,+GAA+G;AAC/G,wBAAsB,oBAAoB,CAAC,KAAK,EAAE;IAAE,EAAE,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;IAAE,OAAO,EAAE,aAAa,CAAA;CAAE,GAAG,IAAI,CAAC,CAO7H;AAMD,mGAAmG;AACnG,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,mBAAmB,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CASnF;AAED,4EAA4E;AAC5E,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAOhF;AAED;;;GAGG;AACH,wBAAsB,oBAAoB,CAAC,CAAC,SAAS;IAAE,EAAE,EAAE,IAAI,CAAA;CAAE,EAChE,KAAK,EAAE,mBAAmB,EAC1B,MAAM,EAAE,MAAM,GACZ,OAAO,CAAC;IAAE,OAAO,EAAE,aAAa,CAAC;IAAC,IAAI,EAAE,CAAC,CAAA;CAAE,GAAG,IAAI,CAAC,CAoBrD"}