@ishlabs/cli 0.17.7 → 0.18.0

package/dist/commands/iteration.js

@@ -24,7 +24,7 @@ function readTextOrAtFile(value) {
 }
 /**
  * Parse a JSON-blob flag that also supports `@filepath` (read from disk).
- * Used for tester_pair `--role-criteria-a/-b` and any future blob inputs.
+ * Used for participant_pair `--role-criteria-a/-b` and any future blob inputs.
  * Throws a descriptive Error on bad JSON or wrong top-level type.
  */
 function parseJsonOrAtFile(raw, flagName) {
@@ -46,27 +46,27 @@ function parseJsonOrAtFile(raw, flagName) {
     return parsed;
 }
 /**
- * Pattern C / M12: project each tester row on an iteration response so its
+ * Pattern C / M12: project each participant row on an iteration response so its
  * `alias` and `name` survive `leanJson` (which strips raw UUID values). The
- * existing `id` and `tester_profile` payload still pass through under
+ * existing `id` and `person` payload still pass through under
  * `--verbose`, but the agent-default `--json` shape now exposes the same
  * `{alias, name, status}` triple `study results` already does, so an agent
- * can correlate testers across the two verbs.
+ * can correlate participants across the two verbs.
  */
-function enrichIterationTesters(iteration) {
-    const testers = iteration.testers;
-    if (!Array.isArray(testers))
+function enrichIterationParticipants(iteration) {
+    const participants = iteration.participants;
+    if (!Array.isArray(participants))
         return;
-    for (const t of testers) {
+    for (const t of participants) {
         if (!t || typeof t !== "object")
             continue;
-        const tester = t;
-        const id = tester.id ? String(tester.id) : "";
+        const participant = t;
+        const id = participant.id ? String(participant.id) : "";
         if (id)
-            tester.alias = tagAlias(ALIAS_PREFIX.tester, id);
-        const profile = tester.tester_profile;
-        if (!tester.name) {
-            tester.name = profile?.name ?? tester.instance_name ?? null;
+            participant.alias = tagAlias(ALIAS_PREFIX.participant, id);
+        const profile = participant.person;
+        if (!participant.name) {
+            participant.name = profile?.name ?? participant.instance_name ?? null;
         }
     }
 }
@@ -164,7 +164,7 @@ function buildIterationDetails(modality, opts) {
         case "chat": {
             const mode = opts.chatMode === undefined ? "external_chatbot" : normalizeChatMode(opts.chatMode);
             if (mode === null) {
-                throw new ValidationError(`Invalid --chat-mode "${opts.chatMode}". Expected "external_chatbot" or "tester_pair" (hyphenated variants accepted: "external-chatbot", "tester-pair").`, ["external_chatbot", "tester_pair"]);
+                throw new ValidationError(`Invalid --chat-mode "${opts.chatMode}". Expected "external_chatbot" or "participant_pair" (hyphenated variants accepted: "external-chatbot", "participant-pair").`, ["external_chatbot", "participant_pair"]);
             }
             let maxTurns;
             if (opts.maxTurns !== undefined) {
@@ -179,7 +179,7 @@ function buildIterationDetails(modality, opts) {
                 ...(maxTurns !== undefined && { max_turns: maxTurns }),
                 ...(opts.earlyTermination !== undefined && { early_termination: opts.earlyTermination }),
             };
-            if (mode === "tester_pair") {
+            if (mode === "participant_pair") {
                 // Reject external-chatbot flags so users don't silently lose them.
                 const conflictingFlags = [];
                 if (opts.chatEndpointId)
@@ -187,10 +187,10 @@ function buildIterationDetails(modality, opts) {
                 if (opts.chatEndpointJson)
                     conflictingFlags.push("--chat-endpoint-json");
                 if (conflictingFlags.length > 0) {
-                    throw new ValidationError(`--chat-mode tester_pair is incompatible with ${conflictingFlags.join(", ")}. Use --audience-a/-b or --role-criteria-a/-b plus --scenario-a/-b instead.`, conflictingFlags);
+                    throw new ValidationError(`--chat-mode participant_pair is incompatible with ${conflictingFlags.join(", ")}. Use --group-a/-b or --role-criteria-a/-b plus --scenario-a/-b instead.`, conflictingFlags);
                 }
-                const audA = (opts.audienceA ?? []).map(resolveId);
-                const audB = (opts.audienceB ?? []).map(resolveId);
+                const audA = (opts.groupA ?? []).map(resolveId);
+                const audB = (opts.groupB ?? []).map(resolveId);
                 const critARaw = parseJsonOrAtFile(opts.roleCriteriaA, "--role-criteria-a");
                 const critBRaw = parseJsonOrAtFile(opts.roleCriteriaB, "--role-criteria-b");
                 let critA;
@@ -205,14 +205,14 @@ function buildIterationDetails(modality, opts) {
                 const sideAHasInput = audA.length > 0 || !!critA;
                 const sideBHasInput = audB.length > 0 || !!critB;
                 if (!sideAHasInput || !sideBHasInput) {
-                    throw new ValidationError("tester_pair chat iterations require, for each side, either an explicit audience (--audience-a / --audience-b) or a role-criteria filter (--role-criteria-a / --role-criteria-b).", ["--audience-a", "--audience-b", "--role-criteria-a", "--role-criteria-b"]);
+                    throw new ValidationError("participant_pair chat iterations require, for each side, either explicit people (--group-a / --group-b) or a role-criteria filter (--role-criteria-a / --role-criteria-b).", ["--group-a", "--group-b", "--role-criteria-a", "--role-criteria-b"]);
                 }
                 // 1×N broadcast: the canonical "rehearse one side against N
                 // variations" shape. When one side has exactly one explicit
                 // profile and the other has more, broadcast the singleton so
                 // every conversation has the same fixed side and a distinct
-                // varying side. Example: --audience-a tp-rep --audience-b
-                // tp-cto1,tp-cto2,tp-cto3 → N=3 conversations, same rep vs
+                // varying side. Example: --group-a p-rep --group-b
+                // p-cto1,p-cto2,p-cto3 → N=3 conversations, same rep vs
                 // 3 different CTO personas. Same backend wire shape, just
                 // CLI-side ergonomics.
                 let audA_final = audA;
@@ -220,11 +220,11 @@ function buildIterationDetails(modality, opts) {
                 let broadcastMsg;
                 if (audA.length === 1 && audB.length > 1 && !critA && !critB) {
                     audA_final = Array(audB.length).fill(audA[0]);
-                    broadcastMsg = `Broadcasting --audience-a (1 profile) to length ${audB.length} to match --audience-b — same side-A profile across all ${audB.length} conversations.`;
+                    broadcastMsg = `Broadcasting --group-a (1 profile) to length ${audB.length} to match --group-b — same side-A profile across all ${audB.length} conversations.`;
                 }
                 else if (audB.length === 1 && audA.length > 1 && !critA && !critB) {
                     audB_final = Array(audA.length).fill(audB[0]);
-                    broadcastMsg = `Broadcasting --audience-b (1 profile) to length ${audA.length} to match --audience-a — same side-B profile across all ${audA.length} conversations.`;
+                    broadcastMsg = `Broadcasting --group-b (1 profile) to length ${audA.length} to match --group-a — same side-B profile across all ${audA.length} conversations.`;
                 }
                 if (broadcastMsg) {
                     // stderr so it doesn't pollute --json stdout.
@@ -235,13 +235,13 @@ function buildIterationDetails(modality, opts) {
                 // resolution happens server-side and may yield differing counts.
                 const bothExplicit = audA_final.length > 0 && audB_final.length > 0 && !critA && !critB;
                 if (bothExplicit && audA_final.length !== audB_final.length) {
-                    throw new ValidationError(`--audience-a (${audA_final.length}) and --audience-b (${audB_final.length}) cannot be paired. ` +
+                    throw new ValidationError(`--group-a (${audA_final.length}) and --group-b (${audB_final.length}) cannot be paired. ` +
                         `Pick the same number on each side (1:1 by index), or pass exactly one profile on one side to broadcast ` +
-                        `(e.g. --audience-a tp-rep --audience-b tp-cto1,tp-cto2,tp-cto3), ` +
-                        `or use --role-criteria-a/-b on either side to let the backend resolve the pool.`, ["--audience-a", "--audience-b"]);
+                        `(e.g. --group-a p-rep --group-b p-cto1,p-cto2,p-cto3), ` +
+                        `or use --role-criteria-a/-b on either side to let the backend resolve the pool.`, ["--group-a", "--group-b"]);
                 }
                 if (!opts.scenarioA || !opts.scenarioB) {
-                    throw new ValidationError("tester_pair chat iterations require --scenario-a and --scenario-b (text or @filepath).", ["--scenario-a", "--scenario-b"]);
+                    throw new ValidationError("participant_pair chat iterations require --scenario-a and --scenario-b (text or @filepath).", ["--scenario-a", "--scenario-b"]);
                 }
                 const scenarioA = readTextOrAtFile(opts.scenarioA);
                 const scenarioB = readTextOrAtFile(opts.scenarioB);
@@ -255,9 +255,9 @@ function buildIterationDetails(modality, opts) {
                 return {
                     ...topLevel,
                     mode_details: {
-                        mode: "tester_pair",
-                        audience_a: audA_final,
-                        audience_b: audB_final,
+                        mode: "participant_pair",
+                        group_a: audA_final,
+                        group_b: audB_final,
                         scenario_a: scenarioA,
                         scenario_b: scenarioB,
                         initiator_side: initiatorRaw,
@@ -269,7 +269,7 @@ function buildIterationDetails(modality, opts) {
             // external_chatbot (default)
             const endpoint = parseJsonFlag(opts.chatEndpointJson, "--chat-endpoint-json");
             if (!endpoint && !opts.chatEndpointId) {
-                throw new Error("Chat iterations require either --chat-endpoint-id (saved endpoint) or --chat-endpoint-json (inline config). For two-AI rehearsal use --chat-mode tester_pair with --audience-a/-b and --scenario-a/-b.");
+                throw new Error("Chat iterations require either --chat-endpoint-id (saved endpoint) or --chat-endpoint-json (inline config). For two-AI rehearsal use --chat-mode participant_pair with --group-a/-b and --scenario-a/-b.");
             }
             return {
                 ...topLevel,
@@ -393,11 +393,11 @@ Concept pages: ish docs get-page concepts/iteration
         .option("--segmentation-json <json>", "Segmentation JSON — time_based {intervals_seconds, labels?}, section_based {sections[{name,label,...}]}, or page_based {} — media modalities")
         .option("--content-config-json <json>", "Content config JSON — {early_termination, selected_segment_indices?} — media modalities")
         // Chat modality
-        .option("--chat-mode <mode>", "Chat mode: external_chatbot (default; probe a customer chatbot) or tester_pair (two AI audiences talk to each other)")
+        .option("--chat-mode <mode>", "Chat mode: external_chatbot (default; probe a customer chatbot) or participant_pair (two AI people talk to each other)")
         .option("--chat-endpoint-id <id>", "Saved chatbot endpoint id — chat modality, external_chatbot mode (legacy; prefer --endpoint)")
         .option("--chat-endpoint-json <json>", "Inline chatbot endpoint config JSON — chat modality, external_chatbot mode (legacy; prefer --endpoint-config)")
-        .option("--max-turns <n>", "Max tester turns (1-50) — chat modality (default 12)")
-        .option("--early-termination", "End the chat session early when the tester signals stop — chat modality")
+        .option("--max-turns <n>", "Max participant turns (1-50) — chat modality (default 12)")
+        .option("--early-termination", "End the chat session early when the participant signals stop — chat modality")
         // Agent-friendly chat shortcuts: --endpoint <id> resolves a saved
         // chatbot endpoint via alias / UUID and fetches its config inline;
         // --endpoint-config <file> takes a raw config file (or `-` for
@@ -406,16 +406,16 @@ Concept pages: ish docs get-page concepts/iteration
         // external_chatbot mode.
         .option("--endpoint <id>", "Saved chatbot endpoint id (alias or UUID) — chat modality, external_chatbot mode")
         .option("--endpoint-config <file>", "Raw ChatbotEndpointConfig JSON file or `-` for stdin — chat modality, external_chatbot mode")
-        // tester_pair (two-AI rehearsal) flags. audience_a and audience_b must
+        // participant_pair (two-AI rehearsal) flags. group_a and group_b must
         // be the same length — pairs are 1:1 by index. Each side has its own
         // scenario + goal; the partner does NOT see the other side's prompt.
-        .option("--audience-a <ids>", "Tester profile IDs/aliases for audience A (comma-separated or repeatable). Pass a single profile and N on --audience-b to broadcast (1×N rehearsal: fix side A, vary side B) — chat tester_pair mode", collectIds, [])
-        .option("--audience-b <ids>", "Tester profile IDs/aliases for audience B (comma-separated or repeatable). When both sides are explicit they must be equal length, BUT if either side is a singleton it's auto-broadcast to match the other (1×N rehearsal) — chat tester_pair mode", collectIds, [])
-        .option("--scenario-a <text-or-@file>", "Side-A scenario + goal text, or @filepath — chat tester_pair mode")
-        .option("--scenario-b <text-or-@file>", "Side-B scenario + goal text, or @filepath — chat tester_pair mode")
-        .option("--initiator-side <a|b>", "Which side speaks first (default: a) — chat tester_pair mode")
-        .option("--role-criteria-a <json-or-@file>", 'RoleCriteria filter for side A (inline JSON or @filepath). Keys: occupation[], min_age, max_age, gender[], country[], education_level_in[], household_in[], locale_type_in[], income_level_in[], employment_status_in[], requires_captions, uses_screen_reader, prefers_reduced_motion, prefers_high_contrast, has_any_accessibility_need. The five *_in arrays accept snake_case spec values; the five accessibility filters are booleans. Persona-first: filters the eligible profile pool without altering personas. Use INSTEAD of --audience-a or alongside it (criteria then validates the explicit list). chat tester_pair mode.')
-        .option("--role-criteria-b <json-or-@file>", "RoleCriteria filter for side B — same shape as --role-criteria-a. chat tester_pair mode.")
+        .option("--group-a <ids>", "Person IDs/aliases for side A (comma-separated or repeatable). Pass a single person and N on --group-b to broadcast (1×N rehearsal: fix side A, vary side B) — chat participant_pair mode", collectIds, [])
+        .option("--group-b <ids>", "Person IDs/aliases for side B (comma-separated or repeatable). When both sides are explicit they must be equal length, BUT if either side is a singleton it's auto-broadcast to match the other (1×N rehearsal) — chat participant_pair mode", collectIds, [])
+        .option("--scenario-a <text-or-@file>", "Side-A scenario + goal text, or @filepath — chat participant_pair mode")
+        .option("--scenario-b <text-or-@file>", "Side-B scenario + goal text, or @filepath — chat participant_pair mode")
+        .option("--initiator-side <a|b>", "Which side speaks first (default: a) — chat participant_pair mode")
+        .option("--role-criteria-a <json-or-@file>", 'RoleCriteria filter for side A (inline JSON or @filepath). Keys: occupation[], min_age, max_age, gender[], country[], education_level_in[], household_in[], locale_type_in[], income_level_in[], employment_status_in[], requires_captions, uses_screen_reader, prefers_reduced_motion, prefers_high_contrast, has_any_accessibility_need. The five *_in arrays accept snake_case spec values; the five accessibility filters are booleans. Persona-first: filters the eligible profile pool without altering personas. Use INSTEAD of --group-a or alongside it (criteria then validates the explicit list). chat participant_pair mode.')
+        .option("--role-criteria-b <json-or-@file>", "RoleCriteria filter for side B — same shape as --role-criteria-a. chat participant_pair mode.")
         // Escape hatch
         .option("--details-json <json>", "Raw iteration details JSON (overrides individual flags)")
         .addHelpText("after", `
@@ -517,16 +517,16 @@ Next: \`ish study run\` to dispatch simulations against this iteration.`)
                 if (!isChat && (opts.endpoint !== undefined || opts.endpointConfig !== undefined)) {
                     throw new Error(`This study uses "${modality}" modality — --endpoint / --endpoint-config are for chat studies.`);
                 }
-                const pairFlagsSet = (opts.audienceA && opts.audienceA.length > 0)
-                    || (opts.audienceB && opts.audienceB.length > 0)
+                const pairFlagsSet = (opts.groupA && opts.groupA.length > 0)
+                    || (opts.groupB && opts.groupB.length > 0)
                     || opts.scenarioA !== undefined
                     || opts.scenarioB !== undefined
                     || opts.initiatorSide !== undefined
                     || opts.roleCriteriaA !== undefined
                     || opts.roleCriteriaB !== undefined
-                    || normalizeChatMode(opts.chatMode) === "tester_pair";
+                    || normalizeChatMode(opts.chatMode) === "participant_pair";
                 if (!isChat && pairFlagsSet) {
-                    throw new Error(`This study uses "${modality}" modality — --chat-mode / --audience-a/-b / --scenario-a/-b / --role-criteria-a/-b are for chat studies.`);
+                    throw new Error(`This study uses "${modality}" modality — --chat-mode / --group-a/-b / --scenario-a/-b / --role-criteria-a/-b are for chat studies.`);
                 }
                 // Validate per-modality required flags BEFORE any upload so we don't
                 // orphan blobs in storage when the wrong flag is passed (e.g.
@@ -556,9 +556,9 @@ Next: \`ish study run\` to dispatch simulations against this iteration.`)
                     case "chat": {
                         const mode = opts.chatMode === undefined ? "external_chatbot" : normalizeChatMode(opts.chatMode);
                         if (mode === null) {
-                            throw new ValidationError(`Invalid --chat-mode "${opts.chatMode}". Expected "external_chatbot" or "tester_pair" (hyphenated variants accepted).`, ["external_chatbot", "tester_pair"]);
+                            throw new ValidationError(`Invalid --chat-mode "${opts.chatMode}". Expected "external_chatbot" or "participant_pair" (hyphenated variants accepted).`, ["external_chatbot", "participant_pair"]);
                         }
-                        if (mode === "tester_pair") {
+                        if (mode === "participant_pair") {
                             const conflicting = [];
                             if (opts.endpoint)
                                 conflicting.push("--endpoint");
@@ -569,15 +569,15 @@ Next: \`ish study run\` to dispatch simulations against this iteration.`)
                             if (opts.chatEndpointJson)
                                 conflicting.push("--chat-endpoint-json");
                             if (conflicting.length > 0) {
-                                throw new ValidationError(`--chat-mode tester_pair is incompatible with ${conflicting.join(", ")}. Use --audience-a/-b or --role-criteria-a/-b plus --scenario-a/-b instead.`, conflicting);
+                                throw new ValidationError(`--chat-mode participant_pair is incompatible with ${conflicting.join(", ")}. Use --group-a/-b or --role-criteria-a/-b plus --scenario-a/-b instead.`, conflicting);
                             }
-                            const sideAHasInput = (opts.audienceA && opts.audienceA.length > 0) || !!opts.roleCriteriaA;
-                            const sideBHasInput = (opts.audienceB && opts.audienceB.length > 0) || !!opts.roleCriteriaB;
+                            const sideAHasInput = (opts.groupA && opts.groupA.length > 0) || !!opts.roleCriteriaA;
+                            const sideBHasInput = (opts.groupB && opts.groupB.length > 0) || !!opts.roleCriteriaB;
                             if (!sideAHasInput || !sideBHasInput) {
-                                throw new Error("tester_pair chat iterations require, for each side, either an explicit audience (--audience-a / --audience-b) or a role-criteria filter (--role-criteria-a / --role-criteria-b).");
+                                throw new Error("participant_pair chat iterations require, for each side, either explicit people (--group-a / --group-b) or a role-criteria filter (--role-criteria-a / --role-criteria-b).");
                             }
                             if (!opts.scenarioA || !opts.scenarioB) {
-                                throw new Error("tester_pair chat iterations require --scenario-a <text-or-@file> and --scenario-b <text-or-@file>.");
+                                throw new Error("participant_pair chat iterations require --scenario-a <text-or-@file> and --scenario-b <text-or-@file>.");
                             }
                             break;
                         }
@@ -586,7 +586,7 @@ Next: \`ish study run\` to dispatch simulations against this iteration.`)
                             && !opts.chatEndpointJson
                             && !opts.endpoint
                             && !opts.endpointConfig) {
-                            throw new Error("Chat iterations (external_chatbot mode) require one of: --endpoint <id>, --endpoint-config <file>, --chat-endpoint-id, or --chat-endpoint-json. For two-AI rehearsal use --chat-mode tester_pair.");
+                            throw new Error("Chat iterations (external_chatbot mode) require one of: --endpoint <id>, --endpoint-config <file>, --chat-endpoint-id, or --chat-endpoint-json. For two-AI rehearsal use --chat-mode participant_pair.");
                         }
                         if ((opts.endpoint || opts.endpointConfig)
                             && (opts.chatEndpointId || opts.chatEndpointJson)) {
@@ -708,7 +708,7 @@ With multiple IDs, returns a {items:[...], total:N} envelope.`)
                 const result = data;
                 if (result.id)
                     result.alias = tagAlias(ALIAS_PREFIX.iteration, String(result.id));
-                enrichIterationTesters(result);
+                enrichIterationParticipants(result);
                 output(result, globals.json);
                 return;
             }
@@ -717,7 +717,7 @@ With multiple IDs, returns a {items:[...], total:N} envelope.`)
                 const r = data;
                 if (r.id)
                     r.alias = tagAlias(ALIAS_PREFIX.iteration, String(r.id));
-                enrichIterationTesters(r);
+                enrichIterationParticipants(r);
                 return r;
             }));
             if (globals.json) {

package/dist/commands/mcp.d.ts

@@ -0,0 +1,23 @@
+/**
+ * ish mcp — wire the ish MCP server into local AI clients.
+ *
+ * Three verbs:
+ *   - `ish mcp add`    Wire ish MCP into selected clients (idempotent).
+ *   - `ish mcp list`   Show detected clients + ish-MCP wiring status.
+ *   - `ish mcp remove` Inverse of add — cleanly unwire the ish block.
+ *
+ * Design choices (per plan workstream C):
+ *   - No API call required — all writes are local JSON files. We use
+ *     `runInline` instead of `withClient`.
+ *   - Atomic writes (tmp file + rename), deep-equal idempotence, and
+ *     unrelated keys in the target config are preserved verbatim.
+ *   - Never embed access tokens in the file. The hosted ish MCP server
+ *     handles OAuth on first connect; we only write the URL.
+ *   - No interactive prompts by default (CLI is for autonomous agents).
+ *     `--yes` is required to commit writes under `--json` / non-TTY.
+ *
+ * Per-client config paths + per-client server-block shapes live in
+ * `src/lib/mcp-clients.ts` (MCP_CLIENT_TARGETS).
+ */
+import type { Command } from "commander";
+export declare function registerMcpCommands(program: Command): void;