@vite-plugin-opencode-assistant/opencode 1.0.58 → 1.0.59

package/es/plugins/service-logs.js

@@ -1,75 +1,122 @@
-import { t as h } from "./tool.js";
-import { c as v } from "./logger.js";
-const o = {};
-var y = Object.defineProperty, E = (s, e, t) => e in s ? y(s, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : s[e] = t, n = (s, e, t) => E(s, typeof e != "symbol" ? e + "" : e, t);
-const a = v("FileLogWatcher");
-class F {
-  constructor(e) {
-    n(this, "buffer", []), n(this, "maxSize"), n(this, "name"), n(this, "filePath"), n(this, "lastPosition", 0), n(this, "watcher", null), n(this, "enabled", !1);
-    var t;
-    this.name = e.name, this.filePath = e.filePath, this.maxSize = (t = e.maxBufferSize) != null ? t : 200, this.enabled = !0;
-  }
-  start(e) {
-    const t = this.resolvePath(e);
-    if (!o.existsSync(t)) {
-      a.debug(`Log file does not exist: ${t}`);
+import { tool } from "@opencode-ai/plugin";
+import fs from "fs";
+import path from "path";
+import { c as createLogger } from "./logger.js";
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+const log$1 = createLogger("FileLogWatcher");
+class FileLogBuffer {
+  constructor(options) {
+    __publicField(this, "buffer", []);
+    __publicField(this, "maxSize");
+    __publicField(this, "name");
+    __publicField(this, "filePath");
+    __publicField(this, "lastPosition", 0);
+    __publicField(this, "watcher", null);
+    __publicField(this, "enabled", false);
+    var _a;
+    this.name = options.name;
+    this.filePath = options.filePath;
+    this.maxSize = (_a = options.maxBufferSize) != null ? _a : 200;
+    this.enabled = true;
+  }
+  start(projectRoot) {
+    const resolvedPath = this.resolvePath(projectRoot);
+    if (!fs.existsSync(resolvedPath)) {
+      log$1.debug(`Log file does not exist: ${resolvedPath}`);
       return;
     }
-    const i = o.statSync(t);
-    this.lastPosition = i.size, this.watcher = o.watch(t, (r) => {
-      r === "change" && this.readNewLogs(t);
-    }), this.watcher.on("error", (r) => {
-      a.error(`Error watching file ${t}`, { error: r });
-    }), a.info(`Started watching log file: ${t}`);
+    const stat = fs.statSync(resolvedPath);
+    this.lastPosition = stat.size;
+    this.watcher = fs.watch(resolvedPath, (eventType) => {
+      if (eventType === "change") {
+        this.readNewLogs(resolvedPath);
+      }
+    });
+    this.watcher.on("error", (err) => {
+      log$1.error(`Error watching file ${resolvedPath}`, { error: err });
+    });
+    log$1.info(`Started watching log file: ${resolvedPath}`);
   }
   stop() {
-    this.watcher && (this.watcher.close(), this.watcher = null, a.debug(`Stopped watching log file: ${this.filePath}`));
+    if (this.watcher) {
+      this.watcher.close();
+      this.watcher = null;
+      log$1.debug(`Stopped watching log file: ${this.filePath}`);
+    }
   }
-  resolvePath(e) {
-    return o.isAbsolute(this.filePath) ? this.filePath : e ? o.resolve(e, this.filePath) : o.resolve(process.cwd(), this.filePath);
+  resolvePath(projectRoot) {
+    if (path.isAbsolute(this.filePath)) {
+      return this.filePath;
+    }
+    if (projectRoot) {
+      return path.resolve(projectRoot, this.filePath);
+    }
+    return path.resolve(process.cwd(), this.filePath);
   }
-  readNewLogs(e) {
+  readNewLogs(filePath) {
     try {
-      const t = o.statSync(e);
-      if (t.size <= this.lastPosition)
+      const stat = fs.statSync(filePath);
+      if (stat.size <= this.lastPosition) {
         return;
-      const i = o.openSync(e, "r"), r = Buffer.alloc(t.size - this.lastPosition);
-      o.readSync(i, r, 0, r.length, this.lastPosition), o.closeSync(i), this.lastPosition = t.size;
-      const f = r.toString("utf-8").trim();
-      f && this.processLogContent(f);
-    } catch (t) {
-      a.error(`Error reading log file ${e}`, { error: t });
+      }
+      const fd = fs.openSync(filePath, "r");
+      const buffer = Buffer.alloc(stat.size - this.lastPosition);
+      fs.readSync(fd, buffer, 0, buffer.length, this.lastPosition);
+      fs.closeSync(fd);
+      this.lastPosition = stat.size;
+      const content = buffer.toString("utf-8").trim();
+      if (content) {
+        this.processLogContent(content);
+      }
+    } catch (err) {
+      log$1.error(`Error reading log file ${filePath}`, { error: err });
     }
   }
-  processLogContent(e) {
-    const t = e.split(`
-`);
-    for (const i of t)
-      i.trim() && this.addEntry({
-        level: this.detectLogLevel(i),
-        message: i,
+  processLogContent(content) {
+    const lines = content.split("\n");
+    for (const line of lines) {
+      if (!line.trim()) continue;
+      this.addEntry({
+        level: this.detectLogLevel(line),
+        message: line,
         timestamp: (/* @__PURE__ */ new Date()).toISOString(),
         source: `file:${this.name}`
       });
+    }
   }
-  detectLogLevel(e) {
-    const t = e.toLowerCase();
-    return t.includes("error") || t.includes("err") || t.includes("fatal") ? "error" : t.includes("warn") || t.includes("warning") ? "warn" : "info";
+  detectLogLevel(line) {
+    const lowerLine = line.toLowerCase();
+    if (lowerLine.includes("error") || lowerLine.includes("err") || lowerLine.includes("fatal")) {
+      return "error";
+    }
+    if (lowerLine.includes("warn") || lowerLine.includes("warning")) {
+      return "warn";
+    }
+    return "info";
   }
-  addEntry(e) {
-    this.enabled && (this.buffer.length >= this.maxSize && this.buffer.shift(), this.buffer.push(e));
+  addEntry(entry) {
+    if (!this.enabled) return;
+    if (this.buffer.length >= this.maxSize) {
+      this.buffer.shift();
+    }
+    this.buffer.push(entry);
   }
-  getLogs(e = {}) {
-    let t = [...this.buffer];
-    if (e.level) {
-      const i = Array.isArray(e.level) ? e.level : [e.level];
-      t = t.filter((r) => i.includes(r.level));
+  getLogs(options = {}) {
+    let logs = [...this.buffer];
+    if (options.level) {
+      const levels = Array.isArray(options.level) ? options.level : [options.level];
+      logs = logs.filter((log2) => levels.includes(log2.level));
+    }
+    if (options.since) {
+      const sinceDate = new Date(options.since);
+      logs = logs.filter((log2) => new Date(log2.timestamp) >= sinceDate);
     }
-    if (e.since) {
-      const i = new Date(e.since);
-      t = t.filter((r) => new Date(r.timestamp) >= i);
+    if (options.limit && options.limit > 0) {
+      logs = logs.slice(-options.limit);
     }
-    return e.limit && e.limit > 0 && (t = t.slice(-e.limit)), t;
+    return logs;
   }
   clear() {
     this.buffer = [];
@@ -77,8 +124,8 @@ class F {
   size() {
     return this.buffer.length;
   }
-  setEnabled(e) {
-    this.enabled = e;
+  setEnabled(enabled) {
+    this.enabled = enabled;
   }
   isEnabled() {
     return this.enabled;
@@ -90,123 +137,151 @@ class F {
     return this.filePath;
   }
 }
-class z {
+class ServiceLogWatcher {
   constructor() {
-    n(this, "buffers", /* @__PURE__ */ new Map()), n(this, "projectRoot", null);
+    __publicField(this, "buffers", /* @__PURE__ */ new Map());
+    __publicField(this, "projectRoot", null);
   }
-  setProjectRoot(e) {
-    this.projectRoot = e;
+  setProjectRoot(root) {
+    this.projectRoot = root;
   }
-  addLogFile(e) {
-    var t;
-    if (this.buffers.has(e.name)) {
-      a.warn(`Log file "${e.name}" already exists, skipping`);
+  addLogFile(options) {
+    var _a;
+    if (this.buffers.has(options.name)) {
+      log$1.warn(`Log file "${options.name}" already exists, skipping`);
       return;
     }
-    const i = new F(e);
-    i.start((t = this.projectRoot) != null ? t : void 0), this.buffers.set(e.name, i), a.info(`Added log file watcher: ${e.name} -> ${e.filePath}`);
+    const buffer = new FileLogBuffer(options);
+    buffer.start((_a = this.projectRoot) != null ? _a : void 0);
+    this.buffers.set(options.name, buffer);
+    log$1.info(`Added log file watcher: ${options.name} -> ${options.filePath}`);
   }
-  removeLogFile(e) {
-    const t = this.buffers.get(e);
-    t && (t.stop(), this.buffers.delete(e), a.info(`Removed log file watcher: ${e}`));
+  removeLogFile(name) {
+    const buffer = this.buffers.get(name);
+    if (buffer) {
+      buffer.stop();
+      this.buffers.delete(name);
+      log$1.info(`Removed log file watcher: ${name}`);
+    }
   }
-  getBuffer(e) {
-    return this.buffers.get(e);
+  getBuffer(name) {
+    return this.buffers.get(name);
   }
   getAllBuffers() {
     return this.buffers;
   }
   stopAll() {
-    for (const [e, t] of this.buffers)
-      t.stop(), a.debug(`Stopped log file watcher: ${e}`);
+    for (const [name, buffer] of this.buffers) {
+      buffer.stop();
+      log$1.debug(`Stopped log file watcher: ${name}`);
+    }
     this.buffers.clear();
   }
   getLogFileNames() {
     return Array.from(this.buffers.keys());
   }
 }
-let d = null;
-function N() {
-  return d || (d = new z()), d;
+let globalWatcher = null;
+function getServiceLogWatcher() {
+  if (!globalWatcher) {
+    globalWatcher = new ServiceLogWatcher();
+  }
+  return globalWatcher;
 }
-const l = v("ServiceLogsPlugin"), B = async () => {
-  l.debug("ServiceLogsPlugin loading...");
-  const s = process.env.OPENCODE_LOG_FILES_JSON;
-  if (l.debug("Log files JSON from env:", { logFilesJson: s ? "set" : "not set" }), !s)
-    return l.debug("OPENCODE_LOG_FILES_JSON is not set, service logs plugin will not register tools"), {};
-  let e;
+const log = createLogger("ServiceLogsPlugin");
+const ServiceLogsPlugin = async () => {
+  log.debug("ServiceLogsPlugin loading...");
+  const logFilesJson = process.env.OPENCODE_LOG_FILES_JSON;
+  log.debug("Log files JSON from env:", { logFilesJson: logFilesJson ? "set" : "not set" });
+  if (!logFilesJson) {
+    log.debug("OPENCODE_LOG_FILES_JSON is not set, service logs plugin will not register tools");
+    return {};
+  }
+  let logFiles;
   try {
-    e = JSON.parse(s), l.debug("Parsed log files config", { count: e.length });
-  } catch (r) {
-    return l.error("Failed to parse OPENCODE_LOG_FILES_JSON", { error: r }), {};
-  }
-  if (!e || e.length === 0)
-    return l.debug("No log files configured, plugin will not register any tools"), {};
-  const t = N();
-  t.setProjectRoot(process.cwd());
-  for (const r of e)
-    t.addLogFile({
-      name: r.name,
-      filePath: r.path,
-      maxBufferSize: r.maxBufferSize,
-      watchExisting: r.watchExisting
-    }), l.debug(`Added log file watcher: ${r.name} -> ${r.path}`);
-  const i = {};
-  for (const r of e) {
-    const f = `get_${r.name}_logs`, L = `获取 ${r.name} 的日志。
+    logFiles = JSON.parse(logFilesJson);
+    log.debug("Parsed log files config", { count: logFiles.length });
+  } catch (e) {
+    log.error("Failed to parse OPENCODE_LOG_FILES_JSON", { error: e });
+    return {};
+  }
+  if (!logFiles || logFiles.length === 0) {
+    log.debug("No log files configured, plugin will not register any tools");
+    return {};
+  }
+  const watcher = getServiceLogWatcher();
+  watcher.setProjectRoot(process.cwd());
+  for (const logFileConfig of logFiles) {
+    watcher.addLogFile({
+      name: logFileConfig.name,
+      filePath: logFileConfig.path,
+      maxBufferSize: logFileConfig.maxBufferSize,
+      watchExisting: logFileConfig.watchExisting
+    });
+    log.debug(`Added log file watcher: ${logFileConfig.name} -> ${logFileConfig.path}`);
+  }
+  const tools = {};
+  for (const logFileConfig of logFiles) {
+    const toolName = `get_${logFileConfig.name}_logs`;
+    const description = `获取 ${logFileConfig.name} 的日志。
 
 **何时使用此工具**：
-${r.description}
+${logFileConfig.description}
 
 **日志内容**：
-- 来自日志文件 ${r.path} 的实时日志
-- 最多保留 ${r.maxBufferSize ?? 200} 条日志`, S = h({
-      description: L,
+- 来自日志文件 ${logFileConfig.path} 的实时日志
+- 最多保留 ${logFileConfig.maxBufferSize ?? 200} 条日志`;
+    const getLogsTool = tool({
+      description,
       args: {
-        level: h.schema.string().optional().describe(
+        level: tool.schema.string().optional().describe(
           "日志级别过滤：error(错误)、warn(警告)、info(信息)。多个用逗号分隔，如 'error,warn'"
         ),
-        limit: h.schema.number().int().min(1).max(200).optional().default(50).describe("返回条数，默认 50，最大 200"),
-        since: h.schema.string().optional().describe("起始时间（ISO 格式），获取此时间之后的日志")
+        limit: tool.schema.number().int().min(1).max(200).optional().default(50).describe("返回条数，默认 50，最大 200"),
+        since: tool.schema.string().optional().describe("起始时间（ISO 格式），获取此时间之后的日志")
       },
-      async execute(m, b) {
-        const { level: w, limit: p, since: P } = m;
-        l.debug(`${f} called`, {
-          args: m,
-          sessionID: b.sessionID,
-          directory: b.directory
+      async execute(args, context) {
+        const { level, limit, since } = args;
+        log.debug(`${toolName} called`, {
+          args,
+          sessionID: context.sessionID,
+          directory: context.directory
         });
-        const g = t.getBuffer(r.name);
-        if (!g)
-          return `日志文件 "${r.name}" 未找到。请检查配置。`;
-        const u = g.getLogs({
-          level: w ? w.split(",").map((c) => c.trim()) : void 0,
-          limit: p,
-          since: P
+        const buffer = watcher.getBuffer(logFileConfig.name);
+        if (!buffer) {
+          return `日志文件 "${logFileConfig.name}" 未找到。请检查配置。`;
+        }
+        const logs = buffer.getLogs({
+          level: level ? level.split(",").map((l) => l.trim()) : void 0,
+          limit,
+          since
         });
-        if (u.length === 0)
-          return `当前没有符合条件的日志（缓冲区共 ${g.size()} 条）。
+        if (logs.length === 0) {
+          return `当前没有符合条件的日志（缓冲区共 ${buffer.size()} 条）。
 
 建议：
 - 不指定参数获取所有日志
 - 使用 level=error,warn 获取错误和警告`;
-        const $ = u.map((c) => {
-          const _ = new Date(c.timestamp).toLocaleTimeString(), O = c.level === "error" ? "❌" : c.level === "warn" ? "⚠️" : "ℹ️";
-          return `${_} ${O} ${c.message}`;
-        }).join(`
-`);
-        return `${r.name} 日志（${u.length}/${g.size()} 条）：
+        }
+        const formattedLogs = logs.map((entry) => {
+          const time = new Date(entry.timestamp).toLocaleTimeString();
+          const levelIcon = entry.level === "error" ? "❌" : entry.level === "warn" ? "⚠️" : "ℹ️";
+          return `${time} ${levelIcon} ${entry.message}`;
+        }).join("\n");
+        return `${logFileConfig.name} 日志（${logs.length}/${buffer.size()} 条）：
 
-${$}`;
+${formattedLogs}`;
       }
     });
-    i[f] = S, l.debug(`Registered tool: ${f}`);
+    tools[toolName] = getLogsTool;
+    log.debug(`Registered tool: ${toolName}`);
   }
-  return l.debug(`Plugin initialized with ${Object.keys(i).length} log tools`), {
-    tool: i
+  log.debug(`Plugin initialized with ${Object.keys(tools).length} log tools`);
+  return {
+    tool: tools
   };
 };
 export {
-  B as ServiceLogsPlugin,
-  B as default
+  ServiceLogsPlugin,
+  ServiceLogsPlugin as default
 };

package/es/plugins/vite-logs.js

@@ -1,12 +1,17 @@
-import { t as n } from "./tool.js";
-import { c as p } from "./logger.js";
-const e = p("OpenCodePluginViteLogs"), b = async () => {
-  e.info("ViteLogsPlugin loading...");
-  const l = process.env.OPENCODE_VITE_LOGS_API_URL;
-  return e.debug("Vite Logs API URL:", { logsApiUrl: l }), l ? (e.info("Plugin initialized successfully"), {
-    tool: {
-      get_vite_dev_logs: n({
-        description: `获取 Vite 开发服务器的运行日志。
+import { tool } from "@opencode-ai/plugin";
+import { c as createLogger } from "./logger.js";
+const log = createLogger("OpenCodePluginViteLogs");
+const ViteLogsPlugin = async () => {
+  log.info("ViteLogsPlugin loading...");
+  const logsApiUrl = process.env.OPENCODE_VITE_LOGS_API_URL;
+  log.debug("Vite Logs API URL:", { logsApiUrl });
+  if (!logsApiUrl) {
+    log.warn("OPENCODE_VITE_LOGS_API_URL is not set, vite logs plugin will not work");
+    return {};
+  }
+  log.info("Plugin initialized successfully");
+  const getViteDevLogsTool = tool({
+    description: `获取 Vite 开发服务器的运行日志。
 
 **何时使用此工具**：
 - 用户报告"页面没更新"、"热更新不工作"、"HMR 失效"时
@@ -22,60 +27,74 @@ const e = p("OpenCodePluginViteLogs"), b = async () => {
 - 插件运行日志
 
 日志保存在内存缓冲区（最近 500 条）。`,
-        args: {
-          level: n.schema.string().optional().describe(
-            "日志级别过滤：error(错误)、warn(警告)、info(信息)、debug(调试)、log(普通)。多个用逗号分隔，如 'error,warn'"
-          ),
-          limit: n.schema.number().int().min(1).max(200).optional().default(50).describe("返回条数，默认 50，最大 200"),
-          source: n.schema.string().optional().describe("来源过滤：console(控制台)、opencode-stdout(服务输出)、opencode-stderr(服务错误)")
-        },
-        async execute(a, i) {
-          const { level: c, limit: g, source: u } = a;
-          e.debug("get_vite_dev_logs called", {
-            args: a,
-            sessionID: i.sessionID,
-            directory: i.directory
-          });
-          try {
-            const r = new URL(l);
-            c && r.searchParams.set("level", c), g && r.searchParams.set("limit", String(g)), u && r.searchParams.set("source", u), e.debug("Fetching logs from", { url: r.toString() });
-            const t = await fetch(r.toString(), {
-              method: "GET",
-              headers: { Accept: "application/json" },
-              signal: i.abort
-            });
-            if (!t.ok) {
-              const o = await t.text();
-              return e.error("Failed to fetch logs", { status: t.status, error: o }), `获取日志失败: HTTP ${t.status} - ${o}`;
-            }
-            const s = await t.json();
-            if (e.debug("Logs fetched successfully", {
-              count: s.logs.length,
-              total: s.meta.total
-            }), s.logs.length === 0)
-              return `当前没有符合条件的日志（缓冲区共 ${s.meta.total} 条）。
+    args: {
+      level: tool.schema.string().optional().describe(
+        "日志级别过滤：error(错误)、warn(警告)、info(信息)、debug(调试)、log(普通)。多个用逗号分隔，如 'error,warn'"
+      ),
+      limit: tool.schema.number().int().min(1).max(200).optional().default(50).describe("返回条数，默认 50，最大 200"),
+      source: tool.schema.string().optional().describe("来源过滤：console(控制台)、opencode-stdout(服务输出)、opencode-stderr(服务错误)")
+    },
+    async execute(args, context) {
+      const { level, limit, source } = args;
+      log.debug("get_vite_dev_logs called", {
+        args,
+        sessionID: context.sessionID,
+        directory: context.directory
+      });
+      try {
+        const url = new URL(logsApiUrl);
+        if (level) url.searchParams.set("level", level);
+        if (limit) url.searchParams.set("limit", String(limit));
+        if (source) url.searchParams.set("source", source);
+        log.debug("Fetching logs from", { url: url.toString() });
+        const response = await fetch(url.toString(), {
+          method: "GET",
+          headers: { Accept: "application/json" },
+          signal: context.abort
+        });
+        if (!response.ok) {
+          const errorText = await response.text();
+          log.error("Failed to fetch logs", { status: response.status, error: errorText });
+          return `获取日志失败: HTTP ${response.status} - ${errorText}`;
+        }
+        const data = await response.json();
+        log.debug("Logs fetched successfully", {
+          count: data.logs.length,
+          total: data.meta.total
+        });
+        if (data.logs.length === 0) {
+          return `当前没有符合条件的日志（缓冲区共 ${data.meta.total} 条）。
 
 建议：
 - 不指定参数获取所有日志
 - 使用 level=error,warn 获取错误和警告`;
-            const d = s.logs.map((o) => {
-              const m = new Date(o.timestamp).toLocaleTimeString(), f = o.level === "error" ? "❌" : o.level === "warn" ? "⚠️" : o.level === "info" ? "ℹ️" : "";
-              return `${m} ${f} ${o.message}`;
-            }).join(`
-`);
-            return `Vite 开发服务器日志（${s.meta.returned}/${s.meta.total} 条）：
+        }
+        const formattedLogs = data.logs.map((entry) => {
+          const time = new Date(entry.timestamp).toLocaleTimeString();
+          const levelIcon = entry.level === "error" ? "❌" : entry.level === "warn" ? "⚠️" : entry.level === "info" ? "ℹ️" : "";
+          return `${time} ${levelIcon} ${entry.message}`;
+        }).join("\n");
+        return `Vite 开发服务器日志（${data.meta.returned}/${data.meta.total} 条）：
 
-${d}`;
-          } catch (r) {
-            const t = r;
-            return i.abort.aborted ? (e.debug("Request aborted"), "请求已取消") : (e.error("Error fetching vite logs", { error: t }), `获取日志时发生错误: ${t.message}`);
-          }
+${formattedLogs}`;
+      } catch (error) {
+        const err = error;
+        if (context.abort.aborted) {
+          log.debug("Request aborted");
+          return "请求已取消";
         }
-      })
+        log.error("Error fetching vite logs", { error: err });
+        return `获取日志时发生错误: ${err.message}`;
+      }
+    }
+  });
+  return {
+    tool: {
+      get_vite_dev_logs: getViteDevLogsTool
     }
-  }) : (e.warn("OPENCODE_VITE_LOGS_API_URL is not set, vite logs plugin will not work"), {});
+  };
 };
 export {
-  b as ViteLogsPlugin,
-  b as default
+  ViteLogsPlugin,
+  ViteLogsPlugin as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vite-plugin-opencode-assistant/opencode",
-  "version": "1.0.58",
+  "version": "1.0.59",
   "type": "module",
   "main": "lib/index.cjs",
   "module": "es/index.mjs",
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "execa": "^9.6.1",
-    "@vite-plugin-opencode-assistant/shared": "1.0.58"
+    "@vite-plugin-opencode-assistant/shared": "1.0.59"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.3.15",