From 6caad0757ad8407b2005fabe317aa0b159dabb7c Mon Sep 17 00:00:00 2001
From: gavrielc <gabicohen22@yahoo.com>
Date: Fri, 8 May 2026 21:02:23 +0300
Subject: [PATCH] fix(cli): add list filtering/pagination, fix double-close in
 container ncl

- genericList now accepts column filters (--flag value) and LIMIT (default 200)
- Remove early inDb.close() in container pollResponse to avoid double-close
- Document filtering and --limit in cli.instructions.md

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 container/agent-runner/src/cli/ncl.ts         |  4 +---
 .../src/mcp-tools/cli.instructions.md         |  1 +
 src/cli/crud.ts                               | 19 ++++++++++++++++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/container/agent-runner/src/cli/ncl.ts b/container/agent-runner/src/cli/ncl.ts
index 83bd666dc..d86c601b7 100644
--- a/container/agent-runner/src/cli/ncl.ts
+++ b/container/agent-runner/src/cli/ncl.ts
@@ -102,8 +102,6 @@ function pollResponse(requestId: string, timeoutMs: number): ResponseFrame | nul
         .get(`%"requestId":"${requestId}"%`) as { id: string; content: string } | null;
 
       if (row) {
-        inDb.close();
-
         // Mark as completed via processing_ack so agent-runner skips it
         const outDb = new Database(OUTBOUND_DB);
         outDb.exec('PRAGMA journal_mode = DELETE');
@@ -119,7 +117,7 @@ function pollResponse(requestId: string, timeoutMs: number): ResponseFrame | nul
         return parsed.frame as ResponseFrame;
       }
     } finally {
-      try { inDb.close(); } catch {}
+      inDb.close();
     }
 
     Bun.sleepSync(500);
diff --git a/container/agent-runner/src/mcp-tools/cli.instructions.md b/container/agent-runner/src/mcp-tools/cli.instructions.md
index f9965f5ba..9dee60fdd 100644
--- a/container/agent-runner/src/mcp-tools/cli.instructions.md
+++ b/container/agent-runner/src/mcp-tools/cli.instructions.md
@@ -73,5 +73,6 @@ ncl destinations add --agent-group-id abc123 --messaging-group-id mg_xyz
 
 - Use `ncl <resource> help` to see all available fields, types, enums, and which fields are required or updatable.
 - Flags use `--hyphen-case` (e.g. `--agent-group-id`), mapped to `underscore_case` DB columns automatically.
+- `list` supports filtering by any non-auto column (e.g. `ncl wirings list --messaging-group-id mg_xyz`). Default limit is 200 rows; override with `--limit N`.
 - For composite-key resources (roles, members, destinations), use the custom verbs (grant/revoke, add/remove) instead of create/delete.
 - Write commands return `approval-pending` immediately — don't treat this as an error. Wait for the system message with the result.
diff --git a/src/cli/crud.ts b/src/cli/crud.ts
index 98c9989f9..7721f67be 100644
--- a/src/cli/crud.ts
+++ b/src/cli/crud.ts
@@ -89,8 +89,21 @@ function visibleColumns(def: ResourceDef): string[] {
 
 function genericList(def: ResourceDef) {
   const cols = visibleColumns(def).join(', ');
-  return async () => {
-    return getDb().prepare(`SELECT ${cols} FROM ${def.table}`).all();
+  const filterableNames = new Set(def.columns.filter((c) => !c.generated).map((c) => c.name));
+  return async (args: Record<string, unknown>) => {
+    const limit = args.limit !== undefined ? Math.max(1, Number(args.limit)) : 200;
+    const filters: string[] = [];
+    const params: unknown[] = [];
+    for (const [k, v] of Object.entries(args)) {
+      if (k === 'id' || k === 'limit') continue;
+      if (filterableNames.has(k)) {
+        filters.push(`${k} = ?`);
+        params.push(v);
+      }
+    }
+    const where = filters.length > 0 ? ` WHERE ${filters.join(' AND ')}` : '';
+    params.push(limit);
+    return getDb().prepare(`SELECT ${cols} FROM ${def.table}${where} LIMIT ?`).all(...params);
   };
 }
 
@@ -211,7 +224,7 @@ export function registerResource(def: ResourceDef): void {
       description: `List all ${def.plural}.`,
       access: def.operations.list,
       resource: def.plural,
-      parseArgs: () => ({}),
+      parseArgs: (raw) => normalizeArgs(raw),
       handler: genericList(def),
     });
   }