witbitz-code 1.3.5__tar.gz → 1.3.6__tar.gz

{witbitz_code-1.3.5/src/witbitz_code.egg-info → witbitz_code-1.3.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: witbitz-code
-Version: 1.3.5
+Version: 1.3.6
 Summary: Reach OpenCode on this computer from the Witbitz Spaces Code section, through an end-to-end sealed relay.
 Author: Witbitz
 License-Expression: MIT
@@ -21,6 +21,7 @@ Requires-Dist: segno>=1.5
 Requires-Dist: tinfoil<0.15,>=0.14
 Provides-Extra: test
 Requires-Dist: pytest>=8; extra == "test"
+Requires-Dist: pyflakes>=3; extra == "test"
 Dynamic: license-file
 
 # witbitz-code

{witbitz_code-1.3.5 → witbitz_code-1.3.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "witbitz-code"
-version = "1.3.5"
+version = "1.3.6"
 description = "Reach OpenCode on this computer from the Witbitz Spaces Code section, through an end-to-end sealed relay."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -29,7 +29,7 @@ dependencies = [
 ]
 
 [project.optional-dependencies]
-test = ["pytest>=8"]
+test = ["pytest>=8", "pyflakes>=3"]
 
 [project.urls]
 Documentation = "https://witbitz.chat/docs/opencode.md"

{witbitz_code-1.3.5 → witbitz_code-1.3.6}/src/witbitz_code/__init__.py

@@ -4,4 +4,4 @@ The Python implementation of tools/witbitz-code.mjs (docs/opencode-relay.md phas
 vectors and cross-implementation tests.
 """
 
-__version__ = "1.3.5"
+__version__ = "1.3.6"

{witbitz_code-1.3.5 → witbitz_code-1.3.6}/src/witbitz_code/cli.py

@@ -26,7 +26,7 @@ import httpx
 from . import __version__
 from . import pair as pair_cmd
 from . import pairings as pp
-from . import codekeys, codetools, confidential, keys, models, plugins, policy, uninstall as uninstall_mod, winagent, winconsole, wizard
+from . import codekeys, codetools, confidential, keys, models, plugins, policy, ports, toolsetup, uninstall as uninstall_mod, winagent, winconsole, wizard
 from ._js import to_number, truthy
 from .connector import pairings_for_port, start_connector
 from .payers import SessionPayers

{witbitz_code-1.3.5 → witbitz_code-1.3.6}/src/witbitz_code/opencode_plugins/witbitz-media-server.mjs

@@ -719,26 +719,35 @@ export function parseSearchAnswer (data) { // == agent/tinfoilWebSearch.mjs pars
   }
   return { text, citations }
 }
-async function webSearch (a, { fetchImpl = fetch, env = process.env } = {}) {
-  const q = String((a && a.query) || '').replace(/\s+/g, ' ').trim().slice(0, 2000)
-  if (!q) fail('query is required')
-  const apiKey = env.TINFOIL_API_KEY
-  if (!apiKey) fail('web_search needs a Tinfoil key: TINFOIL_API_KEY is not set for this OpenCode (on a laptop it comes from ~/.opencode-server.env; a cloud computer gets it from its Sentinel)')
-  const url = env.WITBITZ_SEARCH_URL || `https://${SEARCH_HOST}${SEARCH_PATH}`
-  const body = {
+/** The one Tinfoil web-search request, for a laptop (sent with the key) and for a cloud computer's Sentinel (which builds it
+ *  from the query alone, so the key it holds cannot be spent on any other call — infra/cloud-computer/sentinel). */
+export function searchRequest (query, { piiCheck = true } = {}) {
+  return {
     model: SEARCH_MODEL,
     messages: [
       { role: 'system', content: 'You are a web research assistant. Search the web and report what you find, briefly and factually, with dates. State plainly when sources disagree or when something has not happened yet. Do not speculate beyond what the sources say.' },
-      { role: 'user', content: q },
+      { role: 'user', content: query },
     ],
     max_tokens: SEARCH_MAX_TOKENS,
     reasoning_effort: SEARCH_REASONING_EFFORT,
     web_search_options: {},
-    ...(a && a.pii_check === false ? {} : { pii_check_options: {} }), // a query carrying personal data is refused before it leaves the enclave for the index
+    ...(piiCheck === false ? {} : { pii_check_options: {} }), // a query carrying personal data is refused before it leaves the enclave for the index
   }
+}
+
+async function webSearch (a, { fetchImpl = fetch, env = process.env } = {}) {
+  const q = String((a && a.query) || '').replace(/\s+/g, ' ').trim().slice(0, 2000)
+  if (!q) fail('query is required')
+  const piiCheck = !(a && a.pii_check === false)
+  // A cloud computer holds no key: the query goes to its Credential Sentinel, which builds this same request with the key.
+  const viaSentinel = env.WITBITZ_SEARCH_SENTINEL
+  const apiKey = env.TINFOIL_API_KEY
+  if (!viaSentinel && !apiKey) fail('web_search needs a Tinfoil key: TINFOIL_API_KEY is not set for this OpenCode (on a laptop it comes from ~/.opencode-server.env; a cloud computer gets it from its Sentinel)')
+  const url = viaSentinel || env.WITBITZ_SEARCH_URL || `https://${SEARCH_HOST}${SEARCH_PATH}`
+  const body = viaSentinel ? { query: q, pii_check: piiCheck } : searchRequest(q, { piiCheck })
   let data
   try {
-    const res = await fetchImpl(url, { method: 'POST', headers: { 'content-type': 'application/json', authorization: `Bearer ${apiKey}` }, body: JSON.stringify(body), signal: AbortSignal.timeout(SEARCH_TIMEOUT_MS) })
+    const res = await fetchImpl(url, { method: 'POST', headers: { 'content-type': 'application/json', ...(viaSentinel ? {} : { authorization: `Bearer ${apiKey}` }) }, body: JSON.stringify(body), signal: AbortSignal.timeout(SEARCH_TIMEOUT_MS) })
     if (!res.ok) fail(`the search endpoint answered ${res.status}`)
     data = await res.json()
   } catch (e) { fail(`could not search the web (${String((e && e.message) || e).slice(0, 160)})`) }

{witbitz_code-1.3.5 → witbitz_code-1.3.6}/src/witbitz_code/wizard.py

@@ -241,7 +241,7 @@ def _describe(step: dict) -> str:
 
 
 async def _tools_step(d: Deps) -> str:
-    """→ 'here' | 'installed' | 'partly' | 'skipped' | 'unavailable'."""
+    """→ 'here' | 'installed' | 'partly' | 'skipped' | 'unavailable' | 'failed' (an install that breaks never ends setup)."""
     try:
         report = d.probe_tools()
     except Exception:  # noqa: BLE001 — a probe that fails never stops setup
@@ -262,8 +262,12 @@ async def _tools_step(d: Deps) -> str:
     if not _yes(d.ask("   Install them now? [Y/n] ")):
         d.say("   Skipped — run witbitz-code setup again to install them, or use the card in Code.")
         return "skipped"
-    d.run_tools(plan)
-    d.refresh_path()
+    try:
+        d.run_tools(plan)
+        d.refresh_path()
+    except Exception as e:  # noqa: BLE001 — the tools are a convenience: setup goes on to serve
+        d.say(f"   Could not install them ({str(e)[:160]}) — setup goes on; \"Install with the agent\" in Code can try.")
+        return "failed"
     try:
         after = {t["id"] for t in toolsetup.missing_tools(d.probe_tools())}
     except Exception:  # noqa: BLE001

{witbitz_code-1.3.5 → witbitz_code-1.3.6/src/witbitz_code.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: witbitz-code
-Version: 1.3.5
+Version: 1.3.6
 Summary: Reach OpenCode on this computer from the Witbitz Spaces Code section, through an end-to-end sealed relay.
 Author: Witbitz
 License-Expression: MIT
@@ -21,6 +21,7 @@ Requires-Dist: segno>=1.5
 Requires-Dist: tinfoil<0.15,>=0.14
 Provides-Extra: test
 Requires-Dist: pytest>=8; extra == "test"
+Requires-Dist: pyflakes>=3; extra == "test"
 Dynamic: license-file
 
 # witbitz-code

{witbitz_code-1.3.5 → witbitz_code-1.3.6}/src/witbitz_code.egg-info/requires.txt

@@ -6,3 +6,4 @@ tinfoil<0.15,>=0.14
 
 [test]
 pytest>=8
+pyflakes>=3

{witbitz_code-1.3.5 → witbitz_code-1.3.6}/tests/test_toolsetup.py

@@ -145,3 +145,61 @@ def test_no_package_manager_says_so_without_asking():
     t = Tools(["jq"], {"os": "darwin", "pm": ""})
     r, said = step(t, [])
     assert r == "unavailable" and t.plans == [] and any("no package manager found" in s for s in said)
+
+
+def test_an_install_that_breaks_never_ends_setup():
+    # 1.3.5 on Windows: cli.py never imported toolsetup, so the first "y" died "FATAL — name 'toolsetup' is not defined"
+    t = Tools(["jq"], {"os": "win32", "pm": "winget"})
+
+    def broken(plan: list) -> dict:
+        raise NameError("name 'toolsetup' is not defined")
+
+    t.run = broken  # type: ignore[method-assign]
+    r, said = step(t, [""])
+    assert r == "failed"
+    assert any("Could not install them (name 'toolsetup' is not defined) — setup goes on" in s for s in said)
+
+
+def test_setup_hands_the_wizard_the_real_installer_and_path_refresh(monkeypatch):
+    # the wizard's own tests fake run_tools/refresh_path, so only this one runs the lambdas cli.py builds
+    from witbitz_code import cli
+
+    seen: dict = {}
+
+    async def capture(d):
+        seen["d"] = d
+        return {"served": 0}
+
+    monkeypatch.setattr(wizard, "run_setup", capture)
+    asyncio.run(cli.setup([]))
+    seen["d"].refresh_path()
+    assert seen["d"].run_tools([]) == {"done": [], "failed": [], "auto": [], "none": []}
+
+
+def test_no_module_uses_a_name_it_never_defined():
+    # pyflakes: the two missing imports that reached a release (ports in 1.3.3's serve, toolsetup in 1.3.5's setup)
+    from pathlib import Path
+
+    import pyflakes.api
+    import pyflakes.messages
+
+    import witbitz_code
+
+    class Undefined:
+        def __init__(self) -> None:
+            self.found: list[str] = []
+
+        def unexpectedError(self, filename, msg):  # noqa: N802 — pyflakes' reporter interface
+            self.found.append(f"{filename}: {msg}")
+
+        def syntaxError(self, filename, msg, lineno, offset, text):  # noqa: N802
+            self.found.append(f"{filename}:{lineno}: {msg}")
+
+        def flake(self, message):
+            if isinstance(message, pyflakes.messages.UndefinedName):
+                self.found.append(str(message))
+
+    rep = Undefined()
+    for f in sorted(Path(witbitz_code.__file__).parent.glob("*.py")):
+        pyflakes.api.check(f.read_text(encoding="utf-8"), str(f), rep)
+    assert rep.found == []