feat: extend Telegram dock commands and config hashing (#929)

Thanks @grp06.

Co-authored-by: George Pickett <gpickett00@gmail.com>

src/auto-reply/commands-registry.data.ts

@@ -27,6 +27,18 @@ function defineChatCommand(command: DefineChatCommandInput): ChatCommandDefiniti
   };
 }
 
+type ChannelDock = ReturnType<typeof listChannelDocks>[number];
+
+function defineDockCommand(dock: ChannelDock): ChatCommandDefinition {
+  return defineChatCommand({
+    key: `dock:${dock.id}`,
+    nativeName: `dock_${dock.id}`,
+    description: `Switch to ${dock.id} for replies.`,
+    textAliases: [`/dock-${dock.id}`, `/dock_${dock.id}`],
+    acceptsArgs: false,
+  });
+}
+
 function registerAlias(commands: ChatCommandDefinition[], key: string, ...aliases: string[]): void {
   const command = commands.find((entry) => entry.key === key);
   if (!command) {
@@ -238,15 +250,7 @@ export const CHAT_COMMANDS: ChatCommandDefinition[] = (() => {
     }),
     ...listChannelDocks()
       .filter((dock) => dock.capabilities.nativeCommands)
-      .map((dock) =>
-        defineChatCommand({
-          key: `dock:${dock.id}`,
-          nativeName: `dock-${dock.id}`,
-          description: `Switch to ${dock.id} for replies.`,
-          textAlias: `/dock-${dock.id}`,
-          acceptsArgs: false,
-        }),
-      ),
+      .map((dock) => defineDockCommand(dock)),
   ];
 
   registerAlias(commands, "status", "/usage");

src/auto-reply/commands-registry.test.ts

@@ -113,4 +113,8 @@ describe("commands registry", () => {
       "/help@otherbot",
     );
   });
+
+  it("normalizes dock command aliases", () => {
+    expect(normalizeCommandBody("/dock_telegram")).toBe("/dock-telegram");
+  });
 });

src/config/config.ts

@@ -3,6 +3,7 @@ export {
   loadConfig,
   parseConfigJson5,
   readConfigFileSnapshot,
+  resolveConfigSnapshotHash,
   writeConfigFile,
 } from "./io.js";
 export { migrateLegacyConfig } from "./legacy-migrate.js";

src/config/io.ts

@@ -58,6 +58,18 @@ function hashConfigRaw(raw: string | null): string {
     .digest("hex");
 }
 
+export function resolveConfigSnapshotHash(snapshot: {
+  hash?: string;
+  raw?: string | null;
+}): string | null {
+  if (typeof snapshot.hash === "string") {
+    const trimmed = snapshot.hash.trim();
+    if (trimmed) return trimmed;
+  }
+  if (typeof snapshot.raw !== "string") return null;
+  return hashConfigRaw(snapshot.raw);
+}
+
 export type ConfigIoDeps = {
   fs?: typeof fs;
   json5?: typeof JSON5;

src/gateway/server-bridge-methods-config.ts

@@ -4,6 +4,7 @@ import {
   loadConfig,
   parseConfigJson5,
   readConfigFileSnapshot,
+  resolveConfigSnapshotHash,
   validateConfigObject,
   writeConfigFile,
 } from "../config/config.js";
@@ -33,7 +34,8 @@ function requireConfigBaseHash(
   snapshot: Awaited<ReturnType<typeof readConfigFileSnapshot>>,
 ): { ok: true } | { ok: false; error: { code: string; message: string } } {
   if (!snapshot.exists) return { ok: true };
-  if (typeof snapshot.raw !== "string" || !snapshot.hash) {
+  const snapshotHash = resolveConfigSnapshotHash(snapshot);
+  if (!snapshotHash) {
     return {
       ok: false,
       error: {
@@ -52,7 +54,7 @@ function requireConfigBaseHash(
       },
     };
   }
-  if (baseHash !== snapshot.hash) {
+  if (baseHash !== snapshotHash) {
     return {
       ok: false,
       error: {

src/gateway/server-methods/config.ts

@@ -4,6 +4,7 @@ import {
   loadConfig,
   parseConfigJson5,
   readConfigFileSnapshot,
+  resolveConfigSnapshotHash,
   validateConfigObject,
   writeConfigFile,
 } from "../../config/config.js";
@@ -42,7 +43,8 @@ function requireConfigBaseHash(
   respond: RespondFn,
 ): boolean {
   if (!snapshot.exists) return true;
-  if (typeof snapshot.raw !== "string" || !snapshot.hash) {
+  const snapshotHash = resolveConfigSnapshotHash(snapshot);
+  if (!snapshotHash) {
     respond(
       false,
       undefined,
@@ -65,7 +67,7 @@ function requireConfigBaseHash(
     );
     return false;
   }
-  if (baseHash !== snapshot.hash) {
+  if (baseHash !== snapshotHash) {
     respond(
       false,
       undefined,

src/gateway/server.config-patch.test.ts

@@ -1,5 +1,7 @@
 import { describe, expect, it } from "vitest";
 
+import { resolveConfigSnapshotHash } from "../config/config.js";
+
 import {
   connectOk,
   installGatewayTestHooks,
@@ -43,12 +45,15 @@ describe("gateway config.patch", () => {
         params: {},
       }),
     );
-    const getRes = await onceMessage<{ ok: boolean; payload?: { hash?: string } }>(
+    const getRes = await onceMessage<{ ok: boolean; payload?: { hash?: string; raw?: string } }>(
       ws,
       (o) => o.type === "res" && o.id === getId,
     );
     expect(getRes.ok).toBe(true);
-    const baseHash = getRes.payload?.hash;
+    const baseHash = resolveConfigSnapshotHash({
+      hash: getRes.payload?.hash,
+      raw: getRes.payload?.raw,
+    });
     expect(typeof baseHash).toBe("string");
 
     const patchId = "req-patch";