ndi-cli 0.21.0__tar.gz → 0.26.0__tar.gz

{ndi_cli-0.21.0 → ndi_cli-0.26.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ndi-cli
-Version: 0.21.0
+Version: 0.26.0
 Summary: NDI platform CLI: document operations, jobs, workspaces, and the agent workspace tools
 Keywords: ndi,cli,document-intelligence,coding-agents
 Author: Nace AI
@@ -16,7 +16,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Requires-Dist: ndi-sdk>=0.38,<1
+Requires-Dist: ndi-sdk>=0.45,<1
 Requires-Dist: truststore>=0.10.4,<1
 Requires-Python: >=3.11
 Project-URL: Homepage, https://ndi-api.nace.ai
@@ -57,12 +57,13 @@ config location. Workspace-scoped verbs also take `--workspace ID`.
 | `ndi workspace global-context [--set TEXT\|--file PATH\|--clear]` | Show, replace, or remove (`--clear`) the background every query without `--context` runs with; `--no-context` on a query runs with none |
 | `ndi files upload\|list\|get\|delete` | Workspace files (a directory walks nested files; `--ingest` then queues ingestion) |
 | `ndi ingest` | Queue ingestion |
-| `ndi automatic-search QUERY` | Service answers with fact search or an agent over files, tables and the catalog; prints the route, the output job id, and the answer (plus the catalog table when there is one) |
+| `ndi automatic-search QUERY` | Service answers with fact search or an agent over files, tables and the catalog (`--mode fact\|agent` skips the routing step, `--path` scopes it to files); prints the route, the output job id, and the answer (plus the catalog table when there is one) |
 | `ndi deep-search QUERY` / `ndi fact-search QUERY` | Agentic / single-shot search (`--path` on `deep-search` scopes it to files); then `ndi job` on each printed `grounding_job_ids` entry |
-| `ndi filtered-search QUERY` | Corpus filter/rank/count over the metadata catalog (`--cursor` pages an earlier run) |
+| `ndi filtered-search QUERY` | Corpus filter/rank/count over the metadata catalog (`--path` scopes it to files, `--cursor` pages an earlier run) |
 | `ndi je-testing QUERY` | Journal-entry testing over a ledger package (`--path` to scope it, `--reasoning-effort` for the thinking budget) |
 | `ndi ledger-understanding start\|get\|sources\|select\|selection` | Measure the ledger package, confirm sources, or read the latest report |
 | `ndi ask-file PATH QUESTION` | Cited answer over one document, image or recording |
+| `ndi systemone --state TEXT --questions JSON` | Answer `noul`, `choice` and `score` questions about a state in one call, no workspace (`--state-json` for a JSON state; any value may be `@FILE` or `@-`) |
 
 ## Sources
 

{ndi_cli-0.21.0 → ndi_cli-0.26.0}/README.md

@@ -33,12 +33,13 @@ config location. Workspace-scoped verbs also take `--workspace ID`.
 | `ndi workspace global-context [--set TEXT\|--file PATH\|--clear]` | Show, replace, or remove (`--clear`) the background every query without `--context` runs with; `--no-context` on a query runs with none |
 | `ndi files upload\|list\|get\|delete` | Workspace files (a directory walks nested files; `--ingest` then queues ingestion) |
 | `ndi ingest` | Queue ingestion |
-| `ndi automatic-search QUERY` | Service answers with fact search or an agent over files, tables and the catalog; prints the route, the output job id, and the answer (plus the catalog table when there is one) |
+| `ndi automatic-search QUERY` | Service answers with fact search or an agent over files, tables and the catalog (`--mode fact\|agent` skips the routing step, `--path` scopes it to files); prints the route, the output job id, and the answer (plus the catalog table when there is one) |
 | `ndi deep-search QUERY` / `ndi fact-search QUERY` | Agentic / single-shot search (`--path` on `deep-search` scopes it to files); then `ndi job` on each printed `grounding_job_ids` entry |
-| `ndi filtered-search QUERY` | Corpus filter/rank/count over the metadata catalog (`--cursor` pages an earlier run) |
+| `ndi filtered-search QUERY` | Corpus filter/rank/count over the metadata catalog (`--path` scopes it to files, `--cursor` pages an earlier run) |
 | `ndi je-testing QUERY` | Journal-entry testing over a ledger package (`--path` to scope it, `--reasoning-effort` for the thinking budget) |
 | `ndi ledger-understanding start\|get\|sources\|select\|selection` | Measure the ledger package, confirm sources, or read the latest report |
 | `ndi ask-file PATH QUESTION` | Cited answer over one document, image or recording |
+| `ndi systemone --state TEXT --questions JSON` | Answer `noul`, `choice` and `score` questions about a state in one call, no workspace (`--state-json` for a JSON state; any value may be `@FILE` or `@-`) |
 
 ## Sources
 

{ndi_cli-0.21.0 → ndi_cli-0.26.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ndi-cli"
-version = "0.21.0"
+version = "0.26.0"
 description = "NDI platform CLI: document operations, jobs, workspaces, and the agent workspace tools"
 readme = "README.md"
 license = "MIT"
@@ -24,7 +24,7 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "ndi-sdk>=0.38,<1",
+    "ndi-sdk>=0.45,<1",
     "truststore>=0.10.4,<1",
 ]
 

{ndi_cli-0.21.0 → ndi_cli-0.26.0}/pyproject.toml.orig

@@ -1,6 +1,6 @@
 [project]
 name = "ndi-cli"
-version = "0.21.0"
+version = "0.26.0"
 description = "NDI platform CLI: document operations, jobs, workspaces, and the agent workspace tools"
 authors = [
     { name = "Nace AI", email = "engineering@nace.ai" }
@@ -27,7 +27,7 @@ classifiers = [
     "Typing :: Typed",
 ]
 dependencies = [
-    "ndi-sdk>=0.38,<1",
+    "ndi-sdk>=0.45,<1",
     "truststore>=0.10.4,<1",
 ]
 

{ndi_cli-0.21.0 → ndi_cli-0.26.0}/src/ndi_cli/__init__.py

@@ -6,4 +6,4 @@ methods. Inside an agent sandbox the workspace tools (``folder-metadata``,
 are the whole surface; outside one only ``ask-file`` is.
 """
 
-__version__ = "0.21.0"
+__version__ = "0.26.0"

{ndi_cli-0.21.0 → ndi_cli-0.26.0}/src/ndi_cli/_cli.py

@@ -8,16 +8,18 @@ when ``$NDI_CLI_SOCKET`` is set, before any client is built.
 from __future__ import annotations
 
 import argparse
+import copy
 import os
 import sys
+from concurrent.futures import ThreadPoolExecutor
 
 from ndi_sdk.client import NdiClient
 from ndi_sdk.errors import NdiError, NdiStatusError
 from ndi_sdk.resources.tools import SyncTools
 
-from ndi_cli import _docops, _jobs, _login, _tools, _workspace
+from ndi_cli import _docops, _jobs, _login, _systemone, _tools, _workspace
 from ndi_cli._config import ConfigError, resolve_settings
-from ndi_cli._local import KG_ENV, SOCKET_ENV, TOKEN_ENV, LocalTransport
+from ndi_cli._local import SOCKET_ENV, TOKEN_ENV, LocalTransport
 from ndi_cli._output import full_json, output_limit, print_full_or_summary
 from ndi_cli._tools import parse_pages
 
@@ -33,8 +35,7 @@ def main(argv: list[str] | None = None) -> int:
     # Presence, not truthiness: an empty $NDI_CLI_SOCKET still means "inside an
     # agent run", and must not silently unlock the full platform CLI.
     in_agent_run = socket_path is not None
-    # An agent run gets kg-answer only when the worker granted it.
-    parser = _build_parser(in_agent_run=in_agent_run, graph=in_agent_run and bool(os.environ.get(KG_ENV)))
+    parser = _build_parser(in_agent_run=in_agent_run)
     args = parser.parse_args(argv)
     if args.command is None:
         parser.print_help()
@@ -100,22 +101,35 @@ def main(argv: list[str] | None = None) -> int:
 def _run_tool(args: argparse.Namespace, tools: SyncTools, workspace_id: str, printer) -> int:
     """Run a tool once per positional target (``file-metadata a b``), each printed as its own call would print it.
 
-    With several targets a failing one reports on stderr and the rest still run, so one
-    bad path costs the caller that path's error line, not every other path's answer.
+    The targets are fetched concurrently and printed in the order given. With several
+    targets a failing one reports on stderr and the rest still run, so one bad path costs
+    the caller that path's error line, not every other path's answer.
     """
     targets = getattr(args, "targets", [None])
     if len(targets) == 1:
         args.target = targets[0]
         return printer(args, args.run(tools, workspace_id, args))
+
+    def fetch(target: str) -> tuple[argparse.Namespace, object]:
+        per_target = copy.copy(args)
+        per_target.target = target
+        try:
+            return per_target, per_target.run(tools, workspace_id, per_target)
+        except NdiError as exc:
+            return per_target, exc
+
+    with ThreadPoolExecutor(max_workers=len(targets)) as pool:
+        fetched = list(pool.map(fetch, targets))
     status = 0
-    for index, target in enumerate(targets):
-        args.target = target
+    for index, (per_target, response) in enumerate(fetched):
         if index:
             print()
-        try:
-            status = max(status, printer(args, args.run(tools, workspace_id, args)))
-        except NdiError as exc:
-            status = max(status, _report_error(exc, target=target))
+        if getattr(args, "label_targets", False):
+            print(f"==> {per_target.target} <==")
+        if isinstance(response, NdiError):
+            status = max(status, _report_error(response, target=per_target.target))
+        else:
+            status = max(status, printer(per_target, response))
     return status
 
 
@@ -173,7 +187,7 @@ def _validation_error_lines(detail: object) -> list[str]:
     return lines
 
 
-def _build_parser(*, in_agent_run: bool = False, graph: bool = False) -> argparse.ArgumentParser:
+def _build_parser(*, in_agent_run: bool = False) -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(
         prog="ndi",
         description=(
@@ -196,10 +210,11 @@ def _build_parser(*, in_agent_run: bool = False, graph: bool = False) -> argpars
     )
     sub = parser.add_subparsers(dest="command")
     _login.add_parsers(sub)
-    _tools.add_parsers(sub, common, in_agent_run=in_agent_run, graph=graph)
+    _tools.add_parsers(sub, common, in_agent_run=in_agent_run)
     _docops.add_parsers(sub, common)
     _jobs.add_parsers(sub, common)
     _workspace.add_parsers(sub, common)
+    _systemone.add_parsers(sub, default_timeout=DEFAULT_TIMEOUT_SECONDS)
     return parser
 
 

{ndi_cli-0.21.0 → ndi_cli-0.26.0}/src/ndi_cli/_local.py

@@ -21,9 +21,6 @@ from ndi_cli.commands import WorkspaceCommand
 
 SOCKET_ENV = "NDI_CLI_SOCKET"
 TOKEN_ENV = "NDI_CLI_TOKEN"
-#: Set (to any non-empty value) by the worker for an agent run that has the graph
-#: surface; inside an agent run ``kg-answer`` is registered only when it is.
-KG_ENV = "NDI_CLI_KG"
 MAX_MESSAGE_BYTES = 16 * 1024 * 1024
 ModelT = TypeVar("ModelT", bound=BaseModel)
 
@@ -101,29 +98,8 @@ class SearchCommand(BaseModel):
     body: SearchRequest
 
 
-class KgAnswerRequest(BaseModel):
-    """``kg-answer``'s question as a socket body.
-
-    The agent passes its verbatim question; the server runs the graph pass and
-    returns the rendered outcome (answered text + citations, or evidence + gap).
-    """
-
-    query: str
-
-
-class KgAnswerResponse(BaseModel):
-    """The rendered outcome of one graph pass, ready to print or inject as a tool result."""
-
-    text: str
-
-
-class KgAnswerCommand(BaseModel):
-    command: Literal[WorkspaceCommand.KG_ANSWER] = WorkspaceCommand.KG_ANSWER
-    body: KgAnswerRequest
-
-
 Command = Annotated[
-    FolderCommand | FileCommand | ReadCommand | AskCommand | SqlCommand | SearchCommand | KgAnswerCommand,
+    FolderCommand | FileCommand | ReadCommand | AskCommand | SqlCommand | SearchCommand,
     Field(discriminator="command"),
 ]
 COMMAND = TypeAdapter(Command)

{ndi_cli-0.21.0 → ndi_cli-0.26.0}/src/ndi_cli/_output.py

@@ -49,7 +49,8 @@ def shortened(full: str, args, *, get_full: str = "rerun with --json") -> bool:
     """Whether ``full`` is too long for stdout; if so, tell stderr how to get it.
 
     A file target is never shortened — the limit protects a reader's context,
-    and ``--save`` / ``--out-dir`` asked for the whole thing. ``get_full`` names
+    and ``--save`` / ``--out-dir`` asked for the whole thing. A limit of ``0``
+    asked for the text rendering, so nothing goes to stderr. ``get_full`` names
     the command that prints it whole.
     """
     if getattr(args, "save", None) or getattr(args, "out_dir", None):
@@ -57,6 +58,8 @@ def shortened(full: str, args, *, get_full: str = "rerun with --json") -> bool:
     limit = output_limit()
     if len(full) <= limit:
         return False
+    if limit == 0:
+        return True
     print(
         f"note: output shortened — the full response is {len(full):,} chars, over the {limit:,} limit "
         f"(${OUTPUT_LIMIT_ENV}); {get_full} for all of it",

{ndi_cli-0.21.0 → ndi_cli-0.26.0}/src/ndi_cli/_render.py

@@ -42,6 +42,7 @@ from ndi_sdk.models.ledger_understanding import (
     SelectionSummary,
     SourceCatalog,
 )
+from ndi_sdk.models.systemone import ChoiceAnswer, NoulAnswer, ScoreAnswer, SystemOneResponse
 from ndi_sdk.models.workspaces import Workspace, WorkspaceStats
 from ndi_sdk.models.tools import (
     FileMetadataToolResponse,
@@ -591,6 +592,40 @@ def schema_validation(result: ExtractSchemaValidationResponse) -> str:
     return "\n".join(lines)
 
 
+def _probability(value: float) -> str:
+    return f"{value:.3f}"
+
+
+def _systemone_answer(answer) -> str:
+    if isinstance(answer, NoulAnswer):
+        return f"noul  p(true)={_probability(answer.noul)}"
+    if isinstance(answer, ChoiceAnswer):
+        ranked = sorted(answer.probabilities.items(), key=lambda item: -item[1])
+        spread = " ".join(f"{option}={_probability(p)}" for option, p in ranked)
+        return f"choice  {answer.choice} (confidence {_probability(answer.confidence)})  {spread}"
+    if isinstance(answer, ScoreAnswer):
+        # The score is an expected level index; name the level it rounds to.
+        named = ""
+        if answer.legend:
+            named = f" ≈ {answer.legend[min(max(round(answer.score), 0), len(answer.legend) - 1)]!r}"
+        spread = " ".join(
+            f"{name}={_probability(answer.probabilities[str(index)])}"
+            for index, name in enumerate(answer.legend)
+            if str(index) in answer.probabilities
+        )
+        return f"score  {answer.score:.2f}{named} (confidence {_probability(answer.confidence)})  {spread}"
+    return f"{answer.type} (not known to this CLI)  {json.dumps(answer.data, sort_keys=True)}"
+
+
+def systemone(response: SystemOneResponse) -> str:
+    usage = response.usage
+    tokens = f"  tokens in={usage.input_tokens} out={usage.output_tokens}" if usage.input_tokens is not None else ""
+    lines = [f"model {response.model}  {response.evaluation_time_ms:.0f} ms{tokens}"]
+    width = max((len(key) for key in response.answers), default=0)
+    lines.extend(f"{key:<{width}}  {_systemone_answer(answer)}" for key, answer in response.answers.items())
+    return "\n".join(lines)
+
+
 def workspace(item: Workspace) -> str:
     purpose = f" purpose={item.purpose}" if item.purpose else ""
     return f"{item.workspace_id}  {item.name}  {item.domain_slug}@{item.domain_version}  {item.status}{purpose}"

ndi_cli-0.26.0/src/ndi_cli/_systemone.py

@@ -0,0 +1,81 @@
+"""``ndi systemone``: answer typed questions about a state in one synchronous call. No workspace, no job."""
+
+from __future__ import annotations
+
+import argparse
+import json
+import sys
+from pathlib import Path
+
+from ndi_sdk.client import NdiClient
+from ndi_sdk.models.systemone import SystemOneRequest
+from pydantic import JsonValue, ValidationError
+
+from ndi_cli import _render
+from ndi_cli._workspace import _dump_or_text
+
+
+def add_parsers(sub: argparse._SubParsersAction, *, default_timeout: float) -> None:
+    systemone = sub.add_parser(
+        "systemone",
+        help="Answer noul, choice, and score questions about a state.",
+        description=(
+            "Answer typed questions about a state in one call. A VALUE is inline, @FILE reads a file, and @- reads stdin."
+        ),
+    )
+    systemone.add_argument(
+        "--json", action="store_true", help="Always print the full response JSON, never the shortened text rendering."
+    )
+    systemone.add_argument(
+        "--timeout",
+        type=float,
+        default=default_timeout,
+        metavar="SECONDS",
+        help=f"HTTP timeout for the call (default {default_timeout:.0f}s).",
+    )
+    state = systemone.add_mutually_exclusive_group(required=True)
+    state.add_argument("--state", default=None, metavar="VALUE", help="The state as text.")
+    state.add_argument("--state-json", default=None, metavar="VALUE", help="The state as any JSON value.")
+    systemone.add_argument(
+        "--questions",
+        required=True,
+        metavar="VALUE",
+        help='JSON object of named questions, e.g. {"approve": {"type": "noul", "instructions": "..."}}.',
+    )
+    systemone.set_defaults(run=_run, family="systemone", needs_workspace=False, needs_client=True)
+
+
+def _read_value(value: str, flag: str) -> str:
+    if not value.startswith("@"):
+        return value
+    if value == "@-":
+        return sys.stdin.read()
+    try:
+        return Path(value[1:]).read_text(encoding="utf-8")
+    except OSError as exc:
+        raise ValueError(f"cannot read {flag} {value[1:]!r}: {exc.strerror or exc}") from None
+
+
+def _read_json(value: str, flag: str) -> JsonValue:
+    try:
+        return json.loads(_read_value(value, flag))
+    except json.JSONDecodeError as exc:
+        raise ValueError(f"{flag} is not valid JSON: {exc}") from None
+
+
+def _request(args: argparse.Namespace) -> SystemOneRequest:
+    state = _read_json(args.state_json, "--state-json") if args.state is None else _read_value(args.state, "--state")
+    questions = _read_json(args.questions, "--questions")
+    if not isinstance(questions, dict) or not questions:
+        raise ValueError("--questions must be a non-empty JSON object of named questions")
+    try:
+        return SystemOneRequest.model_validate({"state": state, "questions": questions})
+    except ValidationError as exc:
+        problems = "; ".join(f"{'.'.join(str(part) for part in error['loc'])}: {error['msg']}" for error in exc.errors())
+        raise ValueError(f"--questions: {problems}") from None
+
+
+def _run(client: NdiClient, workspace_id: str, args: argparse.Namespace) -> int:
+    request = _request(args)
+    response = client.systemone.evaluate(request.state, request.questions)
+    return _dump_or_text(response, args, text=_render.systemone(response), stem="systemone")

{ndi_cli-0.21.0 → ndi_cli-0.26.0}/src/ndi_cli/_tools.py

@@ -1,4 +1,4 @@
-"""The workspace-tool verbs: ``ask-file`` everywhere, and the agent run's file commands plus ``kg-answer``.
+"""The workspace-tool verbs: ``ask-file`` everywhere, and the agent run's file commands.
 
 The agent-only commands have no SDK method: their /v1 routes are unpublished, so
 they reach the run's socket through the tools' transport directly.
@@ -24,8 +24,6 @@ from ndi_cli import _render
 from ndi_cli._local import (
     FileMetadataRequest,
     FolderMetadataRequest,
-    KgAnswerRequest,
-    KgAnswerResponse,
     ReadFileRequest,
     RunSqlRequest,
     SearchRequest,
@@ -35,11 +33,11 @@ from ndi_cli.commands import WorkspaceCommand
 ModelT = TypeVar("ModelT", bound=BaseModel)
 
 
-def add_parsers(sub: argparse._SubParsersAction, common: argparse.ArgumentParser, *, in_agent_run: bool, graph: bool) -> None:
+def add_parsers(sub: argparse._SubParsersAction, common: argparse.ArgumentParser, *, in_agent_run: bool) -> None:
     """Register the tool verbs.
 
     Outside an agent run only ``ask-file`` is registered. Inside one the file
-    commands are too, and ``kg-answer`` when ``graph`` says the worker granted it.
+    commands are too.
     """
     if in_agent_run:
         folder = sub.add_parser(
@@ -100,18 +98,29 @@ def add_parsers(sub: argparse._SubParsersAction, common: argparse.ArgumentParser
         read = sub.add_parser(
             WorkspaceCommand.READ_FILE,
             parents=[common],
-            help="Print the text of one uploaded file.",
+            help="Print the text of one or more uploaded files.",
             description=(
                 "Content goes to stdout; a one-line footer (pages, components returned/omitted, truncation) goes to "
                 "stderr. Scope with --component (names from file-metadata) or --pages; images are refused — use ask-file."
             ),
         )
-        read.add_argument("path", help="Uploaded source path.")
+        read.add_argument(
+            "targets",
+            nargs="+",
+            metavar="path",
+            help="Uploaded source paths. Several are fetched together, each under a `==> path <==` header.",
+        )
         read.add_argument("--component", default=None, help="One tab or section, named as file-metadata lists it.")
         read.add_argument("--pages", default=None, metavar="SPEC", help="1-based pages, e.g. 3 or 1-5,8. Not for spreadsheets.")
         read.add_argument("--max-chars", type=int, default=None, help="Character budget for the returned text.")
         read.set_defaults(
-            run=_run_read_file, render=_render_read_file, verbatim=True, family="tool", needs_workspace=True, needs_client=True
+            run=_run_read_file,
+            render=_render_read_file,
+            verbatim=True,
+            label_targets=True,
+            family="tool",
+            needs_workspace=True,
+            needs_client=True,
         )
 
     ask_file = sub.add_parser(
@@ -164,29 +173,11 @@ def add_parsers(sub: argparse._SubParsersAction, common: argparse.ArgumentParser
     )
     search.add_argument("query", help="What to look for.")
     search.add_argument("-k", type=int, default=10, help="Number of hits (default 10).")
-    search.add_argument("--path-prefix", default=None, help="Only files under this directory prefix.")
+    search.add_argument(
+        "--path-prefix", default=None, help="Only files under this directory prefix, or only the one file at this full path."
+    )
     search.add_argument("--category", action="append", default=None, dest="categories", help="Category filter; repeatable.")
     search.set_defaults(run=_run_search, render=_render.search, family="tool", needs_workspace=True, needs_client=True)
-    if not graph:
-        return
-
-    kg_answer = sub.add_parser(
-        WorkspaceCommand.KG_ANSWER,
-        parents=[common],
-        help="Retrieve from the workspace knowledge graph in one call — entities and pages, never an answer.",
-        description=(
-            "Runs the full graph pass: locates the entities the question names and reads the pages they cite. "
-            "Prints the entity cards and the pages read: a page marked (full) is the document's text, quotable as "
-            "printed; re-read only a page shown in part, for what lies past the cut. The graph only knows what its own build extracted — a question resting on material "
-            "outside its scope (parquet, CSV, anything not yet built into it) gets nothing from this call, and "
-            "even a covered entity's pages are a starting sample, not the workspace. "
-            "Call this first, once, with the question verbatim."
-        ),
-    )
-    kg_answer.add_argument("query", help="The question, verbatim.")
-    kg_answer.set_defaults(
-        run=_run_kg_answer, render=_render_kg_answer, verbatim=True, family="tool", needs_workspace=True, needs_client=True
-    )
 
 
 def _agent_command(
@@ -245,7 +236,7 @@ def parse_pages(spec: str | None) -> list[int] | None:
 
 
 def _run_read_file(tools: SyncTools, workspace_id: str, args: argparse.Namespace) -> ReadFileResponse:
-    body = ReadFileRequest(path=args.path, pages=parse_pages(args.pages), component=args.component, max_chars=args.max_chars)
+    body = ReadFileRequest(path=args.target, pages=parse_pages(args.pages), component=args.component, max_chars=args.max_chars)
     return _agent_command(tools, ReadFileResponse, workspace_id, WorkspaceCommand.READ_FILE, body)
 
 
@@ -271,11 +262,3 @@ def _run_run_sql(tools: SyncTools, workspace_id: str, args: argparse.Namespace)
 def _run_search(tools: SyncTools, workspace_id: str, args: argparse.Namespace) -> SearchResponse:
     body = SearchRequest(query=args.query, k=args.k, path_prefix=args.path_prefix, categories=args.categories)
     return _agent_command(tools, SearchResponse, workspace_id, WorkspaceCommand.HYBRID_SEARCH, body)
-
-
-def _run_kg_answer(tools: SyncTools, workspace_id: str, args: argparse.Namespace) -> KgAnswerResponse:
-    return _agent_command(tools, KgAnswerResponse, workspace_id, WorkspaceCommand.KG_ANSWER, KgAnswerRequest(query=args.query))
-
-
-def _render_kg_answer(response: KgAnswerResponse) -> str:
-    return response.text

{ndi_cli-0.21.0 → ndi_cli-0.26.0}/src/ndi_cli/_workspace.py

@@ -8,11 +8,13 @@ import sys
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from dataclasses import dataclass
 from pathlib import Path
+from typing import get_args
 
 from ndi_sdk.client import NdiClient
 from ndi_sdk.credentials import write_config
 from ndi_sdk.errors import ErrorCode, JobFailedError, JobTimeoutError, NdiError, NdiStatusError
 from ndi_sdk.models.jobs import Job, UploadFileResult
+from ndi_sdk.models.tools import AutomaticSearchMode
 from ndi_sdk.resources.jobs import check_terminal
 
 from ndi_cli import _render
@@ -117,7 +119,6 @@ def add_parsers(sub: argparse._SubParsersAction, common: argparse.ArgumentParser
 
     deep = sub.add_parser("deep-search", parents=[common], help="Run an agentic workspace search.")
     deep.add_argument("query")
-    deep.add_argument("--effort", choices=("low", "medium", "high"), default=None)
     deep.add_argument("--prefix", default=None, dest="path_prefix")
     deep.add_argument(
         "--path",
@@ -139,8 +140,7 @@ def add_parsers(sub: argparse._SubParsersAction, common: argparse.ArgumentParser
     add_job_output_args(fact)
     fact.set_defaults(run=_run_fact_search, family="workspace", needs_workspace=True, needs_client=True)
 
-    # No --effort, --session-id, or --allow-clarification: the route is
-    # single-shot and the service chooses the pipeline.
+    # No --effort, --session-id, or --allow-clarification: the route is single-shot.
     automatic = sub.add_parser(
         "automatic-search",
         parents=[common],
@@ -148,7 +148,14 @@ def add_parsers(sub: argparse._SubParsersAction, common: argparse.ArgumentParser
     )
     automatic.add_argument("query")
     automatic.add_argument("--prefix", default=None, dest="path_prefix")
-    automatic.add_argument("--top-k", type=int, default=None, help="Cap the citation list when the fact pipeline answers.")
+    automatic.add_argument("--path", action="append", dest="paths", default=None, help="Scope to this file; repeatable.")
+    automatic.add_argument("--top-k", type=int, default=None, help="Cap the citation list when fact search answers.")
+    automatic.add_argument(
+        "--mode",
+        choices=get_args(AutomaticSearchMode),
+        default=None,
+        help="auto (the default) lets the service choose; fact or agent runs that route directly.",
+    )
     _add_context_args(automatic)
     add_job_output_args(automatic)
     automatic.set_defaults(run=_run_automatic_search, family="workspace", needs_workspace=True, needs_client=True)
@@ -161,6 +168,7 @@ def add_parsers(sub: argparse._SubParsersAction, common: argparse.ArgumentParser
         "--cursor", default=None, help="Page an earlier run: paste its result's next_cursor. A page is a new job."
     )
     filtered.add_argument("--prefix", default=None, dest="path_prefix")
+    filtered.add_argument("--path", action="append", dest="paths", default=None, help="Scope to this file; repeatable.")
     _add_context_args(filtered)
     # No --result-unit: the server deprecates the grouping override and returns
     # catalog entries. No --allow-clarification: a clarification is answered by a
@@ -534,7 +542,6 @@ def _run_deep_search(client: NdiClient, workspace_id: str, args: argparse.Namesp
         workspace_id,
         query=args.query,
         context=args.context,
-        effort=args.effort,
         path_prefix=args.path_prefix,
         paths=args.paths,
     )
@@ -559,7 +566,9 @@ def _run_automatic_search(client: NdiClient, workspace_id: str, args: argparse.N
         query=args.query,
         context=args.context,
         path_prefix=args.path_prefix,
+        paths=args.paths,
         top_k=args.top_k,
+        mode=args.mode,
     )
     return _finish_job(client, job, args, _render.automatic_search_job, "automatic-search")
 
@@ -575,8 +584,11 @@ def _run_filtered_search(client: NdiClient, workspace_id: str, args: argparse.Na
         # A page re-executes the parent's own stored query, so the scoping flags
         # cannot apply to it. Accepting and dropping them would quietly answer a
         # different question than the one typed.
-        if args.path_prefix or args.context is not None:
-            print("error: --prefix, --context and --no-context belong to the initial query, not a page", file=sys.stderr)
+        if args.path_prefix or args.paths or args.context is not None:
+            print(
+                "error: --prefix, --path, --context and --no-context belong to the initial query, not a page",
+                file=sys.stderr,
+            )
             return 2
         job = client.search.filtered_page(workspace_id, cursor=args.cursor)
     else:
@@ -585,6 +597,7 @@ def _run_filtered_search(client: NdiClient, workspace_id: str, args: argparse.Na
             query=args.query,
             context=args.context,
             path_prefix=args.path_prefix,
+            paths=args.paths,
         )
     return _finish_job(client, job, args, _render.filtered_search_job, "filtered-search")
 

{ndi_cli-0.21.0 → ndi_cli-0.26.0}/src/ndi_cli/commands.py

@@ -13,7 +13,6 @@ class WorkspaceCommand(StrEnum):
     KG_INFO = "kg-info"
     KG_SEARCH = "kg-search"
     KG_WALK = "kg-walk"
-    KG_ANSWER = "kg-answer"
 
     @property
     def activity_label(self) -> str:
@@ -27,5 +26,4 @@ class WorkspaceCommand(StrEnum):
             self.KG_INFO: "Sizing up the knowledge graph",
             self.KG_SEARCH: "Searching the knowledge graph",
             self.KG_WALK: "Following graph relations",
-            self.KG_ANSWER: "Reading the knowledge graph",
         }[self]