thinqos 3.3.2__tar.gz → 3.3.4__tar.gz

{thinqos-3.3.2 → thinqos-3.3.4}/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [3.3.4](https://github.com/AI4Outcomes/thinqos/compare/tools/thinqos-v3.3.3...tools/thinqos-v3.3.4) (2026-10-10)
+
+
+### Bug Fixes
+
+* follow migrated Copilot MCP configuration (TOS-7796) ([#8401](https://github.com/AI4Outcomes/thinqos/issues/8401)) ([e845518](https://github.com/AI4Outcomes/thinqos/commit/e845518d4fd2194805a6a46085ebdf9b71a136e3))
+
+## [3.3.3](https://github.com/AI4Outcomes/thinqos/compare/tools/thinqos-v3.3.2...tools/thinqos-v3.3.3) (2026-10-09)
+
+
+### Bug Fixes
+
+* release batch af78bc6f (TOS-7763, TOS-7758, TOS-7768) ([#8361](https://github.com/AI4Outcomes/thinqos/issues/8361)) ([2d27f78](https://github.com/AI4Outcomes/thinqos/commit/2d27f78d697c61c8bda2c8beedb244034b451df4))
+
 ## [3.3.2](https://github.com/AI4Outcomes/thinqos/compare/tools/thinqos-v3.3.1...tools/thinqos-v3.3.2) (2026-10-09)
 
 

{thinqos-3.3.2 → thinqos-3.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: thinqos
-Version: 3.3.2
+Version: 3.3.4
 Summary: Connect Claude Code, Codex, Grok Build, VS Code, and Cline to your thinqOS Mind.
 Project-URL: Homepage, https://thinqos.com
 Project-URL: Documentation, https://thinqos.com/mcp-memory-server
@@ -109,7 +109,7 @@ the Claude Code or Codex *extensions*, which are wired via `--client claude` /
 uvx --link-mode=copy thinqos install --client vscode --pat tq_xxxx...
 ```
 
-This registers thinqOS as an MCP server in VS Code's own `User/mcp.json` AND
+This registers thinqOS in the active VS Code/Copilot MCP configuration AND
 wires capture/reflexive-retrieve/resume hooks into the **workspace**
 `.github/copilot/settings.local.json` for the Copilot agent host. Note `settings.local.json`, NOT
 `settings.json`: the shared file is git-tracked in every AI4O repo, and
@@ -446,7 +446,10 @@ reads workspace hook sources including `.claude/settings.local.json`; thinqOS
 writes its managed capture/incremental/reflexive-retrieve/resume hooks to the
 Copilot-only `.github/copilot/settings.local.json` so they cannot double-fire
 inside Claude Code. It registers the remote thinqOS MCP server in VS Code's
-native user-level `mcp.json`:
+user-level `~/.copilot/mcp-config.json` (`mcpServers.thinqos`) once that
+Copilot config exists, honoring `COPILOT_HOME`. This follows the newer VS Code
+migration rather than recreating the legacy entry and repeating its prompt.
+Older hosts without that config continue to use native `mcp.json`:
 
 - macOS: `~/Library/Application Support/Code/User/mcp.json`
 - Windows: `%APPDATA%\Code\User\mcp.json`
@@ -461,12 +464,14 @@ to the same capture path Claude uses.
 Because the wiring lives in the workspace `.github/copilot/settings.local.json`, run
 `install --client vscode` from the repo root you want connected (the installer
 walks up for `.git` to find the workspace root). It is safe to re-run: managed
-hooks are detected and migrated, and unrelated MCP servers already in
-`mcp.json` (e.g. `github/github-mcp-server`) are preserved.
+hooks are detected and migrated, and unrelated MCP servers and existing
+custom tool allowlists are preserved. `VSCODE_MCP_PATH` explicitly overrides
+the registration file; name it `mcp-config.json` for the Copilot format.
 
 `uninstall --client vscode` removes the workspace capture hooks and the
-`servers.thinqos` entry from `User/mcp.json`, leaving any other MCP servers you
-have registered untouched.
+`thinqos` entry from the active MCP configuration, leaving any other MCP
+servers you have registered untouched. Doctor and background sync use the
+same path and schema.
 
 For a one-time backfill of past VS Code sessions in the current workspace:
 

{thinqos-3.3.2 → thinqos-3.3.4}/README.md

@@ -89,7 +89,7 @@ the Claude Code or Codex *extensions*, which are wired via `--client claude` /
 uvx --link-mode=copy thinqos install --client vscode --pat tq_xxxx...
 ```
 
-This registers thinqOS as an MCP server in VS Code's own `User/mcp.json` AND
+This registers thinqOS in the active VS Code/Copilot MCP configuration AND
 wires capture/reflexive-retrieve/resume hooks into the **workspace**
 `.github/copilot/settings.local.json` for the Copilot agent host. Note `settings.local.json`, NOT
 `settings.json`: the shared file is git-tracked in every AI4O repo, and
@@ -426,7 +426,10 @@ reads workspace hook sources including `.claude/settings.local.json`; thinqOS
 writes its managed capture/incremental/reflexive-retrieve/resume hooks to the
 Copilot-only `.github/copilot/settings.local.json` so they cannot double-fire
 inside Claude Code. It registers the remote thinqOS MCP server in VS Code's
-native user-level `mcp.json`:
+user-level `~/.copilot/mcp-config.json` (`mcpServers.thinqos`) once that
+Copilot config exists, honoring `COPILOT_HOME`. This follows the newer VS Code
+migration rather than recreating the legacy entry and repeating its prompt.
+Older hosts without that config continue to use native `mcp.json`:
 
 - macOS: `~/Library/Application Support/Code/User/mcp.json`
 - Windows: `%APPDATA%\Code\User\mcp.json`
@@ -441,12 +444,14 @@ to the same capture path Claude uses.
 Because the wiring lives in the workspace `.github/copilot/settings.local.json`, run
 `install --client vscode` from the repo root you want connected (the installer
 walks up for `.git` to find the workspace root). It is safe to re-run: managed
-hooks are detected and migrated, and unrelated MCP servers already in
-`mcp.json` (e.g. `github/github-mcp-server`) are preserved.
+hooks are detected and migrated, and unrelated MCP servers and existing
+custom tool allowlists are preserved. `VSCODE_MCP_PATH` explicitly overrides
+the registration file; name it `mcp-config.json` for the Copilot format.
 
 `uninstall --client vscode` removes the workspace capture hooks and the
-`servers.thinqos` entry from `User/mcp.json`, leaving any other MCP servers you
-have registered untouched.
+`thinqos` entry from the active MCP configuration, leaving any other MCP
+servers you have registered untouched. Doctor and background sync use the
+same path and schema.
 
 For a one-time backfill of past VS Code sessions in the current workspace:
 

{thinqos-3.3.2 → thinqos-3.3.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "thinqos"
-version = "3.3.2"
+version = "3.3.4"
 description = "Connect Claude Code, Codex, Grok Build, VS Code, and Cline to your thinqOS Mind."
 readme = "README.md"
 requires-python = ">=3.13"

{thinqos-3.3.2 → thinqos-3.3.4}/src/thinqos_capture/cli.py

@@ -1806,7 +1806,7 @@ def doctor_cmd(
                 )
             click.echo(
                 f"   Otherwise, get a fresh key from {base_url}"
-                "/settings?section=expenses and run "
+                "/api-keys and run "
                 f"`{CLI_NAME} install --repair`."
             )
         check_statuses["server"] = "fail"
@@ -2309,19 +2309,28 @@ def _grok_agents_path() -> Path:
 
 
 def _vscode_mcp_path() -> Path:
-    """User-level VS Code MCP registration file (native ``mcp.json``).
-
-    This is distinct from the Claude Code / Codex extensions that also run
-    inside VS Code - those are handled by ``--client claude`` / ``--client
-    codex`` and write into ``~/.claude`` / ``~/.codex``. This path is VS
-    Code's OWN "Agents" surface (Copilot Chat / Copilot CLI agent mode),
-    which reads MCP servers from this file, not from either coding client's
-    config. Capture hooks for this client live in the WORKSPACE
-    ``.claude/settings.local.json`` (see ``_config_path_for("vscode")``).
+    """Use the Copilot agent host's config after VS Code has migrated it.
+
+    Older hosts use ``User/mcp.json``. Once ``mcp-config.json`` exists,
+    install, sync, doctor and uninstall must follow that destination rather
+    than resurrecting the legacy registration and its migration prompt.
+    ``VSCODE_MCP_PATH`` remains an explicit override for either format.
     """
     override = os.environ.get("VSCODE_MCP_PATH")
     if override:
         return Path(override)
+    copilot_config = Path(os.environ.get("COPILOT_HOME") or (Path.home() / ".copilot"))
+    copilot_config /= "mcp-config.json"
+    if copilot_config.exists():
+        return copilot_config
+    return _vscode_legacy_mcp_path()
+
+
+def _vscode_mcp_container(path: Path) -> str:
+    return "mcpServers" if path.name == "mcp-config.json" else "servers"
+
+
+def _vscode_legacy_mcp_path() -> Path:
     home = Path.home()
     if sys.platform == "win32":
         # %APPDATA%\Code\User\mcp.json
@@ -2426,15 +2435,11 @@ def _detect_cline_mcp() -> dict[str, str | bool]:
 
 
 def _detect_vscode_mcp() -> dict[str, str | bool]:
-    """Return non-secret VS Code native MCP registration diagnostics.
-
-    VS Code's schema keys servers under ``servers`` (not Claude's
-    ``mcpServers``); each entry is otherwise the same ``type``/``url``/
-    ``headers`` shape.
-    """
+    """Return non-secret diagnostics from the active VS Code MCP format."""
     try:
-        cfg = json.loads(_vscode_mcp_path().read_text(encoding="utf-8"))
-        server = _thinqos_server_entry(cfg, "servers")
+        path = _vscode_mcp_path()
+        cfg = json.loads(path.read_text(encoding="utf-8"))
+        server = _thinqos_server_entry(cfg, _vscode_mcp_container(path))
         if server is None:
             return {"present": False}
         headers = server.get("headers", {})
@@ -5462,7 +5467,10 @@ def _registration_key_absent(client: str) -> bool:
         return False
     if not isinstance(config, dict):
         return False
-    container = config.get(_REGISTRATION_CONTAINERS[client])
+    container_key = (
+        _vscode_mcp_container(path) if client == "vscode" else _REGISTRATION_CONTAINERS[client]
+    )
+    container = config.get(container_key)
     if container is None:
         return True
     return isinstance(container, dict) and "thinqos" not in container
@@ -6522,7 +6530,7 @@ def _remove_vscode_mcp_registration(*, dry_run: bool) -> str:
         return "unreadable - preserved"
     if not isinstance(config, dict):
         return "unexpected shape - preserved"
-    servers = config.get("servers")
+    servers = config.get(_vscode_mcp_container(path))
     if not isinstance(servers, dict) or "thinqos" not in servers:
         return "not present"
     if not dry_run:
@@ -6555,14 +6563,10 @@ def _remove_cline_mcp_registration(*, dry_run: bool) -> str:
 
 
 def _ensure_vscode_mcp_registration(token: str, base_url: str) -> str:
-    """Write/refresh the ``thinqos`` entry in VS Code's native ``mcp.json``.
-
-    Safe to re-run on a file that already has unrelated servers registered
-    (e.g. ``github/github-mcp-server``) - only the ``servers.thinqos`` key is
-    ever touched. Creates the file (and parent dirs) if VS Code has not
-    created one yet, since - unlike Claude/Codex/Grok, whose config
-    directories only exist once that client has run at least once - a fresh
-    VS Code install may not have written ``User/mcp.json`` yet.
+    """Merge thinqOS into the active VS Code/Copilot MCP registration file.
+
+    Preserve unrelated servers and custom options, including Copilot's
+    tool allowlist. Older hosts without a migrated config retain mcp.json.
     """
     path = _vscode_mcp_path()
     config: dict[str, Any] = {}
@@ -6574,19 +6578,28 @@ def _ensure_vscode_mcp_registration(token: str, base_url: str) -> str:
         if not isinstance(parsed, dict):
             return "unexpected shape - preserved"
         config = parsed
-    servers = config.setdefault("servers", {})
+    container_key = _vscode_mcp_container(path)
+    servers = config.setdefault(container_key, {})
     if not isinstance(servers, dict):
-        return "unexpected servers shape - preserved"
+        return f"unexpected {container_key} shape - preserved"
     endpoint = _mcp_endpoint(base_url)
-    desired = {
+    desired: dict[str, Any] = {
         "type": "http",
         "url": endpoint,
         "headers": {"Authorization": f"Bearer {token}"},
     }
     existing = servers.get("thinqos")
-    if existing == desired:
+    merged = dict(existing) if isinstance(existing, dict) else {}
+    headers = merged.get("headers")
+    merged_headers = dict(headers) if isinstance(headers, dict) else {}
+    merged_headers.update(desired["headers"])
+    desired["headers"] = merged_headers
+    merged.update(desired)
+    if container_key == "mcpServers":
+        merged.setdefault("tools", ["*"])
+    if existing == merged:
         return "already up to date"
-    servers["thinqos"] = desired
+    servers["thinqos"] = merged
     path.parent.mkdir(parents=True, exist_ok=True)
     tmp = path.with_suffix(path.suffix + ".tmp")
     tmp.write_text(json.dumps(config, indent=2), encoding="utf-8")
@@ -7089,7 +7102,7 @@ def _prompt_for_pasted_token(base_url: str) -> str:
     """
     click.echo("")
     click.echo("No thinqOS API key found on this machine yet.")
-    click.echo(f"  1. Open {base_url}/settings?section=expenses (sign in if asked).")
+    click.echo(f"  1. Open {base_url}/api-keys (sign in if asked).")
     click.echo("  2. Click Create Key and copy the key it shows you.")
     if base_url == DEFAULT_BASE_URL:
         click.echo(

{thinqos-3.3.2 → thinqos-3.3.4}/tests/test_install.py

@@ -61,6 +61,7 @@ def _no_real_uv(monkeypatch, tmp_path) -> None:
     monkeypatch.setenv("GROK_AGENTS_PATH", str(tmp_path / "grok" / "AGENTS.md"))
     # Never touch the real VS Code User/mcp.json.
     monkeypatch.setenv("VSCODE_MCP_PATH", str(tmp_path / "vscode_mcp.json"))
+    monkeypatch.setenv("COPILOT_HOME", str(tmp_path / "copilot"))
     # Never write workspace capture hooks into the real repo's
     # .claude/settings.json - pin the resolved workspace root under tmp_path.
     vscode_workspace = tmp_path / "vscode_workspace"
@@ -635,6 +636,65 @@ def test_uninstall_vscode_dry_run_preserves_registration(tmp_path: Path, monkeyp
     assert vscode_mcp.read_text() == original
 
 
+@pytest.mark.parametrize("existing", [False, True])
+def test_vscode_follows_migrated_copilot_config(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch, existing: bool
+) -> None:
+    from thinqos_capture import cli
+
+    monkeypatch.delenv("VSCODE_MCP_PATH")
+    monkeypatch.setattr(cli.Path, "home", lambda: tmp_path)
+    monkeypatch.setattr(cli.sys, "platform", "darwin")
+    migrated = tmp_path / "copilot" / "mcp-config.json"
+    migrated.parent.mkdir()
+    custom = {"type": "http", "url": "https://old.example/mcp", "tools": ["recall"]}
+    servers = {"commons": {"type": "http", "url": "https://example.com/mcp"}}
+    if existing:
+        servers["thinqos"] = custom
+    migrated.write_text(json.dumps({"mcpServers": servers}), encoding="utf-8")
+    legacy = cli._vscode_legacy_mcp_path()
+    legacy.parent.mkdir(parents=True)
+    legacy.write_text('{"inputs": [], "servers": {}}', encoding="utf-8")
+    before = legacy.read_bytes()
+
+    assert cli._vscode_mcp_path() == migrated
+    assert cli._registration_key_absent("vscode") is (not existing)
+    assert cli._sync_client("vscode", "tq_test", "https://app.thinqos.com", dry_run=False) == (
+        "updated" if existing else "added"
+    )
+    config = json.loads(migrated.read_text(encoding="utf-8"))
+    assert config["mcpServers"]["commons"] == servers["commons"]
+    assert config["mcpServers"]["thinqos"]["tools"] == (["recall"] if existing else ["*"])
+    assert "servers" not in config
+    assert cli._detect_vscode_mcp()["present"] is True
+    assert cli._registration_key_absent("vscode") is False
+    assert cli._sync_client("vscode", "tq_test", "https://app.thinqos.com", dry_run=False) == (
+        "already up to date"
+    )
+    assert cli._remove_vscode_mcp_registration(dry_run=True) == "would remove"
+    assert cli._detect_vscode_mcp()["present"] is True
+    assert cli._remove_vscode_mcp_registration(dry_run=False) == "removed"
+    assert json.loads(migrated.read_text(encoding="utf-8"))["mcpServers"] == {
+        "commons": servers["commons"]
+    }
+    assert legacy.read_bytes() == before
+
+
+def test_vscode_preserves_malformed_migrated_config(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    from thinqos_capture import cli
+
+    migrated = tmp_path / "mcp-config.json"
+    migrated.write_text('{"mcpServers": []}', encoding="utf-8")
+    monkeypatch.setenv("VSCODE_MCP_PATH", str(migrated))
+    assert cli._ensure_vscode_mcp_registration("tq_test", "https://app.thinqos.com") == (
+        "unexpected mcpServers shape - preserved"
+    )
+    assert migrated.read_text(encoding="utf-8") == '{"mcpServers": []}'
+    assert cli._registration_key_absent("vscode") is False
+
+
 def test_vscode_mcp_path_prefers_override_env_var(
     tmp_path: Path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
@@ -2458,7 +2518,7 @@ def test_install_with_no_token_sources_prompts_and_accepts_pasted_pat(
     )
 
     assert result.exit_code == 0, result.output
-    assert "Open https://app.thinqos.com/settings?section=expenses" in result.output
+    assert "Open https://app.thinqos.com/api-keys" in result.output
     assert "Paste your thinqOS API key" in result.output
     assert read_ingest_key(tmp_path / "state") == "tq_pasted_abc123"
 

{thinqos-3.3.2 → thinqos-3.3.4}/tests/test_tos_5100_key_prompt_links.py

@@ -17,7 +17,7 @@ def test_prompt_links_directly_to_key_page(
     monkeypatch.setattr(cli.click, "prompt", lambda *a, **k: "")
     cli._prompt_for_pasted_token("https://thinqos.heartwoodguild.com")
     out = capsys.readouterr().out
-    assert "https://thinqos.heartwoodguild.com/settings?section=expenses" in out
+    assert "https://thinqos.heartwoodguild.com/api-keys" in out
     assert "Create Key" in out
     assert "/connect " not in out
     assert "Settings -> API Keys" not in out