Merge branch 'main' of https://github.com/grinev/opencode-telegram-bot

# Conflicts:
#	tests/bot/routers/command-router.test.ts

Author: grinev

src/app/formatters/scheduled-task-display-formatter.ts

@@ -127,6 +127,9 @@ function parseCronParts(cron: string): CronParts | null {
   }
 
   const [minute, hour, dayOfMonth, month, dayOfWeek] = parts;
+  if (!minute || !hour || !dayOfMonth || !month || !dayOfWeek) {
+    return null;
+  }
   return {
     minute,
     hour,
@@ -156,7 +159,11 @@ function parseEveryStep(field: string, minStep: number, maxStep: number): number
     return null;
   }
 
-  const step = Number.parseInt(match[1], 10);
+  const stepText = match[1];
+  if (!stepText) {
+    return null;
+  }
+  const step = Number.parseInt(stepText, 10);
   if (!Number.isInteger(step) || step < minStep || step > maxStep) {
     return null;
   }
@@ -176,8 +183,9 @@ function normalizeWeekdayValue(token: string): number | null {
     sat: 6,
   };
 
-  if (normalized in aliases) {
-    return aliases[normalized];
+  const aliasValue = aliases[normalized];
+  if (aliasValue !== undefined) {
+    return aliasValue;
   }
 
   const numericValue = parseExactNumber(normalized, 0, 7);
@@ -199,6 +207,9 @@ function parseWeekdaySet(field: string): Set<number> | null {
 
     if (trimmedToken.includes("-")) {
       const [startRaw, endRaw] = trimmedToken.split("-");
+      if (startRaw === undefined || endRaw === undefined) {
+        return null;
+      }
       const start = normalizeWeekdayValue(startRaw);
       const end = normalizeWeekdayValue(endRaw);
       if (start === null || end === null || start > end) {
@@ -299,7 +310,11 @@ function formatCronTaskBadge(cron: string): string {
 
     if (weekdayValues.size === 1) {
       const [weekday] = weekdayValues;
-      return `${WEEKDAY_LABELS[weekday]} ${formatTime(hour, minute)}`;
+      const weekdayLabel = weekday === undefined ? undefined : WEEKDAY_LABELS[weekday];
+      if (!weekdayLabel) {
+        return "cron";
+      }
+      return `${weekdayLabel} ${formatTime(hour, minute)}`;
     }
   }
 

src/app/formatters/subagent-formatter.ts

@@ -56,7 +56,7 @@ function formatToolStep(subagent: SubagentInfo): string {
     state: {
       status: "running",
       input: subagent.currentToolInput ?? {},
-      title: toolTitle,
+      ...(toolTitle !== undefined ? { title: toolTitle } : {}),
       metadata: {},
       time: { start: subagent.updatedAt },
     },

src/app/formatters/summary-formatter.ts

@@ -140,6 +140,9 @@ function formatTodos(todos: Array<{ content: string; status: string }>): string
 
   for (let i = 0; i < Math.min(todos.length, MAX_TODOS); i++) {
     const todo = todos[i];
+    if (!todo) {
+      continue;
+    }
     const marker = statusToMarker[todo.status] ?? "🔲";
     formattedTodos.push(`${marker} ${todo.content}`);
   }
@@ -153,7 +156,10 @@ function formatTodos(todos: Array<{ content: string; status: string }>): string
   return result;
 }
 
-function formatDiffLineInfo(filediff: { additions?: number; deletions?: number }): string {
+function formatDiffLineInfo(filediff: {
+  additions?: number | undefined;
+  deletions?: number | undefined;
+}): string {
   const parts = [];
   if (filediff.additions && filediff.additions > 0) parts.push(`+${filediff.additions}`);
   if (filediff.deletions && filediff.deletions > 0) parts.push(`-${filediff.deletions}`);
@@ -181,7 +187,8 @@ function countDiffChangesFromText(text: string): { additions: number; deletions:
 function extractFirstUpdatedFileFromTitle(title: string): string {
   for (const rawLine of title.split("\n")) {
     const line = rawLine.trim();
-    if (line.length >= 3 && line[1] === " " && /[AMDURC]/.test(line[0])) {
+    const status = line[0];
+    if (line.length >= 3 && line[1] === " " && status !== undefined && /[AMDURC]/.test(status)) {
       return line.slice(2).trim();
     }
   }

src/app/managers/assistant-run-state-manager.ts

@@ -2,22 +2,22 @@ import { logger } from "../../utils/logger.js";
 
 export interface AssistantRunStartInfo {
   startedAt: number;
-  configuredAgent?: string;
-  configuredProviderID?: string;
-  configuredModelID?: string;
+  configuredAgent?: string | undefined;
+  configuredProviderID?: string | undefined;
+  configuredModelID?: string | undefined;
 }
 
 export interface AssistantRunResolvedInfo {
-  agent?: string;
-  providerID?: string;
-  modelID?: string;
+  agent?: string | undefined;
+  providerID?: string | undefined;
+  modelID?: string | undefined;
 }
 
 export interface AssistantRunInfo extends AssistantRunStartInfo {
   sessionId: string;
-  actualAgent?: string;
-  actualProviderID?: string;
-  actualModelID?: string;
+  actualAgent?: string | undefined;
+  actualProviderID?: string | undefined;
+  actualModelID?: string | undefined;
   hasCompletedResponse: boolean;
 }
 

src/app/managers/background-session-manager.ts

@@ -10,9 +10,9 @@ export type BackgroundSessionNotificationKind =
 export interface BackgroundSessionNotification {
   kind: BackgroundSessionNotificationKind;
   sessionId: string;
-  sessionTitle?: string;
-  requestId?: string;
-  messageId?: string;
+  sessionTitle?: string | undefined;
+  requestId?: string | undefined;
+  messageId?: string | undefined;
 }
 
 type NotificationCallback = (notification: BackgroundSessionNotification) => void | Promise<void>;

src/app/managers/interaction-manager.ts

@@ -26,8 +26,7 @@ function normalizeCommand(command: string): string | null {
 
   const withSlash = trimmed.startsWith("/") ? trimmed : `/${trimmed}`;
   const withoutMention = withSlash.split("@")[0];
-
-  if (withoutMention.length <= 1) {
+  if (!withoutMention || withoutMention.length <= 1) {
     return null;
   }
 

src/app/managers/permission-manager.ts

@@ -161,7 +161,7 @@ class PermissionManager {
       return null;
     }
 
-    return messageIds[messageIds.length - 1];
+    return messageIds[messageIds.length - 1] ?? null;
   }
 
   /**

src/app/managers/prompt-queue-manager.ts

@@ -40,6 +40,9 @@ class PromptQueueManager {
     }
 
     const [removed] = this.items.splice(index, 1);
+    if (!removed) {
+      return null;
+    }
     logger.debug(
       `[PromptQueue] Prompt removed: id=${removed.id}, position=${index + 1}, size=${this.items.length}`,
     );

src/app/managers/question-manager.ts

@@ -46,10 +46,7 @@ class QuestionManager {
   }
 
   getCurrentQuestion(): Question | null {
-    if (this.state.currentIndex >= this.state.questions.length) {
-      return null;
-    }
-    return this.state.questions[this.state.currentIndex];
+    return this.state.questions[this.state.currentIndex] ?? null;
   }
 
   selectOption(questionIndex: number, optionIndex: number): void {
@@ -93,10 +90,10 @@ class QuestionManager {
     }
 
     const selected = this.state.selectedOptions.get(questionIndex) || new Set();
-    const options = Array.from(selected)
-      .map((idx) => question.options[idx])
-      .filter((opt) => opt)
-      .map((opt) => `* ${opt.label}: ${opt.description}`);
+    const options = Array.from(selected).flatMap((idx) => {
+      const opt = question.options[idx];
+      return opt ? [`* ${opt.label}: ${opt.description}`] : [];
+    });
 
     return options.join("\n");
   }
@@ -211,6 +208,9 @@ class QuestionManager {
 
     for (let i = 0; i < this.state.questions.length; i++) {
       const question = this.state.questions[i];
+      if (!question) {
+        continue;
+      }
       const selectedAnswer = this.getSelectedAnswer(i);
       const customAnswer = this.getCustomAnswer(i);
 

src/app/managers/summary-aggregation-manager.ts

@@ -18,11 +18,11 @@ export interface SummaryInfo {
 }
 
 export interface MessageCompletionInfo {
-  agent?: string;
-  providerID?: string;
-  modelID?: string;
-  createdAt?: number;
-  completedAt?: number;
+  agent?: string | undefined;
+  providerID?: string | undefined;
+  modelID?: string | undefined;
+  createdAt?: number | undefined;
+  completedAt?: number | undefined;
 }
 
 type MessageCompleteCallback = (
@@ -36,7 +36,7 @@ type MessagePartialCallback = (sessionId: string, messageId: string, messageText
 
 export interface ThinkingSection {
   id: string;
-  title?: string;
+  title?: string | undefined;
   text: string;
 }
 
@@ -82,10 +82,10 @@ export interface ToolInfo {
   callId: string;
   tool: string;
   state: ToolState;
-  input?: { [key: string]: unknown };
-  title?: string;
-  metadata?: { [key: string]: unknown };
-  hasFileAttachment?: boolean;
+  input?: { [key: string]: unknown } | undefined;
+  title?: string | undefined;
+  metadata?: { [key: string]: unknown } | undefined;
+  hasFileAttachment?: boolean | undefined;
 }
 
 export interface ToolFileInfo extends ToolInfo {
@@ -128,20 +128,20 @@ export interface SubagentInfo {
   agent: string;
   description: string;
   prompt: string;
-  command?: string;
+  command?: string | undefined;
   status: SubagentStatus;
-  providerID?: string;
-  modelID?: string;
+  providerID?: string | undefined;
+  modelID?: string | undefined;
   tokens: TokensInfo;
   cost: number;
-  currentTool?: string;
-  currentToolInput?: { [key: string]: unknown };
-  currentToolTitle?: string;
-  currentToolCallId?: string;
-  currentToolStartedAt?: number;
-  terminalMessage?: string;
+  currentTool?: string | undefined;
+  currentToolInput?: { [key: string]: unknown } | undefined;
+  currentToolTitle?: string | undefined;
+  currentToolCallId?: string | undefined;
+  currentToolStartedAt?: number | undefined;
+  terminalMessage?: string | undefined;
   createdAt: number;
-  finishedAt?: number;
+  finishedAt?: number | undefined;
   updatedAt: number;
 }
 
@@ -239,7 +239,8 @@ function isUpstreamEmptyResponseText(text: string, isFinal: boolean): boolean {
 function extractFirstUpdatedFileFromTitle(title: string): string {
   for (const rawLine of title.split("\n")) {
     const line = rawLine.trim();
-    if (line.length >= 3 && line[1] === " " && /[AMDURC]/.test(line[0])) {
+    const status = line[0];
+    if (line.length >= 3 && line[1] === " " && status !== undefined && /[AMDURC]/.test(status)) {
       return line.slice(2).trim();
     }
   }
@@ -286,7 +287,6 @@ class SummaryAggregator {
   private thinkingMessageStates: Map<string, ThinkingMessageState> = new Map();
   private messages: Map<string, { role: string }> = new Map();
   private messageCount = 0;
-  private lastUpdated = 0;
   private onCompleteCallback: MessageCompleteCallback | null = null;
   private onPartialCallback: MessagePartialCallback | null = null;
   private onExternalUserInputCallback: ExternalUserInputCallback | null = null;
@@ -570,7 +570,6 @@ class SummaryAggregator {
     this.lastSubagentSnapshot = "";
     this.permissionQueue = Promise.resolve();
     this.messageCount = 0;
-    this.lastUpdated = 0;
 
     if (this.onClearedCallback) {
       try {
@@ -741,7 +740,12 @@ class SummaryAggregator {
 
   private enrichSubagentFromSubtask(
     state: SubagentState,
-    details: { agent: string; description: string; prompt: string; command?: string },
+    details: {
+      agent: string;
+      description: string;
+      prompt: string;
+      command?: string | undefined;
+    },
   ): void {
     state.agent = details.agent || state.agent;
     state.description = details.description || details.prompt || state.description;
@@ -754,10 +758,10 @@ class SummaryAggregator {
   private enrichSubagentFromTaskTool(
     state: SubagentState,
     details: {
-      agent?: string;
-      description?: string;
-      prompt?: string;
-      command?: string;
+      agent?: string | undefined;
+      description?: string | undefined;
+      prompt?: string | undefined;
+      command?: string | undefined;
     },
   ): void {
     const nextDescription = details.description?.trim() || details.prompt?.trim();
@@ -1226,7 +1230,6 @@ class SummaryAggregator {
           );
         }
 
-      this.lastUpdated = Date.now();
     }
   }
 
@@ -1261,7 +1264,6 @@ class SummaryAggregator {
         part.prompt,
         part.command,
       );
-      this.lastUpdated = Date.now();
       return;
     }
 
@@ -1281,7 +1283,6 @@ class SummaryAggregator {
         this.updateSubagentStepFinish(part.sessionID, part.tokens, part.cost, part.snapshot);
       }
 
-      this.lastUpdated = Date.now();
       return;
     }
 
@@ -1293,7 +1294,6 @@ class SummaryAggregator {
     // for the user - rendering them would echo a whole attached file back into the chat.
     if (part.type === "text" && "synthetic" in part && part.synthetic === true) {
       this.registerSyntheticPart(messageID, part.id);
-      this.lastUpdated = Date.now();
       return;
     }
 
@@ -1318,7 +1318,6 @@ class SummaryAggregator {
     ) {
       this.emitThinkingFinishedOnce(part.sessionID, messageID);
       this.applyTextDelta(part.sessionID, messageID, part.id, deltaFromUpdated, part.text);
-      this.lastUpdated = Date.now();
       return;
     }
 
@@ -1336,7 +1335,6 @@ class SummaryAggregator {
         partText,
         this.extractReasoningTitle(part),
       );
-      this.lastUpdated = Date.now();
       return;
     }
 
@@ -1488,8 +1486,6 @@ class SummaryAggregator {
         }
       }
     }
-
-    this.lastUpdated = Date.now();
   }
 
   private handleMessagePartDelta(event: MessagePartDeltaEventRaw): void {