aibroker 0.13.0 → 0.14.0

package/dist/daemon/todoist-reply.js

@@ -0,0 +1,135 @@
+/**
+ * daemon/todoist-reply.ts — answering on the task you were asked from.
+ *
+ * A task arriving here is often a question, not a work order, and until now the
+ * answer went to a terminal the asker was not looking at. Filing from a watch
+ * and reading the reply at a desk is not a channel; it is two half channels.
+ *
+ * So a session answers on the task itself. The comment carries the agent mark,
+ * which `route()` already drops before anything else, so our own writes cannot
+ * come back as instructions.
+ *
+ * Deliberately does NOT complete the task. Completion is the human saying done
+ * — the same rule the receiver enforces on the way in — and a question whose
+ * answer you have not read yet is not done. Left open, the task keeps its place
+ * in the list with a comment indicator; completed, it vanishes from view and
+ * the answer with it.
+ */
+import { AGENT_MARK } from "./todoist-webhook.js";
+import { loadToken } from "./todoist-oauth.js";
+import { log } from "../core/log.js";
+import { audit } from "./audit.js";
+/**
+ * Fetch the task a comment belongs to.
+ *
+ * A `note:added` payload carries `item_id` and the comment text and nothing
+ * else — no project, no labels. Without them the security boundary cannot be
+ * evaluated, so a comment is unroutable until its parent is resolved. This is
+ * the lookup that makes replying-by-comment possible at all.
+ */
+export async function fetchParentTask(taskId, fetchImpl = fetch) {
+    const token = loadToken();
+    if (!token)
+        throw new Error("no Todoist authorisation on file — run `aibroker todoist auth`");
+    const res = await fetchImpl(`https://api.todoist.com/api/v1/tasks/${encodeURIComponent(taskId)}`, {
+        headers: { authorization: `${token.token_type} ${token.access_token}` },
+    });
+    const raw = await res.text();
+    if (!res.ok)
+        throw new Error(`task lookup failed with ${res.status}: ${raw.slice(0, 200)}`);
+    let t;
+    try {
+        t = JSON.parse(raw);
+    }
+    catch {
+        throw new Error(`task lookup returned unparseable body: ${raw.slice(0, 200)}`);
+    }
+    return {
+        content: t.content ?? "",
+        projectId: t.project_id ?? "",
+        labels: Array.isArray(t.labels) ? t.labels.map(String) : [],
+    };
+}
+/**
+ * Post a comment on a task as the agent.
+ *
+ * The mark is added here rather than trusted to callers: every path that can
+ * write to Todoist has to be echo-safe, and "remember the prefix" is not a
+ * safety mechanism.
+ */
+export async function replyToTask(taskId, text, fetchImpl = fetch) {
+    const token = loadToken();
+    if (!token) {
+        throw new Error("no Todoist authorisation on file — run `aibroker todoist auth`");
+    }
+    const body = text.trimStart().startsWith(AGENT_MARK) ? text : `${AGENT_MARK} ${text}`;
+    const res = await fetchImpl("https://api.todoist.com/api/v1/comments", {
+        method: "POST",
+        headers: {
+            "content-type": "application/json",
+            authorization: `${token.token_type} ${token.access_token}`,
+        },
+        body: JSON.stringify({ task_id: taskId, content: body }),
+    });
+    const raw = await res.text();
+    if (!res.ok)
+        throw new Error(`comment failed with ${res.status}: ${raw.slice(0, 200)}`);
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch {
+        throw new Error(`comment returned unparseable body: ${raw.slice(0, 200)}`);
+    }
+    const result = { commentId: parsed.id ?? "?", taskId };
+    audit({
+        action: "todoist-reply", actor: "aibroker", target: `todoist:task:${taskId}`,
+        outcome: "posted", body,
+    });
+    log(`todoist-reply: commented on ${taskId}`);
+    return result;
+}
+/** Normalise a title the way a human comparing two list rows would. */
+function sameTitle(a, b) {
+    const n = (s) => s.trim().toLowerCase().replace(/\s+/g, " ");
+    return n(a) === n(b);
+}
+/**
+ * How many OPEN tasks in this project share a title.
+ *
+ * Two tasks called the same thing are indistinguishable in a list, so a reply
+ * posted on one looks — to whoever is watching the other — exactly like being
+ * ignored. That cost two full rounds today: comment routing was working
+ * perfectly and the answers were landing on a sibling nobody was looking at.
+ * Being ignored and being answered elsewhere must not look the same.
+ *
+ * Returns 1 in the ordinary case (this task alone) and 0 when it cannot tell —
+ * a lookup failure must not invent a duplicate warning.
+ */
+export async function countTasksWithTitle(projectId, title, fetchImpl = fetch) {
+    const token = loadToken();
+    if (!token || !projectId || !title.trim())
+        return 0;
+    const res = await fetchImpl(`https://api.todoist.com/api/v1/tasks?project_id=${encodeURIComponent(projectId)}`, { headers: { authorization: `${token.token_type} ${token.access_token}` } });
+    if (!res.ok)
+        return 0;
+    let body;
+    try {
+        body = JSON.parse(await res.text());
+    }
+    catch {
+        return 0;
+    }
+    // This endpoint has returned both a bare array and a {results:[…]} envelope
+    // across versions; accept either rather than silently counting zero.
+    const list = Array.isArray(body)
+        ? body
+        : Array.isArray(body?.results)
+            ? body.results
+            : [];
+    return list.filter((t) => {
+        const c = t?.content;
+        return typeof c === "string" && sameTitle(c, title);
+    }).length;
+}
+//# sourceMappingURL=todoist-reply.js.map

package/dist/daemon/todoist-reply.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"todoist-reply.js","sourceRoot":"","sources":["../../src/daemon/todoist-reply.ts"],"names":[],"mappings":"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"}

package/dist/daemon/todoist-webhook.d.ts

@@ -65,6 +65,21 @@ export interface WebhookConfig {
     bind: string;
     /** Path the receiver answers on. Anything else 404s. */
     path: string;
+    /**
+     * Client id from the App Management Console.
+     *
+     * Only needed for the OAuth landing below — the webhook path itself is
+     * verified by HMAC and never uses it.
+     */
+    clientId?: string;
+    /**
+     * Path the OAuth redirect lands on.
+     *
+     * Todoist rejects a redirect URL carrying a port, so this one cannot be
+     * reached over the same Funnel as the webhook. Put a tailnet-only Serve on
+     * 443 in front of it — see docs/todoist.md.
+     */
+    oauthPath: string;
     /**
      * Project ids allowed to reach a session. An explicit allowlist, not a
      * subtree resolved at runtime, and deliberately so: a project added later
@@ -80,14 +95,35 @@ export interface WebhookConfig {
      */
     defaultOwner?: string;
 }
+/** Which rule chose the owner. Recorded, so a wrong guess is visible. */
+export type OwnerRule = "label" | "address" | "held" | "project" | "default";
 export type RouteDecision = {
     act: true;
     project: string;
     body: string;
     taskId: string;
+    rule: OwnerRule;
+    nearMiss?: string;
 } | {
     act: false;
     reason: string;
+    nearMiss?: string;
+};
+/**
+ * Pull a leading session name off the content.
+ *
+ * Typing a label is several taps on a phone and worse on a watch, so the
+ * cheapest possible address is the first word: "pai send a whatsapp message".
+ * Only names we already know are accepted — otherwise "home improvements"
+ * becomes a work order for the Home session — and an explicit `name:` or
+ * `name,` counts as addressing even when the name is unknown, so that a typo
+ * can be reported instead of silently ignored.
+ */
+export declare function parseAddress(content: string, known: Set<string>): {
+    owner?: string;
+    rest: string;
+    firstToken: string | null;
+    addressed: boolean;
 };
 /**
  * Verify Todoist's HMAC over the RAW body.
@@ -104,14 +140,41 @@ export declare function eventKey(e: TodoistEvent): string;
  * Pure, so the routing rules are testable without a socket: this function is
  * the entire security boundary of the ingress.
  */
-export declare function route(e: TodoistEvent, cfg: WebhookConfig): RouteDecision;
+export declare function route(e: TodoistEvent, cfg: WebhookConfig, knownOwners?: Iterable<string>, 
+/**
+ * The session already holding this task, when we know it.
+ *
+ * Only meaningful for a comment: a follow-up belongs to whoever did the work,
+ * not to whatever the project mapping would pick today.
+ */
+heldBy?: string): RouteDecision;
 export interface WebhookDeps {
-    /** Deliver a work order. Returns a short outcome for the audit record. */
-    deliver: (project: string, body: string) => Promise<{
+    /**
+     * Deliver a work order. Returns a short outcome for the audit record.
+     *
+     * `prefix` distinguishes a correction from a new work order: `[Task]` reads
+     * as "start this", and a session that receives a comment under that heading
+     * will begin again rather than adjust.
+     */
+    deliver: (project: string, body: string, opts?: {
+        prefix?: string;
+    }) => Promise<{
         outcome: string;
         session: string;
         reason?: string;
     }>;
+    /**
+     * Names that may be used as an address in a task's first word.
+     *
+     * Must be the names DISPATCH can resolve, not merely the ones a human would
+     * recognise. Addressing a live session that dispatch has no alias for reads
+     * as success and delivers nothing — which is exactly how "paicloud send me a
+     * mail" was quietly answered by the wrong session.
+     *
+     * A function rather than a list: aliases and sessions both change while the
+     * daemon runs, and a name that was valid at boot need not be valid now.
+     */
+    knownOwners?: () => string[] | Promise<string[]>;
 }
 export declare function createWebhookServer(cfg: WebhookConfig, deps: WebhookDeps): Server;
 /** Read config from the environment. Returns null when not configured. */

package/dist/daemon/todoist-webhook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"todoist-webhook.d.ts","sourceRoot":"","sources":["../../src/daemon/todoist-webhook.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiCG;AAEH,OAAO,EAA2D,KAAK,MAAM,EAAE,MAAM,WAAW,CAAC;AAKjG,qFAAqF;AACrF,eAAO,MAAM,UAAU,iBAAO,CAAC;AAE/B,MAAM,WAAW,YAAY;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC3C,SAAS,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAChE,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,aAAa;IAC5B,2EAA2E;IAC3E,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;;;;OASG;IACH,IAAI,EAAE,MAAM,CAAC;IACb,wDAAwD;IACxD,IAAI,EAAE,MAAM,CAAC;IACb;;;;OAIG;IACH,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC/B,mFAAmF;IACnF,aAAa,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACnC;;;;OAIG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,MAAM,aAAa,GACrB;IAAE,GAAG,EAAE,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAC5D;IAAE,GAAG,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnC;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAOhG;AAED,sEAAsE;AACtE,wBAAgB,QAAQ,CAAC,CAAC,EAAE,YAAY,GAAG,MAAM,CAGhD;AAED;;;;;GAKG;AACH,wBAAgB,KAAK,CAAC,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,aAAa,GAAG,aAAa,CAkDxE;AAmBD,MAAM,WAAW,WAAW;IAC1B,0EAA0E;IAC1E,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC5G;AAgBD,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,WAAW,GAAG,MAAM,CA+EjF;AAED,0EAA0E;AAC1E,wBAAgB,oBAAoB,IAAI,aAAa,GAAG,IAAI,CAuB3D;AAED,yDAAyD;AACzD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAwBpE"}
+{"version":3,"file":"todoist-webhook.d.ts","sourceRoot":"","sources":["../../src/daemon/todoist-webhook.ts"],"names":[],"mappings":"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"}

package/dist/daemon/todoist-webhook.js

@@ -36,8 +36,74 @@ import { createServer } from "node:http";
 import { createHmac, timingSafeEqual } from "node:crypto";
 import { log } from "../core/log.js";
 import { audit } from "./audit.js";
+import { handleOAuthCallback } from "./todoist-oauth.js";
 /** Prefix on anything an agent writes back to Todoist, so we ignore our own echo. */
 export const AGENT_MARK = "🤖";
+/**
+ * Something that looked like an address but was not one.
+ *
+ * A task saying `PAI do the thing` or labelled `pai` reads, to a human, as an
+ * instruction about where it should go. Neither parses, and the silent outcome
+ * is that it lands on the default owner as though nothing had been asked for.
+ * That is the failure this project keeps having to fix: a suppression nobody
+ * counts is indistinguishable from an event that never happened. So we say it.
+ */
+function detectNearMiss(labels, firstToken, addressed, known) {
+    const labelAttempt = labels.find((l) => {
+        const low = l.toLowerCase();
+        // A label that already routes is not a near miss, whichever form it took.
+        if (low.startsWith("pai:") || known.has(low))
+            return false;
+        return low.startsWith("pai");
+    });
+    if (labelAttempt)
+        return `label "${labelAttempt}" names nobody — use a session name, or pai:<name>`;
+    if (addressed && firstToken && !known.has(firstToken.toLowerCase())) {
+        return `"${firstToken}" reads as an address but no session by that name is known`;
+    }
+    return undefined;
+}
+/**
+ * Owner named by a label, in either accepted form.
+ *
+ * `pai:<name>` is explicit and works even for a name we have never heard of.
+ * A bare `<name>` label is the cheap form — one tap in Todoist's picker — and
+ * is accepted only when it matches something dispatch can actually resolve,
+ * so an ordinary label like `urgent` stays an ordinary label.
+ */
+function ownerFromLabels(labels, known) {
+    for (const raw of labels.map((l) => l.trim())) {
+        const low = raw.toLowerCase();
+        if (low.startsWith("pai:")) {
+            const name = raw.slice(4).trim();
+            if (name)
+                return name;
+        }
+        if (known.has(low))
+            return low;
+    }
+    return undefined;
+}
+/**
+ * Pull a leading session name off the content.
+ *
+ * Typing a label is several taps on a phone and worse on a watch, so the
+ * cheapest possible address is the first word: "pai send a whatsapp message".
+ * Only names we already know are accepted — otherwise "home improvements"
+ * becomes a work order for the Home session — and an explicit `name:` or
+ * `name,` counts as addressing even when the name is unknown, so that a typo
+ * can be reported instead of silently ignored.
+ */
+export function parseAddress(content, known) {
+    const m = /^([\p{L}\p{N}_-]+)([:,])?\s+([\s\S]+)$/u.exec(content.trim());
+    if (!m)
+        return { rest: content, firstToken: null, addressed: false };
+    const [, token, punct, rest] = m;
+    const addressed = Boolean(punct);
+    if (known.has(token.toLowerCase()))
+        return { owner: token.toLowerCase(), rest, firstToken: token, addressed: true };
+    return { rest: content, firstToken: token, addressed };
+}
 /**
  * Verify Todoist's HMAC over the RAW body.
  *
@@ -70,7 +136,26 @@ export function eventKey(e) {
  * Pure, so the routing rules are testable without a socket: this function is
  * the entire security boundary of the ingress.
  */
-export function route(e, cfg) {
+export function route(e, cfg, knownOwners = [], 
+/**
+ * The session already holding this task, when we know it.
+ *
+ * Only meaningful for a comment: a follow-up belongs to whoever did the work,
+ * not to whatever the project mapping would pick today.
+ */
+heldBy) {
+    // Names we will accept as an address: every session the hub can see, plus
+    // every owner named in config. Config counts even when the session is not
+    // running, so "clickr do x" is understood and reported as undeliverable
+    // rather than being read as the first word of a shopping list.
+    const known = new Set();
+    for (const n of knownOwners)
+        if (n)
+            known.add(n.toLowerCase());
+    for (const o of cfg.projectOwners.values())
+        known.add(o.toLowerCase());
+    if (cfg.defaultOwner)
+        known.add(cfg.defaultOwner.toLowerCase());
     const data = e.event_data ?? {};
     const content = typeof data.content === "string" ? data.content : "";
     const description = typeof data.description === "string" ? data.description : "";
@@ -80,7 +165,7 @@ export function route(e, cfg) {
     if (content.startsWith(AGENT_MARK) || description.startsWith(AGENT_MARK)) {
         return { act: false, reason: "agent-authored content, ignored to avoid an echo loop" };
     }
-    const ACTIONABLE = new Set(["item:added", "item:completed", "reminder:fired"]);
+    const ACTIONABLE = new Set(["item:added", "item:completed", "reminder:fired", "note:added"]);
     if (!ACTIONABLE.has(e.event_name)) {
         return { act: false, reason: `event ${e.event_name} is not actionable` };
     }
@@ -98,21 +183,52 @@ export function route(e, cfg) {
         return { act: false, reason: "task has no content" };
     }
     // Owner, most explicit first:
-    //   1. a `pai:<name>` label      — say exactly where it goes
-    //   2. the project it was filed in — "put it in the Whazaa list"
-    //   3. the configured default     — the watch case: Inbox, no label, no project
+    //   1. a `pai:<name>` label       — say exactly where it goes
+    //   2. a leading name in the text — "pai send a whatsapp message"
+    //   3. the session already holding it — a comment follows its work
+    //   4. the project it was filed in — "put it in the Whazaa list"
+    //   5. the configured default      — the watch case: Inbox, no label, no text address
+    //
+    // Text beats project: what you wrote is more deliberate than where it landed,
+    // and on a watch the project is whatever the quick-capture button chose.
     const labels = Array.isArray(data.labels) ? data.labels.map(String) : [];
-    const labelled = labels.map((l) => l.trim())
-        .find((l) => l.toLowerCase().startsWith("pai:"))?.slice(4).trim();
-    const owner = labelled || cfg.projectOwners.get(projectId) || cfg.defaultOwner;
+    const labelled = ownerFromLabels(labels, known);
+    const addr = parseAddress(content, known);
+    const nearMiss = detectNearMiss(labels, addr.firstToken, addr.addressed, known);
+    let owner;
+    let rule;
+    if (labelled) {
+        owner = labelled;
+        rule = "label";
+    }
+    else if (addr.owner) {
+        owner = addr.owner;
+        rule = "address";
+    }
+    else if (heldBy) {
+        owner = heldBy;
+        rule = "held";
+    }
+    else if (cfg.projectOwners.get(projectId)) {
+        owner = cfg.projectOwners.get(projectId);
+        rule = "project";
+    }
+    else {
+        owner = cfg.defaultOwner;
+        rule = "default";
+    }
     if (!owner) {
         return {
             act: false,
-            reason: "no pai:<name> label, no owner for this project, and no default owner configured",
+            reason: "no pai:<name> label, no name in the text, no owner for this project, and no default owner configured",
+            nearMiss,
         };
     }
-    const body = description.trim() ? `${content}\n\n${description}` : content;
-    return { act: true, project: owner, body, taskId };
+    // Only the address rule consumed part of the title; every other rule leaves
+    // the text exactly as written.
+    const title = rule === "address" ? addr.rest : content;
+    const body = description.trim() ? `${title}\n\n${description}` : title;
+    return { act: true, project: owner, body, taskId, rule, nearMiss };
 }
 /** Bounded replay guard: Todoist retries, and a retry must not run work twice. */
 class SeenSet {
@@ -156,12 +272,22 @@ export function createWebhookServer(cfg, deps) {
     const seen = new SeenSet();
     return createServer((req, res) => {
         void (async () => {
+            // Ignore query strings on the webhook path; a proxy may append them. The
+            // OAuth landing is the one place here where the query IS the payload.
+            const reqPath = (req.url ?? "/").split("?")[0];
+            if (req.method === "GET" && reqPath === cfg.oauthPath) {
+                const url = new URL(req.url ?? "/", "http://localhost");
+                const { status, html } = await handleOAuthCallback(url, {
+                    clientId: cfg.clientId,
+                    clientSecret: cfg.secret,
+                });
+                res.writeHead(status, { "content-type": "text/html; charset=utf-8" }).end(html);
+                return;
+            }
             if (req.method !== "POST") {
                 res.writeHead(405).end();
                 return;
             }
-            // Ignore query strings; a proxy may append them.
-            const reqPath = (req.url ?? "/").split("?")[0];
             if (reqPath !== cfg.path) {
                 res.writeHead(404).end();
                 return;
@@ -202,22 +328,119 @@ export function createWebhookServer(cfg, deps) {
                 return;
             }
             seen.add(key);
-            const decision = route(event, cfg);
+            // Deleting the project revokes its ingress. A grant outliving the thing
+            // it points at is dead weight in a security boundary: it reads as though
+            // access is still open, and if the id is ever reused it silently is. The
+            // boundary should only ever shrink on its own.
+            if (event.event_name === "project:deleted") {
+                const gone = String(event.event_data?.id ?? "");
+                if (gone) {
+                    const { revokeIngress } = await import("./todoist-ingress.js");
+                    if (revokeIngress(gone)) {
+                        log(`todoist-webhook: project ${gone} was deleted — its ingress grant is revoked`);
+                    }
+                }
+                // Still not actionable as work; fall through to be recorded as ignored.
+            }
+            // A comment carries item_id and its own text and nothing else — no
+            // project, no labels — so the boundary cannot be evaluated until the
+            // parent task is resolved. Do it before routing, and let a failed lookup
+            // drop the event rather than route it against a missing project, which
+            // the allowlist would refuse anyway but for the wrong reason.
+            if (event.event_name === "note:added" && !event.event_data?.project_id) {
+                const parentId = String(event.event_data?.item_id ?? "");
+                if (!parentId) {
+                    audit({
+                        action: "webhook", actor: "todoist", target: "aibroker", outcome: "ignored",
+                        reason: "comment carries no item_id", meta: { event: event.event_name },
+                    });
+                    return;
+                }
+                try {
+                    const { fetchParentTask } = await import("./todoist-reply.js");
+                    const parent = await fetchParentTask(parentId);
+                    event.event_data = {
+                        ...event.event_data,
+                        id: parentId,
+                        project_id: parent.projectId,
+                        labels: parent.labels,
+                        // Answer on the task, about the task: the comment is the
+                        // instruction, the title is the context it makes sense in.
+                        description: parent.content ? `(comment on "${parent.content}")` : "",
+                    };
+                }
+                catch (err) {
+                    const reason = `could not resolve the task a comment belongs to — ${err instanceof Error ? err.message : String(err)}`;
+                    audit({
+                        action: "webhook", actor: "todoist", target: "aibroker",
+                        outcome: "ignored", reason, meta: { event: event.event_name, taskId: parentId },
+                    });
+                    log(`todoist-webhook: ${reason}`);
+                    return;
+                }
+            }
+            const isComment = event.event_name === "note:added";
+            const parentId = String(event.event_data?.id ?? "");
+            const { ownerOf, rememberOwner } = await import("./todoist-owners.js");
+            // Grants made since the daemon started take effect now, not at the next
+            // restart. A project created and granted while you are using the system
+            // has to work immediately, or the grant is indistinguishable from a
+            // project that routes nowhere.
+            const { applyGrants } = await import("./todoist-ingress.js");
+            const live = applyGrants(cfg);
+            const decision = route(event, live, await (deps.knownOwners?.() ?? []), isComment ? ownerOf(parentId) : undefined);
             const who = event.initiator?.email ?? event.initiator?.full_name ?? "todoist";
+            if (decision.nearMiss) {
+                // Recorded whether or not the task was delivered: the point is that
+                // something was asked for and not honoured.
+                log(`todoist-webhook: near miss — ${decision.nearMiss}`);
+            }
             if (!decision.act) {
                 audit({
                     action: "webhook", actor: `todoist:${who}`, target: "aibroker",
                     outcome: "ignored", reason: decision.reason,
-                    meta: { event: event.event_name, task: event.event_data?.content ?? undefined },
+                    meta: {
+                        event: event.event_name,
+                        task: event.event_data?.content ?? undefined,
+                        nearMiss: decision.nearMiss,
+                    },
                 });
                 return;
             }
             try {
-                const r = await deps.deliver(decision.project, decision.body);
+                // The id rides along so the session can answer on the task it came
+                // from. Without it the reply has nowhere to go but a terminal the
+                // asker is not looking at.
+                // Warn when the title is not unique in its project. Two tasks with the
+                // same name are indistinguishable in a list, so an answer posted on one
+                // looks — to whoever is watching the other — exactly like being ignored.
+                // The session is told, so it can say which id it answered on.
+                let twins = 0;
+                if (!isComment) {
+                    try {
+                        const { countTasksWithTitle } = await import("./todoist-reply.js");
+                        twins = await countTasksWithTitle(String(event.event_data?.project_id ?? ""), String(event.event_data?.content ?? ""));
+                    }
+                    catch { /* a lookup failure must not block a delivery */ }
+                }
+                const twinWarning = twins > 1
+                    ? `\n\n[note: ${twins} open tasks in this project share this title — say which id you answered on]`
+                    : "";
+                const delivered = `${decision.body}${twinWarning}\n\n[todoist:${decision.taskId}]`;
+                const r = await deps.deliver(decision.project, delivered, isComment ? { prefix: "[Task:comment]" } : undefined);
+                // Remember who took it, so a later comment reaches the same session.
+                // Recorded on the way out and only on a real delivery: a task nobody
+                // accepted has no owner to inherit.
+                if (!isComment && r.outcome === "delivered")
+                    rememberOwner(decision.taskId, decision.project);
                 audit({
                     action: "webhook", actor: `todoist:${who}`, target: r.session || decision.project,
                     outcome: r.outcome, body: decision.body, reason: r.reason,
-                    meta: { event: event.event_name, taskId: decision.taskId },
+                    meta: {
+                        event: event.event_name, taskId: decision.taskId,
+                        rule: decision.rule, nearMiss: decision.nearMiss,
+                        duplicateTitles: twins > 1 ? twins : undefined,
+                    },
                 });
             }
             catch (err) {
@@ -254,6 +477,8 @@ export function webhookConfigFromEnv() {
         port: Number(process.env.TODOIST_WEBHOOK_PORT) || 8766,
         bind: process.env.TODOIST_WEBHOOK_BIND ?? "127.0.0.1",
         path: process.env.TODOIST_WEBHOOK_PATH ?? "/todoist",
+        clientId: process.env.TODOIST_CLIENT_ID,
+        oauthPath: process.env.TODOIST_OAUTH_PATH ?? "/oauth",
         ingressProjectIds: ids,
         projectOwners: owners,
         defaultOwner: process.env.TODOIST_DEFAULT_OWNER,
@@ -280,6 +505,8 @@ export function startTodoistWebhook(deps) {
     server.listen(cfg.port, cfg.bind, () => {
         log(`todoist-webhook: listening on ${cfg.bind}:${cfg.port}${cfg.path}, ` +
             `${cfg.ingressProjectIds.size} ingress project(s), default owner ${cfg.defaultOwner ?? "(none)"}`);
+        log(`todoist-webhook: OAuth landing on ${cfg.oauthPath}` +
+            (cfg.clientId ? "" : " — inert until TODOIST_CLIENT_ID is set"));
     });
     server.on("error", (err) => log(`todoist-webhook: server error — ${err.message}`));
     return server;