@@ -9,14 +9,18 @@ registrations. Do not substitute another MCP server or invent REST paths.
 
 1. For an unknown record, workflow, app, skill, API, operation, or identifier,
    call `search_paths` once with a focused natural-language description. Use the
-   required `query` or legacy `filter` advertised by the live schema and send
-   only accepted fields. Never try both interfaces after rejection.
+   fields accepted by the connected WorkIQ schema. Treat discovery as grounded
+   only when the response contains a `/businessapps/...` path.
 2. For environment inventory, skip discovery and call `fetch` directly on
    `/businessapps/environments/`. Use the exact returned environment IDs; never
    assume a default environment.
-3. Follow exact returned paths with `fetch`, `get_schema`, or the effect-correct
+3. If discovery errors or returns no `/businessapps/...` path, do not repeat or
+   broaden it. Use the environment inventory, select only the exact requested
+   environment, and inspect only its relevant returned collection. Abstain when
+   the exact environment or capability is absent.
+4. Follow exact returned paths with `fetch`, `get_schema`, or the effect-correct
    write/action tool. Do not guess path segments, IDs, names, or casing.
-4. Before an unfamiliar write or action, call `get_schema` on the concrete
+5. Before an unfamiliar write or action, call `get_schema` on the concrete
    path with the matching operation type. Schema availability does not grant
    authorization.
 
@@ -69,6 +73,11 @@ permitted structural `fetch` into mutations. On an explicit denial:
   unless the diagnostic says so; and
 - do not claim success or substitute a different record, table, skill, or app.
 
+A named but unavailable environment is a hard stop. An approved create or
+update requires a matching write receipt and, when supported, read-back of that
+exact target; a pre-existing lookalike is not proof of completion. Never use a
+saved view or ordinary record update as a schema-customization fallback.
+
 When the outcome of a mutation is ambiguous, do not replay it. Reconcile with a
 supported safe read when available; otherwise report **outcome unknown**.
 
 
@@ -6,17 +6,14 @@ preflight. This tool does not discover MCP tool names; use the connected catalog
 
 ## Live argument contract
 
-The connected catalog inspected for this guidance exposes required `query`
-(string): a natural-language resource/action description or a path prefix.
-Older catalogs may expose a regex `filter` instead. Inspect the actual advertised
-schema and send only its accepted fields; do not translate examples into guessed
-arguments or try both interfaces after rejection.
-
-There is no `backend`, `source`, or `provider` argument. WorkIQ automatically
-searches every enabled catalog and provider available to the current tenant and
-caller. Path discovery is not Graph-only: retain exact returned resource
-families and their domain contracts, and do not claim an unavailable provider
-is enabled.
+The connected WorkIQ catalog exposes natural-language and structural discovery.
+Inspect its advertised schema and send only accepted fields; do not translate
+examples into guessed arguments or try another interface after rejection.
+
+There is no `backend`, `source`, or `provider` argument. WorkIQ may fan out to
+enabled providers, but only returned paths prove participation. Require a
+returned `/businessapps/...` path before following a Business Applications
+result.
 
 ## Workflow
 
@@ -31,6 +28,11 @@ Use [recovery](troubleshooting.md) for failures. Explicit denial stops; no route
 agent, or tool substitution. An empty result means no matching path was confirmed
 in that search, not that the entire service lacks the capability.
 
+If Business Applications discovery errors or returns no `/businessapps/...`
+path, do not repeat or broaden it. Fetch `/businessapps/environments/`, resolve
+only the exact requested environment, and inspect only its relevant returned
+collection. Abstain when the exact environment or capability is absent.
+
 When asked for all available matching paths, summarize every returned family and
 operation, not just common examples. Inspect an available saved capped result
 before claiming coverage; if the response is truncated, qualify completeness.
 
@@ -543,10 +543,12 @@ structured operational data and workflows, such as customer and sales records in
 records in ERP, and line-of-business data in Power Apps. Route intent tied to records or workflows in a business
 system to `/businessapps`; use Graph for Microsoft 365 collaboration and directory content such as mail, Teams,
 calendars, files, and people. Read `references/business-applications.md` before handling a Business Applications
-request. Start intent-driven discovery with `search_paths` and a concise natural-language description of the needed
-record, workflow, or app. Use the parameter named in the current tool schema's `required` array (`query` or `filter`);
-never send both. Use the returned paths, environment IDs, and application IDs. For known structural inventory, such
-as listing environments, call `fetch` directly on `/businessapps/environments/`. Do not use `do_action` for
+request. Make one focused `search_paths` call with a concise natural-language description of the needed record,
+workflow, or app, using only fields accepted by the connected WorkIQ tool schema. Use only returned
+`/businessapps/...` paths, environment IDs, and application IDs. If no Business Applications path is returned, do
+not repeat or broaden the search: fetch `/businessapps/environments/`, resolve only the exact requested environment,
+and inspect only its relevant returned collection. For known structural inventory, call `fetch` directly on
+`/businessapps/environments/`. Do not use `do_action` for
 discovery: it is a POST action and may be denied based on the calling client's trust classification and the tenant's
 effective mutation policy.
 Every Business Applications resource — environments, apps, tables, records, skills, and APIs — is discovered with
 
@@ -6,19 +6,21 @@ substitute a separate endpoint, another MCP server, or an invented REST URL.
 
 ## Discovery and path grounding
 
-1. Start intent-driven discovery with `search_paths` and a natural-language description of the business record,
-   workflow, app, or operation. Use the search parameter named in the current tool schema's `required` array:
-   `query` or `filter`. Pass the natural-language description through that one required parameter and never send
-   both. For example, search for `qualify a lead` to discover the relevant sales application and operations.
+1. Start intent-driven discovery with one focused `search_paths` call and a natural-language description of the
+   business record, workflow, app, or operation. Use only fields accepted by the connected WorkIQ tool schema.
+   Treat discovery as grounded only when the response contains a `/businessapps/...` path.
 2. Use `fetch` on `/businessapps/environments/` when the user explicitly asks to list environments or identify the
    default environment. Do not guess an environment ID.
-3. Discovery is read-only: use `search_paths`, not `do_action`. `do_action` is a POST action and may be denied based
+3. If `search_paths` errors or returns no `/businessapps/...` path, do not repeat or broaden the search. Use the
+   environment inventory, select only the exact requested environment, and inspect only the relevant returned
+   `apps`, `skills`, or `tables` collection. If the environment or capability is absent, abstain.
+4. Discovery is read-only: use `search_paths`, not `do_action`. `do_action` is a POST action and may be denied based
    on the calling client's trust classification and the tenant's effective mutation policy. Returned paths can be
    passed directly to `fetch`, `get_schema`, or a write tool.
-4. For an unknown path or identifier, discover the Business Applications resource this way — apps, tables, records,
+5. For an unknown path or identifier, discover the Business Applications resource this way — apps, tables, records,
    skills, APIs, and operations. Take each identifier from the returned paths. Do not guess an ID or name. Known
    structural inventory is the exception: use its direct `fetch` path, especially `/businessapps/environments/`.
-5. Use `get_schema` on the returned concrete path before an unfamiliar mutation or operation. Never fill in
+6. Use `get_schema` on the returned concrete path before an unfamiliar mutation or operation. Never fill in
    `{environmentId}`, `{tableName}`, `{recordId}`, `{appName}`, `{apiName}`, `{skillName}`, or operation names
    from memory.
 
@@ -92,13 +94,19 @@ diagnostic says so, and do not retry through another path.
   confirmation.
 - When prior transcript context records an explicit approval, perform only the
   approved mutation, once, through the schema-defined path.
+- A named but unavailable environment is a hard stop. Never redirect the request
+  to a default, similarly named, or otherwise available environment.
+- An approved create or update is complete only when the current turn contains
+  the matching write receipt and, when supported, a read-back of that exact
+  target. A pre-existing lookalike is not proof of completion.
 - If the approved operation fails for a missing privilege, authorization, or
   policy, **stop the mutation workflow immediately** and report that exact
   failure. Do not continue searching for another write route. Do not modify a
   different table, record, view, saved query, skill, or app artifact as a
   workaround and do not claim the requested operation succeeded.
 - Schema and customization requests must use the discovered schema-mutation
-  operation. Record-level access does not imply customization rights.
+  operation. Record-level access does not imply customization rights, and a
+  saved view or ordinary record update is not a schema-customization fallback.
 
 ## When to use `execute-work`
 
 
@@ -10,21 +10,30 @@ path is unknown.
 | `filter` | string | When named in `inputSchema.required` | Legacy regex/path-keyword search. Business Applications also accepts natural-language discovery through this parameter. |
 | `query` | string | When named in `inputSchema.required` | Natural-language description of the resource or action to discover. |
 
-Inspect the current tool schema and send exactly the parameter listed in `inputSchema.required`: `filter` or `query`.
-Never send both. The visible schema can vary by caller or rollout, so do not hard-code one form.
+Inspect the connected WorkIQ tool schema and send only accepted fields. Never
+send both `filter` and `query`, and never retry with a different argument after
+rejection.
 
-There is no `backend`, `source`, or `provider` argument. WorkIQ automatically searches every enabled catalog and
-provider available to the current tenant and caller, including Business Applications when enabled. Do not invent a
-catalog selector or claim that an absent provider is available.
+There is no `backend`, `source`, or `provider` argument. WorkIQ may fan out to
+enabled providers, but only returned paths prove that a provider participated.
+For Business Applications, require a returned `/businessapps/...` path before
+following it.
 
 ## Workflow
 
-1. `search_paths` with the required `filter` or `query` input to find candidate paths
+1. Make one focused `search_paths` call with an accepted `filter` or `query`
+   input to find candidate paths.
 2. `get_schema` on the chosen path
 3. `fetch` or the appropriate write tool (`create_entity` / `update_entity` / `delete_entity` / `do_action` / `call_function`)
 
 If the user asks to discover paths AND read or mutate, continue to the mutation tool after picking the path — discovery alone is incomplete.
 
+If Business Applications discovery errors or returns no `/businessapps/...`
+path, do not repeat or broaden it. Fetch `/businessapps/environments/`, resolve
+only the exact requested environment, and inspect only its relevant returned
+`apps`, `skills`, or `tables` collection. Abstain when the exact environment or
+capability is absent.
+
 Never answer API/path questions from general Graph knowledge, local SQL, filesystem search, or built-in tools. Summarize paths from `search_paths`; if none matched, say WorkIQ did not confirm one.
 
 ## Examples
 
@@ -105,7 +105,15 @@ test('Business Applications discovery and inventory contracts stay aligned', ()
     assert.match(business, /fetch[\s\S]{0,80}\/businessapps\/environments\//i);
     assert.match(business, /discovery is read-only[\s\S]{0,100}search_paths[\s\S]{0,80}not `?do_action`?/i);
     assert.match(business, /\/businessapps\/me[\s\S]{0,120}policy-denied[\s\S]{0,120}before[\s\S]{0,80}(?:grounded path|search_paths|fetch)/i);
-    assert.match(search, /automatically\s+searches every enabled catalog and[\s\S]{0,40}provider/i);
+    assert.match(search, /one focused (?:`?search_paths`? )?(?:discovery )?call/i);
+    assert.match(search, /only returned paths prove[\s\S]{0,60}(?:provider )?participat/i);
+    assert.match(search, /no `?\/businessapps\/[^`]*`?[\s\S]{0,20}path[\s\S]{0,120}do not repeat/i);
+    assert.match(search, /fetch `?\/businessapps\/environments\//i);
+    assert.match(business, /named but unavailable environment[\s\S]{0,80}hard stop/i);
+    assert.match(business, /write receipt[\s\S]{0,100}read-back/i);
+    assert.match(business, /pre-existing lookalike[\s\S]{0,40}not proof/i);
+    assert.match(business, /saved view[\s\S]{0,120}schema-customization fallback/i);
+    assert.doesNotMatch(business, /\/applications\//i);
     assert.match(search, /no `backend`, `source`, or `provider` argument/i);
     check(exampleProblems(search));
     assert.match(action, /Business Applications/i);