Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 16 additions & 7 deletions src/cli/handlers/team.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// team register <manifest.json> register team + initial tasks
// team status [team] board state (or list all teams)
// team task add <team> <title> add a task (--detail, --assignee)
// team send <team> <member> <msg> mailbox send (--from, default "lead")
// team send <team> <member> <msg> mailbox send (--from SENDER required)
// team disband <team> disband (--keep-inboxes to skip cleanup)
import { cwd } from "node:process";
import {
Expand All @@ -23,7 +23,7 @@ subcommands:
register <manifest.json> register team + initial tasks from manifest
status [team] show one team's board (or list all teams)
task add <team> <title> add a task (--detail TEXT, --assignee MEMBER)
send <team> <member> <message> send a mailbox message (--from SENDER, default "lead")
send <team> <member> <message> send a mailbox message (--from SENDER, required; sender must be a declared member)
disband <team> disband the team (--keep-inboxes)`;

// ok()/fail() terminate via an ExitSignal instead of calling process.exit
Expand Down Expand Up @@ -167,17 +167,26 @@ async function cmdSend(
args: string[],
): Promise<never> {
const [team, member] = [args[0], args[1]];
const message = args.slice(2).join(" ").trim();
if (!team || !member || !message) {
if (!team || !member) {
fail(USAGE);
}
let from = "lead";
for (let i = 0; i < args.length; i += 1) {
// Kernel contract (fusion-harness team_runtime.send): BOTH sender and
// recipient must be declared team members — "lead" is not an entity.
// --from is therefore required and must name a manifest member.
let from = "";
const bodyTokens: string[] = [];
for (let i = 2; i < args.length; i += 1) {
if (args[i] === "--from" && args[i + 1]) {
from = args[i + 1] ?? "lead";
from = args[i + 1] ?? "";
i += 1;
} else {
bodyTokens.push(args[i] ?? "");
}
}
const message = bodyTokens.join(" ").trim();
if (!from || !message) {
fail(USAGE);
}
ok(
await client.call("teams.send", { team, from, to: member, body: message }),
);
Expand Down
47 changes: 46 additions & 1 deletion tests/cli/team.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,19 @@ function handle(
if (!reg) {
return { status: "error", message: `team not registered: ${teamName}` };
}
// Mirror kernel contract (fusion-harness team_runtime.send):
// sender AND recipient must be declared members.
const members = (
(reg.definition.members as Array<{ name: string }> | undefined) ?? []
).map((m) => m.name);
const from = String(params.from ?? "");
const to = String(params.to ?? "");
if (!members.includes(from)) {
return { status: "error", message: `unknown member: ${from}` };
}
if (!members.includes(to)) {
return { status: "error", message: `unknown member: ${to}` };
}
if (!reg.inboxes[to]) {
reg.inboxes[to] = [];
}
Expand Down Expand Up @@ -300,7 +312,14 @@ describe("team CLI", () => {

test("send delivers to member mailbox", async () => {
const { out, code } = await capture(() =>
runMain(["send", "pair", "worker-a", "please start with task-1"]),
runMain([
"send",
"pair",
"worker-a",
"please start with task-1",
"--from",
"worker-b",
]),
);
expect(code).toBe(0);
expect(JSON.parse(out).delivered).toBeTrue();
Expand All @@ -310,6 +329,32 @@ describe("team CLI", () => {
expect(inbox.at(-1)?.body).toBe("please start with task-1");
});

test("send without --from fails (kernel rejects undeclared senders)", async () => {
const { out, code } = await capture(() =>
runMain(["send", "pair", "worker-a", "no sender given"]),
);
expect(code).toBe(1);
expect(out).toContain("--from");
});

test("send --from does not leak the flag into the message body", async () => {
const { out, code } = await capture(() =>
runMain([
"send",
"pair",
"worker-a",
"trailing flag",
"--from",
"worker-b",
]),
);
expect(code).toBe(0);
const inbox = registry.get("pair")?.inboxes["worker-a"] as Array<{
body: string;
}>;
expect(inbox.at(-1)?.body).toBe("trailing flag");
});

test("status of unknown team fails with server message", async () => {
const { out, code } = await capture(() => runMain(["status", "ghost"]));
expect(code).toBe(1);
Expand Down
Loading