quadwork 1.5.1 → 1.5.3

package/server/routes.telegramBridge.test.js

@@ -10,7 +10,15 @@ const assert = require("node:assert/strict");
 const fs = require("node:fs");
 const os = require("node:os");
 const path = require("node:path");
-const { readLastLines } = require("./routes");
+const { execFileSync } = require("node:child_process");
+const {
+  readLastLines,
+  checkTelegramBridgePythonDeps,
+  resolveProjectAgentchattrUrl,
+  buildTelegramBridgeToml,
+  patchAgentchattrConfigForTelegramBridge,
+  buildTelegramBridgeSpawnEnv,
+} = require("./routes");
 
 const tmp = fs.mkdtempSync(path.join(os.tmpdir(), "qw-bridge-log-"));
 function write(name, content) {
@@ -89,7 +97,142 @@ try {
   assert.match(tail, /ModuleNotFoundError/);
   assert.match(tail, /Install Bridge/);
 
-  console.log("routes.telegramBridge.test.js: all assertions passed (8 cases)");
+  // 9) #380: checkTelegramBridgePythonDeps accepts an explicit
+  //    interpreter path. Passing a guaranteed-broken path must
+  //    return { ok: false, error } without throwing.
+  const broken = checkTelegramBridgePythonDeps(path.join(tmp, "nope", "python3"));
+  assert.equal(broken.ok, false);
+  assert.ok(broken.error && broken.error.length > 0);
+
+  // 10) #380: start handler's missing-venv branch — we don't boot
+  //     the server here, but the branch reduces to a plain
+  //     fs.existsSync check on `<BRIDGE_DIR>/.venv/bin/python3`,
+  //     so we verify the check returns false for a fixture dir
+  //     that has no `.venv` subdir at all.
+  const fixtureBridgeDir = fs.mkdtempSync(path.join(tmp, "bridge-no-venv-"));
+  const missingVenvPython = path.join(fixtureBridgeDir, ".venv", "bin", "python3");
+  assert.equal(fs.existsSync(missingVenvPython), false);
+
+  // 11) #380: round-trip — build a real venv in a tmp dir, install
+  //     a stdlib-only sentinel is trivially importable, and confirm
+  //     checkTelegramBridgePythonDeps reports ok when `requests`
+  //     is installed into that venv. Skipped gracefully on CI if
+  //     `python3 -m venv` or network-backed pip install fails.
+  const venvDir = path.join(tmp, "case11-venv");
+  let venvSkipped = false;
+  try {
+    execFileSync("python3", ["-m", "venv", venvDir], { timeout: 30000, stdio: "pipe" });
+    const venvPython = path.join(venvDir, "bin", "python3");
+    const venvPip = path.join(venvDir, "bin", "pip");
+    // Without `requests` installed yet, the check must fail.
+    const before = checkTelegramBridgePythonDeps(venvPython);
+    assert.equal(before.ok, false);
+    try {
+      execFileSync(venvPip, ["install", "--quiet", "requests"], { timeout: 120000, stdio: "pipe" });
+    } catch {
+      venvSkipped = true;
+    }
+    if (!venvSkipped) {
+      const after = checkTelegramBridgePythonDeps(venvPython);
+      assert.equal(after.ok, true);
+    }
+  } catch {
+    venvSkipped = true;
+  }
+
+  // 12) #383 Bug 1: resolveProjectAgentchattrUrl prefers the
+  //     per-project URL over the global default. Every project
+  //     after the first uses a distinct port, so silently reading
+  //     the global default routed bridge traffic to the wrong AC
+  //     instance.
+  assert.equal(
+    resolveProjectAgentchattrUrl(
+      { agentchattr_url: "http://127.0.0.1:8300" },
+      { id: "quadwork", agentchattr_url: "http://127.0.0.1:8301" },
+    ),
+    "http://127.0.0.1:8301",
+  );
+  // Falls back to global default when the project has no URL of
+  // its own (legacy single-project installs).
+  assert.equal(
+    resolveProjectAgentchattrUrl(
+      { agentchattr_url: "http://127.0.0.1:8300" },
+      { id: "legacy" },
+    ),
+    "http://127.0.0.1:8300",
+  );
+  // Hard-coded fallback when neither is set.
+  assert.equal(
+    resolveProjectAgentchattrUrl({}, {}),
+    "http://127.0.0.1:8300",
+  );
+
+  // 13) #383 Bug 2: buildTelegramBridgeToml writes agentchattr_url
+  //     inside [telegram]. The upstream bridge's load_config only
+  //     reads from that section — a separate [agentchattr] section
+  //     is silently ignored and the bridge falls back to its
+  //     hardcoded :8300 default.
+  const toml13 = buildTelegramBridgeToml({
+    bot_token: "123:abc",
+    chat_id: "-42",
+    agentchattr_url: "http://127.0.0.1:8301",
+  });
+  assert.match(toml13, /^\[telegram\]/);
+  assert.match(toml13, /bot_token = "123:abc"/);
+  assert.match(toml13, /chat_id = "-42"/);
+  assert.match(toml13, /agentchattr_url = "http:\/\/127\.0\.0\.1:8301"/);
+  // Must NOT emit a separate [agentchattr] section — the bridge
+  // would silently ignore it.
+  assert.equal(toml13.includes("\n[agentchattr]\n"), false);
+
+  // 14) #383 Bug 3: patchAgentchattrConfigForTelegramBridge is
+  //     idempotent. The Install Bridge migration may run multiple
+  //     times; it must not duplicate the section or corrupt the
+  //     file.
+  const baseConfig =
+    "[agents.head]\nlabel = \"Head\"\n\n[agents.dev]\nlabel = \"Dev\"\n";
+  const first = patchAgentchattrConfigForTelegramBridge(baseConfig);
+  assert.equal(first.changed, true);
+  assert.match(first.text, /^\[agents\.telegram-bridge\]$/m);
+  assert.match(first.text, /label = "Telegram Bridge"/);
+  // Running a second time is a no-op.
+  const second = patchAgentchattrConfigForTelegramBridge(first.text);
+  assert.equal(second.changed, false);
+  assert.equal(second.text, first.text);
+  // A config that was hand-patched during diagnosis is recognized
+  // as already-correct — do not clobber the operator's edit.
+  const handPatched =
+    baseConfig + "\n[agents.telegram-bridge]\nlabel = \"Telegram Bridge\"\n";
+  const third = patchAgentchattrConfigForTelegramBridge(handPatched);
+  assert.equal(third.changed, false);
+  assert.equal(third.text, handPatched);
+
+  // 15) #383 Bug 4: buildTelegramBridgeSpawnEnv strips the three
+  //     env vars the upstream bridge treats as higher-precedence
+  //     than TOML. Without this, an operator shell that exported a
+  //     different bot's token (common on machines running AC2)
+  //     silently overrode the QuadWork-written TOML and the bridge
+  //     ran as the wrong identity.
+  const scrubbed = buildTelegramBridgeSpawnEnv({
+    PATH: "/usr/bin",
+    HOME: "/home/op",
+    TELEGRAM_BOT_TOKEN: "wrong-token",
+    TELEGRAM_CHAT_ID: "-999",
+    AGENTCHATTR_URL: "http://127.0.0.1:9999",
+  });
+  assert.equal(scrubbed.TELEGRAM_BOT_TOKEN, undefined);
+  assert.equal(scrubbed.TELEGRAM_CHAT_ID, undefined);
+  assert.equal(scrubbed.AGENTCHATTR_URL, undefined);
+  // Non-telegram keys must pass through untouched — the bridge
+  // still needs PATH/HOME/etc. to find python and open files.
+  assert.equal(scrubbed.PATH, "/usr/bin");
+  assert.equal(scrubbed.HOME, "/home/op");
+
+  console.log(
+    "routes.telegramBridge.test.js: all assertions passed (15 cases" +
+      (venvSkipped ? ", case 11 pip step skipped" : "") +
+      ")",
+  );
 } finally {
   try { fs.rmSync(tmp, { recursive: true, force: true }); } catch {}
 }

package/templates/config.toml

@@ -37,6 +37,14 @@ cwd = "{{dev_cwd}}"
 color = "#da7756"
 label = "Dev Builder"
 
+# #383: AC's registry rejects bases not declared in config.toml.
+# The Telegram bridge registers as `telegram-bridge`, so every
+# per-project AC config must declare it. The bridge has no
+# command/cwd of its own — it is a long-running external client
+# that posts to AC's HTTP API.
+[agents.telegram-bridge]
+label = "Telegram Bridge"
+
 [routing]
 default = "none"
 max_agent_hops = 30