Resolve in VS Code: open a conflict from OxygenHub f532c4266f21

// "Resolve in VS Code" (OxygenHub's conflict resolver hands a conflict to

// the extension): vscode://oxygen.oxygen-vscode/resolve?url=…&bookmark=…&path=…

// Parsing and matching live here, apart from VS Code, so they are tested.

export interface ResolveRequest {

  /** The repository's clone URL on the hub. */

  url: string;

  bookmark: string;

  /** Relative to the repository root. */

  path: string;

}

/** Read a resolve request's query string, or say what is wrong with it. */

export function parseResolveQuery(query: string): ResolveRequest | string {

  const q = new URLSearchParams(query);

  const url = (q.get("url") ?? "").trim();

  const bookmark = (q.get("bookmark") ?? "").trim();

  const path = (q.get("path") ?? "").trim().replace(/^\/+/, "");

  if (!/^https?:\/\/[^\s]+$/.test(url)) {

    return "the link names no repository URL";

  }

  if (!bookmark || /[\s~^:?*[\\]/.test(bookmark) || bookmark.includes("..")) {

    return "the link names no valid bookmark";

  }

  if (!path || path.split("/").some((c) => c === "" || c === "." || c === ".." || c === ".oxy")) {

    return "the link names no valid path";

  }

  return { url, bookmark, path };

}

/** Whether two remote URLs name the same repository (case of the host and a trailing slash aside). */

export function sameRemote(a: string, b: string): boolean {

  const norm = (u: string) => {

    try {

      const x = new URL(u.trim());

      return `${x.protocol}//${x.host.toLowerCase()}${x.pathname.replace(/\/+$/, "").replace(/\.oxy$/, "")}`;

    } catch {

      return u.trim().replace(/\/+$/, "");

    }

  };

  return norm(a) === norm(b);

}

import { test } from "node:test";

import assert from "node:assert/strict";

import { parseResolveQuery, sameRemote } from "../out/handoff.mjs";

test("resolve links are read and checked", () => {

  const q = new URLSearchParams({ url: "https://hub.example:7343/andy/demo", bookmark: "feature/x", path: "src/a.txt" }).toString();

  assert.deepEqual(parseResolveQuery(q), { url: "https://hub.example:7343/andy/demo", bookmark: "feature/x", path: "src/a.txt" });

  assert.match(parseResolveQuery("bookmark=main&path=a"), /no repository URL/);

  assert.match(parseResolveQuery("url=https://h/r&bookmark=a..b&path=a"), /no valid bookmark/);

  assert.match(parseResolveQuery("url=https://h/r&bookmark=main&path=../etc/passwd"), /no valid path/);

  assert.match(parseResolveQuery("url=https://h/r&bookmark=main&path=.oxy/config"), /no valid path/);

});

test("remotes match across a trailing slash and the host's case", () => {

  assert.ok(sameRemote("https://Hub.Example:7343/andy/demo/", "https://hub.example:7343/andy/demo"));

  assert.ok(!sameRemote("https://hub.example:7343/andy/demo", "https://hub.example:7343/andy/other"));

  assert.ok(!sameRemote("https://hub.example:7343/andy/demo", "http://hub.example:7343/andy/demo"));

});

## 0.11.0 (2026-09-29)

- **Resolve in VS Code:** OxygenHub's conflict resolver links to a conflict with `vscode://oxygen.oxygen-vscode/resolve?url=…&bookmark=…&path=…`.

  - The extension finds the open checkout of that repository, or offers to clone it.

  - It asks before switching to the conflict's bookmark, pulls it, and opens the file with its conflict lenses.

  - Links with a bad URL, bookmark or path (such as `..` or `.oxy`) are refused.

OxygenHub's conflict resolver also offers **Resolve in VS Code**. The link opens this extension, which switches your checkout to the conflict's bookmark (after asking), pulls it, and opens the file here.

  "version": "0.11.0",

    "onStartupFinished",

    "onUri"

    "pretest": "esbuild src/oxy.ts --bundle --platform=node --format=esm --outfile=out/oxy.mjs && esbuild src/diffutil.ts --bundle --platform=node --format=esm --outfile=out/diffutil.mjs && esbuild src/markers.ts --bundle --platform=node --format=esm --outfile=out/markers.mjs && esbuild src/api.ts --bundle --platform=node --format=esm --outfile=out/api.mjs && esbuild src/commitbox.ts --bundle --platform=node --format=esm --outfile=out/commitbox.mjs && esbuild src/handoff.ts --bundle --platform=node --format=esm --outfile=out/handoff.mjs",

import { parseResolveQuery, sameRemote } from "./handoff";

    vscode.window.registerUriHandler({ handleUri: (uri) => handleUri(uri) }),

/**

 * vscode://oxygen.oxygen-vscode/resolve?url=…&bookmark=…&path=… from

 * OxygenHub's conflict resolver: find the open repository with that remote

 * (or offer to clone it), switch to the bookmark if asked to, pull it, and

 * open the file, where the conflict lenses take over.

 */

async function handleUri(uri: vscode.Uri): Promise<void> {

  if (uri.path !== "/resolve") {

    return;

  }

  const req = parseResolveQuery(uri.query);

  if (typeof req === "string") {

    vscode.window.showErrorMessage(`Oxygen: cannot open this conflict: ${req}.`);

    return;

  }

  let found: { repo: Repository; remote: string } | undefined;

  for (const repo of repositories.values()) {

    const remotes = await repo.oxy.remotes(repo.root).catch(() => []);

    const r = remotes.find((x) => sameRemote(x.url, req.url));

    if (r) {

      found = { repo, remote: r.name };

      break;

    }

  }

  if (!found) {

    const pick = await vscode.window.showInformationMessage(

      `Oxygen: no open folder is a checkout of ${req.url}. Clone it, open it, then follow the link again.`,

      "Clone…",

    );

    if (pick) {

      await cloneRepository(req.url);

    }

    return;

  }

  const { repo, remote } = found;

  try {

    if (repo.currentBookmark?.name !== req.bookmark) {

      const ok = await vscode.window.showInformationMessage(

        `Oxygen: the conflict is on ${req.bookmark}; this checkout is on ${repo.currentBookmark?.name ?? "another bookmark"}. Switch?`,

        { modal: true },

        "Switch",

      );

      if (!ok) {

        return;

      }

      await vscode.window.withProgress({ location: vscode.ProgressLocation.SourceControl, title: `Switching to ${req.bookmark}` }, () =>

        repo.oxy.bookmarkSwitch(repo.root, req.bookmark),

      );

    }

    await vscode.window.withProgress({ location: vscode.ProgressLocation.Notification, title: `Oxygen: pulling ${req.bookmark}` }, () =>

      repo.oxy.pull(repo.root, remote),

    );

    await repo.refresh();

    await vscode.commands.executeCommand("vscode.open", vscode.Uri.joinPath(vscode.Uri.file(repo.root), req.path));

  } catch (e) {

    showError(e);

  }

}

async function cloneRepository(prefill?: string): Promise<void> {

  const url = await vscode.window.showInputBox({ prompt: "Repository to clone (path or https URL)", placeHolder: "https://host:8890/project", value: prefill });