From 357fa3e82f27b47895be1656fda9f8d3ae4cbe63 Mon Sep 17 00:00:00 2001 From: Yernaz Kengesbekov Date: Tue, 17 Nov 2026 04:22:59 +0500 Subject: [PATCH 1/5] =?UTF-8?q?feat(targets):=20=D0=B4=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D1=82=D1=8C=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B0=D0=B9?= =?UTF-8?q?=D0=B4=D0=B5=D1=80=20Herdr=20Core=20=D0=B8=20=D0=B1=D0=B5=D0=B7?= =?UTF-8?q?=D0=BE=D0=BF=D0=B0=D1=81=D0=BD=D1=8B=D0=B9=20=D1=80=D0=B5=D0=B7?= =?UTF-8?q?=D0=BE=D0=BB=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-tauri/capabilities/default.json | 10 +++++ web/src/lib/herdrCoreResolve.test.ts | 30 +++++++++++++++ web/src/lib/herdrCoreResolve.ts | 35 ++++++++++++++++++ web/src/lib/terminalTargets/herdrCore.ts | 47 ++++++++++++++++++++++++ web/src/lib/terminalTargets/index.ts | 8 +++- web/src/lib/terminalTargets/types.ts | 5 ++- 6 files changed, 132 insertions(+), 3 deletions(-) create mode 100644 web/src/lib/herdrCoreResolve.test.ts create mode 100644 web/src/lib/herdrCoreResolve.ts create mode 100644 web/src/lib/terminalTargets/herdrCore.ts diff --git a/src-tauri/capabilities/default.json b/src-tauri/capabilities/default.json index c66cbc3..54238eb 100644 --- a/src-tauri/capabilities/default.json +++ b/src-tauri/capabilities/default.json @@ -64,6 +64,16 @@ "cmd": "orca-ide", "args": ["terminal", "wait", "--terminal", { "validator": "^term_[0-9a-fA-F-]+$" }, "--for", "tui-idle", "--timeout-ms", { "validator": "^[0-9]+$" }, "--json"] }, + { + "name": "herdr-core-list", + "cmd": "hc", + "args": ["ls", "--json"] + }, + { + "name": "herdr-core-send", + "cmd": "hc", + "args": ["send", { "validator": "^t[0-9a-z]+$" }, { "validator": "^[\\s\\S]*$" }] + }, { "name": "herdr-agent-list", "cmd": "herdr", diff --git a/web/src/lib/herdrCoreResolve.test.ts b/web/src/lib/herdrCoreResolve.test.ts new file mode 100644 index 0000000..4e1ef47 --- /dev/null +++ b/web/src/lib/herdrCoreResolve.test.ts @@ -0,0 +1,30 @@ +import { expect, test } from "bun:test"; +import { parseHerdrCoreTargets, resolveHerdrCoreTarget, type HerdrCoreBinding } from "./herdrCoreResolve"; + +const binding: HerdrCoreBinding = { source: "herdr-core", address: "t1", agent: "codex", where: "project / 1", cwd: "/project" }; + +test("показывает только пять поддержанных живых локальных агентов", () => { + const agents = ["codex", "claude-code", "opencode", "antigravity", "pi", "zsh", "claude", "gemini", "hermes"]; + const terminals = agents.map((agent) => ({ ...binding, agent, state: "live" })); + terminals.push({ ...binding, state: "finished" }, { ...binding, address: "remote/t1", state: "live" }); + expect(parseHerdrCoreTargets(JSON.stringify({ terminals })).map((t) => t.agent)) + .toEqual(agents.slice(0, 5)); +}); + +test("невалидный ответ не маскируется пустым списком", () => { + expect(() => parseHerdrCoreTargets("oops")).toThrow(); + expect(() => parseHerdrCoreTargets("{}")).toThrow(); +}); + +test("точный адрес требует совпадения всех полей", () => { + expect(resolveHerdrCoreTarget([binding], binding)).toEqual({ kind: "ok", handle: "t1" }); + expect(resolveHerdrCoreTarget([{ ...binding, agent: "pi" }], binding)).toEqual({ kind: "not-found" }); + expect(resolveHerdrCoreTarget([{ ...binding, cwd: "/other" }], binding)).toEqual({ kind: "not-found" }); +}); + +test("смена адреса восстанавливается только однозначно", () => { + const moved = { ...binding, address: "t2" }; + expect(resolveHerdrCoreTarget([moved], binding)).toEqual({ kind: "ok", handle: "t2" }); + expect(resolveHerdrCoreTarget([moved, { ...moved, address: "t3" }], binding)) + .toEqual({ kind: "ambiguous", count: 2 }); +}); diff --git a/web/src/lib/herdrCoreResolve.ts b/web/src/lib/herdrCoreResolve.ts new file mode 100644 index 0000000..b79e10a --- /dev/null +++ b/web/src/lib/herdrCoreResolve.ts @@ -0,0 +1,35 @@ +import type { Resolution, TabBinding } from "./terminalTargets/types"; + +export type HerdrCoreBinding = Extract; + +export const HERDR_CORE_AGENTS = new Set([ + "codex", "claude-code", "opencode", "antigravity", "pi", +]); + +export function parseHerdrCoreTargets(stdout: string): HerdrCoreBinding[] { + const data: unknown = JSON.parse(stdout); + if (!data || typeof data !== "object" || !("terminals" in data) || !Array.isArray(data.terminals)) { + throw new Error("Herdr Core: invalid terminal list"); + } + return data.terminals.flatMap((value: unknown) => { + if (!value || typeof value !== "object") return []; + const t = value as Record; + if (t.state !== "live" || typeof t.agent !== "string" || !HERDR_CORE_AGENTS.has(t.agent) + || typeof t.address !== "string" || !/^t[0-9a-z]+$/.test(t.address) + || typeof t.where !== "string" || !t.where + || typeof t.cwd !== "string" || !t.cwd) return []; + return [{ source: "herdr-core" as const, address: t.address, agent: t.agent, where: t.where, cwd: t.cwd }]; + }); +} + +export function sameHerdrCoreTarget(a: HerdrCoreBinding, b: HerdrCoreBinding): boolean { + return a.agent === b.agent && a.where === b.where && a.cwd === b.cwd; +} + +export function resolveHerdrCoreTarget(targets: HerdrCoreBinding[], binding: HerdrCoreBinding): Resolution { + const matches = targets.filter((t) => sameHerdrCoreTarget(t, binding)); + const exact = matches.filter((t) => t.address === binding.address); + if (exact.length === 1) return { kind: "ok", handle: exact[0].address }; + if (matches.length > 1) return { kind: "ambiguous", count: matches.length }; + return matches.length === 1 ? { kind: "ok", handle: matches[0].address } : { kind: "not-found" }; +} diff --git a/web/src/lib/terminalTargets/herdrCore.ts b/web/src/lib/terminalTargets/herdrCore.ts new file mode 100644 index 0000000..7c0f196 --- /dev/null +++ b/web/src/lib/terminalTargets/herdrCore.ts @@ -0,0 +1,47 @@ +import { parseHerdrCoreTargets, resolveHerdrCoreTarget } from "../herdrCoreResolve"; +import { describeError, runScoped } from "./shell"; +import type { TerminalProvider } from "./types"; + +async function run(name: string, args: string[], target?: string) { + try { + return await runScoped(name, args, "Herdr Core error", target); + } catch (error) { + throw new Error(`Herdr Core: check that hc is installed in Sendoff's PATH and Core is running. ${describeError(error)}`); + } +} + +async function listAgents() { + return parseHerdrCoreTargets((await run("herdr-core-list", ["ls", "--json"])).stdout); +} + +export const herdrCoreProvider: TerminalProvider = { + source: "herdr-core", + label: "Herdr Core", + executable: "hc", + async listTargets() { + return (await listAgents()).map((binding) => ({ + source: "herdr-core" as const, + key: `herdr-core:${binding.address}`, + handle: binding.address, + binding, + primary: `${binding.agent} · ${binding.where}`, + secondary: binding.cwd, + meta: binding.address, + })); + }, + async resolve(binding) { + if (binding.source !== "herdr-core") return { kind: "not-found" }; + return resolveHerdrCoreTarget(await listAgents(), binding); + }, + async send(handle, text, submit) { + if (!submit) throw new Error("Herdr Core requires Auto-submit"); + // Повторная проверка защищает также путь Last и устаревший выбор пикера. + const matches = (await listAgents()).filter((t) => t.address === handle); + if (matches.length !== 1) throw new Error("Herdr Core agent not found — pick another target"); + await run("herdr-core-send", ["send", handle, text], handle); + return handle; + }, + describe(binding) { + return binding.source === "herdr-core" ? `${binding.agent} · ${binding.where}` : ""; + }, +}; diff --git a/web/src/lib/terminalTargets/index.ts b/web/src/lib/terminalTargets/index.ts index ada14d6..184bb33 100644 --- a/web/src/lib/terminalTargets/index.ts +++ b/web/src/lib/terminalTargets/index.ts @@ -1,4 +1,6 @@ import { herdrProvider } from "./herdr"; +import { herdrCoreProvider } from "./herdrCore"; +import { sameHerdrCoreTarget } from "../herdrCoreResolve"; import { orcaProvider } from "./orca"; import { tmuxProvider } from "./tmux"; import type { TabBinding, TargetSource, TerminalProvider } from "./types"; @@ -15,10 +17,11 @@ export type { // Порядок = порядок секций в пикере, по частоте использования: herdr — daily driver // (≤3 проектов), Orca — когда проектов больше, tmux — не-агентская работа. -export const PROVIDERS: TerminalProvider[] = [herdrProvider, orcaProvider, tmuxProvider]; +export const PROVIDERS: TerminalProvider[] = [herdrProvider, herdrCoreProvider, orcaProvider, tmuxProvider]; const BY_SOURCE: Record = { herdr: herdrProvider, + "herdr-core": herdrCoreProvider, orca: orcaProvider, tmux: tmuxProvider, }; @@ -59,6 +62,9 @@ export async function statusOf(binding: TabBinding): Promise { // соответствующую текущей привязке таба. export function sameBinding(a: TabBinding, b: TabBinding): boolean { if (a.source !== b.source) return false; + if (a.source === "herdr-core" && b.source === "herdr-core") { + return sameHerdrCoreTarget(a, b); + } if (a.source === "herdr" && b.source === "herdr") { return a.workspace === b.workspace && a.tab === b.tab; } diff --git a/web/src/lib/terminalTargets/types.ts b/web/src/lib/terminalTargets/types.ts index c4df37a..0394f08 100644 --- a/web/src/lib/terminalTargets/types.ts +++ b/web/src/lib/terminalTargets/types.ts @@ -4,7 +4,7 @@ // таргеты»): tmux и Orca разошлись бы по швам, которых мы ещё не знали. К третьей // реализации швы известны — они здесь и зафиксированы. -export type TargetSource = "herdr" | "orca" | "tmux"; +export type TargetSource = "herdr" | "herdr-core" | "orca" | "tmux"; // Дескриптор привязки таба. Дискриминированное объединение: одно поле `binding` // вместо трёх взаимоисключимых полей, которые приходилось руками гасить друг о друга. @@ -16,7 +16,8 @@ export type TargetSource = "herdr" | "orca" | "tmux"; export type TabBinding = | { source: "tmux"; session: string; window: string; windowId?: string } | { source: "orca"; worktree: string; titleHint?: string } - | { source: "herdr"; paneId: string; workspace: string; tab: string }; + | { source: "herdr"; paneId: string; workspace: string; tab: string } + | { source: "herdr-core"; address: string; agent: string; where: string; cwd: string }; // Строка в пикере. Провайдер сам решает, что показать — оболочка только рисует. export interface TerminalTarget { From 33a52bc2b1685e10f0f3e4997de3901e4b771934 Mon Sep 17 00:00:00 2001 From: Yernaz Kengesbekov Date: Tue, 17 Nov 2026 04:24:41 +0500 Subject: [PATCH 2/5] =?UTF-8?q?feat(ui):=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB?= =?UTF-8?q?=D1=8E=D1=87=D0=B8=D1=82=D1=8C=20Herdr=20Core=20=D0=BA=20=D0=B2?= =?UTF-8?q?=D1=8B=D0=B1=D0=BE=D1=80=D1=83=20=D1=86=D0=B5=D0=BB=D0=B5=D0=B9?= =?UTF-8?q?=20=D0=B8=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Onboarding/OnboardingOverlay.tsx | 2 +- web/src/components/Settings/SettingsPanel.tsx | 2 +- .../components/TabSwitcher/TabSwitcher.tsx | 2 +- .../components/TargetPicker/TargetPicker.tsx | 13 ++-- web/src/hooks/useTerminalActions.ts | 61 ++++++++++++++++++- web/src/lib/db.test.ts | 6 ++ web/src/lib/herdrCoreResolve.test.ts | 14 +++++ web/src/lib/shortcuts.ts | 2 +- web/src/store/lastTargetStore.ts | 3 +- 9 files changed, 93 insertions(+), 12 deletions(-) diff --git a/web/src/components/Onboarding/OnboardingOverlay.tsx b/web/src/components/Onboarding/OnboardingOverlay.tsx index 98b49be..df9d5a7 100644 --- a/web/src/components/Onboarding/OnboardingOverlay.tsx +++ b/web/src/components/Onboarding/OnboardingOverlay.tsx @@ -117,7 +117,7 @@ export function OnboardingOverlay({ onOpenDoctor }: { onOpenDoctor: () => void }
No terminal agents found.
- Sendoff looks for tmux, Herdr and Orca. Start one of them, or check what Sendoff + Sendoff looks for tmux, Herdr, Herdr Core and Orca. Start one of them, or check what Sendoff actually sees.
diff --git a/web/src/components/Settings/SettingsPanel.tsx b/web/src/components/Settings/SettingsPanel.tsx index 9c8a793..70b6153 100644 --- a/web/src/components/Settings/SettingsPanel.tsx +++ b/web/src/components/Settings/SettingsPanel.tsx @@ -218,7 +218,7 @@ export function SettingsPanel({ onClose, onOpenDoctor }: SettingsPanelProps) {

- A target is a herdr agent, an Orca agent or a tmux window. Choose it via the picker + A target is a Herdr, Herdr Core or Orca agent, or a tmux window. Choose it via the picker (Ctrl+Shift+Enter) or by binding the tab (Ctrl+Alt+B). Ctrl+Enter: binding → last choice → picker. diff --git a/web/src/components/TabSwitcher/TabSwitcher.tsx b/web/src/components/TabSwitcher/TabSwitcher.tsx index ad3cce5..f878043 100644 --- a/web/src/components/TabSwitcher/TabSwitcher.tsx +++ b/web/src/components/TabSwitcher/TabSwitcher.tsx @@ -280,7 +280,7 @@ export function TabSwitcher({ onClose }: TabSwitcherProps) { onClick={() => toggleBoundOnly(setSelectedIndex)} aria-label="Bound to a terminal only" aria-pressed={boundOnly} - title="Bound to a terminal only — herdr / Orca / tmux (Tab)" + title="Bound to a terminal only — Herdr / Herdr Core / Orca / tmux (Tab)" className={`shrink-0 flex items-center justify-center w-7 h-6 rounded-[4px] border transition-colors ${ boundOnly ? "border-accent/30 bg-accent/15 text-accent" diff --git a/web/src/components/TargetPicker/TargetPicker.tsx b/web/src/components/TargetPicker/TargetPicker.tsx index a6ba133..793fcf5 100644 --- a/web/src/components/TargetPicker/TargetPicker.tsx +++ b/web/src/components/TargetPicker/TargetPicker.tsx @@ -3,6 +3,7 @@ import { usePickerModal } from "../../hooks/usePickerModal"; import { PickerModal, PickerHeader, PickerHint } from "../PickerModal/PickerModal"; import { useEditorStore } from "../../store/editorStore"; import { useLastTargetStore } from "../../store/lastTargetStore"; +import { useSettingsStore } from "../../store/settingsStore"; import { PROVIDERS, sameBinding, type TargetSource, type TerminalTarget } from "../../lib/terminalTargets"; interface TargetPickerProps { @@ -31,20 +32,23 @@ export function TargetPicker({ onClose, onPick, mode = "send" }: TargetPickerPro const [sections, setSections] = useState([]); const [loading, setLoading] = useState(true); const [query, setQuery] = useState(""); + const autoSubmit = useSettingsStore((s) => s.tmuxAutoSubmit); // Провайдеры опрашиваются параллельно и НЕЗАВИСИМО: отвалившийся источник (herdr-сервер // не запущен, Orca не установлена) просто не даёт секции — остальные работают. // Отдельного isAvailable() нет: это был бы второй вызов ради того же ответа. useEffect(() => { let cancelled = false; - Promise.allSettled(PROVIDERS.map((p) => p.listTargets())).then((results) => { + const providers = PROVIDERS.filter((p) => p.source !== "herdr-core" || autoSubmit); + Promise.allSettled(providers.map((p) => p.listTargets())).then((results) => { if (cancelled) return; const next: Section[] = []; results.forEach((result, i) => { - const provider = PROVIDERS[i]; + const provider = providers[i]; if (result.status === "fulfilled" && result.value.length > 0) { next.push({ source: provider.source, label: provider.label, targets: result.value }); } + if (result.status === "rejected") console.error(`[${provider.label}] discovery failed`, result.reason); }); setSections(next); setLoading(false); @@ -52,7 +56,7 @@ export function TargetPicker({ onClose, onPick, mode = "send" }: TargetPickerPro return () => { cancelled = true; }; - }, []); + }, [autoSubmit]); // Плоский список — источник правды для курсора; секции рисуются поверх него. const rows = useMemo(() => { @@ -139,7 +143,8 @@ export function TargetPicker({ onClose, onPick, mode = "send" }: TargetPickerPro {query.trim() ? "No matches" : "No targets available"} {!query.trim() && (

- Neither herdr, Orca nor tmux is responding + No supported agents or panes found. Check installed targets with Sendoff Doctor. + {!autoSubmit &&
Herdr Core requires Auto-submit.
}
)}
diff --git a/web/src/hooks/useTerminalActions.ts b/web/src/hooks/useTerminalActions.ts index 1955cad..be66722 100644 --- a/web/src/hooks/useTerminalActions.ts +++ b/web/src/hooks/useTerminalActions.ts @@ -44,6 +44,7 @@ export function useTerminalActions(textareaRef: RefObject { const provider = providerBySource(source); try { + if (source === "herdr-core" && !autoSubmit) throw new Error("Herdr Core requires Auto-submit"); const where = await provider.send(handle, text, autoSubmit); toast(`Sent to ${provider.label}: ${where} (${text.length} chars)`, "success"); // Первый запуск закрывается ровно здесь — по факту успешно отработавшего @@ -88,7 +89,18 @@ export function useTerminalActions(textareaRef: RefObject { + try { + const resolution = await providerFor(target.binding).resolve(target.binding); + if (resolution.kind !== "ok") { + toast("Herdr Core target changed — pick another target", "error"); + setTargetPicker({ mode: "send" }); + return; + } + await sendVia(target.source, resolution.handle, text); + } catch (error) { + toast(describeError(error), "error"); + console.error("[Herdr Core] resolve failed", error); + } + })(); + } else { + void sendVia(target.source, target.handle, text); + } }, [targetPicker, getSendText, sendVia], ); diff --git a/web/src/lib/db.test.ts b/web/src/lib/db.test.ts index 999fefb..3d8a24a 100644 --- a/web/src/lib/db.test.ts +++ b/web/src/lib/db.test.ts @@ -109,6 +109,12 @@ describe("round-trip сессии", () => { await saveSession(snapshot({ tabs: [tab("a", { binding })] })); expect((await loadSession()).tabs[0].binding).toEqual(binding); }); + + test("привязка Herdr Core сохраняет все защитные поля", async () => { + const binding = { source: "herdr-core", address: "t1h", agent: "codex", where: "project / 1", cwd: "/project" } as const; + await saveSession(snapshot({ tabs: [tab("a", { binding })] })); + expect((await loadSession()).tabs[0].binding).toEqual(binding); + }); }); // Архив закрытых табов — новая гарантия «закрыть ≠ потерять». Он лежит в том же diff --git a/web/src/lib/herdrCoreResolve.test.ts b/web/src/lib/herdrCoreResolve.test.ts index 4e1ef47..07e7315 100644 --- a/web/src/lib/herdrCoreResolve.test.ts +++ b/web/src/lib/herdrCoreResolve.test.ts @@ -1,5 +1,7 @@ import { expect, test } from "bun:test"; import { parseHerdrCoreTargets, resolveHerdrCoreTarget, type HerdrCoreBinding } from "./herdrCoreResolve"; +import { herdrCoreProvider } from "./terminalTargets/herdrCore"; +import { sameBinding } from "./terminalTargets"; const binding: HerdrCoreBinding = { source: "herdr-core", address: "t1", agent: "codex", where: "project / 1", cwd: "/project" }; @@ -28,3 +30,15 @@ test("смена адреса восстанавливается только о expect(resolveHerdrCoreTarget([moved, { ...moved, address: "t3" }], binding)) .toEqual({ kind: "ambiguous", count: 2 }); }); + +test("смена подписи ломает привязку, точный адрес различает дубликаты", () => { + expect(resolveHerdrCoreTarget([{ ...binding, where: "other" }], binding)).toEqual({ kind: "not-found" }); + expect(resolveHerdrCoreTarget([binding, { ...binding, address: "t2" }], binding)) + .toEqual({ kind: "ok", handle: "t1" }); + expect(sameBinding(binding, { ...binding, address: "t2" })).toBe(true); + expect(sameBinding(binding, { ...binding, cwd: "/other" })).toBe(false); +}); + +test("без автосабмита команда отправки не запускается", async () => { + await expect(herdrCoreProvider.send("t1", "prompt", false)).rejects.toThrow("requires Auto-submit"); +}); diff --git a/web/src/lib/shortcuts.ts b/web/src/lib/shortcuts.ts index 71f4be4..c659403 100644 --- a/web/src/lib/shortcuts.ts +++ b/web/src/lib/shortcuts.ts @@ -24,7 +24,7 @@ export interface ShortcutEvent { export const shortcutCommands = [ { id: "target-pick", - label: "Pick target (herdr / Orca / tmux)", + label: "Pick target (Herdr / Herdr Core / Orca / tmux)", group: "Editing", scope: "global", defaults: [{ code: "Enter", ctrl: true, shift: true }], diff --git a/web/src/store/lastTargetStore.ts b/web/src/store/lastTargetStore.ts index 04160a9..7da360b 100644 --- a/web/src/store/lastTargetStore.ts +++ b/web/src/store/lastTargetStore.ts @@ -1,5 +1,5 @@ import { create } from "zustand"; -import type { TargetSource } from "../lib/terminalTargets"; +import type { TabBinding, TargetSource } from "../lib/terminalTargets"; // Последний выбранный в пикере таргет — второе звено цепочки Explicit → Last → Modal. // @@ -13,6 +13,7 @@ export interface LastTargetRef { source: TargetSource; handle: string; label: string; + binding?: TabBinding; } interface LastTargetStore { From 13cc4f12e759367c5ea4e7d94f109abcd9a39e04 Mon Sep 17 00:00:00 2001 From: Yernaz Kengesbekov Date: Tue, 17 Nov 2026 04:24:41 +0500 Subject: [PATCH 3/5] =?UTF-8?q?docs(readme):=20=D0=BE=D0=BF=D0=B8=D1=81?= =?UTF-8?q?=D0=B0=D1=82=D1=8C=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6?= =?UTF-8?q?=D0=BA=D1=83=20=D0=B0=D0=B3=D0=B5=D0=BD=D1=82=D0=BE=D0=B2=20Her?= =?UTF-8?q?dr=20Core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 16 ++++++++++++++-- README.ru.md | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1053fb0..b29dd90 100644 --- a/README.md +++ b/README.md @@ -89,11 +89,22 @@ keep the agent's reply pinned in the reference panel while you write the next on **Prompt workflow** - **Send the prompt** (`Ctrl+Enter`) — push the current buffer into the terminal - the tab is bound to, without leaving the keyboard. Three kinds of target are + the tab is bound to, without leaving the keyboard. Four kinds of target are supported: [Herdr](https://herdr.dev) agents (**0.7 or newer** — pane ids changed shape after 0.6 and the older form is rejected by the command allowlist), + Herdr Core / Herdr GUI agents via `hc`, [Orca ADE](https://github.com/stablyai/orca) agents, and plain `tmux` panes. Multi-line prompts arrive as one block and are submitted once. +- **Herdr Core / GUI requirements:** install `hc` and make it available in + Sendoff's `PATH`, with Core running and **Auto-submit enabled**. + Currently only these detected agent types are supported: Codex CLI (`codex`), + Claude Code (`claude-code`), OpenCode (`opencode`), Antigravity CLI + (`antigravity`), and Pi Agent (`pi`). Shells and unrecognized agents are hidden; + Gemini CLI and Hermes Agent are not supported while Core reports them as `zsh`. + `hc send` always submits with Enter; Sendoff does not focus or launch the GUI. + `jq` is not required: Sendoff parses CLI JSON internally. + If `hc` is missing or discovery fails, its picker section is omitted; + use Sendoff Doctor to check Sendoff's PATH. A failed bound send reports an error. - **Target picker** (`Ctrl+Shift+Enter`) — one list, sectioned by source, so you pick an agent or a pane by name instead of relying on whatever is focused. A source that is not running simply has no section. @@ -219,7 +230,8 @@ to record a new one. The editor makes **no network calls** and spawns **no arbitrary processes**. The webview gets a deliberately narrow shell surface: `tmux`, plus `orca-ide` and -`herdr` scoped to individual read/send subcommands. Scoping matters most for +`herdr` scoped to individual read/send subcommands. Herdr Core is restricted to +`hc ls --json` and `hc send `. Scoping matters most for `herdr` — the same binary can also run arbitrary processes and tear down sessions, so it is allowlisted per subcommand rather than wholesale. diff --git a/README.ru.md b/README.ru.md index f641c03..b1fd7fb 100644 --- a/README.ru.md +++ b/README.ru.md @@ -88,11 +88,22 @@ flowchart LR **Prompt-workflow** - **Отправка промпта** (`Ctrl+Enter`) — пушит текущий буфер в терминал, к которому - привязан таб, не отрывая рук от клавиатуры. Поддержаны три вида целей: агенты + привязан таб, не отрывая рук от клавиатуры. Поддержаны четыре вида целей: агенты [Herdr](https://herdr.dev) (**0.7 и новее** — после 0.6 сменился вид id панелей, старую форму отклоняет allowlist команд), агенты + Herdr Core / Herdr GUI через `hc`, агенты [Orca ADE](https://github.com/stablyai/orca) и обычные `tmux`-пейны. Многострочный текст долетает одним блоком, сабмит один. +- **Требования Herdr Core / GUI:** установленный `hc` в `PATH` Sendoff, + запущенный Core и включённый **Auto-submit**. + Пока поддержаны только распознанные типы: Codex CLI (`codex`), + Claude Code (`claude-code`), OpenCode (`opencode`), Antigravity CLI + (`antigravity`) и Pi Agent (`pi`). Shell и неизвестные агенты скрыты. + Gemini CLI и Hermes Agent не поддерживаются, пока Core сообщает их как `zsh`. + `hc send` всегда нажимает Enter; Sendoff не запускает и не фокусирует GUI. + `jq` не нужен: JSON разбирается внутри приложения. + Если `hc` отсутствует или discovery падает, секция не показывается; + проверить PATH можно через Sendoff Doctor. Сбой отправки показывает ошибку. - **Пикер целей** (`Ctrl+Shift+Enter`) — один список с секциями по источникам: выбираешь агента или пейн по имени, а не полагаешься на то, что сейчас в фокусе. Незапущенный источник просто не даёт секции. @@ -214,7 +225,8 @@ flowchart LR Редактор **не делает сетевых вызовов** и **не спавнит произвольные процессы**. Webview получает намеренно узкую shell-поверхность: `tmux`, плюс `orca-ide` и -`herdr`, заскоупленные по отдельным read/send-подкомандам. Скоупинг важнее всего +`herdr`, заскоупленные по отдельным read/send-подкомандам. Herdr Core ограничен +`hc ls --json` и `hc send <локальный-address> <текст>`. Скоупинг важнее всего для `herdr` — тот же бинарник умеет запускать произвольные процессы и сносить сессии, поэтому он разрешён по подкомандам, а не целиком. From 2d74ff0079276d3fc34440f4c8353f237d746359 Mon Sep 17 00:00:00 2001 From: Yernaz Kengesbekov Date: Tue, 17 Nov 2026 22:21:22 +0500 Subject: [PATCH 4/5] =?UTF-8?q?fix(targets):=20=D1=83=D1=87=D0=B8=D1=82?= =?UTF-8?q?=D1=8B=D0=B2=D0=B0=D1=82=D1=8C=20=D1=82=D0=BE=D1=87=D0=BD=D1=8B?= =?UTF-8?q?=D0=B9=20=D0=B0=D0=B4=D1=80=D0=B5=D1=81=20=D0=BF=D1=80=D0=B8=20?= =?UTF-8?q?=D0=BF=D1=80=D0=B5=D0=B4=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B5=20?= =?UTF-8?q?Herdr=20Core?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/TargetPicker/TargetPicker.tsx | 9 +++++-- .../lib/terminalTargets/preselection.test.ts | 26 +++++++++++++++++++ web/src/lib/terminalTargets/preselection.ts | 16 ++++++++++++ 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 web/src/lib/terminalTargets/preselection.test.ts create mode 100644 web/src/lib/terminalTargets/preselection.ts diff --git a/web/src/components/TargetPicker/TargetPicker.tsx b/web/src/components/TargetPicker/TargetPicker.tsx index 793fcf5..09c083d 100644 --- a/web/src/components/TargetPicker/TargetPicker.tsx +++ b/web/src/components/TargetPicker/TargetPicker.tsx @@ -4,7 +4,8 @@ import { PickerModal, PickerHeader, PickerHint } from "../PickerModal/PickerModa import { useEditorStore } from "../../store/editorStore"; import { useLastTargetStore } from "../../store/lastTargetStore"; import { useSettingsStore } from "../../store/settingsStore"; -import { PROVIDERS, sameBinding, type TargetSource, type TerminalTarget } from "../../lib/terminalTargets"; +import { PROVIDERS, type TargetSource, type TerminalTarget } from "../../lib/terminalTargets"; +import { boundTargetIndex } from "../../lib/terminalTargets/preselection"; interface TargetPickerProps { onClose: () => void; @@ -96,7 +97,11 @@ export function TargetPicker({ onClose, onPick, mode = "send" }: TargetPickerPro const binding = tabs.find((t) => t.id === activeTabId)?.binding; const last = useLastTargetStore.getState().lastTarget; - const byBinding = binding ? rows.findIndex((r) => sameBinding(binding, r.binding)) : -1; + const byBinding = binding ? boundTargetIndex(rows, binding) : -1; + if (byBinding === null) { + setSelectedIndex(-1); + return; + } const byLast = last ? rows.findIndex((r) => r.source === last.source && r.handle === last.handle) : -1; const byActive = rows.findIndex((r) => r.isActive); diff --git a/web/src/lib/terminalTargets/preselection.test.ts b/web/src/lib/terminalTargets/preselection.test.ts new file mode 100644 index 0000000..791f07a --- /dev/null +++ b/web/src/lib/terminalTargets/preselection.test.ts @@ -0,0 +1,26 @@ +import { expect, test } from "bun:test"; +import { boundTargetIndex } from "./preselection"; +import type { TerminalTarget, TabBinding } from "./types"; + +const binding: Extract = { + source: "herdr-core", address: "t2", agent: "codex", where: "project / 1", cwd: "/project", +}; +const row = (address: string): TerminalTarget => ({ + source: "herdr-core", key: address, handle: address, + primary: "codex", binding: { ...binding, address }, +}); + +test("точный адрес предвыбирается даже после похожего соседа", () => { + expect(boundTargetIndex([row("t1"), row("t2")], binding)).toBe(1); +}); + +test("без точного адреса предвыбор допускается только для единственной цели", () => { + expect(boundTargetIndex([row("t3")], binding)).toBe(0); + expect(boundTargetIndex([row("t1"), row("t3")], binding)).toBeNull(); + expect(boundTargetIndex([], binding)).toBe(-1); +}); + +test("переиспользованный адрес с чужими полями не получает приоритет", () => { + const reused = { ...row("t2"), binding: { ...binding, cwd: "/other" } }; + expect(boundTargetIndex([reused, row("t3")], binding)).toBe(1); +}); diff --git a/web/src/lib/terminalTargets/preselection.ts b/web/src/lib/terminalTargets/preselection.ts new file mode 100644 index 0000000..510f90b --- /dev/null +++ b/web/src/lib/terminalTargets/preselection.ts @@ -0,0 +1,16 @@ +import { resolveHerdrCoreTarget } from "../herdrCoreResolve"; +import { sameBinding } from "./index"; +import type { TabBinding, TerminalTarget } from "./types"; + +// null: привязка неоднозначна — не заменять её Last/Active/первой строкой. +// -1: цель отсутствует — обычный fallback пикера остаётся доступен. +export function boundTargetIndex(rows: TerminalTarget[], binding: TabBinding): number | null { + if (binding.source !== "herdr-core") { + return rows.findIndex((r) => sameBinding(binding, r.binding)); + } + const targets = rows.flatMap((r) => r.binding.source === "herdr-core" ? [r.binding] : []); + const resolution = resolveHerdrCoreTarget(targets, binding); + if (resolution.kind === "ambiguous") return null; + if (resolution.kind === "not-found") return -1; + return rows.findIndex((r) => r.source === "herdr-core" && r.handle === resolution.handle); +} From 143a898d5a3cc58c3a44db84166d2a30985c14f7 Mon Sep 17 00:00:00 2001 From: Yernaz Kengesbekov Date: Tue, 17 Nov 2026 22:21:22 +0500 Subject: [PATCH 5/5] =?UTF-8?q?fix(doctor):=20=D0=B8=D1=81=D0=BA=D0=B0?= =?UTF-8?q?=D1=82=D1=8C=20hc=20=D0=B2=20PATH=20=D0=BF=D1=80=D0=BE=D1=86?= =?UTF-8?q?=D0=B5=D1=81=D1=81=D0=B0=20Sendoff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src-tauri/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index 443d553..7fae7d8 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -80,7 +80,7 @@ fn sniff_image_ext(bytes: &[u8]) -> Option<&'static str> { /// Список бинарей, о которых Doctor вправе спрашивать. Задан ЗДЕСЬ, а не приходит из /// вебвью: иначе команда превратилась бы в «проверь наличие произвольного файла» — /// generic-проба файловой системы под видом диагностики. Вебвью не передаёт ничего. -const DIAGNOSED_EXECUTABLES: [&str; 3] = ["tmux", "herdr", "orca-ide"]; +const DIAGNOSED_EXECUTABLES: [&str; 4] = ["tmux", "herdr", "orca-ide", "hc"]; #[derive(serde::Serialize)] struct ExecutableLocation {