arisa 5.1.60 → 5.1.64

package/src/official-tools.lock.json

@@ -1,7 +1,7 @@
 {
   "version": 1,
   "repository": "https://github.com/clasen/Arisa.git",
-  "commit": "43b032cbaa5e4ec42345a822119f06a13f49ff8f",
+  "commit": "410d18e354374b43a225c31be574deb4b8f69aba",
   "tools": {
     "browser-session-bridge": {
       "version": "0.1.0",
@@ -31,24 +31,26 @@
       }
     },
     "campaign-draft-runner": {
-      "version": "0.3.3",
+      "version": "0.5.0",
       "toolDependencies": {
         "pr-campaign": "^0.1.0",
         "gmail-workspace": "^0.1.0"
       },
       "files": {
-        "README.md": "fb73d47f6825a1c9b419f6667a319c2cbd959dc7b56c488321db72a6e2210a41",
-        "config.js": "23b95ad1851e498310eb400b1d53c648c280ddcc73cf91f6fa0ae5dc470ae6d2",
-        "index.js": "28d58096adb76e00d74b23ef10816199a5af57e13866ed6ab829da2535d73890",
+        "README.md": "2c977357f774c6bc3369460ba9cd784c9b75b5f12b338e089e634e09f2a8cbcd",
+        "batch-skip.js": "ad428464b739e7355e00ac7cf399247ce611fcef0470d97a73893701e5b07627",
+        "config.js": "9b9c2d9686cebf17c3ba2630088c7028281883608f61054e733283aeb8d383cb",
+        "index.js": "669bf964a0e1e1a0bacc5997c6e49539022649f405543e5914ba01aa11a99330",
         "operation-timeout.js": "9b1ced30ec9ed710bb9118b91f6f3feded5111a08e1e21abf163e4cfb91d7ad2",
         "package.json": "a25b7ed1dd2c30cd68c3c10feb8ee1752cac8cd55cd4344690ffad649e231ec1",
         "product-facts.js": "69339e20e7b70a6b9833878d72b10b70ea4ede4aa448097975d0961b6aaced59",
         "search-quality.js": "ab5412d45d5144e976cccef52992e634c11aca0e21b73fd53f9dc2d489c56dd7",
         "source-exhaustion.js": "407f940f5205eb01715a797672d0dad8bd0b0b897024b5fcb87052a062ecd054",
-        "telemetry.js": "bab44341ae2176c8a29eed19b89db4e7e251c9938af163ecd85293917d94bfb5",
-        "test/selection-policy.test.js": "27dacdc6ac3b1c570229ef624267c5bf7e4b9606dbb71214c2a451a30ac3762b",
-        "test/telemetry.test.js": "e297727e382163f18ab0ec4a21f55bf7e47790939510b615fd8e38c4dfc1998f",
-        "tool.manifest.json": "1eacb9ccdf0b37bba9745ba20ce3462548bac28c7abb15214e5502e7e53d3e0d"
+        "telemetry.js": "984772e73d1cbb761771d6f62954a604333a301182ee74368a41ffab762da367",
+        "test/batch-skip.test.js": "638d185dc0b38900afe6ee9058e733ae36583d0762a0ff0347fdf245df064abc",
+        "test/selection-policy.test.js": "1283f18b861925aee810d156eb64c54b147304ff7352a8f83b9c2311e1f51de2",
+        "test/telemetry.test.js": "daa84b83658226ecd979f15d4e12d94740ffe5280d467ad29677fc1d77734a5b",
+        "tool.manifest.json": "71520f3be858b9c2193223e370c10d938484a2af9281087e6dc14410b45cb2ae"
       }
     },
     "creator-scout": {
@@ -65,34 +67,39 @@
       }
     },
     "gmail-workspace": {
-      "version": "0.1.1",
+      "version": "0.1.2",
       "files": {
         "config.js": "6ad295ec4cedbc936835d8f86c7528e0939ef09d5792c003308d2ee85dc5eea4",
-        "index.js": "c4b1c27a3c5d2309501b695058da73f6287e2a6239f6e2384c05daae8ee25d43",
-        "package.json": "ba87edd5a148da9e99af6b3ab71a0024b86e1a469d56f548c7eeb253bb431f5d",
+        "index.js": "729f345fbd82d8e9525d46412b96efac0a30387477385208a4bb1c83fd794992",
+        "package.json": "991b2a5c03a049faa9363444ff5fd7517fd3556228dd8bad3d0f554cd3e2dd73",
         "secretary-state.js": "afc27732670420bccf1ce56ce715676dd2266de9f2d36a92015a93842755094a",
         "test/secretary-state.test.mjs": "3aea05524a4ad5ebcb79c6aa1db94fcd009ac8ae69414c8f950b32a32af94370",
-        "tool.manifest.json": "2860c5684b9b9532ab4675f5cc5b96238320209086b132a5eda74ba99b6c294a"
+        "tool.manifest.json": "1f9316a957b3a7167e41ece7c2b83f90e69fb390d6dd8c7f99789c538b7a4800",
+        "arguments.js": "b4089006818020cc1cd4e5a4cc6e22242939b45a4b42d216fba2269b8cb99e64",
+        "test/arguments.test.mjs": "dde82737924d75747490f5535bee2420c71838b3e758925132c825ee8c869bad"
       }
     },
     "magnific-mcp": {
-      "version": "0.1.1",
+      "version": "0.4.1",
       "toolDependencies": {
-        "mcp-client": "^0.1.0"
+        "mcp-client": "^0.2.0"
       },
       "files": {
-        "README.md": "519b68d10c80112f475ab173394e937b0fc5930758415c1fc65ea2f5536b6371",
+        "README.md": "98327aacc89cadd761db2eb49f3892818c72d410f88b86a8b6fe904c4efb3630",
         "config.js": "98a629781a1b2541806050952aa78a1e6e1b1671a6f1df7ba36c70dd116936a7",
         "delivery-claims.js": "52f05a5bd1ece1ab21f7d9a49f362f9c55f101ef5723efd642dbecf0236921cd",
+        "generation-request.js": "a6daa889b68fa188111b4389c6446daba87fc46fbddcf4bcccba817cf3f0b607",
         "generation-watch-close.js": "0dd780280eef870d2f11cb1800e6e9de19e5ead7b9d02b9983852cc8ddbdc79b",
         "generation-watch-plan.js": "eb60660341f254adc224181ca19dbbb969ef1d676aeaab60b71a8567f52648fe",
-        "index.js": "0dcbd84ad03ab59919df57081d34a45c3a8d59b3c37ac31249409210ae7107e6",
-        "magnific-api.js": "39fa9a122577029111965c3e8487565c88ce46b61dec5ca685acf1c76cd3b636",
+        "index.js": "2eead50413d076173648623285ac65977ec56d77b1275f3ff801c70f900f4bb5",
+        "magnific-api.js": "062ba561037760de347542b5bd7db5def1f940e1d8f147a131e5603dfccd22ab",
+        "media-output.js": "01aaaeffa64845a200261258dccedf3116f030fafd783db97e846582ec5c9a26",
         "network.js": "b45e43b49eea98ca7d80921ebfa6daf8b0a85d2079d4653f9eda682bc82101ae",
-        "package.json": "9c44eb43a3555cf79bd327318f9a30d3060f22dd2fd534923e303cca1eed7de9",
+        "package.json": "1842a0efe6021e197a14b54f6661fb9ccdcd26e92aa09a5ac50af6d3cee4367a",
         "state-store.js": "c3ee744509f7a6be251cd895406bd1c70827f53cbdc1ac9d1c2a6e48479bfe1e",
-        "test/magnific-mcp.test.js": "7a61dd19a2f6f9f48213cabf0de6e87e0b6fb73a94f0ea9dbfe9c8568c2cc32d",
-        "tool.manifest.json": "ff886d95250d279eff097430e6f89405a2bdd488d5f0949277cbc3f57f918950"
+        "test/magnific-mcp.test.js": "3af971e5a92cf6bd34111b159723892b3a5310952b036386ae98d3592708ddd0",
+        "test/media-output.test.js": "ba3802da6c3e7d3c6ef94fcceb10a0b8547921d0995aa24b8484ddb2fb1a28d9",
+        "tool.manifest.json": "7d26e0a101c8df81bcfdf502d6864a157f0e690e5636ce297e28b1ed07f7abc2"
       }
     },
     "master-slave": {
@@ -132,35 +139,39 @@
       }
     },
     "mcp-client": {
-      "version": "0.1.0",
+      "version": "0.2.0",
+      "toolDependencies": {},
       "files": {
-        "README.md": "798125171049f939f4487e1a023cb3a11b3c28aae96b2687df1681a11bad8dc0",
+        "README.md": "f7317946d27742eebcc443d69e152c0f9f7e1d55b07192a3875cc1a0d623ce3a",
         "config.js": "b5b05fb242034e2d04b6301e848da9701c95be195ba1cdac2421964e9a7db8c9",
-        "index.js": "ba828f353ef23cd7acc3a064f859f553705836e4ede5d31ea0824a761cc88c2a",
+        "index.js": "eaca434b3f0a7697955e0dd4cf4aa8dd7c59ab297c10f646b8cc4ec3189311e3",
         "mcp-session.js": "51765b46f410e1cd49647235b611db0b10af20c9707efcacfbe0ff7dabe3c1ff",
         "network-security.js": "60a020d4e3c7a4784a5a4e7b7246ee34e63ac73ee2316e09a09d10668dc8a7bc",
         "oauth-device.js": "698aa9255bae47190c63527db7680aaab4f06392a108a0ff6444e32d31b7b89f",
         "oauth-watch-plan.js": "b1bbed52eeb0e2e50dd52d733897ebd70573fea3ff5f023b3c63347f92633d3e",
         "package-lock.json": "fd7b6bf4545de4056908bd656a4a4e21b9f84acc7b06d8c1d581a8c84c295e90",
-        "package.json": "16d423b77a32902671a751b1d673077c789a5bc3c79254bde296e4a4207fc4e3",
+        "package.json": "85ac369f959a40da258d268a3ab1d523abba7c225d5c44a903ddae0bcc512d1b",
         "state-store.js": "a8fb63096b8efdec8de1cb386eff371f1552f3fd71d96f25036e1c724285e0af",
-        "test/mcp-client.test.js": "188b253343f551303d1ee6ab2adc34e7153282461ba7399b598fe292e78a22a1",
-        "tool.manifest.json": "5659c398922c914c5bf893404519a30071ee685ab49f34a650ecafd585b4d6ec"
+        "test/mcp-client.test.js": "26a7fe3ffa33ad454eced32c7fab12975ac5c0914041dea68cb7e5467e753a10",
+        "tool-routing.js": "b3405c9879443cdc257a1e97d4968859a8654e62ff7cfb90ec3a7a992a62e311",
+        "tool.manifest.json": "2d64dc40453fba1d5a6743145f759a28b1f6d137fd84c0e15dd41745bd1692d7"
       }
     },
     "official-tool-sync": {
-      "version": "1.0.0",
+      "version": "1.1.0",
       "toolDependencies": {
         "trash": "^1.0.0"
       },
       "files": {
         ".gitignore": "4d56952b0fb13bf8f9b6c13a6d4c34a075bac3af447636a1df4335d7576e2f97",
         "config.js": "744c445b1d2ff65b77f38a5473c24e50a32f4288c4a08c25a874a478086c08c8",
-        "index.js": "fdd4167c63cd33c8e7640cb7ce09fd618dbd416030aa920407392e4591543e94",
-        "package.json": "4447cb5d4e0a04526604dfb9820c44af88349c27e208f27baa148686846559da",
+        "dependency-installer.js": "dd91072612d4cba2ce83748ffae569067cbb2ebf63d59084572c3a9b77611927",
+        "dependency-installer.test.js": "9dc8a8c7d3ea29cfa2bb2d4daef3c02a6e996f9148a27cc499c8fd628fac857f",
+        "index.js": "12186107d449868621af98ce8f434fc84b5de09c62a2cb6b2cb67219b2e856a6",
+        "package.json": "0e95a190a04ebaf1eea81a90ecdb7b260595eb1ea0afe77f4d4215ccd6a9e949",
         "sync-lib.js": "c9f2cd7e19370088ab5fd10f6b2ada52c07d2e405674a356d0989f9a0f4984f6",
         "sync-lib.test.js": "c97cf850d9f42f6b121a458863b048bdcaa6d7d0475642f20742c5862ebf7cc4",
-        "tool.manifest.json": "8e0f94ad786bdaf9edb1a65cd03438e26c1e9927e8db9a5a39e349e7ef3c6cd3"
+        "tool.manifest.json": "00086b52dc969275e6dffc70720ef916493870fff3a27d076fed4ec04a160c75"
       }
     },
     "pr-campaign": {
@@ -189,18 +200,20 @@
       }
     },
     "telemetry-ledger": {
-      "version": "0.1.0",
+      "version": "0.1.1",
       "files": {
-        "README.md": "4cf1b8c7addaa0f6a2d802a7ae261293822c2662efac9c10afa844f9fbcf4e1d",
+        "README.md": "e74bcf93bc89de151d73a03d60a74a2699436775aa5f93d27cf3dbb59250aec4",
         "analysis.js": "c0effbff3af519b018e59c0460d2c277b4f7e1422ca2680de217bcb5e8a13136",
         "config.js": "ddc8543cde5aeda634b8df60628d0024bb03e65b8710cf4878b4c6a7d953a641",
-        "index.js": "7df14d142a70b725b32ee40741ce1007fd96a080f96a9b2e3e34d917d88621b5",
-        "package.json": "e662652038c1c5a6a2a4502b308ae89e1acbd3cb6d3fc494512a730ebe9ccb8a",
+        "index.js": "87f302af297233f2a1bc89d9be52b1b724478ed72658123ff841fcbcaa13389b",
+        "package.json": "f093c7b767dc042518ff6c19ac302b972a03ba34c45a73545079dd76bf525b75",
         "stats.js": "fc41b065d1f280dc278c53dc4c4baaa385a5bf25416c3e4ff8a153ea624967fb",
         "storage.js": "099187e270ccc2bd6d7300b78a2ee31a837f98694a23a3b40b20a646cdb1db1e",
         "test/telemetry.test.js": "312eef22ad960b19a6fe777aecd520952ae20ed03168edbbef8a0f747bee01c0",
-        "tool.manifest.json": "e4b321a56db9030e5b39b764547769c76bcf282ed019ebba0323bf16a73dbe05",
-        "validation.js": "1a50c75a5ca1bb7249bb8bfc3f2927b31ff4accd0efb56a48c36df5adae78f61"
+        "tool.manifest.json": "960b714ead9b0491581bf9f0f4dc882ce58bfc29cef4b2f5267cd0dbc9c37d48",
+        "validation.js": "1a50c75a5ca1bb7249bb8bfc3f2927b31ff4accd0efb56a48c36df5adae78f61",
+        "output.js": "e932098d51efdb99f8c39faaae0c5574d7e263f0e8c0875fc57e7a4311e715ea",
+        "test/output.test.js": "c18ae93cdf74de3748c1571833dfc1063ec6690219b03fbc7772bae504b6259f"
       }
     },
     "trash": {
@@ -230,17 +243,18 @@
       }
     },
     "x-dm": {
-      "version": "0.2.0",
+      "version": "0.2.1",
       "toolDependencies": {
         "browser-session-bridge": "^0.1.0"
       },
       "files": {
-        "config.js": "69a2dcccd10aa2f1ddcc24d52f4ce8fe4a6f5f5a85be64abbdf9dc9e19de0cd4",
-        "index.js": "83e3eb7fbeea8a5183303e0e56b1d6854ca7ccb800e4cd2ad689a5f13637380f",
-        "package.json": "3a76a921b1e78e91b1d2a5ae1926b298dfd6b4ee3f716d5382159b474ee400f4",
+        "config.js": "ac6eb70c1bc94230bc6df89fc73fc22ac53ccab49926abc3c453f85aca220596",
+        "index.js": "d89f70fed0754c61bd7ce31739304e4512ddabf16bc79a1488c164e32d31672d",
+        "package.json": "af4d72a99318d04b522773b8489288d191210435ae5543b564e2ce747164386c",
         "README.md": "503b0ed25ef9a8df3079523ea653178e6e029854b4d199cb8d20be82cc837f9e",
         "test/x-dm.test.mjs": "06352996e14777358eb62ad5e5d757b0dab5c0696927ed54ff40a5b7cdefcfd0",
-        "tool.manifest.json": "177e0abac770f89a0f06aa445363393fa38e7f05ad7cd773ea907fa56faed505"
+        "tool.manifest.json": "227dc3c4a48948cf72544d4b99ba2c3c5a255f8425e795304881ede73d82d011",
+        "browser-cache.js": "f71c20f9ab5f04d9d46c5e2551b348d47baba89a10a07173070298098a6d5551"
       }
     }
   }

package/src/runtime/create-app.js

@@ -114,7 +114,7 @@ export async function createApp({ logger, runtimeOverrides, requestRestart } = {
   }
 
   const artifactStore = new ArtifactStore();
-  const toolRegistry = new ToolRegistry({ logger });
+  const toolRegistry = new ToolRegistry({ logger, executionPolicy: config.toolExecution });
   const toolProcessSupervisor = createToolProcessSupervisor({ logger, policy: config.daemons, toolRegistry });
   const taskStore = new TaskStore();
   await toolRegistry.load();

package/src/runtime/create-headless-app.js

@@ -14,7 +14,7 @@ export async function createHeadlessApp({
   configLoader = loadConfig,
   artifactStoreFactory = () => new ArtifactStore(),
   taskStoreFactory = () => new TaskStore(),
-  toolRegistryFactory = () => new ToolRegistry({ logger }),
+  toolRegistryFactory = (options) => new ToolRegistry(options),
   supervisorFactory = (options) => createToolProcessSupervisor(options),
   capabilitiesFactory = (options) => createArisaCapabilities(options),
   ipcServerFactory = (options) => createIpcServer(options)
@@ -23,7 +23,7 @@ export async function createHeadlessApp({
   const config = await configLoader();
   const artifactStore = artifactStoreFactory();
   const taskStore = taskStoreFactory();
-  const toolRegistry = toolRegistryFactory();
+  const toolRegistry = toolRegistryFactory({ logger, executionPolicy: config.toolExecution });
   await toolRegistry.load();
   const toolProcessSupervisor = supervisorFactory({ logger, policy: config.daemons, toolRegistry });
   const toolExecutor = createHeadlessToolExecutor({ artifactStore, taskStore, toolRegistry });

package/src/runtime/paths.js

@@ -65,6 +65,10 @@ export function getChatToolResourceNotesFile(chatId) {
   return path.join(getChatDir(chatId), "state", "tool-resource-notes.json");
 }
 
+export function getChatTelegramWorkspacesFile(chatId) {
+  return path.join(getChatDir(chatId), "state", "telegram-workspaces.json");
+}
+
 export function getChatToolStateDir(chatId, toolName) {
   return path.join(getChatDir(chatId), "state", "tools", requireToolName(toolName));
 }

package/src/runtime/service-manager.js

@@ -78,7 +78,9 @@ export async function handoffServiceRestart({ verbose = true, cliArgs = [] } = {
 } = {}) {
   await ensureHome();
   const status = await getStatus();
-  if (!status.running || status.pid !== currentPid) {
+  const supervisorPid = Number.parseInt(environment.ARISA_SUPERVISOR_PID || "", 10);
+  const isActiveWorker = Number.isSafeInteger(supervisorPid) && supervisorPid === status.pid;
+  if (!status.running || (status.pid !== currentPid && !isActiveWorker)) {
     throw new Error("Service restart handoff requires the active background service process");
   }
   const logHandle = await openLog(serviceLogFile, "a");

package/src/runtime/service-supervisor.js

@@ -0,0 +1,98 @@
+import { spawn } from "node:child_process";
+
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+function errorMessage(error) {
+  return error instanceof Error ? error.message : String(error);
+}
+
+function boundedInteger(value, fallback, minimum, maximum) {
+  const parsed = Number(value);
+  return Number.isSafeInteger(parsed) && parsed >= minimum ? Math.min(parsed, maximum) : fallback;
+}
+
+export function createServiceSupervisor({
+  command,
+  args,
+  env = process.env,
+  restartLimit = 3,
+  restartBackoffMs = 2_000,
+  restartBackoffMaxMs = 60_000,
+  stableRuntimeMs = 60_000,
+  logger,
+  spawnProcess = spawn,
+  wait = sleep
+}) {
+  const maximumRestarts = boundedInteger(restartLimit, 3, 0, 10);
+  const initialBackoffMs = boundedInteger(restartBackoffMs, 2_000, 1, 60_000);
+  const maximumBackoffMs = boundedInteger(restartBackoffMaxMs, 60_000, initialBackoffMs, 5 * 60_000);
+  const stableAfterMs = boundedInteger(stableRuntimeMs, 60_000, 1_000, 60 * 60_000);
+  let child = null;
+  let stopping = false;
+  let wakeBackoff = null;
+  let resolveDone;
+  const done = new Promise((resolve) => { resolveDone = resolve; });
+
+  async function run() {
+    let consecutiveFailures = 0;
+    while (!stopping) {
+      const startedAt = Date.now();
+      child = spawnProcess(command, args, {
+        stdio: "inherit",
+        env: { ...env, ARISA_SUPERVISOR_PID: String(process.pid) }
+      });
+      logger?.log("service", `worker started (pid ${child.pid})`);
+
+      const outcome = await new Promise((resolve) => {
+        child.once("error", (error) => resolve({ error }));
+        child.once("exit", (code, signal) => resolve({ code, signal }));
+      });
+      child = null;
+      if (stopping) break;
+
+      const runtimeMs = Date.now() - startedAt;
+      if (runtimeMs >= stableAfterMs) consecutiveFailures = 0;
+      consecutiveFailures += 1;
+      const detail = outcome.error
+        ? errorMessage(outcome.error)
+        : `code=${outcome.code ?? "null"} signal=${outcome.signal || "none"}`;
+      logger?.error("service", `worker exited unexpectedly (${detail})`);
+      if (consecutiveFailures > maximumRestarts) {
+        logger?.error("service", `worker restart limit reached after ${consecutiveFailures} consecutive exits`);
+        break;
+      }
+
+      const delay = Math.min(maximumBackoffMs, initialBackoffMs * (2 ** (consecutiveFailures - 1)));
+      logger?.log("service", `restarting worker in ${delay}ms`);
+      await Promise.race([
+        wait(delay),
+        new Promise((resolve) => { wakeBackoff = resolve; })
+      ]);
+      wakeBackoff = null;
+    }
+    resolveDone();
+  }
+
+  return {
+    async start() {
+      run().catch((error) => {
+        logger?.error("service", `supervisor failed: ${errorMessage(error)}`);
+        resolveDone();
+      });
+      return done;
+    },
+    async stop() {
+      stopping = true;
+      wakeBackoff?.();
+      if (child) {
+        const activeChild = child;
+        const exited = new Promise((resolve) => activeChild.once("exit", resolve));
+        activeChild.kill("SIGTERM");
+        await exited;
+      }
+      resolveDone();
+    }
+  };
+}

package/src/transport/telegram/bot.js

@@ -18,6 +18,12 @@ import { createTelegramSessionBridgeController } from "./telegram-session-bridge
 import { createTelegramToolsCommandHandler } from "./telegram-tools-command.js";
 import { createTelegramWorkspaceController } from "./telegram-workspace-controller.js";
 import { resolveTelegramWorkspaceRoute } from "./workspace-group.js";
+import {
+  appendGeneralReplyRoutingInstruction,
+  isGeneralWorkspaceRoute,
+  routeGeneralWorkspaceReply
+} from "./reply-topic-routing.js";
+import { migrateLegacyReplyTopics, WorkspaceTopicStore } from "./workspace-topic-store.js";
 import {
   buildNewSessionPrompt,
   buildPrompt,
@@ -174,6 +180,7 @@ export async function createTelegramBot({ config, artifactStore, toolRegistry, t
   const bot = new Bot(config.telegram.token);
   const perChatState = createChatStateStore();
   const sessionSeeds = new SessionSeedStore();
+  const workspaceTopics = new WorkspaceTopicStore();
   const notifiedPromptErrors = new WeakSet();
   let taskTimer = null;
   const { authorizeContext, contextRoute, registerRoute } = createTelegramWorkspaceController({
@@ -276,7 +283,13 @@ export async function createTelegramBot({ config, artifactStore, toolRegistry, t
     if (normalizationRequired && !transcript) {
       logger?.log("telegram", `media normalization unavailable for chat ${route.transportChatId}: ${toolResult?.error || toolResult?.missingConfig?.join(", ") || "unknown error"}`);
     }
-    return buildPrompt({ ctx, artifact, transcript, toolResult });
+    const prompt = buildPrompt({ ctx, artifact, transcript, toolResult });
+    if (!isGeneralWorkspaceRoute(route)) return prompt;
+    const [topics, recentProposals] = await Promise.all([
+      workspaceTopics.listTopics(route.ownerChatId, route.transportChatId),
+      workspaceTopics.listRecentProposals(route.ownerChatId, route.transportChatId)
+    ]);
+    return appendGeneralReplyRoutingInstruction(prompt, topics, recentProposals);
   }
 
   const {
@@ -290,6 +303,7 @@ export async function createTelegramBot({ config, artifactStore, toolRegistry, t
     agentManager,
     artifactStore,
     sessionSeeds,
+    workspaceTopics,
     getChatState,
     buildTopicInitializationHandoff,
     logger
@@ -354,13 +368,29 @@ export async function createTelegramBot({ config, artifactStore, toolRegistry, t
       }
       executionReceipt?.resolve({ status: "executed" });
       if (text) {
-        await createWorkspaceAccessGuard(route)();
+        const topics = route.workspace && route.ownerChatId
+          ? await workspaceTopics.listTopics(route.ownerChatId, route.transportChatId)
+          : [];
+        const routedReply = routeGeneralWorkspaceReply({ route, text, topics });
+        if (routedReply.proposal) {
+          await workspaceTopics.recordProposal(route.ownerChatId, route.transportChatId, routedReply.proposal);
+          logger?.log("telegram", `recorded topic proposal ${routedReply.proposal} for workspace ${route.transportChatId}`);
+        }
+        if (!routedReply.text) return;
+        const deliveryRoute = routedReply.route;
+        const deliveryOptions = (extra = {}) => deliveryRoute.workspace && deliveryRoute.threadId
+          ? { ...extra, message_thread_id: deliveryRoute.threadId }
+          : extra;
+        await createWorkspaceAccessGuard(deliveryRoute)();
+        if (routedReply.topic) {
+          logger?.log("telegram", `routing General reply to topic ${routedReply.topic.threadId} (${routedReply.topic.name})`);
+        }
         await sendTextReply({
-          sendText: (message, extra) => bot.api.sendMessage(route.transportChatId, message, messageOptions(extra)),
-          sendDocument: (file, extra) => bot.api.sendDocument(route.transportChatId, file, messageOptions(extra)),
+          sendText: (message, extra) => bot.api.sendMessage(deliveryRoute.transportChatId, message, deliveryOptions(extra)),
+          sendDocument: (file, extra) => bot.api.sendDocument(deliveryRoute.transportChatId, file, deliveryOptions(extra)),
           chatId: sessionId,
-          artifactChatId: route.scopeChatId,
-          text
+          artifactChatId: deliveryRoute.scopeChatId,
+          text: routedReply.text
         });
       }
     };
@@ -377,10 +407,11 @@ export async function createTelegramBot({ config, artifactStore, toolRegistry, t
     replaceQueued = false,
     busyMessageMode = "queue",
     waitForExecution = false,
+    onExecutionStart = null,
     coalesceQueued = false
   }) {
     const chatState = getChatState(chatId);
-    const receipt = waitForExecution ? createPromptExecutionReceipt() : null;
+    const receipt = waitForExecution ? createPromptExecutionReceipt(onExecutionStart) : null;
 
     if (chatState.processing) {
       const incomingRoute = ctx ? contextRoute(ctx) : null;
@@ -474,6 +505,13 @@ export async function createTelegramBot({ config, artifactStore, toolRegistry, t
     });
   }
 
+  async function migrateConfiguredReplyTopics() {
+    const migratedGroups = await migrateLegacyReplyTopics(config, workspaceTopics);
+    if (!migratedGroups) return;
+    await saveConfig(config);
+    logger?.log("telegram", `migrated configured reply topics for ${migratedGroups} workspace group(s)`);
+  }
+
   async function sendStartupMessages() {
     for (const chatId of config.telegram.authorizedChatIds || []) {
       try {
@@ -505,7 +543,7 @@ export async function createTelegramBot({ config, artifactStore, toolRegistry, t
     timer.unref?.();
   }
 
-  async function enqueueAsyncPrompt({ chatId, prompt, label, route: taskRoute }) {
+  async function enqueueAsyncPrompt({ chatId, prompt, label, route: taskRoute, timeoutMs }) {
     let ctx = { chat: { id: chatId }, api: bot.api };
     const destination = taskRoute?.transport === "telegram" ? taskRoute.destination : null;
     if (destination?.chatId && destination?.threadId) {
@@ -522,7 +560,32 @@ export async function createTelegramBot({ config, artifactStore, toolRegistry, t
     const route = contextRoute(ctx);
     const chatState = getChatState(route.sessionId);
     if (chatState.processing) await ensureQueuedTelegramTyping(chatState, ctx);
-    return enqueuePrompt({ chatId: route.sessionId, prompt, label, ctx, waitForExecution: true });
+    let timer = null;
+    const execution = enqueuePrompt({
+      chatId: route.sessionId,
+      prompt,
+      label,
+      ctx,
+      waitForExecution: true,
+      onExecutionStart: ({ reject }) => {
+        if (!Number.isFinite(timeoutMs) || timeoutMs <= 0) return;
+        timer = setTimeout(() => {
+          const error = new Error(`${label} exceeded its ${timeoutMs}ms execution deadline`);
+          error.retryable = false;
+          error.outcomeUncertain = true;
+          reject(error);
+          agentManager.abortSession(route.sessionId).catch((abortError) => {
+            logger?.error("tasks", `${label} abort failed: ${getErrorMessage(abortError)}`);
+          });
+        }, timeoutMs);
+        timer.unref?.();
+      }
+    });
+    execution.then(
+      () => { if (timer) clearTimeout(timer); },
+      () => { if (timer) clearTimeout(timer); }
+    );
+    return execution;
   }
 
   const { dispatchDueTasks } = createTelegramTaskDispatcher({
@@ -533,6 +596,7 @@ export async function createTelegramBot({ config, artifactStore, toolRegistry, t
     toolRegistry,
     resourceNotes,
     agentManager,
+    taskTimeouts: config.tasks,
     logger
   });
 
@@ -737,6 +801,9 @@ export async function createTelegramBot({ config, artifactStore, toolRegistry, t
   bot.on("message", async (ctx) => {
     const auth = await authorizeContext(ctx);
     if (!auth.ok) return;
+    await workspaceTopics.observeMessage(contextRoute(ctx), ctx.message).catch((error) => {
+      logger?.error("telegram", `workspace topic observation failed: ${getErrorMessage(error)}`);
+    });
     if (!isProcessableTelegramMessage(ctx.message)) return;
 
     const command = getTelegramCommand(ctx);
@@ -765,6 +832,7 @@ export async function createTelegramBot({ config, artifactStore, toolRegistry, t
   return {
     async start({ skipAgentStartupPrompts = false } = {}) {
       config.telegram.chatMeta ||= {};
+      await migrateConfiguredReplyTopics();
       await bot.api.setMyCommands(telegramCommands);
       if (!taskTimer) {
         taskTimer = setInterval(() => {

package/src/transport/telegram/chat-queue.js

@@ -31,14 +31,24 @@ export function createChatStateStore() {
   };
 }
 
-export function createPromptExecutionReceipt() {
+export function createPromptExecutionReceipt(onStart = null) {
   let resolve;
   let reject;
+  let started = false;
   const promise = new Promise((resolvePromise, rejectPromise) => {
     resolve = resolvePromise;
     reject = rejectPromise;
   });
-  return { promise, resolve, reject };
+  return {
+    promise,
+    resolve,
+    reject,
+    start() {
+      if (started) return;
+      started = true;
+      onStart?.({ resolve, reject, promise });
+    }
+  };
 }
 
 function rejectQueuedReceipts(chatState, error) {
@@ -169,6 +179,7 @@ export async function drainChatPromptQueue({
         chatState.continueAfterClose = false;
       }
       try {
+        currentReceipt?.start?.();
         await processPrompt({ prompt: currentPrompt, ctx: currentCtx, receipt: currentReceipt });
         currentReceipt?.resolve({ status: "completed" });
       } catch (error) {