@staff0rd/assist 0.165.1 → 0.166.1

package/dist/index.js

@@ -6,7 +6,7 @@ import { Command } from "commander";
 // package.json
 var package_default = {
   name: "@staff0rd/assist",
-  version: "0.165.1",
+  version: "0.166.1",
   type: "module",
   main: "dist/index.js",
   bin: {
@@ -3788,6 +3788,7 @@ var allowCache;
 var denyCache;
 var TOOL_RE = /^(Bash|PowerShell)\((.+?)(:.*)?\)$/;
 var SHELL_TOOLS = ["Bash", "PowerShell"];
+var DOTSLASH_RE = /^\.[\\/]/;
 function loadPerms(key) {
   return parsePerms(readSettingsPerms(key));
 }
@@ -3797,9 +3798,13 @@ function shellEntries(map, toolName) {
   }
   return map.get(toolName) ?? [];
 }
+function normCmd(cmd) {
+  return cmd.replace(DOTSLASH_RE, "");
+}
 function findMatch(entries, command) {
+  const norm = normCmd(command);
   return entries.find(
-    (e) => e.wildcard ? command === e.command || command.startsWith(`${e.command} `) : command === e.command
+    (e) => e.wildcard ? norm === e.command || norm.startsWith(`${e.command} `) : norm === e.command
   )?.command;
 }
 function matchesAllow(toolName, command) {
@@ -3816,7 +3821,7 @@ function parsePerms(entries) {
     const m = entry.match(TOOL_RE);
     if (m) {
       const tool = m[1];
-      const command = m[2];
+      const command = normCmd(m[2]);
       const wildcard = m[3] !== void 0;
       const list4 = map.get(tool) ?? [];
       list4.push({ command, wildcard });
@@ -9092,10 +9097,10 @@ var seqAuth = createConnectionAuth({
 // src/commands/seq/seqQuery.ts
 import chalk111 from "chalk";
 
-// src/commands/seq/fetchSeqEvents.ts
+// src/commands/seq/fetchSeq.ts
 import chalk108 from "chalk";
-async function fetchSeqEvents(conn, params) {
-  const url = `${conn.url}/api/events?${params}`;
+async function fetchSeq(conn, path50, params) {
+  const url = `${conn.url}${path50}?${params}`;
   const response = await fetch(url, {
     headers: {
       Accept: "application/json",
@@ -9107,6 +9112,52 @@ async function fetchSeqEvents(conn, params) {
     console.error(chalk108.red(`Seq returned ${response.status}: ${body}`));
     process.exit(1);
   }
+  return response;
+}
+
+// src/commands/seq/filterToSql.ts
+function filterToSql(filter) {
+  return filter.replace(/==/g, "=").replace(/"([^"]*)"/g, "'$1'");
+}
+
+// src/commands/seq/fetchSeqData.ts
+async function fetchSeqData(conn, filter, count, from) {
+  const sqlFilter = filterToSql(filter);
+  const sql = `select @Timestamp, @Level, @Exception, @Message from stream where ${sqlFilter} order by @Timestamp desc limit ${count}`;
+  const params = new URLSearchParams({ q: sql, fromDateUtc: from });
+  const response = await fetchSeq(conn, "/api/data", params);
+  const data = await response.json();
+  return mapDataToEvents(data);
+}
+function ticksToIso(value) {
+  if (typeof value === "string") return value;
+  const ticks = Number(value);
+  const epochTicks = 621355968e9;
+  return new Date((ticks - epochTicks) / 1e4).toISOString();
+}
+function mapDataToEvents(data) {
+  const colIndex = new Map(data.Columns.map((c, i) => [c, i]));
+  function col(name) {
+    const idx = colIndex.get(name) ?? colIndex.get(`@${name}`);
+    if (idx === void 0) throw new Error(`Missing column: ${name}`);
+    return idx;
+  }
+  const tsIdx = col("Timestamp");
+  const levelIdx = col("Level");
+  const exIdx = col("Exception");
+  const msgIdx = col("Message");
+  return data.Rows.map((row) => ({
+    Timestamp: ticksToIso(row[tsIdx]),
+    Level: String(row[levelIdx] ?? ""),
+    Exception: row[exIdx] != null ? String(row[exIdx]) : void 0,
+    Properties: [],
+    MessageTemplateTokens: [{ Text: String(row[msgIdx] ?? "") }]
+  }));
+}
+
+// src/commands/seq/fetchSeqEvents.ts
+async function fetchSeqEvents(conn, params) {
+  const response = await fetchSeq(conn, "/api/events", params);
   return response.json();
 }
 
@@ -9202,11 +9253,10 @@ function resolveConnection2(name) {
 async function seqQuery(filter, options2) {
   const conn = resolveConnection2(options2.connection);
   const count = Number.parseInt(options2.count ?? "1000", 10);
-  const params = new URLSearchParams({ filter, count: String(count) });
-  if (options2.from) {
-    params.set("fromDateUtc", options2.from);
-  }
-  const events = await fetchSeqEvents(conn, params);
+  const events = options2.from ? await fetchSeqData(conn, filter, count, options2.from) : await fetchSeqEvents(
+    conn,
+    new URLSearchParams({ filter, count: String(count) })
+  );
   if (events.length === 0) {
     console.log(chalk111.yellow("No events found."));
     return;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@staff0rd/assist",
-	"version": "0.165.1",
+	"version": "0.166.1",
 	"type": "module",
 	"main": "dist/index.js",
 	"bin": {