Skip to content

Fix: Load .env from plugin directory (not just cwd) #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
selimerunkut wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix: Load .env from plugin directory (not just cwd) #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 6 additions & 12 deletions .opencode/plugin/telegram-remote.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,13 @@ function createBotManager(bot, sessionTitleService) {
}

// src/config.ts
import { resolve } from "path";
import { resolve, dirname } from "path";
import { fileURLToPath } from "url";
import { config as loadEnv } from "dotenv";
var __filename = fileURLToPath(import.meta.url);
var __dirname = dirname(__filename);
loadEnv({ path: resolve(__dirname, "..", "..", ".env") });
loadEnv({ path: resolve(__dirname, "..", ".env") });
loadEnv({ path: resolve(process.cwd(), ".env") });
function parseAllowedUserIds(value) {
if (!value || value.trim() === "") {
Expand Down Expand Up @@ -161,23 +166,14 @@ async function handleSessionStatus(event, context) {
const statusType = event?.properties?.status?.type;
if (statusType) {
if (statusType === "idle") {
console.log(`[TelegramRemote] Session is idle. Sending finished notification.`);
try {
const sessionId = event?.properties?.info?.id ?? event?.properties?.sessionID ?? event?.properties?.id;
console.log("[TelegramRemote] Extracted sessionId for idle event:", sessionId);
console.log("[TelegramRemote] Event structure:", JSON.stringify(event?.properties, null, 2));
let message = "Agent has finished.";
if (sessionId && context.sessionTitleService) {
const title = context.sessionTitleService.getSessionTitle(sessionId);
console.log("[TelegramRemote] Retrieved title from service:", title);
if (title) {
message = `Agent has finished: ${title}`;
}
} else {
console.log("[TelegramRemote] SessionId or sessionTitleService missing:", {
hasSessionId: !!sessionId,
hasService: !!context.sessionTitleService
});
}
await context.bot.sendMessage(message);
} catch (error) {
Expand All @@ -200,7 +196,6 @@ async function handleSessionUpdated(event, context) {

// src/events/question-asked.ts
async function handleQuestionAsked(event, context) {
console.log("[TelegramRemote] handleQuestionAsked called with event:", JSON.stringify(event, null, 2));
const sessionID = event?.properties?.sessionID;
const questions = event?.properties?.questions;
if (sessionID && questions && Array.isArray(questions) && questions.length > 0 && context.bot) {
Expand All @@ -214,7 +209,6 @@ async function handleQuestionAsked(event, context) {

\u2753 Questions:
${questionTexts}`;
console.log(`[TelegramRemote] Sending questions for session ${sessionID}`);
try {
await context.bot.sendMessage(message);
} catch (error) {
Expand Down
18 changes: 6 additions & 12 deletions plugin/dist/telegram-remote.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,13 @@ function createBotManager(bot, sessionTitleService) {
}

// src/config.ts
import { resolve } from "path";
import { resolve, dirname } from "path";
import { fileURLToPath } from "url";
import { config as loadEnv } from "dotenv";
var __filename = fileURLToPath(import.meta.url);
var __dirname = dirname(__filename);
loadEnv({ path: resolve(__dirname, "..", "..", ".env") });
loadEnv({ path: resolve(__dirname, "..", ".env") });
loadEnv({ path: resolve(process.cwd(), ".env") });
function parseAllowedUserIds(value) {
if (!value || value.trim() === "") {
Expand Down Expand Up @@ -161,23 +166,14 @@ async function handleSessionStatus(event, context) {
const statusType = event?.properties?.status?.type;
if (statusType) {
if (statusType === "idle") {
console.log(`[TelegramRemote] Session is idle. Sending finished notification.`);
try {
const sessionId = event?.properties?.info?.id ?? event?.properties?.sessionID ?? event?.properties?.id;
console.log("[TelegramRemote] Extracted sessionId for idle event:", sessionId);
console.log("[TelegramRemote] Event structure:", JSON.stringify(event?.properties, null, 2));
let message = "Agent has finished.";
if (sessionId && context.sessionTitleService) {
const title = context.sessionTitleService.getSessionTitle(sessionId);
console.log("[TelegramRemote] Retrieved title from service:", title);
if (title) {
message = `Agent has finished: ${title}`;
}
} else {
console.log("[TelegramRemote] SessionId or sessionTitleService missing:", {
hasSessionId: !!sessionId,
hasService: !!context.sessionTitleService
});
}
await context.bot.sendMessage(message);
} catch (error) {
Expand All @@ -200,7 +196,6 @@ async function handleSessionUpdated(event, context) {

// src/events/question-asked.ts
async function handleQuestionAsked(event, context) {
console.log("[TelegramRemote] handleQuestionAsked called with event:", JSON.stringify(event, null, 2));
const sessionID = event?.properties?.sessionID;
const questions = event?.properties?.questions;
if (sessionID && questions && Array.isArray(questions) && questions.length > 0 && context.bot) {
Expand All @@ -214,7 +209,6 @@ async function handleQuestionAsked(event, context) {

\u2753 Questions:
${questionTexts}`;
console.log(`[TelegramRemote] Sending questions for session ${sessionID}`);
try {
await context.bot.sendMessage(message);
} catch (error) {
Expand Down
8 changes: 7 additions & 1 deletion plugin/src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import { resolve } from "node:path";
import { resolve, dirname } from "node:path";
import { fileURLToPath } from "node:url";
import { config as loadEnv } from "dotenv";

const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);

loadEnv({ path: resolve(__dirname, "..", "..", ".env") });
loadEnv({ path: resolve(__dirname, "..", ".env") });
loadEnv({ path: resolve(process.cwd(), ".env") });

export const SERVICE_NAME = "TelegramRemote";
Expand Down