patchwork-os 0.2.0-alpha.2 → 0.2.0-alpha.22

package/dist/connectors/github.js

@@ -1,113 +1,341 @@
 /**
- * GitHub connector — uses the `gh` CLI for all operations.
- * No OAuth app required; piggybacks on `gh auth login`.
+ * GitHub connector — routes through the official GitHub MCP server.
  *
- * Exported step helpers used by yamlRunner:
- *   listIssues(opts)  — open issues assigned to / mentioning viewer
- *   listPRs(opts)     — open PRs authored by / requested for review by viewer
- *   getStatus()       — { connected: boolean, user?: string }
+ * Endpoint: https://api.githubcopilot.com/mcp/
+ * Auth:     OAuth 2.0 via github.com/login/oauth (requires pre-registered
+ *           Patchwork OS OAuth App; client_id via PATCHWORK_GITHUB_CLIENT_ID env).
+ *
+ * HTTP routes (wired in src/server.ts):
+ *   GET    /connections/github/authorize — returns { url } for popup
+ *   GET    /connections/github/callback  — token exchange
+ *   POST   /connections/github/test      — ping MCP server
+ *   DELETE /connections/github           — delete token
+ *
+ * Exports preserved for yamlRunner; listIssues/listPRs are now async.
  */
-import { spawnSync } from "node:child_process";
-function gh(args) {
-    const result = spawnSync("gh", args, {
-        encoding: "utf-8",
-        timeout: 15_000,
-        env: { ...process.env, GITHUB_TOKEN: undefined },
-    });
-    return {
-        ok: !result.error && result.status === 0,
-        stdout: result.stdout ?? "",
-        stderr: result.stderr ?? "",
-    };
+import { McpClient } from "./mcpClient.js";
+import { completeAuthorize, getAccessToken, isConnected, loadTokenFile, revoke, startAuthorize, updateTokenProfile, vendorConfig, } from "./mcpOAuth.js";
+const GITHUB_MCP_ENDPOINT = "https://api.githubcopilot.com/mcp/";
+// ── MCP client (memoized) ────────────────────────────────────────────────────
+let _client = null;
+function client() {
+    if (!_client) {
+        _client = new McpClient(GITHUB_MCP_ENDPOINT, () => getAccessToken("github"));
+    }
+    return _client;
 }
+// ── Status ───────────────────────────────────────────────────────────────────
 export function getStatus() {
-    const r = gh(["auth", "status", "--json", "loggedInAccounts"]);
-    if (!r.ok)
+    if (!isConnected("github"))
         return { connected: false };
-    try {
-        const data = JSON.parse(r.stdout);
-        const user = data.loggedInAccounts?.[0]?.user;
-        return { connected: true, user };
-    }
-    catch {
-        // gh auth status without --json on older versions
-        const match = /Logged in to .+ account (\S+)/.exec(r.stdout + r.stderr);
-        return { connected: true, user: match?.[1] };
-    }
+    const file = loadTokenFile("github");
+    return { connected: true, user: file?.profile?.login };
 }
-export function listIssues(opts = {}) {
-    const args = ["issue", "list", "--json", "number,title,url,labels,updatedAt"];
-    if (opts.repo) {
-        args.push("--repo", opts.repo);
-    }
+function parseRepo(opts) {
+    if (!opts.repo)
+        return {};
+    const [owner, repo] = opts.repo.split("/");
+    return { owner, repo };
+}
+function coerceIssue(raw, fallbackRepo) {
+    return {
+        number: raw.number,
+        title: raw.title,
+        repo: raw.repository?.full_name ??
+            raw.repository?.nameWithOwner ??
+            fallbackRepo,
+        url: raw.html_url ?? raw.url ?? "",
+        labels: (raw.labels ?? [])
+            .map((l) => (typeof l === "string" ? l : (l.name ?? "")))
+            .filter(Boolean),
+        updatedAt: raw.updated_at ?? raw.updatedAt ?? "",
+    };
+}
+// ── Listing ──────────────────────────────────────────────────────────────────
+export async function listIssues(opts = {}) {
+    if (!isConnected("github"))
+        return [];
+    const { owner, repo } = parseRepo(opts);
+    const args = {
+        state: "open",
+        perPage: Math.min(opts.limit ?? 20, 50),
+    };
+    if (owner)
+        args.owner = owner;
+    if (repo)
+        args.repo = repo;
     if (opts.assignee)
-        args.push("--assignee", opts.assignee);
+        args.assignee = opts.assignee === "@me" ? "@me" : opts.assignee;
     if (opts.mention)
-        args.push("--mention", opts.mention);
-    args.push("--limit", String(Math.min(opts.limit ?? 20, 50)));
-    const r = gh(args);
-    if (!r.ok)
-        return [];
+        args.mentioned = opts.mention;
     try {
-        const raw = JSON.parse(r.stdout);
-        const repo = opts.repo ?? inferRepo();
-        return raw.map((i) => ({
-            number: i.number,
-            title: i.title,
-            repo,
-            url: i.url,
-            labels: i.labels.map((l) => l.name),
-            updatedAt: i.updatedAt,
-        }));
+        const res = await client().callTool("list_issues", args, {
+            cacheKey: `gh:issues:${JSON.stringify(args)}`,
+            cacheTtlMs: 60_000,
+        });
+        const parsed = McpClient.extractJson(res);
+        const arr = Array.isArray(parsed) ? parsed : (parsed.items ?? []);
+        const fallbackRepo = opts.repo ?? "";
+        return arr.map((i) => coerceIssue(i, fallbackRepo));
     }
     catch {
         return [];
     }
 }
-export function listPRs(opts = {}) {
-    const args = [
-        "pr",
-        "list",
-        "--json",
-        "number,title,url,isDraft,reviewDecision,updatedAt",
-    ];
-    if (opts.repo) {
-        args.push("--repo", opts.repo);
-    }
+export async function listPRs(opts = {}) {
+    if (!isConnected("github"))
+        return [];
+    const { owner, repo } = parseRepo(opts);
+    const args = {
+        state: "open",
+        perPage: Math.min(opts.limit ?? 20, 50),
+    };
+    if (owner)
+        args.owner = owner;
+    if (repo)
+        args.repo = repo;
     if (opts.author)
-        args.push("--author", opts.author);
+        args.author = opts.author === "@me" ? "@me" : opts.author;
     if (opts.reviewRequested)
-        args.push("--review-requested", opts.reviewRequested);
-    args.push("--limit", String(Math.min(opts.limit ?? 20, 50)));
-    const r = gh(args);
-    if (!r.ok)
-        return [];
+        args.reviewRequested = opts.reviewRequested;
     try {
-        const raw = JSON.parse(r.stdout);
-        const repo = opts.repo ?? inferRepo();
-        return raw.map((p) => ({
-            number: p.number,
-            title: p.title,
-            repo,
-            url: p.url,
-            isDraft: p.isDraft,
-            reviewDecision: p.reviewDecision ?? "",
-            updatedAt: p.updatedAt,
+        const res = await client().callTool("list_pull_requests", args, {
+            cacheKey: `gh:prs:${JSON.stringify(args)}`,
+            cacheTtlMs: 60_000,
+        });
+        const parsed = McpClient.extractJson(res);
+        const arr = Array.isArray(parsed) ? parsed : (parsed.items ?? []);
+        const fallbackRepo = opts.repo ?? "";
+        return arr.map((p) => ({
+            ...coerceIssue(p, fallbackRepo),
+            isDraft: Boolean(p.draft ?? p.isDraft ?? false),
+            reviewDecision: p.review_decision ?? p.reviewDecision ?? "",
         }));
     }
     catch {
         return [];
     }
 }
-function inferRepo() {
-    const r = gh(["repo", "view", "--json", "nameWithOwner"]);
-    if (!r.ok)
-        return "";
+function parseIssueRef(ref) {
+    // https://github.com/owner/repo/issues/42
+    const urlMatch = ref.match(/github\.com\/([^/]+)\/([^/]+)\/issues\/(\d+)/);
+    if (urlMatch) {
+        return {
+            owner: urlMatch[1],
+            repo: urlMatch[2],
+            number: Number(urlMatch[3]),
+        };
+    }
+    // owner/repo#42 or owner/repo/42
+    const shortMatch = ref.match(/^([^/]+)\/([^/#]+)[/#](\d+)$/);
+    if (shortMatch) {
+        return {
+            owner: shortMatch[1],
+            repo: shortMatch[2],
+            number: Number(shortMatch[3]),
+        };
+    }
+    throw new Error(`Cannot parse GitHub issue ref: ${ref}`);
+}
+function parsePRRef(ref) {
+    const urlMatch = ref.match(/github\.com\/([^/]+)\/([^/]+)\/pull\/(\d+)/);
+    if (urlMatch) {
+        return {
+            owner: urlMatch[1],
+            repo: urlMatch[2],
+            number: Number(urlMatch[3]),
+        };
+    }
+    const shortMatch = ref.match(/^([^/]+)\/([^/#]+)[/#](\d+)$/);
+    if (shortMatch) {
+        return {
+            owner: shortMatch[1],
+            repo: shortMatch[2],
+            number: Number(shortMatch[3]),
+        };
+    }
+    throw new Error(`Cannot parse GitHub PR ref: ${ref}`);
+}
+export async function fetchGitHubIssue(ref, signal) {
+    if (!isConnected("github"))
+        throw new Error("GitHub not connected. GET /connections/github/auth first.");
+    const { owner, repo, number } = parseIssueRef(ref);
+    const res = await client().callTool("issue_read", { owner, repo, issue_number: number, method: "get" }, { signal });
+    const raw = McpClient.extractJson(res);
+    return {
+        number: raw.number ?? number,
+        title: raw.title ?? "",
+        body: raw.body ?? "",
+        state: raw.state ?? "",
+        url: raw.html_url ?? raw.url ?? "",
+        repo: `${owner}/${repo}`,
+        author: raw.user?.login ??
+            raw.author ??
+            "",
+        labels: (raw.labels ?? []).map((l) => l.name ?? String(l)),
+        assignees: (raw.assignees ?? []).map((a) => a.login ?? String(a)),
+        createdAt: raw.created_at ?? "",
+        updatedAt: raw.updated_at ?? "",
+        comments: raw.comments ?? 0,
+    };
+}
+export async function fetchGitHubPR(ref, signal) {
+    if (!isConnected("github"))
+        throw new Error("GitHub not connected. GET /connections/github/auth first.");
+    const { owner, repo, number } = parsePRRef(ref);
+    const res = await client().callTool("pull_request_read", { owner, repo, pullNumber: number, method: "get" }, { signal });
+    const raw = McpClient.extractJson(res);
+    return {
+        number: raw.number ?? number,
+        title: raw.title ?? "",
+        body: raw.body ?? "",
+        state: raw.state ?? "",
+        url: raw.html_url ?? raw.url ?? "",
+        repo: `${owner}/${repo}`,
+        author: raw.user?.login ??
+            raw.author ??
+            "",
+        isDraft: Boolean(raw.draft ?? raw.isDraft ?? false),
+        reviewDecision: raw.review_decision ?? raw.reviewDecision ?? "",
+        labels: (raw.labels ?? []).map((l) => l.name ?? String(l)),
+        headBranch: raw.head?.ref ??
+            raw.headRefName ??
+            "",
+        baseBranch: raw.base?.ref ??
+            raw.baseRefName ??
+            "",
+        createdAt: raw.created_at ?? "",
+        updatedAt: raw.updated_at ?? "",
+        additions: raw.additions ?? 0,
+        deletions: raw.deletions ?? 0,
+    };
+}
+// ── HTTP handlers ────────────────────────────────────────────────────────────
+export async function handleGithubAuthorize() {
+    const config = vendorConfig("github");
+    if (!config.preregisteredClientId) {
+        return {
+            status: 400,
+            contentType: "application/json",
+            body: JSON.stringify({
+                ok: false,
+                error: "PATCHWORK_GITHUB_CLIENT_ID not set — register a GitHub OAuth App first",
+            }),
+        };
+    }
     try {
-        return JSON.parse(r.stdout).nameWithOwner;
+        const { url } = await startAuthorize(config);
+        return { status: 302, body: "", redirect: url };
     }
-    catch {
-        return "";
+    catch (err) {
+        return {
+            status: 400,
+            contentType: "application/json",
+            body: JSON.stringify({
+                ok: false,
+                error: err instanceof Error ? err.message : String(err),
+            }),
+        };
+    }
+}
+export async function handleGithubCallback(code, state, error) {
+    if (error) {
+        return {
+            status: 400,
+            contentType: "text/html",
+            body: `<html><body><h2>GitHub connect failed</h2><pre>${error}</pre></body></html>`,
+        };
     }
+    if (!code || !state) {
+        return {
+            status: 400,
+            contentType: "text/html",
+            body: `<html><body><h2>GitHub connect failed</h2><pre>missing code or state</pre></body></html>`,
+        };
+    }
+    const config = vendorConfig("github");
+    try {
+        await completeAuthorize(config, code, state);
+        // Capture user login for status display
+        let login = "";
+        try {
+            const token = await getAccessToken("github");
+            const res = await fetch("https://api.github.com/user", {
+                headers: {
+                    Authorization: `Bearer ${token}`,
+                    Accept: "application/json",
+                },
+            });
+            if (res.ok) {
+                const u = (await res.json());
+                login = u.login ?? "";
+                if (login) {
+                    updateTokenProfile("github", { login });
+                }
+            }
+        }
+        catch {
+            // Profile fetch is best-effort
+        }
+        return {
+            status: 200,
+            contentType: "text/html",
+            body: `<html><body><h2>GitHub connected${login ? ` as ${login}` : ""}</h2><script>window.close();</script></body></html>`,
+        };
+    }
+    catch (err) {
+        return {
+            status: 400,
+            contentType: "text/html",
+            body: `<html><body><h2>GitHub connect failed</h2><pre>${err instanceof Error ? err.message : String(err)}</pre></body></html>`,
+        };
+    }
+}
+export async function handleGithubTest() {
+    const s = getStatus();
+    if (!s.connected) {
+        return {
+            status: 200,
+            contentType: "application/json",
+            body: JSON.stringify({ ok: false, message: "Not connected" }),
+        };
+    }
+    try {
+        const ok = await client().ping({ timeoutMs: 10_000 });
+        if (ok) {
+            return {
+                status: 200,
+                contentType: "application/json",
+                body: JSON.stringify({
+                    ok: true,
+                    message: `Connected as ${s.user ?? "unknown"}`,
+                }),
+            };
+        }
+        return {
+            status: 200,
+            contentType: "application/json",
+            body: JSON.stringify({ ok: false, message: "MCP ping failed" }),
+        };
+    }
+    catch (err) {
+        return {
+            status: 200,
+            contentType: "application/json",
+            body: JSON.stringify({
+                ok: false,
+                message: err instanceof Error ? err.message : String(err),
+            }),
+        };
+    }
+}
+export async function handleGithubDisconnect() {
+    await revoke("github");
+    _client = null;
+    return {
+        status: 200,
+        contentType: "application/json",
+        body: JSON.stringify({ ok: true }),
+    };
 }
 //# sourceMappingURL=github.js.map

package/dist/connectors/github.js.map

@@ -1 +1 @@
-{"version":3,"file":"github.js","sourceRoot":"","sources":["../../src/connectors/github.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"github.js","sourceRoot":"","sources":["../../src/connectors/github.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,aAAa,EACb,MAAM,EACN,cAAc,EACd,kBAAkB,EAClB,YAAY,GACb,MAAM,eAAe,CAAC;AAEvB,MAAM,mBAAmB,GAAG,oCAAoC,CAAC;AA0CjE,gFAAgF;AAEhF,IAAI,OAAO,GAAqB,IAAI,CAAC;AACrC,SAAS,MAAM;IACb,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,GAAG,IAAI,SAAS,CAAC,mBAAmB,EAAE,GAAG,EAAE,CAChD,cAAc,CAAC,QAAQ,CAAC,CACzB,CAAC;IACJ,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,gFAAgF;AAEhF,MAAM,UAAU,SAAS;IACvB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;QAAE,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;IACxD,MAAM,IAAI,GAAG,aAAa,CAAC,QAAQ,CAAC,CAAC;IACrC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AACzD,CAAC;AAeD,SAAS,SAAS,CAAC,IAAuB;IACxC,IAAI,CAAC,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IAC1B,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3C,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACzB,CAAC;AAED,SAAS,WAAW,CAAC,GAAa,EAAE,YAAoB;IACtD,OAAO;QACL,MAAM,EAAE,GAAG,CAAC,MAAM;QAClB,KAAK,EAAE,GAAG,CAAC,KAAK;QAChB,IAAI,EACF,GAAG,CAAC,UAAU,EAAE,SAAS;YACzB,GAAG,CAAC,UAAU,EAAE,aAAa;YAC7B,YAAY;QACd,GAAG,EAAE,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE;QAClC,MAAM,EAAE,CAAC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;aACvB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;aACxD,MAAM,CAAC,OAAO,CAAC;QAClB,SAAS,EAAE,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,SAAS,IAAI,EAAE;KACjD,CAAC;AACJ,CAAC;AAED,gFAAgF;AAEhF,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,OAAuB,EAAE;IAEzB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;QAAE,OAAO,EAAE,CAAC;IACtC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,IAAI,GAA4B;QACpC,KAAK,EAAE,MAAM;QACb,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE,EAAE,CAAC;KACxC,CAAC;IACF,IAAI,KAAK;QAAE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IAC9B,IAAI,IAAI;QAAE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAC3B,IAAI,IAAI,CAAC,QAAQ;QACf,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;IAClE,IAAI,IAAI,CAAC,OAAO;QAAE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC;IAChD,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,MAAM,EAAE,CAAC,QAAQ,CAAC,aAAa,EAAE,IAAI,EAAE;YACvD,QAAQ,EAAE,aAAa,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YAC7C,UAAU,EAAE,MAAM;SACnB,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,CAClC,GAAG,CACJ,CAAC;QACF,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QAClE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;QACrC,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC,CAAC;IACtD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AASD,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,OAAoB,EAAE;IAClD,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;QAAE,OAAO,EAAE,CAAC;IACtC,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IACxC,MAAM,IAAI,GAA4B;QACpC,KAAK,EAAE,MAAM;QACb,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE,EAAE,EAAE,CAAC;KACxC,CAAC;IACF,IAAI,KAAK;QAAE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IAC9B,IAAI,IAAI;QAAE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;IAC3B,IAAI,IAAI,CAAC,MAAM;QAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;IAC3E,IAAI,IAAI,CAAC,eAAe;QAAE,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC;IACtE,IAAI,CAAC;QACH,MAAM,GAAG,GAAG,MAAM,MAAM,EAAE,CAAC,QAAQ,CAAC,oBAAoB,EAAE,IAAI,EAAE;YAC9D,QAAQ,EAAE,UAAU,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YAC1C,UAAU,EAAE,MAAM;SACnB,CAAC,CAAC;QACH,MAAM,MAAM,GAAG,SAAS,CAAC,WAAW,CAAgC,GAAG,CAAC,CAAC;QACzE,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;QAClE,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;QACrC,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YACrB,GAAG,WAAW,CAAC,CAAC,EAAE,YAAY,CAAC;YAC/B,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,OAAO,IAAI,KAAK,CAAC;YAC/C,cAAc,EAAE,CAAC,CAAC,eAAe,IAAI,CAAC,CAAC,cAAc,IAAI,EAAE;SAC5D,CAAC,CAAC,CAAC;IACN,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAsCD,SAAS,aAAa,CAAC,GAAW;IAKhC,0CAA0C;IAC1C,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAC3E,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO;YACL,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAW;YAC5B,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAW;YAC3B,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SAC5B,CAAC;IACJ,CAAC;IACD,iCAAiC;IACjC,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAC7D,IAAI,UAAU,EAAE,CAAC;QACf,OAAO;YACL,KAAK,EAAE,UAAU,CAAC,CAAC,CAAW;YAC9B,IAAI,EAAE,UAAU,CAAC,CAAC,CAAW;YAC7B,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;SAC9B,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,kCAAkC,GAAG,EAAE,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,UAAU,CAAC,GAAW;IAK7B,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,4CAA4C,CAAC,CAAC;IACzE,IAAI,QAAQ,EAAE,CAAC;QACb,OAAO;YACL,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAW;YAC5B,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAW;YAC3B,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;SAC5B,CAAC;IACJ,CAAC;IACD,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,CAAC,8BAA8B,CAAC,CAAC;IAC7D,IAAI,UAAU,EAAE,CAAC;QACf,OAAO;YACL,KAAK,EAAE,UAAU,CAAC,CAAC,CAAW;YAC9B,IAAI,EAAE,UAAU,CAAC,CAAC,CAAW;YAC7B,MAAM,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;SAC9B,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,KAAK,CAAC,+BAA+B,GAAG,EAAE,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,GAAW,EACX,MAAoB;IAEpB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;QACxB,MAAM,IAAI,KAAK,CACb,2DAA2D,CAC5D,CAAC;IACJ,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IACnD,MAAM,GAAG,GAAG,MAAM,MAAM,EAAE,CAAC,QAAQ,CACjC,YAAY,EACZ,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,EACpD,EAAE,MAAM,EAAE,CACX,CAAC;IACF,MAAM,GAAG,GAAG,SAAS,CAAC,WAAW,CAA0B,GAAG,CAAC,CAAC;IAChE,OAAO;QACL,MAAM,EAAG,GAAG,CAAC,MAAiB,IAAI,MAAM;QACxC,KAAK,EAAG,GAAG,CAAC,KAAgB,IAAI,EAAE;QAClC,IAAI,EAAG,GAAG,CAAC,IAAe,IAAI,EAAE;QAChC,KAAK,EAAG,GAAG,CAAC,KAAgB,IAAI,EAAE;QAClC,GAAG,EAAG,GAAG,CAAC,QAAmB,IAAK,GAAG,CAAC,GAAc,IAAI,EAAE;QAC1D,IAAI,EAAE,GAAG,KAAK,IAAI,IAAI,EAAE;QACxB,MAAM,EACF,GAAG,CAAC,IAAgC,EAAE,KAAgB;YACvD,GAAG,CAAC,MAAiB;YACtB,EAAE;QACJ,MAAM,EAAE,CAAE,GAAG,CAAC,MAAyC,IAAI,EAAE,CAAC,CAAC,GAAG,CAChE,CAAC,CAAC,EAAE,EAAE,CAAE,CAAC,CAAC,IAAe,IAAI,MAAM,CAAC,CAAC,CAAC,CACvC;QACD,SAAS,EAAE,CAAE,GAAG,CAAC,SAA4C,IAAI,EAAE,CAAC,CAAC,GAAG,CACtE,CAAC,CAAC,EAAE,EAAE,CAAE,CAAC,CAAC,KAAgB,IAAI,MAAM,CAAC,CAAC,CAAC,CACxC;QACD,SAAS,EAAG,GAAG,CAAC,UAAqB,IAAI,EAAE;QAC3C,SAAS,EAAG,GAAG,CAAC,UAAqB,IAAI,EAAE;QAC3C,QAAQ,EAAG,GAAG,CAAC,QAAmB,IAAI,CAAC;KACxC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,GAAW,EACX,MAAoB;IAEpB,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC;QACxB,MAAM,IAAI,KAAK,CACb,2DAA2D,CAC5D,CAAC;IACJ,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,MAAM,MAAM,EAAE,CAAC,QAAQ,CACjC,mBAAmB,EACnB,EAAE,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,EAClD,EAAE,MAAM,EAAE,CACX,CAAC;IACF,MAAM,GAAG,GAAG,SAAS,CAAC,WAAW,CAA0B,GAAG,CAAC,CAAC;IAChE,OAAO;QACL,MAAM,EAAG,GAAG,CAAC,MAAiB,IAAI,MAAM;QACxC,KAAK,EAAG,GAAG,CAAC,KAAgB,IAAI,EAAE;QAClC,IAAI,EAAG,GAAG,CAAC,IAAe,IAAI,EAAE;QAChC,KAAK,EAAG,GAAG,CAAC,KAAgB,IAAI,EAAE;QAClC,GAAG,EAAG,GAAG,CAAC,QAAmB,IAAK,GAAG,CAAC,GAAc,IAAI,EAAE;QAC1D,IAAI,EAAE,GAAG,KAAK,IAAI,IAAI,EAAE;QACxB,MAAM,EACF,GAAG,CAAC,IAAgC,EAAE,KAAgB;YACvD,GAAG,CAAC,MAAiB;YACtB,EAAE;QACJ,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,OAAO,IAAI,KAAK,CAAC;QACnD,cAAc,EACX,GAAG,CAAC,eAA0B,IAAK,GAAG,CAAC,cAAyB,IAAI,EAAE;QACzE,MAAM,EAAE,CAAE,GAAG,CAAC,MAAyC,IAAI,EAAE,CAAC,CAAC,GAAG,CAChE,CAAC,CAAC,EAAE,EAAE,CAAE,CAAC,CAAC,IAAe,IAAI,MAAM,CAAC,CAAC,CAAC,CACvC;QACD,UAAU,EACN,GAAG,CAAC,IAAgC,EAAE,GAAc;YACrD,GAAG,CAAC,WAAsB;YAC3B,EAAE;QACJ,UAAU,EACN,GAAG,CAAC,IAAgC,EAAE,GAAc;YACrD,GAAG,CAAC,WAAsB;YAC3B,EAAE;QACJ,SAAS,EAAG,GAAG,CAAC,UAAqB,IAAI,EAAE;QAC3C,SAAS,EAAG,GAAG,CAAC,UAAqB,IAAI,EAAE;QAC3C,SAAS,EAAG,GAAG,CAAC,SAAoB,IAAI,CAAC;QACzC,SAAS,EAAG,GAAG,CAAC,SAAoB,IAAI,CAAC;KAC1C,CAAC;AACJ,CAAC;AAED,gFAAgF;AAEhF,MAAM,CAAC,KAAK,UAAU,qBAAqB;IACzC,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IACtC,IAAI,CAAC,MAAM,CAAC,qBAAqB,EAAE,CAAC;QAClC,OAAO;YACL,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,kBAAkB;YAC/B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,EAAE,EAAE,KAAK;gBACT,KAAK,EACH,wEAAwE;aAC3E,CAAC;SACH,CAAC;IACJ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,EAAE,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,CAAC;QAC7C,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,CAAC;IAClD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,kBAAkB;YAC/B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,EAAE,EAAE,KAAK;gBACT,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;aACxD,CAAC;SACH,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,IAAmB,EACnB,KAAoB,EACpB,KAAoB;IAEpB,IAAI,KAAK,EAAE,CAAC;QACV,OAAO;YACL,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,WAAW;YACxB,IAAI,EAAE,kDAAkD,KAAK,sBAAsB;SACpF,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACpB,OAAO;YACL,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,WAAW;YACxB,IAAI,EAAE,0FAA0F;SACjG,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IACtC,IAAI,CAAC;QACH,MAAM,iBAAiB,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;QAC7C,wCAAwC;QACxC,IAAI,KAAK,GAAG,EAAE,CAAC;QACf,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,cAAc,CAAC,QAAQ,CAAC,CAAC;YAC7C,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,6BAA6B,EAAE;gBACrD,OAAO,EAAE;oBACP,aAAa,EAAE,UAAU,KAAK,EAAE;oBAChC,MAAM,EAAE,kBAAkB;iBAC3B;aACF,CAAC,CAAC;YACH,IAAI,GAAG,CAAC,EAAE,EAAE,CAAC;gBACX,MAAM,CAAC,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAuB,CAAC;gBACnD,KAAK,GAAG,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;gBACtB,IAAI,KAAK,EAAE,CAAC;oBACV,kBAAkB,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;gBAC1C,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC;YACP,+BAA+B;QACjC,CAAC;QACD,OAAO;YACL,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,WAAW;YACxB,IAAI,EAAE,mCAAmC,KAAK,CAAC,CAAC,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,qDAAqD;SAC1H,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,WAAW;YACxB,IAAI,EAAE,kDAAkD,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,sBAAsB;SAC/H,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,MAAM,CAAC,GAAG,SAAS,EAAE,CAAC;IACtB,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC;QACjB,OAAO;YACL,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,kBAAkB;YAC/B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC;SAC9D,CAAC;IACJ,CAAC;IACD,IAAI,CAAC;QACH,MAAM,EAAE,GAAG,MAAM,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;QACtD,IAAI,EAAE,EAAE,CAAC;YACP,OAAO;gBACL,MAAM,EAAE,GAAG;gBACX,WAAW,EAAE,kBAAkB;gBAC/B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;oBACnB,EAAE,EAAE,IAAI;oBACR,OAAO,EAAE,gBAAgB,CAAC,CAAC,IAAI,IAAI,SAAS,EAAE;iBAC/C,CAAC;aACH,CAAC;QACJ,CAAC;QACD,OAAO;YACL,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,kBAAkB;YAC/B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,iBAAiB,EAAE,CAAC;SAChE,CAAC;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO;YACL,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,kBAAkB;YAC/B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;gBACnB,EAAE,EAAE,KAAK;gBACT,OAAO,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;aAC1D,CAAC;SACH,CAAC;IACJ,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB;IAC1C,MAAM,MAAM,CAAC,QAAQ,CAAC,CAAC;IACvB,OAAO,GAAG,IAAI,CAAC;IACf,OAAO;QACL,MAAM,EAAE,GAAG;QACX,WAAW,EAAE,kBAAkB;QAC/B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;KACnC,CAAC;AACJ,CAAC"}

package/dist/connectors/gmail.d.ts

@@ -17,10 +17,13 @@ export interface GmailTokens {
     expiry_date?: number;
     token_type?: string;
     scope?: string;
+    /** Stored at auth time so refresh works even if env vars are absent. */
+    _client_id?: string;
+    _client_secret?: string;
 }
 export interface ConnectorStatus {
     id: string;
-    status: "connected" | "disconnected";
+    status: "connected" | "disconnected" | "needs_reauth";
     lastSync?: string;
     email?: string;
 }

package/dist/connectors/gmail.js

@@ -12,12 +12,17 @@
  * Client credentials read from env: GMAIL_CLIENT_ID, GMAIL_CLIENT_SECRET.
  */
 import crypto from "node:crypto";
-import { existsSync, mkdirSync, readFileSync, unlinkSync, writeFileSync, } from "node:fs";
+import { existsSync, readFileSync, unlinkSync } from "node:fs";
 import { homedir } from "node:os";
 import path from "node:path";
+import { deleteSecretJsonSync, getSecretJsonSync, storeSecretJsonSync, } from "./tokenStorage.js";
 const SCOPES = ["https://www.googleapis.com/auth/gmail.readonly"];
-const REDIRECT_URI = "http://localhost:3100/connections/gmail/callback";
-const TOKEN_PATH = path.join(homedir(), ".patchwork", "tokens", "gmail.json");
+const REDIRECT_URI = `http://localhost:${process.env.PATCHWORK_BRIDGE_PORT ?? "3101"}/connections/gmail/callback`;
+function getTokenPath() {
+    const dir = process.env.PATCHWORK_TOKEN_DIR ??
+        path.join(homedir(), ".patchwork", "tokens");
+    return path.join(dir, "gmail.json");
+}
 function clientId() {
     return process.env.GMAIL_CLIENT_ID ?? "";
 }
@@ -29,22 +34,41 @@ function isConfigured() {
 }
 // ── Token storage ─────────────────────────────────────────────────────────────
 export function loadTokens() {
-    if (!existsSync(TOKEN_PATH))
+    const secureTokens = getSecretJsonSync("gmail");
+    if (secureTokens) {
+        return secureTokens;
+    }
+    const tokenPath = getTokenPath();
+    if (!existsSync(tokenPath))
         return null;
     try {
-        return JSON.parse(readFileSync(TOKEN_PATH, "utf-8"));
+        const tokens = JSON.parse(readFileSync(tokenPath, "utf-8"));
+        saveTokens(tokens);
+        return tokens;
     }
     catch {
         return null;
     }
 }
 function saveTokens(tokens) {
-    mkdirSync(path.dirname(TOKEN_PATH), { recursive: true, mode: 0o700 });
-    writeFileSync(TOKEN_PATH, JSON.stringify(tokens, null, 2), { mode: 0o600 });
+    storeSecretJsonSync("gmail", tokens);
+    const tokenPath = getTokenPath();
+    if (existsSync(tokenPath)) {
+        try {
+            unlinkSync(tokenPath);
+        }
+        catch { }
+    }
 }
 function deleteTokens() {
-    if (existsSync(TOKEN_PATH))
-        unlinkSync(TOKEN_PATH);
+    deleteSecretJsonSync("gmail");
+    const tokenPath = getTokenPath();
+    if (existsSync(tokenPath)) {
+        try {
+            unlinkSync(tokenPath);
+        }
+        catch { }
+    }
 }
 // ── OAuth helpers ─────────────────────────────────────────────────────────────
 function buildAuthUrl(state) {
@@ -84,18 +108,24 @@ async function exchangeCode(code) {
             : undefined,
         token_type: json.token_type,
         scope: json.scope,
+        _client_id: clientId() || undefined,
+        _client_secret: clientSecret() || undefined,
     };
 }
 async function refreshAccessToken(tokens) {
     if (!tokens.refresh_token)
         throw new Error("No refresh token available");
+    const id = clientId() || tokens._client_id || "";
+    const secret = clientSecret() || tokens._client_secret || "";
+    if (!id || !secret)
+        throw new Error("Gmail client credentials not available — reconnect the Gmail connector");
     const res = await fetch("https://oauth2.googleapis.com/token", {
         method: "POST",
         headers: { "Content-Type": "application/x-www-form-urlencoded" },
         body: new URLSearchParams({
             refresh_token: tokens.refresh_token,
-            client_id: clientId(),
-            client_secret: clientSecret(),
+            client_id: id,
+            client_secret: secret,
             grant_type: "refresh_token",
         }).toString(),
     });
@@ -120,7 +150,7 @@ export async function getValidAccessToken() {
     if (!tokens)
         throw new Error("Gmail not connected");
     const bufferMs = 60_000;
-    if (tokens.expiry_date && Date.now() > tokens.expiry_date - bufferMs) {
+    if (!tokens.expiry_date || Date.now() > tokens.expiry_date - bufferMs) {
         tokens = await refreshAccessToken(tokens);
     }
     return tokens.access_token;
@@ -143,14 +173,32 @@ function generateState() {
     setTimeout(() => pendingStates.delete(state), 10 * 60 * 1000); // 10 min TTL
     return state;
 }
+function gmailStatus(tokens) {
+    if (!tokens)
+        return "disconnected";
+    const expired = !tokens.expiry_date || Date.now() > tokens.expiry_date;
+    const hasCredentials = Boolean((process.env.GMAIL_CLIENT_ID || tokens._client_id) &&
+        (process.env.GMAIL_CLIENT_SECRET || tokens._client_secret));
+    const canRefresh = Boolean(tokens.refresh_token) && hasCredentials;
+    return expired && !canRefresh ? "needs_reauth" : "connected";
+}
 export async function handleConnectionsList() {
     const tokens = loadTokens();
     const { getStatus: getGitHubStatus } = await import("./github.js");
+    const { getStatus: getSentryStatus } = await import("./sentry.js");
+    const { getStatus: getLinearStatus } = await import("./linear.js");
+    const { getStatus: getCalendarStatus } = await import("./googleCalendar.js");
+    const { isConnected: isSlackConnected, getProfile: getSlackProfile } = await import("./slack.js");
     const gh = getGitHubStatus();
+    const sentry = getSentryStatus();
+    const linear = getLinearStatus();
+    const calendar = getCalendarStatus();
+    const slackConnected = isSlackConnected();
+    const slackProfile = getSlackProfile();
     const connectors = [
         {
             id: "gmail",
-            status: tokens ? "connected" : "disconnected",
+            status: gmailStatus(tokens),
             lastSync: tokens ? new Date().toISOString() : undefined,
         },
         {
@@ -158,6 +206,26 @@ export async function handleConnectionsList() {
             status: gh.connected ? "connected" : "disconnected",
             lastSync: gh.connected ? new Date().toISOString() : undefined,
         },
+        {
+            id: "sentry",
+            status: sentry.status,
+            lastSync: sentry.lastSync,
+        },
+        {
+            id: "linear",
+            status: linear.status,
+            lastSync: linear.lastSync,
+        },
+        {
+            id: "google-calendar",
+            status: calendar.status,
+            lastSync: calendar.lastSync,
+        },
+        {
+            id: "slack",
+            status: slackConnected ? "connected" : "disconnected",
+            lastSync: slackConnected && slackProfile ? new Date().toISOString() : undefined,
+        },
     ];
     return {
         status: 200,
@@ -247,10 +315,19 @@ export async function handleGmailDisconnect() {
     };
 }
 // ── Callback HTML ─────────────────────────────────────────────────────────────
+function escHtml(s) {
+    return s
+        .replace(/&/g, "&")
+        .replace(/</g, "&lt;")
+        .replace(/>/g, "&gt;")
+        .replace(/"/g, "&quot;");
+}
 function callbackHtml(title, message, success) {
     const color = success ? "#b8ff57" : "#ff5555";
+    const t = escHtml(title);
+    const m = escHtml(message);
     return `<!DOCTYPE html><html lang="en"><head><meta charset="utf-8">
-<title>${title} — Patchwork OS</title>
+<title>${t} — Patchwork OS</title>
 <style>
   body { background: #040406; color: #e0e0e0; font-family: system-ui, sans-serif;
     display: flex; align-items: center; justify-content: center; min-height: 100vh; margin: 0; }
@@ -262,8 +339,8 @@ function callbackHtml(title, message, success) {
 </style>
 </head>
 <body><div class="card">
-  <h1>${title}</h1>
-  <p>${message}</p>
+  <h1>${t}</h1>
+  <p>${m}</p>
   <br><a href="javascript:window.close()">Close this tab</a>
 </div>
 <script>