@coinseeker/opencode-telegram-plugin 1.0.8 → 1.0.10

package/README.md

@@ -15,11 +15,11 @@ Configure the npm package in `~/.config/opencode/opencode.json`:
 
 ```json
 {
-  "plugin": ["@coinseeker/opencode-telegram-plugin@1.0.8"]
+  "plugin": ["@coinseeker/opencode-telegram-plugin@1.0.10"]
 }
 ```
 
-Current stable version: `@coinseeker/opencode-telegram-plugin@1.0.8`.
+Current stable version: `@coinseeker/opencode-telegram-plugin@1.0.10`.
 
 Restart OpenCode after editing the config. OpenCode resolves npm package plugins on startup.
 

package/dist/telegram-remote.js

@@ -45,7 +45,6 @@ function createTelegramBot(opts) {
   let activeChatId = opts.initialChatId;
   let questionDispatcher;
   let permissionDispatcher;
-  let startWorkDispatcher;
   if (polling) {
     bot.use(async (ctx, next) => {
       const userId = ctx.from?.id;
@@ -98,13 +97,6 @@ This chat is now active for OpenCode notifications.`
       if (!permissionDispatcher || messageId === void 0) return;
       await permissionDispatcher.handleCallbackQuery(data, messageId);
     });
-    bot.callbackQuery(/^sw:(.+)$/, async (ctx) => {
-      await ctx.answerCallbackQuery();
-      const data = ctx.callbackQuery.data;
-      const messageId = ctx.callbackQuery.message?.message_id;
-      if (!startWorkDispatcher || messageId === void 0) return;
-      await startWorkDispatcher.handleCallbackQuery(data, messageId);
-    });
     bot.on("message:text", async (ctx) => {
       const replyToMessageId = ctx.message.reply_to_message?.message_id;
       const chatId = ctx.chat.id;
@@ -198,9 +190,6 @@ This chat is now active for OpenCode notifications.`
     },
     setPermissionDispatcher(dispatcher) {
       permissionDispatcher = dispatcher;
-    },
-    setStartWorkDispatcher(dispatcher) {
-      startWorkDispatcher = dispatcher;
     }
   };
 }
@@ -482,6 +471,7 @@ async function handleNormalizedPermission(permission, ctx) {
     const pending = {
       requestID: permission.requestID,
       sessionID: permission.sessionID,
+      serverUrl: ctx.serverUrl.href,
       title: permission.title,
       permission: permission.permission,
       patterns: permission.patterns,
@@ -525,7 +515,13 @@ function createPermissionDispatcher(ctx) {
         return;
       }
       try {
-        await ctx.replyToPermission(pending.requestID, pending.sessionID, reply, pending.endpoint);
+        await ctx.replyToPermission(
+          pending.requestID,
+          pending.sessionID,
+          reply,
+          pending.endpoint,
+          pending.serverUrl
+        );
         await ctx.bot.editMessageRemoveKeyboard(messageId, `\u2705 Permission ${replyLabel(reply)}
 
 ${pending.permission}: ${pending.title}`);
@@ -730,7 +726,7 @@ async function completeIfReady(ctx, pending, shortHash) {
   const answers = pending.answersInProgress.map((answer) => answer ?? []);
   const messageId = pending.telegramMessageIds[0];
   try {
-    await ctx.replyToQuestion(pending.requestID, answers);
+    await ctx.replyToQuestion(pending.requestID, answers, pending.serverUrl);
     await ctx.bot.editMessageRemoveKeyboard(
       messageId,
       `\u2705 Answered:
@@ -770,6 +766,7 @@ async function handleQuestionAsked(event, ctx) {
   const pending = {
     requestID: request.id,
     sessionID: request.sessionID,
+    serverUrl: ctx.serverUrl.href,
     questions: request.questions,
     sentAt,
     expiresAt: sentAt + QUESTION_EXPIRY_MS,
@@ -953,84 +950,6 @@ async function handleSessionError(event, ctx) {
   ctx.logger.info("session abort recorded", { sessionId: event.properties.sessionID ?? "global" });
 }
 
-// src/events/start-work.ts
-var CALLBACK_RE3 = /^sw:(.+)$/;
-var START_WORK_COMMAND = "start-work";
-var START_WORK_RE = /(?:^|[\s`])\/start-work(?:\s+([^\n`]+))?/g;
-var StartWorkCommandStore = class {
-  commands = /* @__PURE__ */ new Map();
-  updateFromText(sessionID, text) {
-    const command = extractStartWorkCommand(sessionID, text);
-    if (!command) return void 0;
-    this.commands.set(sessionID, command.arguments);
-    return command;
-  }
-  get(sessionID) {
-    const args = this.commands.get(sessionID);
-    if (args === void 0) return void 0;
-    return { sessionID, arguments: args };
-  }
-  delete(sessionID) {
-    this.commands.delete(sessionID);
-  }
-};
-function extractStartWorkCommand(sessionID, text) {
-  let latestArgs;
-  for (const match of text.matchAll(START_WORK_RE)) {
-    const args = (match[1] ?? "").trim();
-    if (args) latestArgs = args;
-  }
-  if (latestArgs === void 0) return void 0;
-  return { sessionID, arguments: latestArgs };
-}
-function startWorkCallbackData(sessionID) {
-  const data = `sw:${encodeURIComponent(sessionID)}`;
-  return Buffer.byteLength(data, "utf8") <= 64 ? data : void 0;
-}
-function startWorkKeyboard(sessionID) {
-  const callbackData = startWorkCallbackData(sessionID);
-  if (!callbackData) return void 0;
-  return [[{ text: "\u25B6\uFE0F Run /start-work", callback_data: callbackData }]];
-}
-function createStartWorkDispatcher(ctx) {
-  return {
-    async handleCallbackQuery(data, messageId) {
-      const match = CALLBACK_RE3.exec(data);
-      if (!match) return;
-      const sessionID = decodeURIComponent(match[1]);
-      const command = ctx.startWorkCommands.get(sessionID);
-      if (!command) {
-        await ctx.bot.editMessageRemoveKeyboard(
-          messageId,
-          `\u26A0\uFE0F No /start-work command was detected for this session.
-
-Session: ${sessionID}`
-        );
-        return;
-      }
-      try {
-        await ctx.runSessionCommand(sessionID, START_WORK_COMMAND, command.arguments);
-        await ctx.bot.editMessageRemoveKeyboard(
-          messageId,
-          `\u25B6\uFE0F Sent /start-work ${command.arguments} to opencode.
-
-Session: ${sessionID}`
-        );
-        ctx.startWorkCommands.delete(sessionID);
-        ctx.logger.info("start-work command sent", { sessionID });
-      } catch (err) {
-        await ctx.bot.editMessageRemoveKeyboard(
-          messageId,
-          `\u26A0\uFE0F Failed to send /start-work to opencode.
-
-Session: ${sessionID}`
-        );
-        ctx.logger.error("failed to send start-work command", { sessionID, error: String(err) });
-      }
-    }
-  };
-}
-
 // src/events/session-idle.ts
 var ROOT_IDLE_RECHECK_DELAY_MS = 2500;
 function sleep(ms) {
@@ -1077,17 +996,9 @@ async function sendIdleNotification(sessionId, ctx) {
   });
   if (!claimed) return;
   const title = ctx.sessionTitleService.getSessionTitle(sessionId);
-  const startWorkCommand = ctx.startWorkCommands.get(sessionId);
-  const message = title ? `Agent has finished: ${title}` : "Agent has finished.";
-  const keyboard = startWorkCommand ? startWorkKeyboard(sessionId) : void 0;
-  const text = startWorkCommand ? `${message}
-
-Plan is ready. Tap below to run /start-work ${startWorkCommand.arguments}.` : message;
+  const text = title ? `Agent has finished: ${title}` : "Agent has finished.";
   try {
-    await ctx.bot.sendMessage(
-      text,
-      keyboard ? { reply_markup: { inline_keyboard: keyboard } } : void 0
-    );
+    await ctx.bot.sendMessage(text);
     ctx.sessionTitleService.clearDeferredIdleNotification(sessionId);
     ctx.logger.info("idle notification sent", { sessionId, title });
   } catch (err) {
@@ -1097,15 +1008,19 @@ Plan is ready. Tap below to run /start-work ${startWorkCommand.arguments}.` : me
 async function flushDeferredParentIfReady(parentID, ctx) {
   if (!ctx.sessionTitleService.hasDeferredIdleNotification(parentID)) return;
   if (ctx.sessionTitleService.hasUnfinishedDescendants(parentID)) return;
-  if (ctx.sessionTitleService.getSessionStatus(parentID) !== "idle") {
+  const parentStatus = ctx.sessionTitleService.getSessionStatus(parentID);
+  if (parentStatus === "idle") {
+    ctx.logger.info("keeping deferred parent idle notification - waiting for parent to resume", {
+      sessionId: parentID
+    });
+    return;
+  }
+  if (parentStatus !== void 0) {
     ctx.sessionTitleService.clearDeferredIdleNotification(parentID);
     ctx.logger.info("clearing deferred parent idle notification - parent resumed", {
       sessionId: parentID
     });
-    return;
   }
-  ctx.logger.info("sending deferred parent idle notification", { sessionId: parentID });
-  await sendIdleNotification(parentID, ctx);
 }
 async function deferParentIdleIfDescendantsRunning(sessionId, ctx) {
   await hydrateDescendants(sessionId, ctx);
@@ -1118,8 +1033,8 @@ async function deferParentIdleIfDescendantsRunning(sessionId, ctx) {
 }
 async function handleSessionIdle(event, ctx) {
   const sessionId = event.properties.sessionID;
-  ctx.sessionTitleService.setSessionStatus(sessionId, "idle");
   const parentID = await resolveParentID(sessionId, ctx);
+  ctx.sessionTitleService.setSessionStatus(sessionId, "idle");
   if (typeof parentID === "string") {
     ctx.logger.info("suppressing child session idle notification", { sessionId, parentID });
     await flushDeferredParentIfReady(parentID, ctx);
@@ -1412,7 +1327,7 @@ var SessionTitleService = class {
     const existing = this.sessions.get(sessionId);
     this.sessions.set(sessionId, {
       title,
-      parentID: existing?.parentID ?? null,
+      parentID: existing?.parentID,
       status: existing?.status,
       idleNotificationPending: existing?.idleNotificationPending ?? false
     });
@@ -1421,7 +1336,7 @@ var SessionTitleService = class {
     const existing = this.sessions.get(sessionId);
     this.sessions.set(sessionId, {
       title: existing?.title ?? null,
-      parentID: existing?.parentID ?? null,
+      parentID: existing?.parentID,
       status,
       idleNotificationPending: status === "idle" ? existing?.idleNotificationPending ?? false : false
     });
@@ -1447,7 +1362,7 @@ var SessionTitleService = class {
     const existing = this.sessions.get(sessionId);
     this.sessions.set(sessionId, {
       title: existing?.title ?? null,
-      parentID: existing?.parentID ?? null,
+      parentID: existing?.parentID,
       status: existing?.status ?? "idle",
       idleNotificationPending: true
     });
@@ -1467,15 +1382,16 @@ var SessionTitleService = class {
 
 // src/telegram-remote.ts
 var pluginDir = dirname4(fileURLToPath(import.meta.url));
-function getTextPartFromMessagePartUpdated(event) {
-  if (event.type !== "message.part.updated") return void 0;
-  const part = event.properties?.part;
-  if (!part || typeof part !== "object") return void 0;
-  const candidate = part;
-  if (candidate.type !== "text" || typeof candidate.sessionID !== "string" || typeof candidate.text !== "string") {
-    return void 0;
-  }
-  return { type: "text", sessionID: candidate.sessionID, text: candidate.text };
+async function postToServer(serverUrl, path, body) {
+  const url = new URL(path, serverUrl);
+  const response = await fetch(url, {
+    method: "POST",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify(body)
+  });
+  if (response.ok) return;
+  const text = await response.text();
+  throw new Error(`OpenCode request failed: ${response.status} ${response.statusText}${text ? ` - ${text}` : ""}`);
 }
 var TelegramRemote = async (input) => {
   const logger = createLogger({ namespace: "telegram" });
@@ -1490,7 +1406,6 @@ var TelegramRemote = async (input) => {
     const claimsDir = join6(tmpdir4(), `opencoder-telegram-claims-${tokenHash}`);
     const pendingQuestions = createPendingQuestionStore({ tokenHash });
     const pendingPermissions = createPendingPermissionStore({ tokenHash });
-    const startWorkCommands = new StartWorkCommandStore();
     const lockResult = await acquireLock({ lockPath });
     const isLeader = lockResult.acquired;
     logger.info(
@@ -1504,38 +1419,46 @@ var TelegramRemote = async (input) => {
     });
     const sessionTitleService = new SessionTitleService();
     const client = input.client;
-    const replyToQuestion = async (requestID, answers) => {
+    const replyToQuestion = async (requestID, answers, serverUrl = input.serverUrl.href) => {
+      const path = `/question/${encodeURIComponent(requestID)}/reply`;
+      if (serverUrl !== input.serverUrl.href) {
+        await postToServer(serverUrl, path, { answers });
+        return;
+      }
       await client._client.post({
-        url: `/question/${encodeURIComponent(requestID)}/reply`,
+        url: path,
         headers: { "Content-Type": "application/json" },
         body: { answers },
         throwOnError: true
       });
     };
-    const replyToPermission = async (requestID, sessionID, reply, endpoint) => {
+    const replyToPermission = async (requestID, sessionID, reply, endpoint, serverUrl = input.serverUrl.href) => {
       if (endpoint === "request") {
+        const path2 = `/permission/${encodeURIComponent(requestID)}/reply`;
+        if (serverUrl !== input.serverUrl.href) {
+          await postToServer(serverUrl, path2, { reply });
+          return;
+        }
         await client._client.post({
-          url: `/permission/${encodeURIComponent(requestID)}/reply`,
+          url: path2,
           headers: { "Content-Type": "application/json" },
           body: { reply },
           throwOnError: true
         });
         return;
       }
+      const path = `/session/${encodeURIComponent(sessionID)}/permissions/${encodeURIComponent(requestID)}`;
+      if (serverUrl !== input.serverUrl.href) {
+        await postToServer(serverUrl, path, { response: reply });
+        return;
+      }
       await client._client.post({
-        url: `/session/${encodeURIComponent(sessionID)}/permissions/${encodeURIComponent(requestID)}`,
+        url: path,
         headers: { "Content-Type": "application/json" },
         body: { response: reply },
         throwOnError: true
       });
     };
-    const runSessionCommand = async (sessionID, command, args) => {
-      await input.client.session.command({
-        path: { id: sessionID },
-        body: { command, arguments: args },
-        throwOnError: true
-      });
-    };
     const bot = createTelegramBot({
       config,
       stateStore,
@@ -1580,15 +1503,12 @@ var TelegramRemote = async (input) => {
       tokenHash,
       pendingQuestions,
       pendingPermissions,
-      startWorkCommands,
       replyToQuestion,
-      replyToPermission,
-      runSessionCommand
+      replyToPermission
     };
     if (isLeader) {
       bot.setQuestionDispatcher(createQuestionDispatcher(ctx));
       bot.setPermissionDispatcher(createPermissionDispatcher(ctx));
-      bot.setStartWorkDispatcher(createStartWorkDispatcher(ctx));
     }
     return {
       event: async ({ event }) => {
@@ -1606,17 +1526,6 @@ var TelegramRemote = async (input) => {
           case "permission.updated":
             return handlePermissionUpdated(event, ctx);
           default: {
-            const textPart = getTextPartFromMessagePartUpdated(extEvent);
-            if (textPart) {
-              const command = startWorkCommands.updateFromText(textPart.sessionID, textPart.text);
-              if (command) {
-                logger.info("start-work command detected", {
-                  sessionID: command.sessionID,
-                  arguments: command.arguments
-                });
-              }
-              return;
-            }
             if (isEventPermissionAsked(extEvent)) {
               if (!isLeader) return;
               return handlePermissionAsked(extEvent, ctx);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@coinseeker/opencode-telegram-plugin",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "Control and monitor OpenCode from Telegram with notifications, question replies, and subagent-aware completion.",
   "type": "module",
   "main": "dist/telegram-remote.js",