Add the harness, envs, per-bot models and chat attachments
- Harness: providers, model catalog synced hourly, automatic free picks, cooldowns, tool loop with context trimming, MCP computer tools - Bots queue runs replies and tasks through the harness; jobs wait (attempt refunded) while every model is resting - Envs: Settings > Environment, scoped general/workspace/computer, written to computers and redacted from tool output - Models: Settings > Models, per-harness provider select defaulting to OpenRouter, and a models modal on each bot's chat (the coordinator's edits the defaults) - Chat: thinking row while a reply runs, file attachments (upload, paste, drop) that replies read as images, audio and document text - Fix media uploads failing after a user's first file, and private files being served from the public media path Co-Authored-By: Claude Opus 5.5 <[email protected]>
This commit is contained in:
@@ -0,0 +1,54 @@
|
||||
import { describe, expect, test } from "bun:test";
|
||||
import changedHarnessSettings from "./changed-harness-settings";
|
||||
|
||||
const saved = {
|
||||
text: { model_id: null, provider_id: null, fallback: true, enabled: true },
|
||||
speech: { model_id: 4, provider_id: null, fallback: true, enabled: true, voice: "george" },
|
||||
};
|
||||
|
||||
describe("changedHarnessSettings", () => {
|
||||
test("is empty when nothing changed", () => {
|
||||
expect(
|
||||
changedHarnessSettings({ form: structuredClone(saved), saved }),
|
||||
).toEqual([]);
|
||||
});
|
||||
|
||||
test("lists only the harnesses that changed", () => {
|
||||
expect(
|
||||
changedHarnessSettings({
|
||||
form: {
|
||||
...saved,
|
||||
speech: { ...saved.speech, voice: "sarah" },
|
||||
},
|
||||
saved,
|
||||
}),
|
||||
).toEqual([
|
||||
{
|
||||
harness: "speech",
|
||||
model_id: 4,
|
||||
provider_id: null,
|
||||
fallback: true,
|
||||
enabled: true,
|
||||
voice: "sarah",
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
test("lists a provider change", () => {
|
||||
expect(
|
||||
changedHarnessSettings({
|
||||
form: { ...saved, text: { ...saved.text, provider_id: 2 } },
|
||||
saved,
|
||||
}),
|
||||
).toEqual([{ harness: "text", model_id: null, provider_id: 2, fallback: true, enabled: true }]);
|
||||
});
|
||||
|
||||
test("treats an empty voice as no voice", () => {
|
||||
expect(
|
||||
changedHarnessSettings({
|
||||
form: { text: { ...saved.text, voice: "" } },
|
||||
saved,
|
||||
}),
|
||||
).toEqual([]);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,35 @@
|
||||
import type { HarnessKind } from "@/src/dict/harness-dict";
|
||||
import type {
|
||||
HarnessFormValue,
|
||||
HarnessSettingsFormObject,
|
||||
} from "@/src/types";
|
||||
|
||||
type Params = {
|
||||
form: HarnessSettingsFormObject;
|
||||
saved: HarnessSettingsFormObject;
|
||||
};
|
||||
|
||||
/**
|
||||
* The harness settings that differ from what is saved, ready to send.
|
||||
*/
|
||||
export default function changedHarnessSettings({ form, saved }: Params) {
|
||||
return (Object.keys(form) as HarnessKind[]).flatMap((harness) => {
|
||||
const value = form[harness];
|
||||
|
||||
if (!value || isSame({ a: value, b: saved[harness] })) return [];
|
||||
|
||||
return [{ harness, ...value }];
|
||||
});
|
||||
}
|
||||
|
||||
function isSame({ a, b }: { a: HarnessFormValue; b?: HarnessFormValue }) {
|
||||
return (
|
||||
Boolean(b) &&
|
||||
Boolean(a.inherit) == Boolean(b!.inherit) &&
|
||||
a.model_id == b!.model_id &&
|
||||
(a.provider_id ?? null) == (b!.provider_id ?? null) &&
|
||||
a.fallback == b!.fallback &&
|
||||
a.enabled == b!.enabled &&
|
||||
(a.voice || "") == (b!.voice || "")
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,46 @@
|
||||
import type { TWUISelectOptionObject } from "@moduletrace/twui/form/Select";
|
||||
import type { HarnessModelOption } from "@/src/types";
|
||||
|
||||
export const AutoModelValue = "auto";
|
||||
|
||||
type Params = {
|
||||
/**
|
||||
* The models to offer, already narrowed to the picked provider.
|
||||
*/
|
||||
models: HarnessModelOption[];
|
||||
model_id: number | null;
|
||||
/**
|
||||
* The picked provider's name; undefined for any provider.
|
||||
*/
|
||||
provider_name?: string;
|
||||
};
|
||||
|
||||
/**
|
||||
* The model picker's options: automatic (the best free model, on the
|
||||
* picked provider if there is one), then every model that can do the job
|
||||
* (free ones first, as the server sorts them).
|
||||
*/
|
||||
export default function harnessModelSelectOptions({
|
||||
models,
|
||||
model_id,
|
||||
provider_name,
|
||||
}: Params): TWUISelectOptionObject[] {
|
||||
const has_free = models.some((model) => model.free);
|
||||
|
||||
return [
|
||||
{
|
||||
value: AutoModelValue,
|
||||
title: provider_name
|
||||
? has_free
|
||||
? `Automatic (best free model on ${provider_name})`
|
||||
: `Automatic (no free models on ${provider_name}: pick one)`
|
||||
: "Automatic (best free model)",
|
||||
default: !model_id,
|
||||
},
|
||||
...models.map((model) => ({
|
||||
value: String(model.id),
|
||||
title: `${model.name}${provider_name ? "" : ` · ${model.provider_name}`}${model.free && !/free/i.test(model.name) ? " · free" : ""}`,
|
||||
default: model.id == model_id,
|
||||
})),
|
||||
];
|
||||
}
|
||||
@@ -0,0 +1,32 @@
|
||||
import type {
|
||||
HarnessOverview,
|
||||
HarnessSettingsFormObject,
|
||||
} from "@/src/types";
|
||||
|
||||
type Params = {
|
||||
harnesses: HarnessOverview[];
|
||||
};
|
||||
|
||||
/**
|
||||
* The saved harness settings as form values.
|
||||
*/
|
||||
export default function toHarnessForm({
|
||||
harnesses,
|
||||
}: Params): HarnessSettingsFormObject {
|
||||
return Object.fromEntries(
|
||||
harnesses.map((harness) => [
|
||||
harness.harness,
|
||||
{
|
||||
inherit: harness.inherit,
|
||||
model_id: harness.model_id ?? null,
|
||||
provider_id: harness.provider_id ?? null,
|
||||
fallback: harness.fallback,
|
||||
enabled: harness.enabled,
|
||||
voice:
|
||||
typeof harness.options.voice == "string"
|
||||
? harness.options.voice
|
||||
: undefined,
|
||||
},
|
||||
]),
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user