Michael Gardner
6f0257dbc7
* feat: add Kiro native CLI harness Signed-off-by: Michael Gardner <gardnmi@gmail.com> * fix(kiro): avoid ambient env in tmux attach Signed-off-by: Michael Gardner <gardnmi@users.noreply.github.com> * fix: restore uv.lock pypi.org sources (drop accidental databricks-proxy re-lock) A local `uv run` during the merge re-locked uv.lock against this machine's Databricks-internal pypi proxy, flipping every package source URL. Kiro changes no dependencies and pyproject.toml is unchanged vs main, so restore main's uv.lock verbatim (pypi.org sources). Only registry URLs differed — no version or hash changes. Co-authored-by: Isaac * test(e2e-ui): add native-kiro render-parity suite (E2E UI Required gate) The E2E UI Required gate flagged that #899 changes the agent-picker/session UI (adds Kiro) without a tests/e2e_ui/** test. Add test_native_kiro_render_parity.py mirroring the cursor/goose siblings — composer-IN parity, a TUI-originated turn surfacing OUT, and no duplicate rendering — plus the native_kiro_session fixture. Skip-gated on kiro-cli + tmux, so it skips in CI (no Kiro account provisioned) exactly like the goose/cursor suites, and runs for real where Kiro is signed in. Verified: collects + skips cleanly (kiro-cli absent); ruff clean. Co-authored-by: Isaac * fix: restore ap-web/package-lock.json npmjs.org sources (drop databricks npm-proxy) Same root cause as the uv.lock fix: an npm command during round-1 merge re-resolved one dependency (yaml-1.10.3) against this machine's Databricks-internal npm proxy (npm-proxy.cloud.databricks.com), which CI (pinned to registry.npmjs.org) can't reach -> 'npm ci' ETIMEDOUT. ap-web/package.json is unchanged vs main and Kiro adds no npm dependency, so restore main's package-lock.json verbatim (clean npmjs.org sources). Co-authored-by: Isaac * test(e2e): exclude kiro-native from the live-harness matrix coverage check test_run_harness_live_matrix_covers_registered_coding_harnesses asserts every registered coding harness is either in the live no-AGENT e2e matrix or explicitly excluded. kiro-native is a terminal-first TUI launched via `omni kiro` (tmux pane + bridge dir), not `omnigent run --harness kiro-native`, so — like goose-native / qwen-native / cursor-native — it can't run in this matrix. Add it to the exclusion set with the matching rationale; its coverage is the kiro-native bridge/executor/ forwarder unit tests + the test_native_kiro_render_parity e2e_ui suite. Co-authored-by: Isaac * test(ap-web): set isNativeWrapper in /compact composer menu tests #1139 gated "/compact" behind isNativeWrapper (hidden for non-native harnesses), but the three slash-menu-UX tests that assert "/compact" tops/appears in the suggestions still rendered a non-native composer, so they now fail on main (and on every PR that merges main). Render those three with isNativeWrapper:true so "/compact" is offered, restoring the built-in ordering the tests pin. Test-only; no behavior change. Fixes the inherited ChatPage.composer.test.tsx red on this PR. Co-authored-by: Isaac * test(kiro): cover kiro_native launcher helpers (raise coverage 43%→70%) The kiro-native launcher (omnigent/kiro_native.py) was the largest coverage gap on this PR: its CLI/daemon orchestration is only exercised by the live render-parity e2e, which skips in CI when kiro-cli is absent. Add focused unit tests (with a fake httpx client) for the unit-testable surface: executable resolution, launch-argv assembly, terminal-payload decoding, tmux attach gating, startup-progress forwarding, preflight, resume-id resolution, and the create/fetch/ ensure/find/wait session helpers (success + error branches). Lifts kiro_native.py from 43% to 70%; remaining misses are the daemon-driven async orchestration covered by runner/e2e paths. Co-authored-by: Isaac * test(kiro): rename test env var to avoid exfil-scan false positive The CI exfil scanner flags any added file containing a secret-named source (regex `[A-Z0-9]+_SECRET\b`) together with a network sink. The tmux-allowlist test used `OMNIGENT_SECRET` purely as a non-allowlisted sample var, which matched the secret regex and — combined with the fake httpx client's .post()/.get() in the same file — tripped the "secret-named source + network sink" block. Rename it to a neutral `OMNIGENT_UNLISTED_VAR`; the test's intent (filtering non-allowlisted keys) is unchanged. Co-authored-by: Isaac --------- Signed-off-by: Michael Gardner <gardnmi@gmail.com> Signed-off-by: Michael Gardner <gardnmi@users.noreply.github.com> Co-authored-by: Pat Sukprasert <pattara.sk127@gmail.com>
109 lines
4.3 KiB
Python
109 lines
4.3 KiB
Python
"""Shared harness-name alias helpers.
|
|
|
|
Keep user-facing shorthand spellings at the edges while the rest of
|
|
Omnigent continues to use canonical harness identifiers internally.
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
HARNESS_ALIASES: dict[str, str] = {
|
|
"claude": "claude-sdk",
|
|
"native-kiro": "kiro-native",
|
|
"native-pi": "pi-native",
|
|
# The SDK package / runtime dispatch spelling; specs use "openai-agents".
|
|
"openai-agents-sdk": "openai-agents",
|
|
# User-facing spellings for the Google Antigravity SDK harness; the
|
|
# canonical id is "antigravity" (matches the registry / workflow type).
|
|
"agy": "antigravity",
|
|
"google-antigravity": "antigravity",
|
|
# User-facing reversed spelling for the Goose native-CLI harness; canonical
|
|
# id is "goose-native".
|
|
"native-goose": "goose-native",
|
|
# Qwen Code harness alias.
|
|
"qwen-code": "qwen",
|
|
# User-facing reversed spelling for the qwen native-CLI harness; canonical
|
|
# id is "qwen-native" (the ACP-piped harness keeps the bare "qwen" name).
|
|
"native-qwen": "qwen-native",
|
|
# OpenCode native-server harness: the bare ``opencode`` name and the
|
|
# reversed ``native-opencode`` spelling both fold to ``opencode-native``
|
|
# (there is no separate SDK ``opencode`` harness, so the bare name is free).
|
|
"opencode": "opencode-native",
|
|
"native-opencode": "opencode-native",
|
|
# User-facing reversed spelling for the Hermes native-CLI (TUI) harness;
|
|
# canonical id is "hermes-native" (the headless subprocess harness keeps the
|
|
# bare "hermes" name, like goose vs goose-native).
|
|
"native-hermes": "hermes-native",
|
|
# User-facing spelling for the GitHub Copilot SDK harness; the canonical id
|
|
# is "copilot" (matches the registry / workflow type).
|
|
"github-copilot": "copilot",
|
|
}
|
|
|
|
# Canonical native-CLI harness spellings. These harnesses type messages into
|
|
# a resident terminal process and mirror their transcript back to Omnigent, so
|
|
# the runner must not replay Omnigent history or treat a completed queue call
|
|
# as a full in-process model turn. ``AgentSpec.harness_kind`` returns these
|
|
# canonical spellings for native agents, so no executor-type aliasing is needed
|
|
# here.
|
|
NATIVE_HARNESSES: frozenset[str] = frozenset(
|
|
{
|
|
"claude-native",
|
|
"native-claude",
|
|
"codex-native",
|
|
"native-codex",
|
|
"pi-native",
|
|
"native-pi",
|
|
"cursor-native",
|
|
"native-cursor",
|
|
"kiro-native",
|
|
"native-kiro",
|
|
# Native Antigravity (agy) TUI bridge used by ``omnigent antigravity``;
|
|
# the in-process SDK counterpart is the canonical ``antigravity``
|
|
# harness (see HARNESS_ALIASES / runtime/harnesses/__init__.py).
|
|
"antigravity-native",
|
|
"native-antigravity",
|
|
"goose-native",
|
|
"native-goose",
|
|
"qwen-native",
|
|
"native-qwen",
|
|
"opencode-native",
|
|
"native-opencode",
|
|
# Native Hermes (TUI) bridge used by ``omnigent hermes``; the headless
|
|
# subprocess counterpart is the canonical ``hermes`` harness (see
|
|
# HARNESS_ALIASES / runtime/harnesses/__init__.py).
|
|
"hermes-native",
|
|
"native-hermes",
|
|
}
|
|
)
|
|
|
|
|
|
def canonicalize_harness(harness: str | None) -> str | None:
|
|
"""Return the canonical harness identifier for *harness*.
|
|
|
|
Unknown names are returned unchanged so callers can still produce
|
|
their normal validation error messages.
|
|
"""
|
|
if harness is None:
|
|
return None
|
|
return HARNESS_ALIASES.get(harness, harness)
|
|
|
|
|
|
def is_claude_sdk_harness_name(harness: str | None) -> bool:
|
|
"""Return ``True`` for the canonical Claude SDK harness and aliases."""
|
|
return canonicalize_harness(harness) == "claude-sdk"
|
|
|
|
|
|
def is_native_harness(harness: str | None) -> bool:
|
|
"""Return whether *harness* is a native CLI harness.
|
|
|
|
Native harnesses boot a vendor TUI in a terminal and route user messages
|
|
into that running process. Accepts the canonical native spellings that
|
|
:attr:`AgentSpec.harness_kind` returns plus their reversed aliases.
|
|
|
|
:param harness: A harness id, e.g. ``"codex-native"`` or ``"claude_sdk"``;
|
|
``None`` returns ``False``.
|
|
:returns: ``True`` for a native CLI harness, else ``False``.
|
|
"""
|
|
if harness is None:
|
|
return False
|
|
return (canonicalize_harness(harness) or harness) in NATIVE_HARNESSES
|