insightfactory-cli 1.1.2.dev29__tar.gz → 1.1.2.dev30__tar.gz

{insightfactory_cli-1.1.2.dev29 → insightfactory_cli-1.1.2.dev30}/.gitignore

@@ -9,3 +9,4 @@ __pycache__/
 dist/
 build/
 .DS_Store
+.tmp/

{insightfactory_cli-1.1.2.dev29 → insightfactory_cli-1.1.2.dev30}/CHANGELOG.md

@@ -39,6 +39,13 @@ last one has been released, so a cycle's PRs share a section.
   has to land above the released version, not merely above the base, and a PR into an
   open cycle has to add a line rather than reword one.
 
+### Fixed
+
+- The router no longer turns a `confirmed:false` preview from a mutating tool into an
+  error pointing at a web UI. That path only belongs to the Databricks connect flow;
+  a form-mode approval gate now comes back as an ordinary result, so the caller
+  confirms by calling again with `confirmed:true` as intended.
+
 ## 1.1.1
 
 ### Added

{insightfactory_cli-1.1.2.dev29 → insightfactory_cli-1.1.2.dev30}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: insightfactory-cli
-Version: 1.1.2.dev29
+Version: 1.1.2.dev30
 Summary: Profile-based authentication CLI for the InsightFactory Interfaces API
 Project-URL: Homepage, https://insightfactory.ai
 Author-email: "insightfactory.ai Support" <support@insightfactory.ai>

{insightfactory_cli-1.1.2.dev29 → insightfactory_cli-1.1.2.dev30}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "insightfactory-cli"
-version = "1.1.2.dev29"
+version = "1.1.2.dev30"
 description = "Profile-based authentication CLI for the InsightFactory Interfaces API"
 readme = "README.md"
 requires-python = ">=3.10"

{insightfactory_cli-1.1.2.dev29 → insightfactory_cli-1.1.2.dev30}/src/if_cli/router/upstream.py

@@ -138,6 +138,22 @@ class ConnectUrlRecorder:
         return types.ElicitResult(action="decline")
 
 
+def _has_url_request(result: types.InputRequiredResult) -> bool:
+    """Whether any of the result's requests is the Databricks connect flow.
+
+    A request in any other mode (today, only `form`) gates a preview behind a
+    confirmation rather than asking for a trip to a browser, so its presence
+    alone never puts the result on the connect path. A URL-mode request does,
+    even one whose URL fails the origin check in `_connect_url` and so
+    contributes no link: the call still did not run, and the caller still
+    needs the existing refusal, not a result that reads as success.
+    """
+    return any(
+        isinstance(getattr(request, "params", None), types.ElicitRequestURLParams)
+        for request in (result.input_requests or {}).values()
+    )
+
+
 def _relayable_requests(result: types.InputRequiredResult, origin: str) -> tuple[list[str], str | None]:
     """The messages this router will repeat, and the first connect URL it will name.
 
@@ -279,7 +295,16 @@ class Upstream:
         result = await self._run(call, elicitation_callback=recorder)
         if isinstance(result, types.InputRequiredResult):
             lines, url = _relayable_requests(result, self.profile["host"])
-            return self._connect_refusal(lines, url)
+            if _has_url_request(result):
+                return self._connect_refusal(lines, url)
+            # Every mutating tool gates a `confirmed:false` call behind a form-mode
+            # elicitation once the router advertises elicitation at all (see
+            # `ConnectUrlRecorder`). That gate is a preview, not a connect flow: the
+            # factory's own answer to a client with no elicitation capability is a
+            # plain `pending_confirmation` result, and the router owes the caller
+            # the closest thing it can relay to that, not an error pointing at a
+            # web UI the caller was never asked to visit.
+            return self._preview_result(lines)
         if recorder.declined_url_request:
             # The older-revision path. The server elicited in band and carried on
             # once the router declined, so the connect page is in the recorder
@@ -290,6 +315,24 @@ class Upstream:
             return self._connect_refusal(_result_texts(result), recorder.url)
         return result
 
+    def _preview_result(self, lines: list[str]) -> types.CallToolResult:
+        """A form-mode approval gate, relayed as the ordinary result it is.
+
+        This loses the structured `pending_confirmation` JSON a client with no
+        elicitation capability would see (the `approvalId`, `preview`,
+        `impactedResources`): the router has only the elicitation's message
+        text to work with, not the tool's own result body, which the factory
+        never sends once it has decided to gate the call. The message still
+        carries what a caller needs, and the caller still proceeds the same
+        way, by calling again with `confirmed:true`.
+
+        Not an error: the call is still pending, exactly as it would be for a
+        client that never advertised elicitation, and marking this `is_error`
+        would make a normal preview indistinguishable from the connect refusal
+        it is not.
+        """
+        return types.CallToolResult(content=[types.TextContent(text="\n".join(lines))], is_error=False)
+
     def _connect_refusal(self, lines: list[str], url: str | None) -> types.CallToolResult:
         """Turn the factory's request for input into a refusal naming the page to visit.
 

{insightfactory_cli-1.1.2.dev29 → insightfactory_cli-1.1.2.dev30}/tests/test_router_upstream.py

@@ -253,21 +253,49 @@ def test_call_tool_takes_the_first_same_origin_url():
     ]
 
 
-def test_call_tool_ignores_a_form_mode_request():
-    """Answering a form means relaying it downstream, which the router does not do."""
+def test_call_tool_relays_a_form_mode_request_as_a_preview_not_an_error():
+    """A `confirmed:false` mutating call gates behind a form-mode elicitation once
+    the router advertises elicitation at all; it is a preview, not a connect
+    flow, so it comes back as an ordinary result the caller can act on by
+    calling again with `confirmed:true`."""
     form = types.ElicitRequest(
         params=types.ElicitRequestFormParams(
-            message="Pick one.", requested_schema=types.ElicitRequestedSchema(properties={})
+            message="Ready to add **1** task(s) to production line **NEIL_ROUTER_DEMO**. Ask the user to confirm.",
+            requested_schema=types.ElicitRequestedSchema(properties={}),
         )
     )
     upstream, _ = _upstream_returning(_input_required(form))
 
+    result = anyio.run(lambda: upstream.call_tool("add_tasks_to_production_line", {}))
+
+    assert not result.is_error
+    assert _texts(result) == [
+        "Ready to add **1** task(s) to production line **NEIL_ROUTER_DEMO**. Ask the user to confirm."
+    ]
+
+
+def test_call_tool_treats_a_form_and_url_mix_as_the_connect_flow():
+    """A URL-mode request anywhere in the result keeps today's connect refusal,
+    even alongside a form-mode one: the connect flow must behave exactly as
+    before, so its presence, not the absence of other modes, decides the
+    outcome. The form's own message still rides along as an extra relayed
+    line, same as any other request that is not the chosen connect URL."""
+    form = types.ElicitRequest(
+        params=types.ElicitRequestFormParams(
+            message="Pick one.", requested_schema=types.ElicitRequestedSchema(properties={})
+        )
+    )
+    upstream, _ = _upstream_returning(
+        _input_required(form, _url_request("https://factory.example/my-profile/developer"))
+    )
+
     result = anyio.run(lambda: upstream.call_tool("run_sql_query", {}))
 
     assert result.is_error
     assert _texts(result) == [
         "Pick one.",
-        "[prd] This factory needs input the router cannot relay. Start at https://factory.example.",
+        "Connect your Databricks account.",
+        "[prd] Connect at https://factory.example/my-profile/developer, then retry.",
     ]